Merge branch 'upstream'

174 files changed, 13216 insertions, 50294 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..cef1612
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,79 @@
+*.o
+*.stamp
+*.la
+*.so
+*.dll
+*.a
+*.exe
+*.lo
+*.log
+*.trs
+*.test
+
+.deps/
+.libs/
+
+Makefile.in.in
+Makefile.in
+Makefile
+config.h.in
+tags
+
+/autom4te.cache
+/aclocal.m4
+/compile
+/configure
+/configure.sub
+/config.*
+/depcomp
+/install-sh
+/ltmain.sh
+/missing
+/ar-lib
+/libtool
+/test-driver
+stamp-h1
+.dirstamp
+/gtk-doc.make
+
+__pycache__/
+
+/po/POTFILES
+/po/stamp-it
+/po/.intltool-merge-cache
+/po/*.pot
+/po/*.gmo
+
+/docs/*.signals
+/docs/*.types
+/docs/*.prerequisites
+/docs/*.interfaces
+/docs/*.hierarchy
+/docs/*.args
+/docs/*-decl*
+/docs/*undocumented.txt
+/docs/*unused.txt
+/docs/*undeclared.txt
+/docs/xml/
+/docs/html/
+/docs/*.c
+
+/m4
+!/m4/desktop.m4
+!/m4/leak-supp.txt
+!/m4/tap-test
+
+*.appdata.xml
+*.desktop
+*.gschema.xml
+*.gschema.valid
+*.desktop.valid
+*.vapi
+*.gir
+*.deps
+*.typelib
+*~
+
+/src/transmission-remote-gtk
+/src/transmission-remote-gtk.1
+
diff --git a/AUTHORS b/AUTHORS
index e4dadc4..492249e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,28 +1,28 @@
- transmission-remote-gtk authors

- ===============================

-

-transmission-remote-gtk is developed by:

-   

-   Alan Fitton <alan-at-eth0.org.uk>

-

- translations

- ============

-

-translations kindly contributed by

-

-  * Rafael Neri (Brazilian Portuguese)

-  * Jan Žárský (Czech)

-  * Pierre Rudloff (French)

-  * Julian Held (German)

-  * Dénes Sávoli (Hungarian)

-  * Enrico G, Milo Casagrande, Carlo Micheli (Italian)

-  * Youn sok Choi (Korean) 

-  * sieks (Latvian)

-  * Algimantas Margevi�ius (Lithuanian)

-  * Piotr (Polish)

-  * Y3AVD (Russian)

-  * nisalup (Sinhalese)

-  * aspidzent (Spanish)

-  * webbake (Swedish)

-  * Ebubekir Karul (Turkish)

-  * ROR191 (Ukranian)

+ transmission-remote-gtk authors
+ ===============================
+
+transmission-remote-gtk is developed by:
+   
+   Alan Fitton <alan-at-eth0.org.uk>
+
+ translations
+ ============
+
+translations kindly contributed by
+
+  * Rafael Neri (Brazilian Portuguese)
+  * Jan Žárský (Czech)
+  * Pierre Rudloff (French)
+  * Julian Held (German)
+  * Dénes Sávoli (Hungarian)
+  * Enrico G, Milo Casagrande, Carlo Micheli (Italian)
+  * Youn sok Choi (Korean) 
+  * sieks (Latvian)
+  * Algimantas Margevi�ius (Lithuanian)
+  * Piotr (Polish)
+  * Y3AVD (Russian)
+  * nisalup (Sinhalese)
+  * aspidzent (Spanish)
+  * webbake (Swedish)
+  * Ebubekir Karul (Turkish)
+  * ROR191 (Ukranian)
diff --git a/COPYING b/COPYING
index 89e08fb..d159169 100644
--- a/COPYING
+++ b/COPYING
@@ -1,339 +1,339 @@
-                    GNU GENERAL PUBLIC LICENSE

-                       Version 2, June 1991

-

- Copyright (C) 1989, 1991 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.

-

-                            Preamble

-

-  The licenses for most software are designed to take away your

-freedom to share and change it.  By contrast, the GNU General Public

-License is intended to guarantee your freedom to share and change free

-software--to make sure the software is free for all its users.  This

-General Public License applies to most of the Free Software

-Foundation's software and to any other program whose authors commit to

-using it.  (Some other Free Software Foundation software is covered by

-the GNU Lesser General Public License instead.)  You can apply it to

-your programs, too.

-

-  When we speak of free software, we are referring to freedom, 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 or use pieces of it

-in new free programs; and that you know you can do these things.

-

-  To protect your rights, we need to make restrictions that forbid

-anyone to deny you these rights or to ask you to surrender the rights.

-These restrictions translate to certain responsibilities for you if you

-distribute copies of the software, or if you modify it.

-

-  For example, if you distribute copies of such a program, whether

-gratis or for a fee, you must give the recipients all the rights that

-you have.  You must make sure that they, too, receive or can get the

-source code.  And you must show them these terms so they know their

-rights.

-

-  We protect your rights with two steps: (1) copyright the software, and

-(2) offer you this license which gives you legal permission to copy,

-distribute and/or modify the software.

-

-  Also, for each author's protection and ours, we want to make certain

-that everyone understands that there is no warranty for this free

-software.  If the software is modified by someone else and passed on, we

-want its recipients to know that what they have is not the original, so

-that any problems introduced by others will not reflect on the original

-authors' reputations.

-

-  Finally, any free program is threatened constantly by software

-patents.  We wish to avoid the danger that redistributors of a free

-program will individually obtain patent licenses, in effect making the

-program proprietary.  To prevent this, we have made it clear that any

-patent must be licensed for everyone's free use or not licensed at all.

-

-  The precise terms and conditions for copying, distribution and

-modification follow.

-

-                    GNU GENERAL PUBLIC LICENSE

-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

-

-  0. This License applies to any program or other work which contains

-a notice placed by the copyright holder saying it may be distributed

-under the terms of this General Public License.  The "Program", below,

-refers to any such program or work, and a "work based on the Program"

-means either the Program or any derivative work under copyright law:

-that is to say, a work containing the Program or a portion of it,

-either verbatim or with modifications and/or translated into another

-language.  (Hereinafter, translation is included without limitation in

-the term "modification".)  Each licensee is addressed as "you".

-

-Activities other than copying, distribution and modification are not

-covered by this License; they are outside its scope.  The act of

-running the Program is not restricted, and the output from the Program

-is covered only if its contents constitute a work based on the

-Program (independent of having been made by running the Program).

-Whether that is true depends on what the Program does.

-

-  1. You may copy and distribute verbatim copies of the Program's

-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 give any other recipients of the Program a copy of this License

-along with the Program.

-

-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.

-

-  2. You may modify your copy or copies of the Program or any portion

-of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices

-    stating that you changed the files and the date of any change.

-

-    b) You must cause any work that you distribute or publish, that in

-    whole or in part contains or is derived from the Program or any

-    part thereof, to be licensed as a whole at no charge to all third

-    parties under the terms of this License.

-

-    c) If the modified program normally reads commands interactively

-    when run, you must cause it, when started running for such

-    interactive use in the most ordinary way, to print or display an

-    announcement including an appropriate copyright notice and a

-    notice that there is no warranty (or else, saying that you provide

-    a warranty) and that users may redistribute the program under

-    these conditions, and telling the user how to view a copy of this

-    License.  (Exception: if the Program itself is interactive but

-    does not normally print such an announcement, your work based on

-    the Program is not required to print an announcement.)

-

-These requirements apply to the modified work as a whole.  If

-identifiable sections of that work are not derived from the Program,

-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 Program, 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 Program.

-

-In addition, mere aggregation of another work not based on the Program

-with the Program (or with a work based on the Program) on a volume of

-a storage or distribution medium does not bring the other work under

-the scope of this License.

-

-  3. You may copy and distribute the Program (or a work based on it,

-under Section 2) in object code or executable form under the terms of

-Sections 1 and 2 above provided that you also do one of the following:

-

-    a) 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; or,

-

-    b) Accompany it with a written offer, valid for at least three

-    years, to give any third party, for a charge no more than your

-    cost of physically performing source distribution, a complete

-    machine-readable copy of the corresponding source code, to be

-    distributed under the terms of Sections 1 and 2 above on a medium

-    customarily used for software interchange; or,

-

-    c) Accompany it with the information you received as to the offer

-    to distribute corresponding source code.  (This alternative is

-    allowed only for noncommercial distribution and only if you

-    received the program in object code or executable form with such

-    an offer, in accord with Subsection b above.)

-

-The source code for a work means the preferred form of the work for

-making modifications to it.  For an executable work, 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 executable.  However, as a

-special exception, the source code 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.

-

-If distribution of executable or 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 counts as

-distribution of the source code, even though third parties are not

-compelled to copy the source along with the object code.

-

-  4. You may not copy, modify, sublicense, or distribute the Program

-except as expressly provided under this License.  Any attempt

-otherwise to copy, modify, sublicense or distribute the Program 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.

-

-  5. 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 Program or its derivative works.  These actions are

-prohibited by law if you do not accept this License.  Therefore, by

-modifying or distributing the Program (or any work based on the

-Program), you indicate your acceptance of this License to do so, and

-all its terms and conditions for copying, distributing or modifying

-the Program or works based on it.

-

-  6. Each time you redistribute the Program (or any work based on the

-Program), the recipient automatically receives a license from the

-original licensor to copy, distribute or modify the Program 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 to

-this License.

-

-  7. 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 Program at all.  For example, if a patent

-license would not permit royalty-free redistribution of the Program 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 Program.

-

-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.

-

-  8. If the distribution and/or use of the Program is restricted in

-certain countries either by patents or by copyrighted interfaces, the

-original copyright holder who places the Program 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.

-

-  9. The Free Software Foundation may publish revised and/or new versions

-of the 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 Program

-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 Program does not specify a version number of

-this License, you may choose any version ever published by the Free Software

-Foundation.

-

-  10. If you wish to incorporate parts of the Program into other free

-programs whose distribution conditions are different, 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

-

-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY

-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN

-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES

-PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU.  SHOULD THE

-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,

-REPAIR OR CORRECTION.

-

-  12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER

-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE

-POSSIBILITY OF SUCH DAMAGES.

-

-                     END OF TERMS AND CONDITIONS

-

-            How to Apply These Terms to Your New Programs

-

-  If you develop a new program, and you want it to be of the greatest

-possible use to the public, the best way to achieve this is to make it

-free software which everyone can redistribute and change under these terms.

-

-  To do so, attach the following notices to the program.  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 program's name and a brief idea of what it does.>

-    Copyright (C) <year>  <name of author>

-

-    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.,

-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

-

-Also add information on how to contact you by electronic and paper mail.

-

-If the program is interactive, make it output a short notice like this

-when it starts in an interactive mode:

-

-    Gnomovision version 69, Copyright (C) year name of author

-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.

-    This is free software, and you are welcome to redistribute it

-    under certain conditions; type `show c' for details.

-

-The hypothetical commands `show w' and `show c' should show the appropriate

-parts of the General Public License.  Of course, the commands you use may

-be called something other than `show w' and `show c'; they could even be

-mouse-clicks or menu items--whatever suits your program.

-

-You should also get your employer (if you work as a programmer) or your

-school, if any, to sign a "copyright disclaimer" for the program, if

-necessary.  Here is a sample; alter the names:

-

-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program

-  `Gnomovision' (which makes passes at compilers) written by James Hacker.

-

-  <signature of Ty Coon>, 1 April 1989

-  Ty Coon, President of Vice

-

-This General Public License does not permit incorporating your program into

-proprietary programs.  If your program is a subroutine library, you may

-consider it more useful to permit linking proprietary applications with the

-library.  If this is what you want to do, use the GNU Lesser General

-Public License instead of this License.

+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 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.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, 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 or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+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 give any other recipients of the Program a copy of this License
+along with the Program.
+
+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.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+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 Program, 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 Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) 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; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, 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 executable.  However, as a
+special exception, the source code 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.
+
+If distribution of executable or 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 counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program 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.
+
+  5. 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 Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program 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 to
+this License.
+
+  7. 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 Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program 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 Program.
+
+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.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program 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.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the 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 Program
+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 Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, 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
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  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 program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/ChangeLog b/ChangeLog
index b041fff..ef7234a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,176 +1,205 @@
-* Sun Jun 9 2012 1.1.1

-- fix file lists relying on being sorted (sometimes they are not) to fix

-the tree being messed up with duplicate directories.

-- fix using markup in comment.

-- translations updated from launchpad. (NEW: Latvian, Sinhalese)

-

-* Wed Sep 5 2012 1.1

-- new Transmission display style

-- handle downloading metadata state better, don't make incorrect completion

-notifications

-- win32: build reverted to GTK2 because of empty progress bar in GTK3

-- use g_idle_add instead of gdk_thread_enter/leave for reverse DNS

-- fix compilation error for debian

-- issue 210: fix crash when encountering empty benc dict in .torrent

-- fix concurrency issue when populating large files model and changing

-- translation updates from launchpad

-

-* Fri Jun 29 2012 1.0.2

-- win32: update to gtk3 (also fixes blank tray icon)

-- win32: GeoIP support

-- fix minimise to tray

-- fix units in status icon text

-- truncate magnet links in add dialog

-- ctrl+k to focus on search entry like firefox

-- only use libappindicator if using unity

-- use gtk_box_new instead of gtk_{h,v}box_new (deprecated) on gtk3

-- Swedish translation

-- translation updates from launchpad

-- fix 'make test' due to file missing in POTFILES.in

-- update free space (session) after delete

-- URL links in comment field

-- reorder buttons for actions and directories

-

-* Tue Jan 31 2012 1.0.1

-- Fix a crash when toggling turtle mode or setting remote preferences.

-- Update Russian translation.

-

-* Sun Jan 15 2011 1.0

-- Show files in a tree.

-- Consistency/code share in files tree view and add dialog tree view.

-- A lot of optimisation for building either files tree view.

-- Optimise changes to the torrent tree view (suspend sorting during).

-- Remember last add destination.

-- Fix a bug causing scrolled window position to be lost during maximise

-from system tray.

-- Experimental GTK3 support (--enable-gtk3).

-- Expand/collapse all, selection based changes for add dialog tree view.

-- Counts for filters.

-- Some update efficiency improvements.

-- Put general panel in a scrolled window.

-- Reorganise/cleanup local preferences dialog.

-- Keyboard accelerators.

-- Use IEC standard for expressing base2 units - KiB not KB etc.

-- Configurable timeout/retries.

-- Add the "turtle" mode icon, which enables alternative speed limits.

-- Remote preferences for configuring a time range for alternative speed

-limits.

-- Lithuanian translation contributed.

-- French translation contributed.

-- Updates for translations from launchpad.net.

-- Priority torrent right click menu.

-

-* Sun Dec 11 2011 0.8

-- Define labels for directories.

-- Use labels in filters.

-- Use labels in destination combo box (add/move).

-- Shorten filters relative to the default download directory.

-- Fix a crash when filtering with selections in the torrent treeview.

-- Speed up filtering.

-- Allow remote preferences variables to be used in actions.

-- Update filters if torrent is moved.

-- Add a man page.

-- Rename "remote commands" feature to "actions".

-- Notifications without a system tray icon.

-- libappindicator support for Ubuntu.

-- Status info in status icon for consistency with libappindicator icon.

-- Builds/runs on GTK3 (without graph/libunique for now).

-- Remember last move destination.

-- Use Win32 mailslots as alternative to libunique.

-- Working debian packaging.

-- Handle URLs/files in first instance.

-- Last scrape time trackers column.

-

-* Tue Oct 11 2011 0.7

-- Remote exec.

-- Win32 Support.

-- Connect button menus for profiles.

-- Fix a memory leak on disconnect.

-- Use icon for wanted/unwanted files.

-- Handle URLs and non-existing files in file handler.

-- IPv6 GeoIP support.

-- Upload files on app open.

-- Display public/private tracker status.

-- Show file icons based on MIME types.

-- Shortern tracker filters.

-- Hide state selector if no error torrents.

-- Fix warning caused by zero length files in torrents.

-- Bencoder crash fix.

-- Detect and drop requests from previous connections.

-- Toolbar tooltips.

-- Spanish translation.

-  

-* Sat Aug 27 2011 0.6

-- Profiles support.

-- New JSON based configuration backend.

-- Support new Transmission torrent status values.

-- Populate destination combo in move dialog.

-- Ukranian translation from ROR191.

-- Lots of new columns and info.

-- More options in view menu.

-- Supports for queues.

-- Improved status bar and add a free space indicator.

-- Persist/restore filter selection, + notebook/selector visibility.

-- Reuse http clients and keep sessions open.

-- Start in tray argument (-m --minimized)

-- Fix timezone display issue.

-- Fix bencoder parser bug (parsing empty lists).

-- Make columns fully shrinkable.

-- Many other fixes/improvements.

-   

-* Fri May 6 2011 - 0.5.1

-- Use libproxy pkg-config CFLAGS in build, for older versions.

-- Fix updates inside the GtkNotebook.

-- Fix crash reported by atommixz.

- 

-* Fri Apr 22 2011 - 0.5

-- Fix a few of small memory leaks.

-- Sync single torrent when file/trackers are changed.

-- Update efficiency improvement.

-- Customisable columns, new optional columns.

-

-* Tue Apr 12 2011 - 0.4

-- Torrent add dialog.

-- Support for active only updates.

-- Other update performance improvements.

-- Pause/Resume all.

-- Polish and Russian translation.

-- Torrent added date/time column.

-- Fix gconf ints defaulting to one in prefs dialog.

-- Fix crash disconnecting with graph disabled.

-- Fix crash disabling tracker/dir filters while disconnected.

-

-* Sat Mar 11 2011 - 0.3

-- Case insensitive text filtering.

-- Speed graph.

-- i18n support (currently German and Korean).

-- Use table layout instead of fixed for general panel.

-- libproxy support.

-- Fix torrent bandwidth priority setting.

-- Better suspending of tracker/files update until ack.

-- Put versions in some spec/configure deps.

-- Include libcurl.m4.

-- Better (easier) FreeBSD compilation.

-- Remove 5px window border (much better on some dark themes).

-- Fix hardcoded path to Transmission icon in about dialog.

-- Fix a leak from gtk_tree_selection_get_selected_rows().

-- TRG_NOUNIQUE env variable to start multiple instances.

-

-* Mon Feb 21 2011 - 0.2.1

-- Fix crash in update-blocklist/port-test callbacks.

-- Menu bar mnemonics.

-

-* Sat Feb 19 2011 - 0.2

-- SSL support.

-- Statistics dialog.

-- Fix for setting low priority files.

-- Port testing.

-- Blocklist settings and updates.

-- Torrent reannounce.

-- Tracker add/edit/delete.

-

-* Mon Feb 07 2011 - 0.1.1

-- Fix some major first release bugs.

-

-* Sun Jan 30 2011 - 0.1.0

-- Hello world.

+* Fri Aug 12 2016 1.3.1
+- Fix build error on 32bit
+- Fix installing appdata file
+- Change line endings to unix for data files
+- Add Simplified Chinese translation
+
+* Thu Aug 11 2016 1.3.0
+- Add more information to general panel
+- Redesign and fix destination combobox
+- Fix building with modern GCC
+- Fix starting minimized
+- Fix various compile warnings
+- Clean up build system
+- Translate desktop and appdata file
+- Update translations
+
+* Wed Jun 11 2014 1.2
+- A basic RSS reader which uses libmrss.
+- Fix some 32bit platforms reporting 0 connected peers and unknown ETA.
+- Resolve some GTK deprecations.
+- Fix a crash in port test callback.
+- Fix decimal marker in status bar version.
+- Support for GeoIPCity.dat.
+- Fix a crash when removing lots of columns (something changed in GTK).
+- Optional and non-default support for validating SSL certs.
+- Remove all GTK2 support.
+- Allow alt-speed limits to override global speed limits in the statusbar
+display.
+
+* Sun Jun 9 2013 1.1.1
+- fix file lists relying on being sorted (sometimes they are not) to fix
+the tree being messed up with duplicate directories.
+- fix using markup in comment.
+- translations updated from launchpad. (NEW: Latvian, Sinhalese)
+
+* Wed Sep 5 2012 1.1
+- new Transmission display style
+- handle downloading metadata state better, don't make incorrect completion
+notifications
+- win32: build reverted to GTK2 because of empty progress bar in GTK3
+- use g_idle_add instead of gdk_thread_enter/leave for reverse DNS
+- fix compilation error for debian
+- issue 210: fix crash when encountering empty benc dict in .torrent
+- fix concurrency issue when populating large files model and changing
+- translation updates from launchpad
+
+* Fri Jun 29 2012 1.0.2
+- win32: update to gtk3 (also fixes blank tray icon)
+- win32: GeoIP support
+- fix minimise to tray
+- fix units in status icon text
+- truncate magnet links in add dialog
+- ctrl+k to focus on search entry like firefox
+- only use libappindicator if using unity
+- use gtk_box_new instead of gtk_{h,v}box_new (deprecated) on gtk3
+- Swedish translation
+- translation updates from launchpad
+- fix 'make test' due to file missing in POTFILES.in
+- update free space (session) after delete
+- URL links in comment field
+- reorder buttons for actions and directories
+
+* Tue Jan 31 2012 1.0.1
+- Fix a crash when toggling turtle mode or setting remote preferences.
+- Update Russian translation.
+
+* Sun Jan 15 2011 1.0
+- Show files in a tree.
+- Consistency/code share in files tree view and add dialog tree view.
+- A lot of optimisation for building either files tree view.
+- Optimise changes to the torrent tree view (suspend sorting during).
+- Remember last add destination.
+- Fix a bug causing scrolled window position to be lost during maximise
+from system tray.
+- Experimental GTK3 support (--enable-gtk3).
+- Expand/collapse all, selection based changes for add dialog tree view.
+- Counts for filters.
+- Some update efficiency improvements.
+- Put general panel in a scrolled window.
+- Reorganise/cleanup local preferences dialog.
+- Keyboard accelerators.
+- Use IEC standard for expressing base2 units - KiB not KB etc.
+- Configurable timeout/retries.
+- Add the "turtle" mode icon, which enables alternative speed limits.
+- Remote preferences for configuring a time range for alternative speed
+limits.
+- Lithuanian translation contributed.
+- French translation contributed.
+- Updates for translations from launchpad.net.
+- Priority torrent right click menu.
+
+* Sun Dec 11 2011 0.8
+- Define labels for directories.
+- Use labels in filters.
+- Use labels in destination combo box (add/move).
+- Shorten filters relative to the default download directory.
+- Fix a crash when filtering with selections in the torrent treeview.
+- Speed up filtering.
+- Allow remote preferences variables to be used in actions.
+- Update filters if torrent is moved.
+- Add a man page.
+- Rename "remote commands" feature to "actions".
+- Notifications without a system tray icon.
+- libappindicator support for Ubuntu.
+- Status info in status icon for consistency with libappindicator icon.
+- Builds/runs on GTK3 (without graph/libunique for now).
+- Remember last move destination.
+- Use Win32 mailslots as alternative to libunique.
+- Working debian packaging.
+- Handle URLs/files in first instance.
+- Last scrape time trackers column.
+
+* Tue Oct 11 2011 0.7
+- Remote exec.
+- Win32 Support.
+- Connect button menus for profiles.
+- Fix a memory leak on disconnect.
+- Use icon for wanted/unwanted files.
+- Handle URLs and non-existing files in file handler.
+- IPv6 GeoIP support.
+- Upload files on app open.
+- Display public/private tracker status.
+- Show file icons based on MIME types.
+- Shortern tracker filters.
+- Hide state selector if no error torrents.
+- Fix warning caused by zero length files in torrents.
+- Bencoder crash fix.
+- Detect and drop requests from previous connections.
+- Toolbar tooltips.
+- Spanish translation.
+  
+* Sat Aug 27 2011 0.6
+- Profiles support.
+- New JSON based configuration backend.
+- Support new Transmission torrent status values.
+- Populate destination combo in move dialog.
+- Ukranian translation from ROR191.
+- Lots of new columns and info.
+- More options in view menu.
+- Supports for queues.
+- Improved status bar and add a free space indicator.
+- Persist/restore filter selection, + notebook/selector visibility.
+- Reuse http clients and keep sessions open.
+- Start in tray argument (-m --minimized)
+- Fix timezone display issue.
+- Fix bencoder parser bug (parsing empty lists).
+- Make columns fully shrinkable.
+- Many other fixes/improvements.
+   
+* Fri May 6 2011 - 0.5.1
+- Use libproxy pkg-config CFLAGS in build, for older versions.
+- Fix updates inside the GtkNotebook.
+- Fix crash reported by atommixz.
+ 
+* Fri Apr 22 2011 - 0.5
+- Fix a few of small memory leaks.
+- Sync single torrent when file/trackers are changed.
+- Update efficiency improvement.
+- Customisable columns, new optional columns.
+
+* Tue Apr 12 2011 - 0.4
+- Torrent add dialog.
+- Support for active only updates.
+- Other update performance improvements.
+- Pause/Resume all.
+- Polish and Russian translation.
+- Torrent added date/time column.
+- Fix gconf ints defaulting to one in prefs dialog.
+- Fix crash disconnecting with graph disabled.
+- Fix crash disabling tracker/dir filters while disconnected.
+
+* Sat Mar 11 2011 - 0.3
+- Case insensitive text filtering.
+- Speed graph.
+- i18n support (currently German and Korean).
+- Use table layout instead of fixed for general panel.
+- libproxy support.
+- Fix torrent bandwidth priority setting.
+- Better suspending of tracker/files update until ack.
+- Put versions in some spec/configure deps.
+- Include libcurl.m4.
+- Better (easier) FreeBSD compilation.
+- Remove 5px window border (much better on some dark themes).
+- Fix hardcoded path to Transmission icon in about dialog.
+- Fix a leak from gtk_tree_selection_get_selected_rows().
+- TRG_NOUNIQUE env variable to start multiple instances.
+
+* Mon Feb 21 2011 - 0.2.1
+- Fix crash in update-blocklist/port-test callbacks.
+- Menu bar mnemonics.
+
+* Sat Feb 19 2011 - 0.2
+- SSL support.
+- Statistics dialog.
+- Fix for setting low priority files.
+- Port testing.
+- Blocklist settings and updates.
+- Torrent reannounce.
+- Tracker add/edit/delete.
+
+* Mon Feb 07 2011 - 0.1.1
+- Fix some major first release bugs.
+
+* Sun Jan 30 2011 - 0.1.0
+- Hello world.
diff --git a/Makefile.am b/Makefile.am
index 137915e..e1d0668 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,8 @@
 
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src po
+DISTCHECK_CONFIGURE_FLAGS = --disable-desktop-database-update
+SUBDIRS = extern src po data
 
 DISTCLEANFILES = \
 	intltool-extract \
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index c8f9ac6..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,835 +0,0 @@
-# Makefile.in generated by automake 1.12.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2012 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# transmission-remote-gtk - A GTK RPC client to Transmission
-# Copyright (C) 2011  Alan Fitton
-
-# 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog compile \
-	config.guess config.sub install-sh ltmain.sh missing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-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 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 uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	cscope distdir dist dist-all distcheck
-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@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GEOIP_LIBS = @GEOIP_LIBS@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALEDIR = @LOCALEDIR@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-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@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-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_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@
-gio_CFLAGS = @gio_CFLAGS@
-gio_LIBS = @gio_LIBS@
-gthread_CFLAGS = @gthread_CFLAGS@
-gthread_LIBS = @gthread_LIBS@
-gtk_CFLAGS = @gtk_CFLAGS@
-gtk_LIBS = @gtk_LIBS@
-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@
-jsonglib_CFLAGS = @jsonglib_CFLAGS@
-jsonglib_LIBS = @jsonglib_LIBS@
-libappindicator_CFLAGS = @libappindicator_CFLAGS@
-libappindicator_LIBS = @libappindicator_LIBS@
-libcurl_CFLAGS = @libcurl_CFLAGS@
-libcurl_LIBS = @libcurl_LIBS@
-libdir = @libdir@
-libexecdir = @libexecdir@
-libproxy_CFLAGS = @libproxy_CFLAGS@
-libproxy_LIBS = @libproxy_LIBS@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-notify_CFLAGS = @notify_CFLAGS@
-notify_LIBS = @notify_LIBS@
-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@
-trglicense = @trglicense@
-unique_CFLAGS = @unique_CFLAGS@
-unique_LIBS = @unique_LIBS@
-ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src po
-DISTCLEANFILES = \
-	intltool-extract \
-	intltool-merge \
-	intltool-update
-
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-am--refresh: Makefile
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign 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
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(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; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
-	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool config.lt
-
-# 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) $(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	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; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(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"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-cscopelist-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
-	done
-
-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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	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 || \
-	      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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(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-recursive cscopelist
-
-cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
-	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 tags
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	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; \
-	  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 -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(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="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	-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 $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r "$(distdir)"
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__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
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__post_remove_distdir)
-
-dist-shar: distdir
-	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
-	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
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	test -d $(distdir)/_build || exit 0; \
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(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 \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@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 config.h
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-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-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-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
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-	cscopelist-recursive ctags-recursive install-am install-strip \
-	tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-cscope \
-	clean-generic clean-libtool cscope cscopelist \
-	cscopelist-recursive ctags ctags-recursive 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-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-pdf install-pdf-am install-ps install-ps-am \
-	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-recursive uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/README b/README
index fdb11d1..968ef4e 100644
--- a/README
+++ b/README
@@ -1,25 +1,25 @@
-ABOUT

-

-  transmission-remote-gtk is a GTK client for remote management of

-  the Transmission BitTorrent client, using its HTTP RPC protocol.

-

-BUILDING

-

-  * To optionally see which country peers are located in,

-    install libgeoip and its headers when building.

-

-  Building a transmission-remote-gtk release from the command line:

-

-    $ tar zxfv transmission-remote-gtk-1.1.1.tar.gz

-    $ cd transmission-remote-gtk-1.1.1

-    $ ./configure

-    $ make

-    # make install

-

-  Building from git clone:

-    

-    $ git clone https://code.google.com/p/transmission-remote-gtk/

-    $ ./autogen.sh

-    $ ./configure

-    $ make

-    # make install

+ABOUT
+
+  transmission-remote-gtk is a GTK client for remote management of
+  the Transmission BitTorrent client, using its HTTP RPC protocol.
+
+BUILDING
+
+  * To optionally see which country peers are located in,
+    install libgeoip and its headers when building.
+
+  Building a transmission-remote-gtk release from the command line:
+
+    $ tar zxfv transmission-remote-gtk-1.2.tar.gz
+    $ cd transmission-remote-gtk-1.2
+    $ ./configure
+    $ make
+    # make install
+
+  Building from git clone:
+    
+    $ git clone https://github.com/transmission-remote-gtk/transmission-remote-gtk.git
+    $ ./autogen.sh
+    $ ./configure
+    $ make
+    # make install
diff --git a/aclocal.m4 b/aclocal.m4
deleted file mode 100644
index 2b4898f..0000000
--- a/aclocal.m4
+++ /dev/null
@@ -1,1110 +0,0 @@
-# generated automatically by aclocal 1.12.2 -*- Autoconf -*-
-
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-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'.])])
-
-# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
-dnl Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_NLS],
-[
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE([nls],
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT([$USE_NLS])
-  AC_SUBST([USE_NLS])
-])
-
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# 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.12'
-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.12.2], [],
-      [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.12.2])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 -*-
-
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# 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.
-
-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-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 10
-
-# 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])])
-
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 17
-
-# 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
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-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])
-])
-
-
-# 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
-])
-
-
-# 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
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # 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
-
-
-# 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"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 19
-
-# 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.
-
-# 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.62])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-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])
-
-# 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.  For more info, see:
-http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation])
-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
-dnl Support for Objective C++ was only introduced in Autoconf 2.65,
-dnl but we still cater to Autoconf 2.62.
-m4_ifdef([AC_PROG_OBJCXX],
-[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
-		  [_AM_DEPENDENCIES([OBJCXX])],
-		  [m4_define([AC_PROG_OBJCXX],
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl
-])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
-  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
-
-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# 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-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# 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-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# 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])])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# 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
-])
-
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != 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
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 7
-
-# 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 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
-AC_REQUIRE_AUX_FILE([missing])dnl
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN(['missing' script is too old or missing])
-fi
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# _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])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 9
-
-# 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
-
-# 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
-     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
-     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
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-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-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# 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 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-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# AM_PROG_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-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _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-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _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}'])
-m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of '-'.
-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])
-    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
-
-m4_include([m4/acinclude.m4])
-m4_include([m4/intltool.m4])
-m4_include([m4/libtool.m4])
-m4_include([m4/ltoptions.m4])
-m4_include([m4/ltsugar.m4])
-m4_include([m4/ltversion.m4])
-m4_include([m4/lt~obsolete.m4])
-m4_include([m4/pkg.m4])
diff --git a/autogen.sh b/autogen.sh
index 5bce9ba..f06f1a6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,1578 +1,27 @@
 #!/bin/sh
-#                        a u t o g e n . s h
-#
-# Copyright (c) 2005-2009 United States Government as represented by
-# the U.S. Army Research Laboratory.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-#
-# 3. The name of the author may not be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-###
-#
-# Script for automatically preparing the sources for compilation by
-# performing the myriad of necessary steps.  The script attempts to
-# detect proper version support, and outputs warnings about particular
-# systems that have autotool peculiarities.
-#
-# Basically, if everything is set up and installed correctly, the
-# script will validate that minimum versions of the GNU Build System
-# tools are installed, account for several common configuration
-# issues, and then simply run autoreconf for you.
-#
-# If autoreconf fails, which can happen for many valid configurations,
-# this script proceeds to run manual preparation steps effectively
-# providing a POSIX shell script (mostly complete) reimplementation of
-# autoreconf.
-#
-# The AUTORECONF, AUTOCONF, AUTOMAKE, LIBTOOLIZE, ACLOCAL, AUTOHEADER
-# environment variables and corresponding _OPTIONS variables (e.g.
-# AUTORECONF_OPTIONS) may be used to override the default automatic
-# detection behaviors.  Similarly the _VERSION variables will override
-# the minimum required version numbers.
-#
-# Examples:
-#
-#   To obtain help on usage:
-#     ./autogen.sh --help
-#
-#   To obtain verbose output:
-#     ./autogen.sh --verbose
-#
-#   To skip autoreconf and prepare manually:
-#     AUTORECONF=false ./autogen.sh
-#
-#   To verbosely try running with an older (unsupported) autoconf:
-#     AUTOCONF_VERSION=2.50 ./autogen.sh --verbose
-#
-# Author:
-#   Christopher Sean Morrison <morrison@brlcad.org>
-#
-# Patches:
-#   Sebastian Pipping <sebastian@pipping.org>
-#
-######################################################################
+# Run this to generate all the initial makefiles, etc.
 
-# set to minimum acceptable version of autoconf
-if [ "x$AUTOCONF_VERSION" = "x" ] ; then
-    AUTOCONF_VERSION=2.52
-fi
-# set to minimum acceptable version of automake
-if [ "x$AUTOMAKE_VERSION" = "x" ] ; then
-    AUTOMAKE_VERSION=1.6.0
-fi
-# set to minimum acceptable version of libtool
-if [ "x$LIBTOOL_VERSION" = "x" ] ; then
-    LIBTOOL_VERSION=1.4.2
-fi
-
-
-##################
-# ident function #
-##################
-ident ( ) {
-    # extract copyright from header
-    __copyright="`grep Copyright $AUTOGEN_SH | head -${HEAD_N}1 | awk '{print $4}'`"
-    if [ "x$__copyright" = "x" ] ; then
-	__copyright="`date +%Y`"
-    fi
-
-    # extract version from CVS Id string
-    __id="$Id: autogen.sh 33925 2009-03-01 23:27:06Z brlcad $"
-    __version="`echo $__id | sed 's/.*\([0-9][0-9][0-9][0-9]\)[-\/]\([0-9][0-9]\)[-\/]\([0-9][0-9]\).*/\1\2\3/'`"
-    if [ "x$__version" = "x" ] ; then
-	__version=""
-    fi
-
-    echo "autogen.sh build preparation script by Christopher Sean Morrison"
-    echo "  + config.guess download patch by Sebastian Pipping (2008-12-03)"
-    echo "revised 3-clause BSD-style license, copyright (c) $__copyright"
-    echo "script version $__version, ISO/IEC 9945 POSIX shell script"
-}
-
-
-##################
-# USAGE FUNCTION #
-##################
-usage ( ) {
-    echo "Usage: $AUTOGEN_SH [-h|--help] [-v|--verbose] [-q|--quiet] [-d|--download] [--version]"
-    echo "    --help      Help on $NAME_OF_AUTOGEN usage"
-    echo "    --verbose   Verbose progress output"
-    echo "    --quiet     Quiet suppressed progress output"
-    echo "    --download  Download the latest config.guess from gnulib"
-    echo "    --version   Only perform GNU Build System version checks"
-    echo
-    echo "Description: This script will validate that minimum versions of the"
-    echo "GNU Build System tools are installed and then run autoreconf for you."
-    echo "Should autoreconf fail, manual preparation steps will be run"
-    echo "potentially accounting for several common preparation issues.  The"
-
-    echo "AUTORECONF, AUTOCONF, AUTOMAKE, LIBTOOLIZE, ACLOCAL, AUTOHEADER,"
-    echo "PROJECT, & CONFIGURE environment variables and corresponding _OPTIONS"
-    echo "variables (e.g. AUTORECONF_OPTIONS) may be used to override the"
-    echo "default automatic detection behavior."
-    echo
-
-    ident
-
-    return 0
-}
-
-
-##########################
-# VERSION_ERROR FUNCTION #
-##########################
-version_error ( ) {
-    if [ "x$1" = "x" ] ; then
-	echo "INTERNAL ERROR: version_error was not provided a version"
-	exit 1
-    fi
-    if [ "x$2" = "x" ] ; then
-	echo "INTERNAL ERROR: version_error was not provided an application name"
-	exit 1
-    fi
-    $ECHO
-    $ECHO "ERROR:  To prepare the ${PROJECT} build system from scratch,"
-    $ECHO "        at least version $1 of $2 must be installed."
-    $ECHO
-    $ECHO "$NAME_OF_AUTOGEN does not need to be run on the same machine that will"
-    $ECHO "run configure or make.  Either the GNU Autotools will need to be installed"
-    $ECHO "or upgraded on this system, or $NAME_OF_AUTOGEN must be run on the source"
-    $ECHO "code on another system and then transferred to here. -- Cheers!"
-    $ECHO
-}
-
-##########################
-# VERSION_CHECK FUNCTION #
-##########################
-version_check ( ) {
-    if [ "x$1" = "x" ] ; then
-	echo "INTERNAL ERROR: version_check was not provided a minimum version"
-	exit 1
-    fi
-    _min="$1"
-    if [ "x$2" = "x" ] ; then
-	echo "INTERNAL ERROR: version check was not provided a comparison version"
-	exit 1
-    fi
-    _cur="$2"
-
-    # needed to handle versions like 1.10 and 1.4-p6
-    _min="`echo ${_min}. | sed 's/[^0-9]/./g' | sed 's/\.\././g'`"
-    _cur="`echo ${_cur}. | sed 's/[^0-9]/./g' | sed 's/\.\././g'`"
-
-    _min_major="`echo $_min | cut -d. -f1`"
-    _min_minor="`echo $_min | cut -d. -f2`"
-    _min_patch="`echo $_min | cut -d. -f3`"
-
-    _cur_major="`echo $_cur | cut -d. -f1`"
-    _cur_minor="`echo $_cur | cut -d. -f2`"
-    _cur_patch="`echo $_cur | cut -d. -f3`"
-
-    if [ "x$_min_major" = "x" ] ; then
-	_min_major=0
-    fi
-    if [ "x$_min_minor" = "x" ] ; then
-	_min_minor=0
-    fi
-    if [ "x$_min_patch" = "x" ] ; then
-	_min_patch=0
-    fi
-    if [ "x$_cur_minor" = "x" ] ; then
-	_cur_major=0
-    fi
-    if [ "x$_cur_minor" = "x" ] ; then
-	_cur_minor=0
-    fi
-    if [ "x$_cur_patch" = "x" ] ; then
-	_cur_patch=0
-    fi
-
-    $VERBOSE_ECHO "Checking if ${_cur_major}.${_cur_minor}.${_cur_patch} is greater than ${_min_major}.${_min_minor}.${_min_patch}"
-
-    if [ $_min_major -lt $_cur_major ] ; then
-	return 0
-    elif [ $_min_major -eq $_cur_major ] ; then
-	if [ $_min_minor -lt $_cur_minor ] ; then
-	    return 0
-	elif [ $_min_minor -eq $_cur_minor ] ; then
-	    if [ $_min_patch -lt $_cur_patch ] ; then
-		return 0
-	    elif [ $_min_patch -eq $_cur_patch ] ; then
-		return 0
-	    fi
-	fi
-    fi
-    return 1
-}
-
-
-######################################
-# LOCATE_CONFIGURE_TEMPLATE FUNCTION #
-######################################
-locate_configure_template ( ) {
-    _pwd="`pwd`"
-    if test -f "./configure.ac" ; then
-	echo "./configure.ac"
-    elif test -f "./configure.in" ; then
-	echo "./configure.in"
-    elif test -f "$_pwd/configure.ac" ; then
-	echo "$_pwd/configure.ac"
-    elif test -f "$_pwd/configure.in" ; then
-	echo "$_pwd/configure.in"
-    elif test -f "$PATH_TO_AUTOGEN/configure.ac" ; then
-	echo "$PATH_TO_AUTOGEN/configure.ac"
-    elif test -f "$PATH_TO_AUTOGEN/configure.in" ; then
-	echo "$PATH_TO_AUTOGEN/configure.in"
-    fi
-}
-
-
-##################
-# argument check #
-##################
-ARGS="$*"
-PATH_TO_AUTOGEN="`dirname $0`"
-NAME_OF_AUTOGEN="`basename $0`"
-AUTOGEN_SH="$PATH_TO_AUTOGEN/$NAME_OF_AUTOGEN"
-
-LIBTOOL_M4="${PATH_TO_AUTOGEN}/misc/libtool.m4"
-
-if [ "x$HELP" = "x" ] ; then
-    HELP=no
-fi
-if [ "x$QUIET" = "x" ] ; then
-    QUIET=no
-fi
-if [ "x$VERBOSE" = "x" ] ; then
-    VERBOSE=no
-fi
-if [ "x$VERSION_ONLY" = "x" ] ; then
-    VERSION_ONLY=no
-fi
-if [ "x$DOWNLOAD" = "x" ] ; then
-    DOWNLOAD=no
-fi
-if [ "x$AUTORECONF_OPTIONS" = "x" ] ; then
-    AUTORECONF_OPTIONS="-i -f"
-fi
-if [ "x$AUTOCONF_OPTIONS" = "x" ] ; then
-    AUTOCONF_OPTIONS="-f"
-fi
-if [ "x$AUTOMAKE_OPTIONS" = "x" ] ; then
-    AUTOMAKE_OPTIONS="-a -c -f"
-fi
-ALT_AUTOMAKE_OPTIONS="-a -c"
-if [ "x$LIBTOOLIZE_OPTIONS" = "x" ] ; then
-    LIBTOOLIZE_OPTIONS="--automake -c -f"
-fi
-ALT_LIBTOOLIZE_OPTIONS="--automake --copy --force"
-if [ "x$ACLOCAL_OPTIONS" = "x" ] ; then
-    ACLOCAL_OPTIONS=""
-fi
-if [ "x$AUTOHEADER_OPTIONS" = "x" ] ; then
-    AUTOHEADER_OPTIONS=""
-fi
-if [ "x$CONFIG_GUESS_URL" = "x" ] ; then
-    CONFIG_GUESS_URL="http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=build-aux/config.guess;hb=HEAD"
-fi
-for arg in $ARGS ; do
-    case "x$arg" in
-	x--help) HELP=yes ;;
-	x-[hH]) HELP=yes ;;
-	x--quiet) QUIET=yes ;;
-	x-[qQ]) QUIET=yes ;;
-	x--verbose) VERBOSE=yes ;;
-	x-[dD]) DOWNLOAD=yes ;;
-	x--download) DOWNLOAD=yes ;;
-	x-[vV]) VERBOSE=yes ;;
-	x--version) VERSION_ONLY=yes ;;
-	*)
-	    echo "Unknown option: $arg"
-	    echo
-	    usage
-	    exit 1
-	    ;;
-    esac
-done
-
-
-#####################
-# environment check #
-#####################
-
-# sanity check before recursions potentially begin
-if [ ! -f "$AUTOGEN_SH" ] ; then
-    echo "INTERNAL ERROR: $AUTOGEN_SH does not exist"
-    if [ ! "x$0" = "x$AUTOGEN_SH" ] ; then
-	echo "INTERNAL ERROR: dirname/basename inconsistency: $0 != $AUTOGEN_SH"
-    fi
-    exit 1
-fi
-
-# force locale setting to C so things like date output as expected
-LC_ALL=C
-
-# commands that this script expects
-for __cmd in echo head tail pwd ; do
-    echo "test" | $__cmd > /dev/null 2>&1
-    if [ $? != 0 ] ; then
-	echo "INTERNAL ERROR: '${__cmd}' command is required"
-	exit 2
-    fi
-done
-echo "test" | grep "test" > /dev/null 2>&1
-if test ! x$? = x0 ; then
-    echo "INTERNAL ERROR: grep command is required"
-    exit 1
-fi
-echo "test" | sed "s/test/test/" > /dev/null 2>&1
-if test ! x$? = x0 ; then
-    echo "INTERNAL ERROR: sed command is required"
-    exit 1
-fi
-
-
-# determine the behavior of echo
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-    *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-    *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-    *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-# determine the behavior of head
-case "x`echo 'head' | head -n 1 2>&1`" in
-    *xhead*) HEAD_N="n " ;;
-    *) HEAD_N="" ;;
-esac
-
-# determine the behavior of tail
-case "x`echo 'tail' | tail -n 1 2>&1`" in
-    *xtail*) TAIL_N="n " ;;
-    *) TAIL_N="" ;;
-esac
-
-VERBOSE_ECHO=:
-ECHO=:
-if [ "x$QUIET" = "xyes" ] ; then
-    if [ "x$VERBOSE" = "xyes" ] ; then
-	echo "Verbose output quelled by quiet option.  Further output disabled."
-    fi
-else
-    ECHO=echo
-    if [ "x$VERBOSE" = "xyes" ] ; then
-	echo "Verbose output enabled"
-	VERBOSE_ECHO=echo
-    fi
-fi
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
 
-
-# allow a recursive run to disable further recursions
-if [ "x$RUN_RECURSIVE" = "x" ] ; then
-    RUN_RECURSIVE=yes
-fi
-
-
-################################################
-# check for help arg and bypass version checks #
-################################################
-if [ "x`echo $ARGS | sed 's/.*[hH][eE][lL][pP].*/help/'`" = "xhelp" ] ; then
-    HELP=yes
-fi
-if [ "x$HELP" = "xyes" ] ; then
-    usage
-    $ECHO "---"
-    $ECHO "Help was requested.  No preparation or configuration will be performed."
-    exit 0
-fi
-
-
-#######################
-# set up signal traps #
-#######################
-untrap_abnormal ( ) {
-    for sig in 1 2 13 15; do
-	trap - $sig
-    done
-}
-
-# do this cleanup whenever we exit.
-trap '
-    # start from the root
-    if test -d "$START_PATH" ; then
-	cd "$START_PATH"
-    fi
-
-    # restore/delete backup files
-    if test "x$PFC_INIT" = "x1" ; then
-	recursive_restore
-    fi
-' 0
-
-# trap SIGHUP (1), SIGINT (2), SIGPIPE (13), SIGTERM (15)
-for sig in 1 2 13 15; do
-    trap '
-	$ECHO ""
-	$ECHO "Aborting $NAME_OF_AUTOGEN: caught signal '$sig'"
-
-	# start from the root
-	if test -d "$START_PATH" ; then
-	    cd "$START_PATH"
-	fi
-
-	# clean up on abnormal exit
-	$VERBOSE_ECHO "rm -rf autom4te.cache"
-	rm -rf autom4te.cache
-
-	if test -f "acinclude.m4.$$.backup" ; then
-	    $VERBOSE_ECHO "cat acinclude.m4.$$.backup > acinclude.m4"
-	    chmod u+w acinclude.m4
-	    cat acinclude.m4.$$.backup > acinclude.m4
-
-	    $VERBOSE_ECHO "rm -f acinclude.m4.$$.backup"
-	    rm -f acinclude.m4.$$.backup
-        fi
-
-	{ (exit 1); exit 1; }
-' $sig
-done
-
-
-#############################
-# look for a configure file #
-#############################
-if [ "x$CONFIGURE" = "x" ] ; then
-    CONFIGURE="`locate_configure_template`"
-    if [ ! "x$CONFIGURE" = "x" ] ; then
-	$VERBOSE_ECHO "Found a configure template: $CONFIGURE"
-    fi
-else
-    $ECHO "Using CONFIGURE environment variable override: $CONFIGURE"
-fi
-if [ "x$CONFIGURE" = "x" ] ; then
-    if [ "x$VERSION_ONLY" = "xyes" ] ; then
-	CONFIGURE=/dev/null
-    else
-	$ECHO
-	$ECHO "A configure.ac or configure.in file could not be located implying"
-	$ECHO "that the GNU Build System is at least not used in this directory.  In"
-	$ECHO "any case, there is nothing to do here without one of those files."
-	$ECHO
-	$ECHO "ERROR: No configure.in or configure.ac file found in `pwd`"
+(test -f $srcdir/configure.ac) || {
+	echo -n "**Error**: Directory "\`$srcdir\'" does not look like the top-level directory"
 	exit 1
-    fi
-fi
-
-####################
-# get project name #
-####################
-if [ "x$PROJECT" = "x" ] ; then
-    PROJECT="`grep AC_INIT $CONFIGURE | grep -v '.*#.*AC_INIT' | tail -${TAIL_N}1 | sed 's/^[ 	]*AC_INIT(\([^,)]*\).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
-    if [ "x$PROJECT" = "xAC_INIT" ] ; then
-	# projects might be using the older/deprecated arg-less AC_INIT .. look for AM_INIT_AUTOMAKE instead
-	PROJECT="`grep AM_INIT_AUTOMAKE $CONFIGURE | grep -v '.*#.*AM_INIT_AUTOMAKE' | tail -${TAIL_N}1 | sed 's/^[ 	]*AM_INIT_AUTOMAKE(\([^,)]*\).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
-    fi
-    if [ "x$PROJECT" = "xAM_INIT_AUTOMAKE" ] ; then
-	PROJECT="project"
-    fi
-    if [ "x$PROJECT" = "x" ] ; then
-	PROJECT="project"
-    fi
-else
-    $ECHO "Using PROJECT environment variable override: $PROJECT"
-fi
-$ECHO "Preparing the $PROJECT build system...please wait"
-$ECHO
-
-
-########################
-# check for autoreconf #
-########################
-HAVE_AUTORECONF=no
-if [ "x$AUTORECONF" = "x" ] ; then
-    for AUTORECONF in autoreconf ; do
-	$VERBOSE_ECHO "Checking autoreconf version: $AUTORECONF --version"
-	$AUTORECONF --version > /dev/null 2>&1
-	if [ $? = 0 ] ; then
-	    HAVE_AUTORECONF=yes
-	    break
-	fi
-    done
-else
-    HAVE_AUTORECONF=yes
-    $ECHO "Using AUTORECONF environment variable override: $AUTORECONF"
-fi
-
-
-##########################
-# autoconf version check #
-##########################
-_acfound=no
-if [ "x$AUTOCONF" = "x" ] ; then
-    for AUTOCONF in autoconf ; do
-	$VERBOSE_ECHO "Checking autoconf version: $AUTOCONF --version"
-	$AUTOCONF --version > /dev/null 2>&1
-	if [ $? = 0 ] ; then
-	    _acfound=yes
-	    break
-	fi
-    done
-else
-    _acfound=yes
-    $ECHO "Using AUTOCONF environment variable override: $AUTOCONF"
-fi
-
-_report_error=no
-if [ ! "x$_acfound" = "xyes" ] ; then
-    $ECHO "ERROR:  Unable to locate GNU Autoconf."
-    _report_error=yes
-else
-    _version="`$AUTOCONF --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`"
-    if [ "x$_version" = "x" ] ; then
-	_version="0.0.0"
-    fi
-    $ECHO "Found GNU Autoconf version $_version"
-    version_check "$AUTOCONF_VERSION" "$_version"
-    if [ $? -ne 0 ] ; then
-	_report_error=yes
-    fi
-fi
-if [ "x$_report_error" = "xyes" ] ; then
-    version_error "$AUTOCONF_VERSION" "GNU Autoconf"
-    exit 1
-fi
-
-
-##########################
-# automake version check #
-##########################
-_amfound=no
-if [ "x$AUTOMAKE" = "x" ] ; then
-    for AUTOMAKE in automake ; do
-	$VERBOSE_ECHO "Checking automake version: $AUTOMAKE --version"
-	$AUTOMAKE --version > /dev/null 2>&1
-	if [ $? = 0 ] ; then
-	    _amfound=yes
-	    break
-	fi
-    done
-else
-    _amfound=yes
-    $ECHO "Using AUTOMAKE environment variable override: $AUTOMAKE"
-fi
-
-
-_report_error=no
-if [ ! "x$_amfound" = "xyes" ] ; then
-    $ECHO
-    $ECHO "ERROR: Unable to locate GNU Automake."
-    _report_error=yes
-else
-    _version="`$AUTOMAKE --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`"
-    if [ "x$_version" = "x" ] ; then
-	_version="0.0.0"
-    fi
-    $ECHO "Found GNU Automake version $_version"
-    version_check "$AUTOMAKE_VERSION" "$_version"
-    if [ $? -ne 0 ] ; then
-	_report_error=yes
-    fi
-fi
-if [ "x$_report_error" = "xyes" ] ; then
-    version_error "$AUTOMAKE_VERSION" "GNU Automake"
-    exit 1
-fi
-
-
-########################
-# check for libtoolize #
-########################
-HAVE_LIBTOOLIZE=yes
-HAVE_ALT_LIBTOOLIZE=no
-_ltfound=no
-if [ "x$LIBTOOLIZE" = "x" ] ; then
-    LIBTOOLIZE=libtoolize
-    $VERBOSE_ECHO "Checking libtoolize version: $LIBTOOLIZE --version"
-    $LIBTOOLIZE --version > /dev/null 2>&1
-    if [ ! $? = 0 ] ; then
-	HAVE_LIBTOOLIZE=no
-	$ECHO
-	if [ "x$HAVE_AUTORECONF" = "xno" ] ; then
-	    $ECHO "Warning:  libtoolize does not appear to be available."
-	else
-	    $ECHO "Warning:  libtoolize does not appear to be available.  This means that"
-	    $ECHO "the automatic build preparation via autoreconf will probably not work."
-	    $ECHO "Preparing the build by running each step individually, however, should"
-	    $ECHO "work and will be done automatically for you if autoreconf fails."
-	fi
-
-	# look for some alternates
-	for tool in glibtoolize libtoolize15 libtoolize14 libtoolize13 ; do
-	    $VERBOSE_ECHO "Checking libtoolize alternate: $tool --version"
-	    _glibtoolize="`$tool --version > /dev/null 2>&1`"
-	    if [ $? = 0 ] ; then
-		$VERBOSE_ECHO "Found $tool --version"
-		_glti="`which $tool`"
-		if [ "x$_glti" = "x" ] ; then
-		    $VERBOSE_ECHO "Cannot find $tool with which"
-		    continue;
-		fi
-		if test ! -f "$_glti" ; then
-		    $VERBOSE_ECHO "Cannot use $tool, $_glti is not a file"
-		    continue;
-		fi
-		_gltidir="`dirname $_glti`"
-		if [ "x$_gltidir" = "x" ] ; then
-		    $VERBOSE_ECHO "Cannot find $tool path with dirname of $_glti"
-		    continue;
-		fi
-		if test ! -d "$_gltidir" ; then
-		    $VERBOSE_ECHO "Cannot use $tool, $_gltidir is not a directory"
-		    continue;
-		fi
-		HAVE_ALT_LIBTOOLIZE=yes
-		LIBTOOLIZE="$tool"
-		$ECHO
-		$ECHO "Fortunately, $tool was found which means that your system may simply"
-		$ECHO "have a non-standard or incomplete GNU Autotools install.  If you have"
-		$ECHO "sufficient system access, it may be possible to quell this warning by"
-		$ECHO "running:"
-		$ECHO
-		sudo -V > /dev/null 2>&1
-		if [ $? = 0 ] ; then
-		    $ECHO "   sudo ln -s $_glti $_gltidir/libtoolize"
-		    $ECHO
-		else
-		    $ECHO "   ln -s $_glti $_gltidir/libtoolize"
-		    $ECHO
-		    $ECHO "Run that as root or with proper permissions to the $_gltidir directory"
-		    $ECHO
-		fi
-		_ltfound=yes
-		break
-	    fi
-	done
-    else
-	_ltfound=yes
-    fi
-else
-    _ltfound=yes
-    $ECHO "Using LIBTOOLIZE environment variable override: $LIBTOOLIZE"
-fi
-
-
-############################
-# libtoolize version check #
-############################
-_report_error=no
-if [ ! "x$_ltfound" = "xyes" ] ; then
-    $ECHO
-    $ECHO "ERROR: Unable to locate GNU Libtool."
-    _report_error=yes
-else
-    _version="`$LIBTOOLIZE --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`"
-    if [ "x$_version" = "x" ] ; then
-	_version="0.0.0"
-    fi
-    $ECHO "Found GNU Libtool version $_version"
-    version_check "$LIBTOOL_VERSION" "$_version"
-    if [ $? -ne 0 ] ; then
-	_report_error=yes
-    fi
-fi
-if [ "x$_report_error" = "xyes" ] ; then
-    version_error "$LIBTOOL_VERSION" "GNU Libtool"
-    exit 1
-fi
-
-
-#####################
-# check for aclocal #
-#####################
-if [ "x$ACLOCAL" = "x" ] ; then
-    for ACLOCAL in aclocal ; do
-	$VERBOSE_ECHO "Checking aclocal version: $ACLOCAL --version"
-	$ACLOCAL --version > /dev/null 2>&1
-	if [ $? = 0 ] ; then
-	    break
-	fi
-    done
-else
-    $ECHO "Using ACLOCAL environment variable override: $ACLOCAL"
-fi
-
-
-########################
-# check for autoheader #
-########################
-if [ "x$AUTOHEADER" = "x" ] ; then
-    for AUTOHEADER in autoheader ; do
-	$VERBOSE_ECHO "Checking autoheader version: $AUTOHEADER --version"
-	$AUTOHEADER --version > /dev/null 2>&1
-	if [ $? = 0 ] ; then
-	    break
-	fi
-    done
-else
-    $ECHO "Using AUTOHEADER environment variable override: $AUTOHEADER"
-fi
-
-
-#########################
-# check if version only #
-#########################
-$VERBOSE_ECHO "Checking whether to only output version information"
-if [ "x$VERSION_ONLY" = "xyes" ] ; then
-    $ECHO
-    ident
-    $ECHO "---"
-    $ECHO "Version requested.  No preparation or configuration will be performed."
-    exit 0
-fi
-
-
-#################################
-# PROTECT_FROM_CLOBBER FUNCTION #
-#################################
-protect_from_clobber ( ) {
-    PFC_INIT=1
-
-    # protect COPYING & INSTALL from overwrite by automake.  the
-    # automake force option will (inappropriately) ignore the existing
-    # contents of a COPYING and/or INSTALL files (depending on the
-    # version) instead of just forcing *missing* files like it does
-    # for AUTHORS, NEWS, and README. this is broken but extremely
-    # prevalent behavior, so we protect against it by keeping a backup
-    # of the file that can later be restored.
-
-    for file in COPYING INSTALL ; do
-	if test -f ${file} ; then
-	    if test -f ${file}.$$.protect_from_automake.backup ; then
-		$VERBOSE_ECHO "Already backed up ${file} in `pwd`"
-	    else
-		$VERBOSE_ECHO "Backing up ${file} in `pwd`"
-		$VERBOSE_ECHO "cp -p ${file} ${file}.$$.protect_from_automake.backup"
-		cp -p ${file} ${file}.$$.protect_from_automake.backup
-	    fi
-	fi
-    done
 }
 
+aclocal --install -I m4 || exit 1
+libtoolize --quiet --copy || exit 1
+intltoolize --copy --automake || exit 1
+autoreconf --install -Wno-portability || exit 1
 
-##############################
-# RECURSIVE_PROTECT FUNCTION #
-##############################
-recursive_protect ( ) {
-
-    # for projects using recursive configure, run the build
-    # preparation steps for the subdirectories.  this function assumes
-    # START_PATH was set to pwd before recursion begins so that
-    # relative paths work.
-
-    # git 'r done, protect COPYING and INSTALL from being clobbered
-    protect_from_clobber
-
-    if test -d autom4te.cache ; then
-	$VERBOSE_ECHO "Found an autom4te.cache directory, deleting it"
-	$VERBOSE_ECHO "rm -rf autom4te.cache"
-	rm -rf autom4te.cache
-    fi
-
-    # find configure template
-    _configure="`locate_configure_template`"
-    if [ "x$_configure" = "x" ] ; then
-	return
-    fi
-    # $VERBOSE_ECHO "Looking for configure template found `pwd`/$_configure"
-
-    # look for subdirs
-    # $VERBOSE_ECHO "Looking for subdirs in `pwd`"
-    _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $_configure | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ 	]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
-    CHECK_DIRS=""
-    for dir in $_det_config_subdirs ; do
-	if test -d "`pwd`/$dir" ; then
-	    CHECK_DIRS="$CHECK_DIRS \"`pwd`/$dir\""
-	fi
-    done
-
-    # process subdirs
-    if [ ! "x$CHECK_DIRS" = "x" ] ; then
-	$VERBOSE_ECHO "Recursively scanning the following directories:"
-	$VERBOSE_ECHO "  $CHECK_DIRS"
-	for dir in $CHECK_DIRS ; do
-	    $VERBOSE_ECHO "Protecting files from automake in $dir"
-	    cd "$START_PATH"
-	    eval "cd $dir"
-
-	    # recursively git 'r done
-	    recursive_protect
-	done
-    fi
-} # end of recursive_protect
-
-
-#############################
-# RESTORE_CLOBBERED FUNCION #
-#############################
-restore_clobbered ( ) {
-
-    # The automake (and autoreconf by extension) -f/--force-missing
-    # option may overwrite COPYING and INSTALL even if they do exist.
-    # Here we restore the files if necessary.
-
-    spacer=no
-
-    for file in COPYING INSTALL ; do
-	if test -f ${file}.$$.protect_from_automake.backup ; then
-	    if test -f ${file} ; then
-	    # compare entire content, restore if needed
-	    if test "x`cat ${file}`" != "x`cat ${file}.$$.protect_from_automake.backup`" ; then
-		if test "x$spacer" = "xno" ; then
-		    $VERBOSE_ECHO
-		    spacer=yes
-		fi
-		# restore the backup
-		$VERBOSE_ECHO "Restoring ${file} from backup (automake -f likely clobbered it)"
-		$VERBOSE_ECHO "rm -f ${file}"
-		rm -f ${file}
-		$VERBOSE_ECHO "mv ${file}.$$.protect_from_automake.backup ${file}"
-		mv ${file}.$$.protect_from_automake.backup ${file}
-	    fi # check contents
-	    elif test -f ${file}.$$.protect_from_automake.backup ; then
-		$VERBOSE_ECHO "mv ${file}.$$.protect_from_automake.backup ${file}"
-		mv ${file}.$$.protect_from_automake.backup ${file}
-	    fi # -f ${file}
-	
-	    # just in case
-	    $VERBOSE_ECHO "rm -f ${file}.$$.protect_from_automake.backup"
-	    rm -f ${file}.$$.protect_from_automake.backup
-	fi # -f ${file}.$$.protect_from_automake.backup
-    done
-
-    CONFIGURE="`locate_configure_template`"
-    if [ "x$CONFIGURE" = "x" ] ; then
-	return
-    fi
-
-    _aux_dir="`grep AC_CONFIG_AUX_DIR $CONFIGURE | grep -v '.*#.*AC_CONFIG_AUX_DIR' | tail -${TAIL_N}1 | sed 's/^[ 	]*AC_CONFIG_AUX_DIR(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
-    if test ! -d "$_aux_dir" ; then
-	_aux_dir=.
-    fi
-
-    for file in config.guess config.sub ltmain.sh ; do
-	if test -f "${_aux_dir}/${file}" ; then
-	    $VERBOSE_ECHO "rm -f \"${_aux_dir}/${file}.backup\""
-	    rm -f "${_aux_dir}/${file}.backup"
-	fi
-    done
-} # end of restore_clobbered
-
-
-##############################
-# RECURSIVE_RESTORE FUNCTION #
-##############################
-recursive_restore ( ) {
-
-    # restore COPYING and INSTALL from backup if they were clobbered
-    # for each directory recursively.
-
-    # git 'r undone
-    restore_clobbered
-
-    # find configure template
-    _configure="`locate_configure_template`"
-    if [ "x$_configure" = "x" ] ; then
-	return
-    fi
-
-    # look for subdirs
-    _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $_configure | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ 	]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
-    CHECK_DIRS=""
-    for dir in $_det_config_subdirs ; do
-	if test -d "`pwd`/$dir" ; then
-	    CHECK_DIRS="$CHECK_DIRS \"`pwd`/$dir\""
-	fi
-    done
-
-    # process subdirs
-    if [ ! "x$CHECK_DIRS" = "x" ] ; then
-	$VERBOSE_ECHO "Recursively scanning the following directories:"
-	$VERBOSE_ECHO "  $CHECK_DIRS"
-	for dir in $CHECK_DIRS ; do
-	    $VERBOSE_ECHO "Checking files for automake damage in $dir"
-	    cd "$START_PATH"
-	    eval "cd $dir"
-
-	    # recursively git 'r undone
-	    recursive_restore
-	done
-    fi
-} # end of recursive_restore
+if [ "$NOCONFIGURE" = "" ]; then
+        $srcdir/configure "$@" || exit 1
 
-
-#######################
-# INITIALIZE FUNCTION #
-#######################
-initialize ( ) {
-
-    # this routine performs a variety of directory-specific
-    # initializations.  some are sanity checks, some are preventive,
-    # and some are necessary setup detection.
-    #
-    # this function sets:
-    #   CONFIGURE
-    #   SEARCH_DIRS
-    #   CONFIG_SUBDIRS
-
-    ##################################
-    # check for a configure template #
-    ##################################
-    CONFIGURE="`locate_configure_template`"
-    if [ "x$CONFIGURE" = "x" ] ; then
-	$ECHO
-	$ECHO "A configure.ac or configure.in file could not be located implying"
-	$ECHO "that the GNU Build System is at least not used in this directory.  In"
-	$ECHO "any case, there is nothing to do here without one of those files."
-	$ECHO
-	$ECHO "ERROR: No configure.in or configure.ac file found in `pwd`"
-	exit 1
-    fi
-
-    #####################
-    # detect an aux dir #
-    #####################
-    _aux_dir="`grep AC_CONFIG_AUX_DIR $CONFIGURE | grep -v '.*#.*AC_CONFIG_AUX_DIR' | tail -${TAIL_N}1 | sed 's/^[ 	]*AC_CONFIG_AUX_DIR(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
-    if test ! -d "$_aux_dir" ; then
-	_aux_dir=.
-    else
-	$VERBOSE_ECHO "Detected auxillary directory: $_aux_dir"
-    fi
-
-    ################################
-    # detect a recursive configure #
-    ################################
-    CONFIG_SUBDIRS=""
-    _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $CONFIGURE | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ 	]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`"
-    for dir in $_det_config_subdirs ; do
-	if test -d "`pwd`/$dir" ; then
-	    $VERBOSE_ECHO "Detected recursive configure directory: `pwd`/$dir"
-	    CONFIG_SUBDIRS="$CONFIG_SUBDIRS `pwd`/$dir"
-	fi
-    done
-
-    ###########################################################
-    # make sure certain required files exist for GNU projects #
-    ###########################################################
-    _marker_found=""
-    _marker_found_message_intro='Detected non-GNU marker "'
-    _marker_found_message_mid='" in '
-    for marker in foreign cygnus ; do
-	_marker_found_message=${_marker_found_message_intro}${marker}${_marker_found_message_mid}
-	_marker_found="`grep 'AM_INIT_AUTOMAKE.*'${marker} $CONFIGURE`"
-	if [ ! "x$_marker_found" = "x" ] ; then
-	    $VERBOSE_ECHO "${_marker_found_message}`basename \"$CONFIGURE\"`"
-	    break
-	fi
-	if test -f "`dirname \"$CONFIGURE\"/Makefile.am`" ; then
-	    _marker_found="`grep 'AUTOMAKE_OPTIONS.*'${marker} Makefile.am`"
-	    if [ ! "x$_marker_found" = "x" ] ; then
-		$VERBOSE_ECHO "${_marker_found_message}Makefile.am"
-		break
-	    fi
-	fi
-    done
-    if [ "x${_marker_found}" = "x" ] ; then
-	_suggest_foreign=no
-	for file in AUTHORS COPYING ChangeLog INSTALL NEWS README ; do
-	    if [ ! -f $file ] ; then
-		$VERBOSE_ECHO "Touching ${file} since it does not exist"
-		_suggest_foreign=yes
-		touch $file
-	    fi
-	done
-
-	if [ "x${_suggest_foreign}" = "xyes" ] ; then
-	    $ECHO
-	    $ECHO "Warning: Several files expected of projects that conform to the GNU"
-	    $ECHO "coding standards were not found.  The files were automatically added"
-	    $ECHO "for you since you do not have a 'foreign' declaration specified."
-	    $ECHO
-	    $ECHO "Considered adding 'foreign' to AM_INIT_AUTOMAKE in `basename \"$CONFIGURE\"`"
-	    if test -f "`dirname \"$CONFIGURE\"/Makefile.am`" ; then
-		$ECHO "or to AUTOMAKE_OPTIONS in your top-level Makefile.am file."
-	    fi
-	    $ECHO
-	fi
-    fi
-
-    ##################################################
-    # make sure certain generated files do not exist #
-    ##################################################
-    for file in config.guess config.sub ltmain.sh ; do
-	if test -f "${_aux_dir}/${file}" ; then
-	    $VERBOSE_ECHO "mv -f \"${_aux_dir}/${file}\" \"${_aux_dir}/${file}.backup\""
-	    mv -f "${_aux_dir}/${file}" "${_aux_dir}/${file}.backup"
-	fi
-    done
-
-    ############################
-    # search alternate m4 dirs #
-    ############################
-    SEARCH_DIRS=""
-    for dir in m4 ; do
-	if [ -d $dir ] ; then
-	    $VERBOSE_ECHO "Found extra aclocal search directory: $dir"
-	    SEARCH_DIRS="$SEARCH_DIRS -I $dir"
-	fi
-    done
-
-    ######################################
-    # remove any previous build products #
-    ######################################
-    if test -d autom4te.cache ; then
-	$VERBOSE_ECHO "Found an autom4te.cache directory, deleting it"
-	$VERBOSE_ECHO "rm -rf autom4te.cache"
-	rm -rf autom4te.cache
-    fi
-# tcl/tk (and probably others) have a customized aclocal.m4, so can't delete it
-#     if test -f aclocal.m4 ; then
-# 	$VERBOSE_ECHO "Found an aclocal.m4 file, deleting it"
-# 	$VERBOSE_ECHO "rm -f aclocal.m4"
-# 	rm -f aclocal.m4
-#     fi
-
-} # end of initialize()
-
-
-##############
-# initialize #
-##############
-
-# stash path
-START_PATH="`pwd`"
-
-# Before running autoreconf or manual steps, some prep detection work
-# is necessary or useful.  Only needs to occur once per directory, but
-# does need to traverse the entire subconfigure hierarchy to protect
-# files from being clobbered even by autoreconf.
-recursive_protect
-
-# start from where we started
-cd "$START_PATH"
-
-# get ready to process
-initialize
-
-
-#########################################
-# DOWNLOAD_GNULIB_CONFIG_GUESS FUNCTION #
-#########################################
-
-# TODO - should make sure wget/curl exist and/or work before trying to
-# use them.
-
-download_gnulib_config_guess () {
-    # abuse gitweb to download gnulib's latest config.guess via HTTP
-    config_guess_temp="config.guess.$$.download"
-    ret=1
-    for __cmd in wget curl fetch ; do
-	$VERBOSE_ECHO "Checking for command ${__cmd}"
-	${__cmd} --version > /dev/null 2>&1
-	ret=$?
-	if [ ! $ret = 0 ] ; then
-	    continue
+        if [ "$1" = "--help" ]; then exit 0 else
+                echo "Now type \`make\' to compile" || exit 1
         fi
-
-	__cmd_version=`${__cmd} --version | head -n 1 | sed -e 's/^[^0-9]\+//' -e 's/ .*//'`
-	$VERBOSE_ECHO "Found ${__cmd} ${__cmd_version}"
-
-	opts=""
-	case ${__cmd} in
-	    wget)
-		opts="-O" 
-		;;
-	    curl)
-		opts="-o"
-		;;
-	    fetch)
-		opts="-t 5 -f"
-		;;
-	esac
-
-	$VERBOSE_ECHO "Running $__cmd \"${CONFIG_GUESS_URL}\" $opts \"${config_guess_temp}\""
-	eval "$__cmd \"${CONFIG_GUESS_URL}\" $opts \"${config_guess_temp}\"" > /dev/null 2>&1
-	if [ $? = 0 ] ; then
-	    mv -f "${config_guess_temp}" ${_aux_dir}/config.guess
-	    ret=0
-	    break
-	fi
-    done
-
-    if [ ! $ret = 0 ] ; then
-	$ECHO "Warning: config.guess download failed from: $CONFIG_GUESS_URL"
-	rm -f "${config_guess_temp}"
-    fi
-}
-
-
-##############################
-# LIBTOOLIZE_NEEDED FUNCTION #
-##############################
-libtoolize_needed () {
-    ret=1 # means no, don't need libtoolize
-    for feature in AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT ; do
-	$VERBOSE_ECHO "Searching for $feature in $CONFIGURE"
-	found="`grep \"^$feature.*\" $CONFIGURE`"
-	if [ ! "x$found" = "x" ] ; then
-	    ret=0 # means yes, need to run libtoolize
-	    break
-	fi
-    done
-    return ${ret}
-}
-
-
-
-############################################
-# prepare build via autoreconf or manually #
-############################################
-reconfigure_manually=no
-if [ "x$HAVE_AUTORECONF" = "xyes" ] ; then
-    $ECHO
-    $ECHO $ECHO_N "Automatically preparing build ... $ECHO_C"
-
-    $VERBOSE_ECHO "$AUTORECONF $SEARCH_DIRS $AUTORECONF_OPTIONS"
-    autoreconf_output="`$AUTORECONF $SEARCH_DIRS $AUTORECONF_OPTIONS 2>&1`"
-    ret=$?
-    $VERBOSE_ECHO "$autoreconf_output"
-
-    if [ ! $ret = 0 ] ; then
-	if [ "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then
-	    if [ ! "x`echo \"$autoreconf_output\" | grep libtoolize | grep \"No such file or directory\"`" = "x" ] ; then
-		$ECHO
-		$ECHO "Warning: autoreconf failed but due to what is usually a common libtool"
-		$ECHO "misconfiguration issue.  This problem is encountered on systems that"
-		$ECHO "have installed libtoolize under a different name without providing a"
-		$ECHO "symbolic link or without setting the LIBTOOLIZE environment variable."
-		$ECHO
-		$ECHO "Restarting the preparation steps with LIBTOOLIZE set to $LIBTOOLIZE"
-
-		export LIBTOOLIZE
-		RUN_RECURSIVE=no
-		export RUN_RECURSIVE
-		untrap_abnormal
-
-		$VERBOSE_ECHO sh $AUTOGEN_SH "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"
-		sh "$AUTOGEN_SH" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"
-		exit $?
-	    fi
-	fi
-
-	$ECHO "Warning: $AUTORECONF failed"
-
-	if test -f ltmain.sh ; then
-	    $ECHO "libtoolize being run by autoreconf is not creating ltmain.sh in the auxillary directory like it should"
-	fi
-
-	$ECHO "Attempting to run the preparation steps individually"
-	reconfigure_manually=yes
-    else
-	if [ "x$DOWNLOAD" = "xyes" ] ; then
-	    if libtoolize_needed ; then
-		download_gnulib_config_guess
-	    fi
-	fi
-    fi
 else
-    reconfigure_manually=yes
+        echo "Skipping configure process."
 fi
 
-
-############################
-# LIBTOOL_FAILURE FUNCTION #
-############################
-libtool_failure ( ) {
-
-    # libtool is rather error-prone in comparison to the other
-    # autotools and this routine attempts to compensate for some
-    # common failures.  the output after a libtoolize failure is
-    # parsed for an error related to AC_PROG_LIBTOOL and if found, we
-    # attempt to inject a project-provided libtool.m4 file.
-
-    _autoconf_output="$1"
-
-    if [ "x$RUN_RECURSIVE" = "xno" ] ; then
-	# we already tried the libtool.m4, don't try again
-	return 1
-    fi
-
-    if test -f "$LIBTOOL_M4" ; then
-	found_libtool="`$ECHO $_autoconf_output | grep AC_PROG_LIBTOOL`"
-	if test ! "x$found_libtool" = "x" ; then
-	    if test -f acinclude.m4 ; then
-		rm -f acinclude.m4.$$.backup
-		$VERBOSE_ECHO "cat acinclude.m4 > acinclude.m4.$$.backup"
-		cat acinclude.m4 > acinclude.m4.$$.backup
-	    fi
-	    $VERBOSE_ECHO "cat \"$LIBTOOL_M4\" >> acinclude.m4"
-	    chmod u+w acinclude.m4
-	    cat "$LIBTOOL_M4" >> acinclude.m4
-
-	    # don't keep doing this
-	    RUN_RECURSIVE=no
-	    export RUN_RECURSIVE
-	    untrap_abnormal
-
-	    $ECHO
-	    $ECHO "Restarting the preparation steps with libtool macros in acinclude.m4"
-	    $VERBOSE_ECHO sh $AUTOGEN_SH "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"
-	    sh "$AUTOGEN_SH" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"
-	    exit $?
-	fi
-    fi
-}
-
-
-###########################
-# MANUAL_AUTOGEN FUNCTION #
-###########################
-manual_autogen ( ) {
-
-    ##################################################
-    # Manual preparation steps taken are as follows: #
-    #   aclocal [-I m4]                              #
-    #   libtoolize --automake -c -f                  #
-    #   aclocal [-I m4]                              #
-    #   autoconf -f                                  #
-    #   autoheader                                   #
-    #   automake -a -c -f                            #
-    ##################################################
-
-    ###########
-    # aclocal #
-    ###########
-    $VERBOSE_ECHO "$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS"
-    aclocal_output="`$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS 2>&1`"
-    ret=$?
-    $VERBOSE_ECHO "$aclocal_output"
-    if [ ! $ret = 0 ] ; then $ECHO "ERROR: $ACLOCAL failed" && exit 2 ; fi
-
-    ##############
-    # libtoolize #
-    ##############
-    if libtoolize_needed ; then
-	if [ "x$HAVE_LIBTOOLIZE" = "xyes" ] ; then
-	    $VERBOSE_ECHO "$LIBTOOLIZE $LIBTOOLIZE_OPTIONS"
-	    libtoolize_output="`$LIBTOOLIZE $LIBTOOLIZE_OPTIONS 2>&1`"
-	    ret=$?
-	    $VERBOSE_ECHO "$libtoolize_output"
-
-	    if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi
-	else
-	    if [ "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then
-		$VERBOSE_ECHO "$LIBTOOLIZE $ALT_LIBTOOLIZE_OPTIONS"
-		libtoolize_output="`$LIBTOOLIZE $ALT_LIBTOOLIZE_OPTIONS 2>&1`"
-		ret=$?
-		$VERBOSE_ECHO "$libtoolize_output"
-
-		if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi
-	    fi
-	fi
-
-	###########
-	# aclocal #
-	###########
-	# re-run again as instructed by libtoolize
-	$VERBOSE_ECHO "$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS"
-	aclocal_output="`$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS 2>&1`"
-	ret=$?
-	$VERBOSE_ECHO "$aclocal_output"
-
-	# libtoolize might put ltmain.sh in the wrong place
-	if test -f ltmain.sh ; then
-	    if test ! -f "${_aux_dir}/ltmain.sh" ; then
-		$ECHO
-		$ECHO "Warning:  $LIBTOOLIZE is creating ltmain.sh in the wrong directory"
-		$ECHO
-		$ECHO "Fortunately, the problem can be worked around by simply copying the"
-		$ECHO "file to the appropriate location (${_aux_dir}/).  This has been done for you."
-		$ECHO
-		$VERBOSE_ECHO "cp -p ltmain.sh \"${_aux_dir}/ltmain.sh\""
-		cp -p ltmain.sh "${_aux_dir}/ltmain.sh"
-		$ECHO $ECHO_N "Continuing build preparation ... $ECHO_C"
-	    fi
-	fi # ltmain.sh
-
-	if [ "x$DOWNLOAD" = "xyes" ] ; then
-	    download_gnulib_config_guess
-	fi
-    fi # libtoolize_needed
-
-    ############
-    # autoconf #
-    ############
-    $VERBOSE_ECHO
-    $VERBOSE_ECHO "$AUTOCONF $AUTOCONF_OPTIONS"
-    autoconf_output="`$AUTOCONF $AUTOCONF_OPTIONS 2>&1`"
-    ret=$?
-    $VERBOSE_ECHO "$autoconf_output"
-
-    if [ ! $ret = 0 ] ; then
-	# retry without the -f and check for usage of macros that are too new
-	ac2_59_macros="AC_C_RESTRICT AC_INCLUDES_DEFAULT AC_LANG_ASSERT AC_LANG_WERROR AS_SET_CATFILE"
-	ac2_55_macros="AC_COMPILER_IFELSE AC_FUNC_MBRTOWC AC_HEADER_STDBOOL AC_LANG_CONFTEST AC_LANG_SOURCE AC_LANG_PROGRAM AC_LANG_CALL AC_LANG_FUNC_TRY_LINK AC_MSG_FAILURE AC_PREPROC_IFELSE"
-	ac2_54_macros="AC_C_BACKSLASH_A AC_CONFIG_LIBOBJ_DIR AC_GNU_SOURCE AC_PROG_EGREP AC_PROG_FGREP AC_REPLACE_FNMATCH AC_FUNC_FNMATCH_GNU AC_FUNC_REALLOC AC_TYPE_MBSTATE_T"
-
-	macros_to_search=""
-	ac_major="`echo ${AUTOCONF_VERSION}. | cut -d. -f1 | sed 's/[^0-9]//g'`"
-	ac_minor="`echo ${AUTOCONF_VERSION}. | cut -d. -f2 | sed 's/[^0-9]//g'`"
-
-	if [ $ac_major -lt 2 ] ; then
-	    macros_to_search="$ac2_59_macros $ac2_55_macros $ac2_54_macros"
-	else
-	    if [ $ac_minor -lt 54 ] ; then
-		macros_to_search="$ac2_59_macros $ac2_55_macros $ac2_54_macros"
-	    elif [ $ac_minor -lt 55 ] ; then
-		macros_to_search="$ac2_59_macros $ac2_55_macros"
-	    elif [ $ac_minor -lt 59 ] ; then
-		macros_to_search="$ac2_59_macros"
-	    fi
-	fi
-
-	configure_ac_macros=__none__
-	for feature in $macros_to_search ; do
-	    $VERBOSE_ECHO "Searching for $feature in $CONFIGURE"
-	    found="`grep \"^$feature.*\" $CONFIGURE`"
-	    if [ ! "x$found" = "x" ] ; then
-		if [ "x$configure_ac_macros" = "x__none__" ] ; then
-		    configure_ac_macros="$feature"
-		else
-		    configure_ac_macros="$feature $configure_ac_macros"
-		fi
-	    fi
-	done
-	if [ ! "x$configure_ac_macros" = "x__none__" ] ; then
-	    $ECHO
-	    $ECHO "Warning:  Unsupported macros were found in $CONFIGURE"
-	    $ECHO
-	    $ECHO "The `basename \"$CONFIGURE\"` file was scanned in order to determine if any"
-	    $ECHO "unsupported macros are used that exceed the minimum version"
-	    $ECHO "settings specified within this file.  As such, the following macros"
-	    $ECHO "should be removed from configure.ac or the version numbers in this"
-	    $ECHO "file should be increased:"
-	    $ECHO
-	    $ECHO "$configure_ac_macros"
-	    $ECHO
-	    $ECHO $ECHO_N "Ignorantly continuing build preparation ... $ECHO_C"
-	fi
-
-	###################
-	# autoconf, retry #
-	###################
-	$VERBOSE_ECHO
-	$VERBOSE_ECHO "$AUTOCONF"
-	autoconf_output="`$AUTOCONF 2>&1`"
-	ret=$?
-	$VERBOSE_ECHO "$autoconf_output"
-
-	if [ ! $ret = 0 ] ; then
-	    # test if libtool is busted
-	    libtool_failure "$autoconf_output"
-
-	    # let the user know what went wrong
-	    cat <<EOF
-$autoconf_output
-EOF
-	    $ECHO "ERROR: $AUTOCONF failed"
-	    exit 2
-	else
-	    # autoconf sans -f and possibly sans unsupported options succeed so warn verbosely
-	    $ECHO
-	    $ECHO "Warning: autoconf seems to have succeeded by removing the following options:"
-	    $ECHO "	AUTOCONF_OPTIONS=\"$AUTOCONF_OPTIONS\""
-	    $ECHO
-	    $ECHO "Removing those options should not be necessary and indicate some other"
-	    $ECHO "problem with the build system.  The build preparation is highly suspect"
-	    $ECHO "and may result in configuration or compilation errors.  Consider"
-	    if [ "x$VERBOSE_ECHO" = "x:" ] ; then
-		$ECHO "rerunning the build preparation with verbose output enabled."
-		$ECHO "	$AUTOGEN_SH --verbose"
-	    else
-		$ECHO "reviewing the minimum GNU Autotools version settings contained in"
-		$ECHO "this script along with the macros being used in your `basename \"$CONFIGURE\"` file."
-	    fi
-	    $ECHO
-	    $ECHO $ECHO_N "Continuing build preparation ... $ECHO_C"
-	fi # autoconf ret = 0
-    fi # autoconf ret = 0
-
-    ##############
-    # autoheader #
-    ##############
-    need_autoheader=no
-    for feature in AM_CONFIG_HEADER AC_CONFIG_HEADER ; do
-	$VERBOSE_ECHO "Searching for $feature in $CONFIGURE"
-	found="`grep \"^$feature.*\" $CONFIGURE`"
-	if [ ! "x$found" = "x" ] ; then
-	    need_autoheader=yes
-	    break
-	fi
-    done
-    if [ "x$need_autoheader" = "xyes" ] ; then
-	$VERBOSE_ECHO "$AUTOHEADER $AUTOHEADER_OPTIONS"
-	autoheader_output="`$AUTOHEADER $AUTOHEADER_OPTIONS 2>&1`"
-	ret=$?
-	$VERBOSE_ECHO "$autoheader_output"
-	if [ ! $ret = 0 ] ; then $ECHO "ERROR: $AUTOHEADER failed" && exit 2 ; fi
-    fi # need_autoheader
-
-    ############
-    # automake #
-    ############
-    need_automake=no
-    for feature in AM_INIT_AUTOMAKE ; do
-	$VERBOSE_ECHO "Searching for $feature in $CONFIGURE"
-	found="`grep \"^$feature.*\" $CONFIGURE`"
-	if [ ! "x$found" = "x" ] ; then
-	    need_automake=yes
-	    break
-	fi
-    done
-
-    if [ "x$need_automake" = "xyes" ] ; then
-	$VERBOSE_ECHO "$AUTOMAKE $AUTOMAKE_OPTIONS"
-	automake_output="`$AUTOMAKE $AUTOMAKE_OPTIONS 2>&1`"
-	ret=$?
-	$VERBOSE_ECHO "$automake_output"
-
-	if [ ! $ret = 0 ] ; then
-
-	    ###################
-	    # automake, retry #
-	    ###################
-	    $VERBOSE_ECHO
-	    $VERBOSE_ECHO "$AUTOMAKE $ALT_AUTOMAKE_OPTIONS"
-	    # retry without the -f
-	    automake_output="`$AUTOMAKE $ALT_AUTOMAKE_OPTIONS 2>&1`"
-	    ret=$?
-	    $VERBOSE_ECHO "$automake_output"
-
-	    if [ ! $ret = 0 ] ; then
-	 	# test if libtool is busted
-		libtool_failure "$automake_output"
-
-		# let the user know what went wrong
-		cat <<EOF
-$automake_output
-EOF
-		$ECHO "ERROR: $AUTOMAKE failed"
-		exit 2
-	    fi # automake retry
-	fi # automake ret = 0
-    fi # need_automake
-} # end of manual_autogen
-
-
-#####################################
-# RECURSIVE_MANUAL_AUTOGEN FUNCTION #
-#####################################
-recursive_manual_autogen ( ) {
-
-    # run the build preparation steps manually for this directory
-    manual_autogen
-
-    # for projects using recursive configure, run the build
-    # preparation steps for the subdirectories.
-    if [ ! "x$CONFIG_SUBDIRS" = "x" ] ; then
-	$VERBOSE_ECHO "Recursively configuring the following directories:"
-	$VERBOSE_ECHO "  $CONFIG_SUBDIRS"
-	for dir in $CONFIG_SUBDIRS ; do
-	    $VERBOSE_ECHO "Processing recursive configure in $dir"
-	    cd "$START_PATH"
-	    cd "$dir"
-
-	    # new directory, prepare
-	    initialize
-
-	    # run manual steps for the subdir and any others below
-	    recursive_manual_autogen
-	done
-    fi
-}
-
-
-################################
-# run manual preparation steps #
-################################
-if [ "x$reconfigure_manually" = "xyes" ] ; then
-    $ECHO
-    $ECHO $ECHO_N "Preparing build ... $ECHO_C"
-
-    recursive_manual_autogen
-fi
-
-
-#########################
-# restore and summarize #
-#########################
-cd "$START_PATH"
-
-# restore COPYING and INSTALL from backup if necessary
-recursive_restore
-
-# make sure we end up with a configure script
-config_ac="`locate_configure_template`"
-config="`echo $config_ac | sed 's/\.ac$//' | sed 's/\.in$//'`"
-if [ "x$config" = "x" ] ; then
-    $VERBOSE_ECHO "Could not locate the configure template (from `pwd`)"
-fi
-
-# summarize
-$ECHO "done"
-$ECHO
-if test "x$config" = "x" -o ! -f "$config" ; then
-    $ECHO "WARNING: The $PROJECT build system should now be prepared but there"
-    $ECHO "does not seem to be a resulting configure file.  This is unexpected"
-    $ECHO "and likely the result of an error.  You should run $NAME_OF_AUTOGEN"
-    $ECHO "with the --verbose option to get more details on a potential"
-    $ECHO "misconfiguration."
-else
-    $ECHO "The $PROJECT build system is now prepared.  To build here, run:"
-    $ECHO "  $config"
-    $ECHO "  make"
-fi
-
-
-# Local Variables:
-# mode: sh
-# tab-width: 8
-# sh-basic-offset: 4
-# sh-indentation: 4
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=4 tabstop=8
+set +x
diff --git a/compile b/compile
deleted file mode 100755
index 7b4a9a7..0000000
--- a/compile
+++ /dev/null
@@ -1,342 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand '-c -o'.
-
-scriptversion=2012-03-05.13; # UTC
-
-# Copyright (C) 1999-2012 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
-  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:
diff --git a/config.guess b/config.guess
deleted file mode 100755
index c0adba9..0000000
--- a/config.guess
+++ /dev/null
@@ -1,1530 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
-
-timestamp='2012-06-10'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# 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, 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.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-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."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-		os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-	echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH="i386"
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH="x86_64"
-	    fi
-	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
-	exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
-	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[4567])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-		      532)                      # CPU_PA_RISC2_0
-			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-			esac ;;
-		    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^		//' << EOF >$dummy.c
-
-		#define _HPUX_SOURCE
-		#include <stdlib.h>
-		#include <unistd.h>
-
-		int main ()
-		{
-		#if defined(_SC_KERNEL_BITS)
-		    long bits = sysconf(_SC_KERNEL_BITS);
-		#endif
-		    long cpu  = sysconf (_SC_CPU_VERSION);
-
-		    switch (cpu)
-			{
-			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-			case CPU_PA_RISC2_0:
-		#if defined(_SC_KERNEL_BITS)
-			    switch (bits)
-				{
-				case 64: puts ("hppa2.0w"); break;
-				case 32: puts ("hppa2.0n"); break;
-				default: puts ("hppa2.0"); break;
-				} break;
-		#else  /* !defined(_SC_KERNEL_BITS) */
-			    puts ("hppa2.0"); break;
-		#endif
-			default: puts ("hppa1.0"); break;
-			}
-		    exit (0);
-		}
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep -q __LP64__
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-	exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-	exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-	exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-	exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-	exit ;;
-    i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:*)
-	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    aarch64_be:Linux:*:*)
-	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-	esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
-    arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-	else
-	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-		| grep -q __ARM_PCS_VFP
-	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
-	    fi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
-    x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-	# Unixware is an offshoot of SVR4, but it has its own version
-	# number series starting with 2...
-	# I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-	# the processor, so we play safe by assuming i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
-	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-	exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-		echo mips-nec-sysv${UNAME_RELEASE}
-	else
-		echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-	exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSE-*:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-	echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
-    x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-unknown-esx
-	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/config.h.in b/config.h.in
deleted file mode 100644
index 6137887..0000000
--- a/config.h.in
+++ /dev/null
@@ -1,92 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* enable debugging */
-#undef DEBUG
-
-/* foo */
-#undef GETTEXT_PACKAGE
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* GeoIP Support. */
-#undef HAVE_GEOIP
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define if libappindicator is available */
-#undef HAVE_LIBAPPINDICATOR
-
-/* Define if libnotify is available */
-#undef HAVE_LIBNOTIFY
-
-/* Define if libproxy is available */
-#undef HAVE_LIBPROXY
-
-/* Define if libunique is available */
-#undef HAVE_LIBUNIQUE
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* gettext catalogs */
-#undef LOCALEDIR
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
diff --git a/config.sub b/config.sub
deleted file mode 100755
index 6205f84..0000000
--- a/config.sub
+++ /dev/null
@@ -1,1782 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
-
-timestamp='2012-04-18'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# 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, 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.
-
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
-		os=
-		basic_machine=$1
-		;;
-	-bluegene*)
-		os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
-	-chorusrdb)
-		os=-chorusrdb
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*178)
-		os=-lynxos178
-		;;
-	-lynx*5)
-		os=-lynxos5
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| aarch64 | aarch64_be \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-        | be32 | be64 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| open8 \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
-	| pyramid \
-	| rl78 | rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| we32k \
-	| x86 | xc16x | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
-		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
-		;;
-
-	xscaleel)
-		basic_machine=armel-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| aarch64-* | aarch64_be-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| be32-* | be64-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| le32-* | le64-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-	| pyramid-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16 | cr16-*)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	microblaze)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	msys)
-		basic_machine=i386-pc
-		os=-msys
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
-		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
-		;;
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-dicos*)
-		os=-dicos
-		;;
-	-nacl*)
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	score-*)
-		os=-elf
-		;;
-	spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	c4x-* | tic4x-*)
-		os=-coff
-		;;
-	hexagon-*)
-		os=-elf
-		;;
-	tic54x-*)
-		os=-coff
-		;;
-	tic55x-*)
-		os=-coff
-		;;
-	tic6x-*)
-		os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-cnk*|-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/configure b/configure
deleted file mode 100755
index 36e10d3..0000000
--- a/configure
+++ /dev/null
@@ -1,16037 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for transmission-remote-gtk 1.1.1.
-#
-# Report bugs to <alan@eth0.org.uk>.
-#
-#
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# Use a proper internal environment variable to ensure we don't fall
-  # into an infinite loop, continuously re-executing ourselves.
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-    _as_can_reexec=no; export _as_can_reexec;
-    # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
-  fi
-  # We don't want this to propagate to other subprocesses.
-          { _as_can_reexec=; unset _as_can_reexec;}
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-
-  test -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
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and alan@eth0.org.uk
-$0: about your system, including any error possibly output
-$0: before this message. Then install a modern shell, or
-$0: manually run the script under such a shell if you do
-$0: have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME='transmission-remote-gtk'
-PACKAGE_TARNAME='transmission-remote-gtk'
-PACKAGE_VERSION='1.1.1'
-PACKAGE_STRING='transmission-remote-gtk 1.1.1'
-PACKAGE_BUGREPORT='alan@eth0.org.uk'
-PACKAGE_URL=''
-
-ac_unique_file="src"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-LIBOBJS
-gio_LIBS
-gio_CFLAGS
-libcurl_LIBS
-libcurl_CFLAGS
-unique_LIBS
-unique_CFLAGS
-libappindicator_LIBS
-libappindicator_CFLAGS
-gtk_LIBS
-gtk_CFLAGS
-gthread_LIBS
-gthread_CFLAGS
-jsonglib_LIBS
-jsonglib_CFLAGS
-libproxy_LIBS
-libproxy_CFLAGS
-notify_LIBS
-notify_CFLAGS
-HAVE_GEOIP_FALSE
-HAVE_GEOIP_TRUE
-GEOIP_LIBS
-LOCALEDIR
-GETTEXT_PACKAGE
-trglicense
-WIN32_FALSE
-WIN32_TRUE
-PKG_CONFIG_LIBDIR
-PKG_CONFIG_PATH
-PKG_CONFIG
-DATADIRNAME
-ALL_LINGUAS
-INTLTOOL_PERL
-GMSGFMT
-MSGFMT
-MSGMERGE
-XGETTEXT
-INTLTOOL_POLICY_RULE
-INTLTOOL_SERVICE_RULE
-INTLTOOL_THEME_RULE
-INTLTOOL_SCHEMAS_RULE
-INTLTOOL_CAVES_RULE
-INTLTOOL_XML_NOMERGE_RULE
-INTLTOOL_XML_RULE
-INTLTOOL_KBD_RULE
-INTLTOOL_XAM_RULE
-INTLTOOL_UI_RULE
-INTLTOOL_SOUNDLIST_RULE
-INTLTOOL_SHEET_RULE
-INTLTOOL_SERVER_RULE
-INTLTOOL_PONG_RULE
-INTLTOOL_OAF_RULE
-INTLTOOL_PROP_RULE
-INTLTOOL_KEYS_RULE
-INTLTOOL_DIRECTORY_RULE
-INTLTOOL_DESKTOP_RULE
-INTLTOOL_EXTRACT
-INTLTOOL_MERGE
-INTLTOOL_UPDATE
-USE_NLS
-CPP
-OTOOL64
-OTOOL
-LIPO
-NMEDIT
-DSYMUTIL
-MANIFEST_TOOL
-RANLIB
-ac_ct_AR
-AR
-DLLTOOL
-OBJDUMP
-LN_S
-NM
-ac_ct_DUMPBIN
-DUMPBIN
-LD
-FGREP
-EGREP
-GREP
-SED
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-LIBTOOL
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-am__nodep
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__quote
-am__include
-DEPDIR
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-AM_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
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_silent_rules
-enable_dependency_tracking
-enable_shared
-enable_static
-with_pic
-enable_fast_install
-with_gnu_ld
-with_sysroot
-enable_libtool_lock
-enable_nls
-with_libgeoip
-with_libunique
-with_libnotify
-with_libproxy
-with_libappindicator
-enable_debug
-enable_gtk3
-enable_gtk2
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-PKG_CONFIG
-PKG_CONFIG_PATH
-PKG_CONFIG_LIBDIR
-notify_CFLAGS
-notify_LIBS
-libproxy_CFLAGS
-libproxy_LIBS
-jsonglib_CFLAGS
-jsonglib_LIBS
-gthread_CFLAGS
-gthread_LIBS
-gtk_CFLAGS
-gtk_LIBS
-libappindicator_CFLAGS
-libappindicator_LIBS
-unique_CFLAGS
-unique_LIBS
-libcurl_CFLAGS
-libcurl_LIBS
-gio_CFLAGS
-gio_LIBS'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # 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 transmission-remote-gtk 1.1.1 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root
-                          [DATAROOTDIR/doc/transmission-remote-gtk]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of transmission-remote-gtk 1.1.1:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-silent-rules   less verbose build output (undo: "make V=1")
-  --disable-silent-rules  verbose build output (undo: "make V=0")
-  --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)
-  --disable-nls           do not use Native Language Support
-  --enable-debug          enable debugging
-  --enable-gtk3           use gtk3 support (now default, left for
-                          compatability)
-  --enable-gtk2           use old gtk2 support
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --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).
-  --without-libgeoip      disable GeoIP support
-  --without-libunique     disable libunique
-  --without-libnotify     disable libnotify
-  --without-libproxy      disable libproxy
-  --without-libappindicator
-                          disable libappindicator
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-  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
-  notify_CFLAGS
-              C compiler flags for notify, overriding pkg-config
-  notify_LIBS linker flags for notify, overriding pkg-config
-  libproxy_CFLAGS
-              C compiler flags for libproxy, overriding pkg-config
-  libproxy_LIBS
-              linker flags for libproxy, overriding pkg-config
-  jsonglib_CFLAGS
-              C compiler flags for jsonglib, overriding pkg-config
-  jsonglib_LIBS
-              linker flags for jsonglib, overriding pkg-config
-  gthread_CFLAGS
-              C compiler flags for gthread, overriding pkg-config
-  gthread_LIBS
-              linker flags for gthread, overriding pkg-config
-  gtk_CFLAGS  C compiler flags for gtk, overriding pkg-config
-  gtk_LIBS    linker flags for gtk, overriding pkg-config
-  libappindicator_CFLAGS
-              C compiler flags for libappindicator, overriding pkg-config
-  libappindicator_LIBS
-              linker flags for libappindicator, overriding pkg-config
-  unique_CFLAGS
-              C compiler flags for unique, overriding pkg-config
-  unique_LIBS linker flags for unique, overriding pkg-config
-  libcurl_CFLAGS
-              C compiler flags for libcurl, overriding pkg-config
-  libcurl_LIBS
-              linker flags for libcurl, overriding pkg-config
-  gio_CFLAGS  C compiler flags for gio, overriding pkg-config
-  gio_LIBS    linker flags for gio, 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.
-
-Report bugs to <alan@eth0.org.uk>.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-transmission-remote-gtk configure 1.1.1
-generated by GNU Autoconf 2.69
-
-Copyright (C) 2012 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ------------------------------- ##
-## Report this to alan@eth0.org.uk ##
-## ------------------------------- ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=no"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof ($2))
-	 return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
-	    return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_type
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by transmission-remote-gtk $as_me 1.1.1, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    $as_echo "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    $as_echo "## ----------------- ##
-## Output variables. ##
-## ----------------- ##"
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      $as_echo "## ----------- ##
-## confdefs.h. ##
-## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-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
-
-
-
-am__api_version='1.12'
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-  done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# 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 (
-   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
-   # Ok.
-   :
-else
-   as_fn_error $? "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-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.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-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`
-
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { $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.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-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
-
-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=transmission-remote-gtk
- VERSION=1.1.1
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-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)'
-
-# 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}'
-
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
-
-
-
-
-
-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='transmission-remote-gtk'
- VERSION='1.1.1'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-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)'
-
-# 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}'
-
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
-
-
-
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-
-
-# 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=0;;
-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='\'
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-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'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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_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.
-    : > 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_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- 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
-
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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_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.
-    : > 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_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-if test "x$CC" != xcc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
-  { $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; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; 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; }
-
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != 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
-
-
-
-
-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
-
-
-
-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 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-# 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 grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 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_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $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.
-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
-
-
-
-
-
-
-
-
-
-{ $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
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  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
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${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
-
-
-    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
-  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_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_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
-
-  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
-
-    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
-
-
-
-
-
-
-{ $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
-  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: $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; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; 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, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-# 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
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# '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 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
-aix[4-9]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-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*)
-  # 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=pass_all
-  ;;
-
-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|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.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-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
-    ;;
-  *)
-    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
-  ;;
-
-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_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]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  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='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-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]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# 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 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
-
-# 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 { { 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
-    # 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
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && 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_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
-
-_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_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_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
-	    pipe_works=yes
-	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    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
-
-fi
-
-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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-fi
-
-# 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
-
-
-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; }
-
-
-
-
-
-# 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
-  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
-  ;;
-*-*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*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-
-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=$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
-
-
-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 "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
-  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
-
-
-
-
-
-
-  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=$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
-
-
-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
-    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}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_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-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_LIPO="${ac_tool_prefix}lipo"
-    $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
-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; }
-fi
-
-
-fi
-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_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-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_LIPO="lipo"
-    $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_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_LIPO" = x; then
-    LIPO=":"
-  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
-    LIPO=$ac_ct_LIPO
-  fi
-else
-  LIPO="$ac_cv_prog_LIPO"
-fi
-
-    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_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-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_OTOOL="${ac_tool_prefix}otool"
-    $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
-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; }
-fi
-
-
-fi
-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_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-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_OTOOL="otool"
-    $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_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_OTOOL" = x; then
-    OTOOL=":"
-  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
-    OTOOL=$ac_ct_OTOOL
-  fi
-else
-  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
-
-
-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
-
-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
-
-  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
-else
-  OTOOL64="$ac_cv_prog_OTOOL64"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $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; }
-
-    { $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
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_ld_exported_symbols_list=yes
-else
-  lt_cv_ld_exported_symbols_list=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_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
-
-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 how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_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_c_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_c_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_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # 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_c_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_c_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 \"$CPP\" 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
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-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
-
-
-
-
-
-# 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'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-test -z "$LN_S" && LN_S="ln -s"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-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
-  # 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
-
-
-
-
-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
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# 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
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-
-
-# 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
-  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
-
-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
-
-
-
-
-
-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
-  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
-
-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
-
-
-  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*
-
-
-## 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...
-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_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_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-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='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      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_prog_compiler_pic='-fno-common'
-      ;;
-
-    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_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      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 flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	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*)
-      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_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    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_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_prog_compiler_static='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    solaris*)
-      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_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_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_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_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  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
-
-{ $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
-  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.
-#
-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
-  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*
-
-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_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-#
-# 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_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"
-
-fi
-{ $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
-
-
-
-
-
-
-
-  { $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
-  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; }
-
-
-
-
-
-
-  { $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
-  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; }
-
-
-
-
-hard_links="nottested"
-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*
-  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; }
-
-  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
-
-  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
-    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.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
-            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 | $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
-      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
-      ;;
-
-    haiku*)
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      link_all_deplibs=yes
-      ;;
-
-    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
-      ;;
-
-    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 $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*)
-      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
-*** 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
-	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
-      ;;
-
-    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
-
-*** 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
-	    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
-      ;;
-
-    *)
-      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
-	ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    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
-      ;;
-
-    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].*|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.
-
-      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
-	  :
-	  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'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      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='${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='-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.  */
-
-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"
-        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
-      ;;
-
-    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
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec=-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
-	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
-      ;;
-
-    darwin* | rhapsody*)
-
-
-  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\"`'
-
-  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}"
-
-  else
-  ld_shlibs=no
-  fi
-
-      ;;
-
-    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='-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'
-      ;;
-
-    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
-      ;;
-
-    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'
-	  ;;
-	*)
-
-	  # 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'
-      hardcode_libdir_separator=:
-      inherit_rpath=yes
-      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
-      ;;
-
-    *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=:
-      ;;
-
-    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
-      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'
-      ;;
-
-    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*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'
-
-      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
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  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
-
-with_gnu_ld=$with_gnu_ld
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
-# 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
-  $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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $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=
-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
-
-# 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 # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-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
-  ;;
-
-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
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-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
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  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
-
-    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'
-    ;;
-
-  *,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'
-    ;;
-
-  *)
-    # 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
-  ;;
-
-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`'
-
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-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
-  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 # 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
-    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\"; \
-	 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
-
-  # Add ABI-specific directories to the system library path.
-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
-  # 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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $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 ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-
-
-
-
-  if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  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"
-if test "x$ac_cv_func_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $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 shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_shl_load=yes
-else
-  ac_cv_lib_dld_shl_load=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_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="-ldld"
-else
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen"
-else
-  { $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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if ${ac_cv_lib_svld_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $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_svld_dlopen=yes
-else
-  ac_cv_lib_svld_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_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if ${ac_cv_lib_dld_dld_link+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $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 dld_link ();
-int
-main ()
-{
-return dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_dld_link=yes
-else
-  ac_cv_lib_dld_dld_link=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_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="-ldld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* 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
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_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; ) >&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_dlunknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      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 :
-  $as_echo_n "(cached) " >&6
-else
-  	  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_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* 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
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_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; ) >&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_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-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"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        ac_config_commands="$ac_config_commands libtool"
-
-
-
-
-# Only expand once:
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
-$as_echo_n "checking whether NLS is requested... " >&6; }
-    # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then :
-  enableval=$enable_nls; USE_NLS=$enableval
-else
-  USE_NLS=yes
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
-
-
-
-
-case "$am__api_version" in
-    1.01234)
-	as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
-    ;;
-    *)
-    ;;
-esac
-
-if test -n "0.35.0"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5
-$as_echo_n "checking for intltool >= 0.35.0... " >&6; }
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
-$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	as_fn_error $? "Your intltool is too old.  You need intltool 0.35.0 or later." "$LINENO" 5
-fi
-
-# Extract the first word of "intltool-update", so it can be a program name with args.
-set dummy intltool-update; 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_INTLTOOL_UPDATE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $INTLTOOL_UPDATE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
-if test -n "$INTLTOOL_UPDATE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
-$as_echo "$INTLTOOL_UPDATE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "intltool-merge", so it can be a program name with args.
-set dummy intltool-merge; 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_INTLTOOL_MERGE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $INTLTOOL_MERGE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
-if test -n "$INTLTOOL_MERGE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
-$as_echo "$INTLTOOL_MERGE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "intltool-extract", so it can be a program name with args.
-set dummy intltool-extract; 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_INTLTOOL_EXTRACT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $INTLTOOL_EXTRACT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
-if test -n "$INTLTOOL_EXTRACT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
-$as_echo "$INTLTOOL_EXTRACT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
-fi
-
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check the gettext tools to make sure they are GNU
-# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XGETTEXT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $XGETTEXT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-XGETTEXT=$ac_cv_path_XGETTEXT
-if test -n "$XGETTEXT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-$as_echo "$XGETTEXT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "msgmerge", so it can be a program name with args.
-set dummy msgmerge; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGMERGE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MSGMERGE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MSGMERGE=$ac_cv_path_MSGMERGE
-if test -n "$MSGMERGE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-$as_echo "$MSGMERGE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGFMT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MSGFMT=$ac_cv_path_MSGFMT
-if test -n "$MSGFMT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-$as_echo "$MSGFMT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GMSGFMT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GMSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-if test -n "$GMSGFMT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-$as_echo "$GMSGFMT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
-fi
-
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; 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_INTLTOOL_PERL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $INTLTOOL_PERL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
-if test -n "$INTLTOOL_PERL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
-$as_echo "$INTLTOOL_PERL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$INTLTOOL_PERL"; then
-   as_fn_error $? "perl not found" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
-$as_echo_n "checking for perl >= 5.8.1... " >&6; }
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
-   as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
-else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
-$as_echo "$IT_PERL_VERSION" >&6; }
-fi
-if test "x" != "xno-xml"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
-$as_echo_n "checking for XML::Parser... " >&6; }
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-   else
-       as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
-   fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-
-
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  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 :
-  DATADIRNAME=share
-else
-  DATADIRNAME=lib
-fi
-
-    ;;
-    *)
-    DATADIRNAME=lib
-    ;;
-    esac
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-
-
-
-
-
-
-
-
-
-
-
-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 :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_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
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-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; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-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_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  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
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_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
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-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
-
-for ac_header in stdlib.h string.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
-
-
-case "${host_os}" in
-        *mingw32*) WIN32="yes" ;;
-        *cygwin*) WIN32="yes" ;;
-        *freebsd*) WIN32="no";
-        	CPPFLAGS="$CPPFLAGS -I/usr/local/include" ;;
-        *) WIN32="no" ;;
-esac
-
- if test "$WIN32" = "yes"; then
-  WIN32_TRUE=
-  WIN32_FALSE='#'
-else
-  WIN32_TRUE='#'
-  WIN32_FALSE=
-fi
-
-#if WIN32
-CFLAGS="$CFLAGS -IC:/MinGW/msys/1.0/include"
-#endif
-
-trglicense='${docdir}-$(PACKAGE_VERSION)/COPYING'
-
-GETTEXT_PACKAGE=transmission-remote-gtk
-
-
-$as_echo "#define GETTEXT_PACKAGE \"transmission-remote-gtk\"" >>confdefs.h
-
-
-  prefix_NONE=
-  exec_prefix_NONE=
-  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
-  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-  eval ac_define_dir="\"$datarootdir/locale\""
-  eval ac_define_dir="\"$ac_define_dir\""
-  LOCALEDIR="$ac_define_dir"
-
-
-cat >>confdefs.h <<_ACEOF
-#define LOCALEDIR "$ac_define_dir"
-_ACEOF
-
-  test "$prefix_NONE" && prefix=NONE
-  test "$exec_prefix_NONE" && exec_prefix=NONE
-
-
-
-# Check whether --with-libgeoip was given.
-if test "${with_libgeoip+set}" = set; then :
-  withval=$with_libgeoip;
-fi
-
-have_libgeoip=no
-if test x$with_libgeoip != xno; then
-  ac_fn_c_check_header_mongrel "$LINENO" "GeoIP.h" "ac_cv_header_GeoIP_h" "$ac_includes_default"
-if test "x$ac_cv_header_GeoIP_h" = xyes; then :
-  have_geoip=yes
-else
-  have_geoip=no
-fi
-
-
-fi
-if test "x$have_geoip" = "xyes"; then
-
-$as_echo "#define HAVE_GEOIP 1" >>confdefs.h
-
-  GEOIP_LIBS="-lGeoIP"
-
-fi
- if test "x$have_geoip" = "xyes"; then
-  HAVE_GEOIP_TRUE=
-  HAVE_GEOIP_FALSE='#'
-else
-  HAVE_GEOIP_TRUE='#'
-  HAVE_GEOIP_FALSE=
-fi
-
-
-
-# Check whether --with-libunique was given.
-if test "${with_libunique+set}" = set; then :
-  withval=$with_libunique;
-fi
-
-have_libunique=no
-
-# Check whether --with-libnotify was given.
-if test "${with_libnotify+set}" = set; then :
-  withval=$with_libnotify;
-fi
-
-have_libnotify=no
-
-# Check whether --with-libproxy was given.
-if test "${with_libproxy+set}" = set; then :
-  withval=$with_libproxy;
-fi
-
-have_libproxy=no
-
-# Check whether --with-libappindicator was given.
-if test "${with_libappindicator+set}" = set; then :
-  withval=$with_libappindicator;
-fi
-
-have_libappindicator=no
-
-if test x$with_libnotify != xno; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for notify" >&5
-$as_echo_n "checking for notify... " >&6; }
-
-if test -n "$notify_CFLAGS"; then
-    pkg_cv_notify_CFLAGS="$notify_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnotify") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_notify_CFLAGS=`$PKG_CONFIG --cflags "libnotify" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$notify_LIBS"; then
-    pkg_cv_notify_LIBS="$notify_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnotify") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_notify_LIBS=`$PKG_CONFIG --libs "libnotify" 2>/dev/null`
-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
-	        notify_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify" 2>&1`
-        else
-	        notify_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$notify_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify is required for popup desktop notifications" >&5
-$as_echo "$as_me: WARNING: libnotify is required for popup desktop notifications" >&2;}
-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}: WARNING: libnotify is required for popup desktop notifications" >&5
-$as_echo "$as_me: WARNING: libnotify is required for popup desktop notifications" >&2;}
-else
-	notify_CFLAGS=$pkg_cv_notify_CFLAGS
-	notify_LIBS=$pkg_cv_notify_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_LIBNOTIFY 1" >>confdefs.h
-
-fi
-fi
-
-if test x$with_libproxy != xno; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libproxy" >&5
-$as_echo_n "checking for libproxy... " >&6; }
-
-if test -n "$libproxy_CFLAGS"; then
-    pkg_cv_libproxy_CFLAGS="$libproxy_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libproxy-1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libproxy-1.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_libproxy_CFLAGS=`$PKG_CONFIG --cflags "libproxy-1.0" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$libproxy_LIBS"; then
-    pkg_cv_libproxy_LIBS="$libproxy_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libproxy-1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libproxy-1.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_libproxy_LIBS=`$PKG_CONFIG --libs "libproxy-1.0" 2>/dev/null`
-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
-	        libproxy_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libproxy-1.0" 2>&1`
-        else
-	        libproxy_PKG_ERRORS=`$PKG_CONFIG --print-errors "libproxy-1.0" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$libproxy_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libproxy is required for HTTP proxy support" >&5
-$as_echo "$as_me: WARNING: libproxy is required for HTTP proxy support" >&2;}
-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}: WARNING: libproxy is required for HTTP proxy support" >&5
-$as_echo "$as_me: WARNING: libproxy is required for HTTP proxy support" >&2;}
-else
-	libproxy_CFLAGS=$pkg_cv_libproxy_CFLAGS
-	libproxy_LIBS=$pkg_cv_libproxy_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_LIBPROXY 1" >>confdefs.h
-
-fi
-fi
-
-# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
-  enableval=$enable_debug;
-fi
-
-if test x$enable_debug = xyes; then
-
-$as_echo "#define DEBUG /**/" >>confdefs.h
-
-fi
-
-# Check whether --enable-gtk3 was given.
-if test "${enable_gtk3+set}" = set; then :
-  enableval=$enable_gtk3;
-fi
-
-# Check whether --enable-gtk2 was given.
-if test "${enable_gtk2+set}" = set; then :
-  enableval=$enable_gtk2;
-fi
-
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jsonglib" >&5
-$as_echo_n "checking for jsonglib... " >&6; }
-
-if test -n "$jsonglib_CFLAGS"; then
-    pkg_cv_jsonglib_CFLAGS="$jsonglib_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0 >= 0.8\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "json-glib-1.0 >= 0.8") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_jsonglib_CFLAGS=`$PKG_CONFIG --cflags "json-glib-1.0 >= 0.8" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$jsonglib_LIBS"; then
-    pkg_cv_jsonglib_LIBS="$jsonglib_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0 >= 0.8\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "json-glib-1.0 >= 0.8") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_jsonglib_LIBS=`$PKG_CONFIG --libs "json-glib-1.0 >= 0.8" 2>/dev/null`
-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
-	        jsonglib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "json-glib-1.0 >= 0.8" 2>&1`
-        else
-	        jsonglib_PKG_ERRORS=`$PKG_CONFIG --print-errors "json-glib-1.0 >= 0.8" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$jsonglib_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (json-glib-1.0 >= 0.8) were not met:
-
-$jsonglib_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 jsonglib_CFLAGS
-and jsonglib_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 jsonglib_CFLAGS
-and jsonglib_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
-	jsonglib_CFLAGS=$pkg_cv_jsonglib_CFLAGS
-	jsonglib_LIBS=$pkg_cv_jsonglib_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gthread" >&5
-$as_echo_n "checking for gthread... " >&6; }
-
-if test -n "$gthread_CFLAGS"; then
-    pkg_cv_gthread_CFLAGS="$gthread_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_gthread_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$gthread_LIBS"; then
-    pkg_cv_gthread_LIBS="$gthread_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_gthread_LIBS=`$PKG_CONFIG --libs "gthread-2.0" 2>/dev/null`
-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
-	        gthread_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gthread-2.0" 2>&1`
-        else
-	        gthread_PKG_ERRORS=`$PKG_CONFIG --print-errors "gthread-2.0" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$gthread_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (gthread-2.0) were not met:
-
-$gthread_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 gthread_CFLAGS
-and gthread_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 gthread_CFLAGS
-and gthread_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
-	gthread_CFLAGS=$pkg_cv_gthread_CFLAGS
-	gthread_LIBS=$pkg_cv_gthread_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-
-
-
-
-if test x$enable_gtk2 = xyes; then
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: attempting gtk-2.0 build" >&5
-$as_echo "$as_me: attempting gtk-2.0 build" >&6;}
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk" >&5
-$as_echo_n "checking for gtk... " >&6; }
-
-if test -n "$gtk_CFLAGS"; then
-    pkg_cv_gtk_CFLAGS="$gtk_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.16\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.16") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_gtk_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.16" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$gtk_LIBS"; then
-    pkg_cv_gtk_LIBS="$gtk_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.16\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.16") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_gtk_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.16" 2>/dev/null`
-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
-	        gtk_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= 2.16" 2>&1`
-        else
-	        gtk_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= 2.16" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$gtk_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (gtk+-2.0 >= 2.16) were not met:
-
-$gtk_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 gtk_CFLAGS
-and gtk_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 gtk_CFLAGS
-and gtk_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
-	gtk_CFLAGS=$pkg_cv_gtk_CFLAGS
-	gtk_LIBS=$pkg_cv_gtk_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-if test x$with_libappindicator != xno; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libappindicator" >&5
-$as_echo_n "checking for libappindicator... " >&6; }
-
-if test -n "$libappindicator_CFLAGS"; then
-    pkg_cv_libappindicator_CFLAGS="$libappindicator_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-0.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "appindicator-0.1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_libappindicator_CFLAGS=`$PKG_CONFIG --cflags "appindicator-0.1" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$libappindicator_LIBS"; then
-    pkg_cv_libappindicator_LIBS="$libappindicator_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-0.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "appindicator-0.1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_libappindicator_LIBS=`$PKG_CONFIG --libs "appindicator-0.1" 2>/dev/null`
-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
-	        libappindicator_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "appindicator-0.1" 2>&1`
-        else
-	        libappindicator_PKG_ERRORS=`$PKG_CONFIG --print-errors "appindicator-0.1" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$libappindicator_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ubuntu Unity users should consider building with libappindicator" >&5
-$as_echo "$as_me: WARNING: Ubuntu Unity users should consider building with libappindicator" >&2;}
-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}: WARNING: Ubuntu Unity users should consider building with libappindicator" >&5
-$as_echo "$as_me: WARNING: Ubuntu Unity users should consider building with libappindicator" >&2;}
-else
-	libappindicator_CFLAGS=$pkg_cv_libappindicator_CFLAGS
-	libappindicator_LIBS=$pkg_cv_libappindicator_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_LIBAPPINDICATOR 1" >>confdefs.h
-
-fi
-fi
-if test x$with_libunique != xno; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unique" >&5
-$as_echo_n "checking for unique... " >&6; }
-
-if test -n "$unique_CFLAGS"; then
-    pkg_cv_unique_CFLAGS="$unique_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "unique-1.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_unique_CFLAGS=`$PKG_CONFIG --cflags "unique-1.0" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$unique_LIBS"; then
-    pkg_cv_unique_LIBS="$unique_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "unique-1.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_unique_LIBS=`$PKG_CONFIG --libs "unique-1.0" 2>/dev/null`
-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
-	        unique_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "unique-1.0" 2>&1`
-        else
-	        unique_PKG_ERRORS=`$PKG_CONFIG --print-errors "unique-1.0" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$unique_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libunique is required for opening torrents on gtk+-2.0. not needed for gtk+-3.0 or win32. " >&5
-$as_echo "$as_me: WARNING: libunique is required for opening torrents on gtk+-2.0. not needed for gtk+-3.0 or win32. " >&2;}
-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}: WARNING: libunique is required for opening torrents on gtk+-2.0. not needed for gtk+-3.0 or win32. " >&5
-$as_echo "$as_me: WARNING: libunique is required for opening torrents on gtk+-2.0. not needed for gtk+-3.0 or win32. " >&2;}
-else
-	unique_CFLAGS=$pkg_cv_unique_CFLAGS
-	unique_LIBS=$pkg_cv_unique_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_LIBUNIQUE 1" >>confdefs.h
-
-fi
-fi
-
-else
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: attempting gtk-3.0 build" >&5
-$as_echo "$as_me: attempting gtk-3.0 build" >&6;}
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk" >&5
-$as_echo_n "checking for gtk... " >&6; }
-
-if test -n "$gtk_CFLAGS"; then
-    pkg_cv_gtk_CFLAGS="$gtk_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.00\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.00") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_gtk_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.00" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$gtk_LIBS"; then
-    pkg_cv_gtk_LIBS="$gtk_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.00\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.00") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_gtk_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.00" 2>/dev/null`
-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
-	        gtk_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 >= 3.00" 2>&1`
-        else
-	        gtk_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 >= 3.00" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$gtk_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (gtk+-3.0 >= 3.00) were not met:
-
-$gtk_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 gtk_CFLAGS
-and gtk_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 gtk_CFLAGS
-and gtk_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
-	gtk_CFLAGS=$pkg_cv_gtk_CFLAGS
-	gtk_LIBS=$pkg_cv_gtk_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-if test x$with_libappindicator != xno; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libappindicator" >&5
-$as_echo_n "checking for libappindicator... " >&6; }
-
-if test -n "$libappindicator_CFLAGS"; then
-    pkg_cv_libappindicator_CFLAGS="$libappindicator_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator3-0.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "appindicator3-0.1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_libappindicator_CFLAGS=`$PKG_CONFIG --cflags "appindicator3-0.1" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$libappindicator_LIBS"; then
-    pkg_cv_libappindicator_LIBS="$libappindicator_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator3-0.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "appindicator3-0.1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_libappindicator_LIBS=`$PKG_CONFIG --libs "appindicator3-0.1" 2>/dev/null`
-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
-	        libappindicator_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "appindicator3-0.1" 2>&1`
-        else
-	        libappindicator_PKG_ERRORS=`$PKG_CONFIG --print-errors "appindicator3-0.1" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$libappindicator_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ubuntu Unity users should consider building with libappindicator" >&5
-$as_echo "$as_me: WARNING: Ubuntu Unity users should consider building with libappindicator" >&2;}
-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}: WARNING: Ubuntu Unity users should consider building with libappindicator" >&5
-$as_echo "$as_me: WARNING: Ubuntu Unity users should consider building with libappindicator" >&2;}
-else
-	libappindicator_CFLAGS=$pkg_cv_libappindicator_CFLAGS
-	libappindicator_LIBS=$pkg_cv_libappindicator_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_LIBAPPINDICATOR 1" >>confdefs.h
-
-fi
-fi
-
-fi
-
-fi
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl" >&5
-$as_echo_n "checking for libcurl... " >&6; }
-
-if test -n "$libcurl_CFLAGS"; then
-    pkg_cv_libcurl_CFLAGS="$libcurl_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_libcurl_CFLAGS=`$PKG_CONFIG --cflags "libcurl" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$libcurl_LIBS"; then
-    pkg_cv_libcurl_LIBS="$libcurl_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_libcurl_LIBS=`$PKG_CONFIG --libs "libcurl" 2>/dev/null`
-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
-	        libcurl_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcurl" 2>&1`
-        else
-	        libcurl_PKG_ERRORS=`$PKG_CONFIG --print-errors "libcurl" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$libcurl_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (libcurl) were not met:
-
-$libcurl_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 libcurl_CFLAGS
-and libcurl_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 libcurl_CFLAGS
-and libcurl_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
-	libcurl_CFLAGS=$pkg_cv_libcurl_CFLAGS
-	libcurl_LIBS=$pkg_cv_libcurl_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio" >&5
-$as_echo_n "checking for gio... " >&6; }
-
-if test -n "$gio_CFLAGS"; then
-    pkg_cv_gio_CFLAGS="$gio_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.22\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.22") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_gio_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.22" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$gio_LIBS"; then
-    pkg_cv_gio_LIBS="$gio_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.22\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.22") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_gio_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.22" 2>/dev/null`
-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
-	        gio_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0 >= 2.22" 2>&1`
-        else
-	        gio_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0 >= 2.22" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$gio_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (gio-2.0 >= 2.22) were not met:
-
-$gio_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 gio_CFLAGS
-and gio_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 gio_CFLAGS
-and gio_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
-	gio_CFLAGS=$pkg_cv_gio_CFLAGS
-	gio_LIBS=$pkg_cv_gio_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-ac_config_files="$ac_config_files Makefile po/Makefile.in src/Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-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$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-{ $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 -n "$EXEEXT"; then
-  am__EXEEXT_TRUE=
-  am__EXEEXT_FALSE='#'
-else
-  am__EXEEXT_TRUE='#'
-  am__EXEEXT_FALSE=
-fi
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  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__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
-
-  ac_config_commands="$ac_config_commands po/stamp-it"
-
-
-if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then
-  as_fn_error $? "conditional \"WIN32\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_GEOIP_TRUE}" && test -z "${HAVE_GEOIP_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_GEOIP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-: "${CONFIG_STATUS=./config.status}"
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by transmission-remote-gtk $as_me 1.1.1, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <alan@eth0.org.uk>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-ac_cs_version="\\
-transmission-remote-gtk config.status 1.1.1
-configured by $0, generated by GNU Autoconf 2.69,
-  with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2012 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=?*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-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"`'
-
-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; 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; 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
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  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" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
-
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp= ac_tmp=
-  trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) 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
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
-
-  rm -f "$ac_tmp/stdin"
-  case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
-  fi
-# Compute "$ac_file"'s index in $config_headers.
-_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
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    else
-      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\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
- ;;
-    "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=""
-
-# ### 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
-
-# ### 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"
-
- ;;
-    "po/stamp-it":C)
-    if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
-       as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
-    fi
-    rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
-    >"po/stamp-it.tmp"
-    sed '/^#/d
-	 s/^[[].*] *//
-	 /^[ 	]*$/d
-	'"s|^|	$ac_top_srcdir/|" \
-      "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
-
-    sed '/^POTFILES =/,/[^\\]$/ {
-		/^POTFILES =/!d
-		r po/POTFILES
-	  }
-	 ' "po/Makefile.in" >"po/Makefile"
-    rm -f "po/Makefile.tmp"
-    mv "po/stamp-it.tmp" "po/stamp-it"
-   ;;
-
-  esac
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
diff --git a/configure.ac b/configure.ac
index 2260c49..300ef38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,28 +17,44 @@ dnl with this program; if not, write to the Free Software Foundation, Inc.,
 dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 dnl
 
-AC_PREREQ(2.63)
+AC_PREREQ([2.69])
 
-AC_INIT(transmission-remote-gtk, 1.1.1, alan@eth0.org.uk)
-AC_CONFIG_SRCDIR(src)
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-AM_INIT_AUTOMAKE([foreign])
+AC_INIT([transmission-remote-gtk], [1.3.1],
+        [https://github.com/transmission-remote-gtk/transmission-remote-gtk/issues])
+AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+AM_INIT_AUTOMAKE([1.12 tar-pax dist-xz no-dist-gzip subdir-objects no-define foreign -Wall -Wno-portability])
+AM_SILENT_RULES([yes])
+AM_MAINTAINER_MODE([enable])
 
-AC_PROG_CC
-AM_PROG_CC_C_O
+AC_DEFUN([TRG_CHECK_MACRO], [m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined. Is ]$2[ installed?])])])
+
+TRG_CHECK_MACRO([AX_IS_RELEASE], [autoconf-archive])
+TRG_CHECK_MACRO([APPSTREAM_XML], [appstream-glib])
 
+AX_IS_RELEASE([git-directory])
+AX_CHECK_ENABLE_DEBUG([yes], [G_ENABLE_DEBUG], [DEBUG G_DISABLE_ASSERT G_DISABLE_CHECKS G_DISABLE_CAST_CHECKS])
+
+AC_PROG_CC
+AC_PROG_CC_C99
 AC_PROG_INSTALL
+AC_PATH_PROG([POD2MAN], [pod2man])
+
+LT_PREREQ([2.2.0])
 LT_INIT
-IT_PROG_INTLTOOL([0.35.0])
-PKG_PROG_PKG_CONFIG
+LT_LIB_M
+IT_PROG_INTLTOOL([0.50.1])
+PKG_PROG_PKG_CONFIG([0.28])
+DESKTOP_FILE
+APPSTREAM_XML
 
-AC_CHECK_HEADERS([stdlib.h string.h])
-AC_TYPE_SIZE_T
+GETTEXT_PACKAGE=AC_PACKAGE_NAME
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext package name])
 
+dnl ---- win32 ----
 case "${host_os}" in
         *mingw32*) WIN32="yes" ;;
         *cygwin*) WIN32="yes" ;;
@@ -46,89 +62,142 @@ case "${host_os}" in
         	CPPFLAGS="$CPPFLAGS -I/usr/local/include" ;;
         *) WIN32="no" ;;
 esac
-
 AM_CONDITIONAL([WIN32], test "$WIN32" = "yes")
-#if WIN32
-CFLAGS="$CFLAGS -IC:/MinGW/msys/1.0/include"
-#endif
 
-trglicense='${docdir}-$(PACKAGE_VERSION)/COPYING'
-AC_SUBST(trglicense)
-GETTEXT_PACKAGE=AC_PACKAGE_NAME
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE(GETTEXT_PACKAGE, "AC_PACKAGE_NAME", [foo])
-AC_DEFINE_DIR([LOCALEDIR], [datarootdir/locale], [gettext catalogs])
 
+dnl ---- required deps ----
+AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_44], [Dont warn using older APIs])
+AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_44], [Prevents using newer APIs])
+
+PKG_CHECK_MODULES([TRG], [
+	json-glib-1.0 >= 0.8
+	gthread-2.0
+	libcurl
+	gio-2.0 >= 2.44
+	gtk+-3.0 >= 3.16
+])
+
+
+dnl ---- optional deps ----
 AC_ARG_WITH([libgeoip], AC_HELP_STRING([--without-libgeoip], [disable GeoIP support]))
-have_libgeoip=no
-if test x$with_libgeoip != xno; then
-  AC_CHECK_HEADER([GeoIP.h],[have_geoip=yes],[have_geoip=no])
-fi
-if test "x$have_geoip" = "xyes"; then
-  AC_DEFINE(HAVE_GEOIP, 1, [GeoIP Support.])
-  GEOIP_LIBS="-lGeoIP"
-  AC_SUBST([GEOIP_LIBS])
-fi
+have_geoip=no
+AS_IF([test x$with_libgeoip != xno], [
+	PKG_CHECK_MODULES([GEOIP], [geoip], [
+		have_geoip="yes"
+	], [
+		AC_MSG_WARN([libgeoip not found])
+	])
+])
 AM_CONDITIONAL([HAVE_GEOIP], [test "x$have_geoip" = "xyes"])
 
-AC_ARG_WITH([libunique], AC_HELP_STRING([--without-libunique], [disable libunique]))
-have_libunique=no
+
 AC_ARG_WITH([libnotify], AC_HELP_STRING([--without-libnotify], [disable libnotify]))
 have_libnotify=no
+AS_IF([test x$with_libnotify != xno], [
+	PKG_CHECK_MODULES([NOTIFY], [libnotify], [
+		have_libnotify=yes
+		AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify is available])
+	], [
+		AC_MSG_WARN([libnotify is required for popup desktop notifications])
+	])
+])
+
+
+AC_ARG_WITH([libmrss], AC_HELP_STRING([--without-libmrss], [disable RSS support]))
+have_libmrss=no
+AS_IF([test x$with_libmrss != xno], [
+	PKG_CHECK_MODULES([MRSS], [mrss >= 0.18], [
+		have_libmrss="yes"
+		AC_DEFINE(HAVE_RSS, 1, [Define if RSS features available])
+	], [
+		AC_MSG_WARN([libmrss is required for RSS reader])
+	])
+])
+AM_CONDITIONAL([HAVE_RSS], [test x$have_libmrss == xyes ])
+
+
 AC_ARG_WITH([libproxy], AC_HELP_STRING([--without-libproxy], [disable libproxy]))
 have_libproxy=no
+AS_IF([test x$with_libproxy != xno], [
+	PKG_CHECK_MODULES([PROXY], [libproxy-1.0], [
+		have_libproxy=yes
+		AC_DEFINE(HAVE_LIBPROXY, 1, [Define if libproxy is available])
+	], [
+		AC_MSG_WARN([libproxy is required for HTTP proxy support])
+	])
+])
+
+
 AC_ARG_WITH([libappindicator], AC_HELP_STRING([--without-libappindicator], [disable libappindicator]))
 have_libappindicator=no
+AS_IF([test x$with_libappindicator != xno], [
+	PKG_CHECK_MODULES([APPINDICATOR], [appindicator3-0.1], [
+		AC_DEFINE(HAVE_LIBAPPINDICATOR, 1, [Define if libappindicator is available])
+	], [
+		AC_MSG_WARN([Ubuntu Unity users should consider building with libappindicator])
+	])
+])
+
+
+dnl ---- build flags ----
+AX_APPEND_COMPILE_FLAGS([ \
+	-std=gnu99 \
+	-funsigned-char \
+	-fstack-protector-strong \
+	-fPIE \
+	-fPIC \
+	-Wall \
+	-Wextra \
+	-Winline \
+	-Wno-padded \
+	-Wno-unused-parameter \
+	-Wstrict-prototypes \
+	-Wmissing-prototypes \
+	-Werror=format=2 \
+	-Werror=implicit-function-declaration \
+	-Werror=pointer-arith \
+	-Werror=init-self \
+	-Werror=format-security \
+	-Werror=missing-include-dirs \
+	-Werror=date-time \
+	-Wno-conversion \
+	-Wno-sign-compare \
+	-Wno-deprecated-declarations \
+	-Wno-error=format-nonliteral \
+])
+dnl TODO: Fix last two hidden warnings
+
+AS_IF([test "$enable_debug" = "no"], [
+	AX_APPEND_COMPILE_FLAGS([-O2])
+])
 
-if test x$with_libnotify != xno; then
-  PKG_CHECK_MODULES([notify], [libnotify], AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify is available]), AC_MSG_WARN([libnotify is required for popup desktop notifications]))
-fi
-
-if test x$with_libproxy != xno; then
-  PKG_CHECK_MODULES([libproxy], [libproxy-1.0], AC_DEFINE(HAVE_LIBPROXY, 1, [Define if libproxy is available]), AC_MSG_WARN([libproxy is required for HTTP proxy support]))
-fi
-
-AC_ARG_ENABLE(debug, [AS_HELP_STRING(--enable-debug,
-                                     [enable debugging])])
-if test x$enable_debug = xyes; then
-    AC_DEFINE([DEBUG], [],  [enable debugging])
-fi
-
-AC_ARG_ENABLE(gtk3, [AS_HELP_STRING(--enable-gtk3,
-                                     [use gtk3 support (now default, left for compatability)])])
-AC_ARG_ENABLE(gtk2, [AS_HELP_STRING(--enable-gtk2,
-                                     [use old gtk2 support])])
-
-PKG_CHECK_MODULES([jsonglib], [json-glib-1.0 >= 0.8])
-PKG_CHECK_MODULES([gthread], [gthread-2.0])
-
-AC_DEFUN([TRG_GTK3_CONFIGURE], [
-AC_MSG_NOTICE([attempting gtk-3.0 build])
-PKG_CHECK_MODULES([gtk], [gtk+-3.0 >= 3.00], [
-if test x$with_libappindicator != xno; then
-PKG_CHECK_MODULES([libappindicator], [appindicator3-0.1], AC_DEFINE(HAVE_LIBAPPINDICATOR, 1, [Define if libappindicator is available]), AC_MSG_WARN([Ubuntu Unity users should consider building with libappindicator]))
-fi
-], [$1])
+AX_APPEND_LINK_FLAGS([ \
+	-pie \
+	-Wl,-z,relro \
+	-Wl,-z,now \
 ])
 
-AC_DEFUN([TRG_GTK2_CONFIGURE], [
-AC_MSG_NOTICE([attempting gtk-2.0 build])
-PKG_CHECK_MODULES([gtk], [gtk+-2.0 >= 2.16])
-if test x$with_libappindicator != xno; then
-  PKG_CHECK_MODULES([libappindicator], [appindicator-0.1], AC_DEFINE(HAVE_LIBAPPINDICATOR, 1, [Define if libappindicator is available]), AC_MSG_WARN([Ubuntu Unity users should consider building with libappindicator]))
-fi
-if test x$with_libunique != xno; then
-  PKG_CHECK_MODULES([unique], [unique-1.0], AC_DEFINE(HAVE_LIBUNIQUE, 1, [Define if libunique is available]), AC_MSG_WARN([libunique is required for opening torrents on gtk+-2.0. not needed for gtk+-3.0 or win32. ]))
-fi
+AC_CONFIG_FILES([
+	Makefile
+	po/Makefile.in
+	src/Makefile
+	extern/Makefile
+	extern/rss-glib/Makefile
+	data/Makefile
+	data/icons/Makefile
 ])
 
-if test x$enable_gtk2 = xyes; then
-  TRG_GTK2_CONFIGURE([])
-else
-  TRG_GTK3_CONFIGURE()
-fi
+AC_OUTPUT
+
+echo "
+	$PACKAGE $VERSION
 
-PKG_CHECK_MODULES([libcurl], [libcurl])
-PKG_CHECK_MODULES([gio], [gio-2.0 >= 2.22])
+	prefix ........: $prefix
+	debug .........: $enable_debug
 
-AC_OUTPUT([Makefile po/Makefile.in src/Makefile])
+	geoip .........: $have_geoip
+	libnotify .....: $have_libnotify
+	libmrss .......: $have_libmrss
+	libproxy ......: $have_libproxy
+	libappindicator: $have_libappindicator
+"
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..852a02d
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,15 @@
+SUBDIRS = icons
+
+desktop_in_files = transmission-remote-gtk.desktop.in
+desktop_FILES = $(desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
+@DESKTOP_FILE_RULES@
+
+appstream_in_files = transmission-remote-gtk.appdata.xml.in
+appstream_XML = $(appstream_in_files:.xml.in=.xml)
+@INTLTOOL_XML_RULE@
+@APPSTREAM_XML_RULES@
+
+EXTRA_DIST = $(desktop_in_files) $(appstream_in_files)
+
+DISTCLEANFILES = $(desktop_FILES) $(appstream_XML)
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
new file mode 100644
index 0000000..24bb442
--- /dev/null
+++ b/data/icons/Makefile.am
@@ -0,0 +1,25 @@
+
+icondir = $(datadir)/icons
+nobase_icon_DATA = \
+	hicolor/16x16/apps/transmission-remote-gtk.png \
+	hicolor/22x22/apps/transmission-remote-gtk.png \
+	hicolor/24x24/apps/transmission-remote-gtk.png \
+	hicolor/32x32/apps/transmission-remote-gtk.png \
+	hicolor/48x48/apps/transmission-remote-gtk.png \
+	hicolor/scalable/apps/transmission-remote-gtk.svg
+
+EXTRA_DIST = $(nobase_icon_DATA)
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
+	fi
+
diff --git a/src/hicolor_apps_16x16_transmission-remote-gtk.png b/data/icons/hicolor/16x16/apps/transmission-remote-gtk.png
index 78b1af2..78b1af2 100644
--- a/src/hicolor_apps_16x16_transmission-remote-gtk.png
+++ b/data/icons/hicolor/16x16/apps/transmission-remote-gtk.png
diff --git a/src/hicolor_apps_22x22_transmission-remote-gtk.png b/data/icons/hicolor/22x22/apps/transmission-remote-gtk.png
index 3283ea2..3283ea2 100644
--- a/src/hicolor_apps_22x22_transmission-remote-gtk.png
+++ b/data/icons/hicolor/22x22/apps/transmission-remote-gtk.png
diff --git a/src/hicolor_apps_24x24_transmission-remote-gtk.png b/data/icons/hicolor/24x24/apps/transmission-remote-gtk.png
index 6200ec0..6200ec0 100644
--- a/src/hicolor_apps_24x24_transmission-remote-gtk.png
+++ b/data/icons/hicolor/24x24/apps/transmission-remote-gtk.png
diff --git a/src/hicolor_apps_32x32_transmission-remote-gtk.png b/data/icons/hicolor/32x32/apps/transmission-remote-gtk.png
index d3d6464..d3d6464 100644
--- a/src/hicolor_apps_32x32_transmission-remote-gtk.png
+++ b/data/icons/hicolor/32x32/apps/transmission-remote-gtk.png
diff --git a/src/hicolor_apps_48x48_transmission-remote-gtk.png b/data/icons/hicolor/48x48/apps/transmission-remote-gtk.png
index 3444de8..3444de8 100644
--- a/src/hicolor_apps_48x48_transmission-remote-gtk.png
+++ b/data/icons/hicolor/48x48/apps/transmission-remote-gtk.png
diff --git a/src/hicolor_apps_scalable_transmission-remote-gtk.svg b/data/icons/hicolor/scalable/apps/transmission-remote-gtk.svg
index e9c4cec..e9c4cec 100644
--- a/src/hicolor_apps_scalable_transmission-remote-gtk.svg
+++ b/data/icons/hicolor/scalable/apps/transmission-remote-gtk.svg
diff --git a/data/transmission-remote-gtk.appdata.xml.in b/data/transmission-remote-gtk.appdata.xml.in
new file mode 100644
index 0000000..1d701f4
--- /dev/null
+++ b/data/transmission-remote-gtk.appdata.xml.in
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Alan F -->
+<component type="desktop">
+  <id>transmission-remote-gtk.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+  <project_group>GNOME</project_group>
+  <translation type="gettext">transmission-remote-gtk</translation>
+  <name>Transmission Remote</name>
+  <_developer_name>Transmission Remote Gtk Team</_developer_name>
+  <summary>Remotely manage the Transmission BitTorrent client</summary>
+  <url type="homepage">https://github.com/transmission-remote-gtk/transmission-remote-gtk</url>
+  <url type="bugtracker">https://github.com/transmission-remote-gtk/transmission-remote-gtk/issues</url>
+  <description>
+    <_p>
+    Transmission Remote Gtk allows you to remotely manage the Transmission BitTorrent client using its RPC interface.
+    </_p>
+    <_p>Features:</_p>
+    <ul>
+      <_li>Remotely add (file/url), start, stop, remove, remove and delete, verify, reannounce torrents</_li>
+      <_li>Works as a .torrent handler (eg. from a web browser)</_li>
+      <_li>Set torrent properties such as speed, seed, peer limits, file priorities, add/edit/remove trackers</_li>
+      <_li>Change remote settings like global limits, download directory, and connectivity preferences</_li>
+    </ul>
+  </description>
+  <screenshots>
+    <screenshot height="576" width="1024" type="default">
+      <image>http://eth0.org.uk/~alan/transmission-remote-gtk-1.1.1.png</image>
+    </screenshot>
+  </screenshots>
+  <update_contact>tingping_at_fedoraproject.org</update_contact>
+</component>
diff --git a/src/transmission-remote-gtk.desktop.in b/data/transmission-remote-gtk.desktop.in
index 30a9a5d..776a6f7 100644
--- a/src/transmission-remote-gtk.desktop.in
+++ b/data/transmission-remote-gtk.desktop.in
@@ -1,10 +1,10 @@
 [Desktop Entry]
-Name=Transmission Remote
-Comment=Remotely manage the Transmission BitTorrent client
-Exec=@bindir@/transmission-remote-gtk %U
+_Name=Transmission Remote
+_Comment=Remotely manage the Transmission BitTorrent client
+Exec=transmission-remote-gtk %U
 Icon=transmission-remote-gtk
 Terminal=false
-TryExec=transmission-remote-gtk
 Type=Application
 MimeType=application/x-bittorrent;x-scheme-handler/magnet;
 Categories=Network;FileTransfer;P2P;GTK;
+Keywords=p2p;bittorrent;transmission;rpc;
diff --git a/depcomp b/depcomp
deleted file mode 100755
index debb6ff..0000000
--- a/depcomp
+++ /dev/null
@@ -1,707 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2012-03-27.16; # UTC
-
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# 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.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by 'PROGRAMS ARGS'.
-  object      Object file output by 'PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputting dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-# A tabulation character.
-tab='	'
-# A newline character.
-nl='
-'
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-cygpath_u="cygpath -u -f -"
-if test "$depmode" = msvcmsys; then
-   # This is just like msvisualcpp but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u='sed s,\\\\,/,g'
-   depmode=msvisualcpp
-fi
-
-if test "$depmode" = msvc7msys; then
-   # This is just like msvc7 but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u='sed s,\\\\,/,g'
-   depmode=msvc7
-fi
-
-if test "$depmode" = xlc; then
-   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
-   gccflag=-qmakedep=gcc,-MF
-   depmode=gcc
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am.  Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-  for arg
-  do
-    case $arg in
-    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-    *)  set fnord "$@" "$arg" ;;
-    esac
-    shift # fnord
-    shift # $arg
-  done
-  "$@"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the "deleted header file" problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' "$nl" < "$tmpdepfile" |
-## Some versions of gcc put a space before the ':'.  On the theory
-## that the space means something, we add a space to the output as
-## well.  hp depmode also adds that space, but also prefixes the VPATH
-## to the object.  Take care to not repeat it in the output.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-      | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like '#:fec' to the end of the
-    # dependency line.
-    tr ' ' "$nl" < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr "$nl" ' ' >> "$depfile"
-    echo >> "$depfile"
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' "$nl" < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-xlc)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts '$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$base.u
-    tmpdepfile3=$dir.libs/$base.u
-    "$@" -Wc,-M
-  else
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$dir$base.u
-    tmpdepfile3=$dir$base.u
-    "$@" -M
-  fi
-  stat=$?
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-    exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form 'foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # '$object: dependent.h' and one to simply 'dependent.h:'.
-    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
-  # However on
-  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using '\':
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-  # tcc 0.9.26 (FIXME still under development at the moment of writing)
-  # will emit a similar output, but also prepend the continuation lines
-  # with horizontal tabulation characters.
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form 'foo.o: dependent.h',
-  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # '$object: dependent.h' and one to simply 'dependent.h:'.
-  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
-    < "$tmpdepfile" > "$depfile"
-  sed '
-    s/[ '"$tab"'][ '"$tab"']*/ /g
-    s/^ *//
-    s/ *\\*$//
-    s/^[^:]*: *//
-    /^$/d
-    /:$/d
-    s/$/ :/
-  ' < "$tmpdepfile" >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp2)
-  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-  # compilers, which have integrated preprocessors.  The correct option
-  # to use with these is +Maked; it writes dependencies to a file named
-  # 'foo.d', which lands next to the object file, wherever that
-  # happens to be.
-  # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir.libs/$base.d
-    "$@" -Wc,+Maked
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    "$@" +Maked
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-     rm -f "$tmpdepfile1" "$tmpdepfile2"
-     exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add 'dependent.h:' lines.
-    sed -ne '2,${
-	       s/^ *//
-	       s/ \\*$//
-	       s/$/:/
-	       p
-	     }' "$tmpdepfile" >> "$depfile"
-  else
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile" "$tmpdepfile2"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in 'foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-msvc7)
-  if test "$libtool" = yes; then
-    showIncludes=-Wc,-showIncludes
-  else
-    showIncludes=-showIncludes
-  fi
-  "$@" $showIncludes > "$tmpdepfile"
-  stat=$?
-  grep -v '^Note: including file: ' "$tmpdepfile"
-  if test "$stat" = 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  # The first sed program below extracts the file names and escapes
-  # backslashes for cygpath.  The second sed program outputs the file
-  # name when reading, but also accumulates all include files in the
-  # hold buffer in order to output them again at the end.  This only
-  # works with sed implementations that can handle large buffers.
-  sed < "$tmpdepfile" -n '
-/^Note: including file:  *\(.*\)/ {
-  s//\1/
-  s/\\/\\\\/g
-  p
-}' | $cygpath_u | sort -u | sed -n '
-s/ /\\ /g
-s/\(.*\)/'"$tab"'\1 \\/p
-s/.\(.*\) \\/\1:/
-H
-$ {
-  s/.*/'"$tab"'/
-  G
-  p
-}' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvc7msys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove '-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for ':'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' "$nl" < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no eat=no
-  for arg
-  do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    if test $eat = yes; then
-      eat=no
-      continue
-    fi
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -arch)
-      eat=yes ;;
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix=`echo "$object" | sed 's/^.*\././'`
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  # makedepend may prepend the VPATH from the source file name to the object.
-  # No need to regex-escape $object, excess matching of '.' is harmless.
-  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove '-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E 2>/dev/null |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
-  echo "$tab" >> "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvcmsys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/extern/Makefile.am b/extern/Makefile.am
new file mode 100644
index 0000000..f6e94d1
--- /dev/null
+++ b/extern/Makefile.am
@@ -0,0 +1,3 @@
+if HAVE_RSS
+SUBDIRS = rss-glib
+endif
diff --git a/extern/rss-glib/Makefile.am b/extern/rss-glib/Makefile.am
new file mode 100644
index 0000000..e673f73
--- /dev/null
+++ b/extern/rss-glib/Makefile.am
@@ -0,0 +1,28 @@
+
+noinst_LTLIBRARIES = librss.la
+
+librss_la_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Rss\"
+
+librss_la_CFLAGS = \
+	$(TRG_CFLAGS) \
+	$(MRSS_CFLAGS)
+
+librss_la_LIBADD = \
+	$(MRSS_LIBS)
+
+librss_la_SOURCES = \
+	rss-parser.c \
+	rss-document.c \
+	rss-item.c
+
+noinst_HEADERS = \
+	rss-document-private.h \
+	rss-item-private.h \
+	rss-parser-private.h \
+	rss-parser.h \
+	rss-document.h \
+	rss-item.h \
+	rss-version.h \
+	rss-glib.h
+        
diff --git a/extern/rss-glib/rss-document-private.h b/extern/rss-glib/rss-document-private.h
new file mode 100644
index 0000000..84889e9
--- /dev/null
+++ b/extern/rss-glib/rss-document-private.h
@@ -0,0 +1,58 @@
+/* rss-document-private.h
+ * 
+ * This file is part of RSS-GLib.
+ * Copyright (C) 2008  Christian Hergert <chris@dronelabs.com>
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author:
+ *   Christian Hergert  <chris@dronelabs.com>
+ */
+
+#ifndef __RSS_DOCUMENT_PRIVATE_H__
+#define __RSS_DOCUMENT_PRIVATE_H__
+
+#include <mrss.h>
+
+struct _RssDocumentPrivate
+{
+	gchar *encoding;
+	gchar *guid;
+	gchar *title;
+	gchar *description;
+	gchar *link;
+	gchar *language;
+	gchar *rating;
+	gchar *copyright;
+	gchar *pub_date;
+	gchar *editor;
+	gchar *editor_email;
+	gchar *editor_uri;
+	gint   ttl;
+	gchar *about;
+	gchar *contributor;
+	gchar *contributor_email;
+	gchar *contributor_uri;
+	gchar *generator;
+	gchar *generator_uri;
+	gchar *generator_version;
+	gchar *image_title;
+	gchar *image_url;
+	gchar *image_link;
+
+	GList *items;
+	GList *categories;
+};
+
+#endif /* __RSS_DOCUMENT_PRIVATE_H__ */
diff --git a/extern/rss-glib/rss-document.c b/extern/rss-glib/rss-document.c
new file mode 100644
index 0000000..c98a2f1
--- /dev/null
+++ b/extern/rss-glib/rss-document.c
@@ -0,0 +1,1085 @@
+/* rss-document.c
+ * 
+ * This file is part of RSS-GLib.
+ * Copyright (C) 2008  Christian Hergert <chris@dronelabs.com>
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author:
+ *   Christian Hergert  <chris@dronelabs.com>
+ */
+
+/**
+ * SECTION:rss-document
+ * @short_description: a RSS document representation
+ * @see_also: rss_parser_get_document()
+ *
+ * #RssDocument is the representation of the resource that was parsed. It
+ * contains a list of #RssItem<!-- -->s which in turn contain article information.
+ */
+
+#include "rss-document.h"
+#include "rss-document-private.h"
+
+G_DEFINE_TYPE (RssDocument, rss_document, G_TYPE_OBJECT);
+
+enum {
+	PROP_0,
+
+	PROP_ENCODING,
+	PROP_GUID,
+	PROP_TITLE,
+	PROP_DESCRIPTION,
+	PROP_LINK,
+	PROP_LANGUAGE,
+	PROP_RATING,
+	PROP_COPYRIGHT,
+	PROP_PUB_DATE,
+	PROP_PUB_DATE_PARSED,
+	PROP_EDITOR,
+	PROP_EDITOR_EMAIL,
+	PROP_EDITOR_URI,
+	PROP_TTL,
+	PROP_ABOUT,
+	PROP_CONTRIBUTOR,
+	PROP_CONTRIBUTOR_EMAIL,
+	PROP_CONTRIBUTOR_URI,
+	PROP_GENERATOR,
+	PROP_GENERATOR_URI,
+	PROP_GENERATOR_VERSION,
+	PROP_IMAGE_TITLE,
+	PROP_IMAGE_URL,
+	PROP_IMAGE_LINK
+};
+
+static void
+rss_document_get_property (GObject    *object,
+                           guint       property_id,
+                           GValue     *value,
+                           GParamSpec *pspec)
+{
+	RssDocumentPrivate *priv = RSS_DOCUMENT (object)->priv;
+
+	switch (property_id) {
+	case PROP_ENCODING:
+		g_value_set_string (value, priv->encoding);
+		break;
+	case PROP_GUID:
+		g_value_set_string (value, priv->guid);
+		break;
+	case PROP_TITLE:
+		g_value_set_string (value, priv->title);
+		break;
+	case PROP_DESCRIPTION:
+		g_value_set_string (value, priv->description);
+		break;
+	case PROP_LINK:
+		g_value_set_string (value, priv->link);
+		break;
+	case PROP_LANGUAGE:
+		g_value_set_string (value, priv->language);
+		break;
+	case PROP_RATING:
+		g_value_set_string (value, priv->rating);
+		break;
+	case PROP_COPYRIGHT:
+		g_value_set_string (value, priv->copyright);
+		break;
+	case PROP_PUB_DATE:
+		g_value_set_string (value, priv->pub_date);
+		break;
+	case PROP_EDITOR:
+		g_value_set_string (value, priv->editor);
+		break;
+	case PROP_EDITOR_EMAIL:
+		g_value_set_string (value, priv->editor_email);
+		break;
+	case PROP_EDITOR_URI:
+		g_value_set_string (value, priv->editor_uri);
+		break;
+	case PROP_ABOUT:
+		g_value_set_string (value, priv->about);
+		break;
+	case PROP_CONTRIBUTOR:
+		g_value_set_string (value, priv->contributor);
+		break;
+	case PROP_CONTRIBUTOR_EMAIL:
+		g_value_set_string (value, priv->contributor_email);
+		break;
+	case PROP_CONTRIBUTOR_URI:
+		g_value_set_string (value, priv->contributor_uri);
+		break;
+	case PROP_GENERATOR:
+		g_value_set_string (value, priv->generator);
+		break;
+	case PROP_GENERATOR_URI:
+		g_value_set_string (value, priv->generator_uri);
+		break;
+	case PROP_GENERATOR_VERSION:
+		g_value_set_string (value, priv->generator_version);
+		break;
+	case PROP_IMAGE_TITLE:
+		g_value_set_string (value, priv->image_title);
+		break;
+	case PROP_IMAGE_URL:
+		g_value_set_string (value, priv->image_url);
+		break;
+	case PROP_IMAGE_LINK:
+		g_value_set_string (value, priv->image_link);
+		break;
+	case PROP_TTL:
+		g_value_set_int (value, priv->ttl);
+		break;
+
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+	}
+}
+
+static void
+rss_document_set_property (GObject      *object,
+                           guint         property_id,
+                           const GValue *value,
+                           GParamSpec   *pspec)
+{
+	RssDocumentPrivate *priv = RSS_DOCUMENT (object)->priv;
+
+	switch (property_id) {
+	case PROP_ENCODING:
+		g_free (priv->encoding);
+		priv->encoding = g_value_dup_string (value);
+		break;
+	case PROP_GUID:
+		g_free (priv->guid);
+		priv->guid = g_value_dup_string (value);
+		break;
+	case PROP_TITLE:
+		g_free (priv->title);
+		priv->title = g_value_dup_string (value);
+		break;
+	case PROP_DESCRIPTION:
+		g_free (priv->description);
+		priv->description = g_value_dup_string (value);
+		break;
+	case PROP_LINK:
+		g_free (priv->link);
+		priv->link = g_value_dup_string (value);
+		break;
+	case PROP_LANGUAGE:
+		g_free (priv->language);
+		priv->language = g_value_dup_string (value);
+		break;
+	case PROP_RATING:
+		g_free (priv->rating);
+		priv->rating = g_value_dup_string (value);
+		break;
+	case PROP_COPYRIGHT:
+		g_free (priv->copyright);
+		priv->copyright = g_value_dup_string (value);
+		break;
+	case PROP_PUB_DATE:
+		g_free (priv->pub_date);
+		priv->pub_date = g_value_dup_string (value);
+		break;
+	case PROP_EDITOR:
+		g_free (priv->editor);
+		priv->editor = g_value_dup_string (value);
+		break;
+	case PROP_EDITOR_EMAIL:
+		g_free (priv->editor_email);
+		priv->editor_email = g_value_dup_string (value);
+		break;
+	case PROP_EDITOR_URI:
+		g_free (priv->editor_uri);
+		priv->editor_uri = g_value_dup_string (value);
+		break;
+	case PROP_ABOUT:
+		g_free (priv->about);
+		priv->about = g_value_dup_string (value);
+		break;
+	case PROP_CONTRIBUTOR:
+		g_free (priv->contributor);
+		priv->contributor = g_value_dup_string (value);
+		break;
+	case PROP_CONTRIBUTOR_EMAIL:
+		g_free (priv->contributor_email);
+		priv->contributor_email = g_value_dup_string (value);
+		break;
+	case PROP_CONTRIBUTOR_URI:
+		g_free (priv->contributor_uri);
+		priv->contributor_uri = g_value_dup_string (value);
+		break;
+	case PROP_GENERATOR:
+		g_free (priv->generator);
+		priv->generator = g_value_dup_string (value);
+		break;
+	case PROP_GENERATOR_URI:
+		g_free (priv->generator_uri);
+		priv->generator_uri = g_value_dup_string (value);
+		break;
+	case PROP_GENERATOR_VERSION:
+		g_free (priv->generator_version);
+		priv->generator_version = g_value_dup_string (value);
+		break;
+	case PROP_IMAGE_TITLE:
+		g_free (priv->image_title);
+		priv->image_title = g_value_dup_string (value);
+		break;
+	case PROP_IMAGE_URL:
+		g_free (priv->image_url);
+		priv->image_url = g_value_dup_string (value);
+		break;
+	case PROP_IMAGE_LINK:
+		g_free (priv->image_link);
+		priv->image_link = g_value_dup_string (value);
+		break;
+	case PROP_TTL:
+		priv->ttl = g_value_get_int (value);
+		break;
+
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+	}
+}
+
+static void
+rss_document_dispose (GObject *object)
+{
+	RssDocumentPrivate *priv = RSS_DOCUMENT (object)->priv;
+
+	g_free (priv->encoding);
+	g_free (priv->guid);
+	g_free (priv->title);
+	g_free (priv->description);
+	g_free (priv->link);
+	g_free (priv->language);
+	g_free (priv->rating);
+	g_free (priv->copyright);
+	g_free (priv->pub_date);
+	g_free (priv->editor);
+	g_free (priv->editor_email);
+	g_free (priv->editor_uri);
+	g_free (priv->about);
+	g_free (priv->contributor);
+	g_free (priv->contributor_email);
+	g_free (priv->contributor_uri);
+	g_free (priv->generator);
+	g_free (priv->generator_uri);
+	g_free (priv->generator_version);
+	g_free (priv->image_title);
+	g_free (priv->image_url);
+	g_free (priv->image_link);
+
+	/* free the items */
+	g_list_foreach (priv->items, (GFunc) g_object_unref, NULL);
+	g_list_free (priv->items);
+
+	/* free the category strings */
+	g_list_foreach (priv->categories, (GFunc) g_free, NULL);
+	g_list_free (priv->categories);
+
+	G_OBJECT_CLASS (rss_document_parent_class)->dispose (object);
+}
+
+static void
+rss_document_class_init (RssDocumentClass *klass)
+{
+	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+	GParamSpec *pspec;
+
+	g_type_class_add_private (klass, sizeof (RssDocumentPrivate));
+
+	gobject_class->get_property = rss_document_get_property;
+	gobject_class->set_property = rss_document_set_property;
+	gobject_class->dispose = rss_document_dispose;
+
+	/**
+	 * RssDocument:encoding:
+	 *
+	 * The encoding of the #RssDocument.
+	 */
+	pspec = g_param_spec_string ("encoding",
+	                             "Encoding",
+	                             "Encoding of the document",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_ENCODING,
+	                                 pspec);
+
+	/**
+	 * RssDocument:guid:
+	 *
+	 * The guid associated with the feed. This is often the url of the
+	 * feed.
+	 */
+	pspec = g_param_spec_string ("guid",
+	                             "GUID",
+	                             "The GUID of the document",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_GUID,
+	                                 pspec);
+
+	/**
+	 * RssDocument:title:
+	 *
+	 * The title of the #RssDocument.
+	 */
+	pspec = g_param_spec_string ("title",
+	                             "Title",
+	                             "Title of the document",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_TITLE,
+	                                 pspec);
+
+	/**
+	 * RssDocument:description:
+	 *
+	 * The description of the #RssDocument.
+	 */
+	pspec = g_param_spec_string ("description",
+	                             "Description",
+	                             "Description of the document",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_DESCRIPTION,
+	                                 pspec);
+
+	/**
+	 * RssDocument:link:
+	 *
+	 * The link to the source document.  This is parsed from the actual
+	 * document and can point to whatever the source publisher choses.
+	 */
+	pspec = g_param_spec_string ("link",
+	                             "Link",
+	                             "The link to the source document",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_LINK,
+	                                 pspec);
+
+	/**
+	 * RssDocument:language:
+	 *
+	 * The language the #RssDocument was published in.
+	 */
+	pspec = g_param_spec_string ("language",
+	                             "Language",
+	                             "Language of the document",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_LANGUAGE,
+	                                 pspec);
+
+	/**
+	 * RssDocument:rating:
+	 *
+	 * The rating associated with the #RssDocument.
+	 */
+	pspec = g_param_spec_string ("rating",
+	                             "Rating",
+	                             "Rating of the document",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_RATING,
+	                                 pspec);
+
+	/**
+	 * RssDocument:copyright:
+	 *
+	 * The copyright of the #RssDocument.
+	 */
+	pspec = g_param_spec_string ("copyright",
+	                             "Copyright",
+	                             "Copyright of the document",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_COPYRIGHT,
+	                                 pspec);
+
+	/**
+	 * RssDocument:pub-date:
+	 *
+	 * The string representation of the date the document was published.
+	 */
+	pspec = g_param_spec_string ("pub-date",
+	                             "Publication Date",
+	                             "Publication date of the document",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_PUB_DATE,
+	                                 pspec);
+
+	/**
+	 * RssDocument:editor:
+	 *
+	 * The name of the editor.
+	 */
+	pspec = g_param_spec_string ("editor",
+	                             "Editor",
+	                             "Editor of the document",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_EDITOR,
+	                                 pspec);
+
+	/**
+	 * RssDocument:editor-email:
+	 *
+	 * The email address of the editor.
+	 */
+	pspec = g_param_spec_string ("editor-email",
+	                             "Editor Email",
+	                             "Email of the editor",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_EDITOR_EMAIL,
+	                                 pspec);
+
+	/**
+	 * RssDocument:editor-uri:
+	 *
+	 * The uri for more information about the editor.
+	 */
+	pspec = g_param_spec_string ("editor-uri",
+	                             "Editor URI",
+	                             "The URI of the editor",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_EDITOR_URI,
+	                                 pspec);
+
+	/**
+	 * RssDocument:about:
+	 *
+	 * Information about the #RssDocument.
+	 */
+	pspec = g_param_spec_string ("about",
+	                             "About",
+	                             "Information about the document",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_ABOUT,
+	                                 pspec);
+
+	/**
+	 * RssDocument:contributor:
+	 *
+	 * The name of the particular contributor.
+	 */
+	pspec = g_param_spec_string ("contributor",
+	                             "Contributor",
+	                             "Name of the contributor",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_CONTRIBUTOR,
+	                                 pspec);
+
+	/**
+	 * RssDocument:contributor-email:
+	 *
+	 * The email of the particular contributor.
+	 */
+	pspec = g_param_spec_string ("contributor-email",
+	                             "Contributor Email",
+	                             "Email of the contributor",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_CONTRIBUTOR_EMAIL,
+	                                 pspec);
+
+	/**
+	 * RssDocument:contributor-uri:
+	 *
+	 * The uri to more information on the particular contributer.
+	 */
+	pspec = g_param_spec_string ("contributor-uri",
+	                             "Contributor URI",
+	                             "URI of the contributor",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_CONTRIBUTOR_URI,
+	                                 pspec);
+
+	/**
+	 * RssDocument:generator:
+	 *
+	 * The name of the generator on the server side.
+	 */
+	pspec = g_param_spec_string ("generator",
+	                             "Generator",
+	                             "Name of the document generator",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_GENERATOR,
+	                                 pspec);
+
+	/**
+	 * RssDocument:generator-uri:
+	 *
+	 * Url to more information about the generator on the server side.
+	 */
+	pspec = g_param_spec_string ("generator-uri",
+	                             "Generator URI",
+	                             "URI of the document generator",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_GENERATOR_URI,
+	                                 pspec);
+
+	/**
+	 * RssDocument:generator-version:
+	 *
+	 * The version of the server side generator.
+	 */
+	pspec = g_param_spec_string ("generator-version",
+	                             "Generator Version",
+	                             "Version of the document generator",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_GENERATOR_VERSION,
+	                                 pspec);
+
+	/**
+	 * RssDocument:image-title:
+	 *
+	 * The title for the image.  This is often the alt="" tag in HTML.
+	 */
+	pspec = g_param_spec_string ("image-title",
+	                             "Image Title",
+	                             "Title of the image for the document",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_IMAGE_TITLE,
+	                                 pspec);
+
+	/**
+	 * RssDocument:image-url:
+	 *
+	 * A url to the image for the RssDocument.  Use this before checking
+	 * for a favicon.ico.
+	 */
+	pspec = g_param_spec_string ("image-url",
+	                             "Image URL",
+	                             "URL of the image for the document",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_IMAGE_URL,
+	                                 pspec);
+
+	/**
+	 * RssDocument:image-link:
+	 *
+	 * The url a user should be redirected to when clicking on the image
+	 * for the #RssDocument.  Of course, its up to UI designers if they
+	 * wish to implement this in any sort of way.
+	 */
+	pspec = g_param_spec_string ("image-link",
+	                             "Image Link",
+	                             "URL for document image link",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_IMAGE_LINK,
+	                                 pspec);
+
+	/**
+	 * RssDocument:ttl:
+	 *
+	 * The publisher determined TTL for the source. Readers should try
+	 * to respect this value and not update feeds any more often than
+	 * necessary.
+	 */
+	pspec = g_param_spec_int ("ttl",
+	                          "TTL",
+	                          "Time to live for the document",
+	                          0, G_MAXINT32, 0,
+	                          G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_TTL,
+	                                 pspec);
+}
+
+static void
+rss_document_init (RssDocument *self)
+{
+	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, RSS_TYPE_DOCUMENT,
+	                                          RssDocumentPrivate);
+}
+
+/**
+ * rss_document_new:
+ *
+ * Creates a new instance of #RssDocument.  This isn't incredibly useful
+ * currently, but is here none-the-less.  The desire is to create an
+ * RSS generator that will allow for building RSS streams out of the
+ * document hierarchy.
+ *
+ * Returns: a new #RssDocument. Use g_object_unref() when you are done.
+ */
+RssDocument*
+rss_document_new (void)
+{
+	return g_object_new (RSS_TYPE_DOCUMENT, NULL);
+}
+
+/**
+ * rss_document_get_items:
+ * @self: a #RssDocument
+ *
+ * Creates a #GList of #RssItem<!-- -->s that were found in the syndication. The objects
+ * in the list are weak references. Consumers of those objects should ref
+ * them with g_object_ref.
+ *
+ * Returns: a new #GList owned by the caller.
+ */
+GList*
+rss_document_get_items (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return g_list_copy (self->priv->items);
+}
+
+/**
+ * rss_document_get_categories:
+ * @self: a #RssDocument
+ *
+ * Creates a #GList of categories found in the syndication. The strings
+ * in the list are weak references.  Consumers should duplicate them
+ * with g_strdup().
+ *
+ * Returns: a new #GList owned by the caller
+ */
+GList*
+rss_document_get_categories (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return g_list_copy (self->priv->categories);
+}
+
+/**
+ * rss_document_get_guid:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:guid field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_guid (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->guid;
+}
+
+/**
+ * rss_document_get_about:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:about field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_about (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->about;
+}
+
+/**
+ * rss_document_get_title:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:title field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_title (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->title;
+}
+
+/**
+ * rss_document_get_description:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:description field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_description (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->description;
+}
+
+/**
+ * rss_document_get_link:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:link field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_link (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->link;
+}
+
+/**
+ * rss_document_get_encoding:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:encoding field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_encoding (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->encoding;
+}
+
+/**
+ * rss_document_get_language:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:language field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_language (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->language;
+}
+
+/**
+ * rss_document_get_rating:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:rating field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_rating (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->rating;
+}
+
+/**
+ * rss_document_get_copyright:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:copyright field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_copyright (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->copyright;
+}
+
+/**
+ * rss_document_get_pub_date:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:pub-date field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_pub_date (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->pub_date;
+}
+
+/**
+ * rss_document_get_editor_name:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:editor field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_editor_name (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->editor;
+}
+
+/**
+ * rss_document_get_editor_email:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:editor-email field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_editor_email (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->editor_email;
+}
+
+/**
+ * rss_document_get_editor_uri:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:editor-uri field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_editor_uri (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->editor_uri;
+}
+
+/**
+ * rss_document_get_contributor:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:contributor field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_contributor_name (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->contributor;
+}
+
+/**
+ * rss_document_get_contributor_email:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:contributor-email field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_contributor_email (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->contributor_email;
+}
+
+/**
+ * rss_document_get_contributor_uri:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:contributor-uri field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_contributor_uri (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->contributor_uri;
+}
+
+/**
+ * rss_document_get_generator_name:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:generator-name field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_generator_name (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->generator;
+}
+
+/**
+ * rss_document_get_generator_uri:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:generator-uri field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_generator_uri (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->generator_uri;
+}
+
+/**
+ * rss_document_get_generator_version:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:generator-version field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_generator_version (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->generator_version;
+}
+
+/**
+ * rss_document_get_image_title:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:image-title field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_image_title (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->image_title;
+}
+
+/**
+ * rss_document_get_image_url:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:image-url field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_image_url (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->image_url;
+}
+
+/**
+ * rss_document_get_image_link:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:image-link field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+const gchar *
+rss_document_get_image_link (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), NULL);
+
+	return self->priv->image_link;
+}
+
+/**
+ * rss_document_get_ttl:
+ * @self: a #RssDocument
+ *
+ * Retrieves the #RssDocument:ttl field.
+ *
+ * Return value: the contents of the field. The returned string is
+ *   owned by the #RssDocument and should never be modified of freed
+ */
+gint
+rss_document_get_ttl (RssDocument *self)
+{
+	g_return_val_if_fail (RSS_IS_DOCUMENT (self), 0);
+
+	return self->priv->ttl;
+}
diff --git a/extern/rss-glib/rss-document.h b/extern/rss-glib/rss-document.h
new file mode 100644
index 0000000..58c995a
--- /dev/null
+++ b/extern/rss-glib/rss-document.h
@@ -0,0 +1,105 @@
+/* rss-document.h
+ * 
+ * This file is part of RSS-GLib.
+ * Copyright (C) 2008  Christian Hergert <chris@dronelabs.com>
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author:
+ *   Christian Hergert  <chris@dronelabs.com>
+ */
+
+#ifndef __RSS_DOCUMENT_H__
+#define __RSS_DOCUMENT_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define RSS_TYPE_DOCUMENT rss_document_get_type()
+
+#define RSS_DOCUMENT(obj)				\
+	(G_TYPE_CHECK_INSTANCE_CAST ((obj),		\
+	RSS_TYPE_DOCUMENT,				\
+	RssDocument))
+
+#define RSS_DOCUMENT_CLASS(klass)			\
+	(G_TYPE_CHECK_CLASS_CAST ((klass),		\
+	RSS_TYPE_DOCUMENT,				\
+	RssDocumentClass))
+
+#define RSS_IS_DOCUMENT(obj)				\
+	(G_TYPE_CHECK_INSTANCE_TYPE ((obj),		\
+	RSS_TYPE_DOCUMENT))
+
+#define RSS_IS_DOCUMENT_CLASS(klass)			\
+	(G_TYPE_CHECK_CLASS_TYPE ((klass),		\
+	RSS_TYPE_DOCUMENT))
+
+#define RSS_DOCUMENT_GET_CLASS(obj)			\
+	(G_TYPE_INSTANCE_GET_CLASS ((obj),		\
+	RSS_TYPE_DOCUMENT,				\
+	RssDocumentClass))
+
+typedef struct _RssDocument             RssDocument;
+typedef struct _RssDocumentPrivate      RssDocumentPrivate;
+typedef struct _RssDocumentClass        RssDocumentClass;
+
+struct _RssDocument
+{
+        /*< private >*/
+        GObject parent_instance;
+
+        RssDocumentPrivate *priv;
+};
+
+struct _RssDocumentClass
+{
+        /*< private >*/
+        GObjectClass parent_class;
+};
+
+GType                 rss_document_get_type       (void);
+RssDocument*          rss_document_new            (void);
+
+const gchar *rss_document_get_guid              (RssDocument *self);
+const gchar *rss_document_get_about             (RssDocument *self);
+const gchar *rss_document_get_title             (RssDocument *self);
+const gchar *rss_document_get_description       (RssDocument *self);
+const gchar *rss_document_get_link              (RssDocument *self);
+const gchar *rss_document_get_encoding          (RssDocument *self);
+const gchar *rss_document_get_language          (RssDocument *self);
+const gchar *rss_document_get_rating            (RssDocument *self);
+const gchar *rss_document_get_copyright         (RssDocument *self);
+const gchar *rss_document_get_pub_date          (RssDocument *self);
+const gchar *rss_document_get_editor_name       (RssDocument *self);
+const gchar *rss_document_get_editor_email      (RssDocument *self);
+const gchar *rss_document_get_editor_uri        (RssDocument *self);
+const gchar *rss_document_get_contributor_name  (RssDocument *self);
+const gchar *rss_document_get_contributor_email (RssDocument *self);
+const gchar *rss_document_get_contributor_uri   (RssDocument *self);
+const gchar *rss_document_get_generator_name    (RssDocument *self);
+const gchar *rss_document_get_generator_uri     (RssDocument *self);
+const gchar *rss_document_get_generator_version (RssDocument *self);
+const gchar *rss_document_get_image_title       (RssDocument *self);
+const gchar *rss_document_get_image_url         (RssDocument *self);
+const gchar *rss_document_get_image_link        (RssDocument *self);
+gint                  rss_document_get_ttl               (RssDocument *self);
+
+GList *               rss_document_get_items             (RssDocument *self);
+GList *               rss_document_get_categories        (RssDocument *self);
+
+G_END_DECLS
+
+#endif /* __RSS_DOCUMENT_H__ */
diff --git a/extern/rss-glib/rss-glib.h b/extern/rss-glib/rss-glib.h
new file mode 100644
index 0000000..57667f7
--- /dev/null
+++ b/extern/rss-glib/rss-glib.h
@@ -0,0 +1,9 @@
+#ifndef __RSS_GLIB_H__
+#define __RSS_GLIB_H__
+
+#include <rss-glib/rss-parser.h>
+#include <rss-glib/rss-document.h>
+#include <rss-glib/rss-item.h>
+#include <rss-glib/rss-version.h>
+
+#endif /* __RSS_GLIB_H__ */
diff --git a/extern/rss-glib/rss-item-private.h b/extern/rss-glib/rss-item-private.h
new file mode 100644
index 0000000..9882ac0
--- /dev/null
+++ b/extern/rss-glib/rss-item-private.h
@@ -0,0 +1,46 @@
+/* rss-item-private.h
+ * 
+ * This file is part of RSS-GLib.
+ * Copyright (C) 2008  Christian Hergert <chris@dronelabs.com>
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author:
+ *   Christian Hergert  <chris@dronelabs.com>
+ */
+
+#ifndef __RSS_ITEM_PRIVATE_H__
+#define __RSS_ITEM_PRIVATE_H__
+
+struct _RssItemPrivate {
+	gchar *guid;
+	gchar *title;
+	gchar *link;
+	gchar *description;
+	gchar *copyright;
+	gchar *author;
+	gchar *author_uri;
+	gchar *author_email;
+	gchar *contributor;
+	gchar *contributor_uri;
+	gchar *contributor_email;
+	gchar *comments;
+	gchar *pub_date;
+	gchar *source;
+	gchar *source_url;
+
+	GList *categories;
+};
+
+#endif /* __RSS_ITEM_PRIVATE_H__ */
diff --git a/extern/rss-glib/rss-item.c b/extern/rss-glib/rss-item.c
new file mode 100644
index 0000000..0f84661
--- /dev/null
+++ b/extern/rss-glib/rss-item.c
@@ -0,0 +1,738 @@
+/* rss-item.c
+ * 
+ * This file is part of RSS-GLib.
+ * Copyright (C) 2008  Christian Hergert <chris@dronelabs.com>
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author:
+ *   Christian Hergert  <chris@dronelabs.com>
+ */
+
+/**
+ * SECTION:rss-item
+ * @short_description: a RSS entry representation
+ *
+ * #RssItem is the representation of an individual item parsed from a
+ * #RssDocument.  This would mean an individual article, or note within
+ * the source feed.
+ */
+
+#include "rss-item.h"
+#include "rss-item-private.h"
+
+G_DEFINE_TYPE (RssItem, rss_item, G_TYPE_OBJECT);
+
+enum {
+	PROP_0,
+
+	PROP_TITLE,
+	PROP_LINK,
+	PROP_DESCRIPTION,
+	PROP_COPYRIGHT,
+	PROP_AUTHOR,
+	PROP_AUTHOR_URI,
+	PROP_AUTHOR_EMAIL,
+	PROP_CONTRIBUTOR,
+	PROP_CONTRIBUTOR_URI,
+	PROP_CONTRIBUTOR_EMAIL,
+	PROP_COMMENTS,
+	PROP_PUB_DATE,
+	PROP_GUID,
+	PROP_SOURCE,
+	PROP_SOURCE_URL
+};
+
+static void
+rss_item_get_property (GObject    *object,
+                       guint       property_id,
+                       GValue     *value,
+                       GParamSpec *pspec)
+{
+	RssItemPrivate *priv = RSS_ITEM (object)->priv;
+
+	switch (property_id) {
+	case PROP_TITLE:
+		g_value_set_string (value, priv->title);
+		break;
+	case PROP_LINK:
+		g_value_set_string (value, priv->link);
+		break;
+	case PROP_DESCRIPTION:
+		g_value_set_string (value, priv->description);
+		break;
+	case PROP_COPYRIGHT:
+		g_value_set_string (value, priv->copyright);
+		break;
+	case PROP_AUTHOR:
+		g_value_set_string (value, priv->author);
+		break;
+	case PROP_AUTHOR_URI:
+		g_value_set_string (value, priv->author_uri);
+		break;
+	case PROP_AUTHOR_EMAIL:
+		g_value_set_string (value, priv->author_email);
+		break;
+	case PROP_CONTRIBUTOR:
+		g_value_set_string (value, priv->contributor);
+		break;
+	case PROP_CONTRIBUTOR_URI:
+		g_value_set_string (value, priv->contributor_uri);
+		break;
+	case PROP_CONTRIBUTOR_EMAIL:
+		g_value_set_string (value, priv->contributor_email);
+		break;
+	case PROP_COMMENTS:
+		g_value_set_string (value, priv->comments);
+		break;
+	case PROP_PUB_DATE:
+		g_value_set_string (value, priv->pub_date);
+		break;
+	case PROP_GUID:
+		g_value_set_string (value, priv->guid);
+		break;
+	case PROP_SOURCE:
+		g_value_set_string (value, priv->source);
+		break;
+	case PROP_SOURCE_URL:
+		g_value_set_string (value, priv->source_url);
+		break;
+
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+	}
+}
+
+static void
+rss_item_set_property (GObject      *object,
+                       guint         property_id,
+                       const GValue *value,
+                       GParamSpec   *pspec)
+{
+	RssItemPrivate *priv = RSS_ITEM (object)->priv;
+
+	switch (property_id) {
+	case PROP_TITLE:
+		g_free (priv->title);
+		priv->title = g_value_dup_string (value);
+		break;
+	case PROP_LINK:
+		g_free (priv->link);
+		priv->link = g_value_dup_string (value);
+		break;
+	case PROP_DESCRIPTION:
+		g_free (priv->description);
+		priv->description = g_value_dup_string (value);
+		break;
+	case PROP_COPYRIGHT:
+		g_free (priv->copyright);
+		priv->copyright = g_value_dup_string (value);
+		break;
+	case PROP_AUTHOR:
+		g_free (priv->author);
+		priv->author = g_value_dup_string (value);
+		break;
+	case PROP_AUTHOR_URI:
+		g_free (priv->author_uri);
+		priv->author_uri = g_value_dup_string (value);
+		break;
+	case PROP_AUTHOR_EMAIL:
+		g_free (priv->author_email);
+		priv->author_email = g_value_dup_string (value);
+		break;
+	case PROP_CONTRIBUTOR:
+		g_free (priv->contributor);
+		priv->contributor = g_value_dup_string (value);
+		break;
+	case PROP_CONTRIBUTOR_URI:
+		g_free (priv->contributor_uri);
+		priv->contributor_uri = g_value_dup_string (value);
+		break;
+	case PROP_CONTRIBUTOR_EMAIL:
+		g_free (priv->contributor_email);
+		priv->contributor_email = g_value_dup_string (value);
+		break;
+	case PROP_COMMENTS:
+		g_free (priv->comments);
+		priv->comments = g_value_dup_string (value);
+		break;
+	case PROP_PUB_DATE:
+		g_free (priv->pub_date);
+		priv->pub_date = g_value_dup_string (value);
+		break;
+	case PROP_GUID:
+		g_free (priv->guid);
+		priv->guid = g_value_dup_string (value);
+		break;
+	case PROP_SOURCE:
+		g_free (priv->source);
+		priv->source = g_value_dup_string (value);
+		break;
+	case PROP_SOURCE_URL:
+		g_free (priv->source_url);
+		priv->source_url = g_value_dup_string (value);
+		break;
+
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+	}
+}
+
+static void
+rss_item_finalize (GObject *object)
+{
+	RssItemPrivate *priv = RSS_ITEM (object)->priv;
+
+	g_free (priv->guid);
+	g_free (priv->title);
+	g_free (priv->link);
+	g_free (priv->description);
+	g_free (priv->copyright);
+	g_free (priv->author);
+	g_free (priv->author_uri);
+	g_free (priv->author_email);
+	g_free (priv->contributor);
+	g_free (priv->contributor_uri);
+	g_free (priv->contributor_email);
+	g_free (priv->comments);
+	g_free (priv->pub_date);
+	g_free (priv->source);
+	g_free (priv->source_url);
+  
+	g_list_foreach (priv->categories, (GFunc) g_free, NULL);
+	g_list_free (priv->categories);
+
+	G_OBJECT_CLASS (rss_item_parent_class)->finalize (object);
+}
+
+static void
+rss_item_class_init (RssItemClass *klass)
+{
+	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+	GParamSpec *pspec;
+
+	g_type_class_add_private (klass, sizeof (RssItemPrivate));
+
+	gobject_class->get_property = rss_item_get_property;
+	gobject_class->set_property = rss_item_set_property;
+	gobject_class->finalize = rss_item_finalize;
+
+	/**
+	 * RssItem:title:
+	 *
+	 * The title of the item.
+	 */
+	pspec = g_param_spec_string ("title",
+	                             "Title",
+	                             "Title of the item",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+	                                 PROP_TITLE,
+	                                 pspec);
+
+	/**
+	 * RssItem:link:
+	 *
+	 * The link to the upstream source of the item.
+	 */
+	pspec = g_param_spec_string ("link",
+	                             "Link",
+	                             "Link to the upstream source",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+                                     PROP_LINK,
+                                     pspec);
+
+	/**
+	 * RssItem:description:
+	 *
+	 * The description of the item.  This is often where the actual
+	 * content for the item is stored.
+	 */
+	pspec = g_param_spec_string ("description",
+	                             "Description",
+	                             "Description of the item",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+                                     PROP_DESCRIPTION,
+                                     pspec);
+
+	/**
+	 * RssItem:copyright:
+	 *
+	 * Any associated copyright that may exist for the content.
+	 */
+	pspec = g_param_spec_string ("copyright",
+	                             "Copyright",
+	                             "Any associated copyright for "
+	                             "the content",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+                                     PROP_COPYRIGHT,
+                                     pspec);
+
+	/**
+	 * RssItem:author:
+	 *
+	 * The author's name.
+	 */
+	pspec = g_param_spec_string ("author",
+	                             "Author",
+	                             "The name of the author",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+                                     PROP_AUTHOR,
+                                     pspec);
+
+	/**
+	 * RssItem:author-uri:
+	 *
+	 * The authors uri, often a website.
+	 */
+	pspec = g_param_spec_string ("author-uri",
+	                             "Author URI",
+	                             "The URI of the author",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+                                     PROP_AUTHOR_URI,
+                                     pspec);
+
+	/**
+	 * RssItem:author-email:
+	 *
+	 * The authors email.
+	 */
+	pspec = g_param_spec_string ("author-email",
+	                             "Author Email",
+	                             "The email address of the author",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+                                     PROP_AUTHOR_EMAIL,
+                                     pspec);
+
+	/**
+	 * RssItem:contributor:
+	 *
+	 * The contributors name.
+	 */
+	pspec = g_param_spec_string ("contributor",
+	                             "Contributor",
+	                             "The name of the contributor",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+                                     PROP_CONTRIBUTOR,
+                                     pspec);
+
+	/**
+	 * RssItem:contributor-uri:
+	 *
+	 * The contributors uri, often a website.
+	 */
+	pspec = g_param_spec_string ("contributor-uri",
+	                             "Contributor URI",
+	                             "The URI of the contributor",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+                                     PROP_CONTRIBUTOR_URI,
+                                     pspec);
+
+	/**
+	 * RssItem:contributor-email:
+	 *
+	 * The contributors email.
+	 */
+	pspec = g_param_spec_string ("contributor-email",
+	                             "Contributor Email",
+	                             "The email of the contributor",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+                                     PROP_CONTRIBUTOR_EMAIL,
+                                     pspec);
+
+	/**
+	 * RssItem:comments:
+	 *
+	 * Any comments that may have been associated with the item.
+	 */
+	pspec = g_param_spec_string ("comments",
+	                             "Comments",
+	                             "Any comment associated to the item",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+                                     PROP_COMMENTS,
+                                     pspec);
+
+	/**
+	 * RssItem:pub-date:
+	 *
+	 * The string representation of the publish date.
+	 */
+	pspec = g_param_spec_string ("pub-date",
+	                             "Publication Date",
+	                             "The date of publication",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+                                     PROP_PUB_DATE,
+                                     pspec);
+
+	/**
+	 * RssItem:guid:
+	 *
+	 * The guid of the item. Many feed engines will use the url here
+	 * plus some tag metadata.
+	 */
+	pspec = g_param_spec_string ("guid",
+	                             "GUID",
+	                             "The guid of the item",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+                                     PROP_GUID,
+                                     pspec);
+
+	/**
+	 * RssItem:source:
+	 *
+	 * The name of the source of the item.
+	 */
+	pspec = g_param_spec_string ("source",
+	                             "Source",
+	                             "Source of the item",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+                                     PROP_SOURCE,
+                                     pspec);
+
+	/**
+	 * RssItem:source-url:
+	 *
+	 * The url of the source of the item.
+	 */
+	pspec = g_param_spec_string ("source-url",
+	                             "Source URL",
+	                             "URL of the source",
+	                             NULL,
+	                             G_PARAM_READWRITE);
+	g_object_class_install_property (gobject_class,
+                                     PROP_SOURCE_URL,
+                                     pspec);
+}
+
+static void
+rss_item_init (RssItem *self)
+{
+	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, RSS_TYPE_ITEM, RssItemPrivate);
+}
+
+/**
+ * rss_item_new:
+ *
+ * Creates a new #RssItem.  This isn't incredibly useful yet as we do not
+ * have an RssGenerator written.  However, that will come eventuall and
+ * make creating feeds much simpler.
+ *
+ * Returns: a new #RssItem which should be unref'd with g_object_unref().
+ */
+RssItem*
+rss_item_new (void)
+{
+	return g_object_new (RSS_TYPE_ITEM, NULL);
+}
+
+/**
+ * rss_item_get_guid:
+ * @self: a #RssItem
+ *
+ * Retrieves the #RssItem:guid field.
+ *
+ * Return value: the value of the field. The returned string is
+ *   owned by the #RssItem and should never be modified or freed.
+ */
+const gchar *
+rss_item_get_guid (RssItem *self)
+{
+	g_return_val_if_fail (RSS_IS_ITEM (self), NULL);
+
+	return self->priv->guid;
+}
+
+/**
+ * rss_item_get_title:
+ * @self: a #RssItem
+ *
+ * Retrieves the #RssItem:title field.
+ *
+ * Return value: the value of the field. The returned string is
+ *   owned by the #RssItem and should never be modified or freed.
+ */
+const gchar *
+rss_item_get_title (RssItem *self)
+{
+	g_return_val_if_fail (RSS_IS_ITEM (self), NULL);
+
+	return self->priv->title;
+}
+
+/**
+ * rss_item_get_link:
+ * @self: a #RssItem
+ *
+ * Retrieves the #RssItem:link field.
+ *
+ * Return value: the value of the field. The returned string is
+ *   owned by the #RssItem and should never be modified or freed.
+ */
+const gchar *
+rss_item_get_link (RssItem *self)
+{
+        g_return_val_if_fail (RSS_IS_ITEM (self), NULL);
+
+        return self->priv->link;
+}
+
+/**
+ * rss_item_get_description:
+ * @self: a #RssItem
+ *
+ * Retrieves the #RssItem:description field.
+ *
+ * Return value: the value of the field. The returned string is
+ *   owned by the #RssItem and should never be modified or freed.
+ */
+const gchar *
+rss_item_get_description (RssItem *self)
+{
+	g_return_val_if_fail (RSS_IS_ITEM (self), NULL);
+
+	return self->priv->description;
+}
+
+/**
+ * rss_item_get_copyright:
+ * @self: a #RssItem
+ *
+ * Retrieves the #RssItem:copyright field.
+ *
+ * Return value: the value of the field. The returned string is
+ *   owned by the #RssItem and should never be modified or freed.
+ */
+const gchar *
+rss_item_get_copyright (RssItem *self)
+{
+	g_return_val_if_fail (RSS_IS_ITEM (self), NULL);
+
+	return self->priv->copyright;
+}
+
+/**
+ * rss_item_get_author_name:
+ * @self: a #RssItem
+ *
+ * Retrieves the #RssItem:author field.
+ *
+ * Return value: the value of the field. The returned string is
+ *   owned by the #RssItem and should never be modified or freed.
+ */
+const gchar *
+rss_item_get_author_name (RssItem *self)
+{
+	g_return_val_if_fail (RSS_IS_ITEM (self), NULL);
+
+	return self->priv->author;
+}
+
+/**
+ * rss_item_get_author_uri:
+ * @self: a #RssItem
+ *
+ * Retrieves the #RssItem:author-uri field.
+ *
+ * Return value: the value of the field. The returned string is
+ *   owned by the #RssItem and should never be modified or freed.
+ */
+const gchar *
+rss_item_get_author_uri (RssItem *self)
+{
+	g_return_val_if_fail (RSS_IS_ITEM (self), NULL);
+
+	return self->priv->author_uri;
+}
+
+/**
+ * rss_item_get_author_email:
+ * @self: a #RssItem
+ *
+ * Retrieves the #RssItem:author-email field.
+ *
+ * Return value: the value of the field. The returned string is
+ *   owned by the #RssItem and should never be modified or freed.
+ */
+const gchar *
+rss_item_get_author_email (RssItem *self)
+{
+	g_return_val_if_fail (RSS_IS_ITEM (self), NULL);
+
+	return self->priv->author_email;
+}
+
+/**
+ * rss_item_get_contributor_name:
+ * @self: a #RssItem
+ *
+ * Retrieves the #RssItem:contributor field.
+ *
+ * Return value: the value of the field. The returned string is
+ *   owned by the #RssItem and should never be modified or freed.
+ */
+const gchar *
+rss_item_get_contributor_name (RssItem *self)
+{
+	g_return_val_if_fail (RSS_IS_ITEM (self), NULL);
+
+	return self->priv->contributor;
+}
+
+/**
+ * rss_item_get_contributor_uri:
+ * @self: a #RssItem
+ *
+ * Retrieves the #RssItem:contributor-uri field.
+ *
+ * Return value: the value of the field. The returned string is
+ *   owned by the #RssItem and should never be modified or freed.
+ */
+const gchar *
+rss_item_get_contributor_uri (RssItem *self)
+{
+	g_return_val_if_fail (RSS_IS_ITEM (self), NULL);
+
+	return self->priv->contributor_uri;
+}
+
+/**
+ * rss_item_get_contributor_email:
+ * @self: a #RssItem
+ *
+ * Retrieves the #RssItem:contributor-email field.
+ *
+ * Return value: the value of the field. The returned string is
+ *   owned by the #RssItem and should never be modified or freed.
+ */
+const gchar *
+rss_item_get_contributor_email (RssItem *self)
+{
+	g_return_val_if_fail (RSS_IS_ITEM (self), NULL);
+
+	return self->priv->contributor_email;
+}
+
+/**
+ * rss_item_get_comments:
+ * @self: a #RssItem
+ *
+ * Retrieves the #RssItem:comments field.
+ *
+ * Return value: the value of the field. The returned string is
+ *   owned by the #RssItem and should never be modified or freed.
+ */
+const gchar *
+rss_item_get_comments (RssItem *self)
+{
+	g_return_val_if_fail (RSS_IS_ITEM (self), NULL);
+
+	return self->priv->comments;
+}
+
+/**
+ * rss_item_get_pub_date:
+ * @self: a #RssItem
+ *
+ * Retrieves the #RssItem:pub-date field.
+ *
+ * Return value: the value of the field. The returned string is
+ *   owned by the #RssItem and should never be modified or freed.
+ */
+const gchar *
+rss_item_get_pub_date (RssItem *self)
+{
+	g_return_val_if_fail (RSS_IS_ITEM (self), NULL);
+
+	return self->priv->pub_date;
+}
+
+/**
+ * rss_item_get_source:
+ * @self: a #RssItem
+ *
+ * Retrieves the #RssItem:source field.
+ *
+ * Return value: the value of the field. The returned string is
+ *   owned by the #RssItem and should never be modified or freed.
+ */
+const gchar *
+rss_item_get_source (RssItem *self)
+{
+	g_return_val_if_fail (RSS_IS_ITEM (self), NULL);
+
+	return self->priv->source;
+}
+
+/**
+ * rss_item_get_source_url:
+ * @self: a #RssItem
+ *
+ * Retrieves the #RssItem:source-url field.
+ *
+ * Return value: the value of the field. The returned string is
+ *   owned by the #RssItem and should never be modified or freed.
+ */
+const gchar *
+rss_item_get_source_url (RssItem *self)
+{
+	g_return_val_if_fail (RSS_IS_ITEM (self), NULL);
+
+	return self->priv->source_url;
+}
+
+/**
+ * rss_item_get_categories:
+ * @self: a #RssItem
+ *
+ * Returns a copy of the list of categories for the #RssItem. The data
+ * in the linked list are pointers to strings (char*).  They are owned
+ * by the #RssItem and should not be modified.  Use g_strdup() to copy
+ * the individual strings.
+ *
+ * Returns: a new #GList which should be freed with g_list_free().
+ */
+GList*
+rss_item_get_categories (RssItem *self)
+{
+	g_return_val_if_fail (RSS_IS_ITEM (self), NULL);
+
+	return g_list_copy (self->priv->categories);
+}
diff --git a/extern/rss-glib/rss-item.h b/extern/rss-glib/rss-item.h
new file mode 100644
index 0000000..678b88e
--- /dev/null
+++ b/extern/rss-glib/rss-item.h
@@ -0,0 +1,95 @@
+/* rss-item.h
+ * 
+ * This file is part of RSS-GLib.
+ * Copyright (C) 2008  Christian Hergert <chris@dronelabs.com>
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author:
+ *   Christian Hergert  <chris@dronelabs.com>
+ */
+
+#ifndef __RSS_ITEM_H__
+#define __RSS_ITEM_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define RSS_TYPE_ITEM rss_item_get_type()
+
+#define RSS_ITEM(obj)				\
+	(G_TYPE_CHECK_INSTANCE_CAST ((obj),	\
+	RSS_TYPE_ITEM,				\
+	RssItem))
+
+#define RSS_ITEM_CLASS(klass)			\
+	(G_TYPE_CHECK_CLASS_CAST ((klass),	\
+	RSS_TYPE_ITEM,				\
+	RssItemClass))
+
+#define RSS_IS_ITEM(obj)			\
+	(G_TYPE_CHECK_INSTANCE_TYPE ((obj),	\
+	RSS_TYPE_ITEM))
+
+#define RSS_IS_ITEM_CLASS(klass)		\
+	(G_TYPE_CHECK_CLASS_TYPE ((klass),	\
+	RSS_TYPE_ITEM))
+
+#define RSS_ITEM_GET_CLASS(obj)			\
+	(G_TYPE_INSTANCE_GET_CLASS ((obj),	\
+	RSS_TYPE_ITEM,				\
+	RssItemClass))
+
+typedef struct _RssItem         RssItem;
+typedef struct _RssItemPrivate  RssItemPrivate;
+typedef struct _RssItemClass    RssItemClass;
+
+struct _RssItem
+{
+        /*< private >*/
+	GObject parent_instance;
+
+        RssItemPrivate *priv;
+};
+
+struct _RssItemClass
+{
+        /*< private >*/
+	GObjectClass parent_class;
+};
+
+GType    rss_item_get_type       (void);
+RssItem* rss_item_new            (void);
+
+const gchar *rss_item_get_guid              (RssItem *self);
+const gchar *rss_item_get_title             (RssItem *self);
+const gchar *rss_item_get_link              (RssItem *self);
+const gchar *rss_item_get_description       (RssItem *self);
+const gchar *rss_item_get_copyright         (RssItem *self);
+const gchar *rss_item_get_author_name       (RssItem *self);
+const gchar *rss_item_get_author_uri        (RssItem *self);
+const gchar *rss_item_get_author_email      (RssItem *self);
+const gchar *rss_item_get_contributor_name  (RssItem *self);
+const gchar *rss_item_get_contributor_uri   (RssItem *self);
+const gchar *rss_item_get_contributor_email (RssItem *self);
+const gchar *rss_item_get_comments          (RssItem *self);
+const gchar *rss_item_get_pub_date          (RssItem *self);
+const gchar *rss_item_get_source            (RssItem *self);
+const gchar *rss_item_get_source_url        (RssItem *self);
+GList*                rss_item_get_categories        (RssItem *self);
+
+G_END_DECLS
+
+#endif /* __RSS_ITEM_H__ */
diff --git a/extern/rss-glib/rss-parser-private.h b/extern/rss-glib/rss-parser-private.h
new file mode 100644
index 0000000..eaddb9e
--- /dev/null
+++ b/extern/rss-glib/rss-parser-private.h
@@ -0,0 +1,45 @@
+/* rss-parser-private.h
+ * 
+ * This file is part of RSS-GLib.
+ * Copyright (C) 2008  Christian Hergert <chris@dronelabs.com>
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author:
+ *   Christian Hergert  <chris@dronelabs.com>
+ */
+
+#ifndef __RSS_PARSER_PRIVATE_H__
+#define __RSS_PARSER_PRIVATE_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+struct _RssParserPrivate
+{
+	RssDocument *document;
+};
+
+typedef enum
+{
+	RSS_PARSER_ERROR_INVALID_DATA,
+} RssParserError;
+
+#define RSS_PARSER_ERROR rss_parser_error_quark()
+GQuark rss_parser_error_quark (void);
+
+G_END_DECLS
+
+#endif /* __RSS_PARSER_PRIVATE_H__ */
diff --git a/extern/rss-glib/rss-parser.c b/extern/rss-glib/rss-parser.c
new file mode 100644
index 0000000..184db19
--- /dev/null
+++ b/extern/rss-glib/rss-parser.c
@@ -0,0 +1,334 @@
+/* rss-generator.c
+ * 
+ * This file is part of RSS-GLib.
+ * Copyright (C) 2008  Christian Hergert <chris@dronelabs.com>
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author:
+ *   Christian Hergert  <chris@dronelabs.com>
+ */
+
+/**
+ * SECTION:rss-parser
+ * @short_description: Parse RSS data streams
+ *
+ * #RssParser provides an object for parsing a RSS data stream, either
+ * inside a file or inside a static buffer.
+ */
+
+#include "rss-parser.h"
+#include "rss-parser-private.h"
+
+#include "rss-item.h"
+#include "rss-item-private.h"
+
+#include "rss-document.h"
+#include "rss-document-private.h"
+
+GQuark
+rss_parser_error_quark (void)
+{
+	return g_quark_from_static_string ("rss_parser_error");
+}
+
+enum
+{
+	PARSE_START,
+	PARSE_END,
+
+	LAST_SIGNAL
+};
+
+static guint parser_signals[LAST_SIGNAL] = { 0, };
+
+G_DEFINE_TYPE (RssParser, rss_parser, G_TYPE_OBJECT);
+
+static void
+rss_parser_dispose (GObject *object)
+{
+	RssParserPrivate *priv = RSS_PARSER (object)->priv;
+
+	if (priv->document) {
+		g_object_unref (priv->document);
+		priv->document = NULL;
+	}
+
+	G_OBJECT_CLASS (rss_parser_parent_class)->dispose (object);
+}
+
+static void
+rss_parser_class_init (RssParserClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+	g_type_class_add_private (klass, sizeof (RssParserPrivate));
+	object_class->dispose = rss_parser_dispose;
+
+	/**
+	 * RssParser::parse-start:
+	 * @parser: the #RssParser that received the signal
+	 *
+	 * The ::parse-signal is emitted when the parser began parsing
+	 * a RSS data stream.
+	 */
+	parser_signals[PARSE_START] =
+		g_signal_new ("parse-start",
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (RssParserClass, parse_start),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__VOID,
+		              G_TYPE_NONE, 0);
+
+	/**
+	 * RssParser::parse-end:
+	 * @parser: the #RssParser that received the signal
+	 *
+	 * The ::parse-end signal is emitted when the parser successfully
+	 * finished parsing a RSS data stream.
+	 */
+	parser_signals[PARSE_END] =
+		g_signal_new ("parse-end",
+		              G_OBJECT_CLASS_TYPE (object_class),
+		              G_SIGNAL_RUN_LAST,
+		              G_STRUCT_OFFSET (RssParserClass, parse_end),
+		              NULL, NULL,
+		              g_cclosure_marshal_VOID__VOID,
+		              G_TYPE_NONE, 0);
+}
+
+static void
+rss_parser_init (RssParser *self)
+{
+        self->priv =
+                G_TYPE_INSTANCE_GET_PRIVATE (self, RSS_TYPE_PARSER,
+                                             RssParserPrivate);
+}
+
+/**
+ * rss_parser_new:
+ *
+ * Creates a new #RssParser instance.  You can use the #RssParser to
+ * load a RSS stream from either a file or a buffer and then walk the
+ * items discovered through the resulting RssDocument.
+ *
+ * Return value: the new created #RssParser. Use g_object_unref() to
+ *   release all the memory it allocates.
+ */
+RssParser*
+rss_parser_new (void)
+{
+	return g_object_new (RSS_TYPE_PARSER, NULL);
+}
+
+static RssDocument*
+rss_parser_parse (RssParser *self, mrss_t *mrss)
+{
+	RssDocument     *document;
+	RssItem         *rss_item;
+	GList           *list, *list2;
+	mrss_category_t *cat;
+	mrss_item_t     *item;
+
+	g_return_val_if_fail (RSS_IS_PARSER (self), NULL);
+	g_return_val_if_fail (mrss != NULL, NULL);
+
+	/* create our document object */
+	document = rss_document_new ();
+
+	/* set our document level properties */
+	g_object_set (document,
+	              "encoding",           mrss->encoding,
+	              "guid",               mrss->id,
+	              "title",              mrss->title,
+	              "description",        mrss->description,
+	              "link",               mrss->link,
+	              "language",           mrss->language,
+	              "rating",             mrss->rating,
+	              "copyright",          mrss->copyright,
+	              "pub-date",           mrss->pubDate,
+	              "ttl",                mrss->ttl,
+	              "about",              mrss->about,
+	              "contributor",        mrss->contributor,
+	              "contributor-email",  mrss->contributor_email,
+	              "contributor-uri",    mrss->contributor_uri,
+	              "generator",          mrss->generator,
+	              "generator-uri",      mrss->generator_uri,
+	              "generator-version",  mrss->generator_version,
+	              "image-title",        mrss->image_title,
+	              "image-url",          mrss->image_url,
+	              "image-link",         mrss->image_link,
+	              NULL);
+
+	/* build the list of categories */
+	if (NULL != (cat = mrss->category)) {
+		list = NULL;
+		do {
+			list = g_list_prepend (list, g_strdup (cat->category));
+		} while (NULL != (cat = cat->next));
+		document->priv->categories = list;
+	}
+
+	/* build the list of items */
+	if (NULL != (item = mrss->item)) {
+		list = NULL;
+		do {
+			rss_item = rss_item_new ();
+
+			/* set the rss item properties */
+			g_object_set (rss_item,
+			              "guid",              item->guid,
+			              "title",             item->title,
+			              "link",              item->link,
+			              "description",       item->description,
+			              "copyright",         item->copyright,
+			              "author",            item->author,
+			              "author-uri",        item->author_uri,
+			              "author-email",      item->author_email,
+			              "contributor",       item->contributor,
+			              "contributor-uri",   item->contributor_uri,
+			              "contributor-email", item->contributor_email,
+			              "comments",          item->comments,
+			              "pub-date",          item->pubDate,
+			              "source",	           item->source,
+			              "source-url",        item->source_url,
+			              NULL);
+
+			/* parse the items categories */
+			if (NULL != (cat = item->category)) {
+				list2 = NULL;
+				do {
+					list2 = g_list_prepend (list2, g_strdup (cat->category));
+				} while (NULL != (cat = cat->next));
+				rss_item->priv->categories = list2;
+			}
+
+			list = g_list_prepend (list, rss_item);
+		} while (NULL != (item = item->next));
+		document->priv->items = list;
+	}
+
+	return document;
+}
+
+/**
+ * rss_parser_load_from_data:
+ * @self: a #RssParser
+ * @data: a buffer containing the syndication data
+ * @length: the length of the buffer
+ * @error: a location to place a newly created GError in case of error
+ *
+ * Parses the contents found at @data as an rss file. You can retrieve
+ * the parsed document with rss_parser_get_document().
+ *
+ * Returns: TRUE on success.
+ */
+gboolean
+rss_parser_load_from_data (RssParser   *self,
+                           const gchar *data,
+                           gsize        length,
+                           GError     **error)
+{
+	mrss_t       *mrss;
+	mrss_error_t  res;
+
+	g_signal_emit (self, parser_signals[PARSE_START], 0);
+
+	/* parse the buffer */
+	res = mrss_parse_buffer ((char*)data, length, &mrss);
+
+	/* if there was an error parsing, set the error and return false */
+	if (MRSS_OK != res) {
+		if (error) {
+			g_set_error (error, RSS_PARSER_ERROR,
+			             RSS_PARSER_ERROR_INVALID_DATA,
+			             "Could not parse data contents");
+		}
+		return FALSE;
+	}
+
+	/* keep a copy of our parsed document */
+	self->priv->document = rss_parser_parse (self, mrss);
+
+	/* free our mrss data */
+	mrss_free (mrss);
+
+	g_signal_emit (self, parser_signals[PARSE_END], 0);
+
+	return TRUE;
+}
+
+/**
+ * rss_parser_load_from_file:
+ * @self: a #RssParser
+ * @filename: the path to the file to parse
+ * @error: a location for a newly created #GError
+ *
+ * Parses the file found at @filename as an rss file. You can retrieve
+ * the parsed document with rss_parser_get_document().
+ *
+ * Returns: TRUE if the parse was successful
+ */
+gboolean
+rss_parser_load_from_file (RssParser  *self,
+                           gchar      *filename,
+                           GError    **error)
+{
+	mrss_t       *mrss;
+	mrss_error_t  res;
+
+	g_signal_emit (self, parser_signals[PARSE_START], 0);
+
+	/* parse the buffer */
+	res = mrss_parse_file (filename, &mrss);
+
+	/* if there was an error parsing, set the error and return false */
+	if (MRSS_OK != res) {
+		if (error) {
+			g_set_error (error, RSS_PARSER_ERROR,
+			             RSS_PARSER_ERROR_INVALID_DATA,
+			             "Could not parse file contents");
+		}
+		return FALSE;
+	}
+
+	/* keep a copy of our parsed document */
+	self->priv->document = rss_parser_parse (self, mrss);
+
+	/* free our mrss data */
+	mrss_free (mrss);
+
+	g_signal_emit (self, parser_signals[PARSE_END], 0);
+
+	return TRUE;
+}
+
+/**
+ * rss_parser_get_document:
+ * @self: a #RssParser
+ *
+ * Retreives the document result from parsing rss data from either
+ * a buffer or a file. The document's ref-count is increased, so
+ * call g_object_unref when you are done.
+ *
+ * Returns: a #RssDocument
+ */
+RssDocument*
+rss_parser_get_document (RssParser *self)
+{
+	g_return_val_if_fail (RSS_IS_PARSER (self), NULL);
+
+	return g_object_ref (self->priv->document);
+}
diff --git a/extern/rss-glib/rss-parser.h b/extern/rss-glib/rss-parser.h
new file mode 100644
index 0000000..6ab95a3
--- /dev/null
+++ b/extern/rss-glib/rss-parser.h
@@ -0,0 +1,102 @@
+/* rss-parser.h
+ * 
+ * This file is part of RSS-GLib.
+ * Copyright (C) 2008  Christian Hergert <chris@dronelabs.com>
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author:
+ *   Christian Hergert  <chris@dronelabs.com>
+ */
+
+#ifndef __RSS_PARSER_H__
+#define __RSS_PARSER_H__
+
+#include <glib-object.h>
+#include "rss-document.h"
+
+G_BEGIN_DECLS
+
+#define RSS_TYPE_PARSER rss_parser_get_type()
+
+#define RSS_PARSER(obj)					\
+	(G_TYPE_CHECK_INSTANCE_CAST ((obj),		\
+	RSS_TYPE_PARSER,				\
+	RssParser))
+
+#define RSS_PARSER_CLASS(klass)				\
+	(G_TYPE_CHECK_CLASS_CAST ((klass),		\
+	RSS_TYPE_PARSER,				\
+	RssParserClass))
+
+#define RSS_IS_PARSER(obj)				\
+	(G_TYPE_CHECK_INSTANCE_TYPE ((obj),		\
+	RSS_TYPE_PARSER))
+
+#define RSS_IS_PARSER_CLASS(klass)			\
+	(G_TYPE_CHECK_CLASS_TYPE ((klass),		\
+	RSS_TYPE_PARSER))
+
+#define RSS_PARSER_GET_CLASS(obj)			\
+	(G_TYPE_INSTANCE_GET_CLASS ((obj),		\
+	RSS_TYPE_PARSER,				\
+	RssParserClass))
+
+typedef struct _RssParser               RssParser;
+typedef struct _RssParserPrivate        RssParserPrivate;
+typedef struct _RssParserClass          RssParserClass;
+
+struct _RssParser
+{
+        /*< private >*/
+        GObject parent_instance;
+
+        RssParserPrivate *priv;
+};
+
+struct _RssParserClass
+{
+	/*< private >*/
+	GObjectClass parent_class;
+
+	/*< public >*/
+	void (* parse_start) (RssParser *parser);
+	void (* parse_end)   (RssParser *parser);
+
+	/*< private >*/
+	/* padding for future expansion */
+	void (* _rss_reserved1) (void);
+	void (* _rss_reserved2) (void);
+	void (* _rss_reserved3) (void);
+	void (* _rss_reserved4) (void);
+	void (* _rss_reserved5) (void);
+	void (* _rss_reserved6) (void);
+	void (* _rss_reserved7) (void);
+	void (* _rss_reserved8) (void);
+};
+
+GType        rss_parser_get_type       (void);
+RssParser*   rss_parser_new            (void);
+gboolean     rss_parser_load_from_data (RssParser   * self,
+                                        const gchar *data,
+                                        gsize         length,
+				        GError      **error);
+gboolean     rss_parser_load_from_file (RssParser   *self,
+                                        gchar       *filename,
+				        GError     **error);
+RssDocument* rss_parser_get_document   (RssParser   *self);
+
+G_END_DECLS
+
+#endif /* __RSS_PARSER_H__ */
diff --git a/extern/rss-glib/rss-version.h b/extern/rss-glib/rss-version.h
new file mode 100644
index 0000000..6a61852
--- /dev/null
+++ b/extern/rss-glib/rss-version.h
@@ -0,0 +1,96 @@
+/* rss-version.h - RSS-GLib versioning information
+ * 
+ * This file is part of RSS-GLib.
+ * Copyright (C) 2008  Christian Hergert <chris@dronelabs.com>
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author:
+ *   Christian Hergert	<chris@dronelabs.com>
+ */
+
+#ifndef __RSS_VERSION_H__
+#define __RSS_VERSION_H__
+
+/**
+ * SECTION:rss-version
+ * @title: Versioning
+ * @short_description: RSS-GLib version checking
+ *
+ * RSS-GLib provides macros to check the version of the library
+ * at compile-time
+ */
+
+/**
+ * RSS_MAJOR_VERSION:
+ *
+ * Rss major version component (e.g. 1 if %RSS_VERSION is 1.2.3)
+ */
+#define RSS_MAJOR_VERSION              (0)
+
+/**
+ * RSS_MINOR_VERSION:
+ *
+ * Rss minor version component (e.g. 2 if %RSS_VERSION is 1.2.3)
+ */
+#define RSS_MINOR_VERSION              (2)
+
+/**
+ * RSS_MICRO_VERSION:
+ *
+ * Rss micro version component (e.g. 3 if %RSS_VERSION is 1.2.3)
+ */
+#define RSS_MICRO_VERSION              (3)
+
+/**
+ * RSS_VERSION
+ *
+ * Rss version.
+ */
+#define RSS_VERSION                    (0.2.3)
+
+/**
+ * RSS_VERSION_S:
+ *
+ * Rss version, encoded as a string, useful for printing and
+ * concatenation.
+ */
+#define RSS_VERSION_S                  "0.2.3"
+
+/**
+ * RSS_VERSION_HEX:
+ *
+ * Rss version, encoded as an hexadecimal number, useful for
+ * integer comparisons.
+ */
+#define RSS_VERSION_HEX                (RSS_MAJOR_VERSION << 24 | \
+                                        RSS_MINOR_VERSION << 16 | \
+                                        RSS_MICRO_VERSION << 8)
+
+/**
+ * RSS_CHECK_VERSION:
+ * @major: required major version
+ * @minor: required minor version
+ * @micro: required micro version
+ *
+ * Compile-time version checking. Evaluates to %TRUE if the version
+ * of Rss is greater than the required one.
+ */
+#define RSS_CHECK_VERSION(major,minor,micro)                             \
+        (RSS_MAJOR_VERSION > (major) ||                                  \
+        (RSS_MAJOR_VERSION == (major) && RSS_MINOR_VERSION > (minor)) || \
+        (RSS_MAJOR_VERSION == (major) && RSS_MINOR_VERSION == (minor) && \
+         RSS_MICRO_VERSION >= (micro)))
+
+#endif /* __RSS_VERSION_H__ */
diff --git a/freebsd/Makefile b/freebsd/Makefile
deleted file mode 100644
index 10f8c20..0000000
--- a/freebsd/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# New ports collection makefile for:	transmission-remote-gtk
-# Date created:			22 February 2011
-# Whom:				J.D. Morris <jdm720@gmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	transmission-remote-gtk
-PORTVERSION=	0.5
-CATEGORIES=	net-p2p
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-
-MAINTAINER=	jdm720@gmail.com
-COMMENT=	GTK app for remote management of Transmission via RPC
-
-LIB_DEPENDS=	json-glib-1.0:${PORTSDIR}/devel/json-glib \
-		notify.1:${PORTSDIR}/devel/libnotify \
-		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
-		curl.6:${PORTSDIR}/ftp/curl
-
-RUN_DEPENDS=	notification-daemon:${PORTSDIR}/deskutils/notification-daemon
-
-USE_GNOME=		glib20 gtk20 gconf2
-GNU_CONFIGURE=		yes
-INSTALLS_ICONS=		yes
-GCONF_SCHEMAS=		transmission-remote-gtk.schemas
-
-.include <bsd.port.pre.mk>
-
-.include <bsd.port.post.mk>
diff --git a/freebsd/distinfo b/freebsd/distinfo
deleted file mode 100644
index 4bc2e74..0000000
--- a/freebsd/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (transmission-remote-gtk-0.2.1.tar.gz) = 3377b6f4d821f1852d935933fc1f04e4c024e21d3d42292985e3358033708221
-SIZE (transmission-remote-gtk-0.2.1.tar.gz) = 210822
diff --git a/freebsd/pkg-descr b/freebsd/pkg-descr
deleted file mode 100644
index dbe0608..0000000
--- a/freebsd/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-transmission-remote-gtk is a GTK application for remote management of the
-Transmission BitTorrent client via its RPC interface.
-
-- Remotely add (file/url), start, stop, remove, remove & delete, verify
-  torrents.
-- Works as a .torrent handler (eg. from a web browser).
-- Set torrent properties such as speed, seed, and peer limits.
-- Change remote settings like global limits, download directory, and
-  connectivity preferences.
-
-WWW: http://code.google.com/p/transmission-remote-gtk/
diff --git a/freebsd/pkg-plist b/freebsd/pkg-plist
deleted file mode 100644
index d0c2f03..0000000
--- a/freebsd/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/transmission-remote-gtk
-share/icons/hicolor/scalable/apps/transmission-remote-gtk.svg
-share/icons/hicolor/16x16/apps/transmission-remote-gtk.png
-share/icons/hicolor/24x24/apps/transmission-remote-gtk.png
-share/icons/hicolor/48x48/apps/transmission-remote-gtk.png
-share/icons/hicolor/22x22/apps/transmission-remote-gtk.png
-share/icons/hicolor/32x32/apps/transmission-remote-gtk.png
-share/applications/transmission-remote-gtk.desktop
diff --git a/install-sh b/install-sh
deleted file mode 100755
index 377bb86..0000000
--- a/install-sh
+++ /dev/null
@@ -1,527 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2011-11-20.07; # UTC
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# 'make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-no_target_directory=
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-	shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
-
-    -o) chowncmd="$chownprog $2"
-	shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-	# Protect names problematic for 'test' and other utilities.
-	case $dst_arg in
-	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
-	esac
-	shift;;
-
-    -T) no_target_directory=true;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-    # Protect names problematic for 'test' and other utilities.
-    case $dst_arg in
-      -* | [=\(\)!]) dst_arg=./$dst_arg;;
-    esac
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call 'install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  do_exit='(exit $ret); exit $ret'
-  trap "ret=129; $do_exit" 1
-  trap "ret=130; $do_exit" 2
-  trap "ret=141; $do_exit" 13
-  trap "ret=143; $do_exit" 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names problematic for 'test' and other utilities.
-  case $src in
-    -* | [=\(\)!]) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-    dst=$dst_arg
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix='/';;
-	[-=\(\)!]*) prefix='./';;
-	*)  prefix='';;
-      esac
-
-      eval "$initialize_posix_glob"
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob set -f
-      set fnord $dstdir
-      shift
-      $posix_glob set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-	test X"$d" = X && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/ltmain.sh b/ltmain.sh
deleted file mode 100644
index 63ae69d..0000000
--- a/ltmain.sh
+++ /dev/null
@@ -1,9655 +0,0 @@
-
-# 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.
-#
-# 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.
-
-# Usage: $progname [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
-#       --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
-
-# 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
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-
-# 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"
-
-
-
-: ${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'
-
-# 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.
-nonopt=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
-
-# 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."
-}
-
-
-# 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) ;;
-    *)
-      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
-
-  # Validate options:
-
-  # save first non-option argument
-  if test "$#" -gt 0; then
-    nonopt="$opt"
-    shift
-  fi
-
-  # preserve --debug
-  test "$opt_debug" = : || func_append preserve_args " --debug"
-
-  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
-
-  $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
-}
-
-# 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
-}
-
-# 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
-}
-
-# 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
-      write_lobj=\'${2}\'
-    else
-      write_lobj=none
-    fi
-
-    if test "$build_old_libs" = yes; then
-      write_oldobj=\'${3}\'
-    else
-      write_oldobj=none
-    fi
-
-    $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.
-
-# Name of the PIC object.
-pic_object=$write_lobj
-
-# Name of the non-PIC object
-non_pic_object=$write_oldobj
-
-EOF
-      $MV "${write_libobj}T" "${write_libobj}"
-    }
-}
-
-
-##################################################
-# 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
-  case $4 in
-  $2 ) func_append func_to_host_path_result "$3"
-    ;;
-  esac
-}
-# end func_convert_path_front_back_pathsep
-
-
-##################################################
-# $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.
-
-
-# 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
-      ;;
-    *)
-      $to_tool_file_cmd "$1"
-      func_to_tool_file_result=$func_to_host_file_result
-      ;;
-  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
-
-
-# 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
-
-
-# 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
-
-
-# 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
-
-
-# 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
-
-
-#############################################
-# $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
-}
-
-
-# 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
-
-
-# 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
-
-
-# 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
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      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
-	  ;;
-
-	-pie | -fpie | -fPIE)
-          func_append pie_flag " $arg"
-	  continue
-	  ;;
-
-	-shared | -static | -prefer-pic | -prefer-non-pic)
-	  func_append later " $arg"
-	  continue
-	  ;;
-
-	-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    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      func_append_quoted base_compile "$lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      func_fatal_error "you must specify an argument for -Xcompile"
-      ;;
-    target)
-      func_fatal_error "you must specify a target with \`-o'"
-      ;;
-    *)
-      # 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
-    case $libobj in
-    *.[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
-
-    case $libobj in
-    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
-    *)
-      func_fatal_error "cannot determine name of library object from \`$libobj'"
-      ;;
-    esac
-
-    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 $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2* | cegcc*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # 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 "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # 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 $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 "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-      func_append removelist " $output_obj"
-      $ECHO "$srcfile" > "$lockfile"
-    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
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      func_mkdir_p "$xdir$objdir"
-
-      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 "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$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 -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.
-      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 $qsrcfile$pie_flag"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	func_append command " -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      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 "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      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
-	  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
-
-    # 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
-        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
-	  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'
-}
-
-# 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
-}
-
-
-# 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+\"\$@\"}
-"
-    ;;
-
-  *)
-    $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* | *-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 invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args=$nonopt
-    base_compile="$nonopt $@"
-    compile_command=$nonopt
-    finalize_command=$nonopt
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-    new_inherited_linker_flags=
-
-    avoid_version=no
-    bindir=
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    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
-      -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
-	    func_warning "complete static linking is impossible in this configuration"
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	-static)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  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
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    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
-      arg="$1"
-      shift
-      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)
-	  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.
-	    func_append compile_command " @SYMFILE@"
-	    func_append finalize_command " @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      func_append dlfiles " $arg"
-	    else
-	      func_append dlprefiles " $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  test -f "$arg" \
-	    || func_fatal_error "symbol file \`$arg' does not exist"
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  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=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    func_fatal_error "only absolute run-paths are allowed"
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) func_append rpath " $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $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)
-	  func_append compiler_flags " $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  func_append linker_flags " $qarg"
-	  func_append compiler_flags " $wl$qarg"
-	  prev=
-	  func_append compile_command " $wl$qarg"
-	  func_append finalize_command " $wl$qarg"
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  # 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.
-	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -bindir)
-	prev=bindir
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  func_fatal_error "more than one -exported-symbols argument is not allowed"
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	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* | /*-*-irix*)
-	  func_append compile_command " $arg"
-	  func_append finalize_command " $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -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`
-	  test -z "$absdir" && \
-	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "* | *" $arg "*)
-	  # Will only happen for absolute or sysroot arguments
-	  ;;
-	*)
-	  # 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* | *-cegcc*)
-	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  ::) dllsearchpath=$dir;;
-	  *) func_append dllsearchpath ":$dir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) func_append dllsearchpath ":$testbindir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-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
-	func_append deplibs " $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	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
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # 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 ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -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
-	  ;;
-	*)
-	  func_fatal_error "only absolute run-paths are allowed"
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) func_append xrpath " $dir" ;;
-	esac
-	continue
-	;;
-
-      -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
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -weak)
-        prev=weak
-	continue
-	;;
-
-      -Wc,*)
-	func_stripname '-Wc,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-          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"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Wl,*)
-	func_stripname '-Wl,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-          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"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	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.
-      -* | +*)
-        func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-
-      *.$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
-
-	  # 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
-	;;
-
-      *.$libext)
-	# An archive.
-	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.
-	  func_append dlfiles " $func_resolve_sysroot_result"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  func_append dlprefiles " $func_resolve_sysroot_result"
-	  prev=
-	else
-	  func_append deplibs " $func_resolve_sysroot_result"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	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
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-      fi
-    done # argument parsing loop
-
-    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\"
-      func_append compile_command " $arg"
-      func_append finalize_command " $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    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 \"\${$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\"
-
-    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.
-    func_mkdir_p "$output_objdir"
-
-    # Determine the type of output
-    case $output in
-    "")
-      func_fatal_help "you must specify an output file"
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    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
-      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 dlpreopen link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  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
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $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" != lib && test "$linkmode" != prog; then
-	    func_warning "\`-l' is ignored for archives/objects"
-	    continue
-	  fi
-	  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
-	  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
-	    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
-	  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"
-	    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
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    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"
-	    ;;
-	  *)
-	    func_warning "\`-L' is ignored for archives/objects"
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    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 "*) ;;
-	    *) func_append xrpath " $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la)
-	  func_resolve_sysroot "$deplib"
-	  lib=$func_resolve_sysroot_result
-	  ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    # 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)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  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
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-	fi
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$lib" \
-	  || func_fatal_error "\`$lib' is not a valid libtool archive"
-
-	func_dirname "$lib" "" "."
-	ladir="$func_dirname_result"
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	inherited_linker_flags=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	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" != 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
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      func_fatal_error "cannot find name of link library for \`$lib'"
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    func_append convenience " $ladir/$objdir/$old_library"
-	    func_append old_convenience " $ladir/$objdir/$old_library"
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    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=
-	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
-	  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
-	    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 there is no dlname, no dlopen support or we're linking
-	    # 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
-	    func_append newdlfiles " $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    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
-	func_basename "$lib"
-	laname="$func_basename_result"
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  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="$lt_sysroot$libdir"
-	    absdir="$lt_sysroot$libdir"
-	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-	else
-	  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
-	func_stripname 'lib' '.la' "$laname"
-	name=$func_stripname_result
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  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
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  func_append newlib_search_path " $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -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
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    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...
-
-	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
-
-	    # 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 # $linkmode,$pass = prog,link...
-
-	  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
-	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
-
-	  # 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
-	    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* | mingw* | *cegcc*)
-	        func_arith $current - $age
-		major=$func_arith_result
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    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
-	      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
-	      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"
-
-	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    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" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes &&
-	         test "$hardcode_direct_absolute" = no; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		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"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      func_fatal_configuration "unsupported hardcode properties"
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    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 &&
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) func_append finalize_shlibpath "$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  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 &&
-	       test "$hardcode_direct_absolute" = no; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$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
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # 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.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # 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 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 "*** 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."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	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
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) func_stripname '-R' '' "$libdir"
-	           temp_xrpath=$func_stripname_result
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) func_append xrpath " $temp_xrpath";;
-		   esac;;
-	      *) func_append temp_deplibs " $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  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 $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)
-	        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
-		    func_warning "cannot determine absolute directory name of \`$dir'"
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		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`
-		  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
-		;;
-	      esac
-	      case " $deplibs " in
-	      *" $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
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	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 "*) ;;
-	    *) func_append lib_search_path " $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  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" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) func_append tmp_libs " $deplib" ;;
-	      esac
-	      ;;
-	    *) func_append tmp_libs " $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      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
-	func_warning "\`-dlopen' is ignored for archives"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for archives" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for archives"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for archives"
-
-      test -n "$vinfo" && \
-	func_warning "\`-version-info/-version-number' is ignored for archives"
-
-      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"
-      func_append objs "$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	func_stripname 'lib' '.la' "$outputname"
-	name=$func_stripname_result
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	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
-	  func_stripname '' '.la' "$outputname"
-	  name=$func_stripname_result
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  func_stripname '' '.la' "$outputname"
-	  libname=$func_stripname_result
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  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!"
-	  func_append libobjs " $objs"
-	fi
-      fi
-
-      test "$dlself" != no && \
-	func_warning "\`-dlopen self' is ignored for libtool libraries"
-
-      set dummy $rpath
-      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.
-	  # 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
-
-	test -n "$vinfo" && \
-	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
-
-	test -n "$release" && \
-	  func_warning "\`-release' is ignored for convenience libraries"
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	shift
-	IFS="$save_ifs"
-
-	test -n "$7" && \
-	  func_fatal_help "too many parameters to \`-version-info'"
-
-	# 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]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  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]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  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]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  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
-	  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.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  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"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	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" -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 `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux) # correct to gnu/linux during the next big refactor
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  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" -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.
-	  func_append verstring ":${current}.0"
-	  ;;
-
-	qnx)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  func_arith $current - $age
-	  major=$func_arith_result
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  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=
-	  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
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    func_warning "undefined symbols not allowed in $host shared libraries"
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-
-      fi
-
-      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
-	func_append oldlibs " $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	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 "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
-	  func_replace_sysroot "$libdir"
-	  func_append temp_xrpath " -R$func_replace_sysroot_result"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_rpath " $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) func_append dlfiles " $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $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* | *-cegcc* | *-*-haiku*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    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
-	      func_append deplibs " -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # 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 behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # 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.
-	  $opt_dry_run || $RM conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $opt_dry_run || $RM conftest
-	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      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
-		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 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 "*** library that it depends on before this library will be fully"
-		  echo "*** functional.  Installing it before continuing would be even better."
-		fi
-		;;
-	      *)
-		func_append newdeplibs " $i"
-		;;
-	      esac
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method; shift
-	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-	  for a_deplib in $deplibs; 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
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      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
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		echo
-		$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 "*** 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
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      func_append newdeplibs " $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method; shift
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-	  for a_deplib in $deplibs; 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\""`
-		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
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		echo
-		$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 "*** 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
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      func_append newdeplibs " $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  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."
-	    else
-	      echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	    ;;
-	  esac
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library with the System framework
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  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 "*** 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
-	      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
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    echo "*** The inter-library dependencies that have been dropped here will be"
-	    echo "*** automatically added whenever a program is linked with this library"
-	    echo "*** or is declared to -dlopen it."
-
-	    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"
-	      echo "*** it was explicitly requested with -no-undefined,"
-	      echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# 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=
-      old_library=
-      dlname=
-
-      # 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 "$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
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		func_append dep_rpath " $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append perm_rpath " $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    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
-	      func_append rpath "$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_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
-	shift
-	realname="$1"
-	shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	linknames=
-	for link
-	do
-	  func_append linknames " $link"
-	done
-
-	# Use standard objects if they are pic
-	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
-	    func_verbose "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $opt_dry_run || $RM $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd1 in $cmds; do
-	      IFS="$save_ifs"
-	      # 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" && 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
-	  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=
-	for test_deplib in $deplibs; do
-	  case " $convenience " in
-	  *" $test_deplib "*) ;;
-	  *)
-	    func_append tmp_deplibs " $test_deplib"
-	    ;;
-	  esac
-	done
-	deplibs="$tmp_deplibs"
-
-	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"
-	    func_append generated " $gentop"
-
-	    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\"
-	  func_append linker_flags " $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	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 "$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
-	  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
-
-	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"
-	  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 "$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
-	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for objects"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for objects" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for objects"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for objects"
-
-      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)
-	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=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $opt_dry_run || $RM $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -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 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"
-	  func_append generated " $gentop"
-
-	  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 "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      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
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  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"
-	# $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"
-	func_execute_cmds "$reload_cmds" 'exit $?'
-      fi
-
-      if test -n "$gentop"; then
-	func_show_eval '${RM}r "$gentop"'
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) func_stripname '' '.exe' "$output"
-	          output=$func_stripname_result.exe;;
-      esac
-      test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for programs"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for programs"
-
-      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 " $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
-
-
-      # 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.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_rpath " $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    func_append rpath " $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append perm_rpath " $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  ::) dllsearchpath=$libdir;;
-	  *) func_append dllsearchpath ":$libdir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) func_append dllsearchpath ":$testbindir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    func_append rpath " $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_perm_rpath " $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-      fi
-
-      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-
-      # template prelinking step
-      if test -n "$prelink_cmds"; then
-	func_execute_cmds "$prelink_cmds" 'exit $?'
-      fi
-
-      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 "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	exit_status=0
-	func_show_eval "$link_command" 'exit_status=$?'
-
-	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
-
-	# Delete the generated files.
-	if test -f "$output_objdir/${outputname}S.${objext}"; then
-	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-	fi
-
-	exit $exit_status
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    func_append rpath "$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    func_append rpath "$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# 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 "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$opt_dry_run || $RM $output
-	# Link the executable and exit
-	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
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	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 "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      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.
-      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}\" || $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
-	    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 "$relink_command" | $SED "$sed_quote_subst"`
-      fi
-
-      # 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) 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
-	    func_stripname '' '.exe' "$outputname"
-	    outputname=$func_stripname_result ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *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
-
-	    func_emit_wrapper no > $output
-	    chmod +x $output
-	  ;;
-	esac
-      }
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save $symfileobj"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  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"
-	func_append generated " $gentop"
-
-	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
-	cmds=$old_archive_from_new_cmds
-      else
-
-	# 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
-	      # 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
-	  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
-	fi
-      fi
-      func_execute_cmds "$cmds" 'exit $?'
-    done
-
-    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"
-      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}\" || $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
-	  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 $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.
-      $opt_dry_run || {
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		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"
-		;;
-	      -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
-	      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
-	      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
-	  # 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 | *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 "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# 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
-revision=$revision
-
-# 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 "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      }
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-}
-
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
-    func_mode_link ${1+"$@"}
-
-
-# func_mode_uninstall arg...
-func_mode_uninstall ()
-{
-    $opt_debug
-    RM="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) func_append RM " $arg"; rmforce=yes ;;
-      -*) func_append RM " $arg" ;;
-      *) func_append files " $arg" ;;
-      esac
-    done
-
-    test -z "$RM" && \
-      func_fatal_help "you must specify an RM program"
-
-    rmdirs=
-
-    for file in $files; do
-      func_dirname "$file" "" "."
-      dir="$func_dirname_result"
-      if test "X$dir" = X.; then
-	odir="$objdir"
-      else
-	odir="$dir/$objdir"
-      fi
-      func_basename "$file"
-      name="$func_basename_result"
-      test "$opt_mode" = uninstall && odir="$dir"
-
-      # Remember odir for removal later, being careful to avoid duplicates
-      if test "$opt_mode" = clean; then
-	case " $rmdirs " in
-	  *" $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
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if func_lalib_p "$file"; then
-	  func_source $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    func_append rmfiles " $odir/$n"
-	  done
-	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
-
-	  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.
-	      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.
-	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	    ;;
-	  esac
-	fi
-	;;
-
-      *.lo)
-	# 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
-	;;
-
-      *)
-	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
-
-	    # 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
-      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
-	func_show_eval "rmdir $dir >/dev/null 2>&1"
-      fi
-    done
-
-    exit $exit_status
-}
-
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
-    func_mode_uninstall ${1+"$@"}
-
-test -z "$opt_mode" && {
-  help="$generic_help"
-  func_fatal_help "you must specify a MODE"
-}
-
-test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$opt_mode'"
-
-if test -n "$exec_cmd"; then
-  eval exec "$exec_cmd"
-  exit $EXIT_FAILURE
-fi
-
-exit $exit_status
-
-
-# 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
-
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
deleted file mode 100644
index f3d8734..0000000
--- a/m4/acinclude.m4
+++ /dev/null
@@ -1,47 +0,0 @@
-##### http://autoconf-archive.cryp.to/ac_define_dir.html
-#
-# SYNOPSIS
-#
-#   AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
-#
-# DESCRIPTION
-#
-#   This macro sets VARNAME to the expansion of the DIR variable,
-#   taking care of fixing up ${prefix} and such.
-#
-#   VARNAME is then offered as both an output variable and a C
-#   preprocessor symbol.
-#
-#   Example:
-#
-#      AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
-#
-# LAST MODIFICATION
-#
-#   2006-10-13
-#
-# COPYLEFT
-#
-#   Copyright (c) 2006 Stepan Kasal <kasal@ucw.cz>
-#   Copyright (c) 2006 Andreas Schwab <schwab@suse.de>
-#   Copyright (c) 2006 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2006 Alexandre Oliva
-#
-#   Copying and distribution of this file, with or without
-#   modification, are permitted in any medium without royalty provided
-#   the copyright notice and this notice are preserved.
-
-AC_DEFUN([AC_DEFINE_DIR], [
-  prefix_NONE=
-  exec_prefix_NONE=
-  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
-  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
-dnl refers to ${prefix}.  Thus we have to use `eval' twice.
-  eval ac_define_dir="\"[$]$2\""
-  eval ac_define_dir="\"$ac_define_dir\""
-  AC_SUBST($1, "$ac_define_dir")
-  AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
-  test "$prefix_NONE" && prefix=NONE
-  test "$exec_prefix_NONE" && exec_prefix=NONE
-])
diff --git a/m4/desktop.m4 b/m4/desktop.m4
new file mode 100644
index 0000000..ead6c73
--- /dev/null
+++ b/m4/desktop.m4
@@ -0,0 +1,108 @@
+# desktop.m4
+#
+# serial 4
+
+dnl DESKTOP_VALIDATE
+dnl Validates and installs desktop files.
+dnl
+dnl To use:
+dnl 1. Call DESKTOP_FILE in configure.ac to check for the desktop-file-utils tools.
+dnl 2. Add @DESKTOP_FILE_RULES@ to a Makefile.am to substitute the make rules.
+dnl 3. Add .desktop files to desktop_FILES in Makefile.am and they will be validated
+dnl    at make check time and installed on make install.
+dnl 4. Add --enable-desktop-validate to DISTCHECK_CONFIGURE_FLAGS
+dnl    in Makefile.am to require valid desktop file when doing a distcheck.
+dnl
+dnl On installation desktop-file-install will be used when available which also
+dnl rebuilds the mime info cache. After install update-desktop-database is called.
+dnl 
+dnl Author: TingPing <tingping@tingping.se>
+dnl Based upon appdata-xml.m4
+
+AC_DEFUN([DESKTOP_FILE],
+[
+  m4_pattern_allow([AM_V_GEN])
+  AC_ARG_ENABLE([desktop-validate],
+                [AS_HELP_STRING([--disable-desktop-validate],
+                                [Disable validating desktop files during check phase])])
+
+  AS_IF([test "x$enable_desktop_validate" != "xno"],
+        [AC_PATH_PROG([DESKTOP_FILE_VALIDATE], [desktop-file-validate])
+         AS_IF([test "x$DESKTOP_FILE_VALIDATE" = "x"],
+               [have_desktop_validate=no],
+               [have_desktop_validate=yes
+                AC_SUBST([DESKTOP_FILE_VALIDATE])])],
+        [have_desktop_validate=no])
+
+  AC_ARG_ENABLE([desktop-database-update],
+                [AS_HELP_STRING([--disable-desktop-database-update],
+                                [Disable generating the desktop database, useful for packaging])])
+
+  AS_IF([test "x$enable_desktop_database_update" != "xno"], [
+      AC_PATH_PROG([UPDATE_DESKTOP_DATABASE], [update-desktop-database])
+      AS_IF([test "x$UPDATE_DESKTOP_DATABASE" != "x"], [AC_SUBST([UPDATE_DESKTOP_DATABASE])])
+  ])
+
+  AC_PATH_PROG([DESKTOP_FILE_INSTALL], [desktop-file-install])
+  AS_IF([test "x$DESKTOP_FILE_INSTALL" != "x"], [AC_SUBST([DESKTOP_FILE_INSTALL])])
+
+  AS_IF([test "x$have_desktop_validate" != "xno"],
+        [desktop_validate=yes],
+        [desktop_validate=no
+         AS_IF([test "x$enable_desktop_validate" = "xyes"],
+               [AC_MSG_ERROR([Desktop validation was requested but desktop-file-validate was not found])])])
+
+  AC_SUBST([desktopfiledir], [${datadir}/applications])
+
+  DESKTOP_FILE_RULES='
+.PHONY : uninstall-desktop-file install-desktop-file clean-desktop-file
+
+mostlyclean-am: clean-desktop-file
+
+%.desktop.valid: %.desktop
+	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; \
+		if test -n "$(DESKTOP_FILE_VALIDATE)"; \
+			then $(DESKTOP_FILE_VALIDATE) $${d}$<; fi \
+		&& touch [$]@
+
+check-am: $(desktop_FILES:.desktop=.desktop.valid)
+uninstall-am: uninstall-desktop-file
+install-data-am: install-desktop-file
+
+.SECONDARY: $(desktop_FILES)
+
+install-desktop-file: $(desktop_FILES)
+	@$(NORMAL_INSTALL)
+	if test -n "$^"; then \
+		test -z "$(desktopfiledir)" || $(MKDIR_P) "$(DESTDIR)$(desktopfiledir)"; \
+		if test -n "$(DESKTOP_FILE_INSTALL)"; then \
+			$(DESKTOP_FILE_INSTALL) --dir="$(DESTDIR)$(desktopfiledir)" --mode=644 $^; \
+		else \
+			$(INSTALL_DATA) $^ "$(DESTDIR)$(desktopfiledir)"; \
+		fi; \
+		test -z "$(UPDATE_DESKTOP_DATABASE)" || $(UPDATE_DESKTOP_DATABASE) -q "$(DESTDIR)$(desktopfiledir)"; \
+	fi
+
+uninstall-desktop-file:
+	@$(NORMAL_UNINSTALL)
+	@list='\''$(desktop_FILES)'\''; test -n "$(desktopfiledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '\''$(DESTDIR)$(desktopfiledir)'\'' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(desktopfiledir)" && rm -f $$files; \
+	test -z "$(UPDATE_DESKTOP_DATABASE)" || $(UPDATE_DESKTOP_DATABASE) -q "$(DESTDIR)$(desktopfiledir)"
+
+clean-desktop-file:
+	rm -f $(desktop_FILES:.desktop=.desktop.valid)
+'
+  _DESKTOP_FILE_SUBST(DESKTOP_FILE_RULES)
+])
+
+dnl _DESKTOP_FILE_SUBST(VARIABLE)
+dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+AC_DEFUN([_DESKTOP_FILE_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
diff --git a/m4/gconf-2.m4 b/m4/gconf-2.m4
deleted file mode 100644
index 4a0936e..0000000
--- a/m4/gconf-2.m4
+++ /dev/null
@@ -1,44 +0,0 @@
-dnl AM_GCONF_SOURCE_2
-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-dnl  (i.e. pass to gconftool-2
-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-dnl  you should install foo.schemas files
-dnl
-
-AC_DEFUN([AM_GCONF_SOURCE_2],
-[
-  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  else
-    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-  fi
-
-  AC_ARG_WITH([gconf-source],
-	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
-			     [Config database for installing schema files.]),
-	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-
-  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-
-  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-  fi
-
-  AC_ARG_WITH([gconf-schema-file-dir],
-	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-			     [Directory for installing schema files.]),
-	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
-
-  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-
-  AC_ARG_ENABLE(schemas-install,
-  	AC_HELP_STRING([--disable-schemas-install],
-		       [Disable the schemas installation]),
-     [case ${enableval} in
-       yes|no) ;;
-       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
-      esac])
-  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-])
diff --git a/m4/intltool.m4 b/m4/intltool.m4
deleted file mode 100644
index 839e855..0000000
--- a/m4/intltool.m4
+++ /dev/null
@@ -1,216 +0,0 @@
-## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
-## Copyright (C) 2001 Eazel, Inc.
-## Author: Maciej Stachowiak <mjs@noisehavoc.org>
-##         Kenneth Christiansen <kenneth@gnu.org>
-##
-## 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.
-
-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 40 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL], [
-AC_PREREQ([2.50])dnl
-AC_REQUIRE([AM_NLS])dnl
-
-case "$am__api_version" in
-    1.[01234])
-	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-    ;;
-    *)
-    ;;
-esac
-
-if test -n "$1"; then
-    AC_MSG_CHECKING([for intltool >= $1])
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    ]
-    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
-fi
-
-AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
-AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
-fi
-
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
-_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-_IT_SUBST(INTLTOOL_KEYS_RULE)
-_IT_SUBST(INTLTOOL_PROP_RULE)
-_IT_SUBST(INTLTOOL_OAF_RULE)
-_IT_SUBST(INTLTOOL_PONG_RULE)
-_IT_SUBST(INTLTOOL_SERVER_RULE)
-_IT_SUBST(INTLTOOL_SHEET_RULE)
-_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-_IT_SUBST(INTLTOOL_UI_RULE)
-_IT_SUBST(INTLTOOL_XAM_RULE)
-_IT_SUBST(INTLTOOL_KBD_RULE)
-_IT_SUBST(INTLTOOL_XML_RULE)
-_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-_IT_SUBST(INTLTOOL_CAVES_RULE)
-_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-_IT_SUBST(INTLTOOL_THEME_RULE)
-_IT_SUBST(INTLTOOL_SERVICE_RULE)
-_IT_SUBST(INTLTOOL_POLICY_RULE)
-
-# Check the gettext tools to make sure they are GNU
-AC_PATH_PROG(XGETTEXT, xgettext)
-AC_PATH_PROG(MSGMERGE, msgmerge)
-AC_PATH_PROG(MSGFMT, msgfmt)
-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
-   AC_MSG_ERROR([perl not found])
-fi
-AC_MSG_CHECKING([for perl >= 5.8.1])
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
-   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
-else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-   AC_MSG_RESULT([$IT_PERL_VERSION])
-fi
-if test "x$2" != "xno-xml"; then
-   AC_MSG_CHECKING([for XML::Parser])
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       AC_MSG_RESULT([ok])
-   else
-       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-   fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-AC_SUBST(ALL_LINGUAS)
-
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([[]],
-                     [[extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr]])],
-    [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
-    dnl in this case.
-    AC_CHECK_FUNC(bind_textdomain_codeset,
-      [DATADIRNAME=share], [DATADIRNAME=lib])
-    ;;
-    *)
-    [DATADIRNAME=lib]
-    ;;
-    esac])
-fi
-AC_SUBST(DATADIRNAME)
-
-IT_PO_SUBDIR([po])
-
-])
-
-
-# IT_PO_SUBDIR(DIRNAME)
-# ---------------------
-# All po subdirs have to be declared with this macro; the subdir "po" is
-# declared by IT_PROG_INTLTOOL.
-#
-AC_DEFUN([IT_PO_SUBDIR],
-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-dnl
-dnl The following CONFIG_COMMANDS should be executed at the very end
-dnl of config.status.
-AC_CONFIG_COMMANDS_PRE([
-  AC_CONFIG_COMMANDS([$1/stamp-it], [
-    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
-       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-    fi
-    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-    >"$1/stamp-it.tmp"
-    [sed '/^#/d
-	 s/^[[].*] *//
-	 /^[ 	]*$/d
-	'"s|^|	$ac_top_srcdir/|" \
-      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-    ]
-    [sed '/^POTFILES =/,/[^\\]$/ {
-		/^POTFILES =/!d
-		r $1/POTFILES
-	  }
-	 ' "$1/Makefile.in" >"$1/Makefile"]
-    rm -f "$1/Makefile.tmp"
-    mv "$1/stamp-it.tmp" "$1/stamp-it"
-  ])
-])dnl
-])
-
-# _IT_SUBST(VARIABLE)
-# -------------------
-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-#
-AC_DEFUN([_IT_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
-
-# deprecated macros
-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-# A hint is needed for aclocal from Automake <= 1.9.4:
-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-
diff --git a/m4/libcurl.m4 b/m4/libcurl.m4
deleted file mode 100644
index f54a5f2..0000000
--- a/m4/libcurl.m4
+++ /dev/null
@@ -1,240 +0,0 @@
-# LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION],
-#                       [ACTION-IF-YES], [ACTION-IF-NO])
-# ----------------------------------------------------------
-#      David Shaw <dshaw@jabberwocky.com>   May-09-2006
-#
-# Checks for libcurl.  DEFAULT-ACTION is the string yes or no to
-# specify whether to default to --with-libcurl or --without-libcurl.
-# If not supplied, DEFAULT-ACTION is yes.  MINIMUM-VERSION is the
-# minimum version of libcurl to accept.  Pass the version as a regular
-# version number like 7.10.1. If not supplied, any version is
-# accepted.  ACTION-IF-YES is a list of shell commands to run if
-# libcurl was successfully found and passed the various tests.
-# ACTION-IF-NO is a list of shell commands that are run otherwise.
-# Note that using --without-libcurl does run ACTION-IF-NO.
-#
-# This macro #defines HAVE_LIBCURL if a working libcurl setup is
-# found, and sets @LIBCURL@ and @LIBCURL_CPPFLAGS@ to the necessary
-# values.  Other useful defines are LIBCURL_FEATURE_xxx where xxx are
-# the various features supported by libcurl, and LIBCURL_PROTOCOL_yyy
-# where yyy are the various protocols supported by libcurl.  Both xxx
-# and yyy are capitalized.  See the list of AH_TEMPLATEs at the top of
-# the macro for the complete list of possible defines.  Shell
-# variables $libcurl_feature_xxx and $libcurl_protocol_yyy are also
-# defined to 'yes' for those features and protocols that were found.
-# Note that xxx and yyy keep the same capitalization as in the
-# curl-config list (e.g. it's "HTTP" and not "http").
-#
-# Users may override the detected values by doing something like:
-# LIBCURL="-lcurl" LIBCURL_CPPFLAGS="-I/usr/myinclude" ./configure
-#
-# For the sake of sanity, this macro assumes that any libcurl that is
-# found is after version 7.7.2, the first version that included the
-# curl-config script.  Note that it is very important for people
-# packaging binary versions of libcurl to include this script!
-# Without curl-config, we can only guess what protocols are available,
-# or use curl_version_info to figure it out at runtime.
-
-AC_DEFUN([LIBCURL_CHECK_CONFIG],
-[
-  AH_TEMPLATE([LIBCURL_FEATURE_SSL],[Defined if libcurl supports SSL])
-  AH_TEMPLATE([LIBCURL_FEATURE_KRB4],[Defined if libcurl supports KRB4])
-  AH_TEMPLATE([LIBCURL_FEATURE_IPV6],[Defined if libcurl supports IPv6])
-  AH_TEMPLATE([LIBCURL_FEATURE_LIBZ],[Defined if libcurl supports libz])
-  AH_TEMPLATE([LIBCURL_FEATURE_ASYNCHDNS],[Defined if libcurl supports AsynchDNS])
-  AH_TEMPLATE([LIBCURL_FEATURE_IDN],[Defined if libcurl supports IDN])
-  AH_TEMPLATE([LIBCURL_FEATURE_SSPI],[Defined if libcurl supports SSPI])
-  AH_TEMPLATE([LIBCURL_FEATURE_NTLM],[Defined if libcurl supports NTLM])
-
-  AH_TEMPLATE([LIBCURL_PROTOCOL_HTTP],[Defined if libcurl supports HTTP])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_HTTPS],[Defined if libcurl supports HTTPS])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_FTP],[Defined if libcurl supports FTP])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_FTPS],[Defined if libcurl supports FTPS])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_FILE],[Defined if libcurl supports FILE])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_TELNET],[Defined if libcurl supports TELNET])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_LDAP],[Defined if libcurl supports LDAP])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_DICT],[Defined if libcurl supports DICT])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_TFTP],[Defined if libcurl supports TFTP])
-
-  AC_ARG_WITH(libcurl,
-     AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]),
-     [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])])
-
-  if test "$_libcurl_with" != "no" ; then
-
-     AC_PROG_AWK
-
-     _libcurl_version_parse="eval $AWK '{split(\$NF,A,\".\"); X=256*256*A[[1]]+256*A[[2]]+A[[3]]; print X;}'"
-
-     _libcurl_try_link=yes
-
-     if test -d "$_libcurl_with" ; then
-        LIBCURL_CPPFLAGS="-I$withval/include"
-        _libcurl_ldflags="-L$withval/lib"
-        AC_PATH_PROG([_libcurl_config],[curl-config],["$withval/bin"],
-                     ["$withval/bin"])
-     else
-	AC_PATH_PROG([_libcurl_config],[curl-config])
-     fi
-
-     if test x$_libcurl_config != "x" ; then
-        AC_CACHE_CHECK([for the version of libcurl],
-	   [libcurl_cv_lib_curl_version],
-           [libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $[]2}'`])
-
-	_libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse`
-	_libcurl_wanted=`echo ifelse([$2],,[0],[$2]) | $_libcurl_version_parse`
-
-        if test $_libcurl_wanted -gt 0 ; then
-	   AC_CACHE_CHECK([for libcurl >= version $2],
-	      [libcurl_cv_lib_version_ok],
-              [
-   	      if test $_libcurl_version -ge $_libcurl_wanted ; then
-	         libcurl_cv_lib_version_ok=yes
-      	      else
-	         libcurl_cv_lib_version_ok=no
-  	      fi
-              ])
-        fi
-
-	if test $_libcurl_wanted -eq 0 || test x$libcurl_cv_lib_version_ok = xyes ; then
-           if test x"$LIBCURL_CPPFLAGS" = "x" ; then
-              LIBCURL_CPPFLAGS=`$_libcurl_config --cflags`
-           fi
-           if test x"$LIBCURL" = "x" ; then
-              LIBCURL=`$_libcurl_config --libs`
-
-              # This is so silly, but Apple actually has a bug in their
-	      # curl-config script.  Fixed in Tiger, but there are still
-	      # lots of Panther installs around.
-              case "${host}" in
-                 powerpc-apple-darwin7*)
-                    LIBCURL=`echo $LIBCURL | sed -e 's|-arch i386||g'`
-                 ;;
-              esac
-           fi
-
-	   # All curl-config scripts support --feature
-	   _libcurl_features=`$_libcurl_config --feature`
-
-           # Is it modern enough to have --protocols? (7.12.4)
-	   if test $_libcurl_version -ge 461828 ; then
-              _libcurl_protocols=`$_libcurl_config --protocols`
-           fi
-	else
-           _libcurl_try_link=no
-	fi
-
-	unset _libcurl_wanted
-     fi
-
-     if test $_libcurl_try_link = yes ; then
-
-        # we didn't find curl-config, so let's see if the user-supplied
-        # link line (or failing that, "-lcurl") is enough.
-        LIBCURL=${LIBCURL-"$_libcurl_ldflags -lcurl"}
-
-        AC_CACHE_CHECK([whether libcurl is usable],
-           [libcurl_cv_lib_curl_usable],
-           [
-           _libcurl_save_cppflags=$CPPFLAGS
-           CPPFLAGS="$LIBCURL_CPPFLAGS $CPPFLAGS"
-           _libcurl_save_libs=$LIBS
-           LIBS="$LIBCURL $LIBS"
-
-           AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <curl/curl.h>],[
-/* Try and use a few common options to force a failure if we are
-   missing symbols or can't link. */
-int x;
-curl_easy_setopt(NULL,CURLOPT_URL,NULL);
-x=CURL_ERROR_SIZE;
-x=CURLOPT_WRITEFUNCTION;
-x=CURLOPT_FILE;
-x=CURLOPT_ERRORBUFFER;
-x=CURLOPT_STDERR;
-x=CURLOPT_VERBOSE;
-]),libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no)
-
-           CPPFLAGS=$_libcurl_save_cppflags
-           LIBS=$_libcurl_save_libs
-           unset _libcurl_save_cppflags
-           unset _libcurl_save_libs
-           ])
-
-        if test $libcurl_cv_lib_curl_usable = yes ; then
-
-	   # Does curl_free() exist in this version of libcurl?
-	   # If not, fake it with free()
-
-           _libcurl_save_cppflags=$CPPFLAGS
-           CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
-           _libcurl_save_libs=$LIBS
-           LIBS="$LIBS $LIBCURL"
-
-           AC_CHECK_FUNC(curl_free,,
-  	      AC_DEFINE(curl_free,free,
-		[Define curl_free() as free() if our version of curl lacks curl_free.]))
-
-           CPPFLAGS=$_libcurl_save_cppflags
-           LIBS=$_libcurl_save_libs
-           unset _libcurl_save_cppflags
-           unset _libcurl_save_libs
-
-           AC_DEFINE(HAVE_LIBCURL,1,
-             [Define to 1 if you have a functional curl library.])
-           AC_SUBST(LIBCURL_CPPFLAGS)
-           AC_SUBST(LIBCURL)
-
-           for _libcurl_feature in $_libcurl_features ; do
-	      AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_feature_$_libcurl_feature),[1])
-	      eval AS_TR_SH(libcurl_feature_$_libcurl_feature)=yes
-           done
-
-	   if test "x$_libcurl_protocols" = "x" ; then
-
-	      # We don't have --protocols, so just assume that all
-	      # protocols are available
-	      _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT"
-
-	      if test x$libcurl_feature_SSL = xyes ; then
-	         _libcurl_protocols="$_libcurl_protocols HTTPS"
-
-		 # FTPS wasn't standards-compliant until version
-		 # 7.11.0
-		 if test $_libcurl_version -ge 461568; then
-		    _libcurl_protocols="$_libcurl_protocols FTPS"
-		 fi
-	      fi
-	   fi
-
-	   for _libcurl_protocol in $_libcurl_protocols ; do
-	      AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_protocol_$_libcurl_protocol),[1])
-	      eval AS_TR_SH(libcurl_protocol_$_libcurl_protocol)=yes
-           done
-	else
-	   unset LIBCURL
-	   unset LIBCURL_CPPFLAGS
-        fi
-     fi
-
-     unset _libcurl_try_link
-     unset _libcurl_version_parse
-     unset _libcurl_config
-     unset _libcurl_feature
-     unset _libcurl_features
-     unset _libcurl_protocol
-     unset _libcurl_protocols
-     unset _libcurl_version
-     unset _libcurl_ldflags
-  fi
-
-  if test x$_libcurl_with = xno || test x$libcurl_cv_lib_curl_usable != xyes ; then
-     # This is the IF-NO path
-     ifelse([$4],,:,[$4])
-  else
-     # This is the IF-YES path
-     ifelse([$3],,:,[$3])
-  fi
-
-  unset _libcurl_with
-])dnl
diff --git a/m4/libtool.m4 b/m4/libtool.m4
deleted file mode 100644
index 56666f0..0000000
--- a/m4/libtool.m4
+++ /dev/null
@@ -1,7986 +0,0 @@
-# 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 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.
-])
-
-# serial 57 LT_INIT
-
-
-# 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])])
-
-
-# _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
-])
-
-
-# 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
-
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# 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], [])
-
-
-# _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-%%"`
-])
-
-
-# _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
-
-
-# _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
-
-_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
-
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
-
-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
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# 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
-
-_LT_CC_BASENAME([$compiler])
-
-# 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
-
-# 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
-
-
-# _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'
-
-# 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'
-])
-
-# _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
-
-
-## ------------------------------------- ##
-## Accumulate code for creating libtool. ##
-## ------------------------------------- ##
-
-# 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.
-
-
-# _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
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _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])
-])
-
-
-# _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], [[!?.]$], [], [.])
-)])
-
-
-
-## ------------------------ ##
-## FIXME: Eliminate VARNAME ##
-## ------------------------ ##
-
-
-# _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])])])
-])
-
-
-# _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
-])
-
-
-# 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
-])
-
-
-# _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
-])
-
-
-# _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
-])
-
-
-# _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])])])])
-
-
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-
-
-# _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],
-[
-
-# 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
-
-# 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
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-# _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."
-
-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=: ;;
-
-    -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
-
-    *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-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
-
-
-# _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
-
-    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.
-#
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### 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
-
-  _LT_PROG_LTMAIN
-
-  # 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)
-
-  _LT_PROG_REPLACE_SHELLFNS
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-],
-[cat <<_LT_EOF >> "$ofile"
-
-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], [])
-
-
-# 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
-
-
-# _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
-
-
-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
-
-
-# _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
-
-# 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
-])# _LT_TAG_COMPILER
-
-
-# _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
-
-
-# _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"
-    ])
-
-    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
-])
-
-
-# _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
-])
-
-# _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
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
-[m4_divert_text([M4SH-INIT], [$1
-])])# _LT_SHELL_INIT
-
-
-
-# _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
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*" 
-}
-
-case "$ECHO" in
-  printf*) AC_MSG_RESULT([printf]) ;;
-  print*) AC_MSG_RESULT([print -r]) ;;
-  *) AC_MSG_RESULT([cat]) ;;
-esac
-
-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
-
- 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.])])
-
-# _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
-ia64-*-hpux*)
-  # 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.$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 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*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [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
-  ;;
-*-*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
-
-need_locks="$enable_libtool_lock"
-])# _LT_ENABLE_LOCK
-
-
-# _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
-      rm -f conftest.* libconftest.a
-     ])
-  ])
-
-if test "x$lt_cv_ar_at_file" = xno; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-_LT_DECL([], [archiver_list_spec], [1],
-  [How to feed a file listing to the archiver])
-])# _LT_PROG_AR
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun([_LT_CMD_OLD_ARCHIVE],
-[_LT_PROG_AR
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL([], [RANLIB], [1],
-    [Commands used to install an old-style archive])
-
-# 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
-_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 test x"[$]$2" = xyes; then
-    m4_if([$5], , :, [$5])
-else
-    m4_if([$6], , :, [$6])
-fi
-])# _LT_COMPILER_OPTION
-
-# 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 test x"[$]$2" = xyes; then
-    m4_if([$4], , :, [$4])
-else
-    m4_if([$5], , :, [$5])
-fi
-])# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-
-
-# 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;
-    ;;
-
-  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
-])
-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
-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
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-[#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* 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
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}]
-_LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./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_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_TRY_DLOPEN_SELF
-
-
-# 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
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  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"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [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"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    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_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
-      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_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)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  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*
-])
-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-	[Does compiler simultaneously support -c and -o options?])
-])# _LT_COMPILER_C_O
-
-
-# _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 "$_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*
-  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])
-    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
-
-
-# _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
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-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.
-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-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 "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _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
-_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
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-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"
-      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
-
-
-# _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=
-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
-
-# 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 # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-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
-  ;;
-
-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
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-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
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  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
-
-    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'
-    ;;
-
-  *,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'
-    ;;
-
-  *)
-    # 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
-  ;;
-
-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`'
-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'
-  ;;
-
-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
-  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 # 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
-    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
-  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
-
-  # Add ABI-specific directories to the system library path.
-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
-  # 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
-AC_MSG_RESULT([$dynamic_linker])
-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
-
-_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
-
-
-# _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_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="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 \(.*\)"`
-	  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])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-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], [])
-
-
-# _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
-    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# _LT_PATH_MAGIC
-
-
-# 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
-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 $CC])
-  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
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[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])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-_LT_PATH_LD_GNU
-AC_SUBST([LD])
-
-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-])# LT_PATH_LD
-
-# 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 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])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# _LT_PATH_LD_GNU
-
-
-# _LT_CMD_RELOAD
-# --------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-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
-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
-
-
-# _LT_CHECK_MAGIC_METHOD
-# ----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-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=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# '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 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
-aix[[4-9]]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-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*)
-  # 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=pass_all
-  ;;
-
-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|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.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-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
-    ;;
-  *)
-    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
-  ;;
-
-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_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]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  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='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-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]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  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
-
-_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
-  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
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi])
-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
-
-
-# _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* | *-*-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, cos, LIBM="$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
-
-# 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
-    ;;
-  *)
-    _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
-      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
-
-## 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...
-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
-    $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
-        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
-
-# 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=${GCJ-"gcj"}
-CFLAGS=$GCJFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# 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
-
-## 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...
-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
-
-## 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...
-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])
-])
-
-# _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.                               #
-############################################################
-
-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_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      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
-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
-  done
-done
-])
-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
-  lt_unset=false
-fi
-_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=:
-])
-
-
-# _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])
-
-  _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
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
deleted file mode 100644
index 5d9acd8..0000000
--- a/m4/ltoptions.m4
+++ /dev/null
@@ -1,384 +0,0 @@
-# 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
-
-
-## --------------------------------- ##
-## Macros to handle LT_INIT 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], [])
-
-## ----------------- ##
-## LTDL_INIT Options ##
-## ----------------- ##
-
-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])])
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
deleted file mode 100644
index 9000a05..0000000
--- a/m4/ltsugar.m4
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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
-])
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
deleted file mode 100644
index 07a8602..0000000
--- a/m4/ltversion.m4
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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)
-])
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
deleted file mode 100644
index c573da9..0000000
--- a/m4/lt~obsolete.m4
+++ /dev/null
@@ -1,98 +0,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])])
diff --git a/m4/pkg.m4 b/m4/pkg.m4
deleted file mode 100644
index 73973f7..0000000
--- a/m4/pkg.m4
+++ /dev/null
@@ -1,157 +0,0 @@
-# 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)?$])
-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`],
-		     [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 "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])
-        ])
-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/>.])
-        ])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	$3
-fi[]dnl
-])# PKG_CHECK_MODULES
diff --git a/missing b/missing
deleted file mode 100755
index 9a55648..0000000
--- a/missing
+++ /dev/null
@@ -1,330 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2012-01-06.18; # UTC
-
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# 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.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try '$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, 'missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file 'aclocal.m4'
-  autoconf     touch file 'configure'
-  autoheader   touch file 'config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all 'Makefile.in' files
-  bison        create 'y.tab.[ch]', if possible, from existing .[ch]
-  flex         create 'lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create 'lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  yacc         create 'y.tab.[ch]', if possible, from existing .[ch]
-
-Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
-'g' are ignored when checking the name.
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown '$1' option"
-    echo 1>&2 "Try '$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running '$TOOL --version' or '$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: '$1' is $msg.  You should only need it if
-         you modified 'acinclude.m4' or '${configure_ac}'.  You might want
-         to install the Automake and Perl packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: '$1' is $msg.  You should only need it if
-         you modified '${configure_ac}'.  You might want to install the
-         Autoconf and GNU m4 packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: '$1' is $msg.  You should only need it if
-         you modified 'acconfig.h' or '${configure_ac}'.  You might want
-         to install the Autoconf and GNU m4 packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: '$1' is $msg.  You should only need it if
-         you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'.
-         You might want to install the Automake and Perl packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te*)
-    echo 1>&2 "\
-WARNING: '$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get '$1' as part of Autoconf from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: '$1' $msg.  You should only need it if
-         you modified a '.y' file.  You may need the Bison package
-         in order for those modifications to take effect.  You can get
-         Bison from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: '$1' is $msg.  You should only need it if
-         you modified a '.l' file.  You may need the Flex package
-         in order for those modifications to take effect.  You can get
-         Flex from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: '$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 Help2man package in order for those modifications to take
-	 effect.  You can get Help2man from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: '$1' is $msg.  You should only need it if
-         you modified a '.texi' or '.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy 'make' (AIX,
-         DU, IRIX).  You might want to install the Texinfo package or
-         the GNU make package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: '$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the 'README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing '$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/po/LINGUAS b/po/LINGUAS
index ac68527..f3bf1a1 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,6 +1,8 @@
+bg
 ca
 cs
 de
+el
 es
 fr
 hu
@@ -16,3 +18,4 @@ sv
 tr
 uk
 zh_TW
+zh_CN
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
deleted file mode 100644
index cc8a222..0000000
--- a/po/Makefile.in.in
+++ /dev/null
@@ -1,217 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
-#
-# This file may be copied and used freely without restrictions.  It may
-# be used in projects which are not available under a GNU Public License,
-# but which still want to provide support for the GNU gettext functionality.
-#
-# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
-#
-# - Modified by jacob berkman <jacob@ximian.com> to install
-#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-#
-# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
-#
-# We have the following line for use by intltoolize:
-# INTLTOOL_MAKEFILE
-
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = @datadir@
-datarootdir = @datarootdir@
-libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-subdir = po
-install_sh = @install_sh@
-# Automake >= 1.8 provides @mkdir_p@.
-# Until it can be supposed, use the safe fallback:
-mkdir_p = $(install_sh) -d
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-
-ALL_LINGUAS = @ALL_LINGUAS@
-
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-
-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-
-POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-
-DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
-
-POTFILES = \
-# This comment gets stripped out
-
-CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-
-.SUFFIXES:
-.SUFFIXES: .po .pox .gmo .mo .msg .cat
-
-.po.pox:
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-
-.po.mo:
-	$(MSGFMT) -o $@ $<
-
-.po.gmo:
-	file=`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
-	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && gencat $@ $*.msg
-
-
-all: all-@USE_NLS@
-
-all-yes: $(CATALOGS)
-all-no:
-
-$(GETTEXT_PACKAGE).pot: $(POTFILES)
-	$(GENPOT)
-
-install: install-data
-install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-	  $(mkdir_p) $$dir; \
-	  if test -r $$lang.gmo; then \
-	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
-	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $(srcdir)/$$lang.gmo as" \
-		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
-	  fi; \
-	  if test -r $$lang.gmo.m; then \
-	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
-	  else \
-	    if test -r $(srcdir)/$$lang.gmo.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-		$$dir/$(GETTEXT_PACKAGE).mo.m; \
-	      echo "installing $(srcdir)/$$lang.gmo.m as" \
-		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
-	    else \
-	      true; \
-	    fi; \
-	  fi; \
-	done
-
-# Empty stubs to satisfy archaic automake needs
-dvi info ctags tags CTAGS TAGS ID:
-
-# Define this as empty until I found a useful application.
-install-exec installcheck:
-
-uninstall:
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-	done
-
-check: all $(GETTEXT_PACKAGE).pot
-	rm -f missing notexist
-	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
-	if [ -r missing -o -r notexist ]; then \
-	  exit 1; \
-	fi
-
-mostlyclean:
-	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-	rm -f .intltool-merge-cache
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile Makefile.in POTFILES stamp-it
-	rm -f *.mo *.msg *.cat *.cat.m *.gmo
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	rm -f Makefile.in.in
-
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: $(DISTFILES)
-	dists="$(DISTFILES)"; \
-	extra_dists="$(EXTRA_DISTFILES)"; \
-	for file in $$extra_dists; do \
-	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
-	done; \
-	for file in $$dists; do \
-	  test -f $$file || file="$(srcdir)/$$file"; \
-	  ln $$file $(distdir) 2> /dev/null \
-	    || cp -p $$file $(distdir); \
-	done
-
-update-po: Makefile
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	tmpdir=`pwd`; \
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  echo "$$lang:"; \
-	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-	  if $$result; then \
-	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	      rm -f $$tmpdir/$$lang.new.po; \
-            else \
-	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	        :; \
-	      else \
-	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	        rm -f $$tmpdir/$$lang.new.po; \
-	        exit 1; \
-	      fi; \
-	    fi; \
-	  else \
-	    echo "msgmerge for $$lang.gmo failed!"; \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  fi; \
-	done
-
-Makefile POTFILES: stamp-it
-	@if test ! -f $@; then \
-	  rm -f stamp-it; \
-	  $(MAKE) stamp-it; \
-	fi
-
-stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
-	       $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 09165c9..8440abd 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,5 @@
+[type: gettext/ini]data/transmission-remote-gtk.desktop.in
+[type: gettext/xml]data/transmission-remote-gtk.appdata.xml.in
 src/bencode.c
 src/hig.c
 src/json.c
@@ -6,6 +8,7 @@ src/remote-exec.c
 src/requests.c
 src/session-get.c
 src/torrent.c
+src/torrent-cell-renderer.c
 src/trg-about-window.c
 src/trg-cell-renderer-epoch.c
 src/trg-cell-renderer-eta.c
@@ -20,6 +23,7 @@ src/trg-file-parser.c
 src/trg-files-model.c
 src/trg-files-tree-view.c
 src/trg-general-panel.c
+src/trg-gtk-app.c
 src/trg-json-widgets.c
 src/trg-main-window.c
 src/trg-menu-bar.c
@@ -29,6 +33,7 @@ src/trg-peers-tree-view.c
 src/trg-preferences-dialog.c
 src/trg-prefs.c
 src/trg-remote-prefs-dialog.c
+src/trg-rss-window.c
 src/trg-state-selector.c
 src/trg-stats-dialog.c
 src/trg-status-bar.c
diff --git a/po/bg.po b/po/bg.po
new file mode 100644
index 0000000..d2255ec
--- /dev/null
+++ b/po/bg.po
@@ -0,0 +1,1480 @@
+# Bulgarian translation for transmission-remote-gtk
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the transmission-remote-gtk package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: transmission-remote-gtk\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-09 23:41+0100\n"
+"PO-Revision-Date: 2014-04-06 18:29+0000\n"
+"Last-Translator: Radoslav Petrov <rrpetrov@gmail.com>\n"
+"Language-Team: Bulgarian <bg@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2014-06-12 07:44+0000\n"
+"X-Generator: Launchpad (build 17045)\n"
+
+#: src/torrent.c:360 src/torrent.c:380
+msgid "Metadata Downloading"
+msgstr "Изтегл�не на метаданните"
+
+#: src/torrent.c:362 src/torrent.c:382 src/trg-state-selector.c:658
+msgid "Downloading"
+msgstr "Изтегл�не"
+
+#: src/torrent.c:364
+msgid "Queued download"
+msgstr "Изтегл�не, чакащо в опашката"
+
+#: src/torrent.c:366 src/torrent.c:390
+msgid "Waiting To Check"
+msgstr "Чакащ за проверка"
+
+#: src/torrent.c:368 src/torrent.c:388 src/trg-state-selector.c:684
+msgid "Checking"
+msgstr "Провер�ване"
+
+#: src/torrent.c:370
+msgid "Queued seed"
+msgstr ""
+
+#: src/torrent.c:372 src/torrent.c:386 src/trg-remote-prefs-dialog.c:360
+#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:438
+msgid "Seeding"
+msgstr "Разпро�тран�ване"
+
+#: src/torrent.c:374 src/torrent.c:384 src/torrent-cell-renderer.c:285
+#: src/trg-state-selector.c:672
+msgid "Paused"
+msgstr "Паузиран"
+
+#: src/torrent.c:394
+msgid "Unknown"
+msgstr "�еизве�тно"
+
+#: src/torrent-cell-renderer.c:157
+#, c-format
+msgid "%1$s of %2$s (%3$s)"
+msgstr "%1$s от %2$s (%3$s)"
+
+#: src/torrent-cell-renderer.c:167
+#, c-format
+msgid "%1$s of %2$s (%3$s), uploaded %4$s (Ratio: %5$s Goal: %6$s)"
+msgstr ""
+
+#: src/torrent-cell-renderer.c:183
+#, c-format
+msgid "%1$s of %2$s (%3$s), uploaded %4$s (Ratio: %5$s)"
+msgstr ""
+
+#: src/torrent-cell-renderer.c:200
+#, c-format
+msgid "%1$s, uploaded %2$s (Ratio: %3$s Goal: %4$s)"
+msgstr ""
+
+#: src/torrent-cell-renderer.c:214
+#, c-format
+msgid "%1$s, uploaded %2$s (Ratio: %3$s)"
+msgstr ""
+
+#: src/torrent-cell-renderer.c:230
+msgid "Remaining time unknown"
+msgstr "О�таващото време е неизве�тно"
+
+#: src/torrent-cell-renderer.c:235
+#, c-format
+msgid "%s remaining"
+msgstr "О�таващо време %s"
+
+#: src/torrent-cell-renderer.c:259
+#, c-format
+msgid "%1$s %2$s, %3$s %4$s"
+msgstr ""
+
+#: src/torrent-cell-renderer.c:263 src/torrent-cell-renderer.c:266
+#, c-format
+msgid "%1$s %2$s"
+msgstr ""
+
+#: src/torrent-cell-renderer.c:270
+msgid "Idle"
+msgstr "Бездей�твие"
+
+#: src/torrent-cell-renderer.c:284
+msgid "Finished"
+msgstr "Завършен"
+
+#: src/torrent-cell-renderer.c:287
+msgid "Queued for verification"
+msgstr "�а опашката за проверка"
+
+#: src/torrent-cell-renderer.c:289
+msgid "Queued for download"
+msgstr "�а опашката за изтегл�не"
+
+#: src/torrent-cell-renderer.c:291
+msgid "Queued for seeding"
+msgstr "�а опашката за разпро�транение"
+
+#: src/torrent-cell-renderer.c:294
+#, c-format
+msgid "Verifying data (%1$s tested)"
+msgstr "Провер�ване на данни (%1$s проверени)"
+
+#: src/torrent-cell-renderer.c:302
+#, c-format
+msgid "Ratio %s"
+msgstr "Коефициент %s"
+
+#: src/torrent-cell-renderer.c:332
+#, c-format
+msgid "Downloading from %1$li of %2$li connected peer"
+msgid_plural "Downloading from %1$li of %2$li connected peers"
+msgstr[0] "Изтегл�не от %1$li  от общо %2$li �вързан по�редник"
+msgstr[1] "Изтегл�не от %1$li от общо %2$li �вързани по�редници"
+
+#: src/torrent-cell-renderer.c:340
+#, c-format
+msgid "Downloading metadata from %1$li peer (%2$s done)"
+msgid_plural "Downloading metadata from %1$li peers (%2$s done)"
+msgstr[0] "Изтегл�не на метаданните от %1$li по�редник (%2$s получени)"
+msgstr[1] "Изтегл�не на метаданните от %1$li по�редници (%2$s получени)"
+
+#: src/torrent-cell-renderer.c:351
+#, c-format
+msgid "Seeding to %1$li of %2$li connected peer"
+msgid_plural "Seeding to %1$li of %2$li connected peers"
+msgstr[0] "Изпращане на метаданните от %1$li по�редник ( %2$li изпратени)"
+msgstr[1] "Изпращане на метаданните от %1$li по�редници (%2$li изпратени)"
+
+#: src/trg-about-window.c:74
+msgid "A remote client to transmission-daemon."
+msgstr "Отдалечен клиент за transmission-daemon"
+
+#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2025
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:407
+msgid "Low"
+msgstr "�и�ък"
+
+#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2021
+#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:409
+msgid "High"
+msgstr ""
+
+#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2023
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:408
+msgid "Normal"
+msgstr ""
+
+#: src/trg-cell-renderer-priority.c:80
+msgid "Mixed"
+msgstr ""
+
+#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:278
+#: src/trg-torrent-add-dialog.c:348 src/trg-torrent-tree-view.c:52
+msgid "Name"
+msgstr ""
+
+#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:281
+#: src/trg-torrent-add-dialog.c:366 src/trg-torrent-tree-view.c:57
+msgid "Size"
+msgstr ""
+
+#: src/trg-files-tree-view.c:191 src/trg-peers-tree-view.c:65
+msgid "Progress"
+msgstr ""
+
+#: src/trg-files-tree-view.c:193 src/trg-files-tree-view-common.c:69
+#: src/trg-torrent-add-dialog.c:379 src/trg-torrent-add-dialog.c:703
+msgid "Download"
+msgstr ""
+
+#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2014
+#: src/trg-torrent-add-dialog.c:395 src/trg-torrent-tree-view.c:145
+msgid "Priority"
+msgstr ""
+
+#: src/trg-files-tree-view-common.c:50 src/trg-torrent-add-dialog.c:694
+msgid "High Priority"
+msgstr ""
+
+#: src/trg-files-tree-view-common.c:54 src/trg-torrent-add-dialog.c:697
+msgid "Normal Priority"
+msgstr ""
+
+#: src/trg-files-tree-view-common.c:58 src/trg-torrent-add-dialog.c:700
+msgid "Low Priority"
+msgstr ""
+
+#: src/trg-files-tree-view-common.c:77 src/trg-torrent-add-dialog.c:706
+msgid "Skip"
+msgstr ""
+
+#: src/trg-files-tree-view-common.c:84
+msgid "Expand All"
+msgstr ""
+
+#: src/trg-files-tree-view-common.c:89
+msgid "Collapse All"
+msgstr ""
+
+#: src/trg-general-panel.c:153 src/trg-general-panel.c:212
+msgid "N/A"
+msgstr ""
+
+#: src/trg-general-panel.c:168
+msgid "(Private)"
+msgstr ""
+
+#: src/trg-general-panel.c:168
+msgid "(Public)"
+msgstr ""
+
+#: src/trg-general-panel.c:200 src/trg-main-window.c:1106
+#: src/trg-main-window.c:1519 src/trg-main-window.c:2149
+#: src/trg-state-selector.c:538 src/trg-torrent-add-url-dialog.c:67
+#: src/util.c:333
+msgid "Error"
+msgstr ""
+
+#: src/trg-general-panel.c:283 src/trg-torrent-tree-view.c:123
+msgid "ETA"
+msgstr ""
+
+#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:151
+msgid "Completed"
+msgstr ""
+
+#: src/trg-general-panel.c:288
+msgid "Seeders"
+msgstr ""
+
+#: src/trg-general-panel.c:290
+msgid "Rate Down"
+msgstr ""
+
+#: src/trg-general-panel.c:292 src/trg-torrent-tree-view.c:128
+msgid "Downloaded"
+msgstr ""
+
+#: src/trg-general-panel.c:295 src/trg-torrent-tree-view.c:70
+msgid "Leechers"
+msgstr ""
+
+#: src/trg-general-panel.c:297
+msgid "Rate Up"
+msgstr ""
+
+#: src/trg-general-panel.c:299 src/trg-torrent-tree-view.c:125
+msgid "Uploaded"
+msgstr ""
+
+#: src/trg-general-panel.c:302 src/trg-torrent-tree-view.c:63
+msgid "Status"
+msgstr ""
+
+#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:131
+msgid "Ratio"
+msgstr ""
+
+#: src/trg-general-panel.c:307
+msgid "Comment"
+msgstr ""
+
+#: src/trg-general-panel.c:310
+msgid "Completed At"
+msgstr ""
+
+#: src/trg-general-panel.c:314 src/trg-torrent-tree-view.c:139
+msgid "Location"
+msgstr ""
+
+#: src/trg-main-window.c:363
+msgid "This torrent has completed."
+msgstr ""
+
+#: src/trg-main-window.c:375
+msgid "This torrent has been added."
+msgstr ""
+
+#: src/trg-main-window.c:600
+msgid "No hostname set"
+msgstr ""
+
+#: src/trg-main-window.c:603
+msgid "Unknown error getting settings"
+msgstr ""
+
+#: src/trg-main-window.c:623
+msgid "Connecting..."
+msgstr ""
+
+#: src/trg-main-window.c:882
+#, c-format
+msgid "<big><b>Remove torrent \"%s\"?</b></big>"
+msgstr ""
+
+#: src/trg-main-window.c:883
+#, c-format
+msgid "<big><b>Remove %d torrents?</b></big>"
+msgstr ""
+
+#: src/trg-main-window.c:905
+#, c-format
+msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
+msgstr ""
+
+#: src/trg-main-window.c:907
+#, c-format
+msgid "<big><b>Remove and delete %d torrents?</b></big>"
+msgstr ""
+
+#: src/trg-main-window.c:990 src/trg-preferences-dialog.c:899
+#: src/trg-remote-prefs-dialog.c:693
+msgid "General"
+msgstr ""
+
+#: src/trg-main-window.c:999 src/trg-torrent-props-dialog.c:613
+msgid "Trackers"
+msgstr ""
+
+#: src/trg-main-window.c:1007 src/trg-torrent-props-dialog.c:582
+msgid "Files"
+msgstr ""
+
+#: src/trg-main-window.c:1015 src/trg-remote-prefs-dialog.c:399
+#: src/trg-torrent-props-dialog.c:456 src/trg-torrent-props-dialog.c:596
+#: src/trg-trackers-tree-view.c:190
+msgid "Peers"
+msgstr ""
+
+#: src/trg-main-window.c:1098
+#, c-format
+msgid "This application supports Transmission %g and later, you have %g."
+msgstr ""
+
+#: src/trg-main-window.c:1164 src/trg-status-bar.c:74 src/trg-status-bar.c:104
+msgid "Disconnected"
+msgstr ""
+
+#: src/trg-main-window.c:1209
+#, c-format
+msgid "%d Downloading @ %s"
+msgstr ""
+
+#: src/trg-main-window.c:1216
+#, c-format
+msgid "%d Seeding @ %s"
+msgstr ""
+
+#: src/trg-main-window.c:1267
+#, c-format
+msgid "Request %d/%d failed: %s"
+msgstr ""
+
+#: src/trg-main-window.c:2069
+msgid "No Limit"
+msgstr ""
+
+#: src/trg-main-window.c:2170 src/trg-menu-bar.c:675 src/trg-toolbar.c:224
+msgid "Properties"
+msgstr ""
+
+#: src/trg-main-window.c:2173 src/trg-toolbar.c:217
+msgid "Resume"
+msgstr ""
+
+#: src/trg-main-window.c:2176 src/trg-toolbar.c:220
+msgid "Pause"
+msgstr ""
+
+#: src/trg-main-window.c:2179
+msgid "Verify"
+msgstr ""
+
+#: src/trg-main-window.c:2182
+msgid "Re-announce"
+msgstr ""
+
+#: src/trg-main-window.c:2185 src/trg-torrent-move-dialog.c:119
+#: src/trg-torrent-move-dialog.c:126
+msgid "Move"
+msgstr ""
+
+#: src/trg-main-window.c:2188 src/trg-menu-bar.c:706 src/trg-toolbar.c:228
+msgid "Remove"
+msgstr ""
+
+#: src/trg-main-window.c:2191
+msgid "Remove & Delete"
+msgstr ""
+
+#: src/trg-main-window.c:2215 src/trg-preferences-dialog.c:909
+msgid "Actions"
+msgstr ""
+
+#: src/trg-main-window.c:2244 src/trg-menu-bar.c:722
+msgid "Start Now"
+msgstr ""
+
+#: src/trg-main-window.c:2247 src/trg-menu-bar.c:727
+msgid "Move Up Queue"
+msgstr ""
+
+#: src/trg-main-window.c:2250 src/trg-menu-bar.c:734
+msgid "Move Down Queue"
+msgstr ""
+
+#: src/trg-main-window.c:2253 src/trg-menu-bar.c:741
+msgid "Bottom Of Queue"
+msgstr ""
+
+#: src/trg-main-window.c:2256 src/trg-menu-bar.c:745
+msgid "Top Of Queue"
+msgstr ""
+
+#: src/trg-main-window.c:2265 src/trg-main-window.c:2348
+msgid "Down Limit"
+msgstr ""
+
+#: src/trg-main-window.c:2270 src/trg-main-window.c:2352
+msgid "Up Limit"
+msgstr ""
+
+#: src/trg-main-window.c:2299 src/trg-main-window.c:2306
+#: src/trg-remote-prefs-dialog.c:497
+msgid "Updating..."
+msgstr ""
+
+#: src/trg-main-window.c:2320 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
+msgid "Connect"
+msgstr ""
+
+#: src/trg-main-window.c:2327 src/trg-toolbar.c:207
+msgid "Disconnect"
+msgstr ""
+
+#: src/trg-main-window.c:2331 src/trg-toolbar.c:210
+#: src/trg-trackers-tree-view.c:284 src/trg-trackers-tree-view.c:311
+msgid "Add"
+msgstr ""
+
+#: src/trg-main-window.c:2335
+msgid "Add from URL"
+msgstr ""
+
+#: src/trg-main-window.c:2339
+msgid "Resume All"
+msgstr ""
+
+#: src/trg-main-window.c:2343
+msgid "Pause All"
+msgstr ""
+
+#: src/trg-main-window.c:2359
+msgid "Quit"
+msgstr ""
+
+#: src/trg-main-window.c:2473 src/trg-menu-bar.c:536
+msgid "Graph"
+msgstr ""
+
+#: src/trg-main-window.c:2662
+msgid "Transmission Remote"
+msgstr ""
+
+#: src/trg-menu-bar.c:464
+msgid "_View"
+msgstr ""
+
+#: src/trg-menu-bar.c:473
+msgid "Transmission Style"
+msgstr ""
+
+#: src/trg-menu-bar.c:483
+msgid "Transmission Compact Style"
+msgstr ""
+
+#: src/trg-menu-bar.c:493
+msgid "Classic Style"
+msgstr ""
+
+#: src/trg-menu-bar.c:499
+msgid "Sort"
+msgstr ""
+
+#: src/trg-menu-bar.c:504 src/trg-preferences-dialog.c:675
+msgid "State selector"
+msgstr ""
+
+#: src/trg-menu-bar.c:510 src/trg-preferences-dialog.c:682
+msgid "Directory filters"
+msgstr ""
+
+#: src/trg-menu-bar.c:519 src/trg-preferences-dialog.c:689
+msgid "Tracker filters"
+msgstr ""
+
+#: src/trg-menu-bar.c:528 src/trg-preferences-dialog.c:696
+msgid "Torrent Details"
+msgstr ""
+
+#: src/trg-menu-bar.c:542
+msgid "_Statistics"
+msgstr ""
+
+#: src/trg-menu-bar.c:554
+msgid "_Options"
+msgstr ""
+
+#: src/trg-menu-bar.c:560
+msgid "_Local Preferences"
+msgstr ""
+
+#: src/trg-menu-bar.c:567
+msgid "_Remote Preferences"
+msgstr ""
+
+#: src/trg-menu-bar.c:627
+msgid "_File"
+msgstr ""
+
+#: src/trg-menu-bar.c:640
+msgid "_Disconnect"
+msgstr ""
+
+#: src/trg-menu-bar.c:646
+msgid "_Add"
+msgstr ""
+
+#: src/trg-menu-bar.c:651
+msgid "Add from _URL"
+msgstr ""
+
+#: src/trg-menu-bar.c:657
+msgid "_Quit"
+msgstr ""
+
+#: src/trg-menu-bar.c:668
+msgid "_Torrent"
+msgstr ""
+
+#: src/trg-menu-bar.c:680
+msgid "_Resume"
+msgstr ""
+
+#: src/trg-menu-bar.c:685
+msgid "_Pause"
+msgstr ""
+
+#: src/trg-menu-bar.c:690
+msgid "_Verify"
+msgstr ""
+
+#: src/trg-menu-bar.c:696
+msgid "Re-_announce"
+msgstr ""
+
+#: src/trg-menu-bar.c:701
+msgid "_Move"
+msgstr ""
+
+#: src/trg-menu-bar.c:712
+msgid "Remove and Delete"
+msgstr ""
+
+#: src/trg-menu-bar.c:753
+msgid "_Resume All"
+msgstr ""
+
+#: src/trg-menu-bar.c:759
+msgid "_Pause All"
+msgstr ""
+
+#: src/trg-menu-bar.c:771
+msgid "_Help"
+msgstr ""
+
+#: src/trg-menu-bar.c:777
+msgid "_About"
+msgstr ""
+
+#: src/trg-peers-tree-view.c:50
+msgid "IP"
+msgstr ""
+
+#: src/trg-peers-tree-view.c:54 src/trg-trackers-tree-view.c:209
+msgid "Host"
+msgstr ""
+
+#: src/trg-peers-tree-view.c:58
+msgid "Country"
+msgstr ""
+
+#: src/trg-peers-tree-view.c:61 src/trg-torrent-tree-view.c:117
+msgid "Down Speed"
+msgstr ""
+
+#: src/trg-peers-tree-view.c:63 src/trg-torrent-tree-view.c:120
+msgid "Up Speed"
+msgstr ""
+
+#: src/trg-peers-tree-view.c:67
+msgid "Flags"
+msgstr ""
+
+#: src/trg-peers-tree-view.c:69
+msgid "Client"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:401
+msgid "Updates"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:403
+msgid "Update active torrents only"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:410
+msgid "Full update every (?) updates"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:424
+msgid "Update interval:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:428
+msgid "Minimised update interval:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:433
+msgid "Session update interval:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:435
+msgid "Torrents"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:437
+msgid "Start paused"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:441
+msgid "Options dialog on add"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:446 src/trg-torrent-add-dialog.c:776
+msgid "Delete local .torrent file after adding"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:599
+msgid "Commands"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:609 src/trg-preferences-dialog.c:647
+msgid "Label"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:612
+msgid "Command"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:637
+msgid "Remote Download Directories"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:650
+msgid "Directory"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:904
+msgid "View"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:704
+msgid "Show graph"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:714
+msgid "System Tray"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:716
+msgid "Show in system tray"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:724
+msgid "Minimise to system tray"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:740
+msgid "Notifications"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:742
+msgid "Torrent added notifications"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:746
+msgid "Torrent complete notifications"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:773
+msgid "Profile: "
+msgstr ""
+
+#: src/trg-preferences-dialog.c:799
+msgid "Name:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:894
+msgid "Connection"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:810
+msgid "Host:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:814
+msgid "Port:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:816
+msgid "RPC URL Path:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:819
+msgid "Username:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:823
+msgid "Password:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:825
+msgid "Automatically connect"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:831
+msgid "SSL"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:838
+msgid "Timeout:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:842
+msgid "Retries:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:883 src/trg-toolbar.c:239
+msgid "Local Preferences"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:914
+msgid "Directories"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:305
+msgid "Bandwidth limits"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:309
+msgid "Down Limit (KiB/s)"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:316
+msgid "Up Limit (KiB/s)"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:321
+msgid "Alternate limits"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:326
+msgid "Alternate speed limits active"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:333
+msgid "Alternate time range"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:340
+msgid "Alternate down limit (KiB/s)"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:345
+msgid "Alternate up limit (KiB/s)"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:364
+msgid "Seed ratio limit"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:371
+msgid "Queues"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:375
+msgid "Download queue size"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:383
+msgid "Seed queue size"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:391
+msgid "Ignore stalled (minutes)"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:404
+msgid "Global peer limit"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:409
+msgid "Per torrent peer limit"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:422
+msgid "Retest"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:433
+msgid "Port is <span font_weight=\"bold\" fgcolor=\"darkgreen\">open</span>"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:437
+msgid "Port is <span font_weight=\"bold\" fgcolor=\"red\">closed</span>"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:453 src/trg-remote-prefs-dialog.c:522
+msgid "Port test"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:454
+msgid "Testing..."
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:469 src/trg-remote-prefs-dialog.c:577
+msgid "Update"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:474 src/trg-remote-prefs-dialog.c:568
+#, c-format
+msgid "Blocklist (%ld entries)"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:516 src/trg-remote-prefs-dialog.c:698
+msgid "Connections"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:520
+msgid "Peer port"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:523
+msgid "Test"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:527
+msgid "Required"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:528
+msgid "Preferred"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:529
+msgid "Tolerated"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:540
+msgid "Encryption"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:544
+msgid "Random peer port on start"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:549
+msgid "Peer port forwarding"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:552
+msgid "Protocol"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:555
+msgid "Peer exchange (PEX)"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:559
+msgid "Distributed Hash Table (DHT)"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:563
+msgid "Local peer discovery"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:566
+msgid "Blocklist"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:586
+msgid "Blocklist URL:"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:604
+msgid "Environment"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:608
+msgid "Download directory"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:612
+msgid "Incomplete download dir"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:619
+msgid "Torrent done script"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:628
+msgid "Cache size (MiB)"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:631
+msgid "Behavior"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:635
+msgid "Rename partial files"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:640
+msgid "Trash original torrent files"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:645
+msgid "Start added torrents"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:243
+msgid "Remote Preferences"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:400
+msgid "Bandwidth"
+msgstr ""
+
+#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:627
+msgid "Limits"
+msgstr ""
+
+#: src/trg-state-selector.c:656
+msgid "All"
+msgstr ""
+
+#: src/trg-state-selector.c:661 src/trg-state-selector.c:731
+msgid "Queue Down"
+msgstr ""
+
+#: src/trg-state-selector.c:668 src/trg-state-selector.c:735
+msgid "Queue Up"
+msgstr ""
+
+#: src/trg-state-selector.c:675
+msgid "Complete"
+msgstr ""
+
+#: src/trg-state-selector.c:678
+msgid "Incomplete"
+msgstr ""
+
+#: src/trg-state-selector.c:681
+msgid "Active"
+msgstr ""
+
+#: src/trg-stats-dialog.c:275
+msgid "Statistics"
+msgstr ""
+
+#: src/trg-stats-dialog.c:294
+msgid "Version"
+msgstr ""
+
+#: src/trg-stats-dialog.c:296
+msgid "Download Total"
+msgstr ""
+
+#: src/trg-stats-dialog.c:298
+msgid "Upload Total"
+msgstr ""
+
+#: src/trg-stats-dialog.c:300
+msgid "Files Added"
+msgstr ""
+
+#: src/trg-stats-dialog.c:302
+msgid "Session Count"
+msgstr ""
+
+#: src/trg-stats-dialog.c:304
+msgid "Time Active"
+msgstr ""
+
+#: src/trg-stats-dialog.c:309
+msgid "Statistic"
+msgstr ""
+
+#: src/trg-stats-dialog.c:311
+msgid "Session"
+msgstr ""
+
+#: src/trg-stats-dialog.c:314
+msgid "Cumulative"
+msgstr ""
+
+#: src/trg-status-bar.c:142
+#, c-format
+msgid "Connected: %s (Transmission %g)"
+msgstr ""
+
+#: src/trg-status-bar.c:160
+msgid "Updating torrents..."
+msgstr ""
+
+#: src/trg-status-bar.c:173
+#, c-format
+msgid "Free space: %s"
+msgstr ""
+
+#: src/trg-status-bar.c:185
+msgid "Disable alternate speed limits"
+msgstr ""
+
+#: src/trg-status-bar.c:186
+msgid "Enable alternate speed limits"
+msgstr ""
+
+#: src/trg-status-bar.c:223 src/trg-status-bar.c:230
+#, c-format
+msgid " (Limit: %s)"
+msgstr ""
+
+#: src/trg-status-bar.c:235
+#, c-format
+msgid "Down: %s%s, Up: %s%s"
+msgstr ""
+
+#: src/trg-toolbar.c:232
+msgid "Remove with data"
+msgstr ""
+
+#: src/trg-torrent-add-dialog.c:460
+msgid "Torrent files"
+msgstr ""
+
+#: src/trg-torrent-add-dialog.c:465
+msgid "All files"
+msgstr ""
+
+#: src/trg-torrent-add-dialog.c:497
+msgid ""
+"Unable to parse torrent file. File preferences unavailable, but you can "
+"still try uploading it."
+msgstr ""
+
+#: src/trg-torrent-add-dialog.c:510
+#, c-format
+msgid "Unable to open torrent file: %s"
+msgstr ""
+
+#: src/trg-torrent-add-dialog.c:576
+msgid "(None)"
+msgstr ""
+
+#: src/trg-torrent-add-dialog.c:578
+msgid "(Multiple)"
+msgstr ""
+
+#: src/trg-torrent-add-dialog.c:601
+msgid "Add a Torrent"
+msgstr ""
+
+#: src/trg-torrent-add-dialog.c:744
+msgid "Add Torrent"
+msgstr ""
+
+#: src/trg-torrent-add-dialog.c:769
+msgid "Start _paused"
+msgstr ""
+
+#: src/trg-torrent-add-dialog.c:785
+msgid "_Torrent file:"
+msgstr ""
+
+#: src/trg-torrent-add-dialog.c:801
+msgid "_Destination folder:"
+msgstr ""
+
+#: src/trg-torrent-add-dialog.c:815
+msgid "Apply to all:"
+msgstr ""
+
+#: src/trg-torrent-add-dialog.c:825
+msgid "Torrent _priority:"
+msgstr ""
+
+#: src/trg-torrent-add-dialog.c:926
+msgid "Show _options dialog"
+msgstr ""
+
+#: src/trg-torrent-add-url-dialog.c:61
+msgid ""
+"You are trying to add a magnet torrent, but DHT is disabled. Distributed "
+"Hash Table (DHT) should be enabled in remote settings."
+msgstr ""
+
+#: src/trg-torrent-add-url-dialog.c:120
+msgid "URL:"
+msgstr ""
+
+#: src/trg-torrent-add-url-dialog.c:123
+msgid "Start Paused"
+msgstr ""
+
+#: src/trg-torrent-add-url-dialog.c:126
+msgid "Add torrent from URL"
+msgstr ""
+
+#: src/trg-torrent-graph.c:410
+msgid "Total Uploading"
+msgstr ""
+
+#: src/trg-torrent-graph.c:418
+msgid "Total Downloading"
+msgstr ""
+
+#: src/trg-torrent-model.c:407
+msgid "Default"
+msgstr "По подразбиране"
+
+#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:251
+msgid "Location:"
+msgstr "Ме�тоположение:"
+
+#: src/trg-torrent-move-dialog.c:163
+#, c-format
+msgid "Move %s"
+msgstr ""
+
+#: src/trg-torrent-move-dialog.c:165
+#, c-format
+msgid "Move %d torrents"
+msgstr ""
+
+#: src/trg-torrent-props-dialog.c:197
+msgid "Activity"
+msgstr "Дейно�т"
+
+#: src/trg-torrent-props-dialog.c:202
+msgid "Torrent size:"
+msgstr "Размер:"
+
+#: src/trg-torrent-props-dialog.c:207
+msgid "Have:"
+msgstr "�алични:"
+
+#: src/trg-torrent-props-dialog.c:212
+msgid "Downloaded:"
+msgstr "Изтеглени:"
+
+#: src/trg-torrent-props-dialog.c:217
+msgid "Uploaded:"
+msgstr "Разпро�транено:"
+
+#: src/trg-torrent-props-dialog.c:222
+msgid "State:"
+msgstr "Съ�то�ние:"
+
+#: src/trg-torrent-props-dialog.c:227
+msgid "Running time:"
+msgstr "Продължително�т:"
+
+#: src/trg-torrent-props-dialog.c:232
+msgid "Remaining time:"
+msgstr "О�таващо време:"
+
+#: src/trg-torrent-props-dialog.c:237
+msgid "Last activity:"
+msgstr "По�ледна дейно�т:"
+
+#: src/trg-torrent-props-dialog.c:242
+msgid "Error:"
+msgstr "Грешка:"
+
+#: src/trg-torrent-props-dialog.c:246
+msgid "Details"
+msgstr "Подробно"
+
+#: src/trg-torrent-props-dialog.c:257
+msgid "Hash:"
+msgstr "Хеш:"
+
+#: src/trg-torrent-props-dialog.c:263
+msgid "Privacy:"
+msgstr "Поверително�т:"
+
+#: src/trg-torrent-props-dialog.c:269
+msgid "Origin:"
+msgstr "Произход:"
+
+#: src/trg-torrent-props-dialog.c:286
+msgid "Comment:"
+msgstr "Коментар:"
+
+#: src/trg-torrent-props-dialog.c:321
+msgid "Private to this tracker -- DHT and PEX disabled"
+msgstr "Само за този тракер — DHT и PEX �а изключени"
+
+#: src/trg-torrent-props-dialog.c:323
+msgid "Public torrent"
+msgstr "Публичен торент"
+
+#: src/trg-torrent-props-dialog.c:333
+#, c-format
+msgid "Created on %1$s"
+msgstr "Създаден на %1$s"
+
+#: src/trg-torrent-props-dialog.c:335
+#, c-format
+msgid "Created by %1$s on %2$s"
+msgstr "Създаден от %1$s на %2$s"
+
+#: src/trg-torrent-props-dialog.c:367
+msgid "No errors"
+msgstr "��ма грешки"
+
+#: src/trg-torrent-props-dialog.c:371
+msgid "Active now"
+msgstr "Сега е активен"
+
+#: src/trg-torrent-props-dialog.c:404
+msgid "Honor global limits"
+msgstr "Спазване на общите ограничени�"
+
+#: src/trg-torrent-props-dialog.c:414
+msgid "Torrent priority:"
+msgstr ""
+
+#: src/trg-torrent-props-dialog.c:420
+msgid "Queue Position:"
+msgstr "Позици� в опашката:"
+
+#: src/trg-torrent-props-dialog.c:425
+msgid "Limit download speed (KiB/s)"
+msgstr "Ограничаване �коро�тта на �вал�не (КиБ/�)"
+
+#: src/trg-torrent-props-dialog.c:433
+msgid "Limit upload speed (KiB/s)"
+msgstr "Ограничаване �коро�тта на разпро�транение (КиБ/�)"
+
+#: src/trg-torrent-props-dialog.c:441
+msgid "Use global settings"
+msgstr "Използвай общите на�тройки"
+
+#: src/trg-torrent-props-dialog.c:442
+msgid "Stop seeding at ratio"
+msgstr "Прекрати разпро�тран�ването при коефициент"
+
+#: src/trg-torrent-props-dialog.c:443
+msgid "Seed regardless of ratio"
+msgstr "Разпро�тран�вай незави�имо от коефициента"
+
+#: src/trg-torrent-props-dialog.c:446
+msgid "Seed ratio mode:"
+msgstr ""
+
+#: src/trg-torrent-props-dialog.c:454
+msgid "Seed ratio limit:"
+msgstr ""
+
+#: src/trg-torrent-props-dialog.c:460
+msgid "Peer limit:"
+msgstr ""
+
+#: src/trg-torrent-props-dialog.c:533
+#, c-format
+msgid "Multiple (%d) torrent properties"
+msgstr ""
+
+#: src/trg-torrent-props-dialog.c:565
+msgid "Information"
+msgstr "Информаци�"
+
+#: src/trg-torrent-tree-view.c:60
+msgid "Done"
+msgstr "Завършен"
+
+#: src/trg-torrent-tree-view.c:65
+msgid "Seeds"
+msgstr "Разпро�транители"
+
+#: src/trg-torrent-tree-view.c:67
+msgid "Sending"
+msgstr "Изпраща �е"
+
+#: src/trg-torrent-tree-view.c:73
+msgid "Downloads"
+msgstr "Изтегл�ни�"
+
+#: src/trg-torrent-tree-view.c:76
+msgid "Receiving"
+msgstr "Получава �е"
+
+#: src/trg-torrent-tree-view.c:80
+msgid "Connected"
+msgstr "Свързано�т"
+
+#: src/trg-torrent-tree-view.c:82
+msgid "PEX Peers"
+msgstr "PEX По�редници"
+
+#: src/trg-torrent-tree-view.c:87
+msgid "DHT Peers"
+msgstr "DHT По�редници"
+
+#: src/trg-torrent-tree-view.c:93
+msgid "Tracker Peers"
+msgstr "По�редници от тракера"
+
+#: src/trg-torrent-tree-view.c:97
+msgid "LTEP Peers"
+msgstr "LTEP по�редници"
+
+#: src/trg-torrent-tree-view.c:102
+msgid "Resumed Peers"
+msgstr "Въз�тановени по�редници"
+
+#: src/trg-torrent-tree-view.c:108
+msgid "Incoming Peers"
+msgstr "Вход�щи по�редници"
+
+#: src/trg-torrent-tree-view.c:113
+msgid "Peers T/I/E/H/X/L/R"
+msgstr "По�редници T/I/E/H/X/L/R"
+
+#: src/trg-torrent-tree-view.c:133
+msgid "Added"
+msgstr "Добавен"
+
+#: src/trg-torrent-tree-view.c:136
+msgid "First Tracker"
+msgstr "Първи тракер"
+
+#: src/trg-torrent-tree-view.c:142
+msgid "ID"
+msgstr "ИД"
+
+#: src/trg-torrent-tree-view.c:148
+msgid "Queue Position"
+msgstr "М��то в опашката"
+
+#: src/trg-torrent-tree-view.c:154
+msgid "Last Active"
+msgstr "По�ледна активно�т"
+
+#: src/trg-trackers-tree-view.c:168
+msgid "Tier"
+msgstr "Редица"
+
+#: src/trg-trackers-tree-view.c:174
+msgid "Announce URL"
+msgstr "�дре� на об�в�ване"
+
+#: src/trg-trackers-tree-view.c:192
+msgid "Seeder Count"
+msgstr "Брой разпро�транители"
+
+#: src/trg-trackers-tree-view.c:195
+msgid "Leecher Count"
+msgstr "Брой кон�уматори"
+
+#: src/trg-trackers-tree-view.c:199
+msgid "Last Announce"
+msgstr "По�ледно об�в�ване"
+
+#: src/trg-trackers-tree-view.c:202
+msgid "Last Result"
+msgstr "По�леден резултат"
+
+#: src/trg-trackers-tree-view.c:204
+msgid "Scrape URL"
+msgstr ""
+
+#: src/trg-trackers-tree-view.c:206
+msgid "Last Scrape"
+msgstr ""
+
+#: src/trg-trackers-tree-view.c:305
+msgid "Delete"
+msgstr "Премахни"
+
+#: src/trg-tree-view.c:269
+msgid "Ascending"
+msgstr "Възход�що"
+
+#: src/trg-tree-view.c:279
+msgid "Descending"
+msgstr "�изход�що"
+
+#: src/util.c:342
+msgid "JSON decoding error."
+msgstr "грешка при извличане от JSON формат"
+
+#: src/util.c:347
+msgid "Server responded, but with no result."
+msgstr "Сървърът отговори, но без данни."
+
+#: src/util.c:351
+#, c-format
+msgid "Request failed with HTTP code %d"
+msgstr "За�вката е неу�пешна � HTTP код %d"
+
+#: src/util.c:385
+msgid "None"
+msgstr "Без"
+
+#: src/util.c:431
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d ден"
+msgstr[1] "%d дни"
+
+#: src/util.c:432
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ча�"
+msgstr[1] "%d ча�а"
+
+#: src/util.c:434
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d минута"
+msgstr[1] "%d минути"
+
+#: src/util.c:437
+#, c-format
+msgid "%ld second"
+msgid_plural "%ld seconds"
+msgstr[0] "%ld �екунда"
+msgstr[1] "%ld �екунди"
diff --git a/po/ca.po b/po/ca.po
index 71f2c9b..f21e1e6 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: transmission-remote-gtk\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-09-05 22:09+0100\n"
-"PO-Revision-Date: 2012-07-26 17:44+0000\n"
-"Last-Translator: Adolfo Jayme Barrientos <fitoschido@gmail.com>\n"
+"POT-Creation-Date: 2013-06-09 23:41+0100\n"
+"PO-Revision-Date: 2013-06-11 12:21+0000\n"
+"Last-Translator: pataquets <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-06-09 22:28+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2014-06-12 07:44+0000\n"
+"X-Generator: Launchpad (build 17045)\n"
 
 #: src/torrent.c:360 src/torrent.c:380
 msgid "Metadata Downloading"
@@ -43,7 +43,7 @@ msgid "Queued seed"
 msgstr ""
 
 #: src/torrent.c:372 src/torrent.c:386 src/trg-remote-prefs-dialog.c:360
-#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:447
+#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:438
 msgid "Seeding"
 msgstr ""
 
@@ -83,12 +83,12 @@ msgstr ""
 
 #: src/torrent-cell-renderer.c:230
 msgid "Remaining time unknown"
-msgstr ""
+msgstr "Temps restant desconegut"
 
 #: src/torrent-cell-renderer.c:235
 #, c-format
 msgid "%s remaining"
-msgstr ""
+msgstr "%s restant"
 
 #: src/torrent-cell-renderer.c:259
 #, c-format
@@ -155,18 +155,18 @@ msgstr[1] ""
 msgid "A remote client to transmission-daemon."
 msgstr ""
 
-#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2011
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:416
+#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2025
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:407
 msgid "Low"
 msgstr "Baixa"
 
-#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2007
-#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:418
+#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2021
+#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:409
 msgid "High"
 msgstr "Alta"
 
-#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2009
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:417
+#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2023
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:408
 msgid "Normal"
 msgstr "Normal"
 
@@ -174,12 +174,12 @@ msgstr "Normal"
 msgid "Mixed"
 msgstr ""
 
-#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:280
+#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:278
 #: src/trg-torrent-add-dialog.c:348 src/trg-torrent-tree-view.c:52
 msgid "Name"
 msgstr ""
 
-#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:283
+#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:281
 #: src/trg-torrent-add-dialog.c:366 src/trg-torrent-tree-view.c:57
 msgid "Size"
 msgstr "Mida"
@@ -193,7 +193,7 @@ msgstr "Progrés"
 msgid "Download"
 msgstr "Descarrega"
 
-#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2000
+#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2014
 #: src/trg-torrent-add-dialog.c:395 src/trg-torrent-tree-view.c:145
 msgid "Priority"
 msgstr "Prioritat"
@@ -222,7 +222,7 @@ msgstr "Expansiona-ho tot"
 msgid "Collapse All"
 msgstr "Colapsa-ho tot"
 
-#: src/trg-general-panel.c:153 src/trg-general-panel.c:214
+#: src/trg-general-panel.c:153 src/trg-general-panel.c:212
 msgid "N/A"
 msgstr "N/D"
 
@@ -234,62 +234,62 @@ msgstr ""
 msgid "(Public)"
 msgstr ""
 
-#: src/trg-general-panel.c:202 src/trg-main-window.c:1097
-#: src/trg-main-window.c:1505 src/trg-main-window.c:2135
+#: src/trg-general-panel.c:200 src/trg-main-window.c:1106
+#: src/trg-main-window.c:1519 src/trg-main-window.c:2149
 #: src/trg-state-selector.c:538 src/trg-torrent-add-url-dialog.c:67
-#: src/util.c:331
+#: src/util.c:333
 msgid "Error"
 msgstr "Error"
 
-#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:123
+#: src/trg-general-panel.c:283 src/trg-torrent-tree-view.c:123
 msgid "ETA"
 msgstr ""
 
-#: src/trg-general-panel.c:287 src/trg-torrent-tree-view.c:151
+#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:151
 msgid "Completed"
 msgstr ""
 
-#: src/trg-general-panel.c:290
+#: src/trg-general-panel.c:288
 msgid "Seeders"
 msgstr ""
 
-#: src/trg-general-panel.c:292
+#: src/trg-general-panel.c:290
 msgid "Rate Down"
 msgstr ""
 
-#: src/trg-general-panel.c:294 src/trg-torrent-tree-view.c:128
+#: src/trg-general-panel.c:292 src/trg-torrent-tree-view.c:128
 msgid "Downloaded"
 msgstr ""
 
-#: src/trg-general-panel.c:297 src/trg-torrent-tree-view.c:70
+#: src/trg-general-panel.c:295 src/trg-torrent-tree-view.c:70
 msgid "Leechers"
 msgstr ""
 
-#: src/trg-general-panel.c:299
+#: src/trg-general-panel.c:297
 msgid "Rate Up"
 msgstr ""
 
-#: src/trg-general-panel.c:301 src/trg-torrent-tree-view.c:125
+#: src/trg-general-panel.c:299 src/trg-torrent-tree-view.c:125
 msgid "Uploaded"
 msgstr ""
 
-#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:63
+#: src/trg-general-panel.c:302 src/trg-torrent-tree-view.c:63
 msgid "Status"
 msgstr ""
 
-#: src/trg-general-panel.c:306 src/trg-torrent-tree-view.c:131
+#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:131
 msgid "Ratio"
 msgstr ""
 
-#: src/trg-general-panel.c:309
+#: src/trg-general-panel.c:307
 msgid "Comment"
 msgstr "Comentari"
 
-#: src/trg-general-panel.c:312
+#: src/trg-general-panel.c:310
 msgid "Completed At"
 msgstr ""
 
-#: src/trg-general-panel.c:316 src/trg-torrent-tree-view.c:139
+#: src/trg-general-panel.c:314 src/trg-torrent-tree-view.c:139
 msgid "Location"
 msgstr "Ubicació"
 
@@ -301,189 +301,189 @@ msgstr ""
 msgid "This torrent has been added."
 msgstr ""
 
-#: src/trg-main-window.c:596
+#: src/trg-main-window.c:600
 msgid "No hostname set"
 msgstr ""
 
-#: src/trg-main-window.c:599
+#: src/trg-main-window.c:603
 msgid "Unknown error getting settings"
 msgstr ""
 
-#: src/trg-main-window.c:614
+#: src/trg-main-window.c:623
 msgid "Connecting..."
 msgstr ""
 
-#: src/trg-main-window.c:873
+#: src/trg-main-window.c:882
 #, c-format
 msgid "<big><b>Remove torrent \"%s\"?</b></big>"
 msgstr ""
 
-#: src/trg-main-window.c:874
+#: src/trg-main-window.c:883
 #, c-format
 msgid "<big><b>Remove %d torrents?</b></big>"
 msgstr ""
 
-#: src/trg-main-window.c:896
+#: src/trg-main-window.c:905
 #, c-format
 msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
 msgstr ""
 
-#: src/trg-main-window.c:898
+#: src/trg-main-window.c:907
 #, c-format
 msgid "<big><b>Remove and delete %d torrents?</b></big>"
 msgstr ""
 
-#: src/trg-main-window.c:981 src/trg-preferences-dialog.c:897
+#: src/trg-main-window.c:990 src/trg-preferences-dialog.c:899
 #: src/trg-remote-prefs-dialog.c:693
 msgid "General"
 msgstr "General"
 
-#: src/trg-main-window.c:990 src/trg-torrent-props-dialog.c:622
+#: src/trg-main-window.c:999 src/trg-torrent-props-dialog.c:613
 msgid "Trackers"
 msgstr "Rastrejadors"
 
-#: src/trg-main-window.c:998 src/trg-torrent-props-dialog.c:591
+#: src/trg-main-window.c:1007 src/trg-torrent-props-dialog.c:582
 msgid "Files"
 msgstr "Fitxers"
 
-#: src/trg-main-window.c:1006 src/trg-remote-prefs-dialog.c:399
-#: src/trg-torrent-props-dialog.c:465 src/trg-torrent-props-dialog.c:605
+#: src/trg-main-window.c:1015 src/trg-remote-prefs-dialog.c:399
+#: src/trg-torrent-props-dialog.c:456 src/trg-torrent-props-dialog.c:596
 #: src/trg-trackers-tree-view.c:190
 msgid "Peers"
 msgstr "Parells"
 
-#: src/trg-main-window.c:1089
+#: src/trg-main-window.c:1098
 #, c-format
 msgid "This application supports Transmission %g and later, you have %g."
 msgstr ""
 
-#: src/trg-main-window.c:1155 src/trg-status-bar.c:74 src/trg-status-bar.c:104
+#: src/trg-main-window.c:1164 src/trg-status-bar.c:74 src/trg-status-bar.c:104
 msgid "Disconnected"
 msgstr ""
 
-#: src/trg-main-window.c:1200
+#: src/trg-main-window.c:1209
 #, c-format
 msgid "%d Downloading @ %s"
 msgstr ""
 
-#: src/trg-main-window.c:1207
+#: src/trg-main-window.c:1216
 #, c-format
 msgid "%d Seeding @ %s"
 msgstr ""
 
-#: src/trg-main-window.c:1258
+#: src/trg-main-window.c:1267
 #, c-format
 msgid "Request %d/%d failed: %s"
 msgstr ""
 
-#: src/trg-main-window.c:2055
+#: src/trg-main-window.c:2069
 msgid "No Limit"
 msgstr "Sense límit"
 
-#: src/trg-main-window.c:2156 src/trg-menu-bar.c:675 src/trg-toolbar.c:223
+#: src/trg-main-window.c:2170 src/trg-menu-bar.c:675 src/trg-toolbar.c:224
 msgid "Properties"
 msgstr "Propietats"
 
-#: src/trg-main-window.c:2159 src/trg-toolbar.c:216
+#: src/trg-main-window.c:2173 src/trg-toolbar.c:217
 msgid "Resume"
 msgstr ""
 
-#: src/trg-main-window.c:2162 src/trg-toolbar.c:219
+#: src/trg-main-window.c:2176 src/trg-toolbar.c:220
 msgid "Pause"
 msgstr ""
 
-#: src/trg-main-window.c:2165
+#: src/trg-main-window.c:2179
 msgid "Verify"
 msgstr ""
 
-#: src/trg-main-window.c:2168
+#: src/trg-main-window.c:2182
 msgid "Re-announce"
 msgstr ""
 
-#: src/trg-main-window.c:2171 src/trg-torrent-move-dialog.c:119
+#: src/trg-main-window.c:2185 src/trg-torrent-move-dialog.c:119
 #: src/trg-torrent-move-dialog.c:126
 msgid "Move"
 msgstr "Mou"
 
-#: src/trg-main-window.c:2174 src/trg-menu-bar.c:706 src/trg-toolbar.c:227
+#: src/trg-main-window.c:2188 src/trg-menu-bar.c:706 src/trg-toolbar.c:228
 msgid "Remove"
 msgstr ""
 
-#: src/trg-main-window.c:2177
+#: src/trg-main-window.c:2191
 msgid "Remove & Delete"
 msgstr ""
 
-#: src/trg-main-window.c:2201 src/trg-preferences-dialog.c:907
+#: src/trg-main-window.c:2215 src/trg-preferences-dialog.c:909
 msgid "Actions"
 msgstr "Accions"
 
-#: src/trg-main-window.c:2230 src/trg-menu-bar.c:722
+#: src/trg-main-window.c:2244 src/trg-menu-bar.c:722
 msgid "Start Now"
 msgstr ""
 
-#: src/trg-main-window.c:2233 src/trg-menu-bar.c:727
+#: src/trg-main-window.c:2247 src/trg-menu-bar.c:727
 msgid "Move Up Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2236 src/trg-menu-bar.c:734
+#: src/trg-main-window.c:2250 src/trg-menu-bar.c:734
 msgid "Move Down Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2239 src/trg-menu-bar.c:741
+#: src/trg-main-window.c:2253 src/trg-menu-bar.c:741
 msgid "Bottom Of Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2242 src/trg-menu-bar.c:745
+#: src/trg-main-window.c:2256 src/trg-menu-bar.c:745
 msgid "Top Of Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2251 src/trg-main-window.c:2334
+#: src/trg-main-window.c:2265 src/trg-main-window.c:2348
 msgid "Down Limit"
 msgstr ""
 
-#: src/trg-main-window.c:2256 src/trg-main-window.c:2338
+#: src/trg-main-window.c:2270 src/trg-main-window.c:2352
 msgid "Up Limit"
 msgstr ""
 
-#: src/trg-main-window.c:2285 src/trg-main-window.c:2292
+#: src/trg-main-window.c:2299 src/trg-main-window.c:2306
 #: src/trg-remote-prefs-dialog.c:497
 msgid "Updating..."
 msgstr ""
 
-#: src/trg-main-window.c:2306 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
+#: src/trg-main-window.c:2320 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
 msgid "Connect"
 msgstr "Connecta"
 
-#: src/trg-main-window.c:2313 src/trg-toolbar.c:206
+#: src/trg-main-window.c:2327 src/trg-toolbar.c:207
 msgid "Disconnect"
 msgstr "Desconnecta"
 
-#: src/trg-main-window.c:2317 src/trg-toolbar.c:209
+#: src/trg-main-window.c:2331 src/trg-toolbar.c:210
 #: src/trg-trackers-tree-view.c:284 src/trg-trackers-tree-view.c:311
 msgid "Add"
 msgstr ""
 
-#: src/trg-main-window.c:2321
+#: src/trg-main-window.c:2335
 msgid "Add from URL"
 msgstr ""
 
-#: src/trg-main-window.c:2325
+#: src/trg-main-window.c:2339
 msgid "Resume All"
 msgstr ""
 
-#: src/trg-main-window.c:2329
+#: src/trg-main-window.c:2343
 msgid "Pause All"
 msgstr "Pausa-ho tot"
 
-#: src/trg-main-window.c:2345
+#: src/trg-main-window.c:2359
 msgid "Quit"
 msgstr "Surt"
 
-#: src/trg-main-window.c:2459 src/trg-menu-bar.c:536
+#: src/trg-main-window.c:2473 src/trg-menu-bar.c:536
 msgid "Graph"
 msgstr "Gràfica"
 
-#: src/trg-main-window.c:2647
+#: src/trg-main-window.c:2662
 msgid "Transmission Remote"
 msgstr ""
 
@@ -691,7 +691,7 @@ msgstr ""
 msgid "Directory"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:902
+#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:904
 msgid "View"
 msgstr "Visualitza"
 
@@ -731,7 +731,7 @@ msgstr ""
 msgid "Name:"
 msgstr "Nom:"
 
-#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:892
+#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:894
 msgid "Connection"
 msgstr ""
 
@@ -743,35 +743,39 @@ msgstr ""
 msgid "Port:"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:817
+#: src/trg-preferences-dialog.c:816
+msgid "RPC URL Path:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:819
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
-#: src/trg-preferences-dialog.c:821
+#: src/trg-preferences-dialog.c:823
 msgid "Password:"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:823
+#: src/trg-preferences-dialog.c:825
 msgid "Automatically connect"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:829
+#: src/trg-preferences-dialog.c:831
 msgid "SSL"
 msgstr "SSL"
 
-#: src/trg-preferences-dialog.c:836
+#: src/trg-preferences-dialog.c:838
 msgid "Timeout:"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:840
+#: src/trg-preferences-dialog.c:842
 msgid "Retries:"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:881 src/trg-toolbar.c:238
+#: src/trg-preferences-dialog.c:883 src/trg-toolbar.c:239
 msgid "Local Preferences"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:912
+#: src/trg-preferences-dialog.c:914
 msgid "Directories"
 msgstr ""
 
@@ -960,15 +964,15 @@ msgstr ""
 msgid "Start added torrents"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:242
+#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:243
 msgid "Remote Preferences"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:409
+#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:400
 msgid "Bandwidth"
 msgstr "Amplada de banda"
 
-#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:636
+#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:627
 msgid "Limits"
 msgstr "Límits"
 
@@ -1068,7 +1072,7 @@ msgstr ""
 msgid "Down: %s%s, Up: %s%s"
 msgstr ""
 
-#: src/trg-toolbar.c:231
+#: src/trg-toolbar.c:232
 msgid "Remove with data"
 msgstr ""
 
@@ -1161,7 +1165,7 @@ msgstr ""
 msgid "Default"
 msgstr "Predeterminat"
 
-#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:260
+#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:251
 msgid "Location:"
 msgstr "Ubicació:"
 
@@ -1175,142 +1179,142 @@ msgstr ""
 msgid "Move %d torrents"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:206
+#: src/trg-torrent-props-dialog.c:197
 msgid "Activity"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:211
+#: src/trg-torrent-props-dialog.c:202
 msgid "Torrent size:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:216
+#: src/trg-torrent-props-dialog.c:207
 msgid "Have:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:221
+#: src/trg-torrent-props-dialog.c:212
 msgid "Downloaded:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:226
+#: src/trg-torrent-props-dialog.c:217
 msgid "Uploaded:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:231
+#: src/trg-torrent-props-dialog.c:222
 msgid "State:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:236
+#: src/trg-torrent-props-dialog.c:227
 msgid "Running time:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:241
+#: src/trg-torrent-props-dialog.c:232
 msgid "Remaining time:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:246
+#: src/trg-torrent-props-dialog.c:237
 msgid "Last activity:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:251
+#: src/trg-torrent-props-dialog.c:242
 msgid "Error:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:255
+#: src/trg-torrent-props-dialog.c:246
 msgid "Details"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:266
+#: src/trg-torrent-props-dialog.c:257
 msgid "Hash:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:272
+#: src/trg-torrent-props-dialog.c:263
 msgid "Privacy:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:278
+#: src/trg-torrent-props-dialog.c:269
 msgid "Origin:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:295
+#: src/trg-torrent-props-dialog.c:286
 msgid "Comment:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:330
+#: src/trg-torrent-props-dialog.c:321
 msgid "Private to this tracker -- DHT and PEX disabled"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:332
+#: src/trg-torrent-props-dialog.c:323
 msgid "Public torrent"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:342
+#: src/trg-torrent-props-dialog.c:333
 #, c-format
 msgid "Created on %1$s"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:344
+#: src/trg-torrent-props-dialog.c:335
 #, c-format
 msgid "Created by %1$s on %2$s"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:376
+#: src/trg-torrent-props-dialog.c:367
 msgid "No errors"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:380
+#: src/trg-torrent-props-dialog.c:371
 msgid "Active now"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:413
+#: src/trg-torrent-props-dialog.c:404
 msgid "Honor global limits"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:423
+#: src/trg-torrent-props-dialog.c:414
 msgid "Torrent priority:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:429
+#: src/trg-torrent-props-dialog.c:420
 msgid "Queue Position:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:434
+#: src/trg-torrent-props-dialog.c:425
 msgid "Limit download speed (KiB/s)"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:442
+#: src/trg-torrent-props-dialog.c:433
 msgid "Limit upload speed (KiB/s)"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:450
+#: src/trg-torrent-props-dialog.c:441
 msgid "Use global settings"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:451
+#: src/trg-torrent-props-dialog.c:442
 msgid "Stop seeding at ratio"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:452
+#: src/trg-torrent-props-dialog.c:443
 msgid "Seed regardless of ratio"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:455
+#: src/trg-torrent-props-dialog.c:446
 msgid "Seed ratio mode:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:463
+#: src/trg-torrent-props-dialog.c:454
 msgid "Seed ratio limit:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:469
+#: src/trg-torrent-props-dialog.c:460
 msgid "Peer limit:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:542
+#: src/trg-torrent-props-dialog.c:533
 #, c-format
 msgid "Multiple (%d) torrent properties"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:574
+#: src/trg-torrent-props-dialog.c:565
 msgid "Information"
 msgstr ""
 
@@ -1430,45 +1434,45 @@ msgstr ""
 msgid "Descending"
 msgstr ""
 
-#: src/util.c:340
+#: src/util.c:342
 msgid "JSON decoding error."
 msgstr ""
 
-#: src/util.c:345
+#: src/util.c:347
 msgid "Server responded, but with no result."
 msgstr ""
 
-#: src/util.c:349
+#: src/util.c:351
 #, c-format
 msgid "Request failed with HTTP code %d"
 msgstr ""
 
-#: src/util.c:383
+#: src/util.c:385
 msgid "None"
 msgstr ""
 
-#: src/util.c:429
+#: src/util.c:431
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/util.c:430
+#: src/util.c:432
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/util.c:432
+#: src/util.c:434
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/util.c:435
+#: src/util.c:437
 #, c-format
 msgid "%ld second"
 msgid_plural "%ld seconds"
diff --git a/po/cs.po b/po/cs.po
index ac7a768..5eee73a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: transmission-remote-gtk\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-09-05 22:09+0100\n"
+"POT-Creation-Date: 2013-06-09 23:41+0100\n"
 "PO-Revision-Date: 2012-11-04 13:28+0000\n"
 "Last-Translator: Jan Žárský <jan.zarsky@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2013-06-09 22:28+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2014-06-12 07:44+0000\n"
+"X-Generator: Launchpad (build 17045)\n"
 
 #: src/torrent.c:360 src/torrent.c:380
 msgid "Metadata Downloading"
@@ -43,7 +43,7 @@ msgid "Queued seed"
 msgstr ""
 
 #: src/torrent.c:372 src/torrent.c:386 src/trg-remote-prefs-dialog.c:360
-#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:447
+#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:438
 msgid "Seeding"
 msgstr "Sdílení"
 
@@ -156,18 +156,18 @@ msgstr[1] ""
 msgid "A remote client to transmission-daemon."
 msgstr "Vzdálený klient k transmission-daemon."
 
-#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2011
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:416
+#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2025
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:407
 msgid "Low"
 msgstr "Nízká"
 
-#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2007
-#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:418
+#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2021
+#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:409
 msgid "High"
 msgstr "Vysoká"
 
-#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2009
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:417
+#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2023
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:408
 msgid "Normal"
 msgstr "Normální"
 
@@ -175,12 +175,12 @@ msgstr "Normální"
 msgid "Mixed"
 msgstr "Smíšená"
 
-#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:280
+#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:278
 #: src/trg-torrent-add-dialog.c:348 src/trg-torrent-tree-view.c:52
 msgid "Name"
 msgstr "Jméno"
 
-#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:283
+#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:281
 #: src/trg-torrent-add-dialog.c:366 src/trg-torrent-tree-view.c:57
 msgid "Size"
 msgstr "Velikost"
@@ -194,7 +194,7 @@ msgstr "Postup"
 msgid "Download"
 msgstr "Stáhnout"
 
-#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2000
+#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2014
 #: src/trg-torrent-add-dialog.c:395 src/trg-torrent-tree-view.c:145
 msgid "Priority"
 msgstr "Priorita"
@@ -223,7 +223,7 @@ msgstr "Rozbalit vše"
 msgid "Collapse All"
 msgstr "Sbalit vše"
 
-#: src/trg-general-panel.c:153 src/trg-general-panel.c:214
+#: src/trg-general-panel.c:153 src/trg-general-panel.c:212
 msgid "N/A"
 msgstr "Neznáme"
 
@@ -235,62 +235,62 @@ msgstr "(Soukromé)"
 msgid "(Public)"
 msgstr "(Veřejné)"
 
-#: src/trg-general-panel.c:202 src/trg-main-window.c:1097
-#: src/trg-main-window.c:1505 src/trg-main-window.c:2135
+#: src/trg-general-panel.c:200 src/trg-main-window.c:1106
+#: src/trg-main-window.c:1519 src/trg-main-window.c:2149
 #: src/trg-state-selector.c:538 src/trg-torrent-add-url-dialog.c:67
-#: src/util.c:331
+#: src/util.c:333
 msgid "Error"
 msgstr "Chyba"
 
-#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:123
+#: src/trg-general-panel.c:283 src/trg-torrent-tree-view.c:123
 msgid "ETA"
 msgstr "ETA"
 
-#: src/trg-general-panel.c:287 src/trg-torrent-tree-view.c:151
+#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:151
 msgid "Completed"
 msgstr "Dokon�eno"
 
-#: src/trg-general-panel.c:290
+#: src/trg-general-panel.c:288
 msgid "Seeders"
 msgstr "Protějšky"
 
-#: src/trg-general-panel.c:292
+#: src/trg-general-panel.c:290
 msgid "Rate Down"
 msgstr ""
 
-#: src/trg-general-panel.c:294 src/trg-torrent-tree-view.c:128
+#: src/trg-general-panel.c:292 src/trg-torrent-tree-view.c:128
 msgid "Downloaded"
 msgstr "Staženo"
 
-#: src/trg-general-panel.c:297 src/trg-torrent-tree-view.c:70
+#: src/trg-general-panel.c:295 src/trg-torrent-tree-view.c:70
 msgid "Leechers"
 msgstr "Stahující"
 
-#: src/trg-general-panel.c:299
+#: src/trg-general-panel.c:297
 msgid "Rate Up"
 msgstr ""
 
-#: src/trg-general-panel.c:301 src/trg-torrent-tree-view.c:125
+#: src/trg-general-panel.c:299 src/trg-torrent-tree-view.c:125
 msgid "Uploaded"
 msgstr "Odesláno"
 
-#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:63
+#: src/trg-general-panel.c:302 src/trg-torrent-tree-view.c:63
 msgid "Status"
 msgstr "Stav"
 
-#: src/trg-general-panel.c:306 src/trg-torrent-tree-view.c:131
+#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:131
 msgid "Ratio"
 msgstr "Poměr"
 
-#: src/trg-general-panel.c:309
+#: src/trg-general-panel.c:307
 msgid "Comment"
 msgstr "Komentář"
 
-#: src/trg-general-panel.c:312
+#: src/trg-general-panel.c:310
 msgid "Completed At"
 msgstr "Dokon�eno v"
 
-#: src/trg-general-panel.c:316 src/trg-torrent-tree-view.c:139
+#: src/trg-general-panel.c:314 src/trg-torrent-tree-view.c:139
 msgid "Location"
 msgstr "Umístění"
 
@@ -302,189 +302,189 @@ msgstr "Tento torrent je dokon�ený."
 msgid "This torrent has been added."
 msgstr "Tento torrent byl přidán."
 
-#: src/trg-main-window.c:596
+#: src/trg-main-window.c:600
 msgid "No hostname set"
 msgstr ""
 
-#: src/trg-main-window.c:599
+#: src/trg-main-window.c:603
 msgid "Unknown error getting settings"
 msgstr ""
 
-#: src/trg-main-window.c:614
+#: src/trg-main-window.c:623
 msgid "Connecting..."
 msgstr "Připojování..."
 
-#: src/trg-main-window.c:873
+#: src/trg-main-window.c:882
 #, c-format
 msgid "<big><b>Remove torrent \"%s\"?</b></big>"
 msgstr "<big><b>Odstranit torrent \"%s\"?</b></big>"
 
-#: src/trg-main-window.c:874
+#: src/trg-main-window.c:883
 #, c-format
 msgid "<big><b>Remove %d torrents?</b></big>"
 msgstr "<big><b>Odstranit %d torrentů?</b></big>"
 
-#: src/trg-main-window.c:896
+#: src/trg-main-window.c:905
 #, c-format
 msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
 msgstr "<big><b>Odstranit a smazat torrent \"%s\"?</b></big>"
 
-#: src/trg-main-window.c:898
+#: src/trg-main-window.c:907
 #, c-format
 msgid "<big><b>Remove and delete %d torrents?</b></big>"
 msgstr "<big><b>Odstranit a smazat %d torrentů?</b></big>"
 
-#: src/trg-main-window.c:981 src/trg-preferences-dialog.c:897
+#: src/trg-main-window.c:990 src/trg-preferences-dialog.c:899
 #: src/trg-remote-prefs-dialog.c:693
 msgid "General"
 msgstr "Obecné"
 
-#: src/trg-main-window.c:990 src/trg-torrent-props-dialog.c:622
+#: src/trg-main-window.c:999 src/trg-torrent-props-dialog.c:613
 msgid "Trackers"
 msgstr "Trackery"
 
-#: src/trg-main-window.c:998 src/trg-torrent-props-dialog.c:591
+#: src/trg-main-window.c:1007 src/trg-torrent-props-dialog.c:582
 msgid "Files"
 msgstr "Soubory"
 
-#: src/trg-main-window.c:1006 src/trg-remote-prefs-dialog.c:399
-#: src/trg-torrent-props-dialog.c:465 src/trg-torrent-props-dialog.c:605
+#: src/trg-main-window.c:1015 src/trg-remote-prefs-dialog.c:399
+#: src/trg-torrent-props-dialog.c:456 src/trg-torrent-props-dialog.c:596
 #: src/trg-trackers-tree-view.c:190
 msgid "Peers"
 msgstr "Peery"
 
-#: src/trg-main-window.c:1089
+#: src/trg-main-window.c:1098
 #, c-format
 msgid "This application supports Transmission %g and later, you have %g."
 msgstr "Tato aplikace podporuje Transmission %g a novější, vy máte %g."
 
-#: src/trg-main-window.c:1155 src/trg-status-bar.c:74 src/trg-status-bar.c:104
+#: src/trg-main-window.c:1164 src/trg-status-bar.c:74 src/trg-status-bar.c:104
 msgid "Disconnected"
 msgstr "Odpojeno"
 
-#: src/trg-main-window.c:1200
+#: src/trg-main-window.c:1209
 #, c-format
 msgid "%d Downloading @ %s"
 msgstr ""
 
-#: src/trg-main-window.c:1207
+#: src/trg-main-window.c:1216
 #, c-format
 msgid "%d Seeding @ %s"
 msgstr ""
 
-#: src/trg-main-window.c:1258
+#: src/trg-main-window.c:1267
 #, c-format
 msgid "Request %d/%d failed: %s"
 msgstr "Požadavek %d/%d selhal: %s"
 
-#: src/trg-main-window.c:2055
+#: src/trg-main-window.c:2069
 msgid "No Limit"
 msgstr "Bez omezení"
 
-#: src/trg-main-window.c:2156 src/trg-menu-bar.c:675 src/trg-toolbar.c:223
+#: src/trg-main-window.c:2170 src/trg-menu-bar.c:675 src/trg-toolbar.c:224
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/trg-main-window.c:2159 src/trg-toolbar.c:216
+#: src/trg-main-window.c:2173 src/trg-toolbar.c:217
 msgid "Resume"
 msgstr "Pokra�ovat"
 
-#: src/trg-main-window.c:2162 src/trg-toolbar.c:219
+#: src/trg-main-window.c:2176 src/trg-toolbar.c:220
 msgid "Pause"
 msgstr "Pozastavit"
 
-#: src/trg-main-window.c:2165
+#: src/trg-main-window.c:2179
 msgid "Verify"
 msgstr "Ověřit"
 
-#: src/trg-main-window.c:2168
+#: src/trg-main-window.c:2182
 msgid "Re-announce"
 msgstr ""
 
-#: src/trg-main-window.c:2171 src/trg-torrent-move-dialog.c:119
+#: src/trg-main-window.c:2185 src/trg-torrent-move-dialog.c:119
 #: src/trg-torrent-move-dialog.c:126
 msgid "Move"
 msgstr "Přesunout"
 
-#: src/trg-main-window.c:2174 src/trg-menu-bar.c:706 src/trg-toolbar.c:227
+#: src/trg-main-window.c:2188 src/trg-menu-bar.c:706 src/trg-toolbar.c:228
 msgid "Remove"
 msgstr "Odstranit"
 
-#: src/trg-main-window.c:2177
+#: src/trg-main-window.c:2191
 msgid "Remove & Delete"
 msgstr "Odstranit a smazat"
 
-#: src/trg-main-window.c:2201 src/trg-preferences-dialog.c:907
+#: src/trg-main-window.c:2215 src/trg-preferences-dialog.c:909
 msgid "Actions"
 msgstr "Akce"
 
-#: src/trg-main-window.c:2230 src/trg-menu-bar.c:722
+#: src/trg-main-window.c:2244 src/trg-menu-bar.c:722
 msgid "Start Now"
 msgstr "Za�ít te�"
 
-#: src/trg-main-window.c:2233 src/trg-menu-bar.c:727
+#: src/trg-main-window.c:2247 src/trg-menu-bar.c:727
 msgid "Move Up Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2236 src/trg-menu-bar.c:734
+#: src/trg-main-window.c:2250 src/trg-menu-bar.c:734
 msgid "Move Down Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2239 src/trg-menu-bar.c:741
+#: src/trg-main-window.c:2253 src/trg-menu-bar.c:741
 msgid "Bottom Of Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2242 src/trg-menu-bar.c:745
+#: src/trg-main-window.c:2256 src/trg-menu-bar.c:745
 msgid "Top Of Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2251 src/trg-main-window.c:2334
+#: src/trg-main-window.c:2265 src/trg-main-window.c:2348
 msgid "Down Limit"
 msgstr "Limit stahování"
 
-#: src/trg-main-window.c:2256 src/trg-main-window.c:2338
+#: src/trg-main-window.c:2270 src/trg-main-window.c:2352
 msgid "Up Limit"
 msgstr "Limit odesílání"
 
-#: src/trg-main-window.c:2285 src/trg-main-window.c:2292
+#: src/trg-main-window.c:2299 src/trg-main-window.c:2306
 #: src/trg-remote-prefs-dialog.c:497
 msgid "Updating..."
 msgstr "Aktualizace..."
 
-#: src/trg-main-window.c:2306 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
+#: src/trg-main-window.c:2320 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
 msgid "Connect"
 msgstr "Připojit"
 
-#: src/trg-main-window.c:2313 src/trg-toolbar.c:206
+#: src/trg-main-window.c:2327 src/trg-toolbar.c:207
 msgid "Disconnect"
 msgstr "Odpojit"
 
-#: src/trg-main-window.c:2317 src/trg-toolbar.c:209
+#: src/trg-main-window.c:2331 src/trg-toolbar.c:210
 #: src/trg-trackers-tree-view.c:284 src/trg-trackers-tree-view.c:311
 msgid "Add"
 msgstr "Přidat"
 
-#: src/trg-main-window.c:2321
+#: src/trg-main-window.c:2335
 msgid "Add from URL"
 msgstr "Přidat z URL"
 
-#: src/trg-main-window.c:2325
+#: src/trg-main-window.c:2339
 msgid "Resume All"
 msgstr "Pokra�ovat ve všem"
 
-#: src/trg-main-window.c:2329
+#: src/trg-main-window.c:2343
 msgid "Pause All"
 msgstr "Pozastavit vše"
 
-#: src/trg-main-window.c:2345
+#: src/trg-main-window.c:2359
 msgid "Quit"
 msgstr "Ukon�it"
 
-#: src/trg-main-window.c:2459 src/trg-menu-bar.c:536
+#: src/trg-main-window.c:2473 src/trg-menu-bar.c:536
 msgid "Graph"
 msgstr "Graf"
 
-#: src/trg-main-window.c:2647
+#: src/trg-main-window.c:2662
 msgid "Transmission Remote"
 msgstr "Transmission Remote"
 
@@ -692,7 +692,7 @@ msgstr ""
 msgid "Directory"
 msgstr "Adresář"
 
-#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:902
+#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:904
 msgid "View"
 msgstr "Zobrazit"
 
@@ -732,7 +732,7 @@ msgstr "Profil: "
 msgid "Name:"
 msgstr "Jméno:"
 
-#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:892
+#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:894
 msgid "Connection"
 msgstr "Připojení"
 
@@ -744,35 +744,39 @@ msgstr "Hostitel:"
 msgid "Port:"
 msgstr "Port:"
 
-#: src/trg-preferences-dialog.c:817
+#: src/trg-preferences-dialog.c:816
+msgid "RPC URL Path:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:819
 msgid "Username:"
 msgstr "Uživatelské jméno:"
 
-#: src/trg-preferences-dialog.c:821
+#: src/trg-preferences-dialog.c:823
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/trg-preferences-dialog.c:823
+#: src/trg-preferences-dialog.c:825
 msgid "Automatically connect"
 msgstr "Připojit automaticky"
 
-#: src/trg-preferences-dialog.c:829
+#: src/trg-preferences-dialog.c:831
 msgid "SSL"
 msgstr "SSL"
 
-#: src/trg-preferences-dialog.c:836
+#: src/trg-preferences-dialog.c:838
 msgid "Timeout:"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:840
+#: src/trg-preferences-dialog.c:842
 msgid "Retries:"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:881 src/trg-toolbar.c:238
+#: src/trg-preferences-dialog.c:883 src/trg-toolbar.c:239
 msgid "Local Preferences"
 msgstr "Místní předvolby"
 
-#: src/trg-preferences-dialog.c:912
+#: src/trg-preferences-dialog.c:914
 msgid "Directories"
 msgstr "Adresáře"
 
@@ -962,15 +966,15 @@ msgstr "Vyhodit do koše originální soubory torrentu"
 msgid "Start added torrents"
 msgstr "Spustit přidané torrenty"
 
-#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:242
+#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:243
 msgid "Remote Preferences"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:409
+#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:400
 msgid "Bandwidth"
 msgstr "Šířka pásma"
 
-#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:636
+#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:627
 msgid "Limits"
 msgstr "Limity"
 
@@ -1070,7 +1074,7 @@ msgstr " (Limit: %s)"
 msgid "Down: %s%s, Up: %s%s"
 msgstr "Stahování: %s%s, Odesílání: %s%s"
 
-#: src/trg-toolbar.c:231
+#: src/trg-toolbar.c:232
 msgid "Remove with data"
 msgstr "Odstranit s daty"
 
@@ -1167,7 +1171,7 @@ msgstr ""
 msgid "Default"
 msgstr "Výchozí"
 
-#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:260
+#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:251
 msgid "Location:"
 msgstr "Umístění:"
 
@@ -1181,142 +1185,142 @@ msgstr "Přesunout %s"
 msgid "Move %d torrents"
 msgstr "Přesunout %d torrentů"
 
-#: src/trg-torrent-props-dialog.c:206
+#: src/trg-torrent-props-dialog.c:197
 msgid "Activity"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:211
+#: src/trg-torrent-props-dialog.c:202
 msgid "Torrent size:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:216
+#: src/trg-torrent-props-dialog.c:207
 msgid "Have:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:221
+#: src/trg-torrent-props-dialog.c:212
 msgid "Downloaded:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:226
+#: src/trg-torrent-props-dialog.c:217
 msgid "Uploaded:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:231
+#: src/trg-torrent-props-dialog.c:222
 msgid "State:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:236
+#: src/trg-torrent-props-dialog.c:227
 msgid "Running time:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:241
+#: src/trg-torrent-props-dialog.c:232
 msgid "Remaining time:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:246
+#: src/trg-torrent-props-dialog.c:237
 msgid "Last activity:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:251
+#: src/trg-torrent-props-dialog.c:242
 msgid "Error:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:255
+#: src/trg-torrent-props-dialog.c:246
 msgid "Details"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:266
+#: src/trg-torrent-props-dialog.c:257
 msgid "Hash:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:272
+#: src/trg-torrent-props-dialog.c:263
 msgid "Privacy:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:278
+#: src/trg-torrent-props-dialog.c:269
 msgid "Origin:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:295
+#: src/trg-torrent-props-dialog.c:286
 msgid "Comment:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:330
+#: src/trg-torrent-props-dialog.c:321
 msgid "Private to this tracker -- DHT and PEX disabled"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:332
+#: src/trg-torrent-props-dialog.c:323
 msgid "Public torrent"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:342
+#: src/trg-torrent-props-dialog.c:333
 #, c-format
 msgid "Created on %1$s"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:344
+#: src/trg-torrent-props-dialog.c:335
 #, c-format
 msgid "Created by %1$s on %2$s"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:376
+#: src/trg-torrent-props-dialog.c:367
 msgid "No errors"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:380
+#: src/trg-torrent-props-dialog.c:371
 msgid "Active now"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:413
+#: src/trg-torrent-props-dialog.c:404
 msgid "Honor global limits"
 msgstr "Dodržovat globální limity"
 
-#: src/trg-torrent-props-dialog.c:423
+#: src/trg-torrent-props-dialog.c:414
 msgid "Torrent priority:"
 msgstr "Priorita torrentu:"
 
-#: src/trg-torrent-props-dialog.c:429
+#: src/trg-torrent-props-dialog.c:420
 msgid "Queue Position:"
 msgstr "Pozice ve frontÄ›:"
 
-#: src/trg-torrent-props-dialog.c:434
+#: src/trg-torrent-props-dialog.c:425
 msgid "Limit download speed (KiB/s)"
 msgstr "Limit rychlosti stahování (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:442
+#: src/trg-torrent-props-dialog.c:433
 msgid "Limit upload speed (KiB/s)"
 msgstr "Limit rychlosti odesílání (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:450
+#: src/trg-torrent-props-dialog.c:441
 msgid "Use global settings"
 msgstr "Použít globální nastavení"
 
-#: src/trg-torrent-props-dialog.c:451
+#: src/trg-torrent-props-dialog.c:442
 msgid "Stop seeding at ratio"
 msgstr "Přestat sdílet při poměru"
 
-#: src/trg-torrent-props-dialog.c:452
+#: src/trg-torrent-props-dialog.c:443
 msgid "Seed regardless of ratio"
 msgstr "Sdílet bez ohledu na poměr"
 
-#: src/trg-torrent-props-dialog.c:455
+#: src/trg-torrent-props-dialog.c:446
 msgid "Seed ratio mode:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:463
+#: src/trg-torrent-props-dialog.c:454
 msgid "Seed ratio limit:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:469
+#: src/trg-torrent-props-dialog.c:460
 msgid "Peer limit:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:542
+#: src/trg-torrent-props-dialog.c:533
 #, c-format
 msgid "Multiple (%d) torrent properties"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:574
+#: src/trg-torrent-props-dialog.c:565
 msgid "Information"
 msgstr ""
 
@@ -1436,24 +1440,24 @@ msgstr ""
 msgid "Descending"
 msgstr ""
 
-#: src/util.c:340
+#: src/util.c:342
 msgid "JSON decoding error."
 msgstr ""
 
-#: src/util.c:345
+#: src/util.c:347
 msgid "Server responded, but with no result."
 msgstr "Server odpověděl, ale bez výsledku."
 
-#: src/util.c:349
+#: src/util.c:351
 #, c-format
 msgid "Request failed with HTTP code %d"
 msgstr "Požadavek selhal s HTTP kódem %d"
 
-#: src/util.c:383
+#: src/util.c:385
 msgid "None"
 msgstr "Žádný"
 
-#: src/util.c:429
+#: src/util.c:431
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -1461,7 +1465,7 @@ msgstr[0] "%d den"
 msgstr[1] ""
 msgstr[2] "%d dní"
 
-#: src/util.c:430
+#: src/util.c:432
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1469,7 +1473,7 @@ msgstr[0] "%d hodina"
 msgstr[1] "%d hodiny"
 msgstr[2] "%d hodin"
 
-#: src/util.c:432
+#: src/util.c:434
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1477,7 +1481,7 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minuty"
 msgstr[2] "%d minut"
 
-#: src/util.c:435
+#: src/util.c:437
 #, c-format
 msgid "%ld second"
 msgid_plural "%ld seconds"
diff --git a/po/de.po b/po/de.po
index afc7269..a0c4048 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-05 22:09+0100\n"
+"POT-Creation-Date: 2013-06-09 23:41+0100\n"
 "PO-Revision-Date: 2012-10-25 15:29+0000\n"
-"Last-Translator: Georg Engelmann <contact-me@georg-engelmann.at>\n"
+"Last-Translator: Georg Engelmann <georgengelmann@gmx.net>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-06-09 22:28+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2014-06-12 07:44+0000\n"
+"X-Generator: Launchpad (build 17045)\n"
 "Language: German\n"
 
 #: src/torrent.c:360 src/torrent.c:380
@@ -44,7 +44,7 @@ msgid "Queued seed"
 msgstr ""
 
 #: src/torrent.c:372 src/torrent.c:386 src/trg-remote-prefs-dialog.c:360
-#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:447
+#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:438
 msgid "Seeding"
 msgstr "Seeds"
 
@@ -156,18 +156,18 @@ msgstr[1] ""
 msgid "A remote client to transmission-daemon."
 msgstr "Ein Client für transmission-daemon"
 
-#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2011
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:416
+#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2025
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:407
 msgid "Low"
 msgstr "Niedrig"
 
-#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2007
-#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:418
+#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2021
+#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:409
 msgid "High"
 msgstr "Hoch"
 
-#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2009
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:417
+#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2023
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:408
 msgid "Normal"
 msgstr "Normal"
 
@@ -175,12 +175,12 @@ msgstr "Normal"
 msgid "Mixed"
 msgstr "Gemischt"
 
-#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:280
+#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:278
 #: src/trg-torrent-add-dialog.c:348 src/trg-torrent-tree-view.c:52
 msgid "Name"
 msgstr "Name"
 
-#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:283
+#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:281
 #: src/trg-torrent-add-dialog.c:366 src/trg-torrent-tree-view.c:57
 msgid "Size"
 msgstr "Größe"
@@ -194,7 +194,7 @@ msgstr "Fertig"
 msgid "Download"
 msgstr "Herunterladen"
 
-#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2000
+#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2014
 #: src/trg-torrent-add-dialog.c:395 src/trg-torrent-tree-view.c:145
 msgid "Priority"
 msgstr "Priorität"
@@ -223,7 +223,7 @@ msgstr "Alle aufklappen"
 msgid "Collapse All"
 msgstr "Alle zuklappen"
 
-#: src/trg-general-panel.c:153 src/trg-general-panel.c:214
+#: src/trg-general-panel.c:153 src/trg-general-panel.c:212
 msgid "N/A"
 msgstr "N/A"
 
@@ -235,62 +235,62 @@ msgstr "(Privat)"
 msgid "(Public)"
 msgstr "(Öffentlich)"
 
-#: src/trg-general-panel.c:202 src/trg-main-window.c:1097
-#: src/trg-main-window.c:1505 src/trg-main-window.c:2135
+#: src/trg-general-panel.c:200 src/trg-main-window.c:1106
+#: src/trg-main-window.c:1519 src/trg-main-window.c:2149
 #: src/trg-state-selector.c:538 src/trg-torrent-add-url-dialog.c:67
-#: src/util.c:331
+#: src/util.c:333
 msgid "Error"
 msgstr "Fehlerhaft"
 
-#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:123
+#: src/trg-general-panel.c:283 src/trg-torrent-tree-view.c:123
 msgid "ETA"
 msgstr "Restzeit"
 
-#: src/trg-general-panel.c:287 src/trg-torrent-tree-view.c:151
+#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:151
 msgid "Completed"
 msgstr "Vollendet"
 
-#: src/trg-general-panel.c:290
+#: src/trg-general-panel.c:288
 msgid "Seeders"
 msgstr "Seeder"
 
-#: src/trg-general-panel.c:292
+#: src/trg-general-panel.c:290
 msgid "Rate Down"
 msgstr "DL Rate"
 
-#: src/trg-general-panel.c:294 src/trg-torrent-tree-view.c:128
+#: src/trg-general-panel.c:292 src/trg-torrent-tree-view.c:128
 msgid "Downloaded"
 msgstr "Runtergeladen"
 
-#: src/trg-general-panel.c:297 src/trg-torrent-tree-view.c:70
+#: src/trg-general-panel.c:295 src/trg-torrent-tree-view.c:70
 msgid "Leechers"
 msgstr "Leecher"
 
-#: src/trg-general-panel.c:299
+#: src/trg-general-panel.c:297
 msgid "Rate Up"
 msgstr "UL Rate"
 
-#: src/trg-general-panel.c:301 src/trg-torrent-tree-view.c:125
+#: src/trg-general-panel.c:299 src/trg-torrent-tree-view.c:125
 msgid "Uploaded"
 msgstr "Hochgeladen"
 
-#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:63
+#: src/trg-general-panel.c:302 src/trg-torrent-tree-view.c:63
 msgid "Status"
 msgstr "Status"
 
-#: src/trg-general-panel.c:306 src/trg-torrent-tree-view.c:131
+#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:131
 msgid "Ratio"
 msgstr "Ratio"
 
-#: src/trg-general-panel.c:309
+#: src/trg-general-panel.c:307
 msgid "Comment"
 msgstr ""
 
-#: src/trg-general-panel.c:312
+#: src/trg-general-panel.c:310
 msgid "Completed At"
 msgstr ""
 
-#: src/trg-general-panel.c:316 src/trg-torrent-tree-view.c:139
+#: src/trg-general-panel.c:314 src/trg-torrent-tree-view.c:139
 msgid "Location"
 msgstr "Ort"
 
@@ -302,189 +302,189 @@ msgstr "Dieser Torrent ist fertig."
 msgid "This torrent has been added."
 msgstr "Dieser Torrent wurde hinzugefügt."
 
-#: src/trg-main-window.c:596
+#: src/trg-main-window.c:600
 msgid "No hostname set"
 msgstr "Kein Host angegeben"
 
-#: src/trg-main-window.c:599
+#: src/trg-main-window.c:603
 msgid "Unknown error getting settings"
 msgstr "Unbekannter Fehler beim Holen der Einstellungen"
 
-#: src/trg-main-window.c:614
+#: src/trg-main-window.c:623
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-#: src/trg-main-window.c:873
+#: src/trg-main-window.c:882
 #, c-format
 msgid "<big><b>Remove torrent \"%s\"?</b></big>"
 msgstr "<big><b>Torrent entfernen \"%s\"?</b></big>"
 
-#: src/trg-main-window.c:874
+#: src/trg-main-window.c:883
 #, c-format
 msgid "<big><b>Remove %d torrents?</b></big>"
 msgstr "<big><b>Entferne %d torrents?</b></big>"
 
-#: src/trg-main-window.c:896
+#: src/trg-main-window.c:905
 #, c-format
 msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
 msgstr "<big><b>Torrent entfernen und löschen \"%s\"?</b></big>"
 
-#: src/trg-main-window.c:898
+#: src/trg-main-window.c:907
 #, c-format
 msgid "<big><b>Remove and delete %d torrents?</b></big>"
 msgstr "%d Torrents entfernen und löschen?"
 
-#: src/trg-main-window.c:981 src/trg-preferences-dialog.c:897
+#: src/trg-main-window.c:990 src/trg-preferences-dialog.c:899
 #: src/trg-remote-prefs-dialog.c:693
 msgid "General"
 msgstr "Allgemein"
 
-#: src/trg-main-window.c:990 src/trg-torrent-props-dialog.c:622
+#: src/trg-main-window.c:999 src/trg-torrent-props-dialog.c:613
 msgid "Trackers"
 msgstr "Tracker"
 
-#: src/trg-main-window.c:998 src/trg-torrent-props-dialog.c:591
+#: src/trg-main-window.c:1007 src/trg-torrent-props-dialog.c:582
 msgid "Files"
 msgstr "Dateien"
 
-#: src/trg-main-window.c:1006 src/trg-remote-prefs-dialog.c:399
-#: src/trg-torrent-props-dialog.c:465 src/trg-torrent-props-dialog.c:605
+#: src/trg-main-window.c:1015 src/trg-remote-prefs-dialog.c:399
+#: src/trg-torrent-props-dialog.c:456 src/trg-torrent-props-dialog.c:596
 #: src/trg-trackers-tree-view.c:190
 msgid "Peers"
 msgstr "Peers"
 
-#: src/trg-main-window.c:1089
+#: src/trg-main-window.c:1098
 #, c-format
 msgid "This application supports Transmission %g and later, you have %g."
 msgstr ""
 
-#: src/trg-main-window.c:1155 src/trg-status-bar.c:74 src/trg-status-bar.c:104
+#: src/trg-main-window.c:1164 src/trg-status-bar.c:74 src/trg-status-bar.c:104
 msgid "Disconnected"
 msgstr "Nicht verbunden"
 
-#: src/trg-main-window.c:1200
+#: src/trg-main-window.c:1209
 #, c-format
 msgid "%d Downloading @ %s"
 msgstr ""
 
-#: src/trg-main-window.c:1207
+#: src/trg-main-window.c:1216
 #, c-format
 msgid "%d Seeding @ %s"
 msgstr ""
 
-#: src/trg-main-window.c:1258
+#: src/trg-main-window.c:1267
 #, c-format
 msgid "Request %d/%d failed: %s"
 msgstr "Anfrage %d/%d fehlgeschlagen: %s"
 
-#: src/trg-main-window.c:2055
+#: src/trg-main-window.c:2069
 msgid "No Limit"
 msgstr "Keine Beschränkungen"
 
-#: src/trg-main-window.c:2156 src/trg-menu-bar.c:675 src/trg-toolbar.c:223
+#: src/trg-main-window.c:2170 src/trg-menu-bar.c:675 src/trg-toolbar.c:224
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/trg-main-window.c:2159 src/trg-toolbar.c:216
+#: src/trg-main-window.c:2173 src/trg-toolbar.c:217
 msgid "Resume"
 msgstr "Weiter"
 
-#: src/trg-main-window.c:2162 src/trg-toolbar.c:219
+#: src/trg-main-window.c:2176 src/trg-toolbar.c:220
 msgid "Pause"
 msgstr "Pause"
 
-#: src/trg-main-window.c:2165
+#: src/trg-main-window.c:2179
 msgid "Verify"
 msgstr "Überprüfen"
 
-#: src/trg-main-window.c:2168
+#: src/trg-main-window.c:2182
 msgid "Re-announce"
 msgstr "Neu announcen"
 
-#: src/trg-main-window.c:2171 src/trg-torrent-move-dialog.c:119
+#: src/trg-main-window.c:2185 src/trg-torrent-move-dialog.c:119
 #: src/trg-torrent-move-dialog.c:126
 msgid "Move"
 msgstr "Verschieben"
 
-#: src/trg-main-window.c:2174 src/trg-menu-bar.c:706 src/trg-toolbar.c:227
+#: src/trg-main-window.c:2188 src/trg-menu-bar.c:706 src/trg-toolbar.c:228
 msgid "Remove"
 msgstr "Entfernen"
 
-#: src/trg-main-window.c:2177
+#: src/trg-main-window.c:2191
 msgid "Remove & Delete"
 msgstr "Entfernen und löschen"
 
-#: src/trg-main-window.c:2201 src/trg-preferences-dialog.c:907
+#: src/trg-main-window.c:2215 src/trg-preferences-dialog.c:909
 msgid "Actions"
 msgstr "Aktionen"
 
-#: src/trg-main-window.c:2230 src/trg-menu-bar.c:722
+#: src/trg-main-window.c:2244 src/trg-menu-bar.c:722
 msgid "Start Now"
 msgstr "Jetzt starten"
 
-#: src/trg-main-window.c:2233 src/trg-menu-bar.c:727
+#: src/trg-main-window.c:2247 src/trg-menu-bar.c:727
 msgid "Move Up Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2236 src/trg-menu-bar.c:734
+#: src/trg-main-window.c:2250 src/trg-menu-bar.c:734
 msgid "Move Down Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2239 src/trg-menu-bar.c:741
+#: src/trg-main-window.c:2253 src/trg-menu-bar.c:741
 msgid "Bottom Of Queue"
 msgstr "Ende der Warteschlange"
 
-#: src/trg-main-window.c:2242 src/trg-menu-bar.c:745
+#: src/trg-main-window.c:2256 src/trg-menu-bar.c:745
 msgid "Top Of Queue"
 msgstr "Anfang der Warteschlange"
 
-#: src/trg-main-window.c:2251 src/trg-main-window.c:2334
+#: src/trg-main-window.c:2265 src/trg-main-window.c:2348
 msgid "Down Limit"
 msgstr "DL Limit"
 
-#: src/trg-main-window.c:2256 src/trg-main-window.c:2338
+#: src/trg-main-window.c:2270 src/trg-main-window.c:2352
 msgid "Up Limit"
 msgstr "UL Limit"
 
-#: src/trg-main-window.c:2285 src/trg-main-window.c:2292
+#: src/trg-main-window.c:2299 src/trg-main-window.c:2306
 #: src/trg-remote-prefs-dialog.c:497
 msgid "Updating..."
 msgstr "Aktualisierung läuft …"
 
-#: src/trg-main-window.c:2306 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
+#: src/trg-main-window.c:2320 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
 msgid "Connect"
 msgstr "Verbinden"
 
-#: src/trg-main-window.c:2313 src/trg-toolbar.c:206
+#: src/trg-main-window.c:2327 src/trg-toolbar.c:207
 msgid "Disconnect"
 msgstr "Trennen"
 
-#: src/trg-main-window.c:2317 src/trg-toolbar.c:209
+#: src/trg-main-window.c:2331 src/trg-toolbar.c:210
 #: src/trg-trackers-tree-view.c:284 src/trg-trackers-tree-view.c:311
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/trg-main-window.c:2321
+#: src/trg-main-window.c:2335
 msgid "Add from URL"
 msgstr "Aus URL hinzufügen"
 
-#: src/trg-main-window.c:2325
+#: src/trg-main-window.c:2339
 msgid "Resume All"
 msgstr "Alle fortsetzen"
 
-#: src/trg-main-window.c:2329
+#: src/trg-main-window.c:2343
 msgid "Pause All"
 msgstr "Alle pausieren"
 
-#: src/trg-main-window.c:2345
+#: src/trg-main-window.c:2359
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/trg-main-window.c:2459 src/trg-menu-bar.c:536
+#: src/trg-main-window.c:2473 src/trg-menu-bar.c:536
 msgid "Graph"
 msgstr "Grafik"
 
-#: src/trg-main-window.c:2647
+#: src/trg-main-window.c:2662
 msgid "Transmission Remote"
 msgstr ""
 
@@ -692,7 +692,7 @@ msgstr ""
 msgid "Directory"
 msgstr "Ordner"
 
-#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:902
+#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:904
 msgid "View"
 msgstr "Ansicht"
 
@@ -732,7 +732,7 @@ msgstr "Profil: "
 msgid "Name:"
 msgstr "Name:"
 
-#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:892
+#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:894
 msgid "Connection"
 msgstr "Verbindung"
 
@@ -744,35 +744,39 @@ msgstr "Host:"
 msgid "Port:"
 msgstr "Port:"
 
-#: src/trg-preferences-dialog.c:817
+#: src/trg-preferences-dialog.c:816
+msgid "RPC URL Path:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:819
 msgid "Username:"
 msgstr "Benutzername"
 
-#: src/trg-preferences-dialog.c:821
+#: src/trg-preferences-dialog.c:823
 msgid "Password:"
 msgstr "Passwort:"
 
-#: src/trg-preferences-dialog.c:823
+#: src/trg-preferences-dialog.c:825
 msgid "Automatically connect"
 msgstr "Automatisch verbinden"
 
-#: src/trg-preferences-dialog.c:829
+#: src/trg-preferences-dialog.c:831
 msgid "SSL"
 msgstr "SSL"
 
-#: src/trg-preferences-dialog.c:836
+#: src/trg-preferences-dialog.c:838
 msgid "Timeout:"
 msgstr "Zeitüberschreitung:"
 
-#: src/trg-preferences-dialog.c:840
+#: src/trg-preferences-dialog.c:842
 msgid "Retries:"
 msgstr "Wiederholungen:"
 
-#: src/trg-preferences-dialog.c:881 src/trg-toolbar.c:238
+#: src/trg-preferences-dialog.c:883 src/trg-toolbar.c:239
 msgid "Local Preferences"
 msgstr "Clienteinstellungen"
 
-#: src/trg-preferences-dialog.c:912
+#: src/trg-preferences-dialog.c:914
 msgid "Directories"
 msgstr "Ordner"
 
@@ -963,15 +967,15 @@ msgstr "Original .torrent Dateien löschen"
 msgid "Start added torrents"
 msgstr "Torrents sofort starten"
 
-#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:242
+#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:243
 msgid "Remote Preferences"
 msgstr "Servereinstellungen"
 
-#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:409
+#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:400
 msgid "Bandwidth"
 msgstr "Bandbreite"
 
-#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:636
+#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:627
 msgid "Limits"
 msgstr "Grenzen"
 
@@ -1071,7 +1075,7 @@ msgstr " (Limit %s)"
 msgid "Down: %s%s, Up: %s%s"
 msgstr "Runter: %s%s, Hoch: %s%s"
 
-#: src/trg-toolbar.c:231
+#: src/trg-toolbar.c:232
 msgid "Remove with data"
 msgstr "Mit Daten entfernen"
 
@@ -1164,7 +1168,7 @@ msgstr "Gesammter Download"
 msgid "Default"
 msgstr "Standard"
 
-#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:260
+#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:251
 msgid "Location:"
 msgstr "Ort:"
 
@@ -1178,142 +1182,142 @@ msgstr "Verschiebe %s"
 msgid "Move %d torrents"
 msgstr "Verschiebe %d Torrents"
 
-#: src/trg-torrent-props-dialog.c:206
+#: src/trg-torrent-props-dialog.c:197
 msgid "Activity"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:211
+#: src/trg-torrent-props-dialog.c:202
 msgid "Torrent size:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:216
+#: src/trg-torrent-props-dialog.c:207
 msgid "Have:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:221
+#: src/trg-torrent-props-dialog.c:212
 msgid "Downloaded:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:226
+#: src/trg-torrent-props-dialog.c:217
 msgid "Uploaded:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:231
+#: src/trg-torrent-props-dialog.c:222
 msgid "State:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:236
+#: src/trg-torrent-props-dialog.c:227
 msgid "Running time:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:241
+#: src/trg-torrent-props-dialog.c:232
 msgid "Remaining time:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:246
+#: src/trg-torrent-props-dialog.c:237
 msgid "Last activity:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:251
+#: src/trg-torrent-props-dialog.c:242
 msgid "Error:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:255
+#: src/trg-torrent-props-dialog.c:246
 msgid "Details"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:266
+#: src/trg-torrent-props-dialog.c:257
 msgid "Hash:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:272
+#: src/trg-torrent-props-dialog.c:263
 msgid "Privacy:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:278
+#: src/trg-torrent-props-dialog.c:269
 msgid "Origin:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:295
+#: src/trg-torrent-props-dialog.c:286
 msgid "Comment:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:330
+#: src/trg-torrent-props-dialog.c:321
 msgid "Private to this tracker -- DHT and PEX disabled"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:332
+#: src/trg-torrent-props-dialog.c:323
 msgid "Public torrent"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:342
+#: src/trg-torrent-props-dialog.c:333
 #, c-format
 msgid "Created on %1$s"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:344
+#: src/trg-torrent-props-dialog.c:335
 #, c-format
 msgid "Created by %1$s on %2$s"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:376
+#: src/trg-torrent-props-dialog.c:367
 msgid "No errors"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:380
+#: src/trg-torrent-props-dialog.c:371
 msgid "Active now"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:413
+#: src/trg-torrent-props-dialog.c:404
 msgid "Honor global limits"
 msgstr "Globale Beschränkungen beachten"
 
-#: src/trg-torrent-props-dialog.c:423
+#: src/trg-torrent-props-dialog.c:414
 msgid "Torrent priority:"
 msgstr "Torrent Priorität"
 
-#: src/trg-torrent-props-dialog.c:429
+#: src/trg-torrent-props-dialog.c:420
 msgid "Queue Position:"
 msgstr "Warteschlangenposition:"
 
-#: src/trg-torrent-props-dialog.c:434
+#: src/trg-torrent-props-dialog.c:425
 msgid "Limit download speed (KiB/s)"
 msgstr "Download begrenzen (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:442
+#: src/trg-torrent-props-dialog.c:433
 msgid "Limit upload speed (KiB/s)"
 msgstr "Upload begrenzen (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:450
+#: src/trg-torrent-props-dialog.c:441
 msgid "Use global settings"
 msgstr "Globale Einstellungen bennutzen"
 
-#: src/trg-torrent-props-dialog.c:451
+#: src/trg-torrent-props-dialog.c:442
 msgid "Stop seeding at ratio"
 msgstr "Hochladen beenden wenn Ratio"
 
-#: src/trg-torrent-props-dialog.c:452
+#: src/trg-torrent-props-dialog.c:443
 msgid "Seed regardless of ratio"
 msgstr "Unabhängig von der Ratio weiterseeden"
 
-#: src/trg-torrent-props-dialog.c:455
+#: src/trg-torrent-props-dialog.c:446
 msgid "Seed ratio mode:"
 msgstr "Ratiomodus"
 
-#: src/trg-torrent-props-dialog.c:463
+#: src/trg-torrent-props-dialog.c:454
 msgid "Seed ratio limit:"
 msgstr "Ratiolimit"
 
-#: src/trg-torrent-props-dialog.c:469
+#: src/trg-torrent-props-dialog.c:460
 msgid "Peer limit:"
 msgstr "Peerlimit:"
 
-#: src/trg-torrent-props-dialog.c:542
+#: src/trg-torrent-props-dialog.c:533
 #, c-format
 msgid "Multiple (%d) torrent properties"
 msgstr "Eigenschaften mehrerer (%d) Torrents"
 
-#: src/trg-torrent-props-dialog.c:574
+#: src/trg-torrent-props-dialog.c:565
 msgid "Information"
 msgstr ""
 
@@ -1433,45 +1437,45 @@ msgstr ""
 msgid "Descending"
 msgstr ""
 
-#: src/util.c:340
+#: src/util.c:342
 msgid "JSON decoding error."
 msgstr "JSON decoding error"
 
-#: src/util.c:345
+#: src/util.c:347
 msgid "Server responded, but with no result."
 msgstr "Antwort vom Server erhalten, kein Ergebnis"
 
-#: src/util.c:349
+#: src/util.c:351
 #, c-format
 msgid "Request failed with HTTP code %d"
 msgstr "Anfrage gescheitert. HTTP code: %d"
 
-#: src/util.c:383
+#: src/util.c:385
 msgid "None"
 msgstr "Nichts"
 
-#: src/util.c:429
+#: src/util.c:431
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d Tag"
 msgstr[1] "%d Tage"
 
-#: src/util.c:430
+#: src/util.c:432
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: src/util.c:432
+#: src/util.c:434
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: src/util.c:435
+#: src/util.c:437
 #, c-format
 msgid "%ld second"
 msgid_plural "%ld seconds"
diff --git a/transmission-remote-gtk.pot b/po/el.po
index 24acdbd..5a1400b 100644
--- a/transmission-remote-gtk.pot
+++ b/po/el.po
@@ -1,30 +1,30 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Greek translation for transmission-remote-gtk
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the transmission-remote-gtk package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: transmission-remote-gtk\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-09 23:41+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2014-06-04 07:29+0000\n"
+"Last-Translator: James Spentzos <Unknown>\n"
+"Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2014-06-12 07:44+0000\n"
+"X-Generator: Launchpad (build 17045)\n"
 
 #: src/torrent.c:360 src/torrent.c:380
 msgid "Metadata Downloading"
-msgstr ""
+msgstr "Λήψη Μετα-δεδομένων"
 
 #: src/torrent.c:362 src/torrent.c:382 src/trg-state-selector.c:658
 msgid "Downloading"
-msgstr ""
+msgstr "Λήψη"
 
 #: src/torrent.c:364
 msgid "Queued download"
@@ -36,7 +36,7 @@ msgstr ""
 
 #: src/torrent.c:368 src/torrent.c:388 src/trg-state-selector.c:684
 msgid "Checking"
-msgstr ""
+msgstr "Έλεγχος"
 
 #: src/torrent.c:370
 msgid "Queued seed"
@@ -45,111 +45,112 @@ msgstr ""
 #: src/torrent.c:372 src/torrent.c:386 src/trg-remote-prefs-dialog.c:360
 #: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:438
 msgid "Seeding"
-msgstr ""
+msgstr "Διαμοι�ασμός"
 
 #: src/torrent.c:374 src/torrent.c:384 src/torrent-cell-renderer.c:285
 #: src/trg-state-selector.c:672
 msgid "Paused"
-msgstr ""
+msgstr "Σε πα�ση"
 
 #: src/torrent.c:394
 msgid "Unknown"
-msgstr ""
+msgstr "Άγνωστο"
 
 #: src/torrent-cell-renderer.c:157
 #, c-format
 msgid "%1$s of %2$s (%3$s)"
-msgstr ""
+msgstr "%1$s από %2$s (%3$s)"
 
 #: src/torrent-cell-renderer.c:167
 #, c-format
 msgid "%1$s of %2$s (%3$s), uploaded %4$s (Ratio: %5$s Goal: %6$s)"
 msgstr ""
+"%1$s από %2$s (%3$s), μεταφο�τώθηκαν %4$s (Αναλογία: %5$s Στόχος: %6$s)"
 
 #: src/torrent-cell-renderer.c:183
 #, c-format
 msgid "%1$s of %2$s (%3$s), uploaded %4$s (Ratio: %5$s)"
-msgstr ""
+msgstr "%1$s από %2$s (%3$s), μεταφο�τώθηκαν %4$s (Αναλογία: %5$s)"
 
 #: src/torrent-cell-renderer.c:200
 #, c-format
 msgid "%1$s, uploaded %2$s (Ratio: %3$s Goal: %4$s)"
-msgstr ""
+msgstr "%1$s, μεταφο�τώθηκαν %2$s (Αναλογία: %3$s Στόχος: %4$s)"
 
 #: src/torrent-cell-renderer.c:214
 #, c-format
 msgid "%1$s, uploaded %2$s (Ratio: %3$s)"
-msgstr ""
+msgstr "%1$s, μεταφο�τώθηκαν %2$s (Αναλογία: %3$s)"
 
 #: src/torrent-cell-renderer.c:230
 msgid "Remaining time unknown"
-msgstr ""
+msgstr "Άγνωστος εναπομένων χ�όνος"
 
 #: src/torrent-cell-renderer.c:235
 #, c-format
 msgid "%s remaining"
-msgstr ""
+msgstr "απομένουν %s"
 
 #: src/torrent-cell-renderer.c:259
 #, c-format
 msgid "%1$s %2$s, %3$s %4$s"
-msgstr ""
+msgstr "%1$s %2$s, %3$s %4$s"
 
 #: src/torrent-cell-renderer.c:263 src/torrent-cell-renderer.c:266
 #, c-format
 msgid "%1$s %2$s"
-msgstr ""
+msgstr "%1$s %2$s"
 
 #: src/torrent-cell-renderer.c:270
 msgid "Idle"
-msgstr ""
+msgstr "Αδ�ανές"
 
 #: src/torrent-cell-renderer.c:284
 msgid "Finished"
-msgstr ""
+msgstr "Ολοκλη�ώθηκε"
 
 #: src/torrent-cell-renderer.c:287
 msgid "Queued for verification"
-msgstr ""
+msgstr "Στη σει�ά για επαλήθευση"
 
 #: src/torrent-cell-renderer.c:289
 msgid "Queued for download"
-msgstr ""
+msgstr "Στη σει�ά για λήψη"
 
 #: src/torrent-cell-renderer.c:291
 msgid "Queued for seeding"
-msgstr ""
+msgstr "Σε σει�ά διαμοι�ασμό"
 
 #: src/torrent-cell-renderer.c:294
 #, c-format
 msgid "Verifying data (%1$s tested)"
-msgstr ""
+msgstr "Επαλήθευση δεδομένων (%1$s δοκιμάστηκαν)"
 
 #: src/torrent-cell-renderer.c:302
 #, c-format
 msgid "Ratio %s"
-msgstr ""
+msgstr "Αναλογία %s"
 
 #: src/torrent-cell-renderer.c:332
 #, c-format
 msgid "Downloading from %1$li of %2$li connected peer"
 msgid_plural "Downloading from %1$li of %2$li connected peers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Λήψη από %1$li από %2$li συνδεδεμένο peer"
+msgstr[1] "Λήψη από %1$li από %2$li συνδεδεμένους peers"
 
 #: src/torrent-cell-renderer.c:340
 #, c-format
 msgid "Downloading metadata from %1$li peer (%2$s done)"
 msgid_plural "Downloading metadata from %1$li peers (%2$s done)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Λήψη μετα-δεδομένων από %1$li peer (%2$s ολοκλη�ώθηκε)"
+msgstr[1] "Λήψη μετα-δεδομένων από %1$li peers (%2$s ολοκλη�ώθηκε)"
 
 #: src/torrent-cell-renderer.c:351
 #, c-format
 msgid "Seeding to %1$li of %2$li connected peer"
 msgid_plural "Seeding to %1$li of %2$li connected peers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Διαμοι�ασμός σε %1$li από %2$li συνδεδεμένο peer"
+msgstr[1] "Διαμοι�ασμός σε %1$li από %2$li συνδεδεμένους peers"
 
 #: src/trg-about-window.c:74
 msgid "A remote client to transmission-daemon."
@@ -158,7 +159,7 @@ msgstr ""
 #: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2025
 #: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:407
 msgid "Low"
-msgstr ""
+msgstr "Χαμηλή"
 
 #: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2021
 #: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:409
@@ -1476,5 +1477,5 @@ msgstr[1] ""
 #, c-format
 msgid "%ld second"
 msgid_plural "%ld seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%ld δευτε�όλεπτο"
+msgstr[1] "%ld δευτε�όλεπτα"
diff --git a/po/es.po b/po/es.po
index 00677a6..55fc1eb 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-05 22:09+0100\n"
-"PO-Revision-Date: 2012-11-28 18:48+0000\n"
-"Last-Translator: Adolfo Jayme Barrientos <fitoschido@gmail.com>\n"
+"POT-Creation-Date: 2013-06-09 23:41+0100\n"
+"PO-Revision-Date: 2014-03-24 03:13+0000\n"
+"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-06-09 22:28+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2014-06-12 07:44+0000\n"
+"X-Generator: Launchpad (build 17045)\n"
 "Language: Spanish\n"
 
 #: src/torrent.c:360 src/torrent.c:380
@@ -44,7 +44,7 @@ msgid "Queued seed"
 msgstr "Esperando para servir"
 
 #: src/torrent.c:372 src/torrent.c:386 src/trg-remote-prefs-dialog.c:360
-#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:447
+#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:438
 msgid "Seeding"
 msgstr "Sirviendo"
 
@@ -157,18 +157,18 @@ msgstr[1] "Compartiendo con %1$li de %2$li pares conectados"
 msgid "A remote client to transmission-daemon."
 msgstr "Una interfaz remota para transmission-daemon."
 
-#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2011
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:416
+#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2025
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:407
 msgid "Low"
 msgstr "Baja"
 
-#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2007
-#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:418
+#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2021
+#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:409
 msgid "High"
 msgstr "Alta"
 
-#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2009
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:417
+#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2023
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:408
 msgid "Normal"
 msgstr "Normal"
 
@@ -176,12 +176,12 @@ msgstr "Normal"
 msgid "Mixed"
 msgstr "Mixto"
 
-#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:280
+#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:278
 #: src/trg-torrent-add-dialog.c:348 src/trg-torrent-tree-view.c:52
 msgid "Name"
 msgstr "Nombre"
 
-#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:283
+#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:281
 #: src/trg-torrent-add-dialog.c:366 src/trg-torrent-tree-view.c:57
 msgid "Size"
 msgstr "Tamaño"
@@ -195,7 +195,7 @@ msgstr "Progreso"
 msgid "Download"
 msgstr "Descarga"
 
-#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2000
+#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2014
 #: src/trg-torrent-add-dialog.c:395 src/trg-torrent-tree-view.c:145
 msgid "Priority"
 msgstr "Prioridad"
@@ -224,7 +224,7 @@ msgstr "Expandir todo"
 msgid "Collapse All"
 msgstr "Contraer todo"
 
-#: src/trg-general-panel.c:153 src/trg-general-panel.c:214
+#: src/trg-general-panel.c:153 src/trg-general-panel.c:212
 msgid "N/A"
 msgstr "N/D"
 
@@ -236,62 +236,62 @@ msgstr "(Privado)"
 msgid "(Public)"
 msgstr "(Público)"
 
-#: src/trg-general-panel.c:202 src/trg-main-window.c:1097
-#: src/trg-main-window.c:1505 src/trg-main-window.c:2135
+#: src/trg-general-panel.c:200 src/trg-main-window.c:1106
+#: src/trg-main-window.c:1519 src/trg-main-window.c:2149
 #: src/trg-state-selector.c:538 src/trg-torrent-add-url-dialog.c:67
-#: src/util.c:331
+#: src/util.c:333
 msgid "Error"
 msgstr "Error"
 
-#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:123
+#: src/trg-general-panel.c:283 src/trg-torrent-tree-view.c:123
 msgid "ETA"
 msgstr "Tiempo remanente estimado"
 
-#: src/trg-general-panel.c:287 src/trg-torrent-tree-view.c:151
+#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:151
 msgid "Completed"
 msgstr "Completado"
 
-#: src/trg-general-panel.c:290
+#: src/trg-general-panel.c:288
 msgid "Seeders"
 msgstr "Servidores"
 
-#: src/trg-general-panel.c:292
+#: src/trg-general-panel.c:290
 msgid "Rate Down"
 msgstr "Calificar negativamente"
 
-#: src/trg-general-panel.c:294 src/trg-torrent-tree-view.c:128
+#: src/trg-general-panel.c:292 src/trg-torrent-tree-view.c:128
 msgid "Downloaded"
 msgstr "Descargado"
 
-#: src/trg-general-panel.c:297 src/trg-torrent-tree-view.c:70
+#: src/trg-general-panel.c:295 src/trg-torrent-tree-view.c:70
 msgid "Leechers"
 msgstr "Clientes"
 
-#: src/trg-general-panel.c:299
+#: src/trg-general-panel.c:297
 msgid "Rate Up"
 msgstr "Calificar positivamente"
 
-#: src/trg-general-panel.c:301 src/trg-torrent-tree-view.c:125
+#: src/trg-general-panel.c:299 src/trg-torrent-tree-view.c:125
 msgid "Uploaded"
 msgstr "Subido"
 
-#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:63
+#: src/trg-general-panel.c:302 src/trg-torrent-tree-view.c:63
 msgid "Status"
 msgstr "Estado"
 
-#: src/trg-general-panel.c:306 src/trg-torrent-tree-view.c:131
+#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:131
 msgid "Ratio"
 msgstr "Relación"
 
-#: src/trg-general-panel.c:309
+#: src/trg-general-panel.c:307
 msgid "Comment"
 msgstr "Comentario"
 
-#: src/trg-general-panel.c:312
+#: src/trg-general-panel.c:310
 msgid "Completed At"
 msgstr "Completado el"
 
-#: src/trg-general-panel.c:316 src/trg-torrent-tree-view.c:139
+#: src/trg-general-panel.c:314 src/trg-torrent-tree-view.c:139
 msgid "Location"
 msgstr "Ubicación"
 
@@ -303,190 +303,190 @@ msgstr "Este torrent ha sido completado."
 msgid "This torrent has been added."
 msgstr "Este torrent ha sido añadido."
 
-#: src/trg-main-window.c:596
+#: src/trg-main-window.c:600
 msgid "No hostname set"
 msgstr "No se ha configurado un servidor"
 
-#: src/trg-main-window.c:599
+#: src/trg-main-window.c:603
 msgid "Unknown error getting settings"
 msgstr "Error desconocido mientras se obtenía la configuración"
 
-#: src/trg-main-window.c:614
+#: src/trg-main-window.c:623
 msgid "Connecting..."
 msgstr "Conectando…"
 
-#: src/trg-main-window.c:873
+#: src/trg-main-window.c:882
 #, c-format
 msgid "<big><b>Remove torrent \"%s\"?</b></big>"
 msgstr "<big><b>¿Quitar el torrent «%s»?</b></big>"
 
-#: src/trg-main-window.c:874
+#: src/trg-main-window.c:883
 #, c-format
 msgid "<big><b>Remove %d torrents?</b></big>"
 msgstr "<big><b>¿Quitar %d torrents?</b></big>"
 
-#: src/trg-main-window.c:896
+#: src/trg-main-window.c:905
 #, c-format
 msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
 msgstr "<big><b>¿Quitar y eliminar el torrent «%s»?</b></big>"
 
-#: src/trg-main-window.c:898
+#: src/trg-main-window.c:907
 #, c-format
 msgid "<big><b>Remove and delete %d torrents?</b></big>"
 msgstr "<big><b>¿Quitar y eliminar %d torrents?</b></big>"
 
-#: src/trg-main-window.c:981 src/trg-preferences-dialog.c:897
+#: src/trg-main-window.c:990 src/trg-preferences-dialog.c:899
 #: src/trg-remote-prefs-dialog.c:693
 msgid "General"
 msgstr "General"
 
-#: src/trg-main-window.c:990 src/trg-torrent-props-dialog.c:622
+#: src/trg-main-window.c:999 src/trg-torrent-props-dialog.c:613
 msgid "Trackers"
 msgstr "Rastreadores"
 
-#: src/trg-main-window.c:998 src/trg-torrent-props-dialog.c:591
+#: src/trg-main-window.c:1007 src/trg-torrent-props-dialog.c:582
 msgid "Files"
 msgstr "Archivos"
 
-#: src/trg-main-window.c:1006 src/trg-remote-prefs-dialog.c:399
-#: src/trg-torrent-props-dialog.c:465 src/trg-torrent-props-dialog.c:605
+#: src/trg-main-window.c:1015 src/trg-remote-prefs-dialog.c:399
+#: src/trg-torrent-props-dialog.c:456 src/trg-torrent-props-dialog.c:596
 #: src/trg-trackers-tree-view.c:190
 msgid "Peers"
 msgstr "Pares"
 
-#: src/trg-main-window.c:1089
+#: src/trg-main-window.c:1098
 #, c-format
 msgid "This application supports Transmission %g and later, you have %g."
 msgstr ""
 "Esta aplicación es compatible con Transmission %g y superior, tiene %g."
 
-#: src/trg-main-window.c:1155 src/trg-status-bar.c:74 src/trg-status-bar.c:104
+#: src/trg-main-window.c:1164 src/trg-status-bar.c:74 src/trg-status-bar.c:104
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: src/trg-main-window.c:1200
+#: src/trg-main-window.c:1209
 #, c-format
 msgid "%d Downloading @ %s"
 msgstr "Descargando %d @ %s"
 
-#: src/trg-main-window.c:1207
+#: src/trg-main-window.c:1216
 #, c-format
 msgid "%d Seeding @ %s"
 msgstr "Sirviendo %d @ %s"
 
-#: src/trg-main-window.c:1258
+#: src/trg-main-window.c:1267
 #, c-format
 msgid "Request %d/%d failed: %s"
 msgstr "Petición %d/%d fallida: %s"
 
-#: src/trg-main-window.c:2055
+#: src/trg-main-window.c:2069
 msgid "No Limit"
 msgstr "Sin límites"
 
-#: src/trg-main-window.c:2156 src/trg-menu-bar.c:675 src/trg-toolbar.c:223
+#: src/trg-main-window.c:2170 src/trg-menu-bar.c:675 src/trg-toolbar.c:224
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/trg-main-window.c:2159 src/trg-toolbar.c:216
+#: src/trg-main-window.c:2173 src/trg-toolbar.c:217
 msgid "Resume"
 msgstr "Reanudar"
 
-#: src/trg-main-window.c:2162 src/trg-toolbar.c:219
+#: src/trg-main-window.c:2176 src/trg-toolbar.c:220
 msgid "Pause"
 msgstr "Pausar"
 
-#: src/trg-main-window.c:2165
+#: src/trg-main-window.c:2179
 msgid "Verify"
 msgstr "Comprobar"
 
-#: src/trg-main-window.c:2168
+#: src/trg-main-window.c:2182
 msgid "Re-announce"
 msgstr "Anunciar nuevamente"
 
-#: src/trg-main-window.c:2171 src/trg-torrent-move-dialog.c:119
+#: src/trg-main-window.c:2185 src/trg-torrent-move-dialog.c:119
 #: src/trg-torrent-move-dialog.c:126
 msgid "Move"
 msgstr "Mover"
 
-#: src/trg-main-window.c:2174 src/trg-menu-bar.c:706 src/trg-toolbar.c:227
+#: src/trg-main-window.c:2188 src/trg-menu-bar.c:706 src/trg-toolbar.c:228
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/trg-main-window.c:2177
+#: src/trg-main-window.c:2191
 msgid "Remove & Delete"
 msgstr "Quitar y eliminar"
 
-#: src/trg-main-window.c:2201 src/trg-preferences-dialog.c:907
+#: src/trg-main-window.c:2215 src/trg-preferences-dialog.c:909
 msgid "Actions"
 msgstr "Acciones"
 
-#: src/trg-main-window.c:2230 src/trg-menu-bar.c:722
+#: src/trg-main-window.c:2244 src/trg-menu-bar.c:722
 msgid "Start Now"
 msgstr "Iniciar ahora"
 
-#: src/trg-main-window.c:2233 src/trg-menu-bar.c:727
+#: src/trg-main-window.c:2247 src/trg-menu-bar.c:727
 msgid "Move Up Queue"
 msgstr "Subir en la cola"
 
-#: src/trg-main-window.c:2236 src/trg-menu-bar.c:734
+#: src/trg-main-window.c:2250 src/trg-menu-bar.c:734
 msgid "Move Down Queue"
 msgstr "Bajar en la cola"
 
-#: src/trg-main-window.c:2239 src/trg-menu-bar.c:741
+#: src/trg-main-window.c:2253 src/trg-menu-bar.c:741
 msgid "Bottom Of Queue"
 msgstr "Final de la cola"
 
-#: src/trg-main-window.c:2242 src/trg-menu-bar.c:745
+#: src/trg-main-window.c:2256 src/trg-menu-bar.c:745
 msgid "Top Of Queue"
 msgstr "Principio de la cola"
 
-#: src/trg-main-window.c:2251 src/trg-main-window.c:2334
+#: src/trg-main-window.c:2265 src/trg-main-window.c:2348
 msgid "Down Limit"
 msgstr "Límite de descarga"
 
-#: src/trg-main-window.c:2256 src/trg-main-window.c:2338
+#: src/trg-main-window.c:2270 src/trg-main-window.c:2352
 msgid "Up Limit"
 msgstr "Límite de subida"
 
-#: src/trg-main-window.c:2285 src/trg-main-window.c:2292
+#: src/trg-main-window.c:2299 src/trg-main-window.c:2306
 #: src/trg-remote-prefs-dialog.c:497
 msgid "Updating..."
 msgstr "Actualizando…"
 
-#: src/trg-main-window.c:2306 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
+#: src/trg-main-window.c:2320 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/trg-main-window.c:2313 src/trg-toolbar.c:206
+#: src/trg-main-window.c:2327 src/trg-toolbar.c:207
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: src/trg-main-window.c:2317 src/trg-toolbar.c:209
+#: src/trg-main-window.c:2331 src/trg-toolbar.c:210
 #: src/trg-trackers-tree-view.c:284 src/trg-trackers-tree-view.c:311
 msgid "Add"
 msgstr "Añadir"
 
-#: src/trg-main-window.c:2321
+#: src/trg-main-window.c:2335
 msgid "Add from URL"
 msgstr "Añadir desde URL"
 
-#: src/trg-main-window.c:2325
+#: src/trg-main-window.c:2339
 msgid "Resume All"
 msgstr "Reanudar todo"
 
-#: src/trg-main-window.c:2329
+#: src/trg-main-window.c:2343
 msgid "Pause All"
 msgstr "Pausar todo"
 
-#: src/trg-main-window.c:2345
+#: src/trg-main-window.c:2359
 msgid "Quit"
 msgstr "Salir"
 
-#: src/trg-main-window.c:2459 src/trg-menu-bar.c:536
+#: src/trg-main-window.c:2473 src/trg-menu-bar.c:536
 msgid "Graph"
 msgstr "Gráfico"
 
-#: src/trg-main-window.c:2647
+#: src/trg-main-window.c:2662
 msgid "Transmission Remote"
 msgstr "Transmission Remoto"
 
@@ -694,7 +694,7 @@ msgstr "Directorios de descarga remota"
 msgid "Directory"
 msgstr "Directorio"
 
-#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:902
+#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:904
 msgid "View"
 msgstr "Ver"
 
@@ -734,7 +734,7 @@ msgstr "Perfil: "
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:892
+#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:894
 msgid "Connection"
 msgstr "Conexión"
 
@@ -746,35 +746,39 @@ msgstr "Anfitrión:"
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/trg-preferences-dialog.c:817
+#: src/trg-preferences-dialog.c:816
+msgid "RPC URL Path:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:819
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: src/trg-preferences-dialog.c:821
+#: src/trg-preferences-dialog.c:823
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: src/trg-preferences-dialog.c:823
+#: src/trg-preferences-dialog.c:825
 msgid "Automatically connect"
 msgstr "Conectar autómaticamente"
 
-#: src/trg-preferences-dialog.c:829
+#: src/trg-preferences-dialog.c:831
 msgid "SSL"
 msgstr "SSL"
 
-#: src/trg-preferences-dialog.c:836
+#: src/trg-preferences-dialog.c:838
 msgid "Timeout:"
 msgstr "Tiempo de espera:"
 
-#: src/trg-preferences-dialog.c:840
+#: src/trg-preferences-dialog.c:842
 msgid "Retries:"
 msgstr "Reintentos:"
 
-#: src/trg-preferences-dialog.c:881 src/trg-toolbar.c:238
+#: src/trg-preferences-dialog.c:883 src/trg-toolbar.c:239
 msgid "Local Preferences"
 msgstr "Preferencias locales"
 
-#: src/trg-preferences-dialog.c:912
+#: src/trg-preferences-dialog.c:914
 msgid "Directories"
 msgstr "Directorios"
 
@@ -966,15 +970,15 @@ msgstr "Eliminar los archivos de torrent originales"
 msgid "Start added torrents"
 msgstr "Iniciar torrents añadidos"
 
-#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:242
+#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:243
 msgid "Remote Preferences"
 msgstr "Preferencias remotas"
 
-#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:409
+#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:400
 msgid "Bandwidth"
 msgstr "Ancho de banda"
 
-#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:636
+#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:627
 msgid "Limits"
 msgstr "Límites"
 
@@ -1074,7 +1078,7 @@ msgstr " (Límite: %s)"
 msgid "Down: %s%s, Up: %s%s"
 msgstr "Descarga: %s%s, Subida: %s%s"
 
-#: src/trg-toolbar.c:231
+#: src/trg-toolbar.c:232
 msgid "Remove with data"
 msgstr "Quitar con datos"
 
@@ -1171,7 +1175,7 @@ msgstr "Total de descarga"
 msgid "Default"
 msgstr "Predeterminado"
 
-#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:260
+#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:251
 msgid "Location:"
 msgstr "Ubicación:"
 
@@ -1185,142 +1189,142 @@ msgstr "Mover %s"
 msgid "Move %d torrents"
 msgstr "Mover %d torrents"
 
-#: src/trg-torrent-props-dialog.c:206
+#: src/trg-torrent-props-dialog.c:197
 msgid "Activity"
 msgstr "Actividad"
 
-#: src/trg-torrent-props-dialog.c:211
+#: src/trg-torrent-props-dialog.c:202
 msgid "Torrent size:"
 msgstr "Tamaño del torrent:"
 
-#: src/trg-torrent-props-dialog.c:216
+#: src/trg-torrent-props-dialog.c:207
 msgid "Have:"
 msgstr "Tengo:"
 
-#: src/trg-torrent-props-dialog.c:221
+#: src/trg-torrent-props-dialog.c:212
 msgid "Downloaded:"
 msgstr "Descargado:"
 
-#: src/trg-torrent-props-dialog.c:226
+#: src/trg-torrent-props-dialog.c:217
 msgid "Uploaded:"
 msgstr "Subido:"
 
-#: src/trg-torrent-props-dialog.c:231
+#: src/trg-torrent-props-dialog.c:222
 msgid "State:"
 msgstr "Estado:"
 
-#: src/trg-torrent-props-dialog.c:236
+#: src/trg-torrent-props-dialog.c:227
 msgid "Running time:"
 msgstr "Tiempo ejecutándose:"
 
-#: src/trg-torrent-props-dialog.c:241
+#: src/trg-torrent-props-dialog.c:232
 msgid "Remaining time:"
 msgstr "Tiempo restante:"
 
-#: src/trg-torrent-props-dialog.c:246
+#: src/trg-torrent-props-dialog.c:237
 msgid "Last activity:"
 msgstr "Última actividad:"
 
-#: src/trg-torrent-props-dialog.c:251
+#: src/trg-torrent-props-dialog.c:242
 msgid "Error:"
 msgstr "Error:"
 
-#: src/trg-torrent-props-dialog.c:255
+#: src/trg-torrent-props-dialog.c:246
 msgid "Details"
 msgstr "Detalles"
 
-#: src/trg-torrent-props-dialog.c:266
+#: src/trg-torrent-props-dialog.c:257
 msgid "Hash:"
 msgstr "Hash"
 
-#: src/trg-torrent-props-dialog.c:272
+#: src/trg-torrent-props-dialog.c:263
 msgid "Privacy:"
 msgstr "Privacidad:"
 
-#: src/trg-torrent-props-dialog.c:278
+#: src/trg-torrent-props-dialog.c:269
 msgid "Origin:"
 msgstr "Origen:"
 
-#: src/trg-torrent-props-dialog.c:295
+#: src/trg-torrent-props-dialog.c:286
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: src/trg-torrent-props-dialog.c:330
+#: src/trg-torrent-props-dialog.c:321
 msgid "Private to this tracker -- DHT and PEX disabled"
-msgstr "Privado para este tracker -- DHT y PEX deshabilitados"
+msgstr "Privado para este rastreador, DHT y PEX desactivados"
 
-#: src/trg-torrent-props-dialog.c:332
+#: src/trg-torrent-props-dialog.c:323
 msgid "Public torrent"
 msgstr "Torrent público"
 
-#: src/trg-torrent-props-dialog.c:342
+#: src/trg-torrent-props-dialog.c:333
 #, c-format
 msgid "Created on %1$s"
 msgstr "Creado el %1$s"
 
-#: src/trg-torrent-props-dialog.c:344
+#: src/trg-torrent-props-dialog.c:335
 #, c-format
 msgid "Created by %1$s on %2$s"
 msgstr "Creado por %1$s el %2$s"
 
-#: src/trg-torrent-props-dialog.c:376
+#: src/trg-torrent-props-dialog.c:367
 msgid "No errors"
 msgstr "Sin errores"
 
-#: src/trg-torrent-props-dialog.c:380
+#: src/trg-torrent-props-dialog.c:371
 msgid "Active now"
 msgstr "Activar ahora"
 
-#: src/trg-torrent-props-dialog.c:413
+#: src/trg-torrent-props-dialog.c:404
 msgid "Honor global limits"
 msgstr "Respetar límites globales"
 
-#: src/trg-torrent-props-dialog.c:423
+#: src/trg-torrent-props-dialog.c:414
 msgid "Torrent priority:"
 msgstr "Prioridad del torrent:"
 
-#: src/trg-torrent-props-dialog.c:429
+#: src/trg-torrent-props-dialog.c:420
 msgid "Queue Position:"
 msgstr "Posición en la cola:"
 
-#: src/trg-torrent-props-dialog.c:434
+#: src/trg-torrent-props-dialog.c:425
 msgid "Limit download speed (KiB/s)"
 msgstr "Limitar velocidad de descarga (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:442
+#: src/trg-torrent-props-dialog.c:433
 msgid "Limit upload speed (KiB/s)"
 msgstr "Limitar velocidad de subida (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:450
+#: src/trg-torrent-props-dialog.c:441
 msgid "Use global settings"
 msgstr "Usar la configuración global"
 
-#: src/trg-torrent-props-dialog.c:451
+#: src/trg-torrent-props-dialog.c:442
 msgid "Stop seeding at ratio"
 msgstr "Dejar de servir al llegar a la proporción"
 
-#: src/trg-torrent-props-dialog.c:452
+#: src/trg-torrent-props-dialog.c:443
 msgid "Seed regardless of ratio"
 msgstr "Servir sin importar la proporción"
 
-#: src/trg-torrent-props-dialog.c:455
+#: src/trg-torrent-props-dialog.c:446
 msgid "Seed ratio mode:"
 msgstr "Modo de proporción de subida:"
 
-#: src/trg-torrent-props-dialog.c:463
+#: src/trg-torrent-props-dialog.c:454
 msgid "Seed ratio limit:"
 msgstr "Límite de proporción de servicio:"
 
-#: src/trg-torrent-props-dialog.c:469
+#: src/trg-torrent-props-dialog.c:460
 msgid "Peer limit:"
 msgstr "Límite de pares:"
 
-#: src/trg-torrent-props-dialog.c:542
+#: src/trg-torrent-props-dialog.c:533
 #, c-format
 msgid "Multiple (%d) torrent properties"
 msgstr "Propiedades de torrents múltiples (%d)"
 
-#: src/trg-torrent-props-dialog.c:574
+#: src/trg-torrent-props-dialog.c:565
 msgid "Information"
 msgstr "Informacio�n"
 
@@ -1440,45 +1444,45 @@ msgstr "Ascendente"
 msgid "Descending"
 msgstr "Descendente"
 
-#: src/util.c:340
+#: src/util.c:342
 msgid "JSON decoding error."
 msgstr "Error de codificado JSON"
 
-#: src/util.c:345
+#: src/util.c:347
 msgid "Server responded, but with no result."
 msgstr "El servidor respondió, pero la respuesta está vacía."
 
-#: src/util.c:349
+#: src/util.c:351
 #, c-format
 msgid "Request failed with HTTP code %d"
 msgstr "La petición falló con error de HTTP número %d"
 
-#: src/util.c:383
+#: src/util.c:385
 msgid "None"
 msgstr "Ninguno"
 
-#: src/util.c:429
+#: src/util.c:431
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"
 
-#: src/util.c:430
+#: src/util.c:432
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/util.c:432
+#: src/util.c:434
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/util.c:435
+#: src/util.c:437
 #, c-format
 msgid "%ld second"
 msgid_plural "%ld seconds"
diff --git a/po/fr.po b/po/fr.po
index 990fa94..b044e96 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,16 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: transmission-remote-gtk\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-09-05 22:09+0100\n"
-"PO-Revision-Date: 2013-03-21 20:08+0000\n"
-"Last-Translator: Guiroux Hugo <gx.hugo@gmail.com>\n"
+"POT-Creation-Date: 2013-06-09 23:41+0100\n"
+"PO-Revision-Date: 2016-05-09 19:34+0200\n"
+"Last-Translator: Thibaut Selingue <thibaut.selingue@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2013-06-09 22:28+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2014-06-12 07:44+0000\n"
+"X-Generator: Poedit 1.8.7.1\n"
+"Language: fr\n"
 
 #: src/torrent.c:360 src/torrent.c:380
 msgid "Metadata Downloading"
@@ -43,7 +44,7 @@ msgid "Queued seed"
 msgstr "Envoi en attente"
 
 #: src/torrent.c:372 src/torrent.c:386 src/trg-remote-prefs-dialog.c:360
-#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:447
+#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:438
 msgid "Seeding"
 msgstr "Envoi"
 
@@ -135,37 +136,38 @@ msgstr "Ratio %s"
 msgid "Downloading from %1$li of %2$li connected peer"
 msgid_plural "Downloading from %1$li of %2$li connected peers"
 msgstr[0] "Téléchargement depuis %1$li sur %2$li pair connecté"
+msgstr[1] "Téléchargement depuis %1$li sur %2$li pairs connectés"
 
 #: src/torrent-cell-renderer.c:340
 #, c-format
 msgid "Downloading metadata from %1$li peer (%2$s done)"
 msgid_plural "Downloading metadata from %1$li peers (%2$s done)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Téléchargement des métadonnées depuis %1$li pair (%2$s terminé)"
+msgstr[1] "Téléchargement des métadonnées depuis %1$li pairs (%2$s terminé)"
 
 #: src/torrent-cell-renderer.c:351
 #, c-format
 msgid "Seeding to %1$li of %2$li connected peer"
 msgid_plural "Seeding to %1$li of %2$li connected peers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Envoi à %1$li sur %2$li pair connecté"
+msgstr[1] "Envoi à %1$li sur %2$li pairs connectés"
 
 #: src/trg-about-window.c:74
 msgid "A remote client to transmission-daemon."
 msgstr "Un client distant pour transmission-daemon"
 
-#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2011
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:416
+#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2025
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:407
 msgid "Low"
 msgstr "Bas"
 
-#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2007
-#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:418
+#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2021
+#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:409
 msgid "High"
 msgstr "Haut"
 
-#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2009
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:417
+#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2023
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:408
 msgid "Normal"
 msgstr "Normal"
 
@@ -173,12 +175,12 @@ msgstr "Normal"
 msgid "Mixed"
 msgstr "Mixte"
 
-#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:280
+#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:278
 #: src/trg-torrent-add-dialog.c:348 src/trg-torrent-tree-view.c:52
 msgid "Name"
 msgstr "Nom"
 
-#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:283
+#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:281
 #: src/trg-torrent-add-dialog.c:366 src/trg-torrent-tree-view.c:57
 msgid "Size"
 msgstr "Taille"
@@ -192,7 +194,7 @@ msgstr "Progression"
 msgid "Download"
 msgstr "Télécharger"
 
-#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2000
+#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2014
 #: src/trg-torrent-add-dialog.c:395 src/trg-torrent-tree-view.c:145
 msgid "Priority"
 msgstr "Priorité"
@@ -221,7 +223,7 @@ msgstr "Tout afficher"
 msgid "Collapse All"
 msgstr "Tout réduire"
 
-#: src/trg-general-panel.c:153 src/trg-general-panel.c:214
+#: src/trg-general-panel.c:153 src/trg-general-panel.c:212
 msgid "N/A"
 msgstr "N/D"
 
@@ -233,256 +235,256 @@ msgstr "(Privé)"
 msgid "(Public)"
 msgstr "(Public)"
 
-#: src/trg-general-panel.c:202 src/trg-main-window.c:1097
-#: src/trg-main-window.c:1505 src/trg-main-window.c:2135
+#: src/trg-general-panel.c:200 src/trg-main-window.c:1106
+#: src/trg-main-window.c:1519 src/trg-main-window.c:2149
 #: src/trg-state-selector.c:538 src/trg-torrent-add-url-dialog.c:67
-#: src/util.c:331
+#: src/util.c:333
 msgid "Error"
 msgstr "Erreur"
 
-#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:123
+#: src/trg-general-panel.c:283 src/trg-torrent-tree-view.c:123
 msgid "ETA"
 msgstr "Durée restante estimée"
 
-#: src/trg-general-panel.c:287 src/trg-torrent-tree-view.c:151
+#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:151
 msgid "Completed"
 msgstr "Terminé"
 
-#: src/trg-general-panel.c:290
+#: src/trg-general-panel.c:288
 msgid "Seeders"
 msgstr "Sources"
 
-#: src/trg-general-panel.c:292
+#: src/trg-general-panel.c:290
 msgid "Rate Down"
 msgstr "Vitesse de téléchargement"
 
-#: src/trg-general-panel.c:294 src/trg-torrent-tree-view.c:128
+#: src/trg-general-panel.c:292 src/trg-torrent-tree-view.c:128
 msgid "Downloaded"
 msgstr "Téléchargé"
 
-#: src/trg-general-panel.c:297 src/trg-torrent-tree-view.c:70
+#: src/trg-general-panel.c:295 src/trg-torrent-tree-view.c:70
 msgid "Leechers"
 msgstr "Téléchargeurs"
 
-#: src/trg-general-panel.c:299
+#: src/trg-general-panel.c:297
 msgid "Rate Up"
 msgstr "Vitesse d'envoi"
 
-#: src/trg-general-panel.c:301 src/trg-torrent-tree-view.c:125
+#: src/trg-general-panel.c:299 src/trg-torrent-tree-view.c:125
 msgid "Uploaded"
 msgstr "Envoyé"
 
-#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:63
+#: src/trg-general-panel.c:302 src/trg-torrent-tree-view.c:63
 msgid "Status"
 msgstr "État"
 
-#: src/trg-general-panel.c:306 src/trg-torrent-tree-view.c:131
+#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:131
 msgid "Ratio"
 msgstr "Ratio"
 
-#: src/trg-general-panel.c:309
+#: src/trg-general-panel.c:307
 msgid "Comment"
 msgstr "Commentaire"
 
-#: src/trg-general-panel.c:312
+#: src/trg-general-panel.c:310
 msgid "Completed At"
-msgstr ""
+msgstr "Terminé à"
 
-#: src/trg-general-panel.c:316 src/trg-torrent-tree-view.c:139
+#: src/trg-general-panel.c:314 src/trg-torrent-tree-view.c:139
 msgid "Location"
 msgstr "Emplacement"
 
 #: src/trg-main-window.c:363
 msgid "This torrent has completed."
-msgstr "The torrent est terminé."
+msgstr "Ce torrent est terminé."
 
 #: src/trg-main-window.c:375
 msgid "This torrent has been added."
 msgstr "Ce torrent a été ajouté."
 
-#: src/trg-main-window.c:596
+#: src/trg-main-window.c:600
 msgid "No hostname set"
 msgstr "Aucun nom d'hôte défini"
 
-#: src/trg-main-window.c:599
+#: src/trg-main-window.c:603
 msgid "Unknown error getting settings"
 msgstr "Erreur inconnue lors de l'obtention des paramètres"
 
-#: src/trg-main-window.c:614
+#: src/trg-main-window.c:623
 msgid "Connecting..."
 msgstr "Connexion…"
 
-#: src/trg-main-window.c:873
+#: src/trg-main-window.c:882
 #, c-format
 msgid "<big><b>Remove torrent \"%s\"?</b></big>"
 msgstr "<big><b>Retirer le torrent \"%s\" ?</b></big>"
 
-#: src/trg-main-window.c:874
+#: src/trg-main-window.c:883
 #, c-format
 msgid "<big><b>Remove %d torrents?</b></big>"
 msgstr "<big><b>Retirer %d torrents ?</b></big>"
 
-#: src/trg-main-window.c:896
+#: src/trg-main-window.c:905
 #, c-format
 msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
 msgstr "<big><b>Retirer et supprimer le torrent \"%s\" ?</b></big>"
 
-#: src/trg-main-window.c:898
+#: src/trg-main-window.c:907
 #, c-format
 msgid "<big><b>Remove and delete %d torrents?</b></big>"
 msgstr "<big><b>Retirer et supprimer %d torrents ?</b></big>"
 
-#: src/trg-main-window.c:981 src/trg-preferences-dialog.c:897
+#: src/trg-main-window.c:990 src/trg-preferences-dialog.c:899
 #: src/trg-remote-prefs-dialog.c:693
 msgid "General"
 msgstr "Général"
 
-#: src/trg-main-window.c:990 src/trg-torrent-props-dialog.c:622
+#: src/trg-main-window.c:999 src/trg-torrent-props-dialog.c:613
 msgid "Trackers"
 msgstr "Traqueurs"
 
-#: src/trg-main-window.c:998 src/trg-torrent-props-dialog.c:591
+#: src/trg-main-window.c:1007 src/trg-torrent-props-dialog.c:582
 msgid "Files"
 msgstr "Fichiers"
 
-#: src/trg-main-window.c:1006 src/trg-remote-prefs-dialog.c:399
-#: src/trg-torrent-props-dialog.c:465 src/trg-torrent-props-dialog.c:605
+#: src/trg-main-window.c:1015 src/trg-remote-prefs-dialog.c:399
+#: src/trg-torrent-props-dialog.c:456 src/trg-torrent-props-dialog.c:596
 #: src/trg-trackers-tree-view.c:190
 msgid "Peers"
 msgstr "Pairs"
 
-#: src/trg-main-window.c:1089
+#: src/trg-main-window.c:1098
 #, c-format
 msgid "This application supports Transmission %g and later, you have %g."
-msgstr ""
+msgstr "Cette application supporte Transmission %g et ultérieur, vous avez %g."
 
-#: src/trg-main-window.c:1155 src/trg-status-bar.c:74 src/trg-status-bar.c:104
+#: src/trg-main-window.c:1164 src/trg-status-bar.c:74 src/trg-status-bar.c:104
 msgid "Disconnected"
 msgstr "Déconnecté"
 
-#: src/trg-main-window.c:1200
+#: src/trg-main-window.c:1209
 #, c-format
 msgid "%d Downloading @ %s"
-msgstr "%d Tékéchargement @ %s"
+msgstr "%d Téléchargement @ %s"
 
-#: src/trg-main-window.c:1207
+#: src/trg-main-window.c:1216
 #, c-format
 msgid "%d Seeding @ %s"
 msgstr "%d Envoi @ %s"
 
-#: src/trg-main-window.c:1258
+#: src/trg-main-window.c:1267
 #, c-format
 msgid "Request %d/%d failed: %s"
 msgstr "Échec de la requête %d/%d : %s"
 
-#: src/trg-main-window.c:2055
+#: src/trg-main-window.c:2069
 msgid "No Limit"
 msgstr "Pas de limite"
 
-#: src/trg-main-window.c:2156 src/trg-menu-bar.c:675 src/trg-toolbar.c:223
+#: src/trg-main-window.c:2170 src/trg-menu-bar.c:675 src/trg-toolbar.c:224
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/trg-main-window.c:2159 src/trg-toolbar.c:216
+#: src/trg-main-window.c:2173 src/trg-toolbar.c:217
 msgid "Resume"
 msgstr "Reprendre"
 
-#: src/trg-main-window.c:2162 src/trg-toolbar.c:219
+#: src/trg-main-window.c:2176 src/trg-toolbar.c:220
 msgid "Pause"
 msgstr "Pause"
 
-#: src/trg-main-window.c:2165
+#: src/trg-main-window.c:2179
 msgid "Verify"
 msgstr "Vérifier"
 
-#: src/trg-main-window.c:2168
+#: src/trg-main-window.c:2182
 msgid "Re-announce"
 msgstr "Annoncer de nouveau"
 
-#: src/trg-main-window.c:2171 src/trg-torrent-move-dialog.c:119
+#: src/trg-main-window.c:2185 src/trg-torrent-move-dialog.c:119
 #: src/trg-torrent-move-dialog.c:126
 msgid "Move"
 msgstr "Déplacer"
 
-#: src/trg-main-window.c:2174 src/trg-menu-bar.c:706 src/trg-toolbar.c:227
+#: src/trg-main-window.c:2188 src/trg-menu-bar.c:706 src/trg-toolbar.c:228
 msgid "Remove"
 msgstr "Retirer"
 
-#: src/trg-main-window.c:2177
+#: src/trg-main-window.c:2191
 msgid "Remove & Delete"
 msgstr "Retirer et supprimer"
 
-#: src/trg-main-window.c:2201 src/trg-preferences-dialog.c:907
+#: src/trg-main-window.c:2215 src/trg-preferences-dialog.c:909
 msgid "Actions"
 msgstr "Actions"
 
-#: src/trg-main-window.c:2230 src/trg-menu-bar.c:722
+#: src/trg-main-window.c:2244 src/trg-menu-bar.c:722
 msgid "Start Now"
 msgstr "Démarrer"
 
-#: src/trg-main-window.c:2233 src/trg-menu-bar.c:727
+#: src/trg-main-window.c:2247 src/trg-menu-bar.c:727
 msgid "Move Up Queue"
 msgstr "Monter dans la file d'attente"
 
-#: src/trg-main-window.c:2236 src/trg-menu-bar.c:734
+#: src/trg-main-window.c:2250 src/trg-menu-bar.c:734
 msgid "Move Down Queue"
 msgstr "Descendre dans la file d'attente"
 
-#: src/trg-main-window.c:2239 src/trg-menu-bar.c:741
+#: src/trg-main-window.c:2253 src/trg-menu-bar.c:741
 msgid "Bottom Of Queue"
 msgstr "Bas de la file d'attente"
 
-#: src/trg-main-window.c:2242 src/trg-menu-bar.c:745
+#: src/trg-main-window.c:2256 src/trg-menu-bar.c:745
 msgid "Top Of Queue"
 msgstr "Haut de la file d'attente"
 
-#: src/trg-main-window.c:2251 src/trg-main-window.c:2334
+#: src/trg-main-window.c:2265 src/trg-main-window.c:2348
 msgid "Down Limit"
 msgstr "Limite de réception"
 
-#: src/trg-main-window.c:2256 src/trg-main-window.c:2338
+#: src/trg-main-window.c:2270 src/trg-main-window.c:2352
 msgid "Up Limit"
 msgstr "Limite d'envoi"
 
-#: src/trg-main-window.c:2285 src/trg-main-window.c:2292
+#: src/trg-main-window.c:2299 src/trg-main-window.c:2306
 #: src/trg-remote-prefs-dialog.c:497
 msgid "Updating..."
 msgstr "Mise à jour..."
 
-#: src/trg-main-window.c:2306 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
+#: src/trg-main-window.c:2320 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
 msgid "Connect"
 msgstr "Se connecter"
 
-#: src/trg-main-window.c:2313 src/trg-toolbar.c:206
+#: src/trg-main-window.c:2327 src/trg-toolbar.c:207
 msgid "Disconnect"
 msgstr "Se déconnecter"
 
-#: src/trg-main-window.c:2317 src/trg-toolbar.c:209
+#: src/trg-main-window.c:2331 src/trg-toolbar.c:210
 #: src/trg-trackers-tree-view.c:284 src/trg-trackers-tree-view.c:311
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/trg-main-window.c:2321
+#: src/trg-main-window.c:2335
 msgid "Add from URL"
 msgstr "Ajouter à partir d'une URL"
 
-#: src/trg-main-window.c:2325
+#: src/trg-main-window.c:2339
 msgid "Resume All"
 msgstr "Tout reprendre"
 
-#: src/trg-main-window.c:2329
+#: src/trg-main-window.c:2343
 msgid "Pause All"
 msgstr "Tout mettre en pause"
 
-#: src/trg-main-window.c:2345
+#: src/trg-main-window.c:2359
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/trg-main-window.c:2459 src/trg-menu-bar.c:536
+#: src/trg-main-window.c:2473 src/trg-menu-bar.c:536
 msgid "Graph"
 msgstr "Graphique"
 
-#: src/trg-main-window.c:2647
+#: src/trg-main-window.c:2662
 msgid "Transmission Remote"
 msgstr "Transmission Remote"
 
@@ -492,15 +494,15 @@ msgstr "_Affichage"
 
 #: src/trg-menu-bar.c:473
 msgid "Transmission Style"
-msgstr ""
+msgstr "Style Transmission"
 
 #: src/trg-menu-bar.c:483
 msgid "Transmission Compact Style"
-msgstr ""
+msgstr "Style Transmission Compact"
 
 #: src/trg-menu-bar.c:493
 msgid "Classic Style"
-msgstr ""
+msgstr "Style Classique"
 
 #: src/trg-menu-bar.c:499
 msgid "Sort"
@@ -648,11 +650,11 @@ msgstr "Intervalle de mise à jour :"
 
 #: src/trg-preferences-dialog.c:428
 msgid "Minimised update interval:"
-msgstr "Intervalle de mise à jour minimal"
+msgstr "Interval de mise à jour minimal"
 
 #: src/trg-preferences-dialog.c:433
 msgid "Session update interval:"
-msgstr ""
+msgstr "Interval de mise à jour de session:"
 
 #: src/trg-preferences-dialog.c:435
 msgid "Torrents"
@@ -690,7 +692,7 @@ msgstr "Répertoires de téléchargement distants"
 msgid "Directory"
 msgstr "Répertoire"
 
-#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:902
+#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:904
 msgid "View"
 msgstr "Affichage"
 
@@ -730,7 +732,7 @@ msgstr "Profil : "
 msgid "Name:"
 msgstr "Nom :"
 
-#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:892
+#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:894
 msgid "Connection"
 msgstr "Connexion"
 
@@ -742,35 +744,39 @@ msgstr "Hôte :"
 msgid "Port:"
 msgstr "Port :"
 
-#: src/trg-preferences-dialog.c:817
+#: src/trg-preferences-dialog.c:816
+msgid "RPC URL Path:"
+msgstr "Chemin RPC URL :"
+
+#: src/trg-preferences-dialog.c:819
 msgid "Username:"
 msgstr "Nom d'utilisateur :"
 
-#: src/trg-preferences-dialog.c:821
+#: src/trg-preferences-dialog.c:823
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: src/trg-preferences-dialog.c:823
+#: src/trg-preferences-dialog.c:825
 msgid "Automatically connect"
 msgstr "Se connecter automatiquement"
 
-#: src/trg-preferences-dialog.c:829
+#: src/trg-preferences-dialog.c:831
 msgid "SSL"
 msgstr "SSL"
 
-#: src/trg-preferences-dialog.c:836
+#: src/trg-preferences-dialog.c:838
 msgid "Timeout:"
 msgstr "Délai :"
 
-#: src/trg-preferences-dialog.c:840
+#: src/trg-preferences-dialog.c:842
 msgid "Retries:"
 msgstr "Réessayer :"
 
-#: src/trg-preferences-dialog.c:881 src/trg-toolbar.c:238
+#: src/trg-preferences-dialog.c:883 src/trg-toolbar.c:239
 msgid "Local Preferences"
 msgstr "Préférences locales"
 
-#: src/trg-preferences-dialog.c:912
+#: src/trg-preferences-dialog.c:914
 msgid "Directories"
 msgstr "Répertoires"
 
@@ -960,15 +966,15 @@ msgstr "Mettre le fichier torrent original à la corbeille"
 msgid "Start added torrents"
 msgstr "Démarrer les torrents ajoutés"
 
-#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:242
+#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:243
 msgid "Remote Preferences"
 msgstr "Préférences distantes"
 
-#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:409
+#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:400
 msgid "Bandwidth"
 msgstr "Bande passante"
 
-#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:636
+#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:627
 msgid "Limits"
 msgstr "Limites"
 
@@ -1068,7 +1074,7 @@ msgstr " (Limite : %s)"
 msgid "Down: %s%s, Up: %s%s"
 msgstr "Téléchargement : %s%s, Envoi : %s%s"
 
-#: src/trg-toolbar.c:231
+#: src/trg-toolbar.c:232
 msgid "Remove with data"
 msgstr "Supprimer les fichiers et enlever"
 
@@ -1123,7 +1129,7 @@ msgstr "Dossier de _destination :"
 
 #: src/trg-torrent-add-dialog.c:815
 msgid "Apply to all:"
-msgstr ""
+msgstr "Appliquer à tout :"
 
 #: src/trg-torrent-add-dialog.c:825
 msgid "Torrent _priority:"
@@ -1166,7 +1172,7 @@ msgstr "Téléchargement total"
 msgid "Default"
 msgstr "Par défaut"
 
-#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:260
+#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:251
 msgid "Location:"
 msgstr "Emplacement :"
 
@@ -1180,142 +1186,142 @@ msgstr "Déplacer %s"
 msgid "Move %d torrents"
 msgstr "Déplacer %d torrents"
 
-#: src/trg-torrent-props-dialog.c:206
+#: src/trg-torrent-props-dialog.c:197
 msgid "Activity"
 msgstr "Activité"
 
-#: src/trg-torrent-props-dialog.c:211
+#: src/trg-torrent-props-dialog.c:202
 msgid "Torrent size:"
 msgstr "Taille du torrent :"
 
-#: src/trg-torrent-props-dialog.c:216
+#: src/trg-torrent-props-dialog.c:207
 msgid "Have:"
 msgstr "Obtenu :"
 
-#: src/trg-torrent-props-dialog.c:221
+#: src/trg-torrent-props-dialog.c:212
 msgid "Downloaded:"
 msgstr "Téléchargé :"
 
-#: src/trg-torrent-props-dialog.c:226
+#: src/trg-torrent-props-dialog.c:217
 msgid "Uploaded:"
 msgstr "Envoyé :"
 
-#: src/trg-torrent-props-dialog.c:231
+#: src/trg-torrent-props-dialog.c:222
 msgid "State:"
 msgstr "État :"
 
-#: src/trg-torrent-props-dialog.c:236
+#: src/trg-torrent-props-dialog.c:227
 msgid "Running time:"
 msgstr "Temps d'exécution :"
 
-#: src/trg-torrent-props-dialog.c:241
+#: src/trg-torrent-props-dialog.c:232
 msgid "Remaining time:"
 msgstr "Temps restant :"
 
-#: src/trg-torrent-props-dialog.c:246
+#: src/trg-torrent-props-dialog.c:237
 msgid "Last activity:"
 msgstr "Dernière activité :"
 
-#: src/trg-torrent-props-dialog.c:251
+#: src/trg-torrent-props-dialog.c:242
 msgid "Error:"
 msgstr "Erreur :"
 
-#: src/trg-torrent-props-dialog.c:255
+#: src/trg-torrent-props-dialog.c:246
 msgid "Details"
 msgstr "Détails"
 
-#: src/trg-torrent-props-dialog.c:266
+#: src/trg-torrent-props-dialog.c:257
 msgid "Hash:"
 msgstr "Hachage :"
 
-#: src/trg-torrent-props-dialog.c:272
+#: src/trg-torrent-props-dialog.c:263
 msgid "Privacy:"
 msgstr "Confidentialité :"
 
-#: src/trg-torrent-props-dialog.c:278
+#: src/trg-torrent-props-dialog.c:269
 msgid "Origin:"
 msgstr "Origine :"
 
-#: src/trg-torrent-props-dialog.c:295
+#: src/trg-torrent-props-dialog.c:286
 msgid "Comment:"
 msgstr "Commentaire :"
 
-#: src/trg-torrent-props-dialog.c:330
+#: src/trg-torrent-props-dialog.c:321
 msgid "Private to this tracker -- DHT and PEX disabled"
 msgstr "Restreint à ce traqueur -- DHT et PEX désactivés"
 
-#: src/trg-torrent-props-dialog.c:332
+#: src/trg-torrent-props-dialog.c:323
 msgid "Public torrent"
 msgstr "Torrent public"
 
-#: src/trg-torrent-props-dialog.c:342
+#: src/trg-torrent-props-dialog.c:333
 #, c-format
 msgid "Created on %1$s"
 msgstr "Créé le %1$s"
 
-#: src/trg-torrent-props-dialog.c:344
+#: src/trg-torrent-props-dialog.c:335
 #, c-format
 msgid "Created by %1$s on %2$s"
 msgstr "Créé par %1$s le %2$s"
 
-#: src/trg-torrent-props-dialog.c:376
+#: src/trg-torrent-props-dialog.c:367
 msgid "No errors"
 msgstr "Aucune erreur"
 
-#: src/trg-torrent-props-dialog.c:380
+#: src/trg-torrent-props-dialog.c:371
 msgid "Active now"
 msgstr "Actif actuellement"
 
-#: src/trg-torrent-props-dialog.c:413
+#: src/trg-torrent-props-dialog.c:404
 msgid "Honor global limits"
 msgstr "Honorer les limites globales"
 
-#: src/trg-torrent-props-dialog.c:423
+#: src/trg-torrent-props-dialog.c:414
 msgid "Torrent priority:"
 msgstr "Priorité du torrent :"
 
-#: src/trg-torrent-props-dialog.c:429
+#: src/trg-torrent-props-dialog.c:420
 msgid "Queue Position:"
 msgstr "Position dans la file d'attente :"
 
-#: src/trg-torrent-props-dialog.c:434
+#: src/trg-torrent-props-dialog.c:425
 msgid "Limit download speed (KiB/s)"
 msgstr "Limiter la vitesse de téléchargement (Kio/s)"
 
-#: src/trg-torrent-props-dialog.c:442
+#: src/trg-torrent-props-dialog.c:433
 msgid "Limit upload speed (KiB/s)"
 msgstr "Limiter la vitesse d'envoi (Kio/s)"
 
-#: src/trg-torrent-props-dialog.c:450
+#: src/trg-torrent-props-dialog.c:441
 msgid "Use global settings"
 msgstr "Utiliser les paramètres globaux"
 
-#: src/trg-torrent-props-dialog.c:451
+#: src/trg-torrent-props-dialog.c:442
 msgid "Stop seeding at ratio"
 msgstr "Arrêter l'envoi au ratio"
 
-#: src/trg-torrent-props-dialog.c:452
+#: src/trg-torrent-props-dialog.c:443
 msgid "Seed regardless of ratio"
 msgstr "Partager quel que soit le ratio"
 
-#: src/trg-torrent-props-dialog.c:455
+#: src/trg-torrent-props-dialog.c:446
 msgid "Seed ratio mode:"
 msgstr "Mode ratio de l'envoi :"
 
-#: src/trg-torrent-props-dialog.c:463
+#: src/trg-torrent-props-dialog.c:454
 msgid "Seed ratio limit:"
 msgstr "Limite de ratio de l'envoi :"
 
-#: src/trg-torrent-props-dialog.c:469
+#: src/trg-torrent-props-dialog.c:460
 msgid "Peer limit:"
 msgstr "Limite de pairs :"
 
-#: src/trg-torrent-props-dialog.c:542
+#: src/trg-torrent-props-dialog.c:533
 #, c-format
 msgid "Multiple (%d) torrent properties"
 msgstr "Propriétés de torrents multiples (%d)"
 
-#: src/trg-torrent-props-dialog.c:574
+#: src/trg-torrent-props-dialog.c:565
 msgid "Information"
 msgstr "Information(s)"
 
@@ -1435,45 +1441,45 @@ msgstr "Croissant"
 msgid "Descending"
 msgstr "Décroissant"
 
-#: src/util.c:340
+#: src/util.c:342
 msgid "JSON decoding error."
 msgstr "Erreur du décodage du JSON"
 
-#: src/util.c:345
+#: src/util.c:347
 msgid "Server responded, but with no result."
 msgstr "Le serveur a répondu mais sans résultat"
 
-#: src/util.c:349
+#: src/util.c:351
 #, c-format
 msgid "Request failed with HTTP code %d"
 msgstr "Echec de la requète avec le code HTTP %d"
 
-#: src/util.c:383
+#: src/util.c:385
 msgid "None"
 msgstr "Aucun"
 
-#: src/util.c:429
+#: src/util.c:431
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
-#: src/util.c:430
+#: src/util.c:432
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: src/util.c:432
+#: src/util.c:434
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: src/util.c:435
+#: src/util.c:437
 #, c-format
 msgid "%ld second"
 msgid_plural "%ld seconds"
diff --git a/po/hu.po b/po/hu.po
index 122d23c..fc6cbb0 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-05 22:09+0100\n"
+"POT-Creation-Date: 2013-06-09 23:41+0100\n"
 "PO-Revision-Date: 2012-10-08 09:59+0000\n"
 "Last-Translator: Dénes Sávoli <savolidenes@gmail.com>\n"
 "Language-Team: Random Team <info@randomteam.hu>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-06-09 22:28+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2014-06-12 07:44+0000\n"
+"X-Generator: Launchpad (build 17045)\n"
 "Language: hu\n"
 
 #: src/torrent.c:360 src/torrent.c:380
@@ -44,7 +44,7 @@ msgid "Queued seed"
 msgstr "Sorban áll feltöltésre"
 
 #: src/torrent.c:372 src/torrent.c:386 src/trg-remote-prefs-dialog.c:360
-#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:447
+#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:438
 msgid "Seeding"
 msgstr "Feltöltés"
 
@@ -156,18 +156,18 @@ msgstr[1] "Feltöltés %1$li peertõl. Összesen %2$li peer"
 msgid "A remote client to transmission-daemon."
 msgstr "Távoli kliens a transmission-daemon-hoz"
 
-#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2011
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:416
+#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2025
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:407
 msgid "Low"
 msgstr "Alacsony"
 
-#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2007
-#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:418
+#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2021
+#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:409
 msgid "High"
 msgstr "Magas"
 
-#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2009
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:417
+#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2023
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:408
 msgid "Normal"
 msgstr "Normál"
 
@@ -175,12 +175,12 @@ msgstr "Normál"
 msgid "Mixed"
 msgstr "Kevert"
 
-#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:280
+#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:278
 #: src/trg-torrent-add-dialog.c:348 src/trg-torrent-tree-view.c:52
 msgid "Name"
 msgstr "Név"
 
-#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:283
+#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:281
 #: src/trg-torrent-add-dialog.c:366 src/trg-torrent-tree-view.c:57
 msgid "Size"
 msgstr "Méret"
@@ -194,7 +194,7 @@ msgstr "Állapot"
 msgid "Download"
 msgstr "Letöltés"
 
-#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2000
+#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2014
 #: src/trg-torrent-add-dialog.c:395 src/trg-torrent-tree-view.c:145
 msgid "Priority"
 msgstr "Prioritás"
@@ -223,7 +223,7 @@ msgstr "Kinyit mindet"
 msgid "Collapse All"
 msgstr "Bezár mindet"
 
-#: src/trg-general-panel.c:153 src/trg-general-panel.c:214
+#: src/trg-general-panel.c:153 src/trg-general-panel.c:212
 msgid "N/A"
 msgstr "N/A"
 
@@ -235,62 +235,62 @@ msgstr "(Privát)"
 msgid "(Public)"
 msgstr "(Publikus)"
 
-#: src/trg-general-panel.c:202 src/trg-main-window.c:1097
-#: src/trg-main-window.c:1505 src/trg-main-window.c:2135
+#: src/trg-general-panel.c:200 src/trg-main-window.c:1106
+#: src/trg-main-window.c:1519 src/trg-main-window.c:2149
 #: src/trg-state-selector.c:538 src/trg-torrent-add-url-dialog.c:67
-#: src/util.c:331
+#: src/util.c:333
 msgid "Error"
 msgstr "Hiba"
 
-#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:123
+#: src/trg-general-panel.c:283 src/trg-torrent-tree-view.c:123
 msgid "ETA"
 msgstr "Hátravan"
 
-#: src/trg-general-panel.c:287 src/trg-torrent-tree-view.c:151
+#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:151
 msgid "Completed"
 msgstr "Befejezett"
 
-#: src/trg-general-panel.c:290
+#: src/trg-general-panel.c:288
 msgid "Seeders"
 msgstr "Feltöltõk"
 
-#: src/trg-general-panel.c:292
+#: src/trg-general-panel.c:290
 msgid "Rate Down"
 msgstr "Letöltési seb."
 
-#: src/trg-general-panel.c:294 src/trg-torrent-tree-view.c:128
+#: src/trg-general-panel.c:292 src/trg-torrent-tree-view.c:128
 msgid "Downloaded"
 msgstr "Letöltött"
 
-#: src/trg-general-panel.c:297 src/trg-torrent-tree-view.c:70
+#: src/trg-general-panel.c:295 src/trg-torrent-tree-view.c:70
 msgid "Leechers"
 msgstr "Letöltõk"
 
-#: src/trg-general-panel.c:299
+#: src/trg-general-panel.c:297
 msgid "Rate Up"
 msgstr "Feltöltési seb."
 
-#: src/trg-general-panel.c:301 src/trg-torrent-tree-view.c:125
+#: src/trg-general-panel.c:299 src/trg-torrent-tree-view.c:125
 msgid "Uploaded"
 msgstr "Feltöltött"
 
-#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:63
+#: src/trg-general-panel.c:302 src/trg-torrent-tree-view.c:63
 msgid "Status"
 msgstr "Státusz"
 
-#: src/trg-general-panel.c:306 src/trg-torrent-tree-view.c:131
+#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:131
 msgid "Ratio"
 msgstr "Arány"
 
-#: src/trg-general-panel.c:309
+#: src/trg-general-panel.c:307
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: src/trg-general-panel.c:312
+#: src/trg-general-panel.c:310
 msgid "Completed At"
 msgstr "Kész ekkor"
 
-#: src/trg-general-panel.c:316 src/trg-torrent-tree-view.c:139
+#: src/trg-general-panel.c:314 src/trg-torrent-tree-view.c:139
 msgid "Location"
 msgstr "Hely"
 
@@ -302,192 +302,192 @@ msgstr "Ez a torrent befejezõdött."
 msgid "This torrent has been added."
 msgstr "Ez a torrent hozzáadódott."
 
-#: src/trg-main-window.c:596
+#: src/trg-main-window.c:600
 msgid "No hostname set"
 msgstr "Nincs host név beállítva"
 
-#: src/trg-main-window.c:599
+#: src/trg-main-window.c:603
 msgid "Unknown error getting settings"
 msgstr "Ismeretlen hiba a beállítások lekérdezése közben"
 
-#: src/trg-main-window.c:614
+#: src/trg-main-window.c:623
 msgid "Connecting..."
 msgstr "Kapcsolódás..."
 
-#: src/trg-main-window.c:873
+#: src/trg-main-window.c:882
 #, c-format
 msgid "<big><b>Remove torrent \"%s\"?</b></big>"
 msgstr "<big><b>Törlöd ezt a torrentet: \"%s\"?</b></big>"
 
-#: src/trg-main-window.c:874
+#: src/trg-main-window.c:883
 #, c-format
 msgid "<big><b>Remove %d torrents?</b></big>"
 msgstr "<big><b>Eltávolítod %d torrenteket?</b></big>"
 
-#: src/trg-main-window.c:896
+#: src/trg-main-window.c:905
 #, c-format
 msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
 msgstr ""
 "<big><b>Eltávolítod és törlöd a következõ torrentet: \"%s\"?</b></big>"
 
-#: src/trg-main-window.c:898
+#: src/trg-main-window.c:907
 #, c-format
 msgid "<big><b>Remove and delete %d torrents?</b></big>"
 msgstr "<big><b>Eltávolítod és törlöd %d torrenteket?</b></big>"
 
-#: src/trg-main-window.c:981 src/trg-preferences-dialog.c:897
+#: src/trg-main-window.c:990 src/trg-preferences-dialog.c:899
 #: src/trg-remote-prefs-dialog.c:693
 msgid "General"
 msgstr "Általános"
 
-#: src/trg-main-window.c:990 src/trg-torrent-props-dialog.c:622
+#: src/trg-main-window.c:999 src/trg-torrent-props-dialog.c:613
 msgid "Trackers"
 msgstr "Trackerek"
 
-#: src/trg-main-window.c:998 src/trg-torrent-props-dialog.c:591
+#: src/trg-main-window.c:1007 src/trg-torrent-props-dialog.c:582
 msgid "Files"
 msgstr "Fájlok"
 
-#: src/trg-main-window.c:1006 src/trg-remote-prefs-dialog.c:399
-#: src/trg-torrent-props-dialog.c:465 src/trg-torrent-props-dialog.c:605
+#: src/trg-main-window.c:1015 src/trg-remote-prefs-dialog.c:399
+#: src/trg-torrent-props-dialog.c:456 src/trg-torrent-props-dialog.c:596
 #: src/trg-trackers-tree-view.c:190
 msgid "Peers"
 msgstr "Peerek"
 
-#: src/trg-main-window.c:1089
+#: src/trg-main-window.c:1098
 #, c-format
 msgid "This application supports Transmission %g and later, you have %g."
 msgstr ""
 "Ez az alkalmazás Transmisson %g vagy késõbbi verziót támogat, a te verziód "
 "%g."
 
-#: src/trg-main-window.c:1155 src/trg-status-bar.c:74 src/trg-status-bar.c:104
+#: src/trg-main-window.c:1164 src/trg-status-bar.c:74 src/trg-status-bar.c:104
 msgid "Disconnected"
 msgstr "Szétkapcsolva"
 
-#: src/trg-main-window.c:1200
+#: src/trg-main-window.c:1209
 #, c-format
 msgid "%d Downloading @ %s"
 msgstr "%d Letöltés @ %s"
 
-#: src/trg-main-window.c:1207
+#: src/trg-main-window.c:1216
 #, c-format
 msgid "%d Seeding @ %s"
 msgstr "%d Feltöltés @ %s"
 
-#: src/trg-main-window.c:1258
+#: src/trg-main-window.c:1267
 #, c-format
 msgid "Request %d/%d failed: %s"
 msgstr "Kérés %d/%d sikertelen: %s"
 
-#: src/trg-main-window.c:2055
+#: src/trg-main-window.c:2069
 msgid "No Limit"
 msgstr "Nincs limit"
 
-#: src/trg-main-window.c:2156 src/trg-menu-bar.c:675 src/trg-toolbar.c:223
+#: src/trg-main-window.c:2170 src/trg-menu-bar.c:675 src/trg-toolbar.c:224
 msgid "Properties"
 msgstr "Beállítások"
 
-#: src/trg-main-window.c:2159 src/trg-toolbar.c:216
+#: src/trg-main-window.c:2173 src/trg-toolbar.c:217
 msgid "Resume"
 msgstr "Folytat"
 
-#: src/trg-main-window.c:2162 src/trg-toolbar.c:219
+#: src/trg-main-window.c:2176 src/trg-toolbar.c:220
 msgid "Pause"
 msgstr "Szünetel"
 
-#: src/trg-main-window.c:2165
+#: src/trg-main-window.c:2179
 msgid "Verify"
 msgstr "Ellenõriz"
 
-#: src/trg-main-window.c:2168
+#: src/trg-main-window.c:2182
 msgid "Re-announce"
 msgstr "Re-announce"
 
-#: src/trg-main-window.c:2171 src/trg-torrent-move-dialog.c:119
+#: src/trg-main-window.c:2185 src/trg-torrent-move-dialog.c:119
 #: src/trg-torrent-move-dialog.c:126
 msgid "Move"
 msgstr "Mozgat"
 
-#: src/trg-main-window.c:2174 src/trg-menu-bar.c:706 src/trg-toolbar.c:227
+#: src/trg-main-window.c:2188 src/trg-menu-bar.c:706 src/trg-toolbar.c:228
 msgid "Remove"
 msgstr "Eltávolít"
 
-#: src/trg-main-window.c:2177
+#: src/trg-main-window.c:2191
 msgid "Remove & Delete"
 msgstr "Eltávolít és Töröl"
 
-#: src/trg-main-window.c:2201 src/trg-preferences-dialog.c:907
+#: src/trg-main-window.c:2215 src/trg-preferences-dialog.c:909
 msgid "Actions"
 msgstr "Mûveletek"
 
-#: src/trg-main-window.c:2230 src/trg-menu-bar.c:722
+#: src/trg-main-window.c:2244 src/trg-menu-bar.c:722
 msgid "Start Now"
 msgstr "Indítás Most"
 
-#: src/trg-main-window.c:2233 src/trg-menu-bar.c:727
+#: src/trg-main-window.c:2247 src/trg-menu-bar.c:727
 msgid "Move Up Queue"
 msgstr "Feljebb a sorban"
 
-#: src/trg-main-window.c:2236 src/trg-menu-bar.c:734
+#: src/trg-main-window.c:2250 src/trg-menu-bar.c:734
 msgid "Move Down Queue"
 msgstr "Lejjebb a sorban"
 
-#: src/trg-main-window.c:2239 src/trg-menu-bar.c:741
+#: src/trg-main-window.c:2253 src/trg-menu-bar.c:741
 msgid "Bottom Of Queue"
 msgstr "Sor aljára"
 
-#: src/trg-main-window.c:2242 src/trg-menu-bar.c:745
+#: src/trg-main-window.c:2256 src/trg-menu-bar.c:745
 msgid "Top Of Queue"
 msgstr "Sor elejére"
 
-#: src/trg-main-window.c:2251 src/trg-main-window.c:2334
+#: src/trg-main-window.c:2265 src/trg-main-window.c:2348
 msgid "Down Limit"
 msgstr "Letöltési limit"
 
-#: src/trg-main-window.c:2256 src/trg-main-window.c:2338
+#: src/trg-main-window.c:2270 src/trg-main-window.c:2352
 msgid "Up Limit"
 msgstr "Feltöltési limit"
 
-#: src/trg-main-window.c:2285 src/trg-main-window.c:2292
+#: src/trg-main-window.c:2299 src/trg-main-window.c:2306
 #: src/trg-remote-prefs-dialog.c:497
 msgid "Updating..."
 msgstr "Frissítés..."
 
-#: src/trg-main-window.c:2306 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
+#: src/trg-main-window.c:2320 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
 msgid "Connect"
 msgstr "Kapcsolódás"
 
-#: src/trg-main-window.c:2313 src/trg-toolbar.c:206
+#: src/trg-main-window.c:2327 src/trg-toolbar.c:207
 msgid "Disconnect"
 msgstr "Szétkapcsol"
 
-#: src/trg-main-window.c:2317 src/trg-toolbar.c:209
+#: src/trg-main-window.c:2331 src/trg-toolbar.c:210
 #: src/trg-trackers-tree-view.c:284 src/trg-trackers-tree-view.c:311
 msgid "Add"
 msgstr "Hozzáad"
 
-#: src/trg-main-window.c:2321
+#: src/trg-main-window.c:2335
 msgid "Add from URL"
 msgstr "Hozzáad URL-bõl"
 
-#: src/trg-main-window.c:2325
+#: src/trg-main-window.c:2339
 msgid "Resume All"
 msgstr "Mindet folytat"
 
-#: src/trg-main-window.c:2329
+#: src/trg-main-window.c:2343
 msgid "Pause All"
 msgstr "Mindet szüneteltet"
 
-#: src/trg-main-window.c:2345
+#: src/trg-main-window.c:2359
 msgid "Quit"
 msgstr "Kilép"
 
-#: src/trg-main-window.c:2459 src/trg-menu-bar.c:536
+#: src/trg-main-window.c:2473 src/trg-menu-bar.c:536
 msgid "Graph"
 msgstr "Grafikon"
 
-#: src/trg-main-window.c:2647
+#: src/trg-main-window.c:2662
 msgid "Transmission Remote"
 msgstr "Transmission Remote - Hungarian"
 
@@ -695,7 +695,7 @@ msgstr "Távoli letöltések könyvtárai"
 msgid "Directory"
 msgstr "Könyvtár"
 
-#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:902
+#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:904
 msgid "View"
 msgstr "Nézet"
 
@@ -735,7 +735,7 @@ msgstr "Profil: "
 msgid "Name:"
 msgstr "Név:"
 
-#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:892
+#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:894
 msgid "Connection"
 msgstr "Kapcsolat"
 
@@ -747,35 +747,39 @@ msgstr "Hoszt:"
 msgid "Port:"
 msgstr "Port:"
 
-#: src/trg-preferences-dialog.c:817
+#: src/trg-preferences-dialog.c:816
+msgid "RPC URL Path:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:819
 msgid "Username:"
 msgstr "Felh név:"
 
-#: src/trg-preferences-dialog.c:821
+#: src/trg-preferences-dialog.c:823
 msgid "Password:"
 msgstr "Jelszó"
 
-#: src/trg-preferences-dialog.c:823
+#: src/trg-preferences-dialog.c:825
 msgid "Automatically connect"
 msgstr "Automatikus csatlakozás"
 
-#: src/trg-preferences-dialog.c:829
+#: src/trg-preferences-dialog.c:831
 msgid "SSL"
 msgstr "SSL"
 
-#: src/trg-preferences-dialog.c:836
+#: src/trg-preferences-dialog.c:838
 msgid "Timeout:"
 msgstr "Idõtúllépés:"
 
-#: src/trg-preferences-dialog.c:840
+#: src/trg-preferences-dialog.c:842
 msgid "Retries:"
 msgstr "Újrapróbálkozások:"
 
-#: src/trg-preferences-dialog.c:881 src/trg-toolbar.c:238
+#: src/trg-preferences-dialog.c:883 src/trg-toolbar.c:239
 msgid "Local Preferences"
 msgstr "Helyi Beállítások"
 
-#: src/trg-preferences-dialog.c:912
+#: src/trg-preferences-dialog.c:914
 msgid "Directories"
 msgstr "Könyvtárak"
 
@@ -966,15 +970,15 @@ msgstr "Eredeti torrent fájlok a lomtárba"
 msgid "Start added torrents"
 msgstr "Hozzáadott torrentek indítása"
 
-#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:242
+#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:243
 msgid "Remote Preferences"
 msgstr "Távoli beállítások"
 
-#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:409
+#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:400
 msgid "Bandwidth"
 msgstr "Sávszélesség"
 
-#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:636
+#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:627
 msgid "Limits"
 msgstr "Korlátok"
 
@@ -1074,7 +1078,7 @@ msgstr " (Korlát: %s)"
 msgid "Down: %s%s, Up: %s%s"
 msgstr "Le: %s%s, Fel: %s%s"
 
-#: src/trg-toolbar.c:231
+#: src/trg-toolbar.c:232
 msgid "Remove with data"
 msgstr "Eltávolítás adattal együtt"
 
@@ -1172,7 +1176,7 @@ msgstr "Összes Letöltés"
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:260
+#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:251
 msgid "Location:"
 msgstr "Hely:"
 
@@ -1186,142 +1190,142 @@ msgstr "Mozgat %s"
 msgid "Move %d torrents"
 msgstr "Mozgat %d torrent"
 
-#: src/trg-torrent-props-dialog.c:206
+#: src/trg-torrent-props-dialog.c:197
 msgid "Activity"
 msgstr "Tevékenység"
 
-#: src/trg-torrent-props-dialog.c:211
+#: src/trg-torrent-props-dialog.c:202
 msgid "Torrent size:"
 msgstr "Torrent mérete:"
 
-#: src/trg-torrent-props-dialog.c:216
+#: src/trg-torrent-props-dialog.c:207
 msgid "Have:"
 msgstr "Meglévõ:"
 
-#: src/trg-torrent-props-dialog.c:221
+#: src/trg-torrent-props-dialog.c:212
 msgid "Downloaded:"
 msgstr "Letöltve:"
 
-#: src/trg-torrent-props-dialog.c:226
+#: src/trg-torrent-props-dialog.c:217
 msgid "Uploaded:"
 msgstr "Feltöltve:"
 
-#: src/trg-torrent-props-dialog.c:231
+#: src/trg-torrent-props-dialog.c:222
 msgid "State:"
 msgstr "Állapot:"
 
-#: src/trg-torrent-props-dialog.c:236
+#: src/trg-torrent-props-dialog.c:227
 msgid "Running time:"
 msgstr "Futási idõ:"
 
-#: src/trg-torrent-props-dialog.c:241
+#: src/trg-torrent-props-dialog.c:232
 msgid "Remaining time:"
 msgstr "Hátralévõ idõ:"
 
-#: src/trg-torrent-props-dialog.c:246
+#: src/trg-torrent-props-dialog.c:237
 msgid "Last activity:"
 msgstr "Utolsó tevékenység:"
 
-#: src/trg-torrent-props-dialog.c:251
+#: src/trg-torrent-props-dialog.c:242
 msgid "Error:"
 msgstr "Hiba:"
 
-#: src/trg-torrent-props-dialog.c:255
+#: src/trg-torrent-props-dialog.c:246
 msgid "Details"
 msgstr "Részletek"
 
-#: src/trg-torrent-props-dialog.c:266
+#: src/trg-torrent-props-dialog.c:257
 msgid "Hash:"
 msgstr "Hash:"
 
-#: src/trg-torrent-props-dialog.c:272
+#: src/trg-torrent-props-dialog.c:263
 msgid "Privacy:"
 msgstr "Adatvédelem:"
 
-#: src/trg-torrent-props-dialog.c:278
+#: src/trg-torrent-props-dialog.c:269
 msgid "Origin:"
 msgstr "Eredet:"
 
-#: src/trg-torrent-props-dialog.c:295
+#: src/trg-torrent-props-dialog.c:286
 msgid "Comment:"
 msgstr "Megjegyzés:"
 
-#: src/trg-torrent-props-dialog.c:330
+#: src/trg-torrent-props-dialog.c:321
 msgid "Private to this tracker -- DHT and PEX disabled"
 msgstr "Privát torrent - DHT és PEX kikapcsolva"
 
-#: src/trg-torrent-props-dialog.c:332
+#: src/trg-torrent-props-dialog.c:323
 msgid "Public torrent"
 msgstr "Publikus torrent"
 
-#: src/trg-torrent-props-dialog.c:342
+#: src/trg-torrent-props-dialog.c:333
 #, c-format
 msgid "Created on %1$s"
 msgstr "Létrehozva ekkor: %1$s"
 
-#: src/trg-torrent-props-dialog.c:344
+#: src/trg-torrent-props-dialog.c:335
 #, c-format
 msgid "Created by %1$s on %2$s"
 msgstr "Készítette %1$s, ekkor: %2$s"
 
-#: src/trg-torrent-props-dialog.c:376
+#: src/trg-torrent-props-dialog.c:367
 msgid "No errors"
 msgstr "Nincs hiba"
 
-#: src/trg-torrent-props-dialog.c:380
+#: src/trg-torrent-props-dialog.c:371
 msgid "Active now"
 msgstr "Most aktív"
 
-#: src/trg-torrent-props-dialog.c:413
+#: src/trg-torrent-props-dialog.c:404
 msgid "Honor global limits"
 msgstr "Honor global limits"
 
-#: src/trg-torrent-props-dialog.c:423
+#: src/trg-torrent-props-dialog.c:414
 msgid "Torrent priority:"
 msgstr "Torrent prioritás:"
 
-#: src/trg-torrent-props-dialog.c:429
+#: src/trg-torrent-props-dialog.c:420
 msgid "Queue Position:"
 msgstr "Sor pozíció:"
 
-#: src/trg-torrent-props-dialog.c:434
+#: src/trg-torrent-props-dialog.c:425
 msgid "Limit download speed (KiB/s)"
 msgstr "Letöltési seb. korlátozása (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:442
+#: src/trg-torrent-props-dialog.c:433
 msgid "Limit upload speed (KiB/s)"
 msgstr "Feltöltési seb. korlátozása (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:450
+#: src/trg-torrent-props-dialog.c:441
 msgid "Use global settings"
 msgstr "Globális beállítások használata"
 
-#: src/trg-torrent-props-dialog.c:451
+#: src/trg-torrent-props-dialog.c:442
 msgid "Stop seeding at ratio"
 msgstr "Feltöltés leállítása a megadott arány elérésekor"
 
-#: src/trg-torrent-props-dialog.c:452
+#: src/trg-torrent-props-dialog.c:443
 msgid "Seed regardless of ratio"
 msgstr "Feltöltés tekintet nélkül az arányra"
 
-#: src/trg-torrent-props-dialog.c:455
+#: src/trg-torrent-props-dialog.c:446
 msgid "Seed ratio mode:"
 msgstr "Feltöltési arány mód:"
 
-#: src/trg-torrent-props-dialog.c:463
+#: src/trg-torrent-props-dialog.c:454
 msgid "Seed ratio limit:"
 msgstr "Feltöltési arány korlát:"
 
-#: src/trg-torrent-props-dialog.c:469
+#: src/trg-torrent-props-dialog.c:460
 msgid "Peer limit:"
 msgstr "Peer korlát:"
 
-#: src/trg-torrent-props-dialog.c:542
+#: src/trg-torrent-props-dialog.c:533
 #, c-format
 msgid "Multiple (%d) torrent properties"
 msgstr "Többszörös (%d) torrent beállítások"
 
-#: src/trg-torrent-props-dialog.c:574
+#: src/trg-torrent-props-dialog.c:565
 msgid "Information"
 msgstr "Információ"
 
@@ -1441,45 +1445,45 @@ msgstr "Növekvõ"
 msgid "Descending"
 msgstr "Csökkenõ"
 
-#: src/util.c:340
+#: src/util.c:342
 msgid "JSON decoding error."
 msgstr "JSON dekódolási hiba."
 
-#: src/util.c:345
+#: src/util.c:347
 msgid "Server responded, but with no result."
 msgstr "Szerver válaszolt, de nincs eredmény."
 
-#: src/util.c:349
+#: src/util.c:351
 #, c-format
 msgid "Request failed with HTTP code %d"
 msgstr "Kérés hiba. HTTP Kód: %d"
 
-#: src/util.c:383
+#: src/util.c:385
 msgid "None"
 msgstr "Egyik sem"
 
-#: src/util.c:429
+#: src/util.c:431
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d nap"
 msgstr[1] "%d nap"
 
-#: src/util.c:430
+#: src/util.c:432
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d óra"
 msgstr[1] "%d óra"
 
-#: src/util.c:432
+#: src/util.c:434
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d perc"
 msgstr[1] "%d perc"
 
-#: src/util.c:435
+#: src/util.c:437
 #, c-format
 msgid "%ld second"
 msgid_plural "%ld seconds"
diff --git a/po/it.po b/po/it.po
index 0a19679..ab09294 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,1084 +6,1189 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: transmission-remote-gtk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-09-05 22:09+0100\n"
-"PO-Revision-Date: 2012-09-13 13:25+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-03-09 22:17+0100\n"
+"PO-Revision-Date: 2016-04-07 22:10+0200\n"
 "Last-Translator: Milo Casagrande <milo.casagrande@gmail.com>\n"
 "Language-Team: Italian <it@li.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-06-09 22:28+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2014-06-12 07:44+0000\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
-#: src/torrent.c:360 src/torrent.c:380
+#: ../data/transmission-remote-gtk.desktop.in.h:1 ../src/trg-main-window.c:2717
+msgid "Transmission Remote"
+msgstr "Transmission Remote"
+
+#: ../data/transmission-remote-gtk.desktop.in.h:2
+msgid "Remotely manage the Transmission BitTorrent client"
+msgstr "Gestisci da remoto il Transmission BitTorrent client"
+
+#: ../data/transmission-remote-gtk.appdata.xml.in.h:1
+msgid ""
+"transmission-remote-gtk allows you to remotely manage the Transmission "
+"BitTorrent client using its RPC interface."
+msgstr ""
+"transmission-remote-gtk ti permette di gestire da remoto il Transmission "
+"BitTorrent client tramite le sua interfaccia RPC."
+
+#: ../data/transmission-remote-gtk.appdata.xml.in.h:2
+msgid "Features"
+msgstr "Features"
+
+#: ../data/transmission-remote-gtk.appdata.xml.in.h:3
+msgid ""
+"Remotely add (file/url), start, stop, remove, remove and delete, verify, "
+"reannounce torrents."
+msgstr ""
+"Aggiungi (file/url), start, stop, rimuovi, rimuovi e elimina i dati, "
+"verifica, riannuncia torrent da remoto"
+
+#: ../data/transmission-remote-gtk.appdata.xml.in.h:4
+msgid "Works as a .torrent handler (eg. from a web browser)."
+msgstr "Gestore di .torrent (es: tramite il browser)"
+
+#: ../data/transmission-remote-gtk.appdata.xml.in.h:5
+msgid ""
+"Set torrent properties such as speed, seed, peer limits, file priorities, "
+"add/edit/remove trackers."
+msgstr ""
+"Imposta proprietà del torrent come velocità, limite di seed, limite peer, "
+"priorità dei file, aggiungi/modifica/rimuovi trackers."
+
+#: ../data/transmission-remote-gtk.appdata.xml.in.h:6
+msgid ""
+"Change remote settings like global limits, download directory, and "
+"connectivity preferences."
+msgstr ""
+"Modifica impostazioni remote come limite di seed globale, directory di "
+"download e dettagli connessione."
+
+#: ../src/torrent.c:369 ../src/torrent.c:389
 msgid "Metadata Downloading"
-msgstr "Scaricamento dei meta-dati"
+msgstr "Downloading dei metadati"
 
-#: src/torrent.c:362 src/torrent.c:382 src/trg-state-selector.c:658
+#: ../src/torrent.c:371 ../src/torrent.c:391 ../src/trg-state-selector.c:677
 msgid "Downloading"
-msgstr "Ricezione"
+msgstr "Downloading"
 
-#: src/torrent.c:364
+#: ../src/torrent.c:373
 msgid "Queued download"
-msgstr "Scaricamento in coda"
+msgstr "In coda per download"
 
-#: src/torrent.c:366 src/torrent.c:390
+#: ../src/torrent.c:375 ../src/torrent.c:399
 msgid "Waiting To Check"
 msgstr "In attesa di controllo"
 
-#: src/torrent.c:368 src/torrent.c:388 src/trg-state-selector.c:684
+#: ../src/torrent.c:377 ../src/torrent.c:397 ../src/trg-state-selector.c:703
 msgid "Checking"
 msgstr "Verifica in corso"
 
-#: src/torrent.c:370
+#: ../src/torrent.c:379
 msgid "Queued seed"
-msgstr "Distribuzione in coda"
+msgstr "In coda per seed"
 
-#: src/torrent.c:372 src/torrent.c:386 src/trg-remote-prefs-dialog.c:360
-#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:447
+#: ../src/torrent.c:381 ../src/torrent.c:395
+#: ../src/trg-remote-prefs-dialog.c:364 ../src/trg-state-selector.c:684
+#: ../src/trg-torrent-props-dialog.c:442
 msgid "Seeding"
-msgstr "Distribuzione"
+msgstr "Seeding"
 
-#: src/torrent.c:374 src/torrent.c:384 src/torrent-cell-renderer.c:285
-#: src/trg-state-selector.c:672
+#: ../src/torrent.c:383 ../src/torrent.c:393 ../src/torrent-cell-renderer.c:282
+#: ../src/trg-state-selector.c:691
 msgid "Paused"
 msgstr "In pausa"
 
-#: src/torrent.c:394
+#: ../src/torrent.c:403
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: src/torrent-cell-renderer.c:157
+#. %1$s is how much we've got,
+#. %2$s is how much we'll have when done,
+#. %3$s%% is a percentage of the two
+#: ../src/torrent-cell-renderer.c:154
 #, c-format
 msgid "%1$s of %2$s (%3$s)"
 msgstr "%1$s di %2$s (%3$s)"
 
-#: src/torrent-cell-renderer.c:167
+#: ../src/torrent-cell-renderer.c:164
 #, c-format
 msgid "%1$s of %2$s (%3$s), uploaded %4$s (Ratio: %5$s Goal: %6$s)"
-msgstr "%1$s di %2$s (%3$s), inviati %4$s (rapporto: %5$s - obiettivo: %6$s)"
+msgstr "%1$s di %2$s (%3$s), uploaded %4$s (Ratio: %5$s - obiettivo: %6$s)"
 
-#: src/torrent-cell-renderer.c:183
+#: ../src/torrent-cell-renderer.c:180
 #, c-format
 msgid "%1$s of %2$s (%3$s), uploaded %4$s (Ratio: %5$s)"
-msgstr "%1$s di %2$s (%3$s), inviati %4$s (rapporto: %5$s)"
+msgstr "%1$s di %2$s (%3$s), uploaded %4$s (Ratio: %5$s)"
 
-#: src/torrent-cell-renderer.c:200
+#: ../src/torrent-cell-renderer.c:197
 #, c-format
 msgid "%1$s, uploaded %2$s (Ratio: %3$s Goal: %4$s)"
-msgstr "%1$s, inviati %2$s (rapporto: %3$s - obiettivo: %4$s)"
+msgstr "%1$s, uploaded %2$s (Ratio: %3$s - obiettivo: %4$s)"
 
-#: src/torrent-cell-renderer.c:214
+#. %1$s is the torrent's total size,
+#. %2$s is how much we've uploaded,
+#. %3$s is our upload-to-download ratio
+#: ../src/torrent-cell-renderer.c:211
 #, c-format
 msgid "%1$s, uploaded %2$s (Ratio: %3$s)"
-msgstr "%1$s, inviati %2$s (rapporto: %3$s)"
+msgstr "%1$s, uploaded %2$s (Ratio: %3$s)"
 
-#: src/torrent-cell-renderer.c:230
+#: ../src/torrent-cell-renderer.c:227
 msgid "Remaining time unknown"
 msgstr "Tempo restante sconosciuto"
 
-#: src/torrent-cell-renderer.c:235
+#. time remaining
+#: ../src/torrent-cell-renderer.c:232
 #, c-format
 msgid "%s remaining"
 msgstr "%s rimanenti"
 
-#: src/torrent-cell-renderer.c:259
+#. 1==down arrow, 2==down speed, 3==up arrow, 4==down speed
+#: ../src/torrent-cell-renderer.c:256
 #, c-format
 msgid "%1$s %2$s, %3$s %4$s"
 msgstr "%2$s %1$s, %4$s %3$s"
 
-#: src/torrent-cell-renderer.c:263 src/torrent-cell-renderer.c:266
+#. bandwidth speed + unicode arrow
+#: ../src/torrent-cell-renderer.c:260 ../src/torrent-cell-renderer.c:263
 #, c-format
 msgid "%1$s %2$s"
 msgstr "%2$s %1$s"
 
-#: src/torrent-cell-renderer.c:270
+#: ../src/torrent-cell-renderer.c:267
 msgid "Idle"
 msgstr "In attesa"
 
-#: src/torrent-cell-renderer.c:284
+#: ../src/torrent-cell-renderer.c:281
 msgid "Finished"
 msgstr "Completato"
 
-#: src/torrent-cell-renderer.c:287
+#: ../src/torrent-cell-renderer.c:284
 msgid "Queued for verification"
 msgstr "Accodato per la verifica"
 
-#: src/torrent-cell-renderer.c:289
+#: ../src/torrent-cell-renderer.c:286
 msgid "Queued for download"
-msgstr "Accodato per ricezione"
+msgstr "Accodato per il download"
 
-#: src/torrent-cell-renderer.c:291
+#: ../src/torrent-cell-renderer.c:288
 msgid "Queued for seeding"
-msgstr "Accodato per la distribuzione"
+msgstr "Accodato per il seeding"
 
-#: src/torrent-cell-renderer.c:294
+#: ../src/torrent-cell-renderer.c:291
 #, c-format
 msgid "Verifying data (%1$s tested)"
 msgstr "Verifica dei dati (%1$s controllati)"
 
-#: src/torrent-cell-renderer.c:302
+#: ../src/torrent-cell-renderer.c:299
 #, c-format
 msgid "Ratio %s"
-msgstr "Rapporto %s"
+msgstr "Ratio %s"
 
-#: src/torrent-cell-renderer.c:332
+#: ../src/torrent-cell-renderer.c:313
 #, c-format
-msgid "Downloading from %1$li of %2$li connected peer"
-msgid_plural "Downloading from %1$li of %2$li connected peers"
-msgstr[0] "Scaricamento da %1$li su %2$li nodo connesso"
-msgstr[1] "Scaricamento da %1$li su %2$li nodi connessi"
+msgid "Tracker gave a warning: \"%s\""
+msgstr "Avviso dal tracker: \"%s\""
 
-#: src/torrent-cell-renderer.c:340
+#: ../src/torrent-cell-renderer.c:314
 #, c-format
-msgid "Downloading metadata from %1$li peer (%2$s done)"
-msgid_plural "Downloading metadata from %1$li peers (%2$s done)"
-msgstr[0] "Scaricamento dei meta-dati da %1$li nodo (%2$s completato)"
-msgstr[1] "Scaricamento dei meta-dati da %1$li nodi (%2$s completato)"
+msgid "Tracker gave an error: \"%s\""
+msgstr "Errore dal tracker: \"%s\""
 
-#: src/torrent-cell-renderer.c:351
+#: ../src/torrent-cell-renderer.c:315
 #, c-format
-msgid "Seeding to %1$li of %2$li connected peer"
-msgid_plural "Seeding to %1$li of %2$li connected peers"
-msgstr[0] "Distribuzione a %1$li su %2$li nodo connesso"
-msgstr[1] "Distribuzione a %1$li su %2$li nodi connessi"
-
-#: src/trg-about-window.c:74
+msgid "Error: %s"
+msgstr "Errore: %s"
+
+#: ../src/torrent-cell-renderer.c:329
+msgid "Downloading from %1$lu of %2$lu connected peer"
+msgid_plural "Downloading from %1$lu of %2$lu connected peers"
+msgstr[0] "Downloading da %1$lu di %2$lu peer connesso"
+msgstr[1] "Downloading da %1$lu di %2$lu peer connessi"
+
+#: ../src/torrent-cell-renderer.c:337
+msgid "Downloading metadata from %1$lu peer (%2$s done)"
+msgid_plural "Downloading metadata from %1$lu peers (%2$s done)"
+msgstr[0] "Downloading metadati da %1$lu peer (%2$s scaricato)"
+msgstr[1] "Downloading metadati da %1$lu peer (%2$s scaricato)"
+
+#: ../src/torrent-cell-renderer.c:348
+msgid "Seeding to %1$lu of %2$lu connected peer"
+msgid_plural "Seeding to %1$lu of %2$lu connected peers"
+msgstr[0] "Seeding a %1$lu di %2$lu peer connesso"
+msgstr[1] "Seeding a %1$lu di %2$lu peer connessi"
+
+#: ../src/trg-about-window.c:59
 msgid "A remote client to transmission-daemon."
 msgstr "Un client remoto per transmission-daemon."
 
-#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2011
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:416
+#: ../src/trg-cell-renderer-priority.c:78 ../src/trg-general-panel.c:196
+#: ../src/trg-main-window.c:2079 ../src/trg-torrent-add-dialog.c:382
+#: ../src/trg-torrent-props-dialog.c:411
 msgid "Low"
 msgstr "Bassa"
 
-#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2007
-#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:418
+#: ../src/trg-cell-renderer-priority.c:80 ../src/trg-general-panel.c:202
+#: ../src/trg-main-window.c:2075 ../src/trg-torrent-add-dialog.c:383
+#: ../src/trg-torrent-props-dialog.c:413
 msgid "High"
 msgstr "Alta"
 
-#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2009
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:417
+#: ../src/trg-cell-renderer-priority.c:82 ../src/trg-general-panel.c:199
+#: ../src/trg-main-window.c:2077 ../src/trg-torrent-add-dialog.c:382
+#: ../src/trg-torrent-props-dialog.c:412
 msgid "Normal"
 msgstr "Normale"
 
-#: src/trg-cell-renderer-priority.c:80
+#: ../src/trg-cell-renderer-priority.c:84
 msgid "Mixed"
 msgstr "Mista"
 
-#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:280
-#: src/trg-torrent-add-dialog.c:348 src/trg-torrent-tree-view.c:52
+#: ../src/trg-files-tree-view.c:189 ../src/trg-general-panel.c:310
+#: ../src/trg-preferences-dialog.c:653 ../src/trg-torrent-add-dialog.c:284
+#: ../src/trg-torrent-tree-view.c:56
 msgid "Name"
 msgstr "Nome"
 
-#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:283
-#: src/trg-torrent-add-dialog.c:366 src/trg-torrent-tree-view.c:57
+#. add "size" column
+#: ../src/trg-files-tree-view.c:193 ../src/trg-general-panel.c:313
+#: ../src/trg-torrent-add-dialog.c:302 ../src/trg-torrent-tree-view.c:61
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/trg-files-tree-view.c:191 src/trg-peers-tree-view.c:65
+#: ../src/trg-files-tree-view.c:195 ../src/trg-peers-tree-view.c:74
 msgid "Progress"
 msgstr "Avanzamento"
 
-#: src/trg-files-tree-view.c:193 src/trg-files-tree-view-common.c:69
-#: src/trg-torrent-add-dialog.c:379 src/trg-torrent-add-dialog.c:703
+#. add "enabled" column
+#: ../src/trg-files-tree-view.c:197 ../src/trg-torrent-add-dialog.c:315
+#: ../src/trg-torrent-add-dialog.c:665 ../src/trg-files-tree-view-common.c:69
 msgid "Download"
-msgstr "Ricezione"
+msgstr "Download"
 
-#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2000
-#: src/trg-torrent-add-dialog.c:395 src/trg-torrent-tree-view.c:145
+#. add priority column
+#: ../src/trg-files-tree-view.c:199 ../src/trg-general-panel.c:343
+#: ../src/trg-main-window.c:2068 ../src/trg-torrent-add-dialog.c:331
+#: ../src/trg-torrent-tree-view.c:149
 msgid "Priority"
 msgstr "Priorità"
 
-#: src/trg-files-tree-view-common.c:50 src/trg-torrent-add-dialog.c:694
-msgid "High Priority"
-msgstr "Priorità alta"
-
-#: src/trg-files-tree-view-common.c:54 src/trg-torrent-add-dialog.c:697
-msgid "Normal Priority"
-msgstr "Priorità normale"
-
-#: src/trg-files-tree-view-common.c:58 src/trg-torrent-add-dialog.c:700
-msgid "Low Priority"
-msgstr "Priorità bassa"
-
-#: src/trg-files-tree-view-common.c:77 src/trg-torrent-add-dialog.c:706
-msgid "Skip"
-msgstr "Salta"
-
-#: src/trg-files-tree-view-common.c:84
-msgid "Expand All"
-msgstr "Espandi tutto"
-
-#: src/trg-files-tree-view-common.c:89
-msgid "Collapse All"
-msgstr "Contrai tutto"
-
-#: src/trg-general-panel.c:153 src/trg-general-panel.c:214
+#: ../src/trg-general-panel.c:168 ../src/trg-general-panel.c:244
 msgid "N/A"
 msgstr "N/D"
 
-#: src/trg-general-panel.c:168
+#: ../src/trg-general-panel.c:186
 msgid "(Private)"
 msgstr "(privato)"
 
-#: src/trg-general-panel.c:168
+#: ../src/trg-general-panel.c:186
 msgid "(Public)"
 msgstr "(pubblico)"
 
-#: src/trg-general-panel.c:202 src/trg-main-window.c:1097
-#: src/trg-main-window.c:1505 src/trg-main-window.c:2135
-#: src/trg-state-selector.c:538 src/trg-torrent-add-url-dialog.c:67
-#: src/util.c:331
+#: ../src/trg-general-panel.c:232 ../src/trg-main-window.c:1142
+#: ../src/trg-main-window.c:1555 ../src/trg-main-window.c:2203
+#: ../src/trg-rss-window.c:207 ../src/trg-rss-window.c:221
+#: ../src/trg-state-selector.c:557 ../src/trg-torrent-add-url-dialog.c:71
+#: ../src/util.c:333
 msgid "Error"
 msgstr "Errore"
 
-#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:123
-msgid "ETA"
-msgstr "Rimanente"
+#: ../src/trg-general-panel.c:315
+msgid "Rate Down"
+msgstr "Download"
 
-#: src/trg-general-panel.c:287 src/trg-torrent-tree-view.c:151
+#: ../src/trg-general-panel.c:317 ../src/trg-torrent-tree-view.c:155
 msgid "Completed"
 msgstr "Completato"
 
-#: src/trg-general-panel.c:290
-msgid "Seeders"
-msgstr "Fonti complete"
+#: ../src/trg-general-panel.c:320 ../src/trg-torrent-tree-view.c:127
+msgid "ETA"
+msgstr "ETA"
 
-#: src/trg-general-panel.c:292
-msgid "Rate Down"
-msgstr "Velocità ricezione"
+#: ../src/trg-general-panel.c:322
+msgid "Rate Up"
+msgstr "Upload"
 
-#: src/trg-general-panel.c:294 src/trg-torrent-tree-view.c:128
+#: ../src/trg-general-panel.c:324 ../src/trg-torrent-tree-view.c:132
 msgid "Downloaded"
-msgstr "Scaricati"
+msgstr "Downloaded"
 
-#: src/trg-general-panel.c:297 src/trg-torrent-tree-view.c:70
-msgid "Leechers"
-msgstr "Fonti parziali"
+#: ../src/trg-general-panel.c:327
+msgid "Seeders"
+msgstr "Seeders"
 
-#: src/trg-general-panel.c:299
-msgid "Rate Up"
-msgstr "Velocità invio"
+#: ../src/trg-general-panel.c:329 ../src/trg-stats-dialog.c:321
+#: ../src/trg-torrent-tree-view.c:135
+msgid "Ratio"
+msgstr "Ratio"
 
-#: src/trg-general-panel.c:301 src/trg-torrent-tree-view.c:125
+#: ../src/trg-general-panel.c:331 ../src/trg-torrent-tree-view.c:129
 msgid "Uploaded"
-msgstr "Inviati"
+msgstr "Uploaded"
 
-#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:63
-msgid "Status"
-msgstr "Stato"
+#: ../src/trg-general-panel.c:334 ../src/trg-torrent-tree-view.c:74
+msgid "Leechers"
+msgstr "Leechers"
 
-#: src/trg-general-panel.c:306 src/trg-torrent-tree-view.c:131
-msgid "Ratio"
-msgstr "Rapporto"
+#: ../src/trg-general-panel.c:336
+msgid "Ratio limit"
+msgstr "Limite ratio"
 
-#: src/trg-general-panel.c:309
-msgid "Comment"
-msgstr "Commento"
+#: ../src/trg-general-panel.c:338
+msgid "Corrupted"
+msgstr "Corrotti"
 
-#: src/trg-general-panel.c:312
+#: ../src/trg-general-panel.c:341 ../src/trg-torrent-tree-view.c:67
+msgid "Status"
+msgstr "Stato"
+
+#: ../src/trg-general-panel.c:345
 msgid "Completed At"
 msgstr "Completato alle"
 
-#: src/trg-general-panel.c:316 src/trg-torrent-tree-view.c:139
+#: ../src/trg-general-panel.c:348 ../src/trg-torrent-tree-view.c:143
 msgid "Location"
 msgstr "Percorso"
 
-#: src/trg-main-window.c:363
+#: ../src/trg-general-panel.c:351
+msgid "Comment"
+msgstr "Commento"
+
+#: ../src/trg-gtk-app.c:183 ../src/trg-peers-tree-view.c:78
+msgid "Client"
+msgstr "Client"
+
+#: ../src/trg-gtk-app.c:192
+msgid "Min On Start"
+msgstr "Avvia minimizzato"
+
+#: ../src/trg-main-window.c:368
 msgid "This torrent has completed."
-msgstr "È stato completato questo torrent."
+msgstr "Questo torrent è stato completato."
 
-#: src/trg-main-window.c:375
+#: ../src/trg-main-window.c:380
 msgid "This torrent has been added."
-msgstr "È stato aggiunto questo torrent."
+msgstr "Questo torrent è stato aggiunto."
 
-#: src/trg-main-window.c:596
+#: ../src/trg-main-window.c:610
 msgid "No hostname set"
-msgstr "Non è stato impostato alcun nome host"
+msgstr "Nome host non impostato"
 
-#: src/trg-main-window.c:599
+#: ../src/trg-main-window.c:613
 msgid "Unknown error getting settings"
-msgstr "Errore sconosciuto ottenendo le impostazioni"
+msgstr "Errore sconosciuto ricevendo le impostazioni"
 
-#: src/trg-main-window.c:614
+#: ../src/trg-main-window.c:633
 msgid "Connecting..."
 msgstr "Connessione..."
 
-#: src/trg-main-window.c:873
+#: ../src/trg-main-window.c:902
 #, c-format
 msgid "<big><b>Remove torrent \"%s\"?</b></big>"
 msgstr "<big><b>Rimuovere il torrent «%s»?</b></big>"
 
-#: src/trg-main-window.c:874
+#: ../src/trg-main-window.c:903
 #, c-format
 msgid "<big><b>Remove %d torrents?</b></big>"
 msgstr "<big><b>Rimuovere %d torrent?</b></big>"
 
-#: src/trg-main-window.c:896
+#: ../src/trg-main-window.c:925
 #, c-format
 msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
-msgstr "<big><b>Rimuovere ed eliminare il torrent «%s»?</b></big>"
+msgstr "<big><b>Rimuovere ed eliminare i dati del torrent «%s»?</b></big>"
 
-#: src/trg-main-window.c:898
+#: ../src/trg-main-window.c:927
 #, c-format
 msgid "<big><b>Remove and delete %d torrents?</b></big>"
-msgstr "<big><b>Rimuovere ed eliminare %d torrent?</b></big>"
+msgstr "<big><b>Rimuovere ed eliminare i dati di %d torrent?</b></big>"
 
-#: src/trg-main-window.c:981 src/trg-preferences-dialog.c:897
-#: src/trg-remote-prefs-dialog.c:693
+#: ../src/trg-main-window.c:1026 ../src/trg-preferences-dialog.c:947
+#: ../src/trg-remote-prefs-dialog.c:697
 msgid "General"
 msgstr "Generali"
 
-#: src/trg-main-window.c:990 src/trg-torrent-props-dialog.c:622
+#: ../src/trg-main-window.c:1035 ../src/trg-torrent-props-dialog.c:617
 msgid "Trackers"
-msgstr "Server traccia"
+msgstr "Trackers"
 
-#: src/trg-main-window.c:998 src/trg-torrent-props-dialog.c:591
+#: ../src/trg-main-window.c:1043 ../src/trg-torrent-props-dialog.c:586
 msgid "Files"
 msgstr "File"
 
-#: src/trg-main-window.c:1006 src/trg-remote-prefs-dialog.c:399
-#: src/trg-torrent-props-dialog.c:465 src/trg-torrent-props-dialog.c:605
-#: src/trg-trackers-tree-view.c:190
+#: ../src/trg-main-window.c:1051 ../src/trg-remote-prefs-dialog.c:403
+#: ../src/trg-torrent-props-dialog.c:460 ../src/trg-torrent-props-dialog.c:600
+#: ../src/trg-trackers-tree-view.c:194
 msgid "Peers"
 msgstr "Nodi"
 
-#: src/trg-main-window.c:1089
+#: ../src/trg-main-window.c:1134
 #, c-format
 msgid "This application supports Transmission %g and later, you have %g."
 msgstr ""
 "Questa applicazione supporta Transmission %g e successivi, la versione in "
 "uso è %g."
 
-#: src/trg-main-window.c:1155 src/trg-status-bar.c:74 src/trg-status-bar.c:104
+#: ../src/trg-main-window.c:1200 ../src/trg-status-bar.c:78
+#: ../src/trg-status-bar.c:108
 msgid "Disconnected"
-msgstr "Disconnessi"
+msgstr "Disconnesso"
 
-#: src/trg-main-window.c:1200
+#: ../src/trg-main-window.c:1245
 #, c-format
 msgid "%d Downloading @ %s"
-msgstr "%d in ricezione @ %s"
+msgstr "%d in download @ %s"
 
-#: src/trg-main-window.c:1207
+#: ../src/trg-main-window.c:1252
 #, c-format
 msgid "%d Seeding @ %s"
-msgstr "%d in distribuzione @ %s"
+msgstr "%d in seeding @ %s"
 
-#: src/trg-main-window.c:1258
+#: ../src/trg-main-window.c:1303
 #, c-format
 msgid "Request %d/%d failed: %s"
 msgstr "Richiesta %d/%d non riuscita: %s"
 
-#: src/trg-main-window.c:2055
+#: ../src/trg-main-window.c:2123
 msgid "No Limit"
 msgstr "Nessun limite"
 
-#: src/trg-main-window.c:2156 src/trg-menu-bar.c:675 src/trg-toolbar.c:223
+#: ../src/trg-main-window.c:2224 ../src/trg-menu-bar.c:712
+#: ../src/trg-toolbar.c:228
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/trg-main-window.c:2159 src/trg-toolbar.c:216
+#: ../src/trg-main-window.c:2227 ../src/trg-toolbar.c:221
 msgid "Resume"
 msgstr "Riprendi"
 
-#: src/trg-main-window.c:2162 src/trg-toolbar.c:219
+#: ../src/trg-main-window.c:2230 ../src/trg-toolbar.c:224
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/trg-main-window.c:2165
+#: ../src/trg-main-window.c:2233
 msgid "Verify"
 msgstr "Verifica"
 
-#: src/trg-main-window.c:2168
+#: ../src/trg-main-window.c:2236
 msgid "Re-announce"
 msgstr "Ri-annuncia"
 
-#: src/trg-main-window.c:2171 src/trg-torrent-move-dialog.c:119
-#: src/trg-torrent-move-dialog.c:126
+#: ../src/trg-main-window.c:2239 ../src/trg-torrent-move-dialog.c:122
+#: ../src/trg-torrent-move-dialog.c:129
 msgid "Move"
 msgstr "Sposta"
 
-#: src/trg-main-window.c:2174 src/trg-menu-bar.c:706 src/trg-toolbar.c:227
+#: ../src/trg-main-window.c:2242 ../src/trg-menu-bar.c:743
+#: ../src/trg-toolbar.c:232
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: src/trg-main-window.c:2177
-msgid "Remove & Delete"
-msgstr "Rimuovi ed elimina"
+#: ../src/trg-main-window.c:2245 ../src/trg-menu-bar.c:749
+#: ../src/trg-toolbar.c:236
+msgid "Remove and delete data"
+msgstr "Rimuovi e cancella i dati"
 
-#: src/trg-main-window.c:2201 src/trg-preferences-dialog.c:907
+#: ../src/trg-main-window.c:2269 ../src/trg-preferences-dialog.c:957
 msgid "Actions"
 msgstr "Azioni"
 
-#: src/trg-main-window.c:2230 src/trg-menu-bar.c:722
+#: ../src/trg-main-window.c:2298 ../src/trg-menu-bar.c:759
 msgid "Start Now"
 msgstr "Avvia ora"
 
-#: src/trg-main-window.c:2233 src/trg-menu-bar.c:727
+#: ../src/trg-main-window.c:2301 ../src/trg-menu-bar.c:764
 msgid "Move Up Queue"
 msgstr "In alto nella coda"
 
-#: src/trg-main-window.c:2236 src/trg-menu-bar.c:734
+#: ../src/trg-main-window.c:2304 ../src/trg-menu-bar.c:771
 msgid "Move Down Queue"
 msgstr "In basso nella coda"
 
-#: src/trg-main-window.c:2239 src/trg-menu-bar.c:741
+#: ../src/trg-main-window.c:2307 ../src/trg-menu-bar.c:778
 msgid "Bottom Of Queue"
 msgstr "In fondo alla coda"
 
-#: src/trg-main-window.c:2242 src/trg-menu-bar.c:745
+#: ../src/trg-main-window.c:2310 ../src/trg-menu-bar.c:782
 msgid "Top Of Queue"
 msgstr "In cima nella coda"
 
-#: src/trg-main-window.c:2251 src/trg-main-window.c:2334
+#: ../src/trg-main-window.c:2319 ../src/trg-main-window.c:2402
 msgid "Down Limit"
 msgstr "Limite download"
 
-#: src/trg-main-window.c:2256 src/trg-main-window.c:2338
+#: ../src/trg-main-window.c:2324 ../src/trg-main-window.c:2406
 msgid "Up Limit"
 msgstr "Limite upload"
 
-#: src/trg-main-window.c:2285 src/trg-main-window.c:2292
-#: src/trg-remote-prefs-dialog.c:497
+#: ../src/trg-main-window.c:2353 ../src/trg-main-window.c:2360
+#: ../src/trg-remote-prefs-dialog.c:501
 msgid "Updating..."
 msgstr "Aggiornamento..."
 
-#: src/trg-main-window.c:2306 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
+#: ../src/trg-main-window.c:2374 ../src/trg-menu-bar.c:671
+#: ../src/trg-toolbar.c:200
 msgid "Connect"
 msgstr "Connetti"
 
-#: src/trg-main-window.c:2313 src/trg-toolbar.c:206
+#: ../src/trg-main-window.c:2381 ../src/trg-toolbar.c:211
 msgid "Disconnect"
 msgstr "Disconnetti"
 
-#: src/trg-main-window.c:2317 src/trg-toolbar.c:209
-#: src/trg-trackers-tree-view.c:284 src/trg-trackers-tree-view.c:311
+#: ../src/trg-main-window.c:2385 ../src/trg-toolbar.c:214
+#: ../src/trg-trackers-tree-view.c:288 ../src/trg-trackers-tree-view.c:315
 msgid "Add"
 msgstr "Aggiungi"
 
-#: src/trg-main-window.c:2321
+#: ../src/trg-main-window.c:2389
 msgid "Add from URL"
 msgstr "Aggiungi da URL"
 
-#: src/trg-main-window.c:2325
+#: ../src/trg-main-window.c:2393
 msgid "Resume All"
 msgstr "Riprendi tutti"
 
-#: src/trg-main-window.c:2329
+#: ../src/trg-main-window.c:2397
 msgid "Pause All"
 msgstr "Metti tutti in pausa"
 
-#: src/trg-main-window.c:2345
+#: ../src/trg-main-window.c:2413
 msgid "Quit"
 msgstr "Esci"
 
-#: src/trg-main-window.c:2459 src/trg-menu-bar.c:536
+#: ../src/trg-main-window.c:2527 ../src/trg-menu-bar.c:565
 msgid "Graph"
 msgstr "Grafico"
 
-#: src/trg-main-window.c:2647
-msgid "Transmission Remote"
-msgstr "Transmission Remote"
-
-#: src/trg-menu-bar.c:464
+#: ../src/trg-menu-bar.c:485
 msgid "_View"
 msgstr "_Visualizza"
 
-#: src/trg-menu-bar.c:473
+#: ../src/trg-menu-bar.c:494
 msgid "Transmission Style"
 msgstr "Stile di Transmission"
 
-#: src/trg-menu-bar.c:483
+#: ../src/trg-menu-bar.c:504
 msgid "Transmission Compact Style"
 msgstr "Stile Transmission compatto"
 
-#: src/trg-menu-bar.c:493
+#: ../src/trg-menu-bar.c:514
 msgid "Classic Style"
 msgstr "Stile classico"
 
-#: src/trg-menu-bar.c:499
+#: ../src/trg-menu-bar.c:520
 msgid "Sort"
 msgstr "Ordina"
 
-#: src/trg-menu-bar.c:504 src/trg-preferences-dialog.c:675
+#: ../src/trg-menu-bar.c:525 ../src/trg-preferences-dialog.c:718
 msgid "State selector"
 msgstr "Selettore di stato"
 
-#: src/trg-menu-bar.c:510 src/trg-preferences-dialog.c:682
+#: ../src/trg-menu-bar.c:531 ../src/trg-preferences-dialog.c:725
 msgid "Directory filters"
 msgstr "Filtri delle directory"
 
-#: src/trg-menu-bar.c:519 src/trg-preferences-dialog.c:689
+#: ../src/trg-menu-bar.c:540 ../src/trg-preferences-dialog.c:732
 msgid "Tracker filters"
 msgstr "Filtri dei tracker"
 
-#: src/trg-menu-bar.c:528 src/trg-preferences-dialog.c:696
+#: ../src/trg-menu-bar.c:549 ../src/trg-preferences-dialog.c:739
+msgid "Directories first"
+msgstr "Prima le directory"
+
+#: ../src/trg-menu-bar.c:557 ../src/trg-preferences-dialog.c:746
 msgid "Torrent Details"
 msgstr "Dettagli del torrent"
 
-#: src/trg-menu-bar.c:542
+#: ../src/trg-menu-bar.c:571
 msgid "_Statistics"
 msgstr "_Statistiche"
 
-#: src/trg-menu-bar.c:554
+#: ../src/trg-menu-bar.c:578
+msgid "_RSS"
+msgstr "_RSS"
+
+#: ../src/trg-menu-bar.c:591
 msgid "_Options"
 msgstr "_Opzioni"
 
-#: src/trg-menu-bar.c:560
+#: ../src/trg-menu-bar.c:597
 msgid "_Local Preferences"
 msgstr "Preferenze _Locali"
 
-#: src/trg-menu-bar.c:567
+#: ../src/trg-menu-bar.c:604
 msgid "_Remote Preferences"
 msgstr "Preferenze _Remote"
 
-#: src/trg-menu-bar.c:627
+#: ../src/trg-menu-bar.c:664
 msgid "_File"
 msgstr "_File"
 
-#: src/trg-menu-bar.c:640
+#: ../src/trg-menu-bar.c:677
 msgid "_Disconnect"
 msgstr "_Disconnetti"
 
-#: src/trg-menu-bar.c:646
+#: ../src/trg-menu-bar.c:683
 msgid "_Add"
 msgstr "_Aggiungi"
 
-#: src/trg-menu-bar.c:651
+#: ../src/trg-menu-bar.c:688
 msgid "Add from _URL"
 msgstr "Aggiungi da _URL"
 
-#: src/trg-menu-bar.c:657
+#: ../src/trg-menu-bar.c:694
 msgid "_Quit"
 msgstr "_Esci"
 
-#: src/trg-menu-bar.c:668
+#: ../src/trg-menu-bar.c:705
 msgid "_Torrent"
 msgstr "_Torrent"
 
-#: src/trg-menu-bar.c:680
+#: ../src/trg-menu-bar.c:717
 msgid "_Resume"
 msgstr "_Riprendi"
 
-#: src/trg-menu-bar.c:685
+#: ../src/trg-menu-bar.c:722
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: src/trg-menu-bar.c:690
+#: ../src/trg-menu-bar.c:727
 msgid "_Verify"
 msgstr "_Verifica"
 
-#: src/trg-menu-bar.c:696
+#: ../src/trg-menu-bar.c:733
 msgid "Re-_announce"
 msgstr "Ri-_annuncia"
 
-#: src/trg-menu-bar.c:701
+#: ../src/trg-menu-bar.c:738
 msgid "_Move"
 msgstr "_Sposta"
 
-#: src/trg-menu-bar.c:712
-msgid "Remove and Delete"
-msgstr "Rimuovi e cancella dal disco"
-
-#: src/trg-menu-bar.c:753
+#: ../src/trg-menu-bar.c:790
 msgid "_Resume All"
 msgstr "_Riprendi tutti"
 
-#: src/trg-menu-bar.c:759
+#: ../src/trg-menu-bar.c:796
 msgid "_Pause All"
 msgstr "Metti tutti in _pausa"
 
-#: src/trg-menu-bar.c:771
+#: ../src/trg-menu-bar.c:808
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: src/trg-menu-bar.c:777
+#: ../src/trg-menu-bar.c:814
 msgid "_About"
 msgstr "_Informazioni"
 
-#: src/trg-peers-tree-view.c:50
+#: ../src/trg-peers-tree-view.c:54
 msgid "IP"
 msgstr "IP"
 
-#: src/trg-peers-tree-view.c:54 src/trg-trackers-tree-view.c:209
+#: ../src/trg-peers-tree-view.c:58 ../src/trg-trackers-tree-view.c:213
 msgid "Host"
 msgstr "Host"
 
-#: src/trg-peers-tree-view.c:58
+#: ../src/trg-peers-tree-view.c:63
 msgid "Country"
-msgstr "Paese"
+msgstr "Nazione"
 
-#: src/trg-peers-tree-view.c:61 src/trg-torrent-tree-view.c:117
+#: ../src/trg-peers-tree-view.c:67
+msgid "City"
+msgstr "Città"
+
+#: ../src/trg-peers-tree-view.c:70 ../src/trg-torrent-tree-view.c:121
 msgid "Down Speed"
-msgstr "Velocità di download"
+msgstr "Download"
 
-#: src/trg-peers-tree-view.c:63 src/trg-torrent-tree-view.c:120
+#: ../src/trg-peers-tree-view.c:72 ../src/trg-torrent-tree-view.c:124
 msgid "Up Speed"
-msgstr "Velocità di upload"
+msgstr "Upload"
 
-#: src/trg-peers-tree-view.c:67
+#: ../src/trg-peers-tree-view.c:76
 msgid "Flags"
 msgstr "Indicatori"
 
-#: src/trg-peers-tree-view.c:69
-msgid "Client"
-msgstr "Client"
-
-#: src/trg-preferences-dialog.c:401
+#: ../src/trg-preferences-dialog.c:409
 msgid "Updates"
 msgstr "Aggiornamenti"
 
-#: src/trg-preferences-dialog.c:403
+#: ../src/trg-preferences-dialog.c:411
 msgid "Update active torrents only"
 msgstr "Aggiorna solo il torrent attivo"
 
-#: src/trg-preferences-dialog.c:410
+#: ../src/trg-preferences-dialog.c:418
 msgid "Full update every (?) updates"
 msgstr "Aggiornamento completo ogni (?) aggiornamenti"
 
-#: src/trg-preferences-dialog.c:424
+#: ../src/trg-preferences-dialog.c:432
 msgid "Update interval:"
 msgstr "Intervallo di aggiornamento:"
 
-#: src/trg-preferences-dialog.c:428
+#: ../src/trg-preferences-dialog.c:436
 msgid "Minimised update interval:"
-msgstr "Intervallo di aggiornamento minimo:"
+msgstr "Intervallo di aggiornamento quando minimizzato:"
 
-#: src/trg-preferences-dialog.c:433
+#: ../src/trg-preferences-dialog.c:441
 msgid "Session update interval:"
 msgstr "Intervallo di aggiornamento della sessione:"
 
-#: src/trg-preferences-dialog.c:435
+#: ../src/trg-preferences-dialog.c:443
 msgid "Torrents"
-msgstr "Torrents"
+msgstr "Torrent"
 
-#: src/trg-preferences-dialog.c:437
+#: ../src/trg-preferences-dialog.c:445
 msgid "Start paused"
 msgstr "Avvia in pausa"
 
-#: src/trg-preferences-dialog.c:441
+#: ../src/trg-preferences-dialog.c:449
 msgid "Options dialog on add"
 msgstr "Finestra delle opzioni durante l'aggiunta"
 
-#: src/trg-preferences-dialog.c:446 src/trg-torrent-add-dialog.c:776
+#: ../src/trg-preferences-dialog.c:454 ../src/trg-torrent-add-dialog.c:737
 msgid "Delete local .torrent file after adding"
 msgstr "Cancella il file .torrent locale dopo l'aggiunta"
 
-#: src/trg-preferences-dialog.c:599
+#: ../src/trg-preferences-dialog.c:607
 msgid "Commands"
 msgstr "Comandi"
 
-#: src/trg-preferences-dialog.c:609 src/trg-preferences-dialog.c:647
+#: ../src/trg-preferences-dialog.c:617 ../src/trg-preferences-dialog.c:691
 msgid "Label"
 msgstr "Etichetta"
 
-#: src/trg-preferences-dialog.c:612
+#: ../src/trg-preferences-dialog.c:620
 msgid "Command"
 msgstr "Comando"
 
-#: src/trg-preferences-dialog.c:637
+#: ../src/trg-preferences-dialog.c:643 ../src/trg-preferences-dialog.c:968
+#: ../src/trg-rss-window.c:274
+msgid "RSS Feeds"
+msgstr "Feed RSS"
+
+#: ../src/trg-preferences-dialog.c:656
+msgid "URL"
+msgstr "URL"
+
+#: ../src/trg-preferences-dialog.c:681
 msgid "Remote Download Directories"
-msgstr "Directories di donwload remote"
+msgstr "Directories di download remote"
 
-#: src/trg-preferences-dialog.c:650
+#: ../src/trg-preferences-dialog.c:694
 msgid "Directory"
 msgstr "Directory"
 
-#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:902
+#: ../src/trg-preferences-dialog.c:716 ../src/trg-preferences-dialog.c:952
 msgid "View"
 msgstr "Vista"
 
-#: src/trg-preferences-dialog.c:704
+#: ../src/trg-preferences-dialog.c:754
 msgid "Show graph"
 msgstr "Mostra grafico"
 
-#: src/trg-preferences-dialog.c:714
+#: ../src/trg-preferences-dialog.c:761
 msgid "System Tray"
-msgstr "Area di notifica"
+msgstr "System Tray"
+
+#: ../src/trg-preferences-dialog.c:764
+msgid "Show in system tray (needs whitelisting in unity)"
+msgstr "Mostra in system tray (necessita permessi in unity)"
 
-#: src/trg-preferences-dialog.c:716
+#: ../src/trg-preferences-dialog.c:766
 msgid "Show in system tray"
-msgstr "Mostra nell'area di notifica"
+msgstr "Mostra in system tray"
 
-#: src/trg-preferences-dialog.c:724
+#: ../src/trg-preferences-dialog.c:776
 msgid "Minimise to system tray"
-msgstr "Minimizza nell'area di notifica"
+msgstr "Minimizza in system tray"
 
-#: src/trg-preferences-dialog.c:740
+#: ../src/trg-preferences-dialog.c:786
 msgid "Notifications"
 msgstr "Notifiche"
 
-#: src/trg-preferences-dialog.c:742
+#: ../src/trg-preferences-dialog.c:788
 msgid "Torrent added notifications"
 msgstr "Notifica per l'aggiunta di un torrent"
 
-#: src/trg-preferences-dialog.c:746
+#: ../src/trg-preferences-dialog.c:792
 msgid "Torrent complete notifications"
 msgstr "Notifica per il completamento di un torrent"
 
-#: src/trg-preferences-dialog.c:773
+#: ../src/trg-preferences-dialog.c:819
 msgid "Profile: "
 msgstr "Profilo: "
 
-#: src/trg-preferences-dialog.c:799
+#: ../src/trg-preferences-dialog.c:845
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:892
+#: ../src/trg-preferences-dialog.c:850 ../src/trg-preferences-dialog.c:942
 msgid "Connection"
 msgstr "Connessione"
 
-#: src/trg-preferences-dialog.c:810
+#: ../src/trg-preferences-dialog.c:853
 msgid "Host:"
 msgstr "Host:"
 
-#: src/trg-preferences-dialog.c:814
+#: ../src/trg-preferences-dialog.c:857
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/trg-preferences-dialog.c:817
+#: ../src/trg-preferences-dialog.c:859
+msgid "RPC URL Path:"
+msgstr "RPC URL:"
+
+#: ../src/trg-preferences-dialog.c:862
 msgid "Username:"
 msgstr "Nome utente:"
 
-#: src/trg-preferences-dialog.c:821
+#: ../src/trg-preferences-dialog.c:866
 msgid "Password:"
 msgstr "Password:"
 
-#: src/trg-preferences-dialog.c:823
+#: ../src/trg-preferences-dialog.c:868
 msgid "Automatically connect"
-msgstr "Connetti automaticamente"
+msgstr "Connessione automatica"
 
-#: src/trg-preferences-dialog.c:829
+#: ../src/trg-preferences-dialog.c:874
 msgid "SSL"
 msgstr "SSL"
 
-#: src/trg-preferences-dialog.c:836
+#: ../src/trg-preferences-dialog.c:877
+msgid "Validate SSL Certificate"
+msgstr "Verifica certificato SSL"
+
+#: ../src/trg-preferences-dialog.c:885
 msgid "Timeout:"
-msgstr "Tempo massimo:"
+msgstr "Timeout:"
 
-#: src/trg-preferences-dialog.c:840
+#: ../src/trg-preferences-dialog.c:889
 msgid "Retries:"
 msgstr "Tentativi:"
 
-#: src/trg-preferences-dialog.c:881 src/trg-toolbar.c:238
+#: ../src/trg-preferences-dialog.c:931 ../src/trg-toolbar.c:243
 msgid "Local Preferences"
 msgstr "Preferenze locali"
 
-#: src/trg-preferences-dialog.c:912
+#: ../src/trg-preferences-dialog.c:962
 msgid "Directories"
 msgstr "Directories"
 
-#: src/trg-remote-prefs-dialog.c:305
+#: ../src/trg-remote-prefs-dialog.c:309
 msgid "Bandwidth limits"
 msgstr "Limiti di banda"
 
-#: src/trg-remote-prefs-dialog.c:309
+#: ../src/trg-remote-prefs-dialog.c:313
 msgid "Down Limit (KiB/s)"
 msgstr "Limite di download (KiB/s)"
 
-#: src/trg-remote-prefs-dialog.c:316
+#: ../src/trg-remote-prefs-dialog.c:320
 msgid "Up Limit (KiB/s)"
 msgstr "Limite di upload (KiB/s)"
 
-#: src/trg-remote-prefs-dialog.c:321
+#: ../src/trg-remote-prefs-dialog.c:325
 msgid "Alternate limits"
-msgstr "Altri limiti"
+msgstr "Limiti alternativi"
 
-#: src/trg-remote-prefs-dialog.c:326
+#: ../src/trg-remote-prefs-dialog.c:330
 msgid "Alternate speed limits active"
-msgstr "Altri limiti di velocità attivi"
+msgstr "Limiti alternativi attivi"
 
-#: src/trg-remote-prefs-dialog.c:333
+#: ../src/trg-remote-prefs-dialog.c:337
 msgid "Alternate time range"
-msgstr "Intervallo di tempo"
+msgstr "Intervallo di tempo limiti alternativi"
 
-#: src/trg-remote-prefs-dialog.c:340
+#: ../src/trg-remote-prefs-dialog.c:344
 msgid "Alternate down limit (KiB/s)"
-msgstr "Altro limite di download (KiB/s)"
+msgstr "Limite di download alternativo (KiB/s)"
 
-#: src/trg-remote-prefs-dialog.c:345
+#: ../src/trg-remote-prefs-dialog.c:349
 msgid "Alternate up limit (KiB/s)"
-msgstr "Altro limite di upload (KiB/s)"
+msgstr "Limite di upload alternativo (KiB/s)"
 
-#: src/trg-remote-prefs-dialog.c:364
+#: ../src/trg-remote-prefs-dialog.c:368
 msgid "Seed ratio limit"
-msgstr "Limite del rapporto di seed"
+msgstr "Limite ratio seed"
 
-#: src/trg-remote-prefs-dialog.c:371
+#: ../src/trg-remote-prefs-dialog.c:375
 msgid "Queues"
 msgstr "Code"
 
-#: src/trg-remote-prefs-dialog.c:375
+#: ../src/trg-remote-prefs-dialog.c:379
 msgid "Download queue size"
 msgstr "Dimensione della coda di download"
 
-#: src/trg-remote-prefs-dialog.c:383
+#: ../src/trg-remote-prefs-dialog.c:387
 msgid "Seed queue size"
 msgstr "Dimensione della coda di seed"
 
-#: src/trg-remote-prefs-dialog.c:391
+#: ../src/trg-remote-prefs-dialog.c:395
 msgid "Ignore stalled (minutes)"
 msgstr "Ignora quelli in stallo (minuti)"
 
-#: src/trg-remote-prefs-dialog.c:404
+#: ../src/trg-remote-prefs-dialog.c:408
 msgid "Global peer limit"
 msgstr "Limite di peer globale"
 
-#: src/trg-remote-prefs-dialog.c:409
+#: ../src/trg-remote-prefs-dialog.c:413
 msgid "Per torrent peer limit"
 msgstr "Limite di peer per torrent"
 
-#: src/trg-remote-prefs-dialog.c:422
+#: ../src/trg-remote-prefs-dialog.c:426
 msgid "Retest"
 msgstr "Ricontrolla"
 
-#: src/trg-remote-prefs-dialog.c:433
+#: ../src/trg-remote-prefs-dialog.c:437
 msgid "Port is <span font_weight=\"bold\" fgcolor=\"darkgreen\">open</span>"
 msgstr ""
-"La porta è<span font_weight=\"bold\" fgcolor=\"darkgreen\">aperta</span>"
+"La porta è <span font_weight=\"bold\" fgcolor=\"darkgreen\">aperta</span>"
 
-#: src/trg-remote-prefs-dialog.c:437
+#: ../src/trg-remote-prefs-dialog.c:441
 msgid "Port is <span font_weight=\"bold\" fgcolor=\"red\">closed</span>"
 msgstr "La porta è <span font_weight=\"bold\" fgcolor=\"red\">chiusa</span>"
 
-#: src/trg-remote-prefs-dialog.c:453 src/trg-remote-prefs-dialog.c:522
+#: ../src/trg-remote-prefs-dialog.c:457 ../src/trg-remote-prefs-dialog.c:526
 msgid "Port test"
-msgstr "Test della porta"
+msgstr "Verifica stato porta"
 
-#: src/trg-remote-prefs-dialog.c:454
+#: ../src/trg-remote-prefs-dialog.c:458
 msgid "Testing..."
 msgstr "Verifica in corso..."
 
-#: src/trg-remote-prefs-dialog.c:469 src/trg-remote-prefs-dialog.c:577
+#: ../src/trg-remote-prefs-dialog.c:473 ../src/trg-remote-prefs-dialog.c:581
 msgid "Update"
 msgstr "Aggiornamento"
 
-#: src/trg-remote-prefs-dialog.c:474 src/trg-remote-prefs-dialog.c:568
+#: ../src/trg-remote-prefs-dialog.c:478 ../src/trg-remote-prefs-dialog.c:572
 #, c-format
 msgid "Blocklist (%ld entries)"
-msgstr "Lista nera (%ld voci)"
+msgstr "Blocklist (%ld voci)"
 
-#: src/trg-remote-prefs-dialog.c:516 src/trg-remote-prefs-dialog.c:698
+#: ../src/trg-remote-prefs-dialog.c:520 ../src/trg-remote-prefs-dialog.c:702
 msgid "Connections"
 msgstr "Connessioni"
 
-#: src/trg-remote-prefs-dialog.c:520
+#: ../src/trg-remote-prefs-dialog.c:524
 msgid "Peer port"
 msgstr "Porta peer"
 
-#: src/trg-remote-prefs-dialog.c:523
+#: ../src/trg-remote-prefs-dialog.c:527
 msgid "Test"
 msgstr "Test"
 
-#: src/trg-remote-prefs-dialog.c:527
+#: ../src/trg-remote-prefs-dialog.c:531
 msgid "Required"
 msgstr "Richiesta"
 
-#: src/trg-remote-prefs-dialog.c:528
+#: ../src/trg-remote-prefs-dialog.c:532
 msgid "Preferred"
 msgstr "Preferita"
 
-#: src/trg-remote-prefs-dialog.c:529
+#: ../src/trg-remote-prefs-dialog.c:533
 msgid "Tolerated"
 msgstr "Tollerata"
 
-#: src/trg-remote-prefs-dialog.c:540
+#: ../src/trg-remote-prefs-dialog.c:544
 msgid "Encryption"
 msgstr "Cifratura"
 
-#: src/trg-remote-prefs-dialog.c:544
+#: ../src/trg-remote-prefs-dialog.c:548
 msgid "Random peer port on start"
 msgstr "Porta peer casuale all'avvio"
 
-#: src/trg-remote-prefs-dialog.c:549
+#: ../src/trg-remote-prefs-dialog.c:553
 msgid "Peer port forwarding"
 msgstr "Redirezione della porta peer"
 
-#: src/trg-remote-prefs-dialog.c:552
+#: ../src/trg-remote-prefs-dialog.c:556
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: src/trg-remote-prefs-dialog.c:555
+#: ../src/trg-remote-prefs-dialog.c:559
 msgid "Peer exchange (PEX)"
-msgstr "Scambio dei peer (PEX)"
+msgstr "Peer exchange (PEX)"
 
-#: src/trg-remote-prefs-dialog.c:559
+#: ../src/trg-remote-prefs-dialog.c:563
 msgid "Distributed Hash Table (DHT)"
 msgstr "Tabella degli hash distribuita (DHT)"
 
-#: src/trg-remote-prefs-dialog.c:563
+#: ../src/trg-remote-prefs-dialog.c:567
 msgid "Local peer discovery"
 msgstr "Scoperta dei peer locali"
 
-#: src/trg-remote-prefs-dialog.c:566
+#: ../src/trg-remote-prefs-dialog.c:570
 msgid "Blocklist"
-msgstr "Lista nera"
+msgstr "Blocklist"
 
-#: src/trg-remote-prefs-dialog.c:586
+#: ../src/trg-remote-prefs-dialog.c:590
 msgid "Blocklist URL:"
-msgstr "URL della lista nera:"
+msgstr "URL della blocklist:"
 
-#: src/trg-remote-prefs-dialog.c:604
+#: ../src/trg-remote-prefs-dialog.c:608
 msgid "Environment"
 msgstr "Sistema"
 
-#: src/trg-remote-prefs-dialog.c:608
+#: ../src/trg-remote-prefs-dialog.c:612
 msgid "Download directory"
 msgstr "Directory di download"
 
-#: src/trg-remote-prefs-dialog.c:612
+#: ../src/trg-remote-prefs-dialog.c:616
 msgid "Incomplete download dir"
 msgstr "Directory dei file incompleti"
 
-#: src/trg-remote-prefs-dialog.c:619
+#: ../src/trg-remote-prefs-dialog.c:623
 msgid "Torrent done script"
 msgstr "Script per i torrent terminati"
 
-#: src/trg-remote-prefs-dialog.c:628
+#: ../src/trg-remote-prefs-dialog.c:632
 msgid "Cache size (MiB)"
-msgstr "Dimensione della cache(MiB)"
+msgstr "Dimensione della cache (MiB)"
 
-#: src/trg-remote-prefs-dialog.c:631
+#: ../src/trg-remote-prefs-dialog.c:635
 msgid "Behavior"
 msgstr "Comportamento"
 
-#: src/trg-remote-prefs-dialog.c:635
+#: ../src/trg-remote-prefs-dialog.c:639
 msgid "Rename partial files"
 msgstr "Rinomina i file incompleti"
 
-#: src/trg-remote-prefs-dialog.c:640
+#: ../src/trg-remote-prefs-dialog.c:644
 msgid "Trash original torrent files"
 msgstr "Cestina i file torrent originali"
 
-#: src/trg-remote-prefs-dialog.c:645
+#: ../src/trg-remote-prefs-dialog.c:649
 msgid "Start added torrents"
 msgstr "Avvia i torrents aggiunti"
 
-#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:242
+#: ../src/trg-remote-prefs-dialog.c:675 ../src/trg-toolbar.c:247
 msgid "Remote Preferences"
 msgstr "Preferenze remote"
 
-#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:409
+#: ../src/trg-remote-prefs-dialog.c:707 ../src/trg-torrent-props-dialog.c:404
 msgid "Bandwidth"
 msgstr "Banda"
 
-#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:636
+#: ../src/trg-remote-prefs-dialog.c:712 ../src/trg-torrent-props-dialog.c:631
 msgid "Limits"
 msgstr "Limiti"
 
-#: src/trg-state-selector.c:656
+#: ../src/trg-rss-window.c:197 ../src/util.c:351
+#, c-format
+msgid "Request failed with HTTP code %d"
+msgstr "Richiesta non riuscita con codice HTTP %d"
+
+#: ../src/trg-rss-window.c:214
+#, c-format
+msgid "Error parsing RSS feed \"%s\": %s"
+msgstr "Errore parsing feed RSS \"%s\": %s"
+
+#: ../src/trg-state-selector.c:675
 msgid "All"
 msgstr "Tutti"
 
-#: src/trg-state-selector.c:661 src/trg-state-selector.c:731
+#: ../src/trg-state-selector.c:680 ../src/trg-state-selector.c:753
 msgid "Queue Down"
 msgstr "Coda di download"
 
-#: src/trg-state-selector.c:668 src/trg-state-selector.c:735
+#: ../src/trg-state-selector.c:687 ../src/trg-state-selector.c:757
 msgid "Queue Up"
-msgstr "Coda di seed"
+msgstr "Coda di seeding"
 
-#: src/trg-state-selector.c:675
+#: ../src/trg-state-selector.c:694
 msgid "Complete"
-msgstr "Completati"
+msgstr "Completi"
 
-#: src/trg-state-selector.c:678
+#: ../src/trg-state-selector.c:697
 msgid "Incomplete"
 msgstr "Incompleti"
 
-#: src/trg-state-selector.c:681
+#: ../src/trg-state-selector.c:700
 msgid "Active"
 msgstr "Attivi"
 
-#: src/trg-stats-dialog.c:275
+#: ../src/trg-stats-dialog.c:296
 msgid "Statistics"
 msgstr "Statistiche"
 
-#: src/trg-stats-dialog.c:294
+#: ../src/trg-stats-dialog.c:315
 msgid "Version"
 msgstr "Versione"
 
-#: src/trg-stats-dialog.c:296
+#: ../src/trg-stats-dialog.c:317
 msgid "Download Total"
-msgstr "Totale scaricati"
+msgstr "Totale download"
 
-#: src/trg-stats-dialog.c:298
+#: ../src/trg-stats-dialog.c:319
 msgid "Upload Total"
-msgstr "Totale inviati"
+msgstr "Totale upload"
 
-#: src/trg-stats-dialog.c:300
+#: ../src/trg-stats-dialog.c:323
 msgid "Files Added"
 msgstr "Files aggiunti"
 
-#: src/trg-stats-dialog.c:302
+#: ../src/trg-stats-dialog.c:325
 msgid "Session Count"
-msgstr "Sessioni eseguite"
+msgstr "Sessioni totali"
 
-#: src/trg-stats-dialog.c:304
+#: ../src/trg-stats-dialog.c:327
 msgid "Time Active"
 msgstr "Tempo di esecuzione"
 
-#: src/trg-stats-dialog.c:309
+#: ../src/trg-stats-dialog.c:332
 msgid "Statistic"
 msgstr "Parametro"
 
-#: src/trg-stats-dialog.c:311
+#: ../src/trg-stats-dialog.c:334
 msgid "Session"
 msgstr "Sessione"
 
-#: src/trg-stats-dialog.c:314
+#: ../src/trg-stats-dialog.c:337
 msgid "Cumulative"
 msgstr "Cumulativo"
 
-#: src/trg-status-bar.c:142
+#: ../src/trg-status-bar.c:145
 #, c-format
-msgid "Connected: %s (Transmission %g)"
-msgstr "Connessio: %s (Transmission %g)"
+msgid "Connected: %s :: Transmission %s"
+msgstr "Connesso a %s :: Transmission %s"
 
-#: src/trg-status-bar.c:160
+#: ../src/trg-status-bar.c:163
 msgid "Updating torrents..."
-msgstr "Aggiornamento dei torrents..."
+msgstr "Aggiornamento dei torrent..."
 
-#: src/trg-status-bar.c:173
+#: ../src/trg-status-bar.c:176
 #, c-format
 msgid "Free space: %s"
 msgstr "Spazio libero: %s"
 
-#: src/trg-status-bar.c:185
+#: ../src/trg-status-bar.c:188
 msgid "Disable alternate speed limits"
-msgstr "Disabilita altri limiti di velocità"
+msgstr "Disabilita limiti alternativi"
 
-#: src/trg-status-bar.c:186
+#: ../src/trg-status-bar.c:189
 msgid "Enable alternate speed limits"
-msgstr "Abilita altri limiti di velocità"
+msgstr "Abilita limiti alternativi"
 
-#: src/trg-status-bar.c:223 src/trg-status-bar.c:230
+#: ../src/trg-status-bar.c:226 ../src/trg-status-bar.c:233
 #, c-format
 msgid " (Limit: %s)"
 msgstr " (Limite: %s)"
 
-#: src/trg-status-bar.c:235
+#: ../src/trg-status-bar.c:238
 #, c-format
 msgid "Down: %s%s, Up: %s%s"
 msgstr "Down: %s%s, Up: %s%s"
 
-#: src/trg-toolbar.c:231
-msgid "Remove with data"
-msgstr "Rimuovi con i dati"
-
-#: src/trg-torrent-add-dialog.c:460
+#: ../src/trg-torrent-add-dialog.c:392
 msgid "Torrent files"
 msgstr "File torrent"
 
-#: src/trg-torrent-add-dialog.c:465
+#: ../src/trg-torrent-add-dialog.c:397
 msgid "All files"
 msgstr "Tutti i file"
 
-#: src/trg-torrent-add-dialog.c:497
+#: ../src/trg-torrent-add-dialog.c:432
 msgid ""
 "Unable to parse torrent file. File preferences unavailable, but you can "
 "still try uploading it."
@@ -1091,52 +1196,69 @@ msgstr ""
 "Errore nel parsing del file torrent. Preferenze del file non disponibili, ma "
 "puoi provare a effettuare l'upload del file."
 
-#: src/trg-torrent-add-dialog.c:510
+#: ../src/trg-torrent-add-dialog.c:445
 #, c-format
 msgid "Unable to open torrent file: %s"
 msgstr "Errore nell'apertura del file torrent: %s"
 
-#: src/trg-torrent-add-dialog.c:576
+#: ../src/trg-torrent-add-dialog.c:538
 msgid "(None)"
 msgstr "(Nessuno)"
 
-#: src/trg-torrent-add-dialog.c:578
+#: ../src/trg-torrent-add-dialog.c:540
 msgid "(Multiple)"
 msgstr "(Multipli)"
 
-#: src/trg-torrent-add-dialog.c:601
+#: ../src/trg-torrent-add-dialog.c:563
 msgid "Add a Torrent"
 msgstr "Aggiungi un torrent"
 
-#: src/trg-torrent-add-dialog.c:744
+#: ../src/trg-torrent-add-dialog.c:656 ../src/trg-files-tree-view-common.c:54
+msgid "High Priority"
+msgstr "Priorità alta"
+
+#: ../src/trg-torrent-add-dialog.c:659 ../src/trg-files-tree-view-common.c:58
+msgid "Normal Priority"
+msgstr "Priorità normale"
+
+#: ../src/trg-torrent-add-dialog.c:662 ../src/trg-files-tree-view-common.c:62
+msgid "Low Priority"
+msgstr "Priorità bassa"
+
+#: ../src/trg-torrent-add-dialog.c:668 ../src/trg-files-tree-view-common.c:73
+msgid "Skip"
+msgstr "Salta"
+
+#. window
+#: ../src/trg-torrent-add-dialog.c:707
 msgid "Add Torrent"
 msgstr "Aggiungi Torrent"
 
-#: src/trg-torrent-add-dialog.c:769
+#: ../src/trg-torrent-add-dialog.c:730
 msgid "Start _paused"
 msgstr "Avvia in _pausa"
 
-#: src/trg-torrent-add-dialog.c:785
+#: ../src/trg-torrent-add-dialog.c:747
 msgid "_Torrent file:"
 msgstr "File _torrent:"
 
-#: src/trg-torrent-add-dialog.c:801
+#: ../src/trg-torrent-add-dialog.c:766
 msgid "_Destination folder:"
-msgstr "Directory di destinazione:"
+msgstr "_Directory di destinazione:"
 
-#: src/trg-torrent-add-dialog.c:815
+#: ../src/trg-torrent-add-dialog.c:775
 msgid "Apply to all:"
 msgstr "Applica a tutti:"
 
-#: src/trg-torrent-add-dialog.c:825
+#: ../src/trg-torrent-add-dialog.c:777
 msgid "Torrent _priority:"
 msgstr "_Priorità del torrent:"
 
-#: src/trg-torrent-add-dialog.c:926
+#: ../src/trg-torrent-add-dialog.c:893
 msgid "Show _options dialog"
 msgstr "Mostra la finestra delle _opzioni"
 
-#: src/trg-torrent-add-url-dialog.c:61
+#: ../src/trg-torrent-add-url-dialog.c:65
 msgid ""
 "You are trying to add a magnet torrent, but DHT is disabled. Distributed "
 "Hash Table (DHT) should be enabled in remote settings."
@@ -1145,338 +1267,341 @@ msgstr ""
 "Tabella degli Hash Distribuita (DHT) dovrebbe essere abilitata nelle "
 "impostazioni remote."
 
-#: src/trg-torrent-add-url-dialog.c:120
+#: ../src/trg-torrent-add-url-dialog.c:124
 msgid "URL:"
 msgstr "URL:"
 
-#: src/trg-torrent-add-url-dialog.c:123
+#: ../src/trg-torrent-add-url-dialog.c:127
 msgid "Start Paused"
 msgstr "Avvia in pausa"
 
-#: src/trg-torrent-add-url-dialog.c:126
+#: ../src/trg-torrent-add-url-dialog.c:130
 msgid "Add torrent from URL"
 msgstr "Aggiungi torrent da URL"
 
-#: src/trg-torrent-graph.c:410
+#: ../src/trg-torrent-graph.c:415
 msgid "Total Uploading"
 msgstr "Totale in upload"
 
-#: src/trg-torrent-graph.c:418
+#: ../src/trg-torrent-graph.c:423
 msgid "Total Downloading"
 msgstr "Totale in download"
 
-#: src/trg-torrent-model.c:407
+#: ../src/trg-torrent-model.c:407
 msgid "Default"
-msgstr "Predefinita"
+msgstr "Predefinito"
 
-#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:260
+#: ../src/trg-torrent-move-dialog.c:119 ../src/trg-torrent-props-dialog.c:255
 msgid "Location:"
 msgstr "Posizione:"
 
-#: src/trg-torrent-move-dialog.c:163
+#: ../src/trg-torrent-move-dialog.c:166
 #, c-format
 msgid "Move %s"
 msgstr "Sposta %s"
 
-#: src/trg-torrent-move-dialog.c:165
+#: ../src/trg-torrent-move-dialog.c:168
 #, c-format
 msgid "Move %d torrents"
 msgstr "Sposta %d torrents"
 
-#: src/trg-torrent-props-dialog.c:206
+#: ../src/trg-torrent-props-dialog.c:201
 msgid "Activity"
 msgstr "Attività"
 
-#: src/trg-torrent-props-dialog.c:211
+#: ../src/trg-torrent-props-dialog.c:206
 msgid "Torrent size:"
 msgstr "Dimensione torrent:"
 
-#: src/trg-torrent-props-dialog.c:216
+#: ../src/trg-torrent-props-dialog.c:211
 msgid "Have:"
 msgstr "Posseduti:"
 
-#: src/trg-torrent-props-dialog.c:221
+#: ../src/trg-torrent-props-dialog.c:216
 msgid "Downloaded:"
-msgstr "Scaricati:"
+msgstr "Downloaded:"
 
-#: src/trg-torrent-props-dialog.c:226
+#: ../src/trg-torrent-props-dialog.c:221
 msgid "Uploaded:"
-msgstr "Inviati:"
+msgstr "Uploaded:"
 
-#: src/trg-torrent-props-dialog.c:231
+#: ../src/trg-torrent-props-dialog.c:226
 msgid "State:"
 msgstr "Stato:"
 
-#: src/trg-torrent-props-dialog.c:236
+#: ../src/trg-torrent-props-dialog.c:231
 msgid "Running time:"
 msgstr "Tempo di esecuzione:"
 
-#: src/trg-torrent-props-dialog.c:241
+#: ../src/trg-torrent-props-dialog.c:236
 msgid "Remaining time:"
 msgstr "Tempo rimanente:"
 
-#: src/trg-torrent-props-dialog.c:246
+#: ../src/trg-torrent-props-dialog.c:241
 msgid "Last activity:"
 msgstr "Ultima attività:"
 
-#: src/trg-torrent-props-dialog.c:251
+#: ../src/trg-torrent-props-dialog.c:246
 msgid "Error:"
 msgstr "Errore:"
 
-#: src/trg-torrent-props-dialog.c:255
+#: ../src/trg-torrent-props-dialog.c:250
 msgid "Details"
 msgstr "Dettagli"
 
-#: src/trg-torrent-props-dialog.c:266
+#: ../src/trg-torrent-props-dialog.c:261
 msgid "Hash:"
 msgstr "Hash:"
 
-#: src/trg-torrent-props-dialog.c:272
+#: ../src/trg-torrent-props-dialog.c:267
 msgid "Privacy:"
 msgstr "Privacy:"
 
-#: src/trg-torrent-props-dialog.c:278
+#: ../src/trg-torrent-props-dialog.c:273
 msgid "Origin:"
 msgstr "Origine:"
 
-#: src/trg-torrent-props-dialog.c:295
+#: ../src/trg-torrent-props-dialog.c:290
 msgid "Comment:"
 msgstr "Commento:"
 
-#: src/trg-torrent-props-dialog.c:330
+#: ../src/trg-torrent-props-dialog.c:325
 msgid "Private to this tracker -- DHT and PEX disabled"
-msgstr "Privato per questo server traccia -- DHT e PEX disabilitati"
+msgstr "Privato per questo tracker -- DHT e PEX disabilitati"
 
-#: src/trg-torrent-props-dialog.c:332
+#: ../src/trg-torrent-props-dialog.c:327
 msgid "Public torrent"
 msgstr "Torrent pubblico"
 
-#: src/trg-torrent-props-dialog.c:342
+#: ../src/trg-torrent-props-dialog.c:337
 #, c-format
 msgid "Created on %1$s"
 msgstr "Creato in data %1$s"
 
-#: src/trg-torrent-props-dialog.c:344
+#: ../src/trg-torrent-props-dialog.c:339
 #, c-format
 msgid "Created by %1$s on %2$s"
 msgstr "Creato da %1$s in data %2$s"
 
-#: src/trg-torrent-props-dialog.c:376
+#: ../src/trg-torrent-props-dialog.c:371
 msgid "No errors"
 msgstr "Nessun errore"
 
-#: src/trg-torrent-props-dialog.c:380
+#: ../src/trg-torrent-props-dialog.c:375
 msgid "Active now"
-msgstr "Attualmente attivo"
+msgstr "Ora attivo"
 
-#: src/trg-torrent-props-dialog.c:413
+#: ../src/trg-torrent-props-dialog.c:408
 msgid "Honor global limits"
 msgstr "Rispetta i limiti globali"
 
-#: src/trg-torrent-props-dialog.c:423
+#: ../src/trg-torrent-props-dialog.c:418
 msgid "Torrent priority:"
 msgstr "Priorità del torrent:"
 
-#: src/trg-torrent-props-dialog.c:429
+#: ../src/trg-torrent-props-dialog.c:424
 msgid "Queue Position:"
 msgstr "Posizione in coda:"
 
-#: src/trg-torrent-props-dialog.c:434
+#: ../src/trg-torrent-props-dialog.c:429
 msgid "Limit download speed (KiB/s)"
-msgstr "Limita la velocità di download (KiB/s)"
+msgstr "Limite download (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:442
+#: ../src/trg-torrent-props-dialog.c:437
 msgid "Limit upload speed (KiB/s)"
-msgstr "Limita la velocità di upload (KiB/s)"
+msgstr "Limite upload (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:450
+#: ../src/trg-torrent-props-dialog.c:445
 msgid "Use global settings"
-msgstr "Usa le impostazioni globali"
+msgstr "Limite globale"
 
-#: src/trg-torrent-props-dialog.c:451
+#: ../src/trg-torrent-props-dialog.c:446
 msgid "Stop seeding at ratio"
-msgstr "Ferma il seeding al rapporto"
+msgstr "Limite personalizzato"
 
-#: src/trg-torrent-props-dialog.c:452
+#: ../src/trg-torrent-props-dialog.c:447
 msgid "Seed regardless of ratio"
-msgstr "Distribuisci senza tener conto del rapporto"
+msgstr "Nessun limite"
 
-#: src/trg-torrent-props-dialog.c:455
+#: ../src/trg-torrent-props-dialog.c:450
 msgid "Seed ratio mode:"
-msgstr "Modalità di rapporto del seed:"
+msgstr "Modalità di ratio:"
 
-#: src/trg-torrent-props-dialog.c:463
+#: ../src/trg-torrent-props-dialog.c:458
 msgid "Seed ratio limit:"
-msgstr "Limite del rapporto di seeding:"
+msgstr "Limite ratio:"
 
-#: src/trg-torrent-props-dialog.c:469
+#: ../src/trg-torrent-props-dialog.c:464
 msgid "Peer limit:"
 msgstr "Limite di peer:"
 
-#: src/trg-torrent-props-dialog.c:542
+#: ../src/trg-torrent-props-dialog.c:537
 #, c-format
 msgid "Multiple (%d) torrent properties"
 msgstr "Proprietà di torrent multipli (%d)"
 
-#: src/trg-torrent-props-dialog.c:574
+#: ../src/trg-torrent-props-dialog.c:569
 msgid "Information"
 msgstr "Informazione"
 
-#: src/trg-torrent-tree-view.c:60
+#: ../src/trg-torrent-tree-view.c:64
 msgid "Done"
-msgstr "Fatto"
+msgstr "Completato"
 
-#: src/trg-torrent-tree-view.c:65
+#: ../src/trg-torrent-tree-view.c:69
 msgid "Seeds"
 msgstr "Seeds"
 
-#: src/trg-torrent-tree-view.c:67
+#: ../src/trg-torrent-tree-view.c:71
 msgid "Sending"
 msgstr "Invio in corso"
 
-#: src/trg-torrent-tree-view.c:73
+#: ../src/trg-torrent-tree-view.c:77
 msgid "Downloads"
-msgstr "Scaricati"
+msgstr "Download"
 
-#: src/trg-torrent-tree-view.c:76
+#: ../src/trg-torrent-tree-view.c:80
 msgid "Receiving"
 msgstr "In ricezione"
 
-#: src/trg-torrent-tree-view.c:80
+#: ../src/trg-torrent-tree-view.c:84
 msgid "Connected"
 msgstr "Connesso"
 
-#: src/trg-torrent-tree-view.c:82
+#: ../src/trg-torrent-tree-view.c:86
 msgid "PEX Peers"
-msgstr "Peers PEX"
+msgstr "Peer PEX"
 
-#: src/trg-torrent-tree-view.c:87
+#: ../src/trg-torrent-tree-view.c:91
 msgid "DHT Peers"
-msgstr "Peers DHT"
+msgstr "Peer DHT"
 
-#: src/trg-torrent-tree-view.c:93
+#: ../src/trg-torrent-tree-view.c:97
 msgid "Tracker Peers"
-msgstr "Peers Tracker"
+msgstr "Peer Tracker"
 
-#: src/trg-torrent-tree-view.c:97
+#: ../src/trg-torrent-tree-view.c:101
 msgid "LTEP Peers"
-msgstr "Peers LTEP"
+msgstr "Peer LTEP"
 
-#: src/trg-torrent-tree-view.c:102
+#: ../src/trg-torrent-tree-view.c:106
 msgid "Resumed Peers"
-msgstr "Peers recuperati"
+msgstr "Peer recuperati"
 
-#: src/trg-torrent-tree-view.c:108
+#: ../src/trg-torrent-tree-view.c:112
 msgid "Incoming Peers"
-msgstr "Peers in ingresso"
+msgstr "Peer in ingresso"
 
-#: src/trg-torrent-tree-view.c:113
+#: ../src/trg-torrent-tree-view.c:117
 msgid "Peers T/I/E/H/X/L/R"
-msgstr "Peers T/I/E/H/X/L/R"
+msgstr "Peer T/I/E/H/X/L/R"
 
-#: src/trg-torrent-tree-view.c:133
+#: ../src/trg-torrent-tree-view.c:137
 msgid "Added"
 msgstr "Aggiunto"
 
-#: src/trg-torrent-tree-view.c:136
+#: ../src/trg-torrent-tree-view.c:140
 msgid "First Tracker"
 msgstr "Primo Tracker"
 
-#: src/trg-torrent-tree-view.c:142
+#: ../src/trg-torrent-tree-view.c:146
 msgid "ID"
 msgstr "ID"
 
-#: src/trg-torrent-tree-view.c:148
+#: ../src/trg-torrent-tree-view.c:152
 msgid "Queue Position"
 msgstr "Posizione in coda"
 
-#: src/trg-torrent-tree-view.c:154
+#: ../src/trg-torrent-tree-view.c:158
 msgid "Last Active"
-msgstr "Attivo l'ultima volta"
+msgstr "Ultima attivita"
 
-#: src/trg-trackers-tree-view.c:168
+#: ../src/trg-trackers-tree-view.c:172
 msgid "Tier"
 msgstr "Ordine"
 
-#: src/trg-trackers-tree-view.c:174
+#: ../src/trg-trackers-tree-view.c:178
 msgid "Announce URL"
 msgstr "URL di annuncio"
 
-#: src/trg-trackers-tree-view.c:192
+#: ../src/trg-trackers-tree-view.c:196
 msgid "Seeder Count"
 msgstr "Numero di seeder"
 
-#: src/trg-trackers-tree-view.c:195
+#: ../src/trg-trackers-tree-view.c:199
 msgid "Leecher Count"
 msgstr "Numero di leecher"
 
-#: src/trg-trackers-tree-view.c:199
+#: ../src/trg-trackers-tree-view.c:203
 msgid "Last Announce"
 msgstr "Ultimo annuncio"
 
-#: src/trg-trackers-tree-view.c:202
+#: ../src/trg-trackers-tree-view.c:206
 msgid "Last Result"
 msgstr "Ultimo risultato"
 
-#: src/trg-trackers-tree-view.c:204
+#: ../src/trg-trackers-tree-view.c:208
 msgid "Scrape URL"
 msgstr "Scrape URL"
 
-#: src/trg-trackers-tree-view.c:206
+#: ../src/trg-trackers-tree-view.c:210
 msgid "Last Scrape"
 msgstr "Ultimo scrape"
 
-#: src/trg-trackers-tree-view.c:305
+#: ../src/trg-trackers-tree-view.c:309
 msgid "Delete"
-msgstr "Cancella"
+msgstr "Elimina"
 
-#: src/trg-tree-view.c:269
+#: ../src/trg-tree-view.c:281
 msgid "Ascending"
 msgstr "Crescente"
 
-#: src/trg-tree-view.c:279
+#: ../src/trg-tree-view.c:291
 msgid "Descending"
 msgstr "Decrescente"
 
-#: src/util.c:340
+#: ../src/trg-files-tree-view-common.c:80
+msgid "Expand All"
+msgstr "Espandi tutto"
+
+#: ../src/trg-files-tree-view-common.c:85
+msgid "Collapse All"
+msgstr "Contrai tutto"
+
+#: ../src/util.c:342
 msgid "JSON decoding error."
 msgstr "Errore di decodifica JSON."
 
-#: src/util.c:345
+#: ../src/util.c:347
 msgid "Server responded, but with no result."
 msgstr "Il server ha risposto, ma senza risultato"
 
-#: src/util.c:349
-#, c-format
-msgid "Request failed with HTTP code %d"
-msgstr "Richiesta non riuscita con codice HTTP %d"
-
-#: src/util.c:383
+#: ../src/util.c:385 ../src/util.c:529
 msgid "None"
 msgstr "Nessuno"
 
-#: src/util.c:429
+#: ../src/util.c:431
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d giorno"
 msgstr[1] "%d giorni"
 
-#: src/util.c:430
+#: ../src/util.c:432
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ora"
 msgstr[1] "%d ore"
 
-#: src/util.c:432
+#: ../src/util.c:434
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minuti"
 
-#: src/util.c:435
+#: ../src/util.c:437
 #, c-format
 msgid "%ld second"
 msgid_plural "%ld seconds"
diff --git a/po/ko.po b/po/ko.po
index cf706cf..167b4d5 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-05 22:09+0100\n"
+"POT-Creation-Date: 2013-06-09 23:41+0100\n"
 "PO-Revision-Date: 2012-05-19 01:21+0000\n"
 "Last-Translator: digitie <digitie@gmail.com>\n"
 "Language-Team: none\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2013-06-09 22:28+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2014-06-12 07:44+0000\n"
+"X-Generator: Launchpad (build 17045)\n"
 "Language: Korean\n"
 
 #: src/torrent.c:360 src/torrent.c:380
@@ -44,7 +44,7 @@ msgid "Queued seed"
 msgstr ""
 
 #: src/torrent.c:372 src/torrent.c:386 src/trg-remote-prefs-dialog.c:360
-#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:447
+#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:438
 msgid "Seeding"
 msgstr "배�"
 
@@ -156,18 +156,18 @@ msgstr[1] ""
 msgid "A remote client to transmission-daemon."
 msgstr "트랜스미션 �몬� �격 ���언트."
 
-#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2011
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:416
+#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2025
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:407
 msgid "Low"
 msgstr "낮�"
 
-#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2007
-#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:418
+#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2021
+#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:409
 msgid "High"
 msgstr "높�"
 
-#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2009
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:417
+#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2023
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:408
 msgid "Normal"
 msgstr "보통"
 
@@ -175,12 +175,12 @@ msgstr "보통"
 msgid "Mixed"
 msgstr ""
 
-#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:280
+#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:278
 #: src/trg-torrent-add-dialog.c:348 src/trg-torrent-tree-view.c:52
 msgid "Name"
 msgstr "�름"
 
-#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:283
+#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:281
 #: src/trg-torrent-add-dialog.c:366 src/trg-torrent-tree-view.c:57
 msgid "Size"
 msgstr "�기"
@@ -194,7 +194,7 @@ msgstr "진행량"
 msgid "Download"
 msgstr "다운로드"
 
-#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2000
+#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2014
 #: src/trg-torrent-add-dialog.c:395 src/trg-torrent-tree-view.c:145
 msgid "Priority"
 msgstr "우선순위"
@@ -223,7 +223,7 @@ msgstr ""
 msgid "Collapse All"
 msgstr ""
 
-#: src/trg-general-panel.c:153 src/trg-general-panel.c:214
+#: src/trg-general-panel.c:153 src/trg-general-panel.c:212
 msgid "N/A"
 msgstr "알수없�"
 
@@ -235,62 +235,62 @@ msgstr ""
 msgid "(Public)"
 msgstr ""
 
-#: src/trg-general-panel.c:202 src/trg-main-window.c:1097
-#: src/trg-main-window.c:1505 src/trg-main-window.c:2135
+#: src/trg-general-panel.c:200 src/trg-main-window.c:1106
+#: src/trg-main-window.c:1519 src/trg-main-window.c:2149
 #: src/trg-state-selector.c:538 src/trg-torrent-add-url-dialog.c:67
-#: src/util.c:331
+#: src/util.c:333
 msgid "Error"
 msgstr "오류"
 
-#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:123
+#: src/trg-general-panel.c:283 src/trg-torrent-tree-view.c:123
 msgid "ETA"
 msgstr "남� 시간"
 
-#: src/trg-general-panel.c:287 src/trg-torrent-tree-view.c:151
+#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:151
 msgid "Completed"
 msgstr "완료�"
 
-#: src/trg-general-panel.c:290
+#: src/trg-general-panel.c:288
 msgid "Seeders"
 msgstr "시�"
 
-#: src/trg-general-panel.c:292
+#: src/trg-general-panel.c:290
 msgid "Rate Down"
 msgstr "다운로드 ��"
 
-#: src/trg-general-panel.c:294 src/trg-torrent-tree-view.c:128
+#: src/trg-general-panel.c:292 src/trg-torrent-tree-view.c:128
 msgid "Downloaded"
 msgstr "다운로드 �"
 
-#: src/trg-general-panel.c:297 src/trg-torrent-tree-view.c:70
+#: src/trg-general-panel.c:295 src/trg-torrent-tree-view.c:70
 msgid "Leechers"
 msgstr "리�"
 
-#: src/trg-general-panel.c:299
+#: src/trg-general-panel.c:297
 msgid "Rate Up"
 msgstr "업로드 ��"
 
-#: src/trg-general-panel.c:301 src/trg-torrent-tree-view.c:125
+#: src/trg-general-panel.c:299 src/trg-torrent-tree-view.c:125
 msgid "Uploaded"
 msgstr "업로드 함"
 
-#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:63
+#: src/trg-general-panel.c:302 src/trg-torrent-tree-view.c:63
 msgid "Status"
 msgstr "�태"
 
-#: src/trg-general-panel.c:306 src/trg-torrent-tree-view.c:131
+#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:131
 msgid "Ratio"
 msgstr "비율"
 
-#: src/trg-general-panel.c:309
+#: src/trg-general-panel.c:307
 msgid "Comment"
 msgstr ""
 
-#: src/trg-general-panel.c:312
+#: src/trg-general-panel.c:310
 msgid "Completed At"
 msgstr ""
 
-#: src/trg-general-panel.c:316 src/trg-torrent-tree-view.c:139
+#: src/trg-general-panel.c:314 src/trg-torrent-tree-view.c:139
 msgid "Location"
 msgstr "위치"
 
@@ -302,189 +302,189 @@ msgstr ""
 msgid "This torrent has been added."
 msgstr ""
 
-#: src/trg-main-window.c:596
+#: src/trg-main-window.c:600
 msgid "No hostname set"
 msgstr "호스트를 설정하지 않았습니다"
 
-#: src/trg-main-window.c:599
+#: src/trg-main-window.c:603
 msgid "Unknown error getting settings"
 msgstr "설정� 얻어오는 중 알수없는 �러가 발�하였습니다"
 
-#: src/trg-main-window.c:614
+#: src/trg-main-window.c:623
 msgid "Connecting..."
 msgstr "연결중..."
 
-#: src/trg-main-window.c:873
+#: src/trg-main-window.c:882
 #, c-format
 msgid "<big><b>Remove torrent \"%s\"?</b></big>"
 msgstr "<big><b>\"%s\" 토렌트를 제거하시겠습니까?</b></big>"
 
-#: src/trg-main-window.c:874
+#: src/trg-main-window.c:883
 #, c-format
 msgid "<big><b>Remove %d torrents?</b></big>"
 msgstr "<big><b>%d 개� 토렌트를 제거하시겠습니까?</b></big>"
 
-#: src/trg-main-window.c:896
+#: src/trg-main-window.c:905
 #, c-format
 msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
 msgstr "<big><b>\"%s\" 토렌트를 삭제하고 제거하시겠습니까?</b></big>"
 
-#: src/trg-main-window.c:898
+#: src/trg-main-window.c:907
 #, c-format
 msgid "<big><b>Remove and delete %d torrents?</b></big>"
 msgstr "<big><b>%d 개� 토렌트를 삭제하고 제거하시겠습니까?</b></big>"
 
-#: src/trg-main-window.c:981 src/trg-preferences-dialog.c:897
+#: src/trg-main-window.c:990 src/trg-preferences-dialog.c:899
 #: src/trg-remote-prefs-dialog.c:693
 msgid "General"
 msgstr "�반"
 
-#: src/trg-main-window.c:990 src/trg-torrent-props-dialog.c:622
+#: src/trg-main-window.c:999 src/trg-torrent-props-dialog.c:613
 msgid "Trackers"
 msgstr "트래커"
 
-#: src/trg-main-window.c:998 src/trg-torrent-props-dialog.c:591
+#: src/trg-main-window.c:1007 src/trg-torrent-props-dialog.c:582
 msgid "Files"
 msgstr "파�"
 
-#: src/trg-main-window.c:1006 src/trg-remote-prefs-dialog.c:399
-#: src/trg-torrent-props-dialog.c:465 src/trg-torrent-props-dialog.c:605
+#: src/trg-main-window.c:1015 src/trg-remote-prefs-dialog.c:399
+#: src/trg-torrent-props-dialog.c:456 src/trg-torrent-props-dialog.c:596
 #: src/trg-trackers-tree-view.c:190
 msgid "Peers"
 msgstr "피어"
 
-#: src/trg-main-window.c:1089
+#: src/trg-main-window.c:1098
 #, c-format
 msgid "This application supports Transmission %g and later, you have %g."
 msgstr ""
 
-#: src/trg-main-window.c:1155 src/trg-status-bar.c:74 src/trg-status-bar.c:104
+#: src/trg-main-window.c:1164 src/trg-status-bar.c:74 src/trg-status-bar.c:104
 msgid "Disconnected"
 msgstr ""
 
-#: src/trg-main-window.c:1200
+#: src/trg-main-window.c:1209
 #, c-format
 msgid "%d Downloading @ %s"
 msgstr ""
 
-#: src/trg-main-window.c:1207
+#: src/trg-main-window.c:1216
 #, c-format
 msgid "%d Seeding @ %s"
 msgstr ""
 
-#: src/trg-main-window.c:1258
+#: src/trg-main-window.c:1267
 #, c-format
 msgid "Request %d/%d failed: %s"
 msgstr "%d/%d 요청 실패: %s"
 
-#: src/trg-main-window.c:2055
+#: src/trg-main-window.c:2069
 msgid "No Limit"
 msgstr "제한없�"
 
-#: src/trg-main-window.c:2156 src/trg-menu-bar.c:675 src/trg-toolbar.c:223
+#: src/trg-main-window.c:2170 src/trg-menu-bar.c:675 src/trg-toolbar.c:224
 msgid "Properties"
 msgstr "�성"
 
-#: src/trg-main-window.c:2159 src/trg-toolbar.c:216
+#: src/trg-main-window.c:2173 src/trg-toolbar.c:217
 msgid "Resume"
 msgstr "다시시작"
 
-#: src/trg-main-window.c:2162 src/trg-toolbar.c:219
+#: src/trg-main-window.c:2176 src/trg-toolbar.c:220
 msgid "Pause"
 msgstr "멈춤"
 
-#: src/trg-main-window.c:2165
+#: src/trg-main-window.c:2179
 msgid "Verify"
 msgstr "검사"
 
-#: src/trg-main-window.c:2168
+#: src/trg-main-window.c:2182
 msgid "Re-announce"
 msgstr "다시 알림"
 
-#: src/trg-main-window.c:2171 src/trg-torrent-move-dialog.c:119
+#: src/trg-main-window.c:2185 src/trg-torrent-move-dialog.c:119
 #: src/trg-torrent-move-dialog.c:126
 msgid "Move"
 msgstr "옮기기"
 
-#: src/trg-main-window.c:2174 src/trg-menu-bar.c:706 src/trg-toolbar.c:227
+#: src/trg-main-window.c:2188 src/trg-menu-bar.c:706 src/trg-toolbar.c:228
 msgid "Remove"
 msgstr "제거"
 
-#: src/trg-main-window.c:2177
+#: src/trg-main-window.c:2191
 msgid "Remove & Delete"
 msgstr "파�� 삭제하고 제거"
 
-#: src/trg-main-window.c:2201 src/trg-preferences-dialog.c:907
+#: src/trg-main-window.c:2215 src/trg-preferences-dialog.c:909
 msgid "Actions"
 msgstr ""
 
-#: src/trg-main-window.c:2230 src/trg-menu-bar.c:722
+#: src/trg-main-window.c:2244 src/trg-menu-bar.c:722
 msgid "Start Now"
 msgstr ""
 
-#: src/trg-main-window.c:2233 src/trg-menu-bar.c:727
+#: src/trg-main-window.c:2247 src/trg-menu-bar.c:727
 msgid "Move Up Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2236 src/trg-menu-bar.c:734
+#: src/trg-main-window.c:2250 src/trg-menu-bar.c:734
 msgid "Move Down Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2239 src/trg-menu-bar.c:741
+#: src/trg-main-window.c:2253 src/trg-menu-bar.c:741
 msgid "Bottom Of Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2242 src/trg-menu-bar.c:745
+#: src/trg-main-window.c:2256 src/trg-menu-bar.c:745
 msgid "Top Of Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2251 src/trg-main-window.c:2334
+#: src/trg-main-window.c:2265 src/trg-main-window.c:2348
 msgid "Down Limit"
 msgstr "다운로드 ��제한"
 
-#: src/trg-main-window.c:2256 src/trg-main-window.c:2338
+#: src/trg-main-window.c:2270 src/trg-main-window.c:2352
 msgid "Up Limit"
 msgstr "업로드 ��제한"
 
-#: src/trg-main-window.c:2285 src/trg-main-window.c:2292
+#: src/trg-main-window.c:2299 src/trg-main-window.c:2306
 #: src/trg-remote-prefs-dialog.c:497
 msgid "Updating..."
 msgstr "업��트 중..."
 
-#: src/trg-main-window.c:2306 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
+#: src/trg-main-window.c:2320 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
 msgid "Connect"
 msgstr "ì—°ê²°"
 
-#: src/trg-main-window.c:2313 src/trg-toolbar.c:206
+#: src/trg-main-window.c:2327 src/trg-toolbar.c:207
 msgid "Disconnect"
 msgstr "연결 �기"
 
-#: src/trg-main-window.c:2317 src/trg-toolbar.c:209
+#: src/trg-main-window.c:2331 src/trg-toolbar.c:210
 #: src/trg-trackers-tree-view.c:284 src/trg-trackers-tree-view.c:311
 msgid "Add"
 msgstr "파� 추가"
 
-#: src/trg-main-window.c:2321
+#: src/trg-main-window.c:2335
 msgid "Add from URL"
 msgstr "주소 추가"
 
-#: src/trg-main-window.c:2325
+#: src/trg-main-window.c:2339
 msgid "Resume All"
 msgstr ""
 
-#: src/trg-main-window.c:2329
+#: src/trg-main-window.c:2343
 msgid "Pause All"
 msgstr ""
 
-#: src/trg-main-window.c:2345
+#: src/trg-main-window.c:2359
 msgid "Quit"
 msgstr ""
 
-#: src/trg-main-window.c:2459 src/trg-menu-bar.c:536
+#: src/trg-main-window.c:2473 src/trg-menu-bar.c:536
 msgid "Graph"
 msgstr "그래프"
 
-#: src/trg-main-window.c:2647
+#: src/trg-main-window.c:2662
 msgid "Transmission Remote"
 msgstr ""
 
@@ -692,7 +692,7 @@ msgstr ""
 msgid "Directory"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:902
+#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:904
 msgid "View"
 msgstr ""
 
@@ -732,7 +732,7 @@ msgstr ""
 msgid "Name:"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:892
+#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:894
 msgid "Connection"
 msgstr "ì—°ê²°"
 
@@ -744,35 +744,39 @@ msgstr "호스트:"
 msgid "Port:"
 msgstr "�트:"
 
-#: src/trg-preferences-dialog.c:817
+#: src/trg-preferences-dialog.c:816
+msgid "RPC URL Path:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:819
 msgid "Username:"
 msgstr "사용� �름:"
 
-#: src/trg-preferences-dialog.c:821
+#: src/trg-preferences-dialog.c:823
 msgid "Password:"
 msgstr "암호:"
 
-#: src/trg-preferences-dialog.c:823
+#: src/trg-preferences-dialog.c:825
 msgid "Automatically connect"
 msgstr "시작시 ��으로 연결"
 
-#: src/trg-preferences-dialog.c:829
+#: src/trg-preferences-dialog.c:831
 msgid "SSL"
 msgstr "SSL"
 
-#: src/trg-preferences-dialog.c:836
+#: src/trg-preferences-dialog.c:838
 msgid "Timeout:"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:840
+#: src/trg-preferences-dialog.c:842
 msgid "Retries:"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:881 src/trg-toolbar.c:238
+#: src/trg-preferences-dialog.c:883 src/trg-toolbar.c:239
 msgid "Local Preferences"
 msgstr "로컬 설정"
 
-#: src/trg-preferences-dialog.c:912
+#: src/trg-preferences-dialog.c:914
 msgid "Directories"
 msgstr ""
 
@@ -961,15 +965,15 @@ msgstr "토렌트 파�� 휴지통� 버림"
 msgid "Start added torrents"
 msgstr "추가�면 시작하기"
 
-#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:242
+#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:243
 msgid "Remote Preferences"
 msgstr "�격 설정"
 
-#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:409
+#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:400
 msgid "Bandwidth"
 msgstr "��"
 
-#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:636
+#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:627
 msgid "Limits"
 msgstr "제한"
 
@@ -1069,7 +1073,7 @@ msgstr ""
 msgid "Down: %s%s, Up: %s%s"
 msgstr ""
 
-#: src/trg-toolbar.c:231
+#: src/trg-toolbar.c:232
 msgid "Remove with data"
 msgstr "��터와 함께 제거"
 
@@ -1162,7 +1166,7 @@ msgstr "전체 다운로드"
 msgid "Default"
 msgstr ""
 
-#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:260
+#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:251
 msgid "Location:"
 msgstr "위치:"
 
@@ -1176,142 +1180,142 @@ msgstr "%s 옮기기"
 msgid "Move %d torrents"
 msgstr "%d 개� 토렌트 옮기기"
 
-#: src/trg-torrent-props-dialog.c:206
+#: src/trg-torrent-props-dialog.c:197
 msgid "Activity"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:211
+#: src/trg-torrent-props-dialog.c:202
 msgid "Torrent size:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:216
+#: src/trg-torrent-props-dialog.c:207
 msgid "Have:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:221
+#: src/trg-torrent-props-dialog.c:212
 msgid "Downloaded:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:226
+#: src/trg-torrent-props-dialog.c:217
 msgid "Uploaded:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:231
+#: src/trg-torrent-props-dialog.c:222
 msgid "State:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:236
+#: src/trg-torrent-props-dialog.c:227
 msgid "Running time:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:241
+#: src/trg-torrent-props-dialog.c:232
 msgid "Remaining time:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:246
+#: src/trg-torrent-props-dialog.c:237
 msgid "Last activity:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:251
+#: src/trg-torrent-props-dialog.c:242
 msgid "Error:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:255
+#: src/trg-torrent-props-dialog.c:246
 msgid "Details"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:266
+#: src/trg-torrent-props-dialog.c:257
 msgid "Hash:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:272
+#: src/trg-torrent-props-dialog.c:263
 msgid "Privacy:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:278
+#: src/trg-torrent-props-dialog.c:269
 msgid "Origin:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:295
+#: src/trg-torrent-props-dialog.c:286
 msgid "Comment:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:330
+#: src/trg-torrent-props-dialog.c:321
 msgid "Private to this tracker -- DHT and PEX disabled"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:332
+#: src/trg-torrent-props-dialog.c:323
 msgid "Public torrent"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:342
+#: src/trg-torrent-props-dialog.c:333
 #, c-format
 msgid "Created on %1$s"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:344
+#: src/trg-torrent-props-dialog.c:335
 #, c-format
 msgid "Created by %1$s on %2$s"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:376
+#: src/trg-torrent-props-dialog.c:367
 msgid "No errors"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:380
+#: src/trg-torrent-props-dialog.c:371
 msgid "Active now"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:413
+#: src/trg-torrent-props-dialog.c:404
 msgid "Honor global limits"
 msgstr "전체 제한 존중"
 
-#: src/trg-torrent-props-dialog.c:423
+#: src/trg-torrent-props-dialog.c:414
 msgid "Torrent priority:"
 msgstr "토렌트 우선 순위"
 
-#: src/trg-torrent-props-dialog.c:429
+#: src/trg-torrent-props-dialog.c:420
 msgid "Queue Position:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:434
+#: src/trg-torrent-props-dialog.c:425
 msgid "Limit download speed (KiB/s)"
 msgstr "다운로드 �� 제한 (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:442
+#: src/trg-torrent-props-dialog.c:433
 msgid "Limit upload speed (KiB/s)"
 msgstr "업로드 �� 제한 (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:450
+#: src/trg-torrent-props-dialog.c:441
 msgid "Use global settings"
 msgstr "전체 설정 사용"
 
-#: src/trg-torrent-props-dialog.c:451
+#: src/trg-torrent-props-dialog.c:442
 msgid "Stop seeding at ratio"
 msgstr "비율� 다�� �달할 때까지만 배�"
 
-#: src/trg-torrent-props-dialog.c:452
+#: src/trg-torrent-props-dialog.c:443
 msgid "Seed regardless of ratio"
 msgstr "비율과 �관없� 배�"
 
-#: src/trg-torrent-props-dialog.c:455
+#: src/trg-torrent-props-dialog.c:446
 msgid "Seed ratio mode:"
 msgstr "배� 비율 설정"
 
-#: src/trg-torrent-props-dialog.c:463
+#: src/trg-torrent-props-dialog.c:454
 msgid "Seed ratio limit:"
 msgstr "배� 제한 비율"
 
-#: src/trg-torrent-props-dialog.c:469
+#: src/trg-torrent-props-dialog.c:460
 msgid "Peer limit:"
 msgstr "최대 피어"
 
-#: src/trg-torrent-props-dialog.c:542
+#: src/trg-torrent-props-dialog.c:533
 #, c-format
 msgid "Multiple (%d) torrent properties"
 msgstr "%d 개� 토렌트 정보"
 
-#: src/trg-torrent-props-dialog.c:574
+#: src/trg-torrent-props-dialog.c:565
 msgid "Information"
 msgstr ""
 
@@ -1431,42 +1435,42 @@ msgstr ""
 msgid "Descending"
 msgstr ""
 
-#: src/util.c:340
+#: src/util.c:342
 msgid "JSON decoding error."
 msgstr "JSON 디코드 오류."
 
-#: src/util.c:345
+#: src/util.c:347
 msgid "Server responded, but with no result."
 msgstr "서버가 �답하였으나 결과가 없습니다."
 
-#: src/util.c:349
+#: src/util.c:351
 #, c-format
 msgid "Request failed with HTTP code %d"
 msgstr "요청� 실패하였습니다. HTTP 코드 : %d"
 
-#: src/util.c:383
+#: src/util.c:385
 msgid "None"
 msgstr "없�"
 
-#: src/util.c:429
+#: src/util.c:431
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d �"
 
-#: src/util.c:430
+#: src/util.c:432
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 시간"
 
-#: src/util.c:432
+#: src/util.c:434
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 분"
 
-#: src/util.c:435
+#: src/util.c:437
 #, c-format
 msgid "%ld second"
 msgid_plural "%ld seconds"
diff --git a/po/lt.po b/po/lt.po
index 9b9a4bd..f9c2008 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: transmission-remote-gtk\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-09-05 22:09+0100\n"
+"POT-Creation-Date: 2013-06-09 23:41+0100\n"
 "PO-Revision-Date: 2012-09-20 08:38+0000\n"
 "Last-Translator: Algimantas Margevi�ius <Margevicius.Algimantas@gmail.com>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "(n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2013-06-09 22:28+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2014-06-12 07:44+0000\n"
+"X-Generator: Launchpad (build 17045)\n"
 
 #: src/torrent.c:360 src/torrent.c:380
 msgid "Metadata Downloading"
@@ -44,7 +44,7 @@ msgid "Queued seed"
 msgstr "EilÄ—je skleidimui"
 
 #: src/torrent.c:372 src/torrent.c:386 src/trg-remote-prefs-dialog.c:360
-#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:447
+#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:438
 msgid "Seeding"
 msgstr "Skleidžiama"
 
@@ -159,18 +159,18 @@ msgstr[2] "Skleidžiama %1$li iš %2$li prisijungusių skleidėjų"
 msgid "A remote client to transmission-daemon."
 msgstr "Nuotolinis  transmission demono klientas"
 
-#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2011
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:416
+#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2025
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:407
 msgid "Low"
 msgstr "Žemas"
 
-#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2007
-#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:418
+#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2021
+#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:409
 msgid "High"
 msgstr "Aukštas"
 
-#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2009
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:417
+#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2023
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:408
 msgid "Normal"
 msgstr "Normalus"
 
@@ -178,12 +178,12 @@ msgstr "Normalus"
 msgid "Mixed"
 msgstr "Mišrus"
 
-#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:280
+#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:278
 #: src/trg-torrent-add-dialog.c:348 src/trg-torrent-tree-view.c:52
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:283
+#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:281
 #: src/trg-torrent-add-dialog.c:366 src/trg-torrent-tree-view.c:57
 msgid "Size"
 msgstr "Dydis"
@@ -197,7 +197,7 @@ msgstr "Eiga"
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2000
+#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2014
 #: src/trg-torrent-add-dialog.c:395 src/trg-torrent-tree-view.c:145
 msgid "Priority"
 msgstr "Prioritetas"
@@ -226,7 +226,7 @@ msgstr "IÅ¡skleisti visus"
 msgid "Collapse All"
 msgstr "Suskleisti visus"
 
-#: src/trg-general-panel.c:153 src/trg-general-panel.c:214
+#: src/trg-general-panel.c:153 src/trg-general-panel.c:212
 msgid "N/A"
 msgstr "NÄ—ra"
 
@@ -238,62 +238,62 @@ msgstr "(Privatus)"
 msgid "(Public)"
 msgstr "(Viešas)"
 
-#: src/trg-general-panel.c:202 src/trg-main-window.c:1097
-#: src/trg-main-window.c:1505 src/trg-main-window.c:2135
+#: src/trg-general-panel.c:200 src/trg-main-window.c:1106
+#: src/trg-main-window.c:1519 src/trg-main-window.c:2149
 #: src/trg-state-selector.c:538 src/trg-torrent-add-url-dialog.c:67
-#: src/util.c:331
+#: src/util.c:333
 msgid "Error"
 msgstr "Klaida"
 
-#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:123
+#: src/trg-general-panel.c:283 src/trg-torrent-tree-view.c:123
 msgid "ETA"
 msgstr "Likęs laikas"
 
-#: src/trg-general-panel.c:287 src/trg-torrent-tree-view.c:151
+#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:151
 msgid "Completed"
 msgstr "Užbaigtas"
 
-#: src/trg-general-panel.c:290
+#: src/trg-general-panel.c:288
 msgid "Seeders"
 msgstr "SkleidÄ—jai"
 
-#: src/trg-general-panel.c:292
+#: src/trg-general-panel.c:290
 msgid "Rate Down"
 msgstr "Sumažinti įvertinimą"
 
-#: src/trg-general-panel.c:294 src/trg-torrent-tree-view.c:128
+#: src/trg-general-panel.c:292 src/trg-torrent-tree-view.c:128
 msgid "Downloaded"
 msgstr "Atsisiųsta"
 
-#: src/trg-general-panel.c:297 src/trg-torrent-tree-view.c:70
+#: src/trg-general-panel.c:295 src/trg-torrent-tree-view.c:70
 msgid "Leechers"
 msgstr "SiuntÄ—jai"
 
-#: src/trg-general-panel.c:299
+#: src/trg-general-panel.c:297
 msgid "Rate Up"
 msgstr "Padidinti įvertinimą"
 
-#: src/trg-general-panel.c:301 src/trg-torrent-tree-view.c:125
+#: src/trg-general-panel.c:299 src/trg-torrent-tree-view.c:125
 msgid "Uploaded"
 msgstr "Išsiųsta"
 
-#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:63
+#: src/trg-general-panel.c:302 src/trg-torrent-tree-view.c:63
 msgid "Status"
 msgstr "BÅ«sena"
 
-#: src/trg-general-panel.c:306 src/trg-torrent-tree-view.c:131
+#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:131
 msgid "Ratio"
 msgstr "Santykis"
 
-#: src/trg-general-panel.c:309
+#: src/trg-general-panel.c:307
 msgid "Comment"
 msgstr "Komentaras"
 
-#: src/trg-general-panel.c:312
+#: src/trg-general-panel.c:310
 msgid "Completed At"
 msgstr "Baigta"
 
-#: src/trg-general-panel.c:316 src/trg-torrent-tree-view.c:139
+#: src/trg-general-panel.c:314 src/trg-torrent-tree-view.c:139
 msgid "Location"
 msgstr "Vieta"
 
@@ -305,189 +305,189 @@ msgstr "Šis torentas parsiųstas."
 msgid "This torrent has been added."
 msgstr "Å is torentas pridÄ—tas."
 
-#: src/trg-main-window.c:596
+#: src/trg-main-window.c:600
 msgid "No hostname set"
 msgstr "Nenurodytas mazgo vardas"
 
-#: src/trg-main-window.c:599
+#: src/trg-main-window.c:603
 msgid "Unknown error getting settings"
 msgstr "Gaunant nustatymus įvyko nežinoma klaida"
 
-#: src/trg-main-window.c:614
+#: src/trg-main-window.c:623
 msgid "Connecting..."
 msgstr "Jungiamasi..."
 
-#: src/trg-main-window.c:873
+#: src/trg-main-window.c:882
 #, c-format
 msgid "<big><b>Remove torrent \"%s\"?</b></big>"
 msgstr "<big><b>Pašalinti torentą „%s“?</b></big>"
 
-#: src/trg-main-window.c:874
+#: src/trg-main-window.c:883
 #, c-format
 msgid "<big><b>Remove %d torrents?</b></big>"
 msgstr "<big><b>Pašalinti %d torentus?</b></big>"
 
-#: src/trg-main-window.c:896
+#: src/trg-main-window.c:905
 #, c-format
 msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
 msgstr "<big><b>Pašalinti ir ištrinti torentą „%s“?</b></big>"
 
-#: src/trg-main-window.c:898
+#: src/trg-main-window.c:907
 #, c-format
 msgid "<big><b>Remove and delete %d torrents?</b></big>"
 msgstr "<big><b>Pašalinti ir ištrinti %d torentus?</b></big>"
 
-#: src/trg-main-window.c:981 src/trg-preferences-dialog.c:897
+#: src/trg-main-window.c:990 src/trg-preferences-dialog.c:899
 #: src/trg-remote-prefs-dialog.c:693
 msgid "General"
 msgstr "Bendri"
 
-#: src/trg-main-window.c:990 src/trg-torrent-props-dialog.c:622
+#: src/trg-main-window.c:999 src/trg-torrent-props-dialog.c:613
 msgid "Trackers"
 msgstr "Sekimo serveriai"
 
-#: src/trg-main-window.c:998 src/trg-torrent-props-dialog.c:591
+#: src/trg-main-window.c:1007 src/trg-torrent-props-dialog.c:582
 msgid "Files"
 msgstr "Failai"
 
-#: src/trg-main-window.c:1006 src/trg-remote-prefs-dialog.c:399
-#: src/trg-torrent-props-dialog.c:465 src/trg-torrent-props-dialog.c:605
+#: src/trg-main-window.c:1015 src/trg-remote-prefs-dialog.c:399
+#: src/trg-torrent-props-dialog.c:456 src/trg-torrent-props-dialog.c:596
 #: src/trg-trackers-tree-view.c:190
 msgid "Peers"
 msgstr "SiuntÄ—jai ir skleidÄ—jai"
 
-#: src/trg-main-window.c:1089
+#: src/trg-main-window.c:1098
 #, c-format
 msgid "This application supports Transmission %g and later, you have %g."
 msgstr "Ši programa palaiko Transmission %g ir vėlesnes, jūs turite %g."
 
-#: src/trg-main-window.c:1155 src/trg-status-bar.c:74 src/trg-status-bar.c:104
+#: src/trg-main-window.c:1164 src/trg-status-bar.c:74 src/trg-status-bar.c:104
 msgid "Disconnected"
 msgstr "Atsijungta"
 
-#: src/trg-main-window.c:1200
+#: src/trg-main-window.c:1209
 #, c-format
 msgid "%d Downloading @ %s"
 msgstr "%d Parsiun�iama %s"
 
-#: src/trg-main-window.c:1207
+#: src/trg-main-window.c:1216
 #, c-format
 msgid "%d Seeding @ %s"
 msgstr "%d Skleidžiama %s"
 
-#: src/trg-main-window.c:1258
+#: src/trg-main-window.c:1267
 #, c-format
 msgid "Request %d/%d failed: %s"
 msgstr "Užklausa %d/%d nepavyko: %s"
 
-#: src/trg-main-window.c:2055
+#: src/trg-main-window.c:2069
 msgid "No Limit"
 msgstr "Be apribojimų"
 
-#: src/trg-main-window.c:2156 src/trg-menu-bar.c:675 src/trg-toolbar.c:223
+#: src/trg-main-window.c:2170 src/trg-menu-bar.c:675 src/trg-toolbar.c:224
 msgid "Properties"
 msgstr "SavybÄ—s"
 
-#: src/trg-main-window.c:2159 src/trg-toolbar.c:216
+#: src/trg-main-window.c:2173 src/trg-toolbar.c:217
 msgid "Resume"
 msgstr "Tęsti"
 
-#: src/trg-main-window.c:2162 src/trg-toolbar.c:219
+#: src/trg-main-window.c:2176 src/trg-toolbar.c:220
 msgid "Pause"
 msgstr "Pristabdyti"
 
-#: src/trg-main-window.c:2165
+#: src/trg-main-window.c:2179
 msgid "Verify"
 msgstr "Patikrinti"
 
-#: src/trg-main-window.c:2168
+#: src/trg-main-window.c:2182
 msgid "Re-announce"
 msgstr "Paskelbti iš naujo"
 
-#: src/trg-main-window.c:2171 src/trg-torrent-move-dialog.c:119
+#: src/trg-main-window.c:2185 src/trg-torrent-move-dialog.c:119
 #: src/trg-torrent-move-dialog.c:126
 msgid "Move"
 msgstr "Perkelti"
 
-#: src/trg-main-window.c:2174 src/trg-menu-bar.c:706 src/trg-toolbar.c:227
+#: src/trg-main-window.c:2188 src/trg-menu-bar.c:706 src/trg-toolbar.c:228
 msgid "Remove"
 msgstr "Pašalinti"
 
-#: src/trg-main-window.c:2177
+#: src/trg-main-window.c:2191
 msgid "Remove & Delete"
 msgstr "Pašalinti ir ištrinti"
 
-#: src/trg-main-window.c:2201 src/trg-preferences-dialog.c:907
+#: src/trg-main-window.c:2215 src/trg-preferences-dialog.c:909
 msgid "Actions"
 msgstr "Veiksmai"
 
-#: src/trg-main-window.c:2230 src/trg-menu-bar.c:722
+#: src/trg-main-window.c:2244 src/trg-menu-bar.c:722
 msgid "Start Now"
 msgstr "PradÄ—ti dabar"
 
-#: src/trg-main-window.c:2233 src/trg-menu-bar.c:727
+#: src/trg-main-window.c:2247 src/trg-menu-bar.c:727
 msgid "Move Up Queue"
 msgstr "Eilėje perkelti aukštyn"
 
-#: src/trg-main-window.c:2236 src/trg-menu-bar.c:734
+#: src/trg-main-window.c:2250 src/trg-menu-bar.c:734
 msgid "Move Down Queue"
 msgstr "Eilėje perkelti žemyn"
 
-#: src/trg-main-window.c:2239 src/trg-menu-bar.c:741
+#: src/trg-main-window.c:2253 src/trg-menu-bar.c:741
 msgid "Bottom Of Queue"
 msgstr "Eilės apa�ia"
 
-#: src/trg-main-window.c:2242 src/trg-menu-bar.c:745
+#: src/trg-main-window.c:2256 src/trg-menu-bar.c:745
 msgid "Top Of Queue"
 msgstr "Eilės viršus"
 
-#: src/trg-main-window.c:2251 src/trg-main-window.c:2334
+#: src/trg-main-window.c:2265 src/trg-main-window.c:2348
 msgid "Down Limit"
 msgstr "Parsiuntimo riba"
 
-#: src/trg-main-window.c:2256 src/trg-main-window.c:2338
+#: src/trg-main-window.c:2270 src/trg-main-window.c:2352
 msgid "Up Limit"
 msgstr "IÅ¡siuntimo riba"
 
-#: src/trg-main-window.c:2285 src/trg-main-window.c:2292
+#: src/trg-main-window.c:2299 src/trg-main-window.c:2306
 #: src/trg-remote-prefs-dialog.c:497
 msgid "Updating..."
 msgstr "Atnaujinama..."
 
-#: src/trg-main-window.c:2306 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
+#: src/trg-main-window.c:2320 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
 msgid "Connect"
 msgstr "Prisijungti"
 
-#: src/trg-main-window.c:2313 src/trg-toolbar.c:206
+#: src/trg-main-window.c:2327 src/trg-toolbar.c:207
 msgid "Disconnect"
 msgstr "Atsijungti"
 
-#: src/trg-main-window.c:2317 src/trg-toolbar.c:209
+#: src/trg-main-window.c:2331 src/trg-toolbar.c:210
 #: src/trg-trackers-tree-view.c:284 src/trg-trackers-tree-view.c:311
 msgid "Add"
 msgstr "PridÄ—ti"
 
-#: src/trg-main-window.c:2321
+#: src/trg-main-window.c:2335
 msgid "Add from URL"
 msgstr "Pridėti iš URL"
 
-#: src/trg-main-window.c:2325
+#: src/trg-main-window.c:2339
 msgid "Resume All"
 msgstr "Pratęsti visus"
 
-#: src/trg-main-window.c:2329
+#: src/trg-main-window.c:2343
 msgid "Pause All"
 msgstr "Sustabdyti visus"
 
-#: src/trg-main-window.c:2345
+#: src/trg-main-window.c:2359
 msgid "Quit"
 msgstr "IÅ¡eiti"
 
-#: src/trg-main-window.c:2459 src/trg-menu-bar.c:536
+#: src/trg-main-window.c:2473 src/trg-menu-bar.c:536
 msgid "Graph"
 msgstr "Diagrama"
 
-#: src/trg-main-window.c:2647
+#: src/trg-main-window.c:2662
 msgid "Transmission Remote"
 msgstr "Transmission Remote"
 
@@ -695,7 +695,7 @@ msgstr "Nuotolinio parsiuntimo aplankai"
 msgid "Directory"
 msgstr "Aplankas"
 
-#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:902
+#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:904
 msgid "View"
 msgstr "Rodymas"
 
@@ -735,7 +735,7 @@ msgstr "Profilis: "
 msgid "Name:"
 msgstr "Pavadinimas:"
 
-#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:892
+#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:894
 msgid "Connection"
 msgstr "Prisijungimas"
 
@@ -747,35 +747,39 @@ msgstr "Serveris:"
 msgid "Port:"
 msgstr "Prievadas:"
 
-#: src/trg-preferences-dialog.c:817
+#: src/trg-preferences-dialog.c:816
+msgid "RPC URL Path:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:819
 msgid "Username:"
 msgstr "Naudotojo vardas:"
 
-#: src/trg-preferences-dialog.c:821
+#: src/trg-preferences-dialog.c:823
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: src/trg-preferences-dialog.c:823
+#: src/trg-preferences-dialog.c:825
 msgid "Automatically connect"
 msgstr "Prisijungti automatiškai"
 
-#: src/trg-preferences-dialog.c:829
+#: src/trg-preferences-dialog.c:831
 msgid "SSL"
 msgstr "SSL"
 
-#: src/trg-preferences-dialog.c:836
+#: src/trg-preferences-dialog.c:838
 msgid "Timeout:"
 msgstr "Laukimo laikas:"
 
-#: src/trg-preferences-dialog.c:840
+#: src/trg-preferences-dialog.c:842
 msgid "Retries:"
 msgstr "Kartojimų skai�ius:"
 
-#: src/trg-preferences-dialog.c:881 src/trg-toolbar.c:238
+#: src/trg-preferences-dialog.c:883 src/trg-toolbar.c:239
 msgid "Local Preferences"
 msgstr "Vietiniai nustatymai"
 
-#: src/trg-preferences-dialog.c:912
+#: src/trg-preferences-dialog.c:914
 msgid "Directories"
 msgstr "Aplankai"
 
@@ -968,15 +972,15 @@ msgstr "IÅ¡mesti originalius torent failus"
 msgid "Start added torrents"
 msgstr "PradÄ—ti prdÄ—tus torentus"
 
-#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:242
+#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:243
 msgid "Remote Preferences"
 msgstr "Nuotoliniai nustatymai"
 
-#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:409
+#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:400
 msgid "Bandwidth"
 msgstr "Duomenų srautas"
 
-#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:636
+#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:627
 msgid "Limits"
 msgstr "Ribos"
 
@@ -1076,7 +1080,7 @@ msgstr " (Riba: %s)"
 msgid "Down: %s%s, Up: %s%s"
 msgstr "Pars: %s%s, IÅ¡s: %s%s"
 
-#: src/trg-toolbar.c:231
+#: src/trg-toolbar.c:232
 msgid "Remove with data"
 msgstr "Pašalinti su duomenimis"
 
@@ -1173,7 +1177,7 @@ msgstr "Viso parsiun�iama"
 msgid "Default"
 msgstr "Numatytas"
 
-#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:260
+#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:251
 msgid "Location:"
 msgstr "Vieta:"
 
@@ -1187,142 +1191,142 @@ msgstr "Perkelti %s"
 msgid "Move %d torrents"
 msgstr "Perkelti %d torentus"
 
-#: src/trg-torrent-props-dialog.c:206
+#: src/trg-torrent-props-dialog.c:197
 msgid "Activity"
 msgstr "Veikla"
 
-#: src/trg-torrent-props-dialog.c:211
+#: src/trg-torrent-props-dialog.c:202
 msgid "Torrent size:"
 msgstr "Torento dydis:"
 
-#: src/trg-torrent-props-dialog.c:216
+#: src/trg-torrent-props-dialog.c:207
 msgid "Have:"
 msgstr "Turima:"
 
-#: src/trg-torrent-props-dialog.c:221
+#: src/trg-torrent-props-dialog.c:212
 msgid "Downloaded:"
 msgstr "Atsiųsta:"
 
-#: src/trg-torrent-props-dialog.c:226
+#: src/trg-torrent-props-dialog.c:217
 msgid "Uploaded:"
 msgstr "Išsiųsta:"
 
-#: src/trg-torrent-props-dialog.c:231
+#: src/trg-torrent-props-dialog.c:222
 msgid "State:"
 msgstr "BÅ«sena:"
 
-#: src/trg-torrent-props-dialog.c:236
+#: src/trg-torrent-props-dialog.c:227
 msgid "Running time:"
 msgstr "Veikimo laikas:"
 
-#: src/trg-torrent-props-dialog.c:241
+#: src/trg-torrent-props-dialog.c:232
 msgid "Remaining time:"
 msgstr "Likęs laikas:"
 
-#: src/trg-torrent-props-dialog.c:246
+#: src/trg-torrent-props-dialog.c:237
 msgid "Last activity:"
 msgstr "Paskutinis aktyvumas:"
 
-#: src/trg-torrent-props-dialog.c:251
+#: src/trg-torrent-props-dialog.c:242
 msgid "Error:"
 msgstr "Klaida:"
 
-#: src/trg-torrent-props-dialog.c:255
+#: src/trg-torrent-props-dialog.c:246
 msgid "Details"
 msgstr "DetalÄ—s"
 
-#: src/trg-torrent-props-dialog.c:266
+#: src/trg-torrent-props-dialog.c:257
 msgid "Hash:"
 msgstr "Maiša:"
 
-#: src/trg-torrent-props-dialog.c:272
+#: src/trg-torrent-props-dialog.c:263
 msgid "Privacy:"
 msgstr "Privatumas:"
 
-#: src/trg-torrent-props-dialog.c:278
+#: src/trg-torrent-props-dialog.c:269
 msgid "Origin:"
 msgstr "KilmÄ—:"
 
-#: src/trg-torrent-props-dialog.c:295
+#: src/trg-torrent-props-dialog.c:286
 msgid "Comment:"
 msgstr "Komentaras:"
 
-#: src/trg-torrent-props-dialog.c:330
+#: src/trg-torrent-props-dialog.c:321
 msgid "Private to this tracker -- DHT and PEX disabled"
 msgstr "Privatus šiam serveriui – DHT ir PEX išjungta"
 
-#: src/trg-torrent-props-dialog.c:332
+#: src/trg-torrent-props-dialog.c:323
 msgid "Public torrent"
 msgstr "Viešas torentas"
 
-#: src/trg-torrent-props-dialog.c:342
+#: src/trg-torrent-props-dialog.c:333
 #, c-format
 msgid "Created on %1$s"
 msgstr "Sukurta %1$s"
 
-#: src/trg-torrent-props-dialog.c:344
+#: src/trg-torrent-props-dialog.c:335
 #, c-format
 msgid "Created by %1$s on %2$s"
 msgstr "Sukūrė %1$s %2$s"
 
-#: src/trg-torrent-props-dialog.c:376
+#: src/trg-torrent-props-dialog.c:367
 msgid "No errors"
 msgstr "Klaidų nėra"
 
-#: src/trg-torrent-props-dialog.c:380
+#: src/trg-torrent-props-dialog.c:371
 msgid "Active now"
 msgstr "Dabar aktyvus"
 
-#: src/trg-torrent-props-dialog.c:413
+#: src/trg-torrent-props-dialog.c:404
 msgid "Honor global limits"
 msgstr "Garbingos visuotinÄ—s ribos"
 
-#: src/trg-torrent-props-dialog.c:423
+#: src/trg-torrent-props-dialog.c:414
 msgid "Torrent priority:"
 msgstr "Torento prioritetas"
 
-#: src/trg-torrent-props-dialog.c:429
+#: src/trg-torrent-props-dialog.c:420
 msgid "Queue Position:"
 msgstr "Vieta eilÄ—je:"
 
-#: src/trg-torrent-props-dialog.c:434
+#: src/trg-torrent-props-dialog.c:425
 msgid "Limit download speed (KiB/s)"
 msgstr "Riboti parsiuntimų greitį (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:442
+#: src/trg-torrent-props-dialog.c:433
 msgid "Limit upload speed (KiB/s)"
 msgstr "Riboti išsiuntimų greitį (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:450
+#: src/trg-torrent-props-dialog.c:441
 msgid "Use global settings"
 msgstr "Naudoti visuotinius parametrus"
 
-#: src/trg-torrent-props-dialog.c:451
+#: src/trg-torrent-props-dialog.c:442
 msgid "Stop seeding at ratio"
 msgstr "Baigti skleisti pasiekus santykį"
 
-#: src/trg-torrent-props-dialog.c:452
+#: src/trg-torrent-props-dialog.c:443
 msgid "Seed regardless of ratio"
 msgstr "Skleisti nepaisant santykio"
 
-#: src/trg-torrent-props-dialog.c:455
+#: src/trg-torrent-props-dialog.c:446
 msgid "Seed ratio mode:"
 msgstr "Skleidimo santykio režimas:"
 
-#: src/trg-torrent-props-dialog.c:463
+#: src/trg-torrent-props-dialog.c:454
 msgid "Seed ratio limit:"
 msgstr "Skleidimo santykio riba:"
 
-#: src/trg-torrent-props-dialog.c:469
+#: src/trg-torrent-props-dialog.c:460
 msgid "Peer limit:"
 msgstr "Siuntėjų-skleidėjų riba:"
 
-#: src/trg-torrent-props-dialog.c:542
+#: src/trg-torrent-props-dialog.c:533
 #, c-format
 msgid "Multiple (%d) torrent properties"
 msgstr "Kelių (%d) torentų savybės"
 
-#: src/trg-torrent-props-dialog.c:574
+#: src/trg-torrent-props-dialog.c:565
 msgid "Information"
 msgstr "Informacija"
 
@@ -1442,24 +1446,24 @@ msgstr "Didėjan�iai"
 msgid "Descending"
 msgstr "Mažėjan�iai"
 
-#: src/util.c:340
+#: src/util.c:342
 msgid "JSON decoding error."
 msgstr "JSON iškodavimo klaida."
 
-#: src/util.c:345
+#: src/util.c:347
 msgid "Server responded, but with no result."
 msgstr "Serveris atsakÄ—, bet be rezultato."
 
-#: src/util.c:349
+#: src/util.c:351
 #, c-format
 msgid "Request failed with HTTP code %d"
 msgstr "Užklausa nepavyko su HTTP kodu %d"
 
-#: src/util.c:383
+#: src/util.c:385
 msgid "None"
 msgstr "NÄ—ra"
 
-#: src/util.c:429
+#: src/util.c:431
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -1467,7 +1471,7 @@ msgstr[0] "%d diena"
 msgstr[1] "%d dienos"
 msgstr[2] "%d dienų"
 
-#: src/util.c:430
+#: src/util.c:432
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1475,7 +1479,7 @@ msgstr[0] "%d valanda"
 msgstr[1] "%d valandos"
 msgstr[2] "%d valandų"
 
-#: src/util.c:432
+#: src/util.c:434
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1483,7 +1487,7 @@ msgstr[0] "%d minutÄ—"
 msgstr[1] "%d minutÄ—s"
 msgstr[2] "%d minu�ių"
 
-#: src/util.c:435
+#: src/util.c:437
 #, c-format
 msgid "%ld second"
 msgid_plural "%ld seconds"
diff --git a/po/lv.po b/po/lv.po
index 256871a..a604922 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: transmission-remote-gtk\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-09-05 22:09+0100\n"
+"POT-Creation-Date: 2013-06-09 23:41+0100\n"
 "PO-Revision-Date: 2013-06-03 09:33+0000\n"
 "Last-Translator: sieks <sieks@inbox.lv>\n"
 "Language-Team: Latvian <lv@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2013-06-09 22:28+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2014-06-12 07:44+0000\n"
+"X-Generator: Launchpad (build 17045)\n"
 
 #: src/torrent.c:360 src/torrent.c:380
 msgid "Metadata Downloading"
@@ -43,7 +43,7 @@ msgid "Queued seed"
 msgstr ""
 
 #: src/torrent.c:372 src/torrent.c:386 src/trg-remote-prefs-dialog.c:360
-#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:447
+#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:438
 msgid "Seeding"
 msgstr "Dod"
 
@@ -155,18 +155,18 @@ msgstr[1] ""
 msgid "A remote client to transmission-daemon."
 msgstr ""
 
-#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2011
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:416
+#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2025
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:407
 msgid "Low"
 msgstr "Zema"
 
-#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2007
-#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:418
+#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2021
+#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:409
 msgid "High"
 msgstr "Augsta"
 
-#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2009
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:417
+#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2023
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:408
 msgid "Normal"
 msgstr "Norm�la"
 
@@ -174,12 +174,12 @@ msgstr "Norm�la"
 msgid "Mixed"
 msgstr "Jaukts"
 
-#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:280
+#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:278
 #: src/trg-torrent-add-dialog.c:348 src/trg-torrent-tree-view.c:52
 msgid "Name"
 msgstr "Nosaukums"
 
-#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:283
+#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:281
 #: src/trg-torrent-add-dialog.c:366 src/trg-torrent-tree-view.c:57
 msgid "Size"
 msgstr "Izmērs"
@@ -193,7 +193,7 @@ msgstr "Progress"
 msgid "Download"
 msgstr "Lejupiel�de"
 
-#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2000
+#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2014
 #: src/trg-torrent-add-dialog.c:395 src/trg-torrent-tree-view.c:145
 msgid "Priority"
 msgstr "Priorit�te"
@@ -222,7 +222,7 @@ msgstr "R�dīt visu"
 msgid "Collapse All"
 msgstr "Sakļaut visu"
 
-#: src/trg-general-panel.c:153 src/trg-general-panel.c:214
+#: src/trg-general-panel.c:153 src/trg-general-panel.c:212
 msgid "N/A"
 msgstr "Nav pieejams"
 
@@ -234,62 +234,62 @@ msgstr "Priv�ts"
 msgid "(Public)"
 msgstr "Publisks"
 
-#: src/trg-general-panel.c:202 src/trg-main-window.c:1097
-#: src/trg-main-window.c:1505 src/trg-main-window.c:2135
+#: src/trg-general-panel.c:200 src/trg-main-window.c:1106
+#: src/trg-main-window.c:1519 src/trg-main-window.c:2149
 #: src/trg-state-selector.c:538 src/trg-torrent-add-url-dialog.c:67
-#: src/util.c:331
+#: src/util.c:333
 msgid "Error"
 msgstr "Kļūda"
 
-#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:123
+#: src/trg-general-panel.c:283 src/trg-torrent-tree-view.c:123
 msgid "ETA"
 msgstr "Atlikušais laiks"
 
-#: src/trg-general-panel.c:287 src/trg-torrent-tree-view.c:151
+#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:151
 msgid "Completed"
 msgstr "Pabeigts"
 
-#: src/trg-general-panel.c:290
+#: src/trg-general-panel.c:288
 msgid "Seeders"
 msgstr "Devēji"
 
-#: src/trg-general-panel.c:292
+#: src/trg-general-panel.c:290
 msgid "Rate Down"
 msgstr ""
 
-#: src/trg-general-panel.c:294 src/trg-torrent-tree-view.c:128
+#: src/trg-general-panel.c:292 src/trg-torrent-tree-view.c:128
 msgid "Downloaded"
 msgstr "Lejupiel�dēts"
 
-#: src/trg-general-panel.c:297 src/trg-torrent-tree-view.c:70
+#: src/trg-general-panel.c:295 src/trg-torrent-tree-view.c:70
 msgid "Leechers"
 msgstr "Ņēmēji"
 
-#: src/trg-general-panel.c:299
+#: src/trg-general-panel.c:297
 msgid "Rate Up"
 msgstr ""
 
-#: src/trg-general-panel.c:301 src/trg-torrent-tree-view.c:125
+#: src/trg-general-panel.c:299 src/trg-torrent-tree-view.c:125
 msgid "Uploaded"
 msgstr "Augšupiel�dēts"
 
-#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:63
+#: src/trg-general-panel.c:302 src/trg-torrent-tree-view.c:63
 msgid "Status"
 msgstr "Statuss"
 
-#: src/trg-general-panel.c:306 src/trg-torrent-tree-view.c:131
+#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:131
 msgid "Ratio"
 msgstr "Attiecība"
 
-#: src/trg-general-panel.c:309
+#: src/trg-general-panel.c:307
 msgid "Comment"
 msgstr "Koment�rs"
 
-#: src/trg-general-panel.c:312
+#: src/trg-general-panel.c:310
 msgid "Completed At"
 msgstr "Pabeigts"
 
-#: src/trg-general-panel.c:316 src/trg-torrent-tree-view.c:139
+#: src/trg-general-panel.c:314 src/trg-torrent-tree-view.c:139
 msgid "Location"
 msgstr "Atrašan�s vieta"
 
@@ -301,190 +301,190 @@ msgstr "Å is torrents ir pabeigts"
 msgid "This torrent has been added."
 msgstr "Å is torrents tika pievienots"
 
-#: src/trg-main-window.c:596
+#: src/trg-main-window.c:600
 msgid "No hostname set"
 msgstr ""
 
-#: src/trg-main-window.c:599
+#: src/trg-main-window.c:603
 msgid "Unknown error getting settings"
 msgstr ""
 
-#: src/trg-main-window.c:614
+#: src/trg-main-window.c:623
 msgid "Connecting..."
 msgstr "Savienojas"
 
-#: src/trg-main-window.c:873
+#: src/trg-main-window.c:882
 #, c-format
 msgid "<big><b>Remove torrent \"%s\"?</b></big>"
 msgstr "<big><b>Noņemt torrentu \"%s\"?</b></big>"
 
-#: src/trg-main-window.c:874
+#: src/trg-main-window.c:883
 #, c-format
 msgid "<big><b>Remove %d torrents?</b></big>"
 msgstr "<big><b>Noņemt %d torrentus?</b></big>"
 
-#: src/trg-main-window.c:896
+#: src/trg-main-window.c:905
 #, c-format
 msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
 msgstr "<big><b>Noņemt un dzēst torentu \"%s\"?</b></big>"
 
-#: src/trg-main-window.c:898
+#: src/trg-main-window.c:907
 #, c-format
 msgid "<big><b>Remove and delete %d torrents?</b></big>"
 msgstr "<big><b>Noņemt un dzēst %d torrentus?</b></big>"
 
-#: src/trg-main-window.c:981 src/trg-preferences-dialog.c:897
+#: src/trg-main-window.c:990 src/trg-preferences-dialog.c:899
 #: src/trg-remote-prefs-dialog.c:693
 msgid "General"
 msgstr "Galven�"
 
-#: src/trg-main-window.c:990 src/trg-torrent-props-dialog.c:622
+#: src/trg-main-window.c:999 src/trg-torrent-props-dialog.c:613
 msgid "Trackers"
 msgstr "Trakeri"
 
-#: src/trg-main-window.c:998 src/trg-torrent-props-dialog.c:591
+#: src/trg-main-window.c:1007 src/trg-torrent-props-dialog.c:582
 msgid "Files"
 msgstr "Faili"
 
-#: src/trg-main-window.c:1006 src/trg-remote-prefs-dialog.c:399
-#: src/trg-torrent-props-dialog.c:465 src/trg-torrent-props-dialog.c:605
+#: src/trg-main-window.c:1015 src/trg-remote-prefs-dialog.c:399
+#: src/trg-torrent-props-dialog.c:456 src/trg-torrent-props-dialog.c:596
 #: src/trg-trackers-tree-view.c:190
 msgid "Peers"
 msgstr "Dalībnieki"
 
-#: src/trg-main-window.c:1089
+#: src/trg-main-window.c:1098
 #, c-format
 msgid "This application supports Transmission %g and later, you have %g."
 msgstr ""
 "Šī aplik�cija atbalsta Transmission %g un jaun�ku, Jūs izmantojat %g."
 
-#: src/trg-main-window.c:1155 src/trg-status-bar.c:74 src/trg-status-bar.c:104
+#: src/trg-main-window.c:1164 src/trg-status-bar.c:74 src/trg-status-bar.c:104
 msgid "Disconnected"
 msgstr "Atvienots"
 
-#: src/trg-main-window.c:1200
+#: src/trg-main-window.c:1209
 #, c-format
 msgid "%d Downloading @ %s"
 msgstr "%d Lejupiel�dē @ %s"
 
-#: src/trg-main-window.c:1207
+#: src/trg-main-window.c:1216
 #, c-format
 msgid "%d Seeding @ %s"
 msgstr "%d Augšupiel�dē @ %s"
 
-#: src/trg-main-window.c:1258
+#: src/trg-main-window.c:1267
 #, c-format
 msgid "Request %d/%d failed: %s"
 msgstr ""
 
-#: src/trg-main-window.c:2055
+#: src/trg-main-window.c:2069
 msgid "No Limit"
 msgstr "Nav ierobežojuma"
 
-#: src/trg-main-window.c:2156 src/trg-menu-bar.c:675 src/trg-toolbar.c:223
+#: src/trg-main-window.c:2170 src/trg-menu-bar.c:675 src/trg-toolbar.c:224
 msgid "Properties"
 msgstr "Īpašības"
 
-#: src/trg-main-window.c:2159 src/trg-toolbar.c:216
+#: src/trg-main-window.c:2173 src/trg-toolbar.c:217
 msgid "Resume"
 msgstr "Ats�kt"
 
-#: src/trg-main-window.c:2162 src/trg-toolbar.c:219
+#: src/trg-main-window.c:2176 src/trg-toolbar.c:220
 msgid "Pause"
 msgstr "Pauze"
 
-#: src/trg-main-window.c:2165
+#: src/trg-main-window.c:2179
 msgid "Verify"
 msgstr "P�rbaudīt"
 
-#: src/trg-main-window.c:2168
+#: src/trg-main-window.c:2182
 msgid "Re-announce"
 msgstr ""
 
-#: src/trg-main-window.c:2171 src/trg-torrent-move-dialog.c:119
+#: src/trg-main-window.c:2185 src/trg-torrent-move-dialog.c:119
 #: src/trg-torrent-move-dialog.c:126
 msgid "Move"
 msgstr "P�rvietot"
 
-#: src/trg-main-window.c:2174 src/trg-menu-bar.c:706 src/trg-toolbar.c:227
+#: src/trg-main-window.c:2188 src/trg-menu-bar.c:706 src/trg-toolbar.c:228
 msgid "Remove"
 msgstr "Noņemt"
 
-#: src/trg-main-window.c:2177
+#: src/trg-main-window.c:2191
 msgid "Remove & Delete"
 msgstr "Noņemt un Dzēst"
 
-#: src/trg-main-window.c:2201 src/trg-preferences-dialog.c:907
+#: src/trg-main-window.c:2215 src/trg-preferences-dialog.c:909
 msgid "Actions"
 msgstr "Darbības"
 
-#: src/trg-main-window.c:2230 src/trg-menu-bar.c:722
+#: src/trg-main-window.c:2244 src/trg-menu-bar.c:722
 msgid "Start Now"
 msgstr "S�kt tūlīt"
 
-#: src/trg-main-window.c:2233 src/trg-menu-bar.c:727
+#: src/trg-main-window.c:2247 src/trg-menu-bar.c:727
 msgid "Move Up Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2236 src/trg-menu-bar.c:734
+#: src/trg-main-window.c:2250 src/trg-menu-bar.c:734
 msgid "Move Down Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2239 src/trg-menu-bar.c:741
+#: src/trg-main-window.c:2253 src/trg-menu-bar.c:741
 msgid "Bottom Of Queue"
 msgstr "Rindas apakšpusē"
 
-#: src/trg-main-window.c:2242 src/trg-menu-bar.c:745
+#: src/trg-main-window.c:2256 src/trg-menu-bar.c:745
 msgid "Top Of Queue"
 msgstr "Rindas augšpusē"
 
-#: src/trg-main-window.c:2251 src/trg-main-window.c:2334
+#: src/trg-main-window.c:2265 src/trg-main-window.c:2348
 msgid "Down Limit"
 msgstr "Zem�kais ierobežojums"
 
-#: src/trg-main-window.c:2256 src/trg-main-window.c:2338
+#: src/trg-main-window.c:2270 src/trg-main-window.c:2352
 msgid "Up Limit"
 msgstr "Augšējais ierobežojums"
 
-#: src/trg-main-window.c:2285 src/trg-main-window.c:2292
+#: src/trg-main-window.c:2299 src/trg-main-window.c:2306
 #: src/trg-remote-prefs-dialog.c:497
 msgid "Updating..."
 msgstr "Augšupiel�dē..."
 
-#: src/trg-main-window.c:2306 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
+#: src/trg-main-window.c:2320 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
 msgid "Connect"
 msgstr "Savienoties"
 
-#: src/trg-main-window.c:2313 src/trg-toolbar.c:206
+#: src/trg-main-window.c:2327 src/trg-toolbar.c:207
 msgid "Disconnect"
 msgstr "Atslēgties"
 
-#: src/trg-main-window.c:2317 src/trg-toolbar.c:209
+#: src/trg-main-window.c:2331 src/trg-toolbar.c:210
 #: src/trg-trackers-tree-view.c:284 src/trg-trackers-tree-view.c:311
 msgid "Add"
 msgstr "Pievienot"
 
-#: src/trg-main-window.c:2321
+#: src/trg-main-window.c:2335
 msgid "Add from URL"
 msgstr ""
 
-#: src/trg-main-window.c:2325
+#: src/trg-main-window.c:2339
 msgid "Resume All"
 msgstr "Turpin�t Visus"
 
-#: src/trg-main-window.c:2329
+#: src/trg-main-window.c:2343
 msgid "Pause All"
 msgstr "Pauzēt visus"
 
-#: src/trg-main-window.c:2345
+#: src/trg-main-window.c:2359
 msgid "Quit"
 msgstr "Iziet"
 
-#: src/trg-main-window.c:2459 src/trg-menu-bar.c:536
+#: src/trg-main-window.c:2473 src/trg-menu-bar.c:536
 msgid "Graph"
 msgstr "Grafiks"
 
-#: src/trg-main-window.c:2647
+#: src/trg-main-window.c:2662
 msgid "Transmission Remote"
 msgstr ""
 
@@ -692,7 +692,7 @@ msgstr ""
 msgid "Directory"
 msgstr "Mape"
 
-#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:902
+#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:904
 msgid "View"
 msgstr "Skats"
 
@@ -732,7 +732,7 @@ msgstr "Profils: "
 msgid "Name:"
 msgstr "Nosaukums:"
 
-#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:892
+#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:894
 msgid "Connection"
 msgstr ""
 
@@ -744,35 +744,39 @@ msgstr ""
 msgid "Port:"
 msgstr "Ports"
 
-#: src/trg-preferences-dialog.c:817
+#: src/trg-preferences-dialog.c:816
+msgid "RPC URL Path:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:819
 msgid "Username:"
 msgstr "Lietot�ja v�rds"
 
-#: src/trg-preferences-dialog.c:821
+#: src/trg-preferences-dialog.c:823
 msgid "Password:"
 msgstr "Parole"
 
-#: src/trg-preferences-dialog.c:823
+#: src/trg-preferences-dialog.c:825
 msgid "Automatically connect"
 msgstr "Autom�tiski pieslēgties"
 
-#: src/trg-preferences-dialog.c:829
+#: src/trg-preferences-dialog.c:831
 msgid "SSL"
 msgstr "SSL"
 
-#: src/trg-preferences-dialog.c:836
+#: src/trg-preferences-dialog.c:838
 msgid "Timeout:"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:840
+#: src/trg-preferences-dialog.c:842
 msgid "Retries:"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:881 src/trg-toolbar.c:238
+#: src/trg-preferences-dialog.c:883 src/trg-toolbar.c:239
 msgid "Local Preferences"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:912
+#: src/trg-preferences-dialog.c:914
 msgid "Directories"
 msgstr ""
 
@@ -962,15 +966,15 @@ msgstr ""
 msgid "Start added torrents"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:242
+#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:243
 msgid "Remote Preferences"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:409
+#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:400
 msgid "Bandwidth"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:636
+#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:627
 msgid "Limits"
 msgstr "Ierobežojumi"
 
@@ -1070,7 +1074,7 @@ msgstr " (Limits: %s)"
 msgid "Down: %s%s, Up: %s%s"
 msgstr "Lejup: %s%s, Augšup: %s%s"
 
-#: src/trg-toolbar.c:231
+#: src/trg-toolbar.c:232
 msgid "Remove with data"
 msgstr "Dzēst ar inform�ciju"
 
@@ -1163,7 +1167,7 @@ msgstr "Pavisam lejupiel�dēts"
 msgid "Default"
 msgstr "Noklusētais"
 
-#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:260
+#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:251
 msgid "Location:"
 msgstr "Atr�šan�s vieta:"
 
@@ -1177,142 +1181,142 @@ msgstr ""
 msgid "Move %d torrents"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:206
+#: src/trg-torrent-props-dialog.c:197
 msgid "Activity"
 msgstr "Aktivit�te"
 
-#: src/trg-torrent-props-dialog.c:211
+#: src/trg-torrent-props-dialog.c:202
 msgid "Torrent size:"
 msgstr "Torrenta izmērs:"
 
-#: src/trg-torrent-props-dialog.c:216
+#: src/trg-torrent-props-dialog.c:207
 msgid "Have:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:221
+#: src/trg-torrent-props-dialog.c:212
 msgid "Downloaded:"
 msgstr "Lejupiel�dēts:"
 
-#: src/trg-torrent-props-dialog.c:226
+#: src/trg-torrent-props-dialog.c:217
 msgid "Uploaded:"
 msgstr "Augšupiel�dēts:"
 
-#: src/trg-torrent-props-dialog.c:231
+#: src/trg-torrent-props-dialog.c:222
 msgid "State:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:236
+#: src/trg-torrent-props-dialog.c:227
 msgid "Running time:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:241
+#: src/trg-torrent-props-dialog.c:232
 msgid "Remaining time:"
 msgstr "Atlikušais laiks:"
 
-#: src/trg-torrent-props-dialog.c:246
+#: src/trg-torrent-props-dialog.c:237
 msgid "Last activity:"
 msgstr "Pēdēj� aktivit�te:"
 
-#: src/trg-torrent-props-dialog.c:251
+#: src/trg-torrent-props-dialog.c:242
 msgid "Error:"
 msgstr "Kļūda:"
 
-#: src/trg-torrent-props-dialog.c:255
+#: src/trg-torrent-props-dialog.c:246
 msgid "Details"
 msgstr "Sīk�k"
 
-#: src/trg-torrent-props-dialog.c:266
+#: src/trg-torrent-props-dialog.c:257
 msgid "Hash:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:272
+#: src/trg-torrent-props-dialog.c:263
 msgid "Privacy:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:278
+#: src/trg-torrent-props-dialog.c:269
 msgid "Origin:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:295
+#: src/trg-torrent-props-dialog.c:286
 msgid "Comment:"
 msgstr "Koment�rs:"
 
-#: src/trg-torrent-props-dialog.c:330
+#: src/trg-torrent-props-dialog.c:321
 msgid "Private to this tracker -- DHT and PEX disabled"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:332
+#: src/trg-torrent-props-dialog.c:323
 msgid "Public torrent"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:342
+#: src/trg-torrent-props-dialog.c:333
 #, c-format
 msgid "Created on %1$s"
 msgstr "Izveidots %1$s"
 
-#: src/trg-torrent-props-dialog.c:344
+#: src/trg-torrent-props-dialog.c:335
 #, c-format
 msgid "Created by %1$s on %2$s"
 msgstr "Izveidojis %1$s  %2$s"
 
-#: src/trg-torrent-props-dialog.c:376
+#: src/trg-torrent-props-dialog.c:367
 msgid "No errors"
 msgstr "Nav kļūdu"
 
-#: src/trg-torrent-props-dialog.c:380
+#: src/trg-torrent-props-dialog.c:371
 msgid "Active now"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:413
+#: src/trg-torrent-props-dialog.c:404
 msgid "Honor global limits"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:423
+#: src/trg-torrent-props-dialog.c:414
 msgid "Torrent priority:"
 msgstr "Torrenta priorit�te:"
 
-#: src/trg-torrent-props-dialog.c:429
+#: src/trg-torrent-props-dialog.c:420
 msgid "Queue Position:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:434
+#: src/trg-torrent-props-dialog.c:425
 msgid "Limit download speed (KiB/s)"
 msgstr "Ierobežot lejupiel�des �trumu (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:442
+#: src/trg-torrent-props-dialog.c:433
 msgid "Limit upload speed (KiB/s)"
 msgstr "Ierobežot augšupiel�des �trumu (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:450
+#: src/trg-torrent-props-dialog.c:441
 msgid "Use global settings"
 msgstr "Lietot glob�los iestatījumus"
 
-#: src/trg-torrent-props-dialog.c:451
+#: src/trg-torrent-props-dialog.c:442
 msgid "Stop seeding at ratio"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:452
+#: src/trg-torrent-props-dialog.c:443
 msgid "Seed regardless of ratio"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:455
+#: src/trg-torrent-props-dialog.c:446
 msgid "Seed ratio mode:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:463
+#: src/trg-torrent-props-dialog.c:454
 msgid "Seed ratio limit:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:469
+#: src/trg-torrent-props-dialog.c:460
 msgid "Peer limit:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:542
+#: src/trg-torrent-props-dialog.c:533
 #, c-format
 msgid "Multiple (%d) torrent properties"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:574
+#: src/trg-torrent-props-dialog.c:565
 msgid "Information"
 msgstr ""
 
@@ -1432,24 +1436,24 @@ msgstr "Augoši"
 msgid "Descending"
 msgstr "Dilstoši"
 
-#: src/util.c:340
+#: src/util.c:342
 msgid "JSON decoding error."
 msgstr ""
 
-#: src/util.c:345
+#: src/util.c:347
 msgid "Server responded, but with no result."
 msgstr ""
 
-#: src/util.c:349
+#: src/util.c:351
 #, c-format
 msgid "Request failed with HTTP code %d"
 msgstr ""
 
-#: src/util.c:383
+#: src/util.c:385
 msgid "None"
 msgstr "Nav"
 
-#: src/util.c:429
+#: src/util.c:431
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -1457,7 +1461,7 @@ msgstr[0] "%d diena"
 msgstr[1] "%d dienas"
 msgstr[2] "%d dienas"
 
-#: src/util.c:430
+#: src/util.c:432
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1465,7 +1469,7 @@ msgstr[0] "%d stunda"
 msgstr[1] "%d stundas"
 msgstr[2] "%d stundas"
 
-#: src/util.c:432
+#: src/util.c:434
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1473,7 +1477,7 @@ msgstr[0] "%d minūte"
 msgstr[1] "%d minūtes"
 msgstr[2] "%d minūtes"
 
-#: src/util.c:435
+#: src/util.c:437
 #, c-format
 msgid "%ld second"
 msgid_plural "%ld seconds"
diff --git a/po/pl.po b/po/pl.po
index fc52d63..1c39ece 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: transmission-remote-gui\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-05 22:09+0100\n"
+"POT-Creation-Date: 2013-06-09 23:41+0100\n"
 "PO-Revision-Date: 2012-12-05 19:43+0000\n"
 "Last-Translator: �ukasz Cieliński <lukasc@mp.pl>\n"
 "Language-Team: \n"
@@ -11,8 +11,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2013-06-09 22:28+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2014-06-12 07:44+0000\n"
+"X-Generator: Launchpad (build 17045)\n"
 "Language: Polish\n"
 
 #: src/torrent.c:360 src/torrent.c:380
@@ -40,7 +40,7 @@ msgid "Queued seed"
 msgstr ""
 
 #: src/torrent.c:372 src/torrent.c:386 src/trg-remote-prefs-dialog.c:360
-#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:447
+#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:438
 msgid "Seeding"
 msgstr "Rozsiewane"
 
@@ -152,18 +152,18 @@ msgstr[1] ""
 msgid "A remote client to transmission-daemon."
 msgstr "Zdalny klient programu transsmission-daemon."
 
-#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2011
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:416
+#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2025
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:407
 msgid "Low"
 msgstr "Niski"
 
-#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2007
-#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:418
+#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2021
+#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:409
 msgid "High"
 msgstr "Wysoki"
 
-#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2009
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:417
+#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2023
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:408
 msgid "Normal"
 msgstr "Zwykły"
 
@@ -171,12 +171,12 @@ msgstr "Zwykły"
 msgid "Mixed"
 msgstr "Mieszany"
 
-#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:280
+#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:278
 #: src/trg-torrent-add-dialog.c:348 src/trg-torrent-tree-view.c:52
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:283
+#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:281
 #: src/trg-torrent-add-dialog.c:366 src/trg-torrent-tree-view.c:57
 msgid "Size"
 msgstr "Rozmiar"
@@ -190,7 +190,7 @@ msgstr "Postęp"
 msgid "Download"
 msgstr "Pobierz"
 
-#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2000
+#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2014
 #: src/trg-torrent-add-dialog.c:395 src/trg-torrent-tree-view.c:145
 msgid "Priority"
 msgstr "Piorytet"
@@ -219,7 +219,7 @@ msgstr "Rozwiń wszystko"
 msgid "Collapse All"
 msgstr "Zwiń wszystko"
 
-#: src/trg-general-panel.c:153 src/trg-general-panel.c:214
+#: src/trg-general-panel.c:153 src/trg-general-panel.c:212
 msgid "N/A"
 msgstr "Brak"
 
@@ -231,62 +231,62 @@ msgstr ""
 msgid "(Public)"
 msgstr ""
 
-#: src/trg-general-panel.c:202 src/trg-main-window.c:1097
-#: src/trg-main-window.c:1505 src/trg-main-window.c:2135
+#: src/trg-general-panel.c:200 src/trg-main-window.c:1106
+#: src/trg-main-window.c:1519 src/trg-main-window.c:2149
 #: src/trg-state-selector.c:538 src/trg-torrent-add-url-dialog.c:67
-#: src/util.c:331
+#: src/util.c:333
 msgid "Error"
 msgstr "Błędy"
 
-#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:123
+#: src/trg-general-panel.c:283 src/trg-torrent-tree-view.c:123
 msgid "ETA"
 msgstr "Pozostało"
 
-#: src/trg-general-panel.c:287 src/trg-torrent-tree-view.c:151
+#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:151
 msgid "Completed"
 msgstr "Zakończone"
 
-#: src/trg-general-panel.c:290
+#: src/trg-general-panel.c:288
 msgid "Seeders"
 msgstr "RozsiewajÄ…cy"
 
-#: src/trg-general-panel.c:292
+#: src/trg-general-panel.c:290
 msgid "Rate Down"
 msgstr "Pobieranie"
 
-#: src/trg-general-panel.c:294 src/trg-torrent-tree-view.c:128
+#: src/trg-general-panel.c:292 src/trg-torrent-tree-view.c:128
 msgid "Downloaded"
 msgstr "Pobrane"
 
-#: src/trg-general-panel.c:297 src/trg-torrent-tree-view.c:70
+#: src/trg-general-panel.c:295 src/trg-torrent-tree-view.c:70
 msgid "Leechers"
 msgstr "Pijawki"
 
-#: src/trg-general-panel.c:299
+#: src/trg-general-panel.c:297
 msgid "Rate Up"
 msgstr "Wysyłanie"
 
-#: src/trg-general-panel.c:301 src/trg-torrent-tree-view.c:125
+#: src/trg-general-panel.c:299 src/trg-torrent-tree-view.c:125
 msgid "Uploaded"
 msgstr "Wysłanych"
 
-#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:63
+#: src/trg-general-panel.c:302 src/trg-torrent-tree-view.c:63
 msgid "Status"
 msgstr "Status"
 
-#: src/trg-general-panel.c:306 src/trg-torrent-tree-view.c:131
+#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:131
 msgid "Ratio"
 msgstr "Stosunek"
 
-#: src/trg-general-panel.c:309
+#: src/trg-general-panel.c:307
 msgid "Comment"
 msgstr ""
 
-#: src/trg-general-panel.c:312
+#: src/trg-general-panel.c:310
 msgid "Completed At"
 msgstr ""
 
-#: src/trg-general-panel.c:316 src/trg-torrent-tree-view.c:139
+#: src/trg-general-panel.c:314 src/trg-torrent-tree-view.c:139
 msgid "Location"
 msgstr "Lokalizacja"
 
@@ -298,189 +298,189 @@ msgstr "Ten torent został zakończony."
 msgid "This torrent has been added."
 msgstr "Ten torent został dodany."
 
-#: src/trg-main-window.c:596
+#: src/trg-main-window.c:600
 msgid "No hostname set"
 msgstr "Brak nazwy hosta"
 
-#: src/trg-main-window.c:599
+#: src/trg-main-window.c:603
 msgid "Unknown error getting settings"
 msgstr "Nieznany błąd ustawień"
 
-#: src/trg-main-window.c:614
+#: src/trg-main-window.c:623
 msgid "Connecting..."
 msgstr "�ączenie..."
 
-#: src/trg-main-window.c:873
+#: src/trg-main-window.c:882
 #, c-format
 msgid "<big><b>Remove torrent \"%s\"?</b></big>"
 msgstr "<big><b>Usunąć torenta \"%s\"?</b></big>"
 
-#: src/trg-main-window.c:874
+#: src/trg-main-window.c:883
 #, c-format
 msgid "<big><b>Remove %d torrents?</b></big>"
 msgstr "<big><b>Usunąć %d torenty?</b></big>"
 
-#: src/trg-main-window.c:896
+#: src/trg-main-window.c:905
 #, c-format
 msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
 msgstr "<big><b>Usunąć i skasować torenta \"%s\"?</b></big>"
 
-#: src/trg-main-window.c:898
+#: src/trg-main-window.c:907
 #, c-format
 msgid "<big><b>Remove and delete %d torrents?</b></big>"
 msgstr "<big><b>Usunąć i skasować %d torenty?</b></big>"
 
-#: src/trg-main-window.c:981 src/trg-preferences-dialog.c:897
+#: src/trg-main-window.c:990 src/trg-preferences-dialog.c:899
 #: src/trg-remote-prefs-dialog.c:693
 msgid "General"
 msgstr "Główne"
 
-#: src/trg-main-window.c:990 src/trg-torrent-props-dialog.c:622
+#: src/trg-main-window.c:999 src/trg-torrent-props-dialog.c:613
 msgid "Trackers"
 msgstr "Tropiciele"
 
-#: src/trg-main-window.c:998 src/trg-torrent-props-dialog.c:591
+#: src/trg-main-window.c:1007 src/trg-torrent-props-dialog.c:582
 msgid "Files"
 msgstr "Pliki"
 
-#: src/trg-main-window.c:1006 src/trg-remote-prefs-dialog.c:399
-#: src/trg-torrent-props-dialog.c:465 src/trg-torrent-props-dialog.c:605
+#: src/trg-main-window.c:1015 src/trg-remote-prefs-dialog.c:399
+#: src/trg-torrent-props-dialog.c:456 src/trg-torrent-props-dialog.c:596
 #: src/trg-trackers-tree-view.c:190
 msgid "Peers"
 msgstr "Klienci"
 
-#: src/trg-main-window.c:1089
+#: src/trg-main-window.c:1098
 #, c-format
 msgid "This application supports Transmission %g and later, you have %g."
 msgstr ""
 
-#: src/trg-main-window.c:1155 src/trg-status-bar.c:74 src/trg-status-bar.c:104
+#: src/trg-main-window.c:1164 src/trg-status-bar.c:74 src/trg-status-bar.c:104
 msgid "Disconnected"
 msgstr "Rozłączono"
 
-#: src/trg-main-window.c:1200
+#: src/trg-main-window.c:1209
 #, c-format
 msgid "%d Downloading @ %s"
 msgstr "%d Pobieranie @ %s"
 
-#: src/trg-main-window.c:1207
+#: src/trg-main-window.c:1216
 #, c-format
 msgid "%d Seeding @ %s"
 msgstr "%d Wysyłanie @ %s"
 
-#: src/trg-main-window.c:1258
+#: src/trg-main-window.c:1267
 #, c-format
 msgid "Request %d/%d failed: %s"
 msgstr "Żądanie %d/%d nieudane: %s"
 
-#: src/trg-main-window.c:2055
+#: src/trg-main-window.c:2069
 msgid "No Limit"
 msgstr "Brak Limitów"
 
-#: src/trg-main-window.c:2156 src/trg-menu-bar.c:675 src/trg-toolbar.c:223
+#: src/trg-main-window.c:2170 src/trg-menu-bar.c:675 src/trg-toolbar.c:224
 msgid "Properties"
 msgstr "Ustawienia"
 
-#: src/trg-main-window.c:2159 src/trg-toolbar.c:216
+#: src/trg-main-window.c:2173 src/trg-toolbar.c:217
 msgid "Resume"
 msgstr "Wznów"
 
-#: src/trg-main-window.c:2162 src/trg-toolbar.c:219
+#: src/trg-main-window.c:2176 src/trg-toolbar.c:220
 msgid "Pause"
 msgstr "Zatrzymaj"
 
-#: src/trg-main-window.c:2165
+#: src/trg-main-window.c:2179
 msgid "Verify"
 msgstr "Sprawdź"
 
-#: src/trg-main-window.c:2168
+#: src/trg-main-window.c:2182
 msgid "Re-announce"
 msgstr "Ponowne rozgłaszanie"
 
-#: src/trg-main-window.c:2171 src/trg-torrent-move-dialog.c:119
+#: src/trg-main-window.c:2185 src/trg-torrent-move-dialog.c:119
 #: src/trg-torrent-move-dialog.c:126
 msgid "Move"
 msgstr "PrzenieÅ›"
 
-#: src/trg-main-window.c:2174 src/trg-menu-bar.c:706 src/trg-toolbar.c:227
+#: src/trg-main-window.c:2188 src/trg-menu-bar.c:706 src/trg-toolbar.c:228
 msgid "Remove"
 msgstr "_Usuń"
 
-#: src/trg-main-window.c:2177
+#: src/trg-main-window.c:2191
 msgid "Remove & Delete"
 msgstr "Usuń i Skasuj"
 
-#: src/trg-main-window.c:2201 src/trg-preferences-dialog.c:907
+#: src/trg-main-window.c:2215 src/trg-preferences-dialog.c:909
 msgid "Actions"
 msgstr "Akcje"
 
-#: src/trg-main-window.c:2230 src/trg-menu-bar.c:722
+#: src/trg-main-window.c:2244 src/trg-menu-bar.c:722
 msgid "Start Now"
 msgstr "Zacznij teraz"
 
-#: src/trg-main-window.c:2233 src/trg-menu-bar.c:727
+#: src/trg-main-window.c:2247 src/trg-menu-bar.c:727
 msgid "Move Up Queue"
 msgstr "Przenieś wyżej"
 
-#: src/trg-main-window.c:2236 src/trg-menu-bar.c:734
+#: src/trg-main-window.c:2250 src/trg-menu-bar.c:734
 msgid "Move Down Queue"
 msgstr "Przenieś niżej"
 
-#: src/trg-main-window.c:2239 src/trg-menu-bar.c:741
+#: src/trg-main-window.c:2253 src/trg-menu-bar.c:741
 msgid "Bottom Of Queue"
 msgstr "Przenieś na dół"
 
-#: src/trg-main-window.c:2242 src/trg-menu-bar.c:745
+#: src/trg-main-window.c:2256 src/trg-menu-bar.c:745
 msgid "Top Of Queue"
 msgstr "Przenieś na górę"
 
-#: src/trg-main-window.c:2251 src/trg-main-window.c:2334
+#: src/trg-main-window.c:2265 src/trg-main-window.c:2348
 msgid "Down Limit"
 msgstr "Limit Pobierania"
 
-#: src/trg-main-window.c:2256 src/trg-main-window.c:2338
+#: src/trg-main-window.c:2270 src/trg-main-window.c:2352
 msgid "Up Limit"
 msgstr "Limit Wysyłania"
 
-#: src/trg-main-window.c:2285 src/trg-main-window.c:2292
+#: src/trg-main-window.c:2299 src/trg-main-window.c:2306
 #: src/trg-remote-prefs-dialog.c:497
 msgid "Updating..."
 msgstr "Aktualizowanie..."
 
-#: src/trg-main-window.c:2306 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
+#: src/trg-main-window.c:2320 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
 msgid "Connect"
 msgstr "Połącz"
 
-#: src/trg-main-window.c:2313 src/trg-toolbar.c:206
+#: src/trg-main-window.c:2327 src/trg-toolbar.c:207
 msgid "Disconnect"
 msgstr "Rozłącz"
 
-#: src/trg-main-window.c:2317 src/trg-toolbar.c:209
+#: src/trg-main-window.c:2331 src/trg-toolbar.c:210
 #: src/trg-trackers-tree-view.c:284 src/trg-trackers-tree-view.c:311
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/trg-main-window.c:2321
+#: src/trg-main-window.c:2335
 msgid "Add from URL"
 msgstr "Dodaj adres"
 
-#: src/trg-main-window.c:2325
+#: src/trg-main-window.c:2339
 msgid "Resume All"
 msgstr "Wznów wszystkie"
 
-#: src/trg-main-window.c:2329
+#: src/trg-main-window.c:2343
 msgid "Pause All"
 msgstr "Zatrzymaj wszystkie"
 
-#: src/trg-main-window.c:2345
+#: src/trg-main-window.c:2359
 msgid "Quit"
 msgstr "Wyjście"
 
-#: src/trg-main-window.c:2459 src/trg-menu-bar.c:536
+#: src/trg-main-window.c:2473 src/trg-menu-bar.c:536
 msgid "Graph"
 msgstr "Wykres"
 
-#: src/trg-main-window.c:2647
+#: src/trg-main-window.c:2662
 msgid "Transmission Remote"
 msgstr ""
 
@@ -688,7 +688,7 @@ msgstr ""
 msgid "Directory"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:902
+#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:904
 msgid "View"
 msgstr ""
 
@@ -728,7 +728,7 @@ msgstr ""
 msgid "Name:"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:892
+#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:894
 msgid "Connection"
 msgstr "Połączenie"
 
@@ -740,35 +740,39 @@ msgstr "Host:"
 msgid "Port:"
 msgstr "Port:"
 
-#: src/trg-preferences-dialog.c:817
+#: src/trg-preferences-dialog.c:816
+msgid "RPC URL Path:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:819
 msgid "Username:"
 msgstr "Użytkownik:"
 
-#: src/trg-preferences-dialog.c:821
+#: src/trg-preferences-dialog.c:823
 msgid "Password:"
 msgstr "Hasło:"
 
-#: src/trg-preferences-dialog.c:823
+#: src/trg-preferences-dialog.c:825
 msgid "Automatically connect"
 msgstr "Połącz automatycznie"
 
-#: src/trg-preferences-dialog.c:829
+#: src/trg-preferences-dialog.c:831
 msgid "SSL"
 msgstr "SSL"
 
-#: src/trg-preferences-dialog.c:836
+#: src/trg-preferences-dialog.c:838
 msgid "Timeout:"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:840
+#: src/trg-preferences-dialog.c:842
 msgid "Retries:"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:881 src/trg-toolbar.c:238
+#: src/trg-preferences-dialog.c:883 src/trg-toolbar.c:239
 msgid "Local Preferences"
 msgstr "Ustawienia lokalne"
 
-#: src/trg-preferences-dialog.c:912
+#: src/trg-preferences-dialog.c:914
 msgid "Directories"
 msgstr ""
 
@@ -959,15 +963,15 @@ msgstr "Skasuj oryginalne pliki torent"
 msgid "Start added torrents"
 msgstr "Uruchom dodane torenty"
 
-#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:242
+#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:243
 msgid "Remote Preferences"
 msgstr "Ustawienia zdalne"
 
-#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:409
+#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:400
 msgid "Bandwidth"
 msgstr "Pasmo"
 
-#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:636
+#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:627
 msgid "Limits"
 msgstr "Limity"
 
@@ -1067,7 +1071,7 @@ msgstr ""
 msgid "Down: %s%s, Up: %s%s"
 msgstr ""
 
-#: src/trg-toolbar.c:231
+#: src/trg-toolbar.c:232
 msgid "Remove with data"
 msgstr "Usuń razem z danymi"
 
@@ -1160,7 +1164,7 @@ msgstr "Całość pobieranych"
 msgid "Default"
 msgstr ""
 
-#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:260
+#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:251
 msgid "Location:"
 msgstr "Lokacja:"
 
@@ -1174,142 +1178,142 @@ msgstr "PrzenieÅ› %s"
 msgid "Move %d torrents"
 msgstr "PrzenieÅ› %d torenty"
 
-#: src/trg-torrent-props-dialog.c:206
+#: src/trg-torrent-props-dialog.c:197
 msgid "Activity"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:211
+#: src/trg-torrent-props-dialog.c:202
 msgid "Torrent size:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:216
+#: src/trg-torrent-props-dialog.c:207
 msgid "Have:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:221
+#: src/trg-torrent-props-dialog.c:212
 msgid "Downloaded:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:226
+#: src/trg-torrent-props-dialog.c:217
 msgid "Uploaded:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:231
+#: src/trg-torrent-props-dialog.c:222
 msgid "State:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:236
+#: src/trg-torrent-props-dialog.c:227
 msgid "Running time:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:241
+#: src/trg-torrent-props-dialog.c:232
 msgid "Remaining time:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:246
+#: src/trg-torrent-props-dialog.c:237
 msgid "Last activity:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:251
+#: src/trg-torrent-props-dialog.c:242
 msgid "Error:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:255
+#: src/trg-torrent-props-dialog.c:246
 msgid "Details"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:266
+#: src/trg-torrent-props-dialog.c:257
 msgid "Hash:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:272
+#: src/trg-torrent-props-dialog.c:263
 msgid "Privacy:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:278
+#: src/trg-torrent-props-dialog.c:269
 msgid "Origin:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:295
+#: src/trg-torrent-props-dialog.c:286
 msgid "Comment:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:330
+#: src/trg-torrent-props-dialog.c:321
 msgid "Private to this tracker -- DHT and PEX disabled"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:332
+#: src/trg-torrent-props-dialog.c:323
 msgid "Public torrent"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:342
+#: src/trg-torrent-props-dialog.c:333
 #, c-format
 msgid "Created on %1$s"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:344
+#: src/trg-torrent-props-dialog.c:335
 #, c-format
 msgid "Created by %1$s on %2$s"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:376
+#: src/trg-torrent-props-dialog.c:367
 msgid "No errors"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:380
+#: src/trg-torrent-props-dialog.c:371
 msgid "Active now"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:413
+#: src/trg-torrent-props-dialog.c:404
 msgid "Honor global limits"
 msgstr "Uwzględnij globalne limity"
 
-#: src/trg-torrent-props-dialog.c:423
+#: src/trg-torrent-props-dialog.c:414
 msgid "Torrent priority:"
 msgstr "Piorytet torenta:"
 
-#: src/trg-torrent-props-dialog.c:429
+#: src/trg-torrent-props-dialog.c:420
 msgid "Queue Position:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:434
+#: src/trg-torrent-props-dialog.c:425
 msgid "Limit download speed (KiB/s)"
 msgstr "Ogranicz prędkość pobierania (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:442
+#: src/trg-torrent-props-dialog.c:433
 msgid "Limit upload speed (KiB/s)"
 msgstr "Ogranicz prędkość wysyłania (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:450
+#: src/trg-torrent-props-dialog.c:441
 msgid "Use global settings"
 msgstr "Użyj ustawień globalnych"
 
-#: src/trg-torrent-props-dialog.c:451
+#: src/trg-torrent-props-dialog.c:442
 msgid "Stop seeding at ratio"
 msgstr "Zatrzymaj rozsiewanie przy stosunku"
 
-#: src/trg-torrent-props-dialog.c:452
+#: src/trg-torrent-props-dialog.c:443
 msgid "Seed regardless of ratio"
 msgstr "Rozsiewanie bez względu na stosunek"
 
-#: src/trg-torrent-props-dialog.c:455
+#: src/trg-torrent-props-dialog.c:446
 msgid "Seed ratio mode:"
 msgstr "Tryb rozsiewania:"
 
-#: src/trg-torrent-props-dialog.c:463
+#: src/trg-torrent-props-dialog.c:454
 msgid "Seed ratio limit:"
 msgstr "Limit rozsiewania:"
 
-#: src/trg-torrent-props-dialog.c:469
+#: src/trg-torrent-props-dialog.c:460
 msgid "Peer limit:"
 msgstr "Limit klientów:"
 
-#: src/trg-torrent-props-dialog.c:542
+#: src/trg-torrent-props-dialog.c:533
 #, c-format
 msgid "Multiple (%d) torrent properties"
 msgstr "Właściwości wielu torentów (%d)"
 
-#: src/trg-torrent-props-dialog.c:574
+#: src/trg-torrent-props-dialog.c:565
 msgid "Information"
 msgstr ""
 
@@ -1429,24 +1433,24 @@ msgstr ""
 msgid "Descending"
 msgstr ""
 
-#: src/util.c:340
+#: src/util.c:342
 msgid "JSON decoding error."
 msgstr "BÅ‚Ä…d dekodowania JSON."
 
-#: src/util.c:345
+#: src/util.c:347
 msgid "Server responded, but with no result."
 msgstr "Serwer odpowiedział, ale bez rezultatu."
 
-#: src/util.c:349
+#: src/util.c:351
 #, c-format
 msgid "Request failed with HTTP code %d"
 msgstr "Żądanie nieudane z kodem HTTP %d"
 
-#: src/util.c:383
+#: src/util.c:385
 msgid "None"
 msgstr "Brak"
 
-#: src/util.c:429
+#: src/util.c:431
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -1454,7 +1458,7 @@ msgstr[0] "%d dzień"
 msgstr[1] "%d dni"
 msgstr[2] "%d dni"
 
-#: src/util.c:430
+#: src/util.c:432
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1462,7 +1466,7 @@ msgstr[0] "%d godzinÄ™"
 msgstr[1] "%d godziny"
 msgstr[2] "%d godzin"
 
-#: src/util.c:432
+#: src/util.c:434
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1470,7 +1474,7 @@ msgstr[0] "%d minutÄ™"
 msgstr[1] "%d minuty"
 msgstr[2] "%d minut"
 
-#: src/util.c:435
+#: src/util.c:437
 #, c-format
 msgid "%ld second"
 msgid_plural "%ld seconds"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 16d92a8..129af47 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: transmission-remote-gtk\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-09-05 22:09+0100\n"
+"POT-Creation-Date: 2013-06-09 23:41+0100\n"
 "PO-Revision-Date: 2012-07-25 14:41+0000\n"
 "Last-Translator: Rafael Neri <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2013-06-09 22:28+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2014-06-12 07:44+0000\n"
+"X-Generator: Launchpad (build 17045)\n"
 
 #: src/torrent.c:360 src/torrent.c:380
 msgid "Metadata Downloading"
@@ -43,7 +43,7 @@ msgid "Queued seed"
 msgstr ""
 
 #: src/torrent.c:372 src/torrent.c:386 src/trg-remote-prefs-dialog.c:360
-#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:447
+#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:438
 msgid "Seeding"
 msgstr "Distribuindo"
 
@@ -155,18 +155,18 @@ msgstr[1] ""
 msgid "A remote client to transmission-daemon."
 msgstr "Um cliente remoto para o transmission-daemon"
 
-#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2011
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:416
+#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2025
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:407
 msgid "Low"
 msgstr "Mínima"
 
-#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2007
-#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:418
+#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2021
+#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:409
 msgid "High"
 msgstr "Máxima"
 
-#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2009
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:417
+#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2023
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:408
 msgid "Normal"
 msgstr "Normal"
 
@@ -174,12 +174,12 @@ msgstr "Normal"
 msgid "Mixed"
 msgstr "Misto"
 
-#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:280
+#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:278
 #: src/trg-torrent-add-dialog.c:348 src/trg-torrent-tree-view.c:52
 msgid "Name"
 msgstr "Nome"
 
-#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:283
+#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:281
 #: src/trg-torrent-add-dialog.c:366 src/trg-torrent-tree-view.c:57
 msgid "Size"
 msgstr "Tamanho"
@@ -193,7 +193,7 @@ msgstr "Progresso"
 msgid "Download"
 msgstr "Baixar"
 
-#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2000
+#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2014
 #: src/trg-torrent-add-dialog.c:395 src/trg-torrent-tree-view.c:145
 msgid "Priority"
 msgstr "Prioridade"
@@ -222,7 +222,7 @@ msgstr "Expandir tudo"
 msgid "Collapse All"
 msgstr "Ocultar tudo"
 
-#: src/trg-general-panel.c:153 src/trg-general-panel.c:214
+#: src/trg-general-panel.c:153 src/trg-general-panel.c:212
 msgid "N/A"
 msgstr "N/D"
 
@@ -234,62 +234,62 @@ msgstr "(Privado)"
 msgid "(Public)"
 msgstr "(Público)"
 
-#: src/trg-general-panel.c:202 src/trg-main-window.c:1097
-#: src/trg-main-window.c:1505 src/trg-main-window.c:2135
+#: src/trg-general-panel.c:200 src/trg-main-window.c:1106
+#: src/trg-main-window.c:1519 src/trg-main-window.c:2149
 #: src/trg-state-selector.c:538 src/trg-torrent-add-url-dialog.c:67
-#: src/util.c:331
+#: src/util.c:333
 msgid "Error"
 msgstr "Erro"
 
-#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:123
+#: src/trg-general-panel.c:283 src/trg-torrent-tree-view.c:123
 msgid "ETA"
 msgstr "Tempo estimado"
 
-#: src/trg-general-panel.c:287 src/trg-torrent-tree-view.c:151
+#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:151
 msgid "Completed"
 msgstr "Concluído"
 
-#: src/trg-general-panel.c:290
+#: src/trg-general-panel.c:288
 msgid "Seeders"
 msgstr "Distribuidores"
 
-#: src/trg-general-panel.c:292
+#: src/trg-general-panel.c:290
 msgid "Rate Down"
 msgstr "Taxa de download"
 
-#: src/trg-general-panel.c:294 src/trg-torrent-tree-view.c:128
+#: src/trg-general-panel.c:292 src/trg-torrent-tree-view.c:128
 msgid "Downloaded"
 msgstr "Baixado"
 
-#: src/trg-general-panel.c:297 src/trg-torrent-tree-view.c:70
+#: src/trg-general-panel.c:295 src/trg-torrent-tree-view.c:70
 msgid "Leechers"
 msgstr "Receptores"
 
-#: src/trg-general-panel.c:299
+#: src/trg-general-panel.c:297
 msgid "Rate Up"
 msgstr "Taxa de Upload"
 
-#: src/trg-general-panel.c:301 src/trg-torrent-tree-view.c:125
+#: src/trg-general-panel.c:299 src/trg-torrent-tree-view.c:125
 msgid "Uploaded"
 msgstr "Enviado"
 
-#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:63
+#: src/trg-general-panel.c:302 src/trg-torrent-tree-view.c:63
 msgid "Status"
 msgstr "Estado"
 
-#: src/trg-general-panel.c:306 src/trg-torrent-tree-view.c:131
+#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:131
 msgid "Ratio"
 msgstr "Proporção"
 
-#: src/trg-general-panel.c:309
+#: src/trg-general-panel.c:307
 msgid "Comment"
 msgstr "Comentar"
 
-#: src/trg-general-panel.c:312
+#: src/trg-general-panel.c:310
 msgid "Completed At"
 msgstr "Concluído em"
 
-#: src/trg-general-panel.c:316 src/trg-torrent-tree-view.c:139
+#: src/trg-general-panel.c:314 src/trg-torrent-tree-view.c:139
 msgid "Location"
 msgstr "Localização"
 
@@ -301,189 +301,189 @@ msgstr "Este torrent foi concluído."
 msgid "This torrent has been added."
 msgstr "Este torrent foi adicionado."
 
-#: src/trg-main-window.c:596
+#: src/trg-main-window.c:600
 msgid "No hostname set"
 msgstr "Nenhum hostname definido"
 
-#: src/trg-main-window.c:599
+#: src/trg-main-window.c:603
 msgid "Unknown error getting settings"
 msgstr "Erro desconhecido ao obter as configurações"
 
-#: src/trg-main-window.c:614
+#: src/trg-main-window.c:623
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/trg-main-window.c:873
+#: src/trg-main-window.c:882
 #, c-format
 msgid "<big><b>Remove torrent \"%s\"?</b></big>"
 msgstr "<big><b>Remover torrent \"%s\"?</b></big>"
 
-#: src/trg-main-window.c:874
+#: src/trg-main-window.c:883
 #, c-format
 msgid "<big><b>Remove %d torrents?</b></big>"
 msgstr "<big><b>Remover %d torrents?</b></big>"
 
-#: src/trg-main-window.c:896
+#: src/trg-main-window.c:905
 #, c-format
 msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
 msgstr "<big><b>Remover e excluir torrent \"%s\"?</b></big>"
 
-#: src/trg-main-window.c:898
+#: src/trg-main-window.c:907
 #, c-format
 msgid "<big><b>Remove and delete %d torrents?</b></big>"
 msgstr "<big><b>Remover e excluir %d torrents?</b></big>"
 
-#: src/trg-main-window.c:981 src/trg-preferences-dialog.c:897
+#: src/trg-main-window.c:990 src/trg-preferences-dialog.c:899
 #: src/trg-remote-prefs-dialog.c:693
 msgid "General"
 msgstr "Geral"
 
-#: src/trg-main-window.c:990 src/trg-torrent-props-dialog.c:622
+#: src/trg-main-window.c:999 src/trg-torrent-props-dialog.c:613
 msgid "Trackers"
 msgstr "Rastreadores"
 
-#: src/trg-main-window.c:998 src/trg-torrent-props-dialog.c:591
+#: src/trg-main-window.c:1007 src/trg-torrent-props-dialog.c:582
 msgid "Files"
 msgstr "Arquivos"
 
-#: src/trg-main-window.c:1006 src/trg-remote-prefs-dialog.c:399
-#: src/trg-torrent-props-dialog.c:465 src/trg-torrent-props-dialog.c:605
+#: src/trg-main-window.c:1015 src/trg-remote-prefs-dialog.c:399
+#: src/trg-torrent-props-dialog.c:456 src/trg-torrent-props-dialog.c:596
 #: src/trg-trackers-tree-view.c:190
 msgid "Peers"
 msgstr "Pares"
 
-#: src/trg-main-window.c:1089
+#: src/trg-main-window.c:1098
 #, c-format
 msgid "This application supports Transmission %g and later, you have %g."
 msgstr "Este aplicativo suporta Transmission %g e superior, você tem %g."
 
-#: src/trg-main-window.c:1155 src/trg-status-bar.c:74 src/trg-status-bar.c:104
+#: src/trg-main-window.c:1164 src/trg-status-bar.c:74 src/trg-status-bar.c:104
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: src/trg-main-window.c:1200
+#: src/trg-main-window.c:1209
 #, c-format
 msgid "%d Downloading @ %s"
 msgstr "%d baixando @ %s"
 
-#: src/trg-main-window.c:1207
+#: src/trg-main-window.c:1216
 #, c-format
 msgid "%d Seeding @ %s"
 msgstr "%d distribuindo @ %s"
 
-#: src/trg-main-window.c:1258
+#: src/trg-main-window.c:1267
 #, c-format
 msgid "Request %d/%d failed: %s"
 msgstr "Solicitação %d/%d falhou: %s"
 
-#: src/trg-main-window.c:2055
+#: src/trg-main-window.c:2069
 msgid "No Limit"
 msgstr "Sem limite"
 
-#: src/trg-main-window.c:2156 src/trg-menu-bar.c:675 src/trg-toolbar.c:223
+#: src/trg-main-window.c:2170 src/trg-menu-bar.c:675 src/trg-toolbar.c:224
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/trg-main-window.c:2159 src/trg-toolbar.c:216
+#: src/trg-main-window.c:2173 src/trg-toolbar.c:217
 msgid "Resume"
 msgstr "Continuar"
 
-#: src/trg-main-window.c:2162 src/trg-toolbar.c:219
+#: src/trg-main-window.c:2176 src/trg-toolbar.c:220
 msgid "Pause"
 msgstr "Pausar"
 
-#: src/trg-main-window.c:2165
+#: src/trg-main-window.c:2179
 msgid "Verify"
 msgstr "Verificar"
 
-#: src/trg-main-window.c:2168
+#: src/trg-main-window.c:2182
 msgid "Re-announce"
 msgstr "Anunciar novamente"
 
-#: src/trg-main-window.c:2171 src/trg-torrent-move-dialog.c:119
+#: src/trg-main-window.c:2185 src/trg-torrent-move-dialog.c:119
 #: src/trg-torrent-move-dialog.c:126
 msgid "Move"
 msgstr "Mover"
 
-#: src/trg-main-window.c:2174 src/trg-menu-bar.c:706 src/trg-toolbar.c:227
+#: src/trg-main-window.c:2188 src/trg-menu-bar.c:706 src/trg-toolbar.c:228
 msgid "Remove"
 msgstr "Remover"
 
-#: src/trg-main-window.c:2177
+#: src/trg-main-window.c:2191
 msgid "Remove & Delete"
 msgstr "Remover e excluir"
 
-#: src/trg-main-window.c:2201 src/trg-preferences-dialog.c:907
+#: src/trg-main-window.c:2215 src/trg-preferences-dialog.c:909
 msgid "Actions"
 msgstr "Ações"
 
-#: src/trg-main-window.c:2230 src/trg-menu-bar.c:722
+#: src/trg-main-window.c:2244 src/trg-menu-bar.c:722
 msgid "Start Now"
 msgstr "Iniciar agora"
 
-#: src/trg-main-window.c:2233 src/trg-menu-bar.c:727
+#: src/trg-main-window.c:2247 src/trg-menu-bar.c:727
 msgid "Move Up Queue"
 msgstr "Mover para cima na fila"
 
-#: src/trg-main-window.c:2236 src/trg-menu-bar.c:734
+#: src/trg-main-window.c:2250 src/trg-menu-bar.c:734
 msgid "Move Down Queue"
 msgstr "Mover para baixo na fila"
 
-#: src/trg-main-window.c:2239 src/trg-menu-bar.c:741
+#: src/trg-main-window.c:2253 src/trg-menu-bar.c:741
 msgid "Bottom Of Queue"
 msgstr "Final da fila"
 
-#: src/trg-main-window.c:2242 src/trg-menu-bar.c:745
+#: src/trg-main-window.c:2256 src/trg-menu-bar.c:745
 msgid "Top Of Queue"
 msgstr "Topo da fila"
 
-#: src/trg-main-window.c:2251 src/trg-main-window.c:2334
+#: src/trg-main-window.c:2265 src/trg-main-window.c:2348
 msgid "Down Limit"
 msgstr "Limite de download"
 
-#: src/trg-main-window.c:2256 src/trg-main-window.c:2338
+#: src/trg-main-window.c:2270 src/trg-main-window.c:2352
 msgid "Up Limit"
 msgstr "Limite de upload"
 
-#: src/trg-main-window.c:2285 src/trg-main-window.c:2292
+#: src/trg-main-window.c:2299 src/trg-main-window.c:2306
 #: src/trg-remote-prefs-dialog.c:497
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: src/trg-main-window.c:2306 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
+#: src/trg-main-window.c:2320 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/trg-main-window.c:2313 src/trg-toolbar.c:206
+#: src/trg-main-window.c:2327 src/trg-toolbar.c:207
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: src/trg-main-window.c:2317 src/trg-toolbar.c:209
+#: src/trg-main-window.c:2331 src/trg-toolbar.c:210
 #: src/trg-trackers-tree-view.c:284 src/trg-trackers-tree-view.c:311
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/trg-main-window.c:2321
+#: src/trg-main-window.c:2335
 msgid "Add from URL"
 msgstr "Adicione a partir da URL"
 
-#: src/trg-main-window.c:2325
+#: src/trg-main-window.c:2339
 msgid "Resume All"
 msgstr "Continuar todos"
 
-#: src/trg-main-window.c:2329
+#: src/trg-main-window.c:2343
 msgid "Pause All"
 msgstr "Pausar todos"
 
-#: src/trg-main-window.c:2345
+#: src/trg-main-window.c:2359
 msgid "Quit"
 msgstr "Sair"
 
-#: src/trg-main-window.c:2459 src/trg-menu-bar.c:536
+#: src/trg-main-window.c:2473 src/trg-menu-bar.c:536
 msgid "Graph"
 msgstr "Grafo"
 
-#: src/trg-main-window.c:2647
+#: src/trg-main-window.c:2662
 msgid "Transmission Remote"
 msgstr "Transmission Remote"
 
@@ -691,7 +691,7 @@ msgstr ""
 msgid "Directory"
 msgstr "Diretório"
 
-#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:902
+#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:904
 msgid "View"
 msgstr "Visualizar"
 
@@ -731,7 +731,7 @@ msgstr "Perfil: "
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:892
+#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:894
 msgid "Connection"
 msgstr "Conexão"
 
@@ -743,35 +743,39 @@ msgstr "Host:"
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/trg-preferences-dialog.c:817
+#: src/trg-preferences-dialog.c:816
+msgid "RPC URL Path:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:819
 msgid "Username:"
 msgstr "Nome do usuário:"
 
-#: src/trg-preferences-dialog.c:821
+#: src/trg-preferences-dialog.c:823
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/trg-preferences-dialog.c:823
+#: src/trg-preferences-dialog.c:825
 msgid "Automatically connect"
 msgstr "Conectar automaticamente"
 
-#: src/trg-preferences-dialog.c:829
+#: src/trg-preferences-dialog.c:831
 msgid "SSL"
 msgstr "SSL"
 
-#: src/trg-preferences-dialog.c:836
+#: src/trg-preferences-dialog.c:838
 msgid "Timeout:"
 msgstr "Tempo limite:"
 
-#: src/trg-preferences-dialog.c:840
+#: src/trg-preferences-dialog.c:842
 msgid "Retries:"
 msgstr "Tentativas:"
 
-#: src/trg-preferences-dialog.c:881 src/trg-toolbar.c:238
+#: src/trg-preferences-dialog.c:883 src/trg-toolbar.c:239
 msgid "Local Preferences"
 msgstr "Preferências locais"
 
-#: src/trg-preferences-dialog.c:912
+#: src/trg-preferences-dialog.c:914
 msgid "Directories"
 msgstr "Diretórios"
 
@@ -962,15 +966,15 @@ msgstr ""
 msgid "Start added torrents"
 msgstr "Iniciar torrents adicionados"
 
-#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:242
+#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:243
 msgid "Remote Preferences"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:409
+#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:400
 msgid "Bandwidth"
 msgstr "Largura de banda"
 
-#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:636
+#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:627
 msgid "Limits"
 msgstr "Limites"
 
@@ -1070,7 +1074,7 @@ msgstr " (Limite: %s)"
 msgid "Down: %s%s, Up: %s%s"
 msgstr "Down: %s%s, Up: %s%s"
 
-#: src/trg-toolbar.c:231
+#: src/trg-toolbar.c:232
 msgid "Remove with data"
 msgstr "Excluir com dados"
 
@@ -1163,7 +1167,7 @@ msgstr ""
 msgid "Default"
 msgstr "Padrão"
 
-#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:260
+#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:251
 msgid "Location:"
 msgstr "Localização:"
 
@@ -1177,142 +1181,142 @@ msgstr "Mover %s"
 msgid "Move %d torrents"
 msgstr "Mover %d torrents"
 
-#: src/trg-torrent-props-dialog.c:206
+#: src/trg-torrent-props-dialog.c:197
 msgid "Activity"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:211
+#: src/trg-torrent-props-dialog.c:202
 msgid "Torrent size:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:216
+#: src/trg-torrent-props-dialog.c:207
 msgid "Have:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:221
+#: src/trg-torrent-props-dialog.c:212
 msgid "Downloaded:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:226
+#: src/trg-torrent-props-dialog.c:217
 msgid "Uploaded:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:231
+#: src/trg-torrent-props-dialog.c:222
 msgid "State:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:236
+#: src/trg-torrent-props-dialog.c:227
 msgid "Running time:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:241
+#: src/trg-torrent-props-dialog.c:232
 msgid "Remaining time:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:246
+#: src/trg-torrent-props-dialog.c:237
 msgid "Last activity:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:251
+#: src/trg-torrent-props-dialog.c:242
 msgid "Error:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:255
+#: src/trg-torrent-props-dialog.c:246
 msgid "Details"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:266
+#: src/trg-torrent-props-dialog.c:257
 msgid "Hash:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:272
+#: src/trg-torrent-props-dialog.c:263
 msgid "Privacy:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:278
+#: src/trg-torrent-props-dialog.c:269
 msgid "Origin:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:295
+#: src/trg-torrent-props-dialog.c:286
 msgid "Comment:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:330
+#: src/trg-torrent-props-dialog.c:321
 msgid "Private to this tracker -- DHT and PEX disabled"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:332
+#: src/trg-torrent-props-dialog.c:323
 msgid "Public torrent"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:342
+#: src/trg-torrent-props-dialog.c:333
 #, c-format
 msgid "Created on %1$s"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:344
+#: src/trg-torrent-props-dialog.c:335
 #, c-format
 msgid "Created by %1$s on %2$s"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:376
+#: src/trg-torrent-props-dialog.c:367
 msgid "No errors"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:380
+#: src/trg-torrent-props-dialog.c:371
 msgid "Active now"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:413
+#: src/trg-torrent-props-dialog.c:404
 msgid "Honor global limits"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:423
+#: src/trg-torrent-props-dialog.c:414
 msgid "Torrent priority:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:429
+#: src/trg-torrent-props-dialog.c:420
 msgid "Queue Position:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:434
+#: src/trg-torrent-props-dialog.c:425
 msgid "Limit download speed (KiB/s)"
 msgstr "Limite de velocidade de download (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:442
+#: src/trg-torrent-props-dialog.c:433
 msgid "Limit upload speed (KiB/s)"
 msgstr "Limite de velocidade de upload (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:450
+#: src/trg-torrent-props-dialog.c:441
 msgid "Use global settings"
 msgstr "Usar configurações globais"
 
-#: src/trg-torrent-props-dialog.c:451
+#: src/trg-torrent-props-dialog.c:442
 msgid "Stop seeding at ratio"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:452
+#: src/trg-torrent-props-dialog.c:443
 msgid "Seed regardless of ratio"
 msgstr "Distribuir independente da taxa"
 
-#: src/trg-torrent-props-dialog.c:455
+#: src/trg-torrent-props-dialog.c:446
 msgid "Seed ratio mode:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:463
+#: src/trg-torrent-props-dialog.c:454
 msgid "Seed ratio limit:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:469
+#: src/trg-torrent-props-dialog.c:460
 msgid "Peer limit:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:542
+#: src/trg-torrent-props-dialog.c:533
 #, c-format
 msgid "Multiple (%d) torrent properties"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:574
+#: src/trg-torrent-props-dialog.c:565
 msgid "Information"
 msgstr ""
 
@@ -1432,45 +1436,45 @@ msgstr ""
 msgid "Descending"
 msgstr ""
 
-#: src/util.c:340
+#: src/util.c:342
 msgid "JSON decoding error."
 msgstr "Erro ao decodificar JSON."
 
-#: src/util.c:345
+#: src/util.c:347
 msgid "Server responded, but with no result."
 msgstr "Servidor respondeu, mas sem resultado."
 
-#: src/util.c:349
+#: src/util.c:351
 #, c-format
 msgid "Request failed with HTTP code %d"
 msgstr "Solicitação falhou com código HTTP %d"
 
-#: src/util.c:383
+#: src/util.c:385
 msgid "None"
 msgstr "Nenhum"
 
-#: src/util.c:429
+#: src/util.c:431
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: src/util.c:430
+#: src/util.c:432
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/util.c:432
+#: src/util.c:434
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/util.c:435
+#: src/util.c:437
 #, c-format
 msgid "%ld second"
 msgid_plural "%ld seconds"
diff --git a/po/ru.po b/po/ru.po
index f9c6234..830804c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: transmission-remote-gui\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-05 22:09+0100\n"
+"POT-Creation-Date: 2013-06-09 23:41+0100\n"
 "PO-Revision-Date: 2012-09-30 10:07+0000\n"
 "Last-Translator: Nkolay Parukhin <parukhin@gmail.com>\n"
 "Language-Team: \n"
@@ -11,8 +11,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\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-Launchpad-Export-Date: 2013-06-09 22:28+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2014-06-12 07:44+0000\n"
+"X-Generator: Launchpad (build 17045)\n"
 "Language: ru\n"
 
 #: src/torrent.c:360 src/torrent.c:380
@@ -40,7 +40,7 @@ msgid "Queued seed"
 msgstr "В очереди на отдачу"
 
 #: src/torrent.c:372 src/torrent.c:386 src/trg-remote-prefs-dialog.c:360
-#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:447
+#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:438
 msgid "Seeding"
 msgstr "Раздача"
 
@@ -156,18 +156,18 @@ msgstr[2] "Отдача %1$li из %2$li подключенных пиров"
 msgid "A remote client to transmission-daemon."
 msgstr "Клиент дл� transsmission-daemon."
 
-#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2011
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:416
+#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2025
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:407
 msgid "Low"
 msgstr "�изкий"
 
-#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2007
-#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:418
+#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2021
+#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:409
 msgid "High"
 msgstr "Вы�окий"
 
-#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2009
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:417
+#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2023
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:408
 msgid "Normal"
 msgstr "Обычный"
 
@@ -175,12 +175,12 @@ msgstr "Обычный"
 msgid "Mixed"
 msgstr "Смешанный"
 
-#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:280
+#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:278
 #: src/trg-torrent-add-dialog.c:348 src/trg-torrent-tree-view.c:52
 msgid "Name"
 msgstr "Им�"
 
-#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:283
+#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:281
 #: src/trg-torrent-add-dialog.c:366 src/trg-torrent-tree-view.c:57
 msgid "Size"
 msgstr "Размер"
@@ -194,7 +194,7 @@ msgstr "Прогре��"
 msgid "Download"
 msgstr "Загрузить"
 
-#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2000
+#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2014
 #: src/trg-torrent-add-dialog.c:395 src/trg-torrent-tree-view.c:145
 msgid "Priority"
 msgstr "Приоритет"
@@ -223,7 +223,7 @@ msgstr "Развернуть в�е"
 msgid "Collapse All"
 msgstr "Свернуть в�е"
 
-#: src/trg-general-panel.c:153 src/trg-general-panel.c:214
+#: src/trg-general-panel.c:153 src/trg-general-panel.c:212
 msgid "N/A"
 msgstr "�едо�тупен"
 
@@ -235,62 +235,62 @@ msgstr "(Закрытый)"
 msgid "(Public)"
 msgstr "(Открытый)"
 
-#: src/trg-general-panel.c:202 src/trg-main-window.c:1097
-#: src/trg-main-window.c:1505 src/trg-main-window.c:2135
+#: src/trg-general-panel.c:200 src/trg-main-window.c:1106
+#: src/trg-main-window.c:1519 src/trg-main-window.c:2149
 #: src/trg-state-selector.c:538 src/trg-torrent-add-url-dialog.c:67
-#: src/util.c:331
+#: src/util.c:333
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:123
+#: src/trg-general-panel.c:283 src/trg-torrent-tree-view.c:123
 msgid "ETA"
 msgstr "О�тало�ь"
 
-#: src/trg-general-panel.c:287 src/trg-torrent-tree-view.c:151
+#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:151
 msgid "Completed"
 msgstr "Завершено"
 
-#: src/trg-general-panel.c:290
+#: src/trg-general-panel.c:288
 msgid "Seeders"
 msgstr "Сидеры"
 
-#: src/trg-general-panel.c:292
+#: src/trg-general-panel.c:290
 msgid "Rate Down"
 msgstr "Загрузка"
 
-#: src/trg-general-panel.c:294 src/trg-torrent-tree-view.c:128
+#: src/trg-general-panel.c:292 src/trg-torrent-tree-view.c:128
 msgid "Downloaded"
 msgstr "Загружено"
 
-#: src/trg-general-panel.c:297 src/trg-torrent-tree-view.c:70
+#: src/trg-general-panel.c:295 src/trg-torrent-tree-view.c:70
 msgid "Leechers"
 msgstr "Личеры"
 
-#: src/trg-general-panel.c:299
+#: src/trg-general-panel.c:297
 msgid "Rate Up"
 msgstr "Отдача"
 
-#: src/trg-general-panel.c:301 src/trg-torrent-tree-view.c:125
+#: src/trg-general-panel.c:299 src/trg-torrent-tree-view.c:125
 msgid "Uploaded"
 msgstr "Отдано"
 
-#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:63
+#: src/trg-general-panel.c:302 src/trg-torrent-tree-view.c:63
 msgid "Status"
 msgstr "Стату�"
 
-#: src/trg-general-panel.c:306 src/trg-torrent-tree-view.c:131
+#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:131
 msgid "Ratio"
 msgstr "Ко�фф-т"
 
-#: src/trg-general-panel.c:309
+#: src/trg-general-panel.c:307
 msgid "Comment"
 msgstr "Примечание"
 
-#: src/trg-general-panel.c:312
+#: src/trg-general-panel.c:310
 msgid "Completed At"
 msgstr "Завершён"
 
-#: src/trg-general-panel.c:316 src/trg-torrent-tree-view.c:139
+#: src/trg-general-panel.c:314 src/trg-torrent-tree-view.c:139
 msgid "Location"
 msgstr "Ме�тоположение"
 
@@ -302,190 +302,190 @@ msgstr "Этот торрент закачан."
 msgid "This torrent has been added."
 msgstr "Этот торрент был добавлен."
 
-#: src/trg-main-window.c:596
+#: src/trg-main-window.c:600
 msgid "No hostname set"
 msgstr "�е у�тановлено им� �ервера"
 
-#: src/trg-main-window.c:599
+#: src/trg-main-window.c:603
 msgid "Unknown error getting settings"
 msgstr "�еизве�тна� ошибка при чтении на�троек"
 
-#: src/trg-main-window.c:614
+#: src/trg-main-window.c:623
 msgid "Connecting..."
 msgstr "Подключение..."
 
-#: src/trg-main-window.c:873
+#: src/trg-main-window.c:882
 #, c-format
 msgid "<big><b>Remove torrent \"%s\"?</b></big>"
 msgstr "<big><b>Удалить торрент \"%s\"?</b></big>"
 
-#: src/trg-main-window.c:874
+#: src/trg-main-window.c:883
 #, c-format
 msgid "<big><b>Remove %d torrents?</b></big>"
 msgstr "<big><b>Удалить %d торрента(ов)?</b></big>"
 
-#: src/trg-main-window.c:896
+#: src/trg-main-window.c:905
 #, c-format
 msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
 msgstr "<big><b>Удалить торрент \"%s\" и файлы?</b></big>"
 
-#: src/trg-main-window.c:898
+#: src/trg-main-window.c:907
 #, c-format
 msgid "<big><b>Remove and delete %d torrents?</b></big>"
 msgstr "<big><b>Переме�тить и удалить %d торрента(ов)?</b></big>"
 
-#: src/trg-main-window.c:981 src/trg-preferences-dialog.c:897
+#: src/trg-main-window.c:990 src/trg-preferences-dialog.c:899
 #: src/trg-remote-prefs-dialog.c:693
 msgid "General"
 msgstr "О�новные"
 
-#: src/trg-main-window.c:990 src/trg-torrent-props-dialog.c:622
+#: src/trg-main-window.c:999 src/trg-torrent-props-dialog.c:613
 msgid "Trackers"
 msgstr "Трекеры"
 
-#: src/trg-main-window.c:998 src/trg-torrent-props-dialog.c:591
+#: src/trg-main-window.c:1007 src/trg-torrent-props-dialog.c:582
 msgid "Files"
 msgstr "Файлы"
 
-#: src/trg-main-window.c:1006 src/trg-remote-prefs-dialog.c:399
-#: src/trg-torrent-props-dialog.c:465 src/trg-torrent-props-dialog.c:605
+#: src/trg-main-window.c:1015 src/trg-remote-prefs-dialog.c:399
+#: src/trg-torrent-props-dialog.c:456 src/trg-torrent-props-dialog.c:596
 #: src/trg-trackers-tree-view.c:190
 msgid "Peers"
 msgstr "Пиры"
 
-#: src/trg-main-window.c:1089
+#: src/trg-main-window.c:1098
 #, c-format
 msgid "This application supports Transmission %g and later, you have %g."
 msgstr ""
 "Это приложение поддерживаетTransmission %g и �тарше, у ва� у�тановлена %g."
 
-#: src/trg-main-window.c:1155 src/trg-status-bar.c:74 src/trg-status-bar.c:104
+#: src/trg-main-window.c:1164 src/trg-status-bar.c:74 src/trg-status-bar.c:104
 msgid "Disconnected"
 msgstr "Разъединен"
 
-#: src/trg-main-window.c:1200
+#: src/trg-main-window.c:1209
 #, c-format
 msgid "%d Downloading @ %s"
 msgstr "%d загружает�� @ %s"
 
-#: src/trg-main-window.c:1207
+#: src/trg-main-window.c:1216
 #, c-format
 msgid "%d Seeding @ %s"
 msgstr "%d раздаёт�� @ %s"
 
-#: src/trg-main-window.c:1258
+#: src/trg-main-window.c:1267
 #, c-format
 msgid "Request %d/%d failed: %s"
 msgstr "Запро� %d/%d окончил�� неудачно: %s"
 
-#: src/trg-main-window.c:2055
+#: src/trg-main-window.c:2069
 msgid "No Limit"
 msgstr "Без ограничений"
 
-#: src/trg-main-window.c:2156 src/trg-menu-bar.c:675 src/trg-toolbar.c:223
+#: src/trg-main-window.c:2170 src/trg-menu-bar.c:675 src/trg-toolbar.c:224
 msgid "Properties"
 msgstr "Свой�тва"
 
-#: src/trg-main-window.c:2159 src/trg-toolbar.c:216
+#: src/trg-main-window.c:2173 src/trg-toolbar.c:217
 msgid "Resume"
 msgstr "Запу�тить"
 
-#: src/trg-main-window.c:2162 src/trg-toolbar.c:219
+#: src/trg-main-window.c:2176 src/trg-toolbar.c:220
 msgid "Pause"
 msgstr "О�тановить"
 
-#: src/trg-main-window.c:2165
+#: src/trg-main-window.c:2179
 msgid "Verify"
 msgstr "Проверить"
 
-#: src/trg-main-window.c:2168
+#: src/trg-main-window.c:2182
 msgid "Re-announce"
 msgstr "Получить �пи�ок пиров"
 
-#: src/trg-main-window.c:2171 src/trg-torrent-move-dialog.c:119
+#: src/trg-main-window.c:2185 src/trg-torrent-move-dialog.c:119
 #: src/trg-torrent-move-dialog.c:126
 msgid "Move"
 msgstr "Переме�тить файлы"
 
-#: src/trg-main-window.c:2174 src/trg-menu-bar.c:706 src/trg-toolbar.c:227
+#: src/trg-main-window.c:2188 src/trg-menu-bar.c:706 src/trg-toolbar.c:228
 msgid "Remove"
 msgstr "Удалить"
 
-#: src/trg-main-window.c:2177
+#: src/trg-main-window.c:2191
 msgid "Remove & Delete"
 msgstr "Удалить торрент и файлы"
 
-#: src/trg-main-window.c:2201 src/trg-preferences-dialog.c:907
+#: src/trg-main-window.c:2215 src/trg-preferences-dialog.c:909
 msgid "Actions"
 msgstr "Дей�тви�"
 
-#: src/trg-main-window.c:2230 src/trg-menu-bar.c:722
+#: src/trg-main-window.c:2244 src/trg-menu-bar.c:722
 msgid "Start Now"
 msgstr "Запу�тить немедленно"
 
-#: src/trg-main-window.c:2233 src/trg-menu-bar.c:727
+#: src/trg-main-window.c:2247 src/trg-menu-bar.c:727
 msgid "Move Up Queue"
 msgstr "Продвинуть в очереди вверх"
 
-#: src/trg-main-window.c:2236 src/trg-menu-bar.c:734
+#: src/trg-main-window.c:2250 src/trg-menu-bar.c:734
 msgid "Move Down Queue"
 msgstr "Продвинуть в очереди вниз"
 
-#: src/trg-main-window.c:2239 src/trg-menu-bar.c:741
+#: src/trg-main-window.c:2253 src/trg-menu-bar.c:741
 msgid "Bottom Of Queue"
 msgstr "Вниз очереди"
 
-#: src/trg-main-window.c:2242 src/trg-menu-bar.c:745
+#: src/trg-main-window.c:2256 src/trg-menu-bar.c:745
 msgid "Top Of Queue"
 msgstr "�аверх очереди"
 
-#: src/trg-main-window.c:2251 src/trg-main-window.c:2334
+#: src/trg-main-window.c:2265 src/trg-main-window.c:2348
 msgid "Down Limit"
 msgstr "Мак�. �коро�ть загрузки"
 
-#: src/trg-main-window.c:2256 src/trg-main-window.c:2338
+#: src/trg-main-window.c:2270 src/trg-main-window.c:2352
 msgid "Up Limit"
 msgstr "Мак�. �коро�ть раздачи"
 
-#: src/trg-main-window.c:2285 src/trg-main-window.c:2292
+#: src/trg-main-window.c:2299 src/trg-main-window.c:2306
 #: src/trg-remote-prefs-dialog.c:497
 msgid "Updating..."
 msgstr "Обновл�ет��..."
 
-#: src/trg-main-window.c:2306 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
+#: src/trg-main-window.c:2320 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
 msgid "Connect"
 msgstr "Подключить��"
 
-#: src/trg-main-window.c:2313 src/trg-toolbar.c:206
+#: src/trg-main-window.c:2327 src/trg-toolbar.c:207
 msgid "Disconnect"
 msgstr "Отключить��"
 
-#: src/trg-main-window.c:2317 src/trg-toolbar.c:209
+#: src/trg-main-window.c:2331 src/trg-toolbar.c:210
 #: src/trg-trackers-tree-view.c:284 src/trg-trackers-tree-view.c:311
 msgid "Add"
 msgstr "Добавить"
 
-#: src/trg-main-window.c:2321
+#: src/trg-main-window.c:2335
 msgid "Add from URL"
 msgstr "Добавить по URL"
 
-#: src/trg-main-window.c:2325
+#: src/trg-main-window.c:2339
 msgid "Resume All"
 msgstr "Запу�тить в�е"
 
-#: src/trg-main-window.c:2329
+#: src/trg-main-window.c:2343
 msgid "Pause All"
 msgstr "Прио�тановить в�е"
 
-#: src/trg-main-window.c:2345
+#: src/trg-main-window.c:2359
 msgid "Quit"
 msgstr "Выход"
 
-#: src/trg-main-window.c:2459 src/trg-menu-bar.c:536
+#: src/trg-main-window.c:2473 src/trg-menu-bar.c:536
 msgid "Graph"
 msgstr "График"
 
-#: src/trg-main-window.c:2647
+#: src/trg-main-window.c:2662
 msgid "Transmission Remote"
 msgstr "Transmission Remote"
 
@@ -693,7 +693,7 @@ msgstr "Директории дл� загрузки на �ервере"
 msgid "Directory"
 msgstr "Директори�"
 
-#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:902
+#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:904
 msgid "View"
 msgstr "Вид"
 
@@ -733,7 +733,7 @@ msgstr "Профиль: "
 msgid "Name:"
 msgstr "�азвание"
 
-#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:892
+#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:894
 msgid "Connection"
 msgstr "Соединение"
 
@@ -745,35 +745,39 @@ msgstr "Хо�т:"
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/trg-preferences-dialog.c:817
+#: src/trg-preferences-dialog.c:816
+msgid "RPC URL Path:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:819
 msgid "Username:"
 msgstr "Им�:"
 
-#: src/trg-preferences-dialog.c:821
+#: src/trg-preferences-dialog.c:823
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/trg-preferences-dialog.c:823
+#: src/trg-preferences-dialog.c:825
 msgid "Automatically connect"
 msgstr "Подключать�� автоматиче�ки"
 
-#: src/trg-preferences-dialog.c:829
+#: src/trg-preferences-dialog.c:831
 msgid "SSL"
 msgstr "SSL"
 
-#: src/trg-preferences-dialog.c:836
+#: src/trg-preferences-dialog.c:838
 msgid "Timeout:"
 msgstr "Таймаут:"
 
-#: src/trg-preferences-dialog.c:840
+#: src/trg-preferences-dialog.c:842
 msgid "Retries:"
 msgstr "Попыток:"
 
-#: src/trg-preferences-dialog.c:881 src/trg-toolbar.c:238
+#: src/trg-preferences-dialog.c:883 src/trg-toolbar.c:239
 msgid "Local Preferences"
 msgstr "�а�тройки"
 
-#: src/trg-preferences-dialog.c:912
+#: src/trg-preferences-dialog.c:914
 msgid "Directories"
 msgstr "Директории"
 
@@ -962,15 +966,15 @@ msgstr "Удалить torrent файлы по�ле добавлени�"
 msgid "Start added torrents"
 msgstr "Запу�тить добавленные торренты"
 
-#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:242
+#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:243
 msgid "Remote Preferences"
 msgstr "�а�тройки �ервера"
 
-#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:409
+#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:400
 msgid "Bandwidth"
 msgstr "Скоро�ть"
 
-#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:636
+#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:627
 msgid "Limits"
 msgstr "Ограничени�"
 
@@ -1070,7 +1074,7 @@ msgstr " (Мак�.: %s)"
 msgid "Down: %s%s, Up: %s%s"
 msgstr "Загрузка: %s%s, Отдача: %s%s"
 
-#: src/trg-toolbar.c:231
+#: src/trg-toolbar.c:232
 msgid "Remove with data"
 msgstr "Удалить вме�те � файлами"
 
@@ -1167,7 +1171,7 @@ msgstr "Обща� �коро�ть загруки"
 msgid "Default"
 msgstr "По умолчанию"
 
-#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:260
+#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:251
 msgid "Location:"
 msgstr "�овое ра�положение:"
 
@@ -1181,142 +1185,142 @@ msgstr "Переме�тить %s"
 msgid "Move %d torrents"
 msgstr "Переме�тить %d торрента(ов)"
 
-#: src/trg-torrent-props-dialog.c:206
+#: src/trg-torrent-props-dialog.c:197
 msgid "Activity"
 msgstr "�ктивно�ть"
 
-#: src/trg-torrent-props-dialog.c:211
+#: src/trg-torrent-props-dialog.c:202
 msgid "Torrent size:"
 msgstr "Размер торрента:"
 
-#: src/trg-torrent-props-dialog.c:216
+#: src/trg-torrent-props-dialog.c:207
 msgid "Have:"
 msgstr "Загружено:"
 
-#: src/trg-torrent-props-dialog.c:221
+#: src/trg-torrent-props-dialog.c:212
 msgid "Downloaded:"
 msgstr "Загружено:"
 
-#: src/trg-torrent-props-dialog.c:226
+#: src/trg-torrent-props-dialog.c:217
 msgid "Uploaded:"
 msgstr "Передано:"
 
-#: src/trg-torrent-props-dialog.c:231
+#: src/trg-torrent-props-dialog.c:222
 msgid "State:"
 msgstr "Со�то�ние:"
 
-#: src/trg-torrent-props-dialog.c:236
+#: src/trg-torrent-props-dialog.c:227
 msgid "Running time:"
 msgstr "Длительно�ть:"
 
-#: src/trg-torrent-props-dialog.c:241
+#: src/trg-torrent-props-dialog.c:232
 msgid "Remaining time:"
 msgstr "О�тавшее�� врем�:"
 
-#: src/trg-torrent-props-dialog.c:246
+#: src/trg-torrent-props-dialog.c:237
 msgid "Last activity:"
 msgstr "По�ледн�� активно�ть:"
 
-#: src/trg-torrent-props-dialog.c:251
+#: src/trg-torrent-props-dialog.c:242
 msgid "Error:"
 msgstr "Ошибка:"
 
-#: src/trg-torrent-props-dialog.c:255
+#: src/trg-torrent-props-dialog.c:246
 msgid "Details"
 msgstr "Подробно�ти"
 
-#: src/trg-torrent-props-dialog.c:266
+#: src/trg-torrent-props-dialog.c:257
 msgid "Hash:"
 msgstr "Хеш:"
 
-#: src/trg-torrent-props-dialog.c:272
+#: src/trg-torrent-props-dialog.c:263
 msgid "Privacy:"
 msgstr "Конфиденциально�ть:"
 
-#: src/trg-torrent-props-dialog.c:278
+#: src/trg-torrent-props-dialog.c:269
 msgid "Origin:"
 msgstr "Прои�хождение:"
 
-#: src/trg-torrent-props-dialog.c:295
+#: src/trg-torrent-props-dialog.c:286
 msgid "Comment:"
 msgstr "Комментарий:"
 
-#: src/trg-torrent-props-dialog.c:330
+#: src/trg-torrent-props-dialog.c:321
 msgid "Private to this tracker -- DHT and PEX disabled"
 msgstr "Только дл� �того трекера — DHT и PEX отключены"
 
-#: src/trg-torrent-props-dialog.c:332
+#: src/trg-torrent-props-dialog.c:323
 msgid "Public torrent"
 msgstr "Публичный торрент"
 
-#: src/trg-torrent-props-dialog.c:342
+#: src/trg-torrent-props-dialog.c:333
 #, c-format
 msgid "Created on %1$s"
 msgstr "Создано %1$s"
 
-#: src/trg-torrent-props-dialog.c:344
+#: src/trg-torrent-props-dialog.c:335
 #, c-format
 msgid "Created by %1$s on %2$s"
 msgstr "Создан %1$s %2$s"
 
-#: src/trg-torrent-props-dialog.c:376
+#: src/trg-torrent-props-dialog.c:367
 msgid "No errors"
 msgstr "�ет ошибок"
 
-#: src/trg-torrent-props-dialog.c:380
+#: src/trg-torrent-props-dialog.c:371
 msgid "Active now"
 msgstr "�ктивен �ейча�"
 
-#: src/trg-torrent-props-dialog.c:413
+#: src/trg-torrent-props-dialog.c:404
 msgid "Honor global limits"
 msgstr "И�пользовать глобальные лимиты"
 
-#: src/trg-torrent-props-dialog.c:423
+#: src/trg-torrent-props-dialog.c:414
 msgid "Torrent priority:"
 msgstr "Приоритет торрента:"
 
-#: src/trg-torrent-props-dialog.c:429
+#: src/trg-torrent-props-dialog.c:420
 msgid "Queue Position:"
 msgstr "Ме�то в очереди:"
 
-#: src/trg-torrent-props-dialog.c:434
+#: src/trg-torrent-props-dialog.c:425
 msgid "Limit download speed (KiB/s)"
 msgstr "Ограничить �коро�ть загрузки (КБ/�)"
 
-#: src/trg-torrent-props-dialog.c:442
+#: src/trg-torrent-props-dialog.c:433
 msgid "Limit upload speed (KiB/s)"
 msgstr "Ограничить �коро�ть отдачи (КБ/�)"
 
-#: src/trg-torrent-props-dialog.c:450
+#: src/trg-torrent-props-dialog.c:441
 msgid "Use global settings"
 msgstr "И�пользовать глобальные на�тройки"
 
-#: src/trg-torrent-props-dialog.c:451
+#: src/trg-torrent-props-dialog.c:442
 msgid "Stop seeding at ratio"
 msgstr "Прекратить раздачу при ко�ффициенте отдачи"
 
-#: src/trg-torrent-props-dialog.c:452
+#: src/trg-torrent-props-dialog.c:443
 msgid "Seed regardless of ratio"
 msgstr "Раздавать без учета ко�ффициента отдачи"
 
-#: src/trg-torrent-props-dialog.c:455
+#: src/trg-torrent-props-dialog.c:446
 msgid "Seed ratio mode:"
 msgstr "Режим ко�ффициента отдачи:"
 
-#: src/trg-torrent-props-dialog.c:463
+#: src/trg-torrent-props-dialog.c:454
 msgid "Seed ratio limit:"
 msgstr "Лимит ко�ффициента раздачи:"
 
-#: src/trg-torrent-props-dialog.c:469
+#: src/trg-torrent-props-dialog.c:460
 msgid "Peer limit:"
 msgstr "Лимит пиров:"
 
-#: src/trg-torrent-props-dialog.c:542
+#: src/trg-torrent-props-dialog.c:533
 #, c-format
 msgid "Multiple (%d) torrent properties"
 msgstr "Свой�тва не�кольких (%d) торрентов"
 
-#: src/trg-torrent-props-dialog.c:574
+#: src/trg-torrent-props-dialog.c:565
 msgid "Information"
 msgstr "Информаци�"
 
@@ -1436,24 +1440,24 @@ msgstr "По возра�танию"
 msgid "Descending"
 msgstr "По убыванию"
 
-#: src/util.c:340
+#: src/util.c:342
 msgid "JSON decoding error."
 msgstr "Ошибка декодировани� JSON."
 
-#: src/util.c:345
+#: src/util.c:347
 msgid "Server responded, but with no result."
 msgstr "Сервер ответил, но без результата"
 
-#: src/util.c:349
+#: src/util.c:351
 #, c-format
 msgid "Request failed with HTTP code %d"
 msgstr "HTTP запро� завершил�� � ошибкой %d"
 
-#: src/util.c:383
+#: src/util.c:385
 msgid "None"
 msgstr "�ет"
 
-#: src/util.c:429
+#: src/util.c:431
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -1461,7 +1465,7 @@ msgstr[0] "%d день"
 msgstr[1] "%d дн�"
 msgstr[2] "%d дней"
 
-#: src/util.c:430
+#: src/util.c:432
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1469,7 +1473,7 @@ msgstr[0] "%d ча�"
 msgstr[1] "%d ча�а"
 msgstr[2] "%d ча�ов"
 
-#: src/util.c:432
+#: src/util.c:434
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1477,7 +1481,7 @@ msgstr[0] "%d минута"
 msgstr[1] "%d минуты"
 msgstr[2] "%d минут"
 
-#: src/util.c:435
+#: src/util.c:437
 #, c-format
 msgid "%ld second"
 msgid_plural "%ld seconds"
diff --git a/po/si.po b/po/si.po
index efce496..4e7d287 100644
--- a/po/si.po
+++ b/po/si.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: transmission-remote-gtk\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-09-05 22:09+0100\n"
-"PO-Revision-Date: 2013-06-02 10:45+0000\n"
-"Last-Translator: nisalup <nisalup@gmail.com>\n"
+"POT-Creation-Date: 2013-06-09 23:41+0100\n"
+"PO-Revision-Date: 2013-11-03 04:30+0000\n"
+"Last-Translator: පසිඳු ක�වින්ද <pkavinda@gmail.com>\n"
 "Language-Team: Sinhalese <si@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-06-09 22:28+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2014-06-12 07:44+0000\n"
+"X-Generator: Launchpad (build 17045)\n"
 
 #: src/torrent.c:360 src/torrent.c:380
 msgid "Metadata Downloading"
@@ -43,7 +43,7 @@ msgid "Queued seed"
 msgstr "ප�ලිම්ගත seeds"
 
 #: src/torrent.c:372 src/torrent.c:386 src/trg-remote-prefs-dialog.c:360
-#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:447
+#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:438
 msgid "Seeding"
 msgstr "seed වෙමින්"
 
@@ -155,18 +155,18 @@ msgstr[1] "සම්බන්ධිත peers %2$li න් %1$li කට seed කà
 msgid "A remote client to transmission-daemon."
 msgstr "සේව�ල�භිය�ගෙන් සම්ප්�රේ�ණ ක්�රමවේදය"
 
-#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2011
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:416
+#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2025
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:407
 msgid "Low"
 msgstr "අඩු"
 
-#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2007
-#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:418
+#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2021
+#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:409
 msgid "High"
 msgstr "ඉහල"
 
-#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2009
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:417
+#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2023
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:408
 msgid "Normal"
 msgstr "ස�ම�න්�ය"
 
@@ -174,12 +174,12 @@ msgstr "ස�ම�න්�ය"
 msgid "Mixed"
 msgstr "මි�්�ර"
 
-#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:280
+#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:278
 #: src/trg-torrent-add-dialog.c:348 src/trg-torrent-tree-view.c:52
 msgid "Name"
 msgstr "නම"
 
-#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:283
+#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:281
 #: src/trg-torrent-add-dialog.c:366 src/trg-torrent-tree-view.c:57
 msgid "Size"
 msgstr "ප්�රම�ණය"
@@ -193,7 +193,7 @@ msgstr "ප්�රගතිය"
 msgid "Download"
 msgstr "බ�ගත කරන්න"
 
-#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2000
+#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2014
 #: src/trg-torrent-add-dialog.c:395 src/trg-torrent-tree-view.c:145
 msgid "Priority"
 msgstr "ප්�රමුඛත�ව"
@@ -222,7 +222,7 @@ msgstr "සියල්ල දිගහරින්න"
 msgid "Collapse All"
 msgstr "සියල්ල හකුළන්න"
 
-#: src/trg-general-panel.c:153 src/trg-general-panel.c:214
+#: src/trg-general-panel.c:153 src/trg-general-panel.c:212
 msgid "N/A"
 msgstr "ලබ�ගත නොහ�ක"
 
@@ -234,62 +234,62 @@ msgstr "(පෞද්ගලික)"
 msgid "(Public)"
 msgstr "(පොදු)"
 
-#: src/trg-general-panel.c:202 src/trg-main-window.c:1097
-#: src/trg-main-window.c:1505 src/trg-main-window.c:2135
+#: src/trg-general-panel.c:200 src/trg-main-window.c:1106
+#: src/trg-main-window.c:1519 src/trg-main-window.c:2149
 #: src/trg-state-selector.c:538 src/trg-torrent-add-url-dialog.c:67
-#: src/util.c:331
+#: src/util.c:333
 msgid "Error"
 msgstr "ද��ය"
 
-#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:123
+#: src/trg-general-panel.c:283 src/trg-torrent-tree-view.c:123
 msgid "ETA"
 msgstr "ඉතිරිව ඇති ක�ලය"
 
-#: src/trg-general-panel.c:287 src/trg-torrent-tree-view.c:151
+#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:151
 msgid "Completed"
 msgstr "අවසන් කරන ලදී"
 
-#: src/trg-general-panel.c:290
+#: src/trg-general-panel.c:288
 msgid "Seeders"
 msgstr "සීඩර්"
 
-#: src/trg-general-panel.c:292
+#: src/trg-general-panel.c:290
 msgid "Rate Down"
 msgstr "අනුප�තය පහලට"
 
-#: src/trg-general-panel.c:294 src/trg-torrent-tree-view.c:128
+#: src/trg-general-panel.c:292 src/trg-torrent-tree-view.c:128
 msgid "Downloaded"
 msgstr "බ�ගත්"
 
-#: src/trg-general-panel.c:297 src/trg-torrent-tree-view.c:70
+#: src/trg-general-panel.c:295 src/trg-torrent-tree-view.c:70
 msgid "Leechers"
 msgstr "ලීචර්"
 
-#: src/trg-general-panel.c:299
+#: src/trg-general-panel.c:297
 msgid "Rate Up"
 msgstr "අනුප�තය ඉහලට"
 
-#: src/trg-general-panel.c:301 src/trg-torrent-tree-view.c:125
+#: src/trg-general-panel.c:299 src/trg-torrent-tree-view.c:125
 msgid "Uploaded"
 msgstr "උඩුගත කළ"
 
-#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:63
+#: src/trg-general-panel.c:302 src/trg-torrent-tree-view.c:63
 msgid "Status"
 msgstr "තත්වය"
 
-#: src/trg-general-panel.c:306 src/trg-torrent-tree-view.c:131
+#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:131
 msgid "Ratio"
 msgstr "අනුප�තය"
 
-#: src/trg-general-panel.c:309
+#: src/trg-general-panel.c:307
 msgid "Comment"
 msgstr "ප්�රතිච�රය"
 
-#: src/trg-general-panel.c:312
+#: src/trg-general-panel.c:310
 msgid "Completed At"
 msgstr "සම්පූර්ණ කරන ලද්දේ"
 
-#: src/trg-general-panel.c:316 src/trg-torrent-tree-view.c:139
+#: src/trg-general-panel.c:314 src/trg-torrent-tree-view.c:139
 msgid "Location"
 msgstr "පිහිටීම"
 
@@ -301,191 +301,191 @@ msgstr "මෙම ටොරන්ටුව සම්පූර්ණ වී ඇà¶
 msgid "This torrent has been added."
 msgstr "මෙම ටොරන්ටුව එකතු කර ඇත"
 
-#: src/trg-main-window.c:596
+#: src/trg-main-window.c:600
 msgid "No hostname set"
 msgstr "Hostname එකක් පත්කර න�ත"
 
-#: src/trg-main-window.c:599
+#: src/trg-main-window.c:603
 msgid "Unknown error getting settings"
 msgstr "ස�කසුම් ලබ�ග�නීමේදී ද��යක්"
 
-#: src/trg-main-window.c:614
+#: src/trg-main-window.c:623
 msgid "Connecting..."
 msgstr "සම්බන්ධ වෙමින්..."
 
-#: src/trg-main-window.c:873
+#: src/trg-main-window.c:882
 #, c-format
 msgid "<big><b>Remove torrent \"%s\"?</b></big>"
 msgstr "%s ටොරන්ටුව අයින් කරන්නද?"
 
-#: src/trg-main-window.c:874
+#: src/trg-main-window.c:883
 #, c-format
 msgid "<big><b>Remove %d torrents?</b></big>"
 msgstr "ටොරන්ටු %d අයින් කරන්නද?"
 
-#: src/trg-main-window.c:896
+#: src/trg-main-window.c:905
 #, c-format
 msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
 msgstr "<big><b> \"%s\" ටොරන්ටුව ඉවත් කර මක� දමන්න? </b></big>"
 
-#: src/trg-main-window.c:898
+#: src/trg-main-window.c:907
 #, c-format
 msgid "<big><b>Remove and delete %d torrents?</b></big>"
 msgstr "<big><b>\"%d\" ටොරන්ටු ඉවත් කර මක� දමන්න?</b></big>"
 
-#: src/trg-main-window.c:981 src/trg-preferences-dialog.c:897
+#: src/trg-main-window.c:990 src/trg-preferences-dialog.c:899
 #: src/trg-remote-prefs-dialog.c:693
 msgid "General"
 msgstr "පොදු"
 
-#: src/trg-main-window.c:990 src/trg-torrent-props-dialog.c:622
+#: src/trg-main-window.c:999 src/trg-torrent-props-dialog.c:613
 msgid "Trackers"
 msgstr "ට්�ර�කර් (tracker)"
 
-#: src/trg-main-window.c:998 src/trg-torrent-props-dialog.c:591
+#: src/trg-main-window.c:1007 src/trg-torrent-props-dialog.c:582
 msgid "Files"
 msgstr "ගොනු"
 
-#: src/trg-main-window.c:1006 src/trg-remote-prefs-dialog.c:399
-#: src/trg-torrent-props-dialog.c:465 src/trg-torrent-props-dialog.c:605
+#: src/trg-main-window.c:1015 src/trg-remote-prefs-dialog.c:399
+#: src/trg-torrent-props-dialog.c:456 src/trg-torrent-props-dialog.c:596
 #: src/trg-trackers-tree-view.c:190
 msgid "Peers"
 msgstr "පියර් (peer) සම්බන්ධත�"
 
-#: src/trg-main-window.c:1089
+#: src/trg-main-window.c:1098
 #, c-format
 msgid "This application supports Transmission %g and later, you have %g."
 msgstr ""
 "මෙම මෘදුක�ංගය ව�ඩකරන්නේ සම්ප්�රේෂණය  %g ට ව�ඩිවිට පමණි. ඔබගේ සම්ප්�රේෂණය %g "
 "පමණකි."
 
-#: src/trg-main-window.c:1155 src/trg-status-bar.c:74 src/trg-status-bar.c:104
+#: src/trg-main-window.c:1164 src/trg-status-bar.c:74 src/trg-status-bar.c:104
 msgid "Disconnected"
 msgstr "විසන්ධි විය"
 
-#: src/trg-main-window.c:1200
+#: src/trg-main-window.c:1209
 #, c-format
 msgid "%d Downloading @ %s"
 msgstr "%d බ�ගත වෙමින් %s ට"
 
-#: src/trg-main-window.c:1207
+#: src/trg-main-window.c:1216
 #, c-format
 msgid "%d Seeding @ %s"
 msgstr "%d  සීඩ් කරමින් %s වේගයෙන්"
 
-#: src/trg-main-window.c:1258
+#: src/trg-main-window.c:1267
 #, c-format
 msgid "Request %d/%d failed: %s"
 msgstr "%d/%d ඉල්ලීම අස�ර්ථක විය: %s"
 
-#: src/trg-main-window.c:2055
+#: src/trg-main-window.c:2069
 msgid "No Limit"
 msgstr "සීම�වක් නොම�ත"
 
-#: src/trg-main-window.c:2156 src/trg-menu-bar.c:675 src/trg-toolbar.c:223
+#: src/trg-main-window.c:2170 src/trg-menu-bar.c:675 src/trg-toolbar.c:224
 msgid "Properties"
 msgstr "ගුණ"
 
-#: src/trg-main-window.c:2159 src/trg-toolbar.c:216
+#: src/trg-main-window.c:2173 src/trg-toolbar.c:217
 msgid "Resume"
 msgstr "ඉදිරියට ගෙනයන්න"
 
-#: src/trg-main-window.c:2162 src/trg-toolbar.c:219
+#: src/trg-main-window.c:2176 src/trg-toolbar.c:220
 msgid "Pause"
 msgstr "විර�මය"
 
-#: src/trg-main-window.c:2165
+#: src/trg-main-window.c:2179
 msgid "Verify"
 msgstr "තහවුරු කරන්න"
 
-#: src/trg-main-window.c:2168
+#: src/trg-main-window.c:2182
 msgid "Re-announce"
 msgstr "න�වත නිවේදනය කරන්න"
 
-#: src/trg-main-window.c:2171 src/trg-torrent-move-dialog.c:119
+#: src/trg-main-window.c:2185 src/trg-torrent-move-dialog.c:119
 #: src/trg-torrent-move-dialog.c:126
 msgid "Move"
 msgstr "ගෙනයන්න"
 
-#: src/trg-main-window.c:2174 src/trg-menu-bar.c:706 src/trg-toolbar.c:227
+#: src/trg-main-window.c:2188 src/trg-menu-bar.c:706 src/trg-toolbar.c:228
 msgid "Remove"
 msgstr "ඉවත් කරන්න"
 
-#: src/trg-main-window.c:2177
+#: src/trg-main-window.c:2191
 msgid "Remove & Delete"
 msgstr "ඉවත් කර මක� දමන්න"
 
-#: src/trg-main-window.c:2201 src/trg-preferences-dialog.c:907
+#: src/trg-main-window.c:2215 src/trg-preferences-dialog.c:909
 msgid "Actions"
 msgstr "ක්�රිය�"
 
-#: src/trg-main-window.c:2230 src/trg-menu-bar.c:722
+#: src/trg-main-window.c:2244 src/trg-menu-bar.c:722
 msgid "Start Now"
 msgstr "ද�න් අරඹන්න"
 
-#: src/trg-main-window.c:2233 src/trg-menu-bar.c:727
+#: src/trg-main-window.c:2247 src/trg-menu-bar.c:727
 msgid "Move Up Queue"
 msgstr "ප�ලිමේ ඉහලට යවන්න"
 
-#: src/trg-main-window.c:2236 src/trg-menu-bar.c:734
+#: src/trg-main-window.c:2250 src/trg-menu-bar.c:734
 msgid "Move Down Queue"
 msgstr "ප�ලිමේ පහලට යවන්න"
 
-#: src/trg-main-window.c:2239 src/trg-menu-bar.c:741
+#: src/trg-main-window.c:2253 src/trg-menu-bar.c:741
 msgid "Bottom Of Queue"
 msgstr "ප�ලිමේ පහලටම යවන්න"
 
-#: src/trg-main-window.c:2242 src/trg-menu-bar.c:745
+#: src/trg-main-window.c:2256 src/trg-menu-bar.c:745
 msgid "Top Of Queue"
 msgstr "ප�ලිමේ මුලටම යවන්න"
 
-#: src/trg-main-window.c:2251 src/trg-main-window.c:2334
+#: src/trg-main-window.c:2265 src/trg-main-window.c:2348
 msgid "Down Limit"
 msgstr "බ�ගත සීම�ව"
 
-#: src/trg-main-window.c:2256 src/trg-main-window.c:2338
+#: src/trg-main-window.c:2270 src/trg-main-window.c:2352
 msgid "Up Limit"
 msgstr "උඩුගත සීම�ව"
 
-#: src/trg-main-window.c:2285 src/trg-main-window.c:2292
+#: src/trg-main-window.c:2299 src/trg-main-window.c:2306
 #: src/trg-remote-prefs-dialog.c:497
 msgid "Updating..."
 msgstr "ය�වත්ක�ළීන කරමින්..."
 
-#: src/trg-main-window.c:2306 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
+#: src/trg-main-window.c:2320 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
 msgid "Connect"
 msgstr "සම්බන්ධ කරන්න"
 
-#: src/trg-main-window.c:2313 src/trg-toolbar.c:206
+#: src/trg-main-window.c:2327 src/trg-toolbar.c:207
 msgid "Disconnect"
 msgstr "විසන්ධි කරන්න"
 
-#: src/trg-main-window.c:2317 src/trg-toolbar.c:209
+#: src/trg-main-window.c:2331 src/trg-toolbar.c:210
 #: src/trg-trackers-tree-view.c:284 src/trg-trackers-tree-view.c:311
 msgid "Add"
 msgstr "එක් කරන්න"
 
-#: src/trg-main-window.c:2321
+#: src/trg-main-window.c:2335
 msgid "Add from URL"
 msgstr "යොමුවකින් එක්කරන්න"
 
-#: src/trg-main-window.c:2325
+#: src/trg-main-window.c:2339
 msgid "Resume All"
 msgstr "සියල්ල න�වත අරඹන්න"
 
-#: src/trg-main-window.c:2329
+#: src/trg-main-window.c:2343
 msgid "Pause All"
 msgstr "සියල්ල මදකට නවත්වන්න"
 
-#: src/trg-main-window.c:2345
+#: src/trg-main-window.c:2359
 msgid "Quit"
 msgstr "ඉවත් වන්න"
 
-#: src/trg-main-window.c:2459 src/trg-menu-bar.c:536
+#: src/trg-main-window.c:2473 src/trg-menu-bar.c:536
 msgid "Graph"
 msgstr "ප්�රස්ථ�රය"
 
-#: src/trg-main-window.c:2647
+#: src/trg-main-window.c:2662
 msgid "Transmission Remote"
 msgstr "දුරස්ථ සම්ප්�රේ�ක ප�ලකය"
 
@@ -693,7 +693,7 @@ msgstr "දුරස්ථ බ�ගත කිරීම් න�ම�වලි
 msgid "Directory"
 msgstr "න�ම�වලිය"
 
-#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:902
+#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:904
 msgid "View"
 msgstr "නරඹන්න"
 
@@ -733,7 +733,7 @@ msgstr "ප�තිකඩ "
 msgid "Name:"
 msgstr "නම:"
 
-#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:892
+#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:894
 msgid "Connection"
 msgstr "සම්බන්ධත�වය"
 
@@ -745,35 +745,39 @@ msgstr "ධ�රකය:"
 msgid "Port:"
 msgstr "පේනුව:"
 
-#: src/trg-preferences-dialog.c:817
+#: src/trg-preferences-dialog.c:816
+msgid "RPC URL Path:"
+msgstr "RPC URL මඟ:"
+
+#: src/trg-preferences-dialog.c:819
 msgid "Username:"
 msgstr "පරි�ීලක න�මය:"
 
-#: src/trg-preferences-dialog.c:821
+#: src/trg-preferences-dialog.c:823
 msgid "Password:"
 msgstr "මුරපදය:"
 
-#: src/trg-preferences-dialog.c:823
+#: src/trg-preferences-dialog.c:825
 msgid "Automatically connect"
 msgstr "ස්වයංක්�රීයව සම්බන්ධ වන්න"
 
-#: src/trg-preferences-dialog.c:829
+#: src/trg-preferences-dialog.c:831
 msgid "SSL"
 msgstr "SSL"
 
-#: src/trg-preferences-dialog.c:836
+#: src/trg-preferences-dialog.c:838
 msgid "Timeout:"
 msgstr "කල් ඉකුත්වීම:"
 
-#: src/trg-preferences-dialog.c:840
+#: src/trg-preferences-dialog.c:842
 msgid "Retries:"
 msgstr "න�වත උත්ස�හ කිරීම්:"
 
-#: src/trg-preferences-dialog.c:881 src/trg-toolbar.c:238
+#: src/trg-preferences-dialog.c:883 src/trg-toolbar.c:239
 msgid "Local Preferences"
 msgstr "ප්�ර�දේ�ිය අභිරුචි"
 
-#: src/trg-preferences-dialog.c:912
+#: src/trg-preferences-dialog.c:914
 msgid "Directories"
 msgstr "න�ම�වලි"
 
@@ -864,19 +868,19 @@ msgstr "ය�වත්ක�ලීන කරන්න"
 #: src/trg-remote-prefs-dialog.c:474 src/trg-remote-prefs-dialog.c:568
 #, c-format
 msgid "Blocklist (%ld entries)"
-msgstr "අවහිර අරන ලද  ( %ld  කි )"
+msgstr "ව�රණල�යිස්තුව  (ඇතුල්කිරීම් %ld)"
 
 #: src/trg-remote-prefs-dialog.c:516 src/trg-remote-prefs-dialog.c:698
 msgid "Connections"
-msgstr "සම්බන්ධත�"
+msgstr "සබඳත�"
 
 #: src/trg-remote-prefs-dialog.c:520
 msgid "Peer port"
-msgstr "පියර් (Peer) පේනුව"
+msgstr "ස�ම�න කවුළුව"
 
 #: src/trg-remote-prefs-dialog.c:523
 msgid "Test"
-msgstr "පිරික්සුම"
+msgstr "පරීක්�ෂ�ව"
 
 #: src/trg-remote-prefs-dialog.c:527
 msgid "Required"
@@ -962,15 +966,15 @@ msgstr "මුල් ටොරන්ට් ගොනුව මකà·� දමනà·
 msgid "Start added torrents"
 msgstr "එකතු කල ටොරන්ට් ආරම්භ කරන්න"
 
-#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:242
+#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:243
 msgid "Remote Preferences"
 msgstr "දුරස්ථ අභිරුචි"
 
-#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:409
+#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:400
 msgid "Bandwidth"
 msgstr "කල�ප පර�සය (Bandwidth)"
 
-#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:636
+#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:627
 msgid "Limits"
 msgstr "සීම�"
 
@@ -1070,7 +1074,7 @@ msgstr " (සීම�ව: %s)"
 msgid "Down: %s%s, Up: %s%s"
 msgstr "බ�ගත: %s%s, උඩුගත: %s%s"
 
-#: src/trg-toolbar.c:231
+#: src/trg-toolbar.c:232
 msgid "Remove with data"
 msgstr "දත්ත සමඟ මක� දමන්න"
 
@@ -1167,7 +1171,7 @@ msgstr "බ�ගත දත්ත එකතුව"
 msgid "Default"
 msgstr "පුරුදු ආක�රය"
 
-#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:260
+#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:251
 msgid "Location:"
 msgstr "ස්ථ�නය:"
 
@@ -1181,142 +1185,142 @@ msgstr "%s ගෙන යන්න"
 msgid "Move %d torrents"
 msgstr "ටොරන්ටු %d ගෙන යන්න"
 
-#: src/trg-torrent-props-dialog.c:206
+#: src/trg-torrent-props-dialog.c:197
 msgid "Activity"
 msgstr "ක්�රිය�ක�රිත්වය"
 
-#: src/trg-torrent-props-dialog.c:211
+#: src/trg-torrent-props-dialog.c:202
 msgid "Torrent size:"
 msgstr "ටොරන්ට් වි��ලත්වය:"
 
-#: src/trg-torrent-props-dialog.c:216
+#: src/trg-torrent-props-dialog.c:207
 msgid "Have:"
 msgstr "තිබේ:"
 
-#: src/trg-torrent-props-dialog.c:221
+#: src/trg-torrent-props-dialog.c:212
 msgid "Downloaded:"
 msgstr "බ�ගන්න ලද:"
 
-#: src/trg-torrent-props-dialog.c:226
+#: src/trg-torrent-props-dialog.c:217
 msgid "Uploaded:"
 msgstr "උඩුගත:"
 
-#: src/trg-torrent-props-dialog.c:231
+#: src/trg-torrent-props-dialog.c:222
 msgid "State:"
 msgstr "තත්වය:"
 
-#: src/trg-torrent-props-dialog.c:236
+#: src/trg-torrent-props-dialog.c:227
 msgid "Running time:"
 msgstr "ධ�වනය වන ක�ලය:"
 
-#: src/trg-torrent-props-dialog.c:241
+#: src/trg-torrent-props-dialog.c:232
 msgid "Remaining time:"
 msgstr "ඉතිරිව ඇති ක�ලය:"
 
-#: src/trg-torrent-props-dialog.c:246
+#: src/trg-torrent-props-dialog.c:237
 msgid "Last activity:"
 msgstr "අවස�න ක්රිය�ක�රකම:"
 
-#: src/trg-torrent-props-dialog.c:251
+#: src/trg-torrent-props-dialog.c:242
 msgid "Error:"
 msgstr "ද�ෂය:"
 
-#: src/trg-torrent-props-dialog.c:255
+#: src/trg-torrent-props-dialog.c:246
 msgid "Details"
 msgstr "තොරතුරු"
 
-#: src/trg-torrent-props-dialog.c:266
+#: src/trg-torrent-props-dialog.c:257
 msgid "Hash:"
 msgstr "හෑ�්:"
 
-#: src/trg-torrent-props-dialog.c:272
+#: src/trg-torrent-props-dialog.c:263
 msgid "Privacy:"
 msgstr "පෞද්ගලිකත්වය:"
 
-#: src/trg-torrent-props-dialog.c:278
+#: src/trg-torrent-props-dialog.c:269
 msgid "Origin:"
 msgstr "මූලය:"
 
-#: src/trg-torrent-props-dialog.c:295
+#: src/trg-torrent-props-dialog.c:286
 msgid "Comment:"
 msgstr "සටහන්:"
 
-#: src/trg-torrent-props-dialog.c:330
+#: src/trg-torrent-props-dialog.c:321
 msgid "Private to this tracker -- DHT and PEX disabled"
 msgstr "මෙම ටොරන්ටුව සඳහ� පුද්ගලිකයි: DHT, PEX අක්�රීය කර ඇත"
 
-#: src/trg-torrent-props-dialog.c:332
+#: src/trg-torrent-props-dialog.c:323
 msgid "Public torrent"
 msgstr "පොදු ටොරන්ට්"
 
-#: src/trg-torrent-props-dialog.c:342
+#: src/trg-torrent-props-dialog.c:333
 #, c-format
 msgid "Created on %1$s"
 msgstr "නිර්ම�ණය කරන ලද්දේ: %1$s"
 
-#: src/trg-torrent-props-dialog.c:344
+#: src/trg-torrent-props-dialog.c:335
 #, c-format
 msgid "Created by %1$s on %2$s"
 msgstr "නිර්ම�ණය කරන ලද්දේ: %1$s  %2$s  දීය"
 
-#: src/trg-torrent-props-dialog.c:376
+#: src/trg-torrent-props-dialog.c:367
 msgid "No errors"
 msgstr "ද�� නොම�ත"
 
-#: src/trg-torrent-props-dialog.c:380
+#: src/trg-torrent-props-dialog.c:371
 msgid "Active now"
 msgstr "ද�න් ක්රිය�ක�රී"
 
-#: src/trg-torrent-props-dialog.c:413
+#: src/trg-torrent-props-dialog.c:404
 msgid "Honor global limits"
 msgstr "වි�්ව සීම� වලට ගරු කරන්න"
 
-#: src/trg-torrent-props-dialog.c:423
+#: src/trg-torrent-props-dialog.c:414
 msgid "Torrent priority:"
 msgstr "ටොරන්ට් ප්�රමුඛත�ව:"
 
-#: src/trg-torrent-props-dialog.c:429
+#: src/trg-torrent-props-dialog.c:420
 msgid "Queue Position:"
 msgstr "ප�ලිමේ පිහිටීම:"
 
-#: src/trg-torrent-props-dialog.c:434
+#: src/trg-torrent-props-dialog.c:425
 msgid "Limit download speed (KiB/s)"
 msgstr "සීම�කල භ�ගත වේගය (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:442
+#: src/trg-torrent-props-dialog.c:433
 msgid "Limit upload speed (KiB/s)"
 msgstr "භ�ගත වේගය සීම�කරන්න (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:450
+#: src/trg-torrent-props-dialog.c:441
 msgid "Use global settings"
 msgstr "වි�්වීය ස�කසුම් භ�විත කරන්න"
 
-#: src/trg-torrent-props-dialog.c:451
+#: src/trg-torrent-props-dialog.c:442
 msgid "Stop seeding at ratio"
 msgstr "සීඩ් කිරීම නවත්වන අනුප�තය"
 
-#: src/trg-torrent-props-dialog.c:452
+#: src/trg-torrent-props-dialog.c:443
 msgid "Seed regardless of ratio"
 msgstr "අනුප�තය නොසලක� සීඩ් කිරීම"
 
-#: src/trg-torrent-props-dialog.c:455
+#: src/trg-torrent-props-dialog.c:446
 msgid "Seed ratio mode:"
 msgstr "අනුප�තයට සීඩ් කිරීම:"
 
-#: src/trg-torrent-props-dialog.c:463
+#: src/trg-torrent-props-dialog.c:454
 msgid "Seed ratio limit:"
 msgstr "සීඩ් කිරීමේ අනුප�තයේ සීම�ව"
 
-#: src/trg-torrent-props-dialog.c:469
+#: src/trg-torrent-props-dialog.c:460
 msgid "Peer limit:"
 msgstr "පියර් සීම�ව:"
 
-#: src/trg-torrent-props-dialog.c:542
+#: src/trg-torrent-props-dialog.c:533
 #, c-format
 msgid "Multiple (%d) torrent properties"
 msgstr "බහු (%d) ටොරන්ටු වල ගතිගුණ"
 
-#: src/trg-torrent-props-dialog.c:574
+#: src/trg-torrent-props-dialog.c:565
 msgid "Information"
 msgstr "තොරතුරු"
 
@@ -1436,45 +1440,45 @@ msgstr "ආර�හණ"
 msgid "Descending"
 msgstr "අවර�හණ"
 
-#: src/util.c:340
+#: src/util.c:342
 msgid "JSON decoding error."
 msgstr "JSON විකේතන ද��ය"
 
-#: src/util.c:345
+#: src/util.c:347
 msgid "Server responded, but with no result."
 msgstr "සර්වරය පිලිතුරු දෙයි, ප්�රතිඵලයක් නොම�ත."
 
-#: src/util.c:349
+#: src/util.c:351
 #, c-format
 msgid "Request failed with HTTP code %d"
 msgstr "ඉල්ලීම අසමත්ය, ද�� පනිවුඩයේ කේත අංකය: %d"
 
-#: src/util.c:383
+#: src/util.c:385
 msgid "None"
 msgstr "නොම�ත"
 
-#: src/util.c:429
+#: src/util.c:431
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "දින %d"
 msgstr[1] "දින %d"
 
-#: src/util.c:430
+#: src/util.c:432
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "ප�ය %d"
 msgstr[1] "ප�ය %d ක්"
 
-#: src/util.c:432
+#: src/util.c:434
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "වින�ඩි %d ක්"
 msgstr[1] "වින�ඩි %d යි"
 
-#: src/util.c:435
+#: src/util.c:437
 #, c-format
 msgid "%ld second"
 msgid_plural "%ld seconds"
diff --git a/po/sv.po b/po/sv.po
index 47243c4..7d6cb67 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-05 22:09+0100\n"
+"POT-Creation-Date: 2013-06-09 23:41+0100\n"
 "PO-Revision-Date: 2012-08-07 10:06+0000\n"
 "Last-Translator: webaake <Unknown>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-06-09 22:28+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2014-06-12 07:44+0000\n"
+"X-Generator: Launchpad (build 17045)\n"
 "Language: Swedish\n"
 
 #: src/torrent.c:360 src/torrent.c:380
@@ -44,7 +44,7 @@ msgid "Queued seed"
 msgstr "Köad seed"
 
 #: src/torrent.c:372 src/torrent.c:386 src/trg-remote-prefs-dialog.c:360
-#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:447
+#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:438
 msgid "Seeding"
 msgstr "Seedning"
 
@@ -156,18 +156,18 @@ msgstr[1] ""
 msgid "A remote client to transmission-daemon."
 msgstr "Fjärrklient till transmission-daemon"
 
-#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2011
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:416
+#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2025
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:407
 msgid "Low"
 msgstr "LÃ¥g"
 
-#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2007
-#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:418
+#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2021
+#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:409
 msgid "High"
 msgstr "Hög"
 
-#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2009
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:417
+#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2023
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:408
 msgid "Normal"
 msgstr "Normal"
 
@@ -175,12 +175,12 @@ msgstr "Normal"
 msgid "Mixed"
 msgstr "Blandad"
 
-#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:280
+#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:278
 #: src/trg-torrent-add-dialog.c:348 src/trg-torrent-tree-view.c:52
 msgid "Name"
 msgstr "Namn"
 
-#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:283
+#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:281
 #: src/trg-torrent-add-dialog.c:366 src/trg-torrent-tree-view.c:57
 msgid "Size"
 msgstr "Storlek"
@@ -194,7 +194,7 @@ msgstr "Förlopp"
 msgid "Download"
 msgstr "Ladda ned"
 
-#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2000
+#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2014
 #: src/trg-torrent-add-dialog.c:395 src/trg-torrent-tree-view.c:145
 msgid "Priority"
 msgstr "Prioritet"
@@ -223,7 +223,7 @@ msgstr "Expandera alla"
 msgid "Collapse All"
 msgstr "Kollapsa alla"
 
-#: src/trg-general-panel.c:153 src/trg-general-panel.c:214
+#: src/trg-general-panel.c:153 src/trg-general-panel.c:212
 msgid "N/A"
 msgstr "N/A"
 
@@ -235,62 +235,62 @@ msgstr "(Privat)"
 msgid "(Public)"
 msgstr "(Publik)"
 
-#: src/trg-general-panel.c:202 src/trg-main-window.c:1097
-#: src/trg-main-window.c:1505 src/trg-main-window.c:2135
+#: src/trg-general-panel.c:200 src/trg-main-window.c:1106
+#: src/trg-main-window.c:1519 src/trg-main-window.c:2149
 #: src/trg-state-selector.c:538 src/trg-torrent-add-url-dialog.c:67
-#: src/util.c:331
+#: src/util.c:333
 msgid "Error"
 msgstr "Fel"
 
-#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:123
+#: src/trg-general-panel.c:283 src/trg-torrent-tree-view.c:123
 msgid "ETA"
 msgstr "ETA"
 
-#: src/trg-general-panel.c:287 src/trg-torrent-tree-view.c:151
+#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:151
 msgid "Completed"
 msgstr "Komplett"
 
-#: src/trg-general-panel.c:290
+#: src/trg-general-panel.c:288
 msgid "Seeders"
 msgstr "Seedare"
 
-#: src/trg-general-panel.c:292
+#: src/trg-general-panel.c:290
 msgid "Rate Down"
 msgstr "Hastighet ned"
 
-#: src/trg-general-panel.c:294 src/trg-torrent-tree-view.c:128
+#: src/trg-general-panel.c:292 src/trg-torrent-tree-view.c:128
 msgid "Downloaded"
 msgstr "Nedladdat"
 
-#: src/trg-general-panel.c:297 src/trg-torrent-tree-view.c:70
+#: src/trg-general-panel.c:295 src/trg-torrent-tree-view.c:70
 msgid "Leechers"
 msgstr "Leechers"
 
-#: src/trg-general-panel.c:299
+#: src/trg-general-panel.c:297
 msgid "Rate Up"
 msgstr "Hastighet upp"
 
-#: src/trg-general-panel.c:301 src/trg-torrent-tree-view.c:125
+#: src/trg-general-panel.c:299 src/trg-torrent-tree-view.c:125
 msgid "Uploaded"
 msgstr "Uppladdat"
 
-#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:63
+#: src/trg-general-panel.c:302 src/trg-torrent-tree-view.c:63
 msgid "Status"
 msgstr "Status"
 
-#: src/trg-general-panel.c:306 src/trg-torrent-tree-view.c:131
+#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:131
 msgid "Ratio"
 msgstr "Ratio"
 
-#: src/trg-general-panel.c:309
+#: src/trg-general-panel.c:307
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/trg-general-panel.c:312
+#: src/trg-general-panel.c:310
 msgid "Completed At"
 msgstr "Avslutad"
 
-#: src/trg-general-panel.c:316 src/trg-torrent-tree-view.c:139
+#: src/trg-general-panel.c:314 src/trg-torrent-tree-view.c:139
 msgid "Location"
 msgstr "Plats"
 
@@ -302,189 +302,189 @@ msgstr "Denna torrent är komplett."
 msgid "This torrent has been added."
 msgstr "Denna torrent är tillagd."
 
-#: src/trg-main-window.c:596
+#: src/trg-main-window.c:600
 msgid "No hostname set"
 msgstr "Inget värdnamn angivet"
 
-#: src/trg-main-window.c:599
+#: src/trg-main-window.c:603
 msgid "Unknown error getting settings"
 msgstr "Okänt fel med inställningar"
 
-#: src/trg-main-window.c:614
+#: src/trg-main-window.c:623
 msgid "Connecting..."
 msgstr "Kopplar upp..."
 
-#: src/trg-main-window.c:873
+#: src/trg-main-window.c:882
 #, c-format
 msgid "<big><b>Remove torrent \"%s\"?</b></big>"
 msgstr "<big><b>Ta bort torrent \"%s\"?</b></big>"
 
-#: src/trg-main-window.c:874
+#: src/trg-main-window.c:883
 #, c-format
 msgid "<big><b>Remove %d torrents?</b></big>"
 msgstr "<big><b>Ta bort %d torrents?</b></big>"
 
-#: src/trg-main-window.c:896
+#: src/trg-main-window.c:905
 #, c-format
 msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
 msgstr "<big><b>Ta bort och radera torrent \"%s\"?</b></big>"
 
-#: src/trg-main-window.c:898
+#: src/trg-main-window.c:907
 #, c-format
 msgid "<big><b>Remove and delete %d torrents?</b></big>"
 msgstr "<big><b>Ta bort och radera %d torrents?</b></big>"
 
-#: src/trg-main-window.c:981 src/trg-preferences-dialog.c:897
+#: src/trg-main-window.c:990 src/trg-preferences-dialog.c:899
 #: src/trg-remote-prefs-dialog.c:693
 msgid "General"
 msgstr "Allmänt"
 
-#: src/trg-main-window.c:990 src/trg-torrent-props-dialog.c:622
+#: src/trg-main-window.c:999 src/trg-torrent-props-dialog.c:613
 msgid "Trackers"
 msgstr "Trackers"
 
-#: src/trg-main-window.c:998 src/trg-torrent-props-dialog.c:591
+#: src/trg-main-window.c:1007 src/trg-torrent-props-dialog.c:582
 msgid "Files"
 msgstr "Filer"
 
-#: src/trg-main-window.c:1006 src/trg-remote-prefs-dialog.c:399
-#: src/trg-torrent-props-dialog.c:465 src/trg-torrent-props-dialog.c:605
+#: src/trg-main-window.c:1015 src/trg-remote-prefs-dialog.c:399
+#: src/trg-torrent-props-dialog.c:456 src/trg-torrent-props-dialog.c:596
 #: src/trg-trackers-tree-view.c:190
 msgid "Peers"
 msgstr "Peers"
 
-#: src/trg-main-window.c:1089
+#: src/trg-main-window.c:1098
 #, c-format
 msgid "This application supports Transmission %g and later, you have %g."
 msgstr "Detta program stödjer Transmission %g och senare, du har %g."
 
-#: src/trg-main-window.c:1155 src/trg-status-bar.c:74 src/trg-status-bar.c:104
+#: src/trg-main-window.c:1164 src/trg-status-bar.c:74 src/trg-status-bar.c:104
 msgid "Disconnected"
 msgstr "Nedkopplad"
 
-#: src/trg-main-window.c:1200
+#: src/trg-main-window.c:1209
 #, c-format
 msgid "%d Downloading @ %s"
 msgstr "%d Laddar ned @ %s"
 
-#: src/trg-main-window.c:1207
+#: src/trg-main-window.c:1216
 #, c-format
 msgid "%d Seeding @ %s"
 msgstr "%d Seeding @ %s"
 
-#: src/trg-main-window.c:1258
+#: src/trg-main-window.c:1267
 #, c-format
 msgid "Request %d/%d failed: %s"
 msgstr "Begäran %d/%d misslyckades: %s"
 
-#: src/trg-main-window.c:2055
+#: src/trg-main-window.c:2069
 msgid "No Limit"
 msgstr "Obegränsat"
 
-#: src/trg-main-window.c:2156 src/trg-menu-bar.c:675 src/trg-toolbar.c:223
+#: src/trg-main-window.c:2170 src/trg-menu-bar.c:675 src/trg-toolbar.c:224
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/trg-main-window.c:2159 src/trg-toolbar.c:216
+#: src/trg-main-window.c:2173 src/trg-toolbar.c:217
 msgid "Resume"
 msgstr "Ã…teruppta"
 
-#: src/trg-main-window.c:2162 src/trg-toolbar.c:219
+#: src/trg-main-window.c:2176 src/trg-toolbar.c:220
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/trg-main-window.c:2165
+#: src/trg-main-window.c:2179
 msgid "Verify"
 msgstr "Verifiera"
 
-#: src/trg-main-window.c:2168
+#: src/trg-main-window.c:2182
 msgid "Re-announce"
 msgstr "Ã…terannonsera"
 
-#: src/trg-main-window.c:2171 src/trg-torrent-move-dialog.c:119
+#: src/trg-main-window.c:2185 src/trg-torrent-move-dialog.c:119
 #: src/trg-torrent-move-dialog.c:126
 msgid "Move"
 msgstr "Flytta"
 
-#: src/trg-main-window.c:2174 src/trg-menu-bar.c:706 src/trg-toolbar.c:227
+#: src/trg-main-window.c:2188 src/trg-menu-bar.c:706 src/trg-toolbar.c:228
 msgid "Remove"
 msgstr "Ta bort"
 
-#: src/trg-main-window.c:2177
+#: src/trg-main-window.c:2191
 msgid "Remove & Delete"
 msgstr "Ta bort & radera"
 
-#: src/trg-main-window.c:2201 src/trg-preferences-dialog.c:907
+#: src/trg-main-window.c:2215 src/trg-preferences-dialog.c:909
 msgid "Actions"
 msgstr "Åtgärder"
 
-#: src/trg-main-window.c:2230 src/trg-menu-bar.c:722
+#: src/trg-main-window.c:2244 src/trg-menu-bar.c:722
 msgid "Start Now"
 msgstr "Starta nu"
 
-#: src/trg-main-window.c:2233 src/trg-menu-bar.c:727
+#: src/trg-main-window.c:2247 src/trg-menu-bar.c:727
 msgid "Move Up Queue"
 msgstr "Flytta upp i kö"
 
-#: src/trg-main-window.c:2236 src/trg-menu-bar.c:734
+#: src/trg-main-window.c:2250 src/trg-menu-bar.c:734
 msgid "Move Down Queue"
 msgstr "Flytta ned i kön"
 
-#: src/trg-main-window.c:2239 src/trg-menu-bar.c:741
+#: src/trg-main-window.c:2253 src/trg-menu-bar.c:741
 msgid "Bottom Of Queue"
 msgstr "Sist i kön"
 
-#: src/trg-main-window.c:2242 src/trg-menu-bar.c:745
+#: src/trg-main-window.c:2256 src/trg-menu-bar.c:745
 msgid "Top Of Queue"
 msgstr "Först i kön"
 
-#: src/trg-main-window.c:2251 src/trg-main-window.c:2334
+#: src/trg-main-window.c:2265 src/trg-main-window.c:2348
 msgid "Down Limit"
 msgstr "Ned gräns"
 
-#: src/trg-main-window.c:2256 src/trg-main-window.c:2338
+#: src/trg-main-window.c:2270 src/trg-main-window.c:2352
 msgid "Up Limit"
 msgstr "Upp gräns"
 
-#: src/trg-main-window.c:2285 src/trg-main-window.c:2292
+#: src/trg-main-window.c:2299 src/trg-main-window.c:2306
 #: src/trg-remote-prefs-dialog.c:497
 msgid "Updating..."
 msgstr "Uppdaterar..."
 
-#: src/trg-main-window.c:2306 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
+#: src/trg-main-window.c:2320 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
 msgid "Connect"
 msgstr "Koppla upp"
 
-#: src/trg-main-window.c:2313 src/trg-toolbar.c:206
+#: src/trg-main-window.c:2327 src/trg-toolbar.c:207
 msgid "Disconnect"
 msgstr "Koppla ned"
 
-#: src/trg-main-window.c:2317 src/trg-toolbar.c:209
+#: src/trg-main-window.c:2331 src/trg-toolbar.c:210
 #: src/trg-trackers-tree-view.c:284 src/trg-trackers-tree-view.c:311
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/trg-main-window.c:2321
+#: src/trg-main-window.c:2335
 msgid "Add from URL"
 msgstr "Lägg till från URL"
 
-#: src/trg-main-window.c:2325
+#: src/trg-main-window.c:2339
 msgid "Resume All"
 msgstr "Ã…teruppta alla"
 
-#: src/trg-main-window.c:2329
+#: src/trg-main-window.c:2343
 msgid "Pause All"
 msgstr "Pausa alla"
 
-#: src/trg-main-window.c:2345
+#: src/trg-main-window.c:2359
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/trg-main-window.c:2459 src/trg-menu-bar.c:536
+#: src/trg-main-window.c:2473 src/trg-menu-bar.c:536
 msgid "Graph"
 msgstr "Graf"
 
-#: src/trg-main-window.c:2647
+#: src/trg-main-window.c:2662
 msgid "Transmission Remote"
 msgstr "Transmission Remote"
 
@@ -692,7 +692,7 @@ msgstr "Fjärr nedladdningsmappar"
 msgid "Directory"
 msgstr "Mapp"
 
-#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:902
+#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:904
 msgid "View"
 msgstr "Visa"
 
@@ -732,7 +732,7 @@ msgstr "Profil: "
 msgid "Name:"
 msgstr "Namn:"
 
-#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:892
+#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:894
 msgid "Connection"
 msgstr "Uppkoppling"
 
@@ -744,35 +744,39 @@ msgstr "Värd:"
 msgid "Port:"
 msgstr "Port:"
 
-#: src/trg-preferences-dialog.c:817
+#: src/trg-preferences-dialog.c:816
+msgid "RPC URL Path:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:819
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: src/trg-preferences-dialog.c:821
+#: src/trg-preferences-dialog.c:823
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: src/trg-preferences-dialog.c:823
+#: src/trg-preferences-dialog.c:825
 msgid "Automatically connect"
 msgstr "Automatisk uppkoppling"
 
-#: src/trg-preferences-dialog.c:829
+#: src/trg-preferences-dialog.c:831
 msgid "SSL"
 msgstr "SSL"
 
-#: src/trg-preferences-dialog.c:836
+#: src/trg-preferences-dialog.c:838
 msgid "Timeout:"
 msgstr "Tidsgräns:"
 
-#: src/trg-preferences-dialog.c:840
+#: src/trg-preferences-dialog.c:842
 msgid "Retries:"
 msgstr "Återförsök:"
 
-#: src/trg-preferences-dialog.c:881 src/trg-toolbar.c:238
+#: src/trg-preferences-dialog.c:883 src/trg-toolbar.c:239
 msgid "Local Preferences"
 msgstr "Lokala inställningar"
 
-#: src/trg-preferences-dialog.c:912
+#: src/trg-preferences-dialog.c:914
 msgid "Directories"
 msgstr "Mappar"
 
@@ -962,15 +966,15 @@ msgstr "Radera original torrentfil"
 msgid "Start added torrents"
 msgstr "Starta tillagda torrents"
 
-#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:242
+#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:243
 msgid "Remote Preferences"
 msgstr "Serverinställningar"
 
-#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:409
+#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:400
 msgid "Bandwidth"
 msgstr "Bandbredd"
 
-#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:636
+#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:627
 msgid "Limits"
 msgstr "Begränsingar"
 
@@ -1070,7 +1074,7 @@ msgstr " (Max: %s)"
 msgid "Down: %s%s, Up: %s%s"
 msgstr "Ned: %s%s, Upp: %s%s"
 
-#: src/trg-toolbar.c:231
+#: src/trg-toolbar.c:232
 msgid "Remove with data"
 msgstr "Ta bort inlusive data"
 
@@ -1167,7 +1171,7 @@ msgstr "Total nedladdning"
 msgid "Default"
 msgstr "Standard"
 
-#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:260
+#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:251
 msgid "Location:"
 msgstr "Plats:"
 
@@ -1181,142 +1185,142 @@ msgstr "Flytta %s"
 msgid "Move %d torrents"
 msgstr "Flytta %d torrents"
 
-#: src/trg-torrent-props-dialog.c:206
+#: src/trg-torrent-props-dialog.c:197
 msgid "Activity"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:211
+#: src/trg-torrent-props-dialog.c:202
 msgid "Torrent size:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:216
+#: src/trg-torrent-props-dialog.c:207
 msgid "Have:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:221
+#: src/trg-torrent-props-dialog.c:212
 msgid "Downloaded:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:226
+#: src/trg-torrent-props-dialog.c:217
 msgid "Uploaded:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:231
+#: src/trg-torrent-props-dialog.c:222
 msgid "State:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:236
+#: src/trg-torrent-props-dialog.c:227
 msgid "Running time:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:241
+#: src/trg-torrent-props-dialog.c:232
 msgid "Remaining time:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:246
+#: src/trg-torrent-props-dialog.c:237
 msgid "Last activity:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:251
+#: src/trg-torrent-props-dialog.c:242
 msgid "Error:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:255
+#: src/trg-torrent-props-dialog.c:246
 msgid "Details"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:266
+#: src/trg-torrent-props-dialog.c:257
 msgid "Hash:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:272
+#: src/trg-torrent-props-dialog.c:263
 msgid "Privacy:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:278
+#: src/trg-torrent-props-dialog.c:269
 msgid "Origin:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:295
+#: src/trg-torrent-props-dialog.c:286
 msgid "Comment:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:330
+#: src/trg-torrent-props-dialog.c:321
 msgid "Private to this tracker -- DHT and PEX disabled"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:332
+#: src/trg-torrent-props-dialog.c:323
 msgid "Public torrent"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:342
+#: src/trg-torrent-props-dialog.c:333
 #, c-format
 msgid "Created on %1$s"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:344
+#: src/trg-torrent-props-dialog.c:335
 #, c-format
 msgid "Created by %1$s on %2$s"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:376
+#: src/trg-torrent-props-dialog.c:367
 msgid "No errors"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:380
+#: src/trg-torrent-props-dialog.c:371
 msgid "Active now"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:413
+#: src/trg-torrent-props-dialog.c:404
 msgid "Honor global limits"
 msgstr "Följ globala inställningar:"
 
-#: src/trg-torrent-props-dialog.c:423
+#: src/trg-torrent-props-dialog.c:414
 msgid "Torrent priority:"
 msgstr "Torrentprioritet:"
 
-#: src/trg-torrent-props-dialog.c:429
+#: src/trg-torrent-props-dialog.c:420
 msgid "Queue Position:"
 msgstr "Köplats:"
 
-#: src/trg-torrent-props-dialog.c:434
+#: src/trg-torrent-props-dialog.c:425
 msgid "Limit download speed (KiB/s)"
 msgstr "Begränsa nedladdningshastighet (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:442
+#: src/trg-torrent-props-dialog.c:433
 msgid "Limit upload speed (KiB/s)"
 msgstr "Begränsa uppladdningshastighet (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:450
+#: src/trg-torrent-props-dialog.c:441
 msgid "Use global settings"
 msgstr "Använd globala inställningar"
 
-#: src/trg-torrent-props-dialog.c:451
+#: src/trg-torrent-props-dialog.c:442
 msgid "Stop seeding at ratio"
 msgstr "Stoppa vid ratio"
 
-#: src/trg-torrent-props-dialog.c:452
+#: src/trg-torrent-props-dialog.c:443
 msgid "Seed regardless of ratio"
 msgstr "Seeda oavsett ratio"
 
-#: src/trg-torrent-props-dialog.c:455
+#: src/trg-torrent-props-dialog.c:446
 msgid "Seed ratio mode:"
 msgstr "Alternativ för ratio:"
 
-#: src/trg-torrent-props-dialog.c:463
+#: src/trg-torrent-props-dialog.c:454
 msgid "Seed ratio limit:"
 msgstr "Seed ratio max:"
 
-#: src/trg-torrent-props-dialog.c:469
+#: src/trg-torrent-props-dialog.c:460
 msgid "Peer limit:"
 msgstr "Max antal peers:"
 
-#: src/trg-torrent-props-dialog.c:542
+#: src/trg-torrent-props-dialog.c:533
 #, c-format
 msgid "Multiple (%d) torrent properties"
 msgstr "Multipla torrents (%d) egenskaper"
 
-#: src/trg-torrent-props-dialog.c:574
+#: src/trg-torrent-props-dialog.c:565
 msgid "Information"
 msgstr ""
 
@@ -1436,45 +1440,45 @@ msgstr ""
 msgid "Descending"
 msgstr ""
 
-#: src/util.c:340
+#: src/util.c:342
 msgid "JSON decoding error."
 msgstr "JSON tolkningsfel."
 
-#: src/util.c:345
+#: src/util.c:347
 msgid "Server responded, but with no result."
 msgstr "Serversvar, men utan resultat."
 
-#: src/util.c:349
+#: src/util.c:351
 #, c-format
 msgid "Request failed with HTTP code %d"
 msgstr "Begäran misslyckades med http-kod %d"
 
-#: src/util.c:383
+#: src/util.c:385
 msgid "None"
 msgstr "Ingen"
 
-#: src/util.c:429
+#: src/util.c:431
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dagar"
 
-#: src/util.c:430
+#: src/util.c:432
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d timme"
 msgstr[1] "%d timmar"
 
-#: src/util.c:432
+#: src/util.c:434
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minuter"
 
-#: src/util.c:435
+#: src/util.c:437
 #, c-format
 msgid "%ld second"
 msgid_plural "%ld seconds"
diff --git a/po/tr.po b/po/tr.po
index 73bc400..9386cce 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: transmission-remote-gtk\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-09-05 22:09+0100\n"
+"POT-Creation-Date: 2013-06-09 23:41+0100\n"
 "PO-Revision-Date: 2012-06-03 05:29+0000\n"
 "Last-Translator: Ebubekir KARUL <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-06-09 22:28+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2014-06-12 07:44+0000\n"
+"X-Generator: Launchpad (build 17045)\n"
 
 #: src/torrent.c:360 src/torrent.c:380
 msgid "Metadata Downloading"
@@ -43,7 +43,7 @@ msgid "Queued seed"
 msgstr ""
 
 #: src/torrent.c:372 src/torrent.c:386 src/trg-remote-prefs-dialog.c:360
-#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:447
+#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:438
 msgid "Seeding"
 msgstr "Gönderiliyor"
 
@@ -155,18 +155,18 @@ msgstr[1] ""
 msgid "A remote client to transmission-daemon."
 msgstr ""
 
-#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2011
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:416
+#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2025
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:407
 msgid "Low"
 msgstr "Düşük"
 
-#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2007
-#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:418
+#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2021
+#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:409
 msgid "High"
 msgstr "Yüksek"
 
-#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2009
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:417
+#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2023
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:408
 msgid "Normal"
 msgstr "Normal"
 
@@ -174,12 +174,12 @@ msgstr "Normal"
 msgid "Mixed"
 msgstr "Karışık"
 
-#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:280
+#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:278
 #: src/trg-torrent-add-dialog.c:348 src/trg-torrent-tree-view.c:52
 msgid "Name"
 msgstr "Ä°sim"
 
-#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:283
+#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:281
 #: src/trg-torrent-add-dialog.c:366 src/trg-torrent-tree-view.c:57
 msgid "Size"
 msgstr "Boyut"
@@ -193,7 +193,7 @@ msgstr "Ä°lerleme"
 msgid "Download"
 msgstr "Ä°ndir"
 
-#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2000
+#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2014
 #: src/trg-torrent-add-dialog.c:395 src/trg-torrent-tree-view.c:145
 msgid "Priority"
 msgstr "Öncelik"
@@ -222,7 +222,7 @@ msgstr "Tümünü genişlet"
 msgid "Collapse All"
 msgstr "Tümünü daralt"
 
-#: src/trg-general-panel.c:153 src/trg-general-panel.c:214
+#: src/trg-general-panel.c:153 src/trg-general-panel.c:212
 msgid "N/A"
 msgstr "Yok"
 
@@ -234,62 +234,62 @@ msgstr "(Gizli)"
 msgid "(Public)"
 msgstr "Herkese açık"
 
-#: src/trg-general-panel.c:202 src/trg-main-window.c:1097
-#: src/trg-main-window.c:1505 src/trg-main-window.c:2135
+#: src/trg-general-panel.c:200 src/trg-main-window.c:1106
+#: src/trg-main-window.c:1519 src/trg-main-window.c:2149
 #: src/trg-state-selector.c:538 src/trg-torrent-add-url-dialog.c:67
-#: src/util.c:331
+#: src/util.c:333
 msgid "Error"
 msgstr "Hata"
 
-#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:123
+#: src/trg-general-panel.c:283 src/trg-torrent-tree-view.c:123
 msgid "ETA"
 msgstr "Kalan Süre"
 
-#: src/trg-general-panel.c:287 src/trg-torrent-tree-view.c:151
+#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:151
 msgid "Completed"
 msgstr "Tamamlandı"
 
-#: src/trg-general-panel.c:290
+#: src/trg-general-panel.c:288
 msgid "Seeders"
 msgstr "Kaynaklar"
 
-#: src/trg-general-panel.c:292
+#: src/trg-general-panel.c:290
 msgid "Rate Down"
 msgstr ""
 
-#: src/trg-general-panel.c:294 src/trg-torrent-tree-view.c:128
+#: src/trg-general-panel.c:292 src/trg-torrent-tree-view.c:128
 msgid "Downloaded"
 msgstr "Ä°ndirildi"
 
-#: src/trg-general-panel.c:297 src/trg-torrent-tree-view.c:70
+#: src/trg-general-panel.c:295 src/trg-torrent-tree-view.c:70
 msgid "Leechers"
 msgstr ""
 
-#: src/trg-general-panel.c:299
+#: src/trg-general-panel.c:297
 msgid "Rate Up"
 msgstr ""
 
-#: src/trg-general-panel.c:301 src/trg-torrent-tree-view.c:125
+#: src/trg-general-panel.c:299 src/trg-torrent-tree-view.c:125
 msgid "Uploaded"
 msgstr "Gönderildi"
 
-#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:63
+#: src/trg-general-panel.c:302 src/trg-torrent-tree-view.c:63
 msgid "Status"
 msgstr "Durum"
 
-#: src/trg-general-panel.c:306 src/trg-torrent-tree-view.c:131
+#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:131
 msgid "Ratio"
 msgstr ""
 
-#: src/trg-general-panel.c:309
+#: src/trg-general-panel.c:307
 msgid "Comment"
 msgstr "Yorum"
 
-#: src/trg-general-panel.c:312
+#: src/trg-general-panel.c:310
 msgid "Completed At"
 msgstr ""
 
-#: src/trg-general-panel.c:316 src/trg-torrent-tree-view.c:139
+#: src/trg-general-panel.c:314 src/trg-torrent-tree-view.c:139
 msgid "Location"
 msgstr "Konum"
 
@@ -301,189 +301,189 @@ msgstr "Bu torrent tamamlandı."
 msgid "This torrent has been added."
 msgstr "Torrent eklendi."
 
-#: src/trg-main-window.c:596
+#: src/trg-main-window.c:600
 msgid "No hostname set"
 msgstr "Sunucu belirlenmedi"
 
-#: src/trg-main-window.c:599
+#: src/trg-main-window.c:603
 msgid "Unknown error getting settings"
 msgstr ""
 
-#: src/trg-main-window.c:614
+#: src/trg-main-window.c:623
 msgid "Connecting..."
 msgstr "Bağlanıyor..."
 
-#: src/trg-main-window.c:873
+#: src/trg-main-window.c:882
 #, c-format
 msgid "<big><b>Remove torrent \"%s\"?</b></big>"
 msgstr "<big><b>Torrent silinsin mi  \"%s\"?</b></big>"
 
-#: src/trg-main-window.c:874
+#: src/trg-main-window.c:883
 #, c-format
 msgid "<big><b>Remove %d torrents?</b></big>"
 msgstr ""
 
-#: src/trg-main-window.c:896
+#: src/trg-main-window.c:905
 #, c-format
 msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
 msgstr ""
 
-#: src/trg-main-window.c:898
+#: src/trg-main-window.c:907
 #, c-format
 msgid "<big><b>Remove and delete %d torrents?</b></big>"
 msgstr ""
 
-#: src/trg-main-window.c:981 src/trg-preferences-dialog.c:897
+#: src/trg-main-window.c:990 src/trg-preferences-dialog.c:899
 #: src/trg-remote-prefs-dialog.c:693
 msgid "General"
 msgstr "Genel"
 
-#: src/trg-main-window.c:990 src/trg-torrent-props-dialog.c:622
+#: src/trg-main-window.c:999 src/trg-torrent-props-dialog.c:613
 msgid "Trackers"
 msgstr "Ä°zleyiciler"
 
-#: src/trg-main-window.c:998 src/trg-torrent-props-dialog.c:591
+#: src/trg-main-window.c:1007 src/trg-torrent-props-dialog.c:582
 msgid "Files"
 msgstr "Dosyalar"
 
-#: src/trg-main-window.c:1006 src/trg-remote-prefs-dialog.c:399
-#: src/trg-torrent-props-dialog.c:465 src/trg-torrent-props-dialog.c:605
+#: src/trg-main-window.c:1015 src/trg-remote-prefs-dialog.c:399
+#: src/trg-torrent-props-dialog.c:456 src/trg-torrent-props-dialog.c:596
 #: src/trg-trackers-tree-view.c:190
 msgid "Peers"
 msgstr "EÅŸler"
 
-#: src/trg-main-window.c:1089
+#: src/trg-main-window.c:1098
 #, c-format
 msgid "This application supports Transmission %g and later, you have %g."
 msgstr ""
 
-#: src/trg-main-window.c:1155 src/trg-status-bar.c:74 src/trg-status-bar.c:104
+#: src/trg-main-window.c:1164 src/trg-status-bar.c:74 src/trg-status-bar.c:104
 msgid "Disconnected"
 msgstr "Bağlı değil"
 
-#: src/trg-main-window.c:1200
+#: src/trg-main-window.c:1209
 #, c-format
 msgid "%d Downloading @ %s"
 msgstr "%d Ä°ndiriliyor @ %s"
 
-#: src/trg-main-window.c:1207
+#: src/trg-main-window.c:1216
 #, c-format
 msgid "%d Seeding @ %s"
 msgstr "%d Gönderiliyor @ %s"
 
-#: src/trg-main-window.c:1258
+#: src/trg-main-window.c:1267
 #, c-format
 msgid "Request %d/%d failed: %s"
 msgstr ""
 
-#: src/trg-main-window.c:2055
+#: src/trg-main-window.c:2069
 msgid "No Limit"
 msgstr "Sınırsız"
 
-#: src/trg-main-window.c:2156 src/trg-menu-bar.c:675 src/trg-toolbar.c:223
+#: src/trg-main-window.c:2170 src/trg-menu-bar.c:675 src/trg-toolbar.c:224
 msgid "Properties"
 msgstr "Tercihler"
 
-#: src/trg-main-window.c:2159 src/trg-toolbar.c:216
+#: src/trg-main-window.c:2173 src/trg-toolbar.c:217
 msgid "Resume"
 msgstr "Devam et"
 
-#: src/trg-main-window.c:2162 src/trg-toolbar.c:219
+#: src/trg-main-window.c:2176 src/trg-toolbar.c:220
 msgid "Pause"
 msgstr "Duraklat"
 
-#: src/trg-main-window.c:2165
+#: src/trg-main-window.c:2179
 msgid "Verify"
 msgstr "DoÄŸrula"
 
-#: src/trg-main-window.c:2168
+#: src/trg-main-window.c:2182
 msgid "Re-announce"
 msgstr ""
 
-#: src/trg-main-window.c:2171 src/trg-torrent-move-dialog.c:119
+#: src/trg-main-window.c:2185 src/trg-torrent-move-dialog.c:119
 #: src/trg-torrent-move-dialog.c:126
 msgid "Move"
 msgstr "Taşı"
 
-#: src/trg-main-window.c:2174 src/trg-menu-bar.c:706 src/trg-toolbar.c:227
+#: src/trg-main-window.c:2188 src/trg-menu-bar.c:706 src/trg-toolbar.c:228
 msgid "Remove"
 msgstr "Sil"
 
-#: src/trg-main-window.c:2177
+#: src/trg-main-window.c:2191
 msgid "Remove & Delete"
 msgstr ""
 
-#: src/trg-main-window.c:2201 src/trg-preferences-dialog.c:907
+#: src/trg-main-window.c:2215 src/trg-preferences-dialog.c:909
 msgid "Actions"
 msgstr "Eylemler"
 
-#: src/trg-main-window.c:2230 src/trg-menu-bar.c:722
+#: src/trg-main-window.c:2244 src/trg-menu-bar.c:722
 msgid "Start Now"
 msgstr "BaÅŸla"
 
-#: src/trg-main-window.c:2233 src/trg-menu-bar.c:727
+#: src/trg-main-window.c:2247 src/trg-menu-bar.c:727
 msgid "Move Up Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2236 src/trg-menu-bar.c:734
+#: src/trg-main-window.c:2250 src/trg-menu-bar.c:734
 msgid "Move Down Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2239 src/trg-menu-bar.c:741
+#: src/trg-main-window.c:2253 src/trg-menu-bar.c:741
 msgid "Bottom Of Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2242 src/trg-menu-bar.c:745
+#: src/trg-main-window.c:2256 src/trg-menu-bar.c:745
 msgid "Top Of Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2251 src/trg-main-window.c:2334
+#: src/trg-main-window.c:2265 src/trg-main-window.c:2348
 msgid "Down Limit"
 msgstr "İndirme Sınırı"
 
-#: src/trg-main-window.c:2256 src/trg-main-window.c:2338
+#: src/trg-main-window.c:2270 src/trg-main-window.c:2352
 msgid "Up Limit"
 msgstr "Gönderme Sınırı"
 
-#: src/trg-main-window.c:2285 src/trg-main-window.c:2292
+#: src/trg-main-window.c:2299 src/trg-main-window.c:2306
 #: src/trg-remote-prefs-dialog.c:497
 msgid "Updating..."
 msgstr "Güncelleniyor..."
 
-#: src/trg-main-window.c:2306 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
+#: src/trg-main-window.c:2320 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
 msgid "Connect"
 msgstr "BaÄŸlan"
 
-#: src/trg-main-window.c:2313 src/trg-toolbar.c:206
+#: src/trg-main-window.c:2327 src/trg-toolbar.c:207
 msgid "Disconnect"
 msgstr "Bağlantıyı Kes"
 
-#: src/trg-main-window.c:2317 src/trg-toolbar.c:209
+#: src/trg-main-window.c:2331 src/trg-toolbar.c:210
 #: src/trg-trackers-tree-view.c:284 src/trg-trackers-tree-view.c:311
 msgid "Add"
 msgstr "Ekle"
 
-#: src/trg-main-window.c:2321
+#: src/trg-main-window.c:2335
 msgid "Add from URL"
 msgstr "Adresten ekle"
 
-#: src/trg-main-window.c:2325
+#: src/trg-main-window.c:2339
 msgid "Resume All"
 msgstr "Tümünü Sürdür"
 
-#: src/trg-main-window.c:2329
+#: src/trg-main-window.c:2343
 msgid "Pause All"
 msgstr "Tümünü Duraklat"
 
-#: src/trg-main-window.c:2345
+#: src/trg-main-window.c:2359
 msgid "Quit"
 msgstr "Çıkış"
 
-#: src/trg-main-window.c:2459 src/trg-menu-bar.c:536
+#: src/trg-main-window.c:2473 src/trg-menu-bar.c:536
 msgid "Graph"
 msgstr "Grafik"
 
-#: src/trg-main-window.c:2647
+#: src/trg-main-window.c:2662
 msgid "Transmission Remote"
 msgstr ""
 
@@ -691,7 +691,7 @@ msgstr ""
 msgid "Directory"
 msgstr "Klasör"
 
-#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:902
+#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:904
 msgid "View"
 msgstr "Görünüm"
 
@@ -731,7 +731,7 @@ msgstr "Profil: "
 msgid "Name:"
 msgstr "Ä°sim:"
 
-#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:892
+#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:894
 msgid "Connection"
 msgstr "Bağlantı"
 
@@ -743,35 +743,39 @@ msgstr "Sunucu:"
 msgid "Port:"
 msgstr "Port:"
 
-#: src/trg-preferences-dialog.c:817
+#: src/trg-preferences-dialog.c:816
+msgid "RPC URL Path:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:819
 msgid "Username:"
 msgstr "Kullanıcı Adı:"
 
-#: src/trg-preferences-dialog.c:821
+#: src/trg-preferences-dialog.c:823
 msgid "Password:"
 msgstr "Åžifre:"
 
-#: src/trg-preferences-dialog.c:823
+#: src/trg-preferences-dialog.c:825
 msgid "Automatically connect"
 msgstr "Otomatik bağlantı"
 
-#: src/trg-preferences-dialog.c:829
+#: src/trg-preferences-dialog.c:831
 msgid "SSL"
 msgstr "SSL"
 
-#: src/trg-preferences-dialog.c:836
+#: src/trg-preferences-dialog.c:838
 msgid "Timeout:"
 msgstr "Zaman aşımı:"
 
-#: src/trg-preferences-dialog.c:840
+#: src/trg-preferences-dialog.c:842
 msgid "Retries:"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:881 src/trg-toolbar.c:238
+#: src/trg-preferences-dialog.c:883 src/trg-toolbar.c:239
 msgid "Local Preferences"
 msgstr "Yerel Tercihler"
 
-#: src/trg-preferences-dialog.c:912
+#: src/trg-preferences-dialog.c:914
 msgid "Directories"
 msgstr "Dizinler"
 
@@ -960,15 +964,15 @@ msgstr ""
 msgid "Start added torrents"
 msgstr "Eklenen torrentleri indir"
 
-#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:242
+#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:243
 msgid "Remote Preferences"
 msgstr "Uzak Tercihler"
 
-#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:409
+#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:400
 msgid "Bandwidth"
 msgstr "Bant GeniÅŸliÄŸi"
 
-#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:636
+#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:627
 msgid "Limits"
 msgstr "Limitler"
 
@@ -1068,7 +1072,7 @@ msgstr " (Limit: %s)"
 msgid "Down: %s%s, Up: %s%s"
 msgstr "İndirme: %s%s, Yükleme: %s%s"
 
-#: src/trg-toolbar.c:231
+#: src/trg-toolbar.c:232
 msgid "Remove with data"
 msgstr ""
 
@@ -1161,7 +1165,7 @@ msgstr "Toplam indirilme"
 msgid "Default"
 msgstr "Varsayılan"
 
-#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:260
+#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:251
 msgid "Location:"
 msgstr "Konum:"
 
@@ -1175,142 +1179,142 @@ msgstr "Taşı %s"
 msgid "Move %d torrents"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:206
+#: src/trg-torrent-props-dialog.c:197
 msgid "Activity"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:211
+#: src/trg-torrent-props-dialog.c:202
 msgid "Torrent size:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:216
+#: src/trg-torrent-props-dialog.c:207
 msgid "Have:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:221
+#: src/trg-torrent-props-dialog.c:212
 msgid "Downloaded:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:226
+#: src/trg-torrent-props-dialog.c:217
 msgid "Uploaded:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:231
+#: src/trg-torrent-props-dialog.c:222
 msgid "State:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:236
+#: src/trg-torrent-props-dialog.c:227
 msgid "Running time:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:241
+#: src/trg-torrent-props-dialog.c:232
 msgid "Remaining time:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:246
+#: src/trg-torrent-props-dialog.c:237
 msgid "Last activity:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:251
+#: src/trg-torrent-props-dialog.c:242
 msgid "Error:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:255
+#: src/trg-torrent-props-dialog.c:246
 msgid "Details"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:266
+#: src/trg-torrent-props-dialog.c:257
 msgid "Hash:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:272
+#: src/trg-torrent-props-dialog.c:263
 msgid "Privacy:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:278
+#: src/trg-torrent-props-dialog.c:269
 msgid "Origin:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:295
+#: src/trg-torrent-props-dialog.c:286
 msgid "Comment:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:330
+#: src/trg-torrent-props-dialog.c:321
 msgid "Private to this tracker -- DHT and PEX disabled"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:332
+#: src/trg-torrent-props-dialog.c:323
 msgid "Public torrent"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:342
+#: src/trg-torrent-props-dialog.c:333
 #, c-format
 msgid "Created on %1$s"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:344
+#: src/trg-torrent-props-dialog.c:335
 #, c-format
 msgid "Created by %1$s on %2$s"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:376
+#: src/trg-torrent-props-dialog.c:367
 msgid "No errors"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:380
+#: src/trg-torrent-props-dialog.c:371
 msgid "Active now"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:413
+#: src/trg-torrent-props-dialog.c:404
 msgid "Honor global limits"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:423
+#: src/trg-torrent-props-dialog.c:414
 msgid "Torrent priority:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:429
+#: src/trg-torrent-props-dialog.c:420
 msgid "Queue Position:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:434
+#: src/trg-torrent-props-dialog.c:425
 msgid "Limit download speed (KiB/s)"
 msgstr "İndirme hızı limiti (KB/s)"
 
-#: src/trg-torrent-props-dialog.c:442
+#: src/trg-torrent-props-dialog.c:433
 msgid "Limit upload speed (KiB/s)"
 msgstr "Yükleme hızı limiti (KB/s)"
 
-#: src/trg-torrent-props-dialog.c:450
+#: src/trg-torrent-props-dialog.c:441
 msgid "Use global settings"
 msgstr "Genel ayarları kullan"
 
-#: src/trg-torrent-props-dialog.c:451
+#: src/trg-torrent-props-dialog.c:442
 msgid "Stop seeding at ratio"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:452
+#: src/trg-torrent-props-dialog.c:443
 msgid "Seed regardless of ratio"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:455
+#: src/trg-torrent-props-dialog.c:446
 msgid "Seed ratio mode:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:463
+#: src/trg-torrent-props-dialog.c:454
 msgid "Seed ratio limit:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:469
+#: src/trg-torrent-props-dialog.c:460
 msgid "Peer limit:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:542
+#: src/trg-torrent-props-dialog.c:533
 #, c-format
 msgid "Multiple (%d) torrent properties"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:574
+#: src/trg-torrent-props-dialog.c:565
 msgid "Information"
 msgstr ""
 
@@ -1430,42 +1434,42 @@ msgstr ""
 msgid "Descending"
 msgstr ""
 
-#: src/util.c:340
+#: src/util.c:342
 msgid "JSON decoding error."
 msgstr ""
 
-#: src/util.c:345
+#: src/util.c:347
 msgid "Server responded, but with no result."
 msgstr ""
 
-#: src/util.c:349
+#: src/util.c:351
 #, c-format
 msgid "Request failed with HTTP code %d"
 msgstr ""
 
-#: src/util.c:383
+#: src/util.c:385
 msgid "None"
 msgstr "Yok"
 
-#: src/util.c:429
+#: src/util.c:431
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d gün"
 
-#: src/util.c:430
+#: src/util.c:432
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d saat"
 
-#: src/util.c:432
+#: src/util.c:434
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d dakika"
 
-#: src/util.c:435
+#: src/util.c:437
 #, c-format
 msgid "%ld second"
 msgid_plural "%ld seconds"
diff --git a/po/uk.po b/po/uk.po
index 39405c0..f66f72b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-05 22:09+0100\n"
+"POT-Creation-Date: 2013-06-09 23:41+0100\n"
 "PO-Revision-Date: 2012-09-06 03:34+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\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-Launchpad-Export-Date: 2013-06-09 22:28+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2014-06-12 07:44+0000\n"
+"X-Generator: Launchpad (build 17045)\n"
 "Language: UK\n"
 
 #: src/torrent.c:360 src/torrent.c:380
@@ -44,7 +44,7 @@ msgid "Queued seed"
 msgstr "Заплановане поширенн�"
 
 #: src/torrent.c:372 src/torrent.c:386 src/trg-remote-prefs-dialog.c:360
-#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:447
+#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:438
 msgid "Seeding"
 msgstr "Поширенн�"
 
@@ -160,18 +160,18 @@ msgstr[2] "Поширюємо на %1$li з %2$li з’єднаних вузлі
 msgid "A remote client to transmission-daemon."
 msgstr "Клієнт дл� transmission-daemon."
 
-#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2011
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:416
+#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2025
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:407
 msgid "Low"
 msgstr "�изький"
 
-#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2007
-#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:418
+#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2021
+#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:409
 msgid "High"
 msgstr "Ви�окий"
 
-#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2009
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:417
+#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2023
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:408
 msgid "Normal"
 msgstr "Звичайний"
 
@@ -179,12 +179,12 @@ msgstr "Звичайний"
 msgid "Mixed"
 msgstr "В�е разом"
 
-#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:280
+#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:278
 #: src/trg-torrent-add-dialog.c:348 src/trg-torrent-tree-view.c:52
 msgid "Name"
 msgstr "�азва"
 
-#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:283
+#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:281
 #: src/trg-torrent-add-dialog.c:366 src/trg-torrent-tree-view.c:57
 msgid "Size"
 msgstr "Розмір"
@@ -198,7 +198,7 @@ msgstr "По�туп"
 msgid "Download"
 msgstr "Завантажити"
 
-#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2000
+#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2014
 #: src/trg-torrent-add-dialog.c:395 src/trg-torrent-tree-view.c:145
 msgid "Priority"
 msgstr "Пріоритет"
@@ -227,7 +227,7 @@ msgstr "Розкрити в�і"
 msgid "Collapse All"
 msgstr "Згорнути в�і"
 
-#: src/trg-general-panel.c:153 src/trg-general-panel.c:214
+#: src/trg-general-panel.c:153 src/trg-general-panel.c:212
 msgid "N/A"
 msgstr "н/д"
 
@@ -239,62 +239,62 @@ msgstr "(Приватний)"
 msgid "(Public)"
 msgstr "(Відкритий)"
 
-#: src/trg-general-panel.c:202 src/trg-main-window.c:1097
-#: src/trg-main-window.c:1505 src/trg-main-window.c:2135
+#: src/trg-general-panel.c:200 src/trg-main-window.c:1106
+#: src/trg-main-window.c:1519 src/trg-main-window.c:2149
 #: src/trg-state-selector.c:538 src/trg-torrent-add-url-dialog.c:67
-#: src/util.c:331
+#: src/util.c:333
 msgid "Error"
 msgstr "З помилками"
 
-#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:123
+#: src/trg-general-panel.c:283 src/trg-torrent-tree-view.c:123
 msgid "ETA"
 msgstr "Залишило�ь"
 
-#: src/trg-general-panel.c:287 src/trg-torrent-tree-view.c:151
+#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:151
 msgid "Completed"
 msgstr "Завершено"
 
-#: src/trg-general-panel.c:290
+#: src/trg-general-panel.c:288
 msgid "Seeders"
 msgstr "Поширювачі"
 
-#: src/trg-general-panel.c:292
+#: src/trg-general-panel.c:290
 msgid "Rate Down"
 msgstr "Завантаженн�"
 
-#: src/trg-general-panel.c:294 src/trg-torrent-tree-view.c:128
+#: src/trg-general-panel.c:292 src/trg-torrent-tree-view.c:128
 msgid "Downloaded"
 msgstr "Завантажено"
 
-#: src/trg-general-panel.c:297 src/trg-torrent-tree-view.c:70
+#: src/trg-general-panel.c:295 src/trg-torrent-tree-view.c:70
 msgid "Leechers"
 msgstr "П’�вки"
 
-#: src/trg-general-panel.c:299
+#: src/trg-general-panel.c:297
 msgid "Rate Up"
 msgstr "Вивантаженн�"
 
-#: src/trg-general-panel.c:301 src/trg-torrent-tree-view.c:125
+#: src/trg-general-panel.c:299 src/trg-torrent-tree-view.c:125
 msgid "Uploaded"
 msgstr "Вивантажено"
 
-#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:63
+#: src/trg-general-panel.c:302 src/trg-torrent-tree-view.c:63
 msgid "Status"
 msgstr "Стан"
 
-#: src/trg-general-panel.c:306 src/trg-torrent-tree-view.c:131
+#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:131
 msgid "Ratio"
 msgstr "Коефіцієнт"
 
-#: src/trg-general-panel.c:309
+#: src/trg-general-panel.c:307
 msgid "Comment"
 msgstr "Коментар"
 
-#: src/trg-general-panel.c:312
+#: src/trg-general-panel.c:310
 msgid "Completed At"
 msgstr "Завершено"
 
-#: src/trg-general-panel.c:316 src/trg-torrent-tree-view.c:139
+#: src/trg-general-panel.c:314 src/trg-torrent-tree-view.c:139
 msgid "Location"
 msgstr "Розташуванн�"
 
@@ -306,191 +306,191 @@ msgstr "Цей торент завантажено."
 msgid "This torrent has been added."
 msgstr "Цей торент було додано."
 
-#: src/trg-main-window.c:596
+#: src/trg-main-window.c:600
 msgid "No hostname set"
 msgstr "�е вказано назви �ервера"
 
-#: src/trg-main-window.c:599
+#: src/trg-main-window.c:603
 msgid "Unknown error getting settings"
 msgstr "�евідома помилка при читанні налаштувань"
 
-#: src/trg-main-window.c:614
+#: src/trg-main-window.c:623
 msgid "Connecting..."
 msgstr "З’єднанн�…"
 
-#: src/trg-main-window.c:873
+#: src/trg-main-window.c:882
 #, c-format
 msgid "<big><b>Remove torrent \"%s\"?</b></big>"
 msgstr "<big><b>Вилучити торент «%s»?</b></big>"
 
-#: src/trg-main-window.c:874
+#: src/trg-main-window.c:883
 #, c-format
 msgid "<big><b>Remove %d torrents?</b></big>"
 msgstr "<big><b>Вилучити %d торентів?</b></big>"
 
-#: src/trg-main-window.c:896
+#: src/trg-main-window.c:905
 #, c-format
 msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
 msgstr "<big><b>Вилучити торент «%s» і файли?</b></big>"
 
-#: src/trg-main-window.c:898
+#: src/trg-main-window.c:907
 #, c-format
 msgid "<big><b>Remove and delete %d torrents?</b></big>"
 msgstr "<big><b>Вилучити %d торентів і файли цих торентів?</b></big>"
 
-#: src/trg-main-window.c:981 src/trg-preferences-dialog.c:897
+#: src/trg-main-window.c:990 src/trg-preferences-dialog.c:899
 #: src/trg-remote-prefs-dialog.c:693
 msgid "General"
 msgstr "Загальне"
 
-#: src/trg-main-window.c:990 src/trg-torrent-props-dialog.c:622
+#: src/trg-main-window.c:999 src/trg-torrent-props-dialog.c:613
 msgid "Trackers"
 msgstr "Трекери"
 
-#: src/trg-main-window.c:998 src/trg-torrent-props-dialog.c:591
+#: src/trg-main-window.c:1007 src/trg-torrent-props-dialog.c:582
 msgid "Files"
 msgstr "Файли"
 
-#: src/trg-main-window.c:1006 src/trg-remote-prefs-dialog.c:399
-#: src/trg-torrent-props-dialog.c:465 src/trg-torrent-props-dialog.c:605
+#: src/trg-main-window.c:1015 src/trg-remote-prefs-dialog.c:399
+#: src/trg-torrent-props-dialog.c:456 src/trg-torrent-props-dialog.c:596
 #: src/trg-trackers-tree-view.c:190
 msgid "Peers"
 msgstr "Вузли"
 
-#: src/trg-main-window.c:1089
+#: src/trg-main-window.c:1098
 #, c-format
 msgid "This application supports Transmission %g and later, you have %g."
 msgstr ""
 "Ц� програма може працювати з Transmission %g та пізнішими вер�і�ми. У вашій "
 "�и�темі в�тановлено вер�ію %g."
 
-#: src/trg-main-window.c:1155 src/trg-status-bar.c:74 src/trg-status-bar.c:104
+#: src/trg-main-window.c:1164 src/trg-status-bar.c:74 src/trg-status-bar.c:104
 msgid "Disconnected"
 msgstr "Роз’єднано"
 
-#: src/trg-main-window.c:1200
+#: src/trg-main-window.c:1209
 #, c-format
 msgid "%d Downloading @ %s"
 msgstr "%d завантаженн� на %s"
 
-#: src/trg-main-window.c:1207
+#: src/trg-main-window.c:1216
 #, c-format
 msgid "%d Seeding @ %s"
 msgstr "%d поширенн� на @ %s"
 
-#: src/trg-main-window.c:1258
+#: src/trg-main-window.c:1267
 #, c-format
 msgid "Request %d/%d failed: %s"
 msgstr "Запит %d/%d зазнав невдачі: %s"
 
-#: src/trg-main-window.c:2055
+#: src/trg-main-window.c:2069
 msgid "No Limit"
 msgstr "Без обмежень"
 
-#: src/trg-main-window.c:2156 src/trg-menu-bar.c:675 src/trg-toolbar.c:223
+#: src/trg-main-window.c:2170 src/trg-menu-bar.c:675 src/trg-toolbar.c:224
 msgid "Properties"
 msgstr "Вла�тиво�ті"
 
-#: src/trg-main-window.c:2159 src/trg-toolbar.c:216
+#: src/trg-main-window.c:2173 src/trg-toolbar.c:217
 msgid "Resume"
 msgstr "Відновити"
 
-#: src/trg-main-window.c:2162 src/trg-toolbar.c:219
+#: src/trg-main-window.c:2176 src/trg-toolbar.c:220
 msgid "Pause"
 msgstr "Призупинити"
 
-#: src/trg-main-window.c:2165
+#: src/trg-main-window.c:2179
 msgid "Verify"
 msgstr "Перевірити"
 
-#: src/trg-main-window.c:2168
+#: src/trg-main-window.c:2182
 msgid "Re-announce"
 msgstr "Повторити оголошенн�"
 
-#: src/trg-main-window.c:2171 src/trg-torrent-move-dialog.c:119
+#: src/trg-main-window.c:2185 src/trg-torrent-move-dialog.c:119
 #: src/trg-torrent-move-dialog.c:126
 msgid "Move"
 msgstr "Пере�унути"
 
-#: src/trg-main-window.c:2174 src/trg-menu-bar.c:706 src/trg-toolbar.c:227
+#: src/trg-main-window.c:2188 src/trg-menu-bar.c:706 src/trg-toolbar.c:228
 msgid "Remove"
 msgstr "Вилучити"
 
-#: src/trg-main-window.c:2177
+#: src/trg-main-window.c:2191
 msgid "Remove & Delete"
 msgstr "Вилучити торент і файли"
 
-#: src/trg-main-window.c:2201 src/trg-preferences-dialog.c:907
+#: src/trg-main-window.c:2215 src/trg-preferences-dialog.c:909
 msgid "Actions"
 msgstr "Дії"
 
-#: src/trg-main-window.c:2230 src/trg-menu-bar.c:722
+#: src/trg-main-window.c:2244 src/trg-menu-bar.c:722
 msgid "Start Now"
 msgstr "Розпочати"
 
-#: src/trg-main-window.c:2233 src/trg-menu-bar.c:727
+#: src/trg-main-window.c:2247 src/trg-menu-bar.c:727
 msgid "Move Up Queue"
 msgstr "Пере�унути вище у черзі"
 
-#: src/trg-main-window.c:2236 src/trg-menu-bar.c:734
+#: src/trg-main-window.c:2250 src/trg-menu-bar.c:734
 msgid "Move Down Queue"
 msgstr "Пере�унути нижче у черзі"
 
-#: src/trg-main-window.c:2239 src/trg-menu-bar.c:741
+#: src/trg-main-window.c:2253 src/trg-menu-bar.c:741
 msgid "Bottom Of Queue"
 msgstr "По�тавити в кінець черги"
 
-#: src/trg-main-window.c:2242 src/trg-menu-bar.c:745
+#: src/trg-main-window.c:2256 src/trg-menu-bar.c:745
 msgid "Top Of Queue"
 msgstr "По�тавити на початок черги"
 
-#: src/trg-main-window.c:2251 src/trg-main-window.c:2334
+#: src/trg-main-window.c:2265 src/trg-main-window.c:2348
 msgid "Down Limit"
 msgstr "Обмеженн� швидко�ті завантаженн�"
 
-#: src/trg-main-window.c:2256 src/trg-main-window.c:2338
+#: src/trg-main-window.c:2270 src/trg-main-window.c:2352
 msgid "Up Limit"
 msgstr "Обмеженн� швидко�ті вивантаженн�"
 
-#: src/trg-main-window.c:2285 src/trg-main-window.c:2292
+#: src/trg-main-window.c:2299 src/trg-main-window.c:2306
 #: src/trg-remote-prefs-dialog.c:497
 msgid "Updating..."
 msgstr "Оновленн�…"
 
-#: src/trg-main-window.c:2306 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
+#: src/trg-main-window.c:2320 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
 msgid "Connect"
 msgstr "З’єднати��"
 
-#: src/trg-main-window.c:2313 src/trg-toolbar.c:206
+#: src/trg-main-window.c:2327 src/trg-toolbar.c:207
 msgid "Disconnect"
 msgstr "Від’єднати��"
 
-#: src/trg-main-window.c:2317 src/trg-toolbar.c:209
+#: src/trg-main-window.c:2331 src/trg-toolbar.c:210
 #: src/trg-trackers-tree-view.c:284 src/trg-trackers-tree-view.c:311
 msgid "Add"
 msgstr "Додати"
 
-#: src/trg-main-window.c:2321
+#: src/trg-main-window.c:2335
 msgid "Add from URL"
 msgstr "Додати за адре�ою"
 
-#: src/trg-main-window.c:2325
+#: src/trg-main-window.c:2339
 msgid "Resume All"
 msgstr "Відновити в�е"
 
-#: src/trg-main-window.c:2329
+#: src/trg-main-window.c:2343
 msgid "Pause All"
 msgstr "Призупинити в�е"
 
-#: src/trg-main-window.c:2345
+#: src/trg-main-window.c:2359
 msgid "Quit"
 msgstr "Вийти"
 
-#: src/trg-main-window.c:2459 src/trg-menu-bar.c:536
+#: src/trg-main-window.c:2473 src/trg-menu-bar.c:536
 msgid "Graph"
 msgstr "Графік"
 
-#: src/trg-main-window.c:2647
+#: src/trg-main-window.c:2662
 msgid "Transmission Remote"
 msgstr "Віддалене керуванн� Transmission"
 
@@ -698,7 +698,7 @@ msgstr "Каталоги віддаленого завантаженн�"
 msgid "Directory"
 msgstr "Каталог"
 
-#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:902
+#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:904
 msgid "View"
 msgstr "Перегл�д"
 
@@ -738,7 +738,7 @@ msgstr "Профіль: "
 msgid "Name:"
 msgstr "�азва:"
 
-#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:892
+#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:894
 msgid "Connection"
 msgstr "З’єднанн�"
 
@@ -750,35 +750,39 @@ msgstr "Вузол:"
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/trg-preferences-dialog.c:817
+#: src/trg-preferences-dialog.c:816
+msgid "RPC URL Path:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:819
 msgid "Username:"
 msgstr "Кори�тувач:"
 
-#: src/trg-preferences-dialog.c:821
+#: src/trg-preferences-dialog.c:823
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/trg-preferences-dialog.c:823
+#: src/trg-preferences-dialog.c:825
 msgid "Automatically connect"
 msgstr "З’єднувати�ь автоматично"
 
-#: src/trg-preferences-dialog.c:829
+#: src/trg-preferences-dialog.c:831
 msgid "SSL"
 msgstr "SSL"
 
-#: src/trg-preferences-dialog.c:836
+#: src/trg-preferences-dialog.c:838
 msgid "Timeout:"
 msgstr "Тайм-аут:"
 
-#: src/trg-preferences-dialog.c:840
+#: src/trg-preferences-dialog.c:842
 msgid "Retries:"
 msgstr "Спроб:"
 
-#: src/trg-preferences-dialog.c:881 src/trg-toolbar.c:238
+#: src/trg-preferences-dialog.c:883 src/trg-toolbar.c:239
 msgid "Local Preferences"
 msgstr "Локальні налаштуванн�"
 
-#: src/trg-preferences-dialog.c:912
+#: src/trg-preferences-dialog.c:914
 msgid "Directories"
 msgstr "Каталоги"
 
@@ -968,15 +972,15 @@ msgstr "Вилучати початкові торент-файли"
 msgid "Start added torrents"
 msgstr "Розпочинати завантаженн� доданих торентів"
 
-#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:242
+#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:243
 msgid "Remote Preferences"
 msgstr "�алаштуванн� �ервера"
 
-#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:409
+#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:400
 msgid "Bandwidth"
 msgstr "Ширина каналу"
 
-#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:636
+#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:627
 msgid "Limits"
 msgstr "Обмеженн�"
 
@@ -1076,7 +1080,7 @@ msgstr " (Обмеженн�: %s)"
 msgid "Down: %s%s, Up: %s%s"
 msgstr "Завант.: %s%s, вивант.: %s%s"
 
-#: src/trg-toolbar.c:231
+#: src/trg-toolbar.c:232
 msgid "Remove with data"
 msgstr "Вилучити з файлами"
 
@@ -1173,7 +1177,7 @@ msgstr "Загальна швидкі�ть завантаженн�"
 msgid "Default"
 msgstr "Типовий"
 
-#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:260
+#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:251
 msgid "Location:"
 msgstr "Розташуванн�:"
 
@@ -1187,142 +1191,142 @@ msgstr "Пере�унути %s"
 msgid "Move %d torrents"
 msgstr "Перемі�тити %d торентів"
 
-#: src/trg-torrent-props-dialog.c:206
+#: src/trg-torrent-props-dialog.c:197
 msgid "Activity"
 msgstr "Дії"
 
-#: src/trg-torrent-props-dialog.c:211
+#: src/trg-torrent-props-dialog.c:202
 msgid "Torrent size:"
 msgstr "Розмір:"
 
-#: src/trg-torrent-props-dialog.c:216
+#: src/trg-torrent-props-dialog.c:207
 msgid "Have:"
 msgstr "Маємо:"
 
-#: src/trg-torrent-props-dialog.c:221
+#: src/trg-torrent-props-dialog.c:212
 msgid "Downloaded:"
 msgstr "Завантажено:"
 
-#: src/trg-torrent-props-dialog.c:226
+#: src/trg-torrent-props-dialog.c:217
 msgid "Uploaded:"
 msgstr "Вивантажено:"
 
-#: src/trg-torrent-props-dialog.c:231
+#: src/trg-torrent-props-dialog.c:222
 msgid "State:"
 msgstr "Стан:"
 
-#: src/trg-torrent-props-dialog.c:236
+#: src/trg-torrent-props-dialog.c:227
 msgid "Running time:"
 msgstr "Тривалі�ть роботи:"
 
-#: src/trg-torrent-props-dialog.c:241
+#: src/trg-torrent-props-dialog.c:232
 msgid "Remaining time:"
 msgstr "Залишило�ь ча�у:"
 
-#: src/trg-torrent-props-dialog.c:246
+#: src/trg-torrent-props-dialog.c:237
 msgid "Last activity:"
 msgstr "Ча� о�танньої активно�ті:"
 
-#: src/trg-torrent-props-dialog.c:251
+#: src/trg-torrent-props-dialog.c:242
 msgid "Error:"
 msgstr "Помилка:"
 
-#: src/trg-torrent-props-dialog.c:255
+#: src/trg-torrent-props-dialog.c:246
 msgid "Details"
 msgstr "Подробиці"
 
-#: src/trg-torrent-props-dialog.c:266
+#: src/trg-torrent-props-dialog.c:257
 msgid "Hash:"
 msgstr "Хеш:"
 
-#: src/trg-torrent-props-dialog.c:272
+#: src/trg-torrent-props-dialog.c:263
 msgid "Privacy:"
 msgstr "Конфіденційні�ть:"
 
-#: src/trg-torrent-props-dialog.c:278
+#: src/trg-torrent-props-dialog.c:269
 msgid "Origin:"
 msgstr "Походженн�:"
 
-#: src/trg-torrent-props-dialog.c:295
+#: src/trg-torrent-props-dialog.c:286
 msgid "Comment:"
 msgstr "Коментар:"
 
-#: src/trg-torrent-props-dialog.c:330
+#: src/trg-torrent-props-dialog.c:321
 msgid "Private to this tracker -- DHT and PEX disabled"
 msgstr "Лише дл� цього трекеру — DHT та PEX вимкнено"
 
-#: src/trg-torrent-props-dialog.c:332
+#: src/trg-torrent-props-dialog.c:323
 msgid "Public torrent"
 msgstr "Публічний торент"
 
-#: src/trg-torrent-props-dialog.c:342
+#: src/trg-torrent-props-dialog.c:333
 #, c-format
 msgid "Created on %1$s"
 msgstr "Створено з вик. %1$s"
 
-#: src/trg-torrent-props-dialog.c:344
+#: src/trg-torrent-props-dialog.c:335
 #, c-format
 msgid "Created by %1$s on %2$s"
 msgstr "Створено автором %1$s з вик. %2$s"
 
-#: src/trg-torrent-props-dialog.c:376
+#: src/trg-torrent-props-dialog.c:367
 msgid "No errors"
 msgstr "Без помилок"
 
-#: src/trg-torrent-props-dialog.c:380
+#: src/trg-torrent-props-dialog.c:371
 msgid "Active now"
 msgstr "Зараз активно"
 
-#: src/trg-torrent-props-dialog.c:413
+#: src/trg-torrent-props-dialog.c:404
 msgid "Honor global limits"
 msgstr "Викори�товувати глобальні обмеженн�"
 
-#: src/trg-torrent-props-dialog.c:423
+#: src/trg-torrent-props-dialog.c:414
 msgid "Torrent priority:"
 msgstr "Пріоритет торента:"
 
-#: src/trg-torrent-props-dialog.c:429
+#: src/trg-torrent-props-dialog.c:420
 msgid "Queue Position:"
 msgstr "Мі�це у черзі:"
 
-#: src/trg-torrent-props-dialog.c:434
+#: src/trg-torrent-props-dialog.c:425
 msgid "Limit download speed (KiB/s)"
 msgstr "Обмежити швидкі�ть завантаженн� (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:442
+#: src/trg-torrent-props-dialog.c:433
 msgid "Limit upload speed (KiB/s)"
 msgstr "Обмежити швидкі�ть віддачі (KiB/s)"
 
-#: src/trg-torrent-props-dialog.c:450
+#: src/trg-torrent-props-dialog.c:441
 msgid "Use global settings"
 msgstr "Викори�товувати загальні параметри"
 
-#: src/trg-torrent-props-dialog.c:451
+#: src/trg-torrent-props-dialog.c:442
 msgid "Stop seeding at ratio"
 msgstr "Зупин�ти поширенн� при коефіцієнті віддачі"
 
-#: src/trg-torrent-props-dialog.c:452
+#: src/trg-torrent-props-dialog.c:443
 msgid "Seed regardless of ratio"
 msgstr "Поширювати незалежно від коефіцієнта"
 
-#: src/trg-torrent-props-dialog.c:455
+#: src/trg-torrent-props-dialog.c:446
 msgid "Seed ratio mode:"
 msgstr "Режим коефіцієнта віддачі:"
 
-#: src/trg-torrent-props-dialog.c:463
+#: src/trg-torrent-props-dialog.c:454
 msgid "Seed ratio limit:"
 msgstr "Обмеженн� коефіцієнта віддачі:"
 
-#: src/trg-torrent-props-dialog.c:469
+#: src/trg-torrent-props-dialog.c:460
 msgid "Peer limit:"
 msgstr "Обмеженн� вузлів:"
 
-#: src/trg-torrent-props-dialog.c:542
+#: src/trg-torrent-props-dialog.c:533
 #, c-format
 msgid "Multiple (%d) torrent properties"
 msgstr "Вла�тиво�ті декількох (%d) торентів"
 
-#: src/trg-torrent-props-dialog.c:574
+#: src/trg-torrent-props-dialog.c:565
 msgid "Information"
 msgstr "Інформаці�"
 
@@ -1442,24 +1446,24 @@ msgstr "За зро�танн�м"
 msgid "Descending"
 msgstr "За �паданн�м"
 
-#: src/util.c:340
+#: src/util.c:342
 msgid "JSON decoding error."
 msgstr "Помилка декодуванн� JSON."
 
-#: src/util.c:345
+#: src/util.c:347
 msgid "Server responded, but with no result."
 msgstr "Сервер відповів, але результат не отримано."
 
-#: src/util.c:349
+#: src/util.c:351
 #, c-format
 msgid "Request failed with HTTP code %d"
 msgstr "Помилка запиту з кодом HTTP %d"
 
-#: src/util.c:383
+#: src/util.c:385
 msgid "None"
 msgstr "�ічого"
 
-#: src/util.c:429
+#: src/util.c:431
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -1467,7 +1471,7 @@ msgstr[0] "%d день"
 msgstr[1] "%d дні"
 msgstr[2] "%d днів"
 
-#: src/util.c:430
+#: src/util.c:432
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1475,7 +1479,7 @@ msgstr[0] "%d година"
 msgstr[1] "%d години"
 msgstr[2] "%d годин"
 
-#: src/util.c:432
+#: src/util.c:434
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1483,7 +1487,7 @@ msgstr[0] "%d хвилина"
 msgstr[1] "%d хвилини"
 msgstr[2] "%d хвилин"
 
-#: src/util.c:435
+#: src/util.c:437
 #, c-format
 msgid "%ld second"
 msgid_plural "%ld seconds"
diff --git a/po/zh_CN.po b/po/zh_CN.po
new file mode 100644
index 0000000..74ce265
--- /dev/null
+++ b/po/zh_CN.po
@@ -0,0 +1,1630 @@
+# Chinese (Simplified) translation for transmission-remote-gtk
+# Copyright (c) 2016 Rosetta Contributors and Canonical Ltd 2016
+# This file is distributed under the same license as the transmission-remote-gtk package.
+# Boyuan Yang <073plan@gmail.com>, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: transmission-remote-gtk\n"
+"Report-Msgid-Bugs-To: Alan Fitton <alan@eth0.org.uk>\n"
+"POT-Creation-Date: 2016-07-19 18:02+0000\n"
+"PO-Revision-Date: 2016-07-28 22:12+0800\n"
+"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
+"Language-Team: Chinese (Simplified) <i18n-zh@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2016-07-28 13:52+0000\n"
+"X-Generator: Poedit 1.8.7.1\n"
+"Language: zh_CN\n"
+
+#: ../data/transmission-remote-gtk.desktop.in.h:1 ../src/trg-main-window.c:2717
+msgid "Transmission Remote"
+msgstr "Transmission 远程管�工具"
+
+#: ../data/transmission-remote-gtk.desktop.in.h:2
+msgid "Remotely manage the Transmission BitTorrent client"
+msgstr "远程管� Transmission BT 下载客户端"
+
+#: ../data/transmission-remote-gtk.appdata.xml.in.h:1
+msgid ""
+"transmission-remote-gtk allows you to remotely manage the Transmission "
+"BitTorrent client using its RPC interface."
+msgstr ""
+"transmission-remote-gtk 让您能够使用 Transmission BT 下载客户端的 RPC 接�进"
+"行远程管�。"
+
+#: ../data/transmission-remote-gtk.appdata.xml.in.h:2
+msgid "Features"
+msgstr "功能"
+
+#: ../data/transmission-remote-gtk.appdata.xml.in.h:3
+msgid ""
+"Remotely add (file/url), start, stop, remove, remove and delete, verify, "
+"reannounce torrents."
+msgstr ""
+"远程添加（文件/URL）��动��止�删除任务�删除任务和文件�校验���布�"
+"�。"
+
+#: ../data/transmission-remote-gtk.appdata.xml.in.h:4
+msgid "Works as a .torrent handler (eg. from a web browser)."
+msgstr "作为 .torrent 文件处�程�（例如，�由网页�览器调用）。"
+
+#: ../data/transmission-remote-gtk.appdata.xml.in.h:5
+msgid ""
+"Set torrent properties such as speed, seed, peer limits, file priorities, "
+"add/edit/remove trackers."
+msgstr ""
+"设置��属性，例如速度����节点�制�文件属性�添加/编辑/删除 tracker �务"
+"器。"
+
+#: ../data/transmission-remote-gtk.appdata.xml.in.h:6
+msgid ""
+"Change remote settings like global limits, download directory, and "
+"connectivity preferences."
+msgstr "更改远程设置，例如全局�制�下载目录以�连接首选项。"
+
+#: ../src/torrent.c:369 ../src/torrent.c:389
+msgid "Metadata Downloading"
+msgstr "正在下载元信�"
+
+#: ../src/torrent.c:371 ../src/torrent.c:391 ../src/trg-state-selector.c:677
+msgid "Downloading"
+msgstr "正在下载"
+
+#: ../src/torrent.c:373
+msgid "Queued download"
+msgstr "已列队的下载"
+
+#: ../src/torrent.c:375 ../src/torrent.c:399
+msgid "Waiting To Check"
+msgstr "等待检查"
+
+#: ../src/torrent.c:377 ../src/torrent.c:397 ../src/trg-state-selector.c:703
+msgid "Checking"
+msgstr "正在检查"
+
+#: ../src/torrent.c:379
+msgid "Queued seed"
+msgstr "已列队的��"
+
+#: ../src/torrent.c:381 ../src/torrent.c:395
+#: ../src/trg-remote-prefs-dialog.c:364 ../src/trg-state-selector.c:684
+#: ../src/trg-torrent-props-dialog.c:446
+msgid "Seeding"
+msgstr "��中"
+
+#: ../src/torrent.c:383 ../src/torrent.c:393 ../src/torrent-cell-renderer.c:282
+#: ../src/trg-state-selector.c:691
+msgid "Paused"
+msgstr "已暂�"
+
+#: ../src/torrent.c:403
+msgid "Unknown"
+msgstr "未知"
+
+#. %1$s is how much we've got,
+#. %2$s is how much we'll have when done,
+#. %3$s%% is a percentage of the two
+#: ../src/torrent-cell-renderer.c:154
+#, c-format
+msgid "%1$s of %2$s (%3$s)"
+msgstr ""
+
+#: ../src/torrent-cell-renderer.c:164
+#, c-format
+msgid "%1$s of %2$s (%3$s), uploaded %4$s (Ratio: %5$s Goal: %6$s)"
+msgstr ""
+
+#: ../src/torrent-cell-renderer.c:180
+#, c-format
+msgid "%1$s of %2$s (%3$s), uploaded %4$s (Ratio: %5$s)"
+msgstr ""
+
+#: ../src/torrent-cell-renderer.c:197
+#, c-format
+msgid "%1$s, uploaded %2$s (Ratio: %3$s Goal: %4$s)"
+msgstr "%1$s，已上传 %2$s (分享比率：%3$s 目标：%4$s)"
+
+#. %1$s is the torrent's total size,
+#. %2$s is how much we've uploaded,
+#. %3$s is our upload-to-download ratio
+#: ../src/torrent-cell-renderer.c:211
+#, c-format
+msgid "%1$s, uploaded %2$s (Ratio: %3$s)"
+msgstr "%1$s, 已上传 %2$s (分享比率: %3$s)"
+
+#: ../src/torrent-cell-renderer.c:227
+msgid "Remaining time unknown"
+msgstr "剩余时间未知"
+
+#. time remaining
+#: ../src/torrent-cell-renderer.c:232
+#, c-format
+msgid "%s remaining"
+msgstr "剩余时间 %s"
+
+#. 1==down arrow, 2==down speed, 3==up arrow, 4==down speed
+#: ../src/torrent-cell-renderer.c:256
+#, c-format
+msgid "%1$s %2$s, %3$s %4$s"
+msgstr "%1$s %2$s，%3$s %4$s"
+
+#. bandwidth speed + unicode arrow
+#: ../src/torrent-cell-renderer.c:260 ../src/torrent-cell-renderer.c:263
+#, c-format
+msgid "%1$s %2$s"
+msgstr ""
+
+#: ../src/torrent-cell-renderer.c:267
+msgid "Idle"
+msgstr "空闲"
+
+#: ../src/torrent-cell-renderer.c:281
+msgid "Finished"
+msgstr "已完�"
+
+#: ../src/torrent-cell-renderer.c:284
+msgid "Queued for verification"
+msgstr "已加入校验队列"
+
+#: ../src/torrent-cell-renderer.c:286
+msgid "Queued for download"
+msgstr "已加入下载队列"
+
+#: ../src/torrent-cell-renderer.c:288
+msgid "Queued for seeding"
+msgstr "已加入��队列"
+
+#: ../src/torrent-cell-renderer.c:291
+#, c-format
+msgid "Verifying data (%1$s tested)"
+msgstr "正在校验数� (%1$s 已检查)"
+
+#: ../src/torrent-cell-renderer.c:299
+#, c-format
+msgid "Ratio %s"
+msgstr "分享比率 %s"
+
+#: ../src/torrent-cell-renderer.c:313
+#, c-format
+msgid "Tracker gave a warning: \"%s\""
+msgstr "Tracker 给出一个警告：%s"
+
+#: ../src/torrent-cell-renderer.c:314
+#, c-format
+msgid "Tracker gave an error: \"%s\""
+msgstr "Tracker 给出一个错误：%s"
+
+#: ../src/torrent-cell-renderer.c:315
+#, c-format
+msgid "Error: %s"
+msgstr "错误：%s"
+
+#: ../src/torrent-cell-renderer.c:329
+msgid "Downloading from %1$"
+msgid_plural "Downloading from %1$"
+msgstr[0] "正在从 %1$ 下载"
+
+#: ../src/torrent-cell-renderer.c:337
+msgid "Downloading metadata from %1$"
+msgid_plural "Downloading metadata from %1$"
+msgstr[0] "正在从 %1$ 下载元信�"
+
+#: ../src/torrent-cell-renderer.c:348
+msgid "Seeding to %1$"
+msgid_plural "Seeding to %1$"
+msgstr[0] "正在为 %1$ ��"
+
+#: ../src/trg-about-window.c:59
+msgid "A remote client to transmission-daemon."
+msgstr "一个 transmission-daemon 的远程客户端。"
+
+#: ../src/trg-cell-renderer-priority.c:78 ../src/trg-general-panel.c:202
+#: ../src/trg-main-window.c:2079 ../src/trg-torrent-add-dialog.c:382
+#: ../src/trg-torrent-props-dialog.c:415
+msgid "Low"
+msgstr "低"
+
+#: ../src/trg-cell-renderer-priority.c:80 ../src/trg-general-panel.c:208
+#: ../src/trg-main-window.c:2075 ../src/trg-torrent-add-dialog.c:383
+#: ../src/trg-torrent-props-dialog.c:417
+msgid "High"
+msgstr "高"
+
+#: ../src/trg-cell-renderer-priority.c:82 ../src/trg-general-panel.c:205
+#: ../src/trg-main-window.c:2077 ../src/trg-torrent-add-dialog.c:382
+#: ../src/trg-torrent-props-dialog.c:416
+msgid "Normal"
+msgstr "正常"
+
+#: ../src/trg-cell-renderer-priority.c:84
+msgid "Mixed"
+msgstr "混�"
+
+#: ../src/trg-files-tree-view.c:189 ../src/trg-general-panel.c:316
+#: ../src/trg-preferences-dialog.c:653 ../src/trg-torrent-add-dialog.c:284
+#: ../src/trg-torrent-tree-view.c:56
+msgid "Name"
+msgstr "�称"
+
+#. add "size" column
+#: ../src/trg-files-tree-view.c:193 ../src/trg-general-panel.c:319
+#: ../src/trg-torrent-add-dialog.c:302 ../src/trg-torrent-tree-view.c:61
+msgid "Size"
+msgstr "大�"
+
+#: ../src/trg-files-tree-view.c:195 ../src/trg-peers-tree-view.c:74
+msgid "Progress"
+msgstr "进度"
+
+#. add "enabled" column
+#: ../src/trg-files-tree-view.c:197 ../src/trg-torrent-add-dialog.c:315
+#: ../src/trg-torrent-add-dialog.c:665 ../src/trg-files-tree-view-common.c:69
+msgid "Download"
+msgstr "下载"
+
+#. add priority column
+#: ../src/trg-files-tree-view.c:199 ../src/trg-general-panel.c:349
+#: ../src/trg-main-window.c:2068 ../src/trg-torrent-add-dialog.c:331
+#: ../src/trg-torrent-tree-view.c:149
+msgid "Priority"
+msgstr "优先级"
+
+#: ../src/trg-general-panel.c:176 ../src/trg-general-panel.c:250
+#: ../src/trg-torrent-props-dialog.c:344 ../src/util.c:487
+msgid "N/A"
+msgstr "�适用"
+
+#: ../src/trg-general-panel.c:194
+msgid "(Private)"
+msgstr "（�有）"
+
+#: ../src/trg-general-panel.c:194
+msgid "(Public)"
+msgstr "（公共）"
+
+#: ../src/trg-general-panel.c:238 ../src/trg-main-window.c:1142
+#: ../src/trg-main-window.c:1555 ../src/trg-main-window.c:2203
+#: ../src/trg-rss-window.c:207 ../src/trg-rss-window.c:221
+#: ../src/trg-state-selector.c:557 ../src/trg-torrent-add-url-dialog.c:71
+#: ../src/util.c:333
+msgid "Error"
+msgstr "错误"
+
+#: ../src/trg-general-panel.c:321
+msgid "Rate Down"
+msgstr ""
+
+#: ../src/trg-general-panel.c:323 ../src/trg-torrent-tree-view.c:155
+msgid "Completed"
+msgstr "已完�"
+
+#: ../src/trg-general-panel.c:326 ../src/trg-torrent-tree-view.c:127
+msgid "ETA"
+msgstr "估计剩余时间"
+
+#: ../src/trg-general-panel.c:328
+msgid "Rate Up"
+msgstr ""
+
+#: ../src/trg-general-panel.c:330 ../src/trg-torrent-tree-view.c:132
+msgid "Downloaded"
+msgstr "已下载"
+
+#: ../src/trg-general-panel.c:333
+msgid "Seeders"
+msgstr "��者"
+
+#: ../src/trg-general-panel.c:335 ../src/trg-stats-dialog.c:321
+#: ../src/trg-torrent-tree-view.c:135
+msgid "Ratio"
+msgstr "分享率"
+
+#: ../src/trg-general-panel.c:337 ../src/trg-torrent-tree-view.c:129
+msgid "Uploaded"
+msgstr "已上传"
+
+#: ../src/trg-general-panel.c:340 ../src/trg-torrent-tree-view.c:74
+msgid "Leechers"
+msgstr "�血鬼"
+
+#: ../src/trg-general-panel.c:342
+msgid "Ratio limit"
+msgstr "分享比率�制"
+
+#: ../src/trg-general-panel.c:344
+msgid "Corrupted"
+msgstr "已��"
+
+#: ../src/trg-general-panel.c:347 ../src/trg-torrent-tree-view.c:67
+msgid "Status"
+msgstr "状�"
+
+#: ../src/trg-general-panel.c:351
+msgid "Completed At"
+msgstr "完�于"
+
+#: ../src/trg-general-panel.c:354 ../src/trg-torrent-tree-view.c:143
+msgid "Location"
+msgstr "�置"
+
+#: ../src/trg-general-panel.c:357
+msgid "Comment"
+msgstr "注释"
+
+#: ../src/trg-gtk-app.c:183 ../src/trg-peers-tree-view.c:78
+msgid "Client"
+msgstr "客户端"
+
+#: ../src/trg-gtk-app.c:192
+msgid "Min On Start"
+msgstr "�动时最�化"
+
+#: ../src/trg-main-window.c:368
+msgid "This torrent has completed."
+msgstr "这个��已�完�。"
+
+#: ../src/trg-main-window.c:380
+msgid "This torrent has been added."
+msgstr "这个��已被添加。"
+
+#: ../src/trg-main-window.c:610
+msgid "No hostname set"
+msgstr "未设置主机�"
+
+#: ../src/trg-main-window.c:613
+msgid "Unknown error getting settings"
+msgstr "获��置时�生未知错误"
+
+#: ../src/trg-main-window.c:633
+msgid "Connecting..."
+msgstr "正在连接…"
+
+#: ../src/trg-main-window.c:902
+#, c-format
+msgid "<big><b>Remove torrent \"%s\"?</b></big>"
+msgstr "<big><b>移除��“%s�？</b></big>"
+
+#: ../src/trg-main-window.c:903
+#, c-format
+msgid "<big><b>Remove %d torrents?</b></big>"
+msgstr "<big><b>移除 %d 个��？</b></big>"
+
+#: ../src/trg-main-window.c:925
+#, c-format
+msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
+msgstr "<big><b>是�移除项目并删除��“%s�？</b></big>"
+
+#: ../src/trg-main-window.c:927
+#, c-format
+msgid "<big><b>Remove and delete %d torrents?</b></big>"
+msgstr "<big><b>是�移除这些项目并删除这 %d 个��？</b></big>"
+
+#: ../src/trg-main-window.c:1026 ../src/trg-preferences-dialog.c:947
+#: ../src/trg-remote-prefs-dialog.c:697
+msgid "General"
+msgstr "通用"
+
+#: ../src/trg-main-window.c:1035 ../src/trg-torrent-props-dialog.c:621
+msgid "Trackers"
+msgstr "Trackers"
+
+#: ../src/trg-main-window.c:1043 ../src/trg-torrent-props-dialog.c:590
+msgid "Files"
+msgstr "文件"
+
+#: ../src/trg-main-window.c:1051 ../src/trg-remote-prefs-dialog.c:403
+#: ../src/trg-torrent-props-dialog.c:464 ../src/trg-torrent-props-dialog.c:604
+#: ../src/trg-trackers-tree-view.c:194
+msgid "Peers"
+msgstr "节点"
+
+#: ../src/trg-main-window.c:1134
+#, c-format
+msgid "This application supports Transmission %g and later, you have %g."
+msgstr "本应用程��支� Transmission %g 或更新版本，但是您正在使用 %g。"
+
+#: ../src/trg-main-window.c:1200 ../src/trg-status-bar.c:78
+#: ../src/trg-status-bar.c:108
+msgid "Disconnected"
+msgstr "连接已断开"
+
+#: ../src/trg-main-window.c:1245
+#, c-format
+msgid "%d Downloading @ %s"
+msgstr ""
+
+#: ../src/trg-main-window.c:1252
+#, c-format
+msgid "%d Seeding @ %s"
+msgstr ""
+
+#: ../src/trg-main-window.c:1303
+#, c-format
+msgid "Request %d/%d failed: %s"
+msgstr ""
+
+#: ../src/trg-main-window.c:2123
+msgid "No Limit"
+msgstr "无�制"
+
+#: ../src/trg-main-window.c:2224 ../src/trg-menu-bar.c:712
+#: ../src/trg-toolbar.c:228
+msgid "Properties"
+msgstr "属性"
+
+#: ../src/trg-main-window.c:2227 ../src/trg-toolbar.c:221
+msgid "Resume"
+msgstr "继续"
+
+#: ../src/trg-main-window.c:2230 ../src/trg-toolbar.c:224
+msgid "Pause"
+msgstr "暂�"
+
+#: ../src/trg-main-window.c:2233
+msgid "Verify"
+msgstr "校验"
+
+#: ../src/trg-main-window.c:2236
+msgid "Re-announce"
+msgstr "��布"
+
+#: ../src/trg-main-window.c:2239 ../src/trg-torrent-move-dialog.c:122
+#: ../src/trg-torrent-move-dialog.c:129
+msgid "Move"
+msgstr "移动"
+
+#: ../src/trg-main-window.c:2242 ../src/trg-menu-bar.c:743
+#: ../src/trg-toolbar.c:232
+msgid "Remove"
+msgstr "移除"
+
+#: ../src/trg-main-window.c:2245 ../src/trg-menu-bar.c:749
+#: ../src/trg-toolbar.c:236
+msgid "Remove and delete data"
+msgstr "移除并删除数�"
+
+#: ../src/trg-main-window.c:2269 ../src/trg-preferences-dialog.c:957
+msgid "Actions"
+msgstr "�作"
+
+#: ../src/trg-main-window.c:2298 ../src/trg-menu-bar.c:759
+msgid "Start Now"
+msgstr "现在开始"
+
+#: ../src/trg-main-window.c:2301 ../src/trg-menu-bar.c:764
+msgid "Move Up Queue"
+msgstr "�上移动"
+
+#: ../src/trg-main-window.c:2304 ../src/trg-menu-bar.c:771
+msgid "Move Down Queue"
+msgstr "�下移动"
+
+#: ../src/trg-main-window.c:2307 ../src/trg-menu-bar.c:778
+msgid "Bottom Of Queue"
+msgstr "移至队列底部"
+
+#: ../src/trg-main-window.c:2310 ../src/trg-menu-bar.c:782
+msgid "Top Of Queue"
+msgstr "移至队列顶部"
+
+#: ../src/trg-main-window.c:2319 ../src/trg-main-window.c:2402
+msgid "Down Limit"
+msgstr "下载�速"
+
+#: ../src/trg-main-window.c:2324 ../src/trg-main-window.c:2406
+msgid "Up Limit"
+msgstr "上传�速"
+
+#: ../src/trg-main-window.c:2353 ../src/trg-main-window.c:2360
+#: ../src/trg-remote-prefs-dialog.c:501
+msgid "Updating..."
+msgstr "正在更新.…"
+
+#: ../src/trg-main-window.c:2374 ../src/trg-menu-bar.c:671
+#: ../src/trg-toolbar.c:200
+msgid "Connect"
+msgstr "连接"
+
+#: ../src/trg-main-window.c:2381 ../src/trg-toolbar.c:211
+msgid "Disconnect"
+msgstr "断开连接"
+
+#: ../src/trg-main-window.c:2385 ../src/trg-toolbar.c:214
+#: ../src/trg-trackers-tree-view.c:288 ../src/trg-trackers-tree-view.c:315
+msgid "Add"
+msgstr "添加"
+
+#: ../src/trg-main-window.c:2389
+msgid "Add from URL"
+msgstr "从 URL 添加"
+
+#: ../src/trg-main-window.c:2393
+msgid "Resume All"
+msgstr "全部继续"
+
+#: ../src/trg-main-window.c:2397
+msgid "Pause All"
+msgstr "全部暂�"
+
+#: ../src/trg-main-window.c:2413
+msgid "Quit"
+msgstr "退出"
+
+#: ../src/trg-main-window.c:2527 ../src/trg-menu-bar.c:565
+msgid "Graph"
+msgstr "图表"
+
+#: ../src/trg-menu-bar.c:485
+msgid "_View"
+msgstr "查看(_V)"
+
+#: ../src/trg-menu-bar.c:494
+msgid "Transmission Style"
+msgstr "Transmission 风格"
+
+#: ../src/trg-menu-bar.c:504
+msgid "Transmission Compact Style"
+msgstr "Transmission 紧凑风格"
+
+#: ../src/trg-menu-bar.c:514
+msgid "Classic Style"
+msgstr "�典风格"
+
+#: ../src/trg-menu-bar.c:520
+msgid "Sort"
+msgstr "排�"
+
+#: ../src/trg-menu-bar.c:525 ../src/trg-preferences-dialog.c:718
+msgid "State selector"
+msgstr ""
+
+#: ../src/trg-menu-bar.c:531 ../src/trg-preferences-dialog.c:725
+msgid "Directory filters"
+msgstr "目录过滤器"
+
+#: ../src/trg-menu-bar.c:540 ../src/trg-preferences-dialog.c:732
+msgid "Tracker filters"
+msgstr "Tracker 过滤器"
+
+#: ../src/trg-menu-bar.c:549 ../src/trg-preferences-dialog.c:739
+msgid "Directories first"
+msgstr ""
+
+#: ../src/trg-menu-bar.c:557 ../src/trg-preferences-dialog.c:746
+msgid "Torrent Details"
+msgstr "��细节"
+
+#: ../src/trg-menu-bar.c:571
+msgid "_Statistics"
+msgstr "统计信�(_S)"
+
+#: ../src/trg-menu-bar.c:578
+msgid "_RSS"
+msgstr "简易信���(_R)"
+
+#: ../src/trg-menu-bar.c:591
+msgid "_Options"
+msgstr "选项(_O)"
+
+#: ../src/trg-menu-bar.c:597
+msgid "_Local Preferences"
+msgstr "本地首选项(_L)"
+
+#: ../src/trg-menu-bar.c:604
+msgid "_Remote Preferences"
+msgstr "远程首选项(_R)"
+
+#: ../src/trg-menu-bar.c:664
+msgid "_File"
+msgstr "文件(_F)"
+
+#: ../src/trg-menu-bar.c:677
+msgid "_Disconnect"
+msgstr "断开连接(_D)"
+
+#: ../src/trg-menu-bar.c:683
+msgid "_Add"
+msgstr "添加(_A)"
+
+#: ../src/trg-menu-bar.c:688
+msgid "Add from _URL"
+msgstr "从 URL 添加(_U)"
+
+#: ../src/trg-menu-bar.c:694
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: ../src/trg-menu-bar.c:705
+msgid "_Torrent"
+msgstr "��(_T)"
+
+#: ../src/trg-menu-bar.c:717
+msgid "_Resume"
+msgstr "ç»­ä¼ (_R)"
+
+#: ../src/trg-menu-bar.c:722
+msgid "_Pause"
+msgstr "暂�(_P)"
+
+#: ../src/trg-menu-bar.c:727
+msgid "_Verify"
+msgstr "校验(_V)"
+
+#: ../src/trg-menu-bar.c:733
+msgid "Re-_announce"
+msgstr "��布(_A)"
+
+#: ../src/trg-menu-bar.c:738
+msgid "_Move"
+msgstr "移动(_M)"
+
+#: ../src/trg-menu-bar.c:790
+msgid "_Resume All"
+msgstr "全部继续(_R)"
+
+#: ../src/trg-menu-bar.c:796
+msgid "_Pause All"
+msgstr "全部暂�(_P)"
+
+#: ../src/trg-menu-bar.c:808
+msgid "_Help"
+msgstr "帮助(_H)"
+
+#: ../src/trg-menu-bar.c:814
+msgid "_About"
+msgstr "关于(_A)"
+
+#: ../src/trg-peers-tree-view.c:54
+msgid "IP"
+msgstr ""
+
+#: ../src/trg-peers-tree-view.c:58 ../src/trg-trackers-tree-view.c:213
+msgid "Host"
+msgstr "主机"
+
+#: ../src/trg-peers-tree-view.c:63
+msgid "Country"
+msgstr "国家"
+
+#: ../src/trg-peers-tree-view.c:67
+msgid "City"
+msgstr "城市"
+
+#: ../src/trg-peers-tree-view.c:70 ../src/trg-torrent-tree-view.c:121
+msgid "Down Speed"
+msgstr "下载速度"
+
+#: ../src/trg-peers-tree-view.c:72 ../src/trg-torrent-tree-view.c:124
+msgid "Up Speed"
+msgstr "上传速度"
+
+#: ../src/trg-peers-tree-view.c:76
+msgid "Flags"
+msgstr ""
+
+#: ../src/trg-preferences-dialog.c:409
+msgid "Updates"
+msgstr "信�更新"
+
+#: ../src/trg-preferences-dialog.c:411
+msgid "Update active torrents only"
+msgstr "�更新活跃��的信�"
+
+#: ../src/trg-preferences-dialog.c:418
+msgid "Full update every (?) updates"
+msgstr "�（？）次更新进行一次完整更新"
+
+#: ../src/trg-preferences-dialog.c:432
+msgid "Update interval:"
+msgstr "更新间隔："
+
+#: ../src/trg-preferences-dialog.c:436
+msgid "Minimised update interval:"
+msgstr "最�化时的更新间隔："
+
+#: ../src/trg-preferences-dialog.c:441
+msgid "Session update interval:"
+msgstr "会�更新间隔："
+
+#: ../src/trg-preferences-dialog.c:443
+msgid "Torrents"
+msgstr "��"
+
+#: ../src/trg-preferences-dialog.c:445
+msgid "Start paused"
+msgstr "将新添加任务置为暂�状�"
+
+#: ../src/trg-preferences-dialog.c:449
+msgid "Options dialog on add"
+msgstr "为新添加任务打开选项对�框"
+
+#: ../src/trg-preferences-dialog.c:454 ../src/trg-torrent-add-dialog.c:737
+msgid "Delete local .torrent file after adding"
+msgstr "添加�删除本地 .torrent 文件"
+
+#: ../src/trg-preferences-dialog.c:607
+msgid "Commands"
+msgstr "命令"
+
+#: ../src/trg-preferences-dialog.c:617 ../src/trg-preferences-dialog.c:691
+msgid "Label"
+msgstr "标签"
+
+#: ../src/trg-preferences-dialog.c:620
+msgid "Command"
+msgstr "命令"
+
+#: ../src/trg-preferences-dialog.c:643 ../src/trg-preferences-dialog.c:968
+#: ../src/trg-rss-window.c:274
+msgid "RSS Feeds"
+msgstr "RSS Feeds"
+
+#: ../src/trg-preferences-dialog.c:656
+msgid "URL"
+msgstr ""
+
+#: ../src/trg-preferences-dialog.c:681
+msgid "Remote Download Directories"
+msgstr "远程下载目录"
+
+#: ../src/trg-preferences-dialog.c:694
+msgid "Directory"
+msgstr "目录"
+
+#: ../src/trg-preferences-dialog.c:716 ../src/trg-preferences-dialog.c:952
+msgid "View"
+msgstr "视图"
+
+#: ../src/trg-preferences-dialog.c:754
+msgid "Show graph"
+msgstr "显示图表"
+
+#: ../src/trg-preferences-dialog.c:761
+msgid "System Tray"
+msgstr "系统托盘"
+
+#: ../src/trg-preferences-dialog.c:764
+msgid "Show in system tray (needs whitelisting in unity)"
+msgstr "在系统托盘中显示（需�在 unity 中具有白��）"
+
+#: ../src/trg-preferences-dialog.c:766
+msgid "Show in system tray"
+msgstr "在系统托盘显示"
+
+#: ../src/trg-preferences-dialog.c:776
+msgid "Minimise to system tray"
+msgstr "最�化至系统托盘"
+
+#: ../src/trg-preferences-dialog.c:786
+msgid "Notifications"
+msgstr "通知"
+
+#: ../src/trg-preferences-dialog.c:788
+msgid "Torrent added notifications"
+msgstr "��添加通知"
+
+#: ../src/trg-preferences-dialog.c:792
+msgid "Torrent complete notifications"
+msgstr "��完�通知"
+
+#: ../src/trg-preferences-dialog.c:819
+msgid "Profile: "
+msgstr "�置文件： "
+
+#: ../src/trg-preferences-dialog.c:845
+msgid "Name:"
+msgstr "�称："
+
+#: ../src/trg-preferences-dialog.c:850 ../src/trg-preferences-dialog.c:942
+msgid "Connection"
+msgstr "连接"
+
+#: ../src/trg-preferences-dialog.c:853
+msgid "Host:"
+msgstr "主机："
+
+#: ../src/trg-preferences-dialog.c:857
+msgid "Port:"
+msgstr "端�："
+
+#: ../src/trg-preferences-dialog.c:859
+msgid "RPC URL Path:"
+msgstr "RPC URL 路径："
+
+#: ../src/trg-preferences-dialog.c:862
+msgid "Username:"
+msgstr "用户�："
+
+#: ../src/trg-preferences-dialog.c:866
+msgid "Password:"
+msgstr "密�："
+
+#: ../src/trg-preferences-dialog.c:868
+msgid "Automatically connect"
+msgstr "自动连接"
+
+#: ../src/trg-preferences-dialog.c:874
+msgid "SSL"
+msgstr "SSL"
+
+#: ../src/trg-preferences-dialog.c:877
+msgid "Validate SSL Certificate"
+msgstr "验� SSL �书"
+
+#: ../src/trg-preferences-dialog.c:885
+msgid "Timeout:"
+msgstr "超时："
+
+#: ../src/trg-preferences-dialog.c:889
+msgid "Retries:"
+msgstr "�试次数："
+
+#: ../src/trg-preferences-dialog.c:931 ../src/trg-toolbar.c:243
+msgid "Local Preferences"
+msgstr "本地首选项"
+
+#: ../src/trg-preferences-dialog.c:962
+msgid "Directories"
+msgstr "目录"
+
+#: ../src/trg-remote-prefs-dialog.c:309
+msgid "Bandwidth limits"
+msgstr "带宽�制"
+
+#: ../src/trg-remote-prefs-dialog.c:313
+msgid "Down Limit (KiB/s)"
+msgstr "下行�制 (KiB/s)"
+
+#: ../src/trg-remote-prefs-dialog.c:320
+msgid "Up Limit (KiB/s)"
+msgstr "上行�制 (KiB/s)"
+
+#: ../src/trg-remote-prefs-dialog.c:325
+msgid "Alternate limits"
+msgstr "临时�制"
+
+#: ../src/trg-remote-prefs-dialog.c:330
+msgid "Alternate speed limits active"
+msgstr "�用临时速度�制"
+
+#: ../src/trg-remote-prefs-dialog.c:337
+msgid "Alternate time range"
+msgstr "临时�制时间范围"
+
+#: ../src/trg-remote-prefs-dialog.c:344
+msgid "Alternate down limit (KiB/s)"
+msgstr "临时下载�制 (KiB/s)"
+
+#: ../src/trg-remote-prefs-dialog.c:349
+msgid "Alternate up limit (KiB/s)"
+msgstr "临时上传�制 (KiB/s)"
+
+#: ../src/trg-remote-prefs-dialog.c:368
+msgid "Seed ratio limit"
+msgstr "��分享比率�制"
+
+#: ../src/trg-remote-prefs-dialog.c:375
+msgid "Queues"
+msgstr "队列"
+
+#: ../src/trg-remote-prefs-dialog.c:379
+msgid "Download queue size"
+msgstr "下载队列大�"
+
+#: ../src/trg-remote-prefs-dialog.c:387
+msgid "Seed queue size"
+msgstr "��队列大�"
+
+#: ../src/trg-remote-prefs-dialog.c:395
+msgid "Ignore stalled (minutes)"
+msgstr ""
+
+#: ../src/trg-remote-prefs-dialog.c:408
+msgid "Global peer limit"
+msgstr ""
+
+#: ../src/trg-remote-prefs-dialog.c:413
+msgid "Per torrent peer limit"
+msgstr ""
+
+#: ../src/trg-remote-prefs-dialog.c:426
+msgid "Retest"
+msgstr ""
+
+#: ../src/trg-remote-prefs-dialog.c:437
+msgid "Port is <span font_weight=\"bold\" fgcolor=\"darkgreen\">open</span>"
+msgstr ""
+
+#: ../src/trg-remote-prefs-dialog.c:441
+msgid "Port is <span font_weight=\"bold\" fgcolor=\"red\">closed</span>"
+msgstr ""
+
+#: ../src/trg-remote-prefs-dialog.c:457 ../src/trg-remote-prefs-dialog.c:526
+msgid "Port test"
+msgstr "端�测试"
+
+#: ../src/trg-remote-prefs-dialog.c:458
+msgid "Testing..."
+msgstr "正在测试…"
+
+#: ../src/trg-remote-prefs-dialog.c:473 ../src/trg-remote-prefs-dialog.c:581
+msgid "Update"
+msgstr "æ›´æ–°"
+
+#: ../src/trg-remote-prefs-dialog.c:478 ../src/trg-remote-prefs-dialog.c:572
+#, c-format
+msgid "Blocklist (%ld entries)"
+msgstr ""
+
+#: ../src/trg-remote-prefs-dialog.c:520 ../src/trg-remote-prefs-dialog.c:702
+msgid "Connections"
+msgstr "连接"
+
+#: ../src/trg-remote-prefs-dialog.c:524
+msgid "Peer port"
+msgstr ""
+
+#: ../src/trg-remote-prefs-dialog.c:527
+msgid "Test"
+msgstr "测试"
+
+#: ../src/trg-remote-prefs-dialog.c:531
+msgid "Required"
+msgstr "必需"
+
+#: ../src/trg-remote-prefs-dialog.c:532
+msgid "Preferred"
+msgstr "�好"
+
+#: ../src/trg-remote-prefs-dialog.c:533
+msgid "Tolerated"
+msgstr "容�"
+
+#: ../src/trg-remote-prefs-dialog.c:544
+msgid "Encryption"
+msgstr "加密"
+
+#: ../src/trg-remote-prefs-dialog.c:548
+msgid "Random peer port on start"
+msgstr ""
+
+#: ../src/trg-remote-prefs-dialog.c:553
+msgid "Peer port forwarding"
+msgstr ""
+
+#: ../src/trg-remote-prefs-dialog.c:556
+msgid "Protocol"
+msgstr "�议"
+
+#: ../src/trg-remote-prefs-dialog.c:559
+msgid "Peer exchange (PEX)"
+msgstr ""
+
+#: ../src/trg-remote-prefs-dialog.c:563
+msgid "Distributed Hash Table (DHT)"
+msgstr "分布�哈希表（DHT）"
+
+#: ../src/trg-remote-prefs-dialog.c:567
+msgid "Local peer discovery"
+msgstr ""
+
+#: ../src/trg-remote-prefs-dialog.c:570
+msgid "Blocklist"
+msgstr "黑��"
+
+#: ../src/trg-remote-prefs-dialog.c:590
+msgid "Blocklist URL:"
+msgstr ""
+
+#: ../src/trg-remote-prefs-dialog.c:608
+msgid "Environment"
+msgstr "�行环境"
+
+#: ../src/trg-remote-prefs-dialog.c:612
+msgid "Download directory"
+msgstr "下载目录"
+
+#: ../src/trg-remote-prefs-dialog.c:616
+msgid "Incomplete download dir"
+msgstr "未完�下载目录"
+
+#: ../src/trg-remote-prefs-dialog.c:623
+msgid "Torrent done script"
+msgstr "��完���行脚本"
+
+#: ../src/trg-remote-prefs-dialog.c:632
+msgid "Cache size (MiB)"
+msgstr "缓存大� (MiB)"
+
+#: ../src/trg-remote-prefs-dialog.c:635
+msgid "Behavior"
+msgstr "行为"
+
+#: ../src/trg-remote-prefs-dialog.c:639
+msgid "Rename partial files"
+msgstr "�命�部分完�的文件"
+
+#: ../src/trg-remote-prefs-dialog.c:644
+msgid "Trash original torrent files"
+msgstr "删除原始��文件"
+
+#: ../src/trg-remote-prefs-dialog.c:649
+msgid "Start added torrents"
+msgstr "添加���立�开始任务"
+
+#: ../src/trg-remote-prefs-dialog.c:675 ../src/trg-toolbar.c:247
+msgid "Remote Preferences"
+msgstr "远程首选项"
+
+#: ../src/trg-remote-prefs-dialog.c:707 ../src/trg-torrent-props-dialog.c:408
+msgid "Bandwidth"
+msgstr "带宽"
+
+#: ../src/trg-remote-prefs-dialog.c:712 ../src/trg-torrent-props-dialog.c:635
+msgid "Limits"
+msgstr "�制"
+
+#: ../src/trg-rss-window.c:197 ../src/util.c:351
+#, c-format
+msgid "Request failed with HTTP code %d"
+msgstr ""
+
+#: ../src/trg-rss-window.c:214
+#, c-format
+msgid "Error parsing RSS feed \"%s\": %s"
+msgstr ""
+
+#: ../src/trg-state-selector.c:675
+msgid "All"
+msgstr "全部"
+
+#: ../src/trg-state-selector.c:680 ../src/trg-state-selector.c:753
+msgid "Queue Down"
+msgstr ""
+
+#: ../src/trg-state-selector.c:687 ../src/trg-state-selector.c:757
+msgid "Queue Up"
+msgstr ""
+
+#: ../src/trg-state-selector.c:694
+msgid "Complete"
+msgstr "已完�"
+
+#: ../src/trg-state-selector.c:697
+msgid "Incomplete"
+msgstr "未完�"
+
+#: ../src/trg-state-selector.c:700
+msgid "Active"
+msgstr "活跃"
+
+#: ../src/trg-stats-dialog.c:296
+msgid "Statistics"
+msgstr "统计信�"
+
+#: ../src/trg-stats-dialog.c:315
+msgid "Version"
+msgstr "版本"
+
+#: ../src/trg-stats-dialog.c:317
+msgid "Download Total"
+msgstr "下载总计"
+
+#: ../src/trg-stats-dialog.c:319
+msgid "Upload Total"
+msgstr "上传总计"
+
+#: ../src/trg-stats-dialog.c:323
+msgid "Files Added"
+msgstr "文件已添加"
+
+#: ../src/trg-stats-dialog.c:325
+msgid "Session Count"
+msgstr ""
+
+#: ../src/trg-stats-dialog.c:327
+msgid "Time Active"
+msgstr ""
+
+#: ../src/trg-stats-dialog.c:332
+msgid "Statistic"
+msgstr ""
+
+#: ../src/trg-stats-dialog.c:334
+msgid "Session"
+msgstr "会�"
+
+#: ../src/trg-stats-dialog.c:337
+msgid "Cumulative"
+msgstr ""
+
+#: ../src/trg-status-bar.c:145
+#, c-format
+msgid "Connected: %s :: Transmission %s"
+msgstr "已连接：%s :: Transmission %s"
+
+#: ../src/trg-status-bar.c:163
+msgid "Updating torrents..."
+msgstr ""
+
+#: ../src/trg-status-bar.c:176
+#, c-format
+msgid "Free space: %s"
+msgstr "�用空间：%s"
+
+#: ../src/trg-status-bar.c:188
+msgid "Disable alternate speed limits"
+msgstr ""
+
+#: ../src/trg-status-bar.c:189
+msgid "Enable alternate speed limits"
+msgstr ""
+
+#: ../src/trg-status-bar.c:226 ../src/trg-status-bar.c:233
+#, c-format
+msgid " (Limit: %s)"
+msgstr "（�制：%s）"
+
+#: ../src/trg-status-bar.c:238
+#, c-format
+msgid "Down: %s%s, Up: %s%s"
+msgstr "下载：%s%s，上传：%s%s"
+
+#: ../src/trg-torrent-add-dialog.c:392
+msgid "Torrent files"
+msgstr "��文件"
+
+#: ../src/trg-torrent-add-dialog.c:397
+msgid "All files"
+msgstr "所有文件"
+
+#: ../src/trg-torrent-add-dialog.c:432
+msgid ""
+"Unable to parse torrent file. File preferences unavailable, but you can "
+"still try uploading it."
+msgstr ""
+
+#: ../src/trg-torrent-add-dialog.c:445
+#, c-format
+msgid "Unable to open torrent file: %s"
+msgstr ""
+
+#: ../src/trg-torrent-add-dialog.c:538
+msgid "(None)"
+msgstr "（无）"
+
+#: ../src/trg-torrent-add-dialog.c:540
+msgid "(Multiple)"
+msgstr ""
+
+#: ../src/trg-torrent-add-dialog.c:563
+msgid "Add a Torrent"
+msgstr "添加一个��"
+
+#: ../src/trg-torrent-add-dialog.c:656 ../src/trg-files-tree-view-common.c:54
+msgid "High Priority"
+msgstr "高优先级"
+
+#: ../src/trg-torrent-add-dialog.c:659 ../src/trg-files-tree-view-common.c:58
+msgid "Normal Priority"
+msgstr "普通优先级"
+
+#: ../src/trg-torrent-add-dialog.c:662 ../src/trg-files-tree-view-common.c:62
+msgid "Low Priority"
+msgstr "低优先级"
+
+#: ../src/trg-torrent-add-dialog.c:668 ../src/trg-files-tree-view-common.c:73
+msgid "Skip"
+msgstr "跳过"
+
+#. window
+#: ../src/trg-torrent-add-dialog.c:707
+msgid "Add Torrent"
+msgstr "添加��"
+
+#: ../src/trg-torrent-add-dialog.c:730
+msgid "Start _paused"
+msgstr "�动已暂�的任务(_P)"
+
+#: ../src/trg-torrent-add-dialog.c:747
+msgid "_Torrent file:"
+msgstr "��文件(_T)："
+
+#: ../src/trg-torrent-add-dialog.c:766
+msgid "_Destination folder:"
+msgstr "目标文件夹(_D)："
+
+#: ../src/trg-torrent-add-dialog.c:775
+msgid "Apply to all:"
+msgstr ""
+
+#: ../src/trg-torrent-add-dialog.c:777
+msgid "Torrent _priority:"
+msgstr "��优先级(_P)："
+
+#: ../src/trg-torrent-add-dialog.c:893
+msgid "Show _options dialog"
+msgstr "显示选项对�框(_O)"
+
+#: ../src/trg-torrent-add-url-dialog.c:65
+msgid ""
+"You are trying to add a magnet torrent, but DHT is disabled. Distributed "
+"Hash Table (DHT) should be enabled in remote settings."
+msgstr ""
+
+#: ../src/trg-torrent-add-url-dialog.c:124
+msgid "URL:"
+msgstr ""
+
+#: ../src/trg-torrent-add-url-dialog.c:127
+msgid "Start Paused"
+msgstr "将新添加任务置为暂�状�"
+
+#: ../src/trg-torrent-add-url-dialog.c:130
+msgid "Add torrent from URL"
+msgstr "从 URL 地�添加��"
+
+#: ../src/trg-torrent-graph.c:415
+msgid "Total Uploading"
+msgstr "上传总计"
+
+#: ../src/trg-torrent-graph.c:423
+msgid "Total Downloading"
+msgstr "下载总计"
+
+#: ../src/trg-torrent-model.c:407
+msgid "Default"
+msgstr "默认"
+
+#: ../src/trg-torrent-move-dialog.c:119 ../src/trg-torrent-props-dialog.c:255
+msgid "Location:"
+msgstr ""
+
+#: ../src/trg-torrent-move-dialog.c:166
+#, c-format
+msgid "Move %s"
+msgstr ""
+
+#: ../src/trg-torrent-move-dialog.c:168
+#, c-format
+msgid "Move %d torrents"
+msgstr ""
+
+#: ../src/trg-torrent-props-dialog.c:201
+msgid "Activity"
+msgstr "活动"
+
+#: ../src/trg-torrent-props-dialog.c:206
+msgid "Torrent size:"
+msgstr "��大�："
+
+#: ../src/trg-torrent-props-dialog.c:211
+msgid "Have:"
+msgstr ""
+
+#: ../src/trg-torrent-props-dialog.c:216
+msgid "Downloaded:"
+msgstr "已下载："
+
+#: ../src/trg-torrent-props-dialog.c:221
+msgid "Uploaded:"
+msgstr "已上传："
+
+#: ../src/trg-torrent-props-dialog.c:226
+msgid "State:"
+msgstr "状�："
+
+#: ../src/trg-torrent-props-dialog.c:231
+msgid "Running time:"
+msgstr "�行时间："
+
+#: ../src/trg-torrent-props-dialog.c:236
+msgid "Remaining time:"
+msgstr "剩余时间："
+
+#: ../src/trg-torrent-props-dialog.c:241
+msgid "Last activity:"
+msgstr "上次活动："
+
+#: ../src/trg-torrent-props-dialog.c:246
+msgid "Error:"
+msgstr "错误："
+
+#: ../src/trg-torrent-props-dialog.c:250
+msgid "Details"
+msgstr "详细信�"
+
+#: ../src/trg-torrent-props-dialog.c:261
+msgid "Hash:"
+msgstr ""
+
+#: ../src/trg-torrent-props-dialog.c:267
+msgid "Privacy:"
+msgstr ""
+
+#: ../src/trg-torrent-props-dialog.c:273
+msgid "Origin:"
+msgstr ""
+
+#: ../src/trg-torrent-props-dialog.c:290
+msgid "Comment:"
+msgstr "备注："
+
+#: ../src/trg-torrent-props-dialog.c:325
+msgid "Private to this tracker -- DHT and PEX disabled"
+msgstr ""
+
+#: ../src/trg-torrent-props-dialog.c:327
+msgid "Public torrent"
+msgstr "公共��"
+
+#: ../src/trg-torrent-props-dialog.c:337
+#, c-format
+msgid "Created by %1$s on %2$s"
+msgstr ""
+
+#: ../src/trg-torrent-props-dialog.c:340
+#, c-format
+msgid "Created on %1$s"
+msgstr ""
+
+#: ../src/trg-torrent-props-dialog.c:342
+#, c-format
+msgid "Created by %1$s"
+msgstr ""
+
+#: ../src/trg-torrent-props-dialog.c:375
+msgid "No errors"
+msgstr "无错误"
+
+#: ../src/trg-torrent-props-dialog.c:379
+msgid "Active now"
+msgstr "当�活跃"
+
+#: ../src/trg-torrent-props-dialog.c:412
+msgid "Honor global limits"
+msgstr ""
+
+#: ../src/trg-torrent-props-dialog.c:422
+msgid "Torrent priority:"
+msgstr "��优先级："
+
+#: ../src/trg-torrent-props-dialog.c:428
+msgid "Queue Position:"
+msgstr "队列�置："
+
+#: ../src/trg-torrent-props-dialog.c:433
+msgid "Limit download speed (KiB/s)"
+msgstr "下载速度�制（KiB/s）"
+
+#: ../src/trg-torrent-props-dialog.c:441
+msgid "Limit upload speed (KiB/s)"
+msgstr "上传速度�制（KiB/s）"
+
+#: ../src/trg-torrent-props-dialog.c:449
+msgid "Use global settings"
+msgstr "使用全局设置"
+
+#: ../src/trg-torrent-props-dialog.c:450
+msgid "Stop seeding at ratio"
+msgstr "达到指定比率��止��"
+
+#: ../src/trg-torrent-props-dialog.c:451
+msgid "Seed regardless of ratio"
+msgstr "无视比率进行��"
+
+#: ../src/trg-torrent-props-dialog.c:454
+msgid "Seed ratio mode:"
+msgstr ""
+
+#: ../src/trg-torrent-props-dialog.c:462
+msgid "Seed ratio limit:"
+msgstr "��比率�制："
+
+#: ../src/trg-torrent-props-dialog.c:468
+msgid "Peer limit:"
+msgstr ""
+
+#: ../src/trg-torrent-props-dialog.c:541
+#, c-format
+msgid "Multiple (%d) torrent properties"
+msgstr ""
+
+#: ../src/trg-torrent-props-dialog.c:573
+msgid "Information"
+msgstr "信�"
+
+#: ../src/trg-torrent-tree-view.c:64
+msgid "Done"
+msgstr ""
+
+#: ../src/trg-torrent-tree-view.c:69
+msgid "Seeds"
+msgstr ""
+
+#: ../src/trg-torrent-tree-view.c:71
+msgid "Sending"
+msgstr "正在��"
+
+#: ../src/trg-torrent-tree-view.c:77
+msgid "Downloads"
+msgstr "下载内容"
+
+#: ../src/trg-torrent-tree-view.c:80
+msgid "Receiving"
+msgstr "正在接收"
+
+#: ../src/trg-torrent-tree-view.c:84
+msgid "Connected"
+msgstr "已连接"
+
+#: ../src/trg-torrent-tree-view.c:86
+msgid "PEX Peers"
+msgstr ""
+
+#: ../src/trg-torrent-tree-view.c:91
+msgid "DHT Peers"
+msgstr ""
+
+#: ../src/trg-torrent-tree-view.c:97
+msgid "Tracker Peers"
+msgstr ""
+
+#: ../src/trg-torrent-tree-view.c:101
+msgid "LTEP Peers"
+msgstr ""
+
+#: ../src/trg-torrent-tree-view.c:106
+msgid "Resumed Peers"
+msgstr ""
+
+#: ../src/trg-torrent-tree-view.c:112
+msgid "Incoming Peers"
+msgstr ""
+
+#: ../src/trg-torrent-tree-view.c:117
+msgid "Peers T/I/E/H/X/L/R"
+msgstr ""
+
+#: ../src/trg-torrent-tree-view.c:137
+msgid "Added"
+msgstr "已添加"
+
+#: ../src/trg-torrent-tree-view.c:140
+msgid "First Tracker"
+msgstr ""
+
+#: ../src/trg-torrent-tree-view.c:146
+msgid "ID"
+msgstr ""
+
+#: ../src/trg-torrent-tree-view.c:152
+msgid "Queue Position"
+msgstr ""
+
+#: ../src/trg-torrent-tree-view.c:158
+msgid "Last Active"
+msgstr ""
+
+#: ../src/trg-trackers-tree-view.c:172
+msgid "Tier"
+msgstr ""
+
+#: ../src/trg-trackers-tree-view.c:178
+msgid "Announce URL"
+msgstr ""
+
+#: ../src/trg-trackers-tree-view.c:196
+msgid "Seeder Count"
+msgstr ""
+
+#: ../src/trg-trackers-tree-view.c:199
+msgid "Leecher Count"
+msgstr ""
+
+#: ../src/trg-trackers-tree-view.c:203
+msgid "Last Announce"
+msgstr ""
+
+#: ../src/trg-trackers-tree-view.c:206
+msgid "Last Result"
+msgstr ""
+
+#: ../src/trg-trackers-tree-view.c:208
+msgid "Scrape URL"
+msgstr ""
+
+#: ../src/trg-trackers-tree-view.c:210
+msgid "Last Scrape"
+msgstr ""
+
+#: ../src/trg-trackers-tree-view.c:309
+msgid "Delete"
+msgstr ""
+
+#: ../src/trg-tree-view.c:281
+msgid "Ascending"
+msgstr "��"
+
+#: ../src/trg-tree-view.c:291
+msgid "Descending"
+msgstr "��"
+
+#: ../src/trg-files-tree-view-common.c:80
+msgid "Expand All"
+msgstr "全部展开"
+
+#: ../src/trg-files-tree-view-common.c:85
+msgid "Collapse All"
+msgstr "全部收起"
+
+#: ../src/util.c:46
+msgid "KiB"
+msgstr ""
+
+#: ../src/util.c:47
+msgid "MiB"
+msgstr ""
+
+#: ../src/util.c:48
+msgid "GiB"
+msgstr ""
+
+#: ../src/util.c:49
+msgid "TiB"
+msgstr ""
+
+#: ../src/util.c:52
+msgid "KiB/s"
+msgstr ""
+
+#: ../src/util.c:53
+msgid "MiB/s"
+msgstr ""
+
+#: ../src/util.c:54
+msgid "GiB/s"
+msgstr ""
+
+#: ../src/util.c:55
+msgid "TiB/s"
+msgstr ""
+
+#: ../src/util.c:342
+msgid "JSON decoding error."
+msgstr "JSON 解�错误。"
+
+#: ../src/util.c:347
+msgid "Server responded, but with no result."
+msgstr "�务器已回应，但是没有给出结果。"
+
+#: ../src/util.c:385 ../src/util.c:531
+msgid "None"
+msgstr "æ— "
+
+#: ../src/util.c:431
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d 天"
+
+#: ../src/util.c:432
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d �时"
+
+#: ../src/util.c:434
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d 分钟"
+
+#: ../src/util.c:437
+#, c-format
+msgid "%ld second"
+msgid_plural "%ld seconds"
+msgstr[0] "%ld 秒"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e3b2465..cc5965d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: transmission-remote-gtk\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-09-05 22:09+0100\n"
+"POT-Creation-Date: 2013-06-09 23:41+0100\n"
 "PO-Revision-Date: 2012-10-22 07:06+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2013-06-09 22:28+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2014-06-12 07:44+0000\n"
+"X-Generator: Launchpad (build 17045)\n"
 
 #: src/torrent.c:360 src/torrent.c:380
 msgid "Metadata Downloading"
@@ -43,7 +43,7 @@ msgid "Queued seed"
 msgstr "已排隊的種�"
 
 #: src/torrent.c:372 src/torrent.c:386 src/trg-remote-prefs-dialog.c:360
-#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:447
+#: src/trg-state-selector.c:665 src/trg-torrent-props-dialog.c:438
 msgid "Seeding"
 msgstr "作種中"
 
@@ -153,18 +153,18 @@ msgstr[0] "正在�種給 %2$li 個中的 %1$li 個已連線用戶"
 msgid "A remote client to transmission-daemon."
 msgstr "一個 transmission-daemon 的�端客戶端"
 
-#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2011
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:416
+#: src/trg-cell-renderer-priority.c:74 src/trg-main-window.c:2025
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:407
 msgid "Low"
 msgstr "低"
 
-#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2007
-#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:418
+#: src/trg-cell-renderer-priority.c:76 src/trg-main-window.c:2021
+#: src/trg-torrent-add-dialog.c:451 src/trg-torrent-props-dialog.c:409
 msgid "High"
 msgstr "高"
 
-#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2009
-#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:417
+#: src/trg-cell-renderer-priority.c:78 src/trg-main-window.c:2023
+#: src/trg-torrent-add-dialog.c:450 src/trg-torrent-props-dialog.c:408
 msgid "Normal"
 msgstr "一般"
 
@@ -172,12 +172,12 @@ msgstr "一般"
 msgid "Mixed"
 msgstr ""
 
-#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:280
+#: src/trg-files-tree-view.c:185 src/trg-general-panel.c:278
 #: src/trg-torrent-add-dialog.c:348 src/trg-torrent-tree-view.c:52
 msgid "Name"
 msgstr "�稱"
 
-#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:283
+#: src/trg-files-tree-view.c:189 src/trg-general-panel.c:281
 #: src/trg-torrent-add-dialog.c:366 src/trg-torrent-tree-view.c:57
 msgid "Size"
 msgstr "大�"
@@ -191,7 +191,7 @@ msgstr "進度"
 msgid "Download"
 msgstr "下載"
 
-#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2000
+#: src/trg-files-tree-view.c:195 src/trg-main-window.c:2014
 #: src/trg-torrent-add-dialog.c:395 src/trg-torrent-tree-view.c:145
 msgid "Priority"
 msgstr "優先權"
@@ -220,7 +220,7 @@ msgstr ""
 msgid "Collapse All"
 msgstr ""
 
-#: src/trg-general-panel.c:153 src/trg-general-panel.c:214
+#: src/trg-general-panel.c:153 src/trg-general-panel.c:212
 msgid "N/A"
 msgstr ""
 
@@ -232,62 +232,62 @@ msgstr ""
 msgid "(Public)"
 msgstr ""
 
-#: src/trg-general-panel.c:202 src/trg-main-window.c:1097
-#: src/trg-main-window.c:1505 src/trg-main-window.c:2135
+#: src/trg-general-panel.c:200 src/trg-main-window.c:1106
+#: src/trg-main-window.c:1519 src/trg-main-window.c:2149
 #: src/trg-state-selector.c:538 src/trg-torrent-add-url-dialog.c:67
-#: src/util.c:331
+#: src/util.c:333
 msgid "Error"
 msgstr ""
 
-#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:123
+#: src/trg-general-panel.c:283 src/trg-torrent-tree-view.c:123
 msgid "ETA"
 msgstr "�估剩餘時間"
 
-#: src/trg-general-panel.c:287 src/trg-torrent-tree-view.c:151
+#: src/trg-general-panel.c:285 src/trg-torrent-tree-view.c:151
 msgid "Completed"
 msgstr "已完�"
 
-#: src/trg-general-panel.c:290
+#: src/trg-general-panel.c:288
 msgid "Seeders"
 msgstr "種�數"
 
-#: src/trg-general-panel.c:292
+#: src/trg-general-panel.c:290
 msgid "Rate Down"
 msgstr "下載速率"
 
-#: src/trg-general-panel.c:294 src/trg-torrent-tree-view.c:128
+#: src/trg-general-panel.c:292 src/trg-torrent-tree-view.c:128
 msgid "Downloaded"
 msgstr "已下載"
 
-#: src/trg-general-panel.c:297 src/trg-torrent-tree-view.c:70
+#: src/trg-general-panel.c:295 src/trg-torrent-tree-view.c:70
 msgid "Leechers"
 msgstr "下載數"
 
-#: src/trg-general-panel.c:299
+#: src/trg-general-panel.c:297
 msgid "Rate Up"
 msgstr "上傳速率"
 
-#: src/trg-general-panel.c:301 src/trg-torrent-tree-view.c:125
+#: src/trg-general-panel.c:299 src/trg-torrent-tree-view.c:125
 msgid "Uploaded"
 msgstr ""
 
-#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:63
+#: src/trg-general-panel.c:302 src/trg-torrent-tree-view.c:63
 msgid "Status"
 msgstr "狀態"
 
-#: src/trg-general-panel.c:306 src/trg-torrent-tree-view.c:131
+#: src/trg-general-panel.c:304 src/trg-torrent-tree-view.c:131
 msgid "Ratio"
 msgstr "分享率"
 
-#: src/trg-general-panel.c:309
+#: src/trg-general-panel.c:307
 msgid "Comment"
 msgstr "備註"
 
-#: src/trg-general-panel.c:312
+#: src/trg-general-panel.c:310
 msgid "Completed At"
 msgstr "完�時間"
 
-#: src/trg-general-panel.c:316 src/trg-torrent-tree-view.c:139
+#: src/trg-general-panel.c:314 src/trg-torrent-tree-view.c:139
 msgid "Location"
 msgstr "�置"
 
@@ -299,189 +299,189 @@ msgstr "這個種�已經完�。"
 msgid "This torrent has been added."
 msgstr "這個種�已經被加入。"
 
-#: src/trg-main-window.c:596
+#: src/trg-main-window.c:600
 msgid "No hostname set"
 msgstr ""
 
-#: src/trg-main-window.c:599
+#: src/trg-main-window.c:603
 msgid "Unknown error getting settings"
 msgstr ""
 
-#: src/trg-main-window.c:614
+#: src/trg-main-window.c:623
 msgid "Connecting..."
 msgstr "正在連線..."
 
-#: src/trg-main-window.c:873
+#: src/trg-main-window.c:882
 #, c-format
 msgid "<big><b>Remove torrent \"%s\"?</b></big>"
 msgstr "<big><b>�移除種� \"%s\"嗎？</b></big>"
 
-#: src/trg-main-window.c:874
+#: src/trg-main-window.c:883
 #, c-format
 msgid "<big><b>Remove %d torrents?</b></big>"
 msgstr "<big><b>�移除 %d 個種�嗎？</b></big>"
 
-#: src/trg-main-window.c:896
+#: src/trg-main-window.c:905
 #, c-format
 msgid "<big><b>Remove and delete torrent \"%s\"?</b></big>"
 msgstr ""
 
-#: src/trg-main-window.c:898
+#: src/trg-main-window.c:907
 #, c-format
 msgid "<big><b>Remove and delete %d torrents?</b></big>"
 msgstr ""
 
-#: src/trg-main-window.c:981 src/trg-preferences-dialog.c:897
+#: src/trg-main-window.c:990 src/trg-preferences-dialog.c:899
 #: src/trg-remote-prefs-dialog.c:693
 msgid "General"
 msgstr "一般"
 
-#: src/trg-main-window.c:990 src/trg-torrent-props-dialog.c:622
+#: src/trg-main-window.c:999 src/trg-torrent-props-dialog.c:613
 msgid "Trackers"
 msgstr "追蹤器"
 
-#: src/trg-main-window.c:998 src/trg-torrent-props-dialog.c:591
+#: src/trg-main-window.c:1007 src/trg-torrent-props-dialog.c:582
 msgid "Files"
 msgstr "檔案"
 
-#: src/trg-main-window.c:1006 src/trg-remote-prefs-dialog.c:399
-#: src/trg-torrent-props-dialog.c:465 src/trg-torrent-props-dialog.c:605
+#: src/trg-main-window.c:1015 src/trg-remote-prefs-dialog.c:399
+#: src/trg-torrent-props-dialog.c:456 src/trg-torrent-props-dialog.c:596
 #: src/trg-trackers-tree-view.c:190
 msgid "Peers"
 msgstr "用戶"
 
-#: src/trg-main-window.c:1089
+#: src/trg-main-window.c:1098
 #, c-format
 msgid "This application supports Transmission %g and later, you have %g."
 msgstr ""
 
-#: src/trg-main-window.c:1155 src/trg-status-bar.c:74 src/trg-status-bar.c:104
+#: src/trg-main-window.c:1164 src/trg-status-bar.c:74 src/trg-status-bar.c:104
 msgid "Disconnected"
 msgstr "已斷線"
 
-#: src/trg-main-window.c:1200
+#: src/trg-main-window.c:1209
 #, c-format
 msgid "%d Downloading @ %s"
 msgstr ""
 
-#: src/trg-main-window.c:1207
+#: src/trg-main-window.c:1216
 #, c-format
 msgid "%d Seeding @ %s"
 msgstr ""
 
-#: src/trg-main-window.c:1258
+#: src/trg-main-window.c:1267
 #, c-format
 msgid "Request %d/%d failed: %s"
 msgstr ""
 
-#: src/trg-main-window.c:2055
+#: src/trg-main-window.c:2069
 msgid "No Limit"
 msgstr ""
 
-#: src/trg-main-window.c:2156 src/trg-menu-bar.c:675 src/trg-toolbar.c:223
+#: src/trg-main-window.c:2170 src/trg-menu-bar.c:675 src/trg-toolbar.c:224
 msgid "Properties"
 msgstr ""
 
-#: src/trg-main-window.c:2159 src/trg-toolbar.c:216
+#: src/trg-main-window.c:2173 src/trg-toolbar.c:217
 msgid "Resume"
 msgstr ""
 
-#: src/trg-main-window.c:2162 src/trg-toolbar.c:219
+#: src/trg-main-window.c:2176 src/trg-toolbar.c:220
 msgid "Pause"
 msgstr "暫�"
 
-#: src/trg-main-window.c:2165
+#: src/trg-main-window.c:2179
 msgid "Verify"
 msgstr "æ ¡é©—"
 
-#: src/trg-main-window.c:2168
+#: src/trg-main-window.c:2182
 msgid "Re-announce"
 msgstr "�新發佈"
 
-#: src/trg-main-window.c:2171 src/trg-torrent-move-dialog.c:119
+#: src/trg-main-window.c:2185 src/trg-torrent-move-dialog.c:119
 #: src/trg-torrent-move-dialog.c:126
 msgid "Move"
 msgstr ""
 
-#: src/trg-main-window.c:2174 src/trg-menu-bar.c:706 src/trg-toolbar.c:227
+#: src/trg-main-window.c:2188 src/trg-menu-bar.c:706 src/trg-toolbar.c:228
 msgid "Remove"
 msgstr ""
 
-#: src/trg-main-window.c:2177
+#: src/trg-main-window.c:2191
 msgid "Remove & Delete"
 msgstr ""
 
-#: src/trg-main-window.c:2201 src/trg-preferences-dialog.c:907
+#: src/trg-main-window.c:2215 src/trg-preferences-dialog.c:909
 msgid "Actions"
 msgstr ""
 
-#: src/trg-main-window.c:2230 src/trg-menu-bar.c:722
+#: src/trg-main-window.c:2244 src/trg-menu-bar.c:722
 msgid "Start Now"
 msgstr ""
 
-#: src/trg-main-window.c:2233 src/trg-menu-bar.c:727
+#: src/trg-main-window.c:2247 src/trg-menu-bar.c:727
 msgid "Move Up Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2236 src/trg-menu-bar.c:734
+#: src/trg-main-window.c:2250 src/trg-menu-bar.c:734
 msgid "Move Down Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2239 src/trg-menu-bar.c:741
+#: src/trg-main-window.c:2253 src/trg-menu-bar.c:741
 msgid "Bottom Of Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2242 src/trg-menu-bar.c:745
+#: src/trg-main-window.c:2256 src/trg-menu-bar.c:745
 msgid "Top Of Queue"
 msgstr ""
 
-#: src/trg-main-window.c:2251 src/trg-main-window.c:2334
+#: src/trg-main-window.c:2265 src/trg-main-window.c:2348
 msgid "Down Limit"
 msgstr ""
 
-#: src/trg-main-window.c:2256 src/trg-main-window.c:2338
+#: src/trg-main-window.c:2270 src/trg-main-window.c:2352
 msgid "Up Limit"
 msgstr ""
 
-#: src/trg-main-window.c:2285 src/trg-main-window.c:2292
+#: src/trg-main-window.c:2299 src/trg-main-window.c:2306
 #: src/trg-remote-prefs-dialog.c:497
 msgid "Updating..."
 msgstr ""
 
-#: src/trg-main-window.c:2306 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
+#: src/trg-main-window.c:2320 src/trg-menu-bar.c:634 src/trg-toolbar.c:196
 msgid "Connect"
 msgstr "連線"
 
-#: src/trg-main-window.c:2313 src/trg-toolbar.c:206
+#: src/trg-main-window.c:2327 src/trg-toolbar.c:207
 msgid "Disconnect"
 msgstr "æ–·ç·š"
 
-#: src/trg-main-window.c:2317 src/trg-toolbar.c:209
+#: src/trg-main-window.c:2331 src/trg-toolbar.c:210
 #: src/trg-trackers-tree-view.c:284 src/trg-trackers-tree-view.c:311
 msgid "Add"
 msgstr "加入"
 
-#: src/trg-main-window.c:2321
+#: src/trg-main-window.c:2335
 msgid "Add from URL"
 msgstr "從網�加入"
 
-#: src/trg-main-window.c:2325
+#: src/trg-main-window.c:2339
 msgid "Resume All"
 msgstr ""
 
-#: src/trg-main-window.c:2329
+#: src/trg-main-window.c:2343
 msgid "Pause All"
 msgstr "全部暫�"
 
-#: src/trg-main-window.c:2345
+#: src/trg-main-window.c:2359
 msgid "Quit"
 msgstr "��"
 
-#: src/trg-main-window.c:2459 src/trg-menu-bar.c:536
+#: src/trg-main-window.c:2473 src/trg-menu-bar.c:536
 msgid "Graph"
 msgstr "圖表"
 
-#: src/trg-main-window.c:2647
+#: src/trg-main-window.c:2662
 msgid "Transmission Remote"
 msgstr ""
 
@@ -689,7 +689,7 @@ msgstr "�端下載目錄"
 msgid "Directory"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:902
+#: src/trg-preferences-dialog.c:673 src/trg-preferences-dialog.c:904
 msgid "View"
 msgstr "檢視"
 
@@ -729,7 +729,7 @@ msgstr ""
 msgid "Name:"
 msgstr "�稱："
 
-#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:892
+#: src/trg-preferences-dialog.c:807 src/trg-preferences-dialog.c:894
 msgid "Connection"
 msgstr "連線"
 
@@ -741,35 +741,39 @@ msgstr ""
 msgid "Port:"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:817
+#: src/trg-preferences-dialog.c:816
+msgid "RPC URL Path:"
+msgstr ""
+
+#: src/trg-preferences-dialog.c:819
 msgid "Username:"
 msgstr "使用者�稱："
 
-#: src/trg-preferences-dialog.c:821
+#: src/trg-preferences-dialog.c:823
 msgid "Password:"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:823
+#: src/trg-preferences-dialog.c:825
 msgid "Automatically connect"
 msgstr "自動連線"
 
-#: src/trg-preferences-dialog.c:829
+#: src/trg-preferences-dialog.c:831
 msgid "SSL"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:836
+#: src/trg-preferences-dialog.c:838
 msgid "Timeout:"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:840
+#: src/trg-preferences-dialog.c:842
 msgid "Retries:"
 msgstr ""
 
-#: src/trg-preferences-dialog.c:881 src/trg-toolbar.c:238
+#: src/trg-preferences-dialog.c:883 src/trg-toolbar.c:239
 msgid "Local Preferences"
 msgstr "本地�好設定"
 
-#: src/trg-preferences-dialog.c:912
+#: src/trg-preferences-dialog.c:914
 msgid "Directories"
 msgstr ""
 
@@ -958,15 +962,15 @@ msgstr ""
 msgid "Start added torrents"
 msgstr "啟動已新增的種�"
 
-#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:242
+#: src/trg-remote-prefs-dialog.c:671 src/trg-toolbar.c:243
 msgid "Remote Preferences"
 msgstr "�端�好設定"
 
-#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:409
+#: src/trg-remote-prefs-dialog.c:703 src/trg-torrent-props-dialog.c:400
 msgid "Bandwidth"
 msgstr ""
 
-#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:636
+#: src/trg-remote-prefs-dialog.c:708 src/trg-torrent-props-dialog.c:627
 msgid "Limits"
 msgstr ""
 
@@ -1066,7 +1070,7 @@ msgstr ""
 msgid "Down: %s%s, Up: %s%s"
 msgstr ""
 
-#: src/trg-toolbar.c:231
+#: src/trg-toolbar.c:232
 msgid "Remove with data"
 msgstr ""
 
@@ -1159,7 +1163,7 @@ msgstr "總計下載速度"
 msgid "Default"
 msgstr ""
 
-#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:260
+#: src/trg-torrent-move-dialog.c:116 src/trg-torrent-props-dialog.c:251
 msgid "Location:"
 msgstr "�置："
 
@@ -1173,142 +1177,142 @@ msgstr ""
 msgid "Move %d torrents"
 msgstr "移動 %d 個種�"
 
-#: src/trg-torrent-props-dialog.c:206
+#: src/trg-torrent-props-dialog.c:197
 msgid "Activity"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:211
+#: src/trg-torrent-props-dialog.c:202
 msgid "Torrent size:"
 msgstr "種�大�："
 
-#: src/trg-torrent-props-dialog.c:216
+#: src/trg-torrent-props-dialog.c:207
 msgid "Have:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:221
+#: src/trg-torrent-props-dialog.c:212
 msgid "Downloaded:"
 msgstr "已下載："
 
-#: src/trg-torrent-props-dialog.c:226
+#: src/trg-torrent-props-dialog.c:217
 msgid "Uploaded:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:231
+#: src/trg-torrent-props-dialog.c:222
 msgid "State:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:236
+#: src/trg-torrent-props-dialog.c:227
 msgid "Running time:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:241
+#: src/trg-torrent-props-dialog.c:232
 msgid "Remaining time:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:246
+#: src/trg-torrent-props-dialog.c:237
 msgid "Last activity:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:251
+#: src/trg-torrent-props-dialog.c:242
 msgid "Error:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:255
+#: src/trg-torrent-props-dialog.c:246
 msgid "Details"
 msgstr "詳細資訊"
 
-#: src/trg-torrent-props-dialog.c:266
+#: src/trg-torrent-props-dialog.c:257
 msgid "Hash:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:272
+#: src/trg-torrent-props-dialog.c:263
 msgid "Privacy:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:278
+#: src/trg-torrent-props-dialog.c:269
 msgid "Origin:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:295
+#: src/trg-torrent-props-dialog.c:286
 msgid "Comment:"
 msgstr "備註"
 
-#: src/trg-torrent-props-dialog.c:330
+#: src/trg-torrent-props-dialog.c:321
 msgid "Private to this tracker -- DHT and PEX disabled"
 msgstr "將此追蹤器設為�人 --  �用 DHT 與 PEX"
 
-#: src/trg-torrent-props-dialog.c:332
+#: src/trg-torrent-props-dialog.c:323
 msgid "Public torrent"
 msgstr "公開的種�"
 
-#: src/trg-torrent-props-dialog.c:342
+#: src/trg-torrent-props-dialog.c:333
 #, c-format
 msgid "Created on %1$s"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:344
+#: src/trg-torrent-props-dialog.c:335
 #, c-format
 msgid "Created by %1$s on %2$s"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:376
+#: src/trg-torrent-props-dialog.c:367
 msgid "No errors"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:380
+#: src/trg-torrent-props-dialog.c:371
 msgid "Active now"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:413
+#: src/trg-torrent-props-dialog.c:404
 msgid "Honor global limits"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:423
+#: src/trg-torrent-props-dialog.c:414
 msgid "Torrent priority:"
 msgstr "種�優先權"
 
-#: src/trg-torrent-props-dialog.c:429
+#: src/trg-torrent-props-dialog.c:420
 msgid "Queue Position:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:434
+#: src/trg-torrent-props-dialog.c:425
 msgid "Limit download speed (KiB/s)"
 msgstr "�制下載速度〈(KiB/s〉"
 
-#: src/trg-torrent-props-dialog.c:442
+#: src/trg-torrent-props-dialog.c:433
 msgid "Limit upload speed (KiB/s)"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:450
+#: src/trg-torrent-props-dialog.c:441
 msgid "Use global settings"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:451
+#: src/trg-torrent-props-dialog.c:442
 msgid "Stop seeding at ratio"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:452
+#: src/trg-torrent-props-dialog.c:443
 msgid "Seed regardless of ratio"
 msgstr "�續作種"
 
-#: src/trg-torrent-props-dialog.c:455
+#: src/trg-torrent-props-dialog.c:446
 msgid "Seed ratio mode:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:463
+#: src/trg-torrent-props-dialog.c:454
 msgid "Seed ratio limit:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:469
+#: src/trg-torrent-props-dialog.c:460
 msgid "Peer limit:"
 msgstr ""
 
-#: src/trg-torrent-props-dialog.c:542
+#: src/trg-torrent-props-dialog.c:533
 #, c-format
 msgid "Multiple (%d) torrent properties"
 msgstr "多個〈%d〉種�屬性"
 
-#: src/trg-torrent-props-dialog.c:574
+#: src/trg-torrent-props-dialog.c:565
 msgid "Information"
 msgstr ""
 
@@ -1428,45 +1432,45 @@ msgstr ""
 msgid "Descending"
 msgstr ""
 
-#: src/util.c:340
+#: src/util.c:342
 msgid "JSON decoding error."
 msgstr ""
 
-#: src/util.c:345
+#: src/util.c:347
 msgid "Server responded, but with no result."
 msgstr ""
 
-#: src/util.c:349
+#: src/util.c:351
 #, c-format
 msgid "Request failed with HTTP code %d"
 msgstr ""
 
-#: src/util.c:383
+#: src/util.c:385
 msgid "None"
 msgstr ""
 
-#: src/util.c:429
+#: src/util.c:431
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/util.c:430
+#: src/util.c:432
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/util.c:432
+#: src/util.c:434
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/util.c:435
+#: src/util.c:437
 #, c-format
 msgid "%ld second"
 msgid_plural "%ld seconds"
diff --git a/redhat/transmission-remote-gtk.spec b/redhat/transmission-remote-gtk.spec
deleted file mode 100644
index a7dce7d..0000000
--- a/redhat/transmission-remote-gtk.spec
+++ /dev/null
@@ -1,89 +0,0 @@
-Name:           transmission-remote-gtk
-Version:        1.1
-Release:        1%{?dist}
-Summary:        Remotely manage the Transmission BitTorrent client
-
-License:        GPLv2+
-URL:            http://code.google.com/p/%{name}
-Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}.tar.gz
-
-BuildRequires:  gettext
-BuildRequires:  json-glib-devel
-BuildRequires:  intltool
-BuildRequires:  gtk2-devel
-BuildRequires:  libproxy-devel
-BuildRequires:  glib2-devel
-BuildRequires:  unique-devel
-BuildRequires:  libcurl-devel
-BuildRequires:  libnotify-devel
-BuildRequires:  GeoIP-devel
-
-Requires(post):  info
-Requires(preun): info
-
-%description
-transmission-remote-gtk is a GTK client for remote management of
-the Transmission BitTorrent client using its HTTP RPC protocol.
-
-%prep
-%setup -q
-for i in README COPYING AUTHORS ChangeLog; do
-  sed -i "s|\r||g" "$i";
-done
-
-%build
-%configure
-make %{?_smp_mflags}
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-%find_lang %{name}
-
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%preun
-if [ $1 = 0 ] ; then
-  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
-fi
-
-%postun
-if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-%files -f %{name}.lang
-%{_bindir}/%{name}
-%{_datadir}/applications/*.desktop
-%{_datadir}/icons/*
-
-
-%doc README COPYING AUTHORS ChangeLog
-%_mandir/man1/transmission-remote-gtk.1.gz
-
-
-%changelog
-* Fri Jun 29 2012 Alan Fitton <alan@eth0.org.uk> 1.0.2-1
-- New release
-
-* Fri Jan 15 2012 Alan Fitton <alan@eth0.org.uk> 1.0-1
-- New release.
-
-* Fri Dec 09 2011 Alan Fitton <alan@eth0.org.uk> 0.8-1
-- New release.
-
-* Thu Nov 20 2011 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 0.7-3
-- Minor changes according to review
-
-* Thu Oct 27 2011 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 0.7-2
-- Added icon cache
-
-* Tue Oct 18 2011 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 0.7-1
-- Initial version of the package
diff --git a/src/Makefile.am b/src/Makefile.am
index 0c1abd6..4602556 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,35 +17,8 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-NULL =
-
-public_icons_themes = \
-        hicolor \
-        $(NULL)
-
-public_icons = \
-        hicolor_apps_scalable_transmission-remote-gtk.svg \
-	hicolor_apps_16x16_transmission-remote-gtk.png \
-	hicolor_apps_24x24_transmission-remote-gtk.png \
-	hicolor_apps_48x48_transmission-remote-gtk.png \
-	hicolor_apps_22x22_transmission-remote-gtk.png \
-	hicolor_apps_32x32_transmission-remote-gtk.png \
-        $(NULL)
-
-if !WIN32
-EXTRA_DIST = transmission-remote-gtk.desktop.in transmission-remote-gtk.pod
-CLEANFILES = transmission-remote-gtk.desktop transmission-remote-gtk.1
-
-man_MANS = transmission-remote-gtk.1
-
-desktopdir = $(datadir)/applications
-desktop_DATA = transmission-remote-gtk.desktop
-
-endif
-
 bin_PROGRAMS = transmission-remote-gtk
-INCLUDES = -std=c99 -Wall -I.. -Wno-overflow -DTRGLICENSE=\""$(trglicense)"\" $(libcurl_CFLAGS) $(jsonglib_CFLAGS) $(gthread_CFLAGS) $(gtk_CFLAGS) $(gio_CFLAGS) $(unique_CFLAGS) $(notify_CFLAGS) $(libproxy_CFLAGS) $(libappindicator_CFLAGS)
-		
+
 transmission_remote_gtk_SOURCES = \
 	  trg-cell-renderer-speed.c \
 	  trg-cell-renderer-counter.c \
@@ -105,9 +78,97 @@ transmission_remote_gtk_SOURCES = \
 	  trg-client.c \
 	  trg-main-window.c \
 	  main.c \
-	  $(NULL)
-
-transmission_remote_gtk_LDFLAGS = -lm $(jsonglib_LIBS) $(gtk_LIBS) $(gthread_LIBS) $(GEOIP_LIBS) $(gio_LIBS) $(unique_LIBS) $(notify_LIBS) $(libproxy_LIBS) $(libcurl_LIBS) $(libappindicator_LIBS)
+	  upload.c
+
+noinst_HEADERS = \
+	  trg-cell-renderer-speed.h \
+	  trg-cell-renderer-counter.h \
+	  trg-cell-renderer-size.h \
+	  trg-cell-renderer-ratio.h \
+	  trg-cell-renderer-eta.h \
+	  trg-cell-renderer-priority.h \
+	  trg-cell-renderer-wanted.h \
+	  trg-cell-renderer-file-icon.h \
+	  trg-cell-renderer-epoch.h \
+	  trg-cell-renderer-numgteqthan.h \
+	  torrent-cell-renderer.h \
+	  trg-remote-prefs-dialog.h \
+	  trg-torrent-props-dialog.h \
+	  trg-torrent-add-url-dialog.h \
+	  trg-torrent-add-dialog.h \
+	  trg-torrent-move-dialog.h \
+	  trg-preferences-dialog.h \
+	  trg-stats-dialog.h \
+	  trg-about-window.h \
+	  trg-destination-combo.h \
+	  trg-state-selector.h \
+	  trg-general-panel.h \
+	  trg-torrent-graph.h \
+	  trg-icons.h \
+	  icons.h \
+	  trg-toolbar.h \
+	  trg-menu-bar.h \
+	  trg-status-bar.h \
+	  trg-file-parser.h \
+	  trg-json-widgets.h \
+	  trg-model.h \
+	  trg-sortable-filtered-model.h \
+	  trg-files-tree.h \
+	  trg-files-model.h \
+	  trg-files-tree-view-common.h \
+	  trg-files-tree-view.h \
+	  trg-files-model-common.h \
+	  trg-trackers-model.h \
+	  trg-trackers-tree-view.h \
+	  trg-peers-model.h \
+	  trg-peers-tree-view.h \
+	  trg-torrent-model.h \
+	  trg-torrent-tree-view.h \
+	  trg-persistent-tree-view.h \
+	  trg-tree-view.h \
+	  util.h \
+	  hig.h \
+	  bencode.h \
+	  trg-prefs.h \
+	  remote-exec.h \
+	  trg-gtk-app.h \
+	  requests.h \
+	  torrent.h \
+	  session-get.h \
+	  json.h \
+	  trg-client.h \
+	  trg-main-window.h \
+	  upload.h \
+	  protocol-constants.h \
+	  icon-turtle.h
+
+transmission_remote_gtk_CPPFLAGS = \
+	-DLOCALEDIR=\""$(localedir)"\" \
+	-I$(top_srcdir)/extern
+
+transmission_remote_gtk_CFLAGS = \
+	$(TRG_CFLAGS) \
+	$(GEOIP_CFLAGS) \
+	$(NOTIFY_CFLAGS) \
+	$(MRSS_CFLAGS) \
+	$(APPINDICATOR_CFLAGS) \
+	$(PROXY_CFLAGS)
+
+transmission_remote_gtk_LDFLAGS = \
+	$(LIBM) \
+	$(TRG_LIBS) \
+	$(GEOIP_LIBS) \
+	$(NOTIFY_LIBS) \
+	$(PROXY_LIBS) \
+	$(APPINDICATOR_LIBS) \
+	$(MRSS_CFLAGS)
+
+if HAVE_RSS
+transmission_remote_gtk_LDFLAGS += ${top_builddir}/extern/rss-glib/librss.la
+
+transmission_remote_gtk_SOURCES += trg-rss-model.c trg-rss-window.c trg-rss-cell-renderer.c
+noinst_HEADERS += trg-rss-model.h trg-rss-window.h trg-rss-cell-renderer.h
+endif
 
 if WIN32
 .rc.o:
@@ -115,49 +176,16 @@ if WIN32
 %.o : %.rc
 	windres $^ -o $@
 
-CFLAGS += -mms-bitfields -mwin32 -mwindows
-LDFLAGS += -Wl,--allow-multiple-definition -lws2_32 -lintl
+transmission_remote_gtk_CFLAGS += -mms-bitfields -mwin32 -mwindows
+transmission_remote_gtk_LDFLAGS += -Wl,--allow-multiple-definition -lws2_32 -lintl
 transmission_remote_gtk_SOURCES += win32.rc win32-mailslot.c
-INCLUDES += -O2
 else
 %.1: %.pod
-	        pod2man --release="" --center="Transmission Remote GTK" $< > $@
+	        $(POD2MAN) --release="$(PACKAGE_VERSION)" --center="Transmission Remote GTK" $< > $@
+
+EXTRA_DIST = transmission-remote-gtk.pod
+CLEANFILES = transmission-remote-gtk.1
+
+man_MANS = transmission-remote-gtk.1
 endif
 
-install-data-local: install-icons update-icon-cache
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t
-
-update-icon-cache:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		for theme in $(public_icons_themes); do \
-			$(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
-	done; \
-	else \
-		echo "*** Icon cache not updated.  After (un)install, run this:"; \
-		for theme in $(public_icons_themes); do \
-			echo "***   $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
-		done; \
-	fi
-
-install-icons:
-	for icon in $(public_icons); do \
-                THEME=`echo $$icon | cut -d_ -f1`; \
-                CONTEXT=`echo $$icon | cut -d_ -f2`; \
-                SIZE=`echo $$icon | cut -d_ -f3`; \
-                ICONFILE=`echo $$icon | cut -d_ -f4`; \
-                mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
-                $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-        done; \
-        for icon in $(private_icons); do \
-                THEME=`echo $$icon | cut -d_ -f1`; \
-                CONTEXT=`echo $$icon | cut -d_ -f2`; \
-                SIZE=`echo $$icon | cut -d_ -f3`; \
-                ICONFILE=`echo $$icon | cut -d_ -f4`; \
-                mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
-                $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-        done
-
-transmission-remote-gtk.desktop: transmission-remote-gtk.desktop.in
-	sed -e 's,@bindir\@,$(bindir),g' <transmission-remote-gtk.desktop.in > $@
diff --git a/src/Makefile.in b/src/Makefile.in
deleted file mode 100644
index bc32290..0000000
--- a/src/Makefile.in
+++ /dev/null
@@ -1,968 +0,0 @@
-# Makefile.in generated by automake 1.12.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2012 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# transmission-remote-gtk - A GTK RPC client to Transmission
-# Copyright (C) 2011  Alan Fitton
-
-# 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = transmission-remote-gtk$(EXEEXT)
-@WIN32_TRUE@am__append_1 = -mms-bitfields -mwin32 -mwindows
-@WIN32_TRUE@am__append_2 = -Wl,--allow-multiple-definition -lws2_32 -lintl
-@WIN32_TRUE@am__append_3 = win32.rc win32-mailslot.c
-@WIN32_TRUE@am__append_4 = -O2
-subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/depcomp
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
-	"$(DESTDIR)$(desktopdir)"
-PROGRAMS = $(bin_PROGRAMS)
-am__transmission_remote_gtk_SOURCES_DIST = trg-cell-renderer-speed.c \
-	trg-cell-renderer-counter.c trg-cell-renderer-size.c \
-	trg-cell-renderer-ratio.c trg-cell-renderer-eta.c \
-	trg-cell-renderer-priority.c trg-cell-renderer-wanted.c \
-	trg-cell-renderer-file-icon.c trg-cell-renderer-epoch.c \
-	trg-cell-renderer-numgteqthan.c torrent-cell-renderer.c \
-	trg-remote-prefs-dialog.c trg-torrent-props-dialog.c \
-	trg-torrent-add-url-dialog.c trg-torrent-add-dialog.c \
-	trg-torrent-move-dialog.c trg-preferences-dialog.c \
-	trg-stats-dialog.c trg-about-window.c trg-destination-combo.c \
-	trg-state-selector.c trg-general-panel.c trg-torrent-graph.c \
-	trg-icons.c icons.c trg-toolbar.c trg-menu-bar.c \
-	trg-status-bar.c trg-file-parser.c trg-json-widgets.c \
-	trg-model.c trg-sortable-filtered-model.c trg-files-tree.c \
-	trg-files-model.c trg-files-tree-view-common.c \
-	trg-files-tree-view.c trg-files-model-common.c \
-	trg-trackers-model.c trg-trackers-tree-view.c \
-	trg-peers-model.c trg-peers-tree-view.c trg-torrent-model.c \
-	trg-torrent-tree-view.c trg-persistent-tree-view.c \
-	trg-tree-view.c util.c hig.c bencode.c trg-prefs.c \
-	remote-exec.c trg-gtk-app.c requests.c torrent.c session-get.c \
-	json.c trg-client.c trg-main-window.c main.c win32.rc \
-	win32-mailslot.c
-am__objects_1 =
-@WIN32_TRUE@am__objects_2 = win32.$(OBJEXT) win32-mailslot.$(OBJEXT)
-am_transmission_remote_gtk_OBJECTS =  \
-	trg-cell-renderer-speed.$(OBJEXT) \
-	trg-cell-renderer-counter.$(OBJEXT) \
-	trg-cell-renderer-size.$(OBJEXT) \
-	trg-cell-renderer-ratio.$(OBJEXT) \
-	trg-cell-renderer-eta.$(OBJEXT) \
-	trg-cell-renderer-priority.$(OBJEXT) \
-	trg-cell-renderer-wanted.$(OBJEXT) \
-	trg-cell-renderer-file-icon.$(OBJEXT) \
-	trg-cell-renderer-epoch.$(OBJEXT) \
-	trg-cell-renderer-numgteqthan.$(OBJEXT) \
-	torrent-cell-renderer.$(OBJEXT) \
-	trg-remote-prefs-dialog.$(OBJEXT) \
-	trg-torrent-props-dialog.$(OBJEXT) \
-	trg-torrent-add-url-dialog.$(OBJEXT) \
-	trg-torrent-add-dialog.$(OBJEXT) \
-	trg-torrent-move-dialog.$(OBJEXT) \
-	trg-preferences-dialog.$(OBJEXT) trg-stats-dialog.$(OBJEXT) \
-	trg-about-window.$(OBJEXT) trg-destination-combo.$(OBJEXT) \
-	trg-state-selector.$(OBJEXT) trg-general-panel.$(OBJEXT) \
-	trg-torrent-graph.$(OBJEXT) trg-icons.$(OBJEXT) \
-	icons.$(OBJEXT) trg-toolbar.$(OBJEXT) trg-menu-bar.$(OBJEXT) \
-	trg-status-bar.$(OBJEXT) trg-file-parser.$(OBJEXT) \
-	trg-json-widgets.$(OBJEXT) trg-model.$(OBJEXT) \
-	trg-sortable-filtered-model.$(OBJEXT) trg-files-tree.$(OBJEXT) \
-	trg-files-model.$(OBJEXT) trg-files-tree-view-common.$(OBJEXT) \
-	trg-files-tree-view.$(OBJEXT) trg-files-model-common.$(OBJEXT) \
-	trg-trackers-model.$(OBJEXT) trg-trackers-tree-view.$(OBJEXT) \
-	trg-peers-model.$(OBJEXT) trg-peers-tree-view.$(OBJEXT) \
-	trg-torrent-model.$(OBJEXT) trg-torrent-tree-view.$(OBJEXT) \
-	trg-persistent-tree-view.$(OBJEXT) trg-tree-view.$(OBJEXT) \
-	util.$(OBJEXT) hig.$(OBJEXT) bencode.$(OBJEXT) \
-	trg-prefs.$(OBJEXT) remote-exec.$(OBJEXT) \
-	trg-gtk-app.$(OBJEXT) requests.$(OBJEXT) torrent.$(OBJEXT) \
-	session-get.$(OBJEXT) json.$(OBJEXT) trg-client.$(OBJEXT) \
-	trg-main-window.$(OBJEXT) main.$(OBJEXT) $(am__objects_1) \
-	$(am__objects_2)
-transmission_remote_gtk_OBJECTS =  \
-	$(am_transmission_remote_gtk_OBJECTS)
-transmission_remote_gtk_LDADD = $(LDADD)
-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 = 
-transmission_remote_gtk_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(transmission_remote_gtk_LDFLAGS) \
-	$(LDFLAGS) -o $@
-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 = 
-SOURCES = $(transmission_remote_gtk_SOURCES)
-DIST_SOURCES = $(am__transmission_remote_gtk_SOURCES_DIST)
-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
-NROFF = nroff
-MANS = $(man_MANS)
-DATA = $(desktop_DATA)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@ $(am__append_1)
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GEOIP_LIBS = @GEOIP_LIBS@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LD = @LD@
-LDFLAGS = @LDFLAGS@ $(am__append_2)
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALEDIR = @LOCALEDIR@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-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@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-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_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@
-gio_CFLAGS = @gio_CFLAGS@
-gio_LIBS = @gio_LIBS@
-gthread_CFLAGS = @gthread_CFLAGS@
-gthread_LIBS = @gthread_LIBS@
-gtk_CFLAGS = @gtk_CFLAGS@
-gtk_LIBS = @gtk_LIBS@
-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@
-jsonglib_CFLAGS = @jsonglib_CFLAGS@
-jsonglib_LIBS = @jsonglib_LIBS@
-libappindicator_CFLAGS = @libappindicator_CFLAGS@
-libappindicator_LIBS = @libappindicator_LIBS@
-libcurl_CFLAGS = @libcurl_CFLAGS@
-libcurl_LIBS = @libcurl_LIBS@
-libdir = @libdir@
-libexecdir = @libexecdir@
-libproxy_CFLAGS = @libproxy_CFLAGS@
-libproxy_LIBS = @libproxy_LIBS@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-notify_CFLAGS = @notify_CFLAGS@
-notify_LIBS = @notify_LIBS@
-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@
-trglicense = @trglicense@
-unique_CFLAGS = @unique_CFLAGS@
-unique_LIBS = @unique_LIBS@
-NULL = 
-public_icons_themes = \
-        hicolor \
-        $(NULL)
-
-public_icons = \
-        hicolor_apps_scalable_transmission-remote-gtk.svg \
-	hicolor_apps_16x16_transmission-remote-gtk.png \
-	hicolor_apps_24x24_transmission-remote-gtk.png \
-	hicolor_apps_48x48_transmission-remote-gtk.png \
-	hicolor_apps_22x22_transmission-remote-gtk.png \
-	hicolor_apps_32x32_transmission-remote-gtk.png \
-        $(NULL)
-
-@WIN32_FALSE@EXTRA_DIST = transmission-remote-gtk.desktop.in transmission-remote-gtk.pod
-@WIN32_FALSE@CLEANFILES = transmission-remote-gtk.desktop transmission-remote-gtk.1
-@WIN32_FALSE@man_MANS = transmission-remote-gtk.1
-@WIN32_FALSE@desktopdir = $(datadir)/applications
-@WIN32_FALSE@desktop_DATA = transmission-remote-gtk.desktop
-INCLUDES = -std=c99 -Wall -I.. -Wno-overflow \
-	-DTRGLICENSE=\""$(trglicense)"\" $(libcurl_CFLAGS) \
-	$(jsonglib_CFLAGS) $(gthread_CFLAGS) $(gtk_CFLAGS) \
-	$(gio_CFLAGS) $(unique_CFLAGS) $(notify_CFLAGS) \
-	$(libproxy_CFLAGS) $(libappindicator_CFLAGS) $(am__append_4)
-transmission_remote_gtk_SOURCES = trg-cell-renderer-speed.c \
-	trg-cell-renderer-counter.c trg-cell-renderer-size.c \
-	trg-cell-renderer-ratio.c trg-cell-renderer-eta.c \
-	trg-cell-renderer-priority.c trg-cell-renderer-wanted.c \
-	trg-cell-renderer-file-icon.c trg-cell-renderer-epoch.c \
-	trg-cell-renderer-numgteqthan.c torrent-cell-renderer.c \
-	trg-remote-prefs-dialog.c trg-torrent-props-dialog.c \
-	trg-torrent-add-url-dialog.c trg-torrent-add-dialog.c \
-	trg-torrent-move-dialog.c trg-preferences-dialog.c \
-	trg-stats-dialog.c trg-about-window.c trg-destination-combo.c \
-	trg-state-selector.c trg-general-panel.c trg-torrent-graph.c \
-	trg-icons.c icons.c trg-toolbar.c trg-menu-bar.c \
-	trg-status-bar.c trg-file-parser.c trg-json-widgets.c \
-	trg-model.c trg-sortable-filtered-model.c trg-files-tree.c \
-	trg-files-model.c trg-files-tree-view-common.c \
-	trg-files-tree-view.c trg-files-model-common.c \
-	trg-trackers-model.c trg-trackers-tree-view.c \
-	trg-peers-model.c trg-peers-tree-view.c trg-torrent-model.c \
-	trg-torrent-tree-view.c trg-persistent-tree-view.c \
-	trg-tree-view.c util.c hig.c bencode.c trg-prefs.c \
-	remote-exec.c trg-gtk-app.c requests.c torrent.c session-get.c \
-	json.c trg-client.c trg-main-window.c main.c $(NULL) \
-	$(am__append_3)
-transmission_remote_gtk_LDFLAGS = -lm $(jsonglib_LIBS) $(gtk_LIBS) $(gthread_LIBS) $(GEOIP_LIBS) $(gio_LIBS) $(unique_LIBS) $(notify_LIBS) $(libproxy_LIBS) $(libcurl_LIBS) $(libappindicator_LIBS)
-gtk_update_icon_cache = gtk-update-icon-cache -f -t
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj .rc
-$(srcdir)/Makefile.in:  $(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) --foreign src/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign 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:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	@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)'; 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)'; 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
-transmission-remote-gtk$(EXEEXT): $(transmission_remote_gtk_OBJECTS) $(transmission_remote_gtk_DEPENDENCIES) $(EXTRA_transmission_remote_gtk_DEPENDENCIES) 
-	@rm -f transmission-remote-gtk$(EXEEXT)
-	$(AM_V_CCLD)$(transmission_remote_gtk_LINK) $(transmission_remote_gtk_OBJECTS) $(transmission_remote_gtk_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bencode.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hig.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icons.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote-exec.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/requests.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/session-get.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/torrent-cell-renderer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/torrent.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-about-window.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-cell-renderer-counter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-cell-renderer-epoch.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-cell-renderer-eta.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-cell-renderer-file-icon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-cell-renderer-numgteqthan.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-cell-renderer-priority.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-cell-renderer-ratio.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-cell-renderer-size.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-cell-renderer-speed.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-cell-renderer-wanted.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-client.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-destination-combo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-file-parser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-files-model-common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-files-model.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-files-tree-view-common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-files-tree-view.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-files-tree.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-general-panel.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-gtk-app.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-icons.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-json-widgets.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-main-window.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-menu-bar.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-model.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-peers-model.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-peers-tree-view.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-persistent-tree-view.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-preferences-dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-prefs.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-remote-prefs-dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-sortable-filtered-model.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-state-selector.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-stats-dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-status-bar.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-toolbar.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-torrent-add-dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-torrent-add-url-dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-torrent-graph.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-torrent-model.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-torrent-move-dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-torrent-props-dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-torrent-tree-view.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-trackers-model.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-trackers-tree-view.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trg-tree-view.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32-mailslot.Po@am__quote@
-
-.c.o:
-@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 $<
-
-.c.obj:
-@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 `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@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 $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-man1: $(man_MANS)
-	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(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='$(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-desktopDATA: $(desktop_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || 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)$(desktopdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
-	done
-
-uninstall-desktopDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
-
-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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
-	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 tags
-
-distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically 'make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
-	@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; \
-	  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 -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    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) $(MANS) $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	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:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-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-data-local install-desktopDATA install-man
-
-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-man1
-
-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
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \
-	uninstall-man
-
-uninstall-man: uninstall-man1
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool cscopelist ctags 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-data-local install-desktopDATA \
-	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-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-desktopDATA \
-	uninstall-man uninstall-man1
-
-
-@WIN32_TRUE@.rc.o:
-@WIN32_TRUE@	windres $^ -o $@
-@WIN32_TRUE@%.o : %.rc
-@WIN32_TRUE@	windres $^ -o $@
-@WIN32_FALSE@%.1: %.pod
-@WIN32_FALSE@	        pod2man --release="" --center="Transmission Remote GTK" $< > $@
-
-install-data-local: install-icons update-icon-cache
-
-update-icon-cache:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		for theme in $(public_icons_themes); do \
-			$(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
-	done; \
-	else \
-		echo "*** Icon cache not updated.  After (un)install, run this:"; \
-		for theme in $(public_icons_themes); do \
-			echo "***   $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
-		done; \
-	fi
-
-install-icons:
-	for icon in $(public_icons); do \
-                THEME=`echo $$icon | cut -d_ -f1`; \
-                CONTEXT=`echo $$icon | cut -d_ -f2`; \
-                SIZE=`echo $$icon | cut -d_ -f3`; \
-                ICONFILE=`echo $$icon | cut -d_ -f4`; \
-                mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
-                $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-        done; \
-        for icon in $(private_icons); do \
-                THEME=`echo $$icon | cut -d_ -f1`; \
-                CONTEXT=`echo $$icon | cut -d_ -f2`; \
-                SIZE=`echo $$icon | cut -d_ -f3`; \
-                ICONFILE=`echo $$icon | cut -d_ -f4`; \
-                mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
-                $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-        done
-
-transmission-remote-gtk.desktop: transmission-remote-gtk.desktop.in
-	sed -e 's,@bindir\@,$(bindir),g' <transmission-remote-gtk.desktop.in > $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/bencode.c b/src/bencode.c
index 89f35ed..476baeb 100644
--- a/src/bencode.c
+++ b/src/bencode.c
@@ -24,6 +24,10 @@
  * into the public domain as well).
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>             /* malloc() realloc() free() strtoll() */
 #include <string.h>             /* memset() */
 #include <ctype.h>
diff --git a/src/hig.c b/src/hig.c
index 32432fe..9664ec9 100644
--- a/src/hig.c
+++ b/src/hig.c
@@ -1,213 +1,173 @@
 /*
- * This file Copyright (C) 2007-2010 Mnemosyne LLC
+ * This file Copyright (C) Mnemosyne LLC
  *
- * This file is licensed by the GPL version 2.  Works owned by the
- * Transmission project are granted a special exemption to clause 2(b)
+ * This file is licensed by the GPL version 2. Works owned by the
+ * Transmission project are granted a special exemption to clause 2 (b)
  * so that the bulk of its code can remain under the MIT license.
  * This exemption does not extend to derived works not owned by
  * the Transmission project.
  *
- * $Id: hig.c 9868 2010-01-04 21:00:47Z charles $
+ * $Id: hig.c 13677 2012-12-16 22:51:29Z jordan $
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gtk/gtk.h>
 #include "hig.h"
-#include "util.h"
 
-GtkWidget *hig_workarea_create(void)
+GtkWidget*
+hig_workarea_create (void)
 {
-    GtkWidget *t = gtk_table_new(1, 2, FALSE);
+    GtkWidget * grid = gtk_grid_new ();
+
+    gtk_container_set_border_width (GTK_CONTAINER (grid), GUI_PAD_BIG);
+    gtk_grid_set_row_spacing (GTK_GRID (grid), GUI_PAD);
+    gtk_grid_set_column_spacing (GTK_GRID (grid), GUI_PAD_BIG);
 
-    gtk_container_set_border_width(GTK_CONTAINER(t), GUI_PAD_BIG);
-    gtk_table_set_col_spacing(GTK_TABLE(t), 0, GUI_PAD_BIG);
-    gtk_table_set_row_spacings(GTK_TABLE(t), GUI_PAD);
-    return t;
+    return grid;
 }
 
-void hig_workarea_add_section_divider(GtkWidget * t, guint * row)
+void
+hig_workarea_add_section_divider (GtkWidget * t, guint * row)
 {
-    GtkWidget *w = gtk_alignment_new(0.0f, 0.0f, 0.0f, 0.0f);
+    GtkWidget * w = gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f);
 
-    gtk_widget_set_size_request(w, 0u, 6u);
-    gtk_table_attach(GTK_TABLE(t), w, 0, 2, *row, *row + 1, 0, 0, 0, 0);
-    ++*row;
+    gtk_widget_set_size_request (w, 0u, 6u);
+    gtk_grid_attach (GTK_GRID (t), w, 0, *row, 2, 1);
+    ++ * row;
 }
 
 void
-hig_workarea_add_section_title_widget(GtkWidget * t, guint * row,
-                                      GtkWidget * w)
+hig_workarea_add_section_title_widget (GtkWidget * t, guint * row, GtkWidget * w)
 {
-    gtk_table_attach(GTK_TABLE(t), w, 0, 2, *row, *row + 1, ~0, 0, 0, 0);
-    ++*row;
+    gtk_widget_set_hexpand (w, TRUE);
+    gtk_grid_attach (GTK_GRID (t), w, 0, *row, 2, 1);
+    ++ * row;
 }
 
 void
-hig_workarea_add_section_title(GtkWidget * t,
-                               guint * row, const char *section_title)
+hig_workarea_add_section_title (GtkWidget *  t, guint * row, const char * section_title)
 {
     char buf[512];
-    GtkWidget *l;
-
-    g_snprintf(buf, sizeof(buf), "<b>%s</b>", section_title);
-    l = gtk_label_new(buf);
-    gtk_misc_set_alignment(GTK_MISC(l), 0.0f, 0.5f);
-    gtk_label_set_use_markup(GTK_LABEL(l), TRUE);
-    hig_workarea_add_section_title_widget(t, row, l);
-}
+    GtkWidget * l;
 
-static GtkWidget *rowNew(GtkWidget * w)
-{
-    GtkWidget *a;
-    GtkWidget *h = trg_hbox_new(FALSE, 0);
-
-    /* spacer */
-    a = gtk_alignment_new(0.0f, 0.0f, 0.0f, 0.0f);
-    gtk_widget_set_size_request(a, 18u, 0u);
-    gtk_box_pack_start(GTK_BOX(h), a, FALSE, FALSE, 0);
-
-    /* lhs widget */
-    if (GTK_IS_MISC(w))
-        gtk_misc_set_alignment(GTK_MISC(w), 0.0f, 0.5f);
-    if (GTK_IS_LABEL(w))
-        gtk_label_set_use_markup(GTK_LABEL(w), TRUE);
-    gtk_box_pack_start(GTK_BOX(h), w, TRUE, TRUE, 0);
-
-    return h;
+    g_snprintf (buf, sizeof (buf), "<b>%s</b>", section_title);
+    l = gtk_label_new (buf);
+    gtk_misc_set_alignment (GTK_MISC (l), 0.0f, 0.5f);
+    gtk_label_set_use_markup (GTK_LABEL (l), TRUE);
+    hig_workarea_add_section_title_widget (t, row, l);
 }
 
-void hig_workarea_add_wide_control(GtkWidget * t, guint * row,
-                                   GtkWidget * w)
+void
+hig_workarea_add_wide_control (GtkWidget * t, guint * row, GtkWidget * w)
 {
-    GtkWidget *r = rowNew(w);
-
-    gtk_table_attach(GTK_TABLE(t), r, 0, 2, *row, *row + 1, GTK_FILL,
-                     0, 0, 0);
-    ++*row;
+    gtk_widget_set_hexpand (w, TRUE);
+    gtk_widget_set_margin_left (w, 18);
+    gtk_grid_attach (GTK_GRID (t), w, 0, *row, 2, 1);
+    ++ * row;
 }
-
 void
-hig_workarea_add_wide_tall_control(GtkWidget * t, guint * row,
-                                   GtkWidget * w)
+hig_workarea_add_wide_tall_control (GtkWidget * t, guint * row, GtkWidget * w)
 {
-    GtkWidget *r = rowNew(w);
-
-    gtk_table_attach(GTK_TABLE(t), r, 0, 2, *row, *row + 1,
-                     GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-                     GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
-
-    ++*row;
+    gtk_widget_set_hexpand (w, TRUE);
+    gtk_widget_set_vexpand (w, TRUE);
+    hig_workarea_add_wide_control (t, row, w);
 }
 
-GtkWidget *hig_workarea_add_wide_checkbutton(GtkWidget * t,
-                                             guint * row,
-                                             const char *mnemonic_string,
-                                             gboolean is_active)
+GtkWidget *
+hig_workarea_add_wide_checkbutton (GtkWidget  * t,
+                                   guint      * row,
+                                   const char * mnemonic_string,
+                                   gboolean     is_active)
 {
-    GtkWidget *w = gtk_check_button_new_with_mnemonic(mnemonic_string);
+    GtkWidget * w = gtk_check_button_new_with_mnemonic (mnemonic_string);
 
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), is_active);
-    hig_workarea_add_wide_control(t, row, w);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), is_active);
+    hig_workarea_add_wide_control (t, row, w);
     return w;
 }
 
-void hig_workarea_add_label_w(GtkWidget * t, guint row, GtkWidget * l)
+void
+hig_workarea_add_label_w (GtkWidget * t, guint row, GtkWidget * w)
 {
-    GtkWidget *w = rowNew(l);
-
-    gtk_table_attach(GTK_TABLE(t), w, 0, 1, row, row + 1, GTK_FILL,
-                     GTK_FILL, 0, 0);
-}
-
-GtkWidget *hig_workarea_add_label(GtkWidget * t, guint row,
-                                  const char *mnemonic_string)
-{
-    GtkWidget *l = gtk_label_new_with_mnemonic(mnemonic_string);
-
-    hig_workarea_add_label_w(t, row, l);
-    return l;
+    gtk_widget_set_margin_left (w, 18);
+    if (GTK_IS_MISC (w))
+        gtk_misc_set_alignment (GTK_MISC (w), 0.0f, 0.5f);
+    if (GTK_IS_LABEL (w))
+        gtk_label_set_use_markup (GTK_LABEL (w), TRUE);
+    gtk_grid_attach (GTK_GRID (t), w, 0, row, 1, 1);
 }
 
 static void
-hig_workarea_add_tall_control(GtkWidget * t, guint row,
-                              GtkWidget * control)
+hig_workarea_add_tall_control (GtkWidget * t, guint row, GtkWidget * control)
 {
-    if (GTK_IS_MISC(control))
-        gtk_misc_set_alignment(GTK_MISC(control), 0.0f, 0.5f);
+    if (GTK_IS_MISC (control))
+        gtk_misc_set_alignment (GTK_MISC (control), 0.0f, 0.5f);
 
-    gtk_table_attach(GTK_TABLE(t), control,
-                     1, 2, row, row + 1,
-                     GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-                     GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
+    g_object_set (control, "expand", TRUE, NULL);
+    gtk_grid_attach (GTK_GRID (t), control, 1, row, 1, 1);
 }
 
-void hig_workarea_add_control(GtkWidget * t, guint row,
-                              GtkWidget * control)
+static void
+hig_workarea_add_control (GtkWidget * t, guint row, GtkWidget * control)
 {
-    if (GTK_IS_MISC(control))
-        gtk_misc_set_alignment(GTK_MISC(control), 0.0f, 0.5f);
+    if (GTK_IS_MISC (control))
+        gtk_misc_set_alignment (GTK_MISC (control), 0.0f, 0.5f);
 
-    gtk_table_attach(GTK_TABLE(t), control,
-                     1, 2, row, row + 1,
-                     GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
+    gtk_widget_set_hexpand (control, TRUE);
+    gtk_grid_attach (GTK_GRID (t), control, 1, row, 1, 1);
 }
 
 void
-hig_workarea_add_row_w(GtkWidget * t,
-                       guint * row,
-                       GtkWidget * label,
-                       GtkWidget * control, GtkWidget * mnemonic)
-{
-    hig_workarea_add_label_w(t, *row, label);
-    hig_workarea_add_control(t, *row, control);
-    if (GTK_IS_LABEL(label))
-        gtk_label_set_mnemonic_widget(GTK_LABEL(label),
-                                      mnemonic ? mnemonic : control);
-    ++*row;
-}
-
-GtkWidget *hig_workarea_add_row(GtkWidget * t,
-                                guint * row,
-                                const char *mnemonic_string,
-                                GtkWidget * control, GtkWidget * mnemonic)
-{
-    GtkWidget *l = gtk_label_new_with_mnemonic(mnemonic_string);
-
-    hig_workarea_add_row_w(t, row, l, control, mnemonic);
+hig_workarea_add_row_w (GtkWidget * t,
+                        guint     * row,
+                        GtkWidget * label,
+                        GtkWidget * control,
+                        GtkWidget * mnemonic)
+{
+    hig_workarea_add_label_w (t, *row, label);
+    hig_workarea_add_control (t, *row, control);
+    if (GTK_IS_LABEL (label))
+        gtk_label_set_mnemonic_widget (GTK_LABEL (label),
+                                       mnemonic ? mnemonic : control);
+    ++ * row;
+}
+
+GtkWidget*
+hig_workarea_add_row (GtkWidget  * t,
+                      guint      * row,
+                      const char * mnemonic_string,
+                      GtkWidget  * control,
+                      GtkWidget  * mnemonic)
+{
+    GtkWidget * l = gtk_label_new_with_mnemonic (mnemonic_string);
+
+    hig_workarea_add_row_w (t, row, l, control, mnemonic);
     return l;
 }
 
-GtkWidget *hig_workarea_add_tall_row(GtkWidget * table,
-                                     guint * row,
-                                     const char *mnemonic_string,
-                                     GtkWidget * control,
-                                     GtkWidget * mnemonic)
+GtkWidget*
+hig_workarea_add_tall_row (GtkWidget  * table,
+                           guint      * row,
+                           const char * mnemonic_string,
+                           GtkWidget  * control,
+                           GtkWidget  * mnemonic)
 {
-    GtkWidget *l = gtk_label_new_with_mnemonic(mnemonic_string);
-    GtkWidget *h = trg_hbox_new(FALSE, 0);
-    GtkWidget *v = trg_vbox_new(FALSE, 0);
-    gtk_box_pack_start(GTK_BOX(h), l, FALSE, FALSE, 0);
-    gtk_box_pack_start(GTK_BOX(v), h, FALSE, FALSE, GUI_PAD_SMALL);
+    GtkWidget * l = gtk_label_new_with_mnemonic (mnemonic_string);
+    GtkWidget * h = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+    GtkWidget * v = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+    gtk_box_pack_start (GTK_BOX (h), l, FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (v), h, FALSE, FALSE, GUI_PAD_SMALL);
 
-    hig_workarea_add_label_w(table, *row, v);
-    hig_workarea_add_tall_control(table, *row, control);
+    hig_workarea_add_label_w (table, *row, v);
+    hig_workarea_add_tall_control (table, *row, control);
 
-    if (GTK_IS_LABEL(l))
-        gtk_label_set_mnemonic_widget(GTK_LABEL(l),
-                                      mnemonic ? mnemonic : control);
+    if (GTK_IS_LABEL (l))
+        gtk_label_set_mnemonic_widget (GTK_LABEL (l),
+                                       mnemonic ? mnemonic : control);
 
-    ++*row;
+    ++ * row;
     return l;
 }
-
-void hig_workarea_finish(GtkWidget * t, guint * row)
-{
-    gtk_table_resize(GTK_TABLE(t), *row, 2);
-}
-
-void
-hig_message_dialog_set_text(GtkMessageDialog * dialog,
-                            const char *primary, const char *secondary)
-{
-    gtk_message_dialog_set_markup(dialog, primary);
-    gtk_message_dialog_format_secondary_text(dialog, "%s", secondary);
-}
diff --git a/src/hig.h b/src/hig.h
index de4a8bc..ae83c90 100644
--- a/src/hig.h
+++ b/src/hig.h
@@ -1,17 +1,17 @@
 /*
- * This file Copyright (C) 2007-2010 Mnemosyne LLC
+ * This file Copyright (C) Mnemosyne LLC
  *
- * This file is licensed by the GPL version 2.  Works owned by the
- * Transmission project are granted a special exemption to clause 2(b)
+ * This file is licensed by the GPL version 2. Works owned by the
+ * Transmission project are granted a special exemption to clause 2 (b)
  * so that the bulk of its code can remain under the MIT license.
  * This exemption does not extend to derived works not owned by
  * the Transmission project.
  *
- * $Id: hig.h 9868 2010-01-04 21:00:47Z charles $
+ * $Id: hig.h 13625 2012-12-05 17:29:46Z jordan $
  */
 
-#ifndef __HIG_H__
-#define __HIG_H__
+#ifndef GTR_HIG_H
+#define GTR_HIG_H
 
 #include <gtk/gtk.h>
 
@@ -20,67 +20,60 @@
 *** see section 8.2.2, Visual Design > Window Layout > Dialogs.
 **/
 
-GtkWidget *hig_workarea_create(void);
+GtkWidget* hig_workarea_create (void);
 
-void hig_workarea_add_section_divider(GtkWidget * table, guint * row);
+void       hig_workarea_add_section_divider (GtkWidget * table,
+                                             guint     *  row);
 
-void hig_workarea_add_section_title_widget(GtkWidget * t,
-                                           guint * row, GtkWidget * w);
+void       hig_workarea_add_section_title_widget (GtkWidget * t,
+                                                  guint     * row,
+                                                  GtkWidget * w);
 
-void hig_workarea_add_section_title(GtkWidget * table,
-                                    guint * row,
-                                    const char *section_title);
+void       hig_workarea_add_section_title (GtkWidget  *  table,
+                                           guint      * row,
+                                           const char * section_title);
 
-void hig_workarea_add_wide_tall_control(GtkWidget * table,
-                                        guint * row, GtkWidget * w);
+void       hig_workarea_add_wide_tall_control (GtkWidget * table,
+                                               guint     * row,
+                                               GtkWidget * w);
 
-void hig_workarea_add_wide_control(GtkWidget * table,
-                                   guint * row, GtkWidget * w);
+void       hig_workarea_add_wide_control (GtkWidget * table,
+                                          guint     * row,
+                                          GtkWidget * w);
 
-GtkWidget *hig_workarea_add_wide_checkbutton(GtkWidget * table,
-                                             guint * row,
-                                             const char *mnemonic_string,
-                                             gboolean is_active);
+GtkWidget* hig_workarea_add_wide_checkbutton (GtkWidget  * table,
+                                              guint      * row,
+                                              const char * mnemonic_string,
+                                              gboolean     is_active);
 
-GtkWidget *hig_workarea_add_label(GtkWidget * table,
-                                  guint row, const char *mnemonic_string);
+void       hig_workarea_add_label_w (GtkWidget * table,
+                                     guint       row,
+                                     GtkWidget * label_widget);
 
-void hig_workarea_add_label_w(GtkWidget * table,
-                              guint row, GtkWidget * label_widget);
+GtkWidget* hig_workarea_add_tall_row (GtkWidget  * table,
+                                      guint      * row,
+                                      const char * mnemonic_string,
+                                      GtkWidget  * control,
+                                      GtkWidget  * mnemonic_or_null_for_control);
 
-void hig_workarea_add_control(GtkWidget * table,
-                              guint row, GtkWidget * control);
+GtkWidget* hig_workarea_add_row (GtkWidget  * table,
+                                 guint      * row,
+                                 const char * mnemonic_string,
+                                 GtkWidget  * control,
+                                 GtkWidget  * mnemonic_or_null_for_control);
 
-GtkWidget *hig_workarea_add_tall_row(GtkWidget * table,
-                                     guint * row,
-                                     const char *mnemonic_string,
-                                     GtkWidget * control,
-                                     GtkWidget *
-                                     mnemonic_or_null_for_control);
+void       hig_workarea_add_row_w (GtkWidget * table,
+                                   guint     * row,
+                                   GtkWidget * label,
+                                   GtkWidget * control,
+                                   GtkWidget * mnemonic_or_null_for_control);
 
-GtkWidget *hig_workarea_add_row(GtkWidget * table,
-                                guint * row,
-                                const char *mnemonic_string,
-                                GtkWidget * control,
-                                GtkWidget * mnemonic_or_null_for_control);
-
-void hig_workarea_add_row_w(GtkWidget * table,
-                            guint * row,
-                            GtkWidget * label,
-                            GtkWidget * control,
-                            GtkWidget * mnemonic_or_null_for_control);
-
-void hig_workarea_finish(GtkWidget * table, guint * row);
-
-void hig_message_dialog_set_text(GtkMessageDialog * dialog,
-                                 const char *primary,
-                                 const char *secondary);
-
-enum {
+enum
+{
     GUI_PAD_SMALL = 3,
     GUI_PAD = 6,
     GUI_PAD_BIG = 12,
     GUI_PAD_LARGE = 12
 };
 
-#endif                          /* __HIG_H__ */
+#endif /* GTR_HIG_H */
diff --git a/src/icons.c b/src/icons.c
index bb8e33d..8275961 100644
--- a/src/icons.c
+++ b/src/icons.c
@@ -6,6 +6,10 @@
  * $Id: icons.c 12639 2011-08-07 18:41:13Z jordan $
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>             /* strcmp */
 #include <glib.h>
 #include <gtk/gtk.h>
diff --git a/src/json.c b/src/json.c
index fdce0b6..706fc08 100644
--- a/src/json.c
+++ b/src/json.c
@@ -17,12 +17,15 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glib-object.h>
 #include <glib/gprintf.h>
 #include <json-glib/json-glib.h>
 #include <gtk/gtk.h>
 
-#include "config.h"
 #include "protocol-constants.h"
 #include "requests.h"
 #include "json.h"
@@ -100,7 +103,7 @@ gdouble json_double_to_progress(JsonNode * n)
 
 gdouble json_node_really_get_double(JsonNode * node)
 {
-    GValue a = { 0 };
+    GValue a = G_VALUE_INIT;
 
     json_node_get_value(node, &a);
     switch (G_VALUE_TYPE(&a)) {
diff --git a/src/main.c b/src/main.c
index f7570ce..df9bce9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -32,11 +32,8 @@
 #include <json-glib/json-glib.h>
 #include <fontconfig/fontconfig.h>
 
-#if !GTK_CHECK_VERSION( 3, 0, 0 ) && HAVE_LIBUNIQUE
-#include <unique/unique.h>
-#elif GTK_CHECK_VERSION( 3, 0, 0 )
 #include "trg-gtk-app.h"
-#elif WIN32
+#if WIN32
 #include "win32-mailslot.h"
 #endif
 
@@ -44,105 +41,16 @@
 #include "trg-client.h"
 #include "util.h"
 
-/* Handle arguments and start the main window. Unfortunately, there's three
- * different ways to achieve a unique instance and pass arguments around. :(
+/* Handle arguments and start the main window.
  *
- * 1) libunique - GTK2 (non-win32). deprecated in GTK3 for GtkApplication.
- * 2) GtkApplication - replaces libunique, GTK3 only, and non-win32.
- * 3) win32 API mailslots.
- */
-
-/*
- * libunique.
+ * either GtkApplication - replaces libunique, GTK3 only, and non-win32.
+ * or win32 API mailslots.
+ *
+ * win32 could possibly run from GtkApplication now, mailslots were needed
+ * for GTK2 (support removed).
  */
 
-#if !GTK_CHECK_VERSION( 3, 0, 0 ) && HAVE_LIBUNIQUE
-
-enum {
-    COMMAND_0,
-    COMMAND_ADD
-};
-
-static UniqueResponse
-message_received_cb(UniqueApp * app G_GNUC_UNUSED,
-                    gint command,
-                    UniqueMessageData * message,
-                    guint time_, gpointer user_data)
-{
-    TrgMainWindow *win;
-    UniqueResponse res;
-    gchar **uris;
-
-    win = TRG_MAIN_WINDOW(user_data);
-
-    switch (command) {
-    case UNIQUE_ACTIVATE:
-        gtk_window_set_screen(GTK_WINDOW(user_data),
-                              unique_message_data_get_screen(message));
-        gtk_window_present_with_time(GTK_WINDOW(user_data), time_);
-        res = UNIQUE_RESPONSE_OK;
-        break;
-    case COMMAND_ADD:
-        uris = unique_message_data_get_uris(message);
-        res =
-            trg_add_from_filename(win,
-                                  uris) ? UNIQUE_RESPONSE_OK :
-            UNIQUE_RESPONSE_FAIL;
-        break;
-    default:
-        res = UNIQUE_RESPONSE_OK;
-        break;
-    }
-
-    return res;
-}
-
-static gint
-trg_libunique_init(TrgClient * client, int argc,
-                   gchar * argv[], gchar ** args)
-{
-    UniqueApp *app = unique_app_new_with_commands("uk.org.eth0.trg", NULL,
-                                                  "add", COMMAND_ADD,
-                                                  NULL);
-    TrgMainWindow *window;
-
-    if (unique_app_is_running(app)) {
-        UniqueCommand command;
-        UniqueResponse response;
-        UniqueMessageData *message;
-
-        if (args) {
-            command = COMMAND_ADD;
-            message = unique_message_data_new();
-            unique_message_data_set_uris(message, args);
-            g_strfreev(args);
-        } else {
-            command = UNIQUE_ACTIVATE;
-            message = NULL;
-        }
-
-        response = unique_app_send_message(app, command, message);
-        unique_message_data_free(message);
-
-        if (response != UNIQUE_RESPONSE_OK)
-            return EXIT_FAILURE;
-    } else {
-        window =
-            trg_main_window_new(client, should_be_minimised(argc, argv));
-        g_signal_connect(app, "message-received",
-                         G_CALLBACK(message_received_cb), window);
-
-        trg_main_window_set_start_args(window, args);
-        auto_connect_if_required(window);
-        gtk_main();
-    }
-
-    g_object_unref(app);
-
-    return EXIT_SUCCESS;
-}
-
-#elif !WIN32 && GTK_CHECK_VERSION( 3, 0, 0 )
+#if !WIN32
 
 /* GtkApplication - the replacement for libunique.
  * This is implemented in trg-gtk-app.c
@@ -205,18 +113,18 @@ trg_simple_init(TrgClient * client, int argc, char *argv[], gchar ** args)
 /* Win32 mailslots. I've implemented this in win32-mailslot.c */
 
 #if !WIN32
-static void trg_non_win32_init()
+static void trg_non_win32_init(void)
 {
     bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
 }
 #endif
 
-static void trg_cleanup()
+static void trg_cleanup(void)
 {
     curl_global_cleanup();
 }
 
-#if WIN32 || !GTK_CHECK_VERSION( 3, 0, 0 )
+#if WIN32
 
 static gchar **convert_args(int argc, char *argv[])
 {
@@ -261,17 +169,15 @@ static gchar **convert_args(int argc, char *argv[])
 
 int main(int argc, char *argv[])
 {
-#if WIN32 || !GTK_CHECK_VERSION( 3, 0, 0 )
+#if WIN32
     gchar **args;
 #endif
     gint exitCode = EXIT_SUCCESS;
     TrgClient *client;
 
-    g_type_init();
-    g_thread_init(NULL);
     gtk_init(&argc, &argv);
 
-#if WIN32 || !GTK_CHECK_VERSION( 3, 0, 0 )
+#if WIN32
     args = convert_args(argc, argv);
 #endif
 
@@ -286,13 +192,7 @@ int main(int argc, char *argv[])
     exitCode = trg_win32_init(client, argc, argv, args);
 #else
     trg_non_win32_init();
-#if !GTK_CHECK_VERSION( 3, 0, 0 ) && HAVE_LIBUNIQUE
-    exitCode = trg_libunique_init(client, argc, argv, args);
-#elif GTK_CHECK_VERSION( 3, 0, 0 )
     exitCode = trg_gtkapp_init(client, argc, argv);
-#else
-    exitCode = trg_simple_init(client, argc, argv, args);
-#endif
 #endif
 
     trg_cleanup();
diff --git a/src/protocol-constants.h b/src/protocol-constants.h
index 061a10e..8fffb00 100644
--- a/src/protocol-constants.h
+++ b/src/protocol-constants.h
@@ -56,6 +56,7 @@
 #define FIELD_ETA				"eta"
 #define FIELD_UPLOADEDEVER		"uploadedEver"
 #define FIELD_DOWNLOADEDEVER	"downloadedEver"
+#define FIELD_CORRUPTEVER		"corruptEver"
 #define FIELD_HAVEVALID			"haveValid"
 #define FIELD_HAVEUNCHECKED		"haveUnchecked"
 #define FIELD_PERCENTDONE		"percentDone"
diff --git a/src/remote-exec.c b/src/remote-exec.c
index edf75f2..774c266 100644
--- a/src/remote-exec.c
+++ b/src/remote-exec.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <json-glib/json-glib.h>
@@ -26,6 +30,7 @@
 #include "trg-prefs.h"
 #include "protocol-constants.h"
 #include "torrent.h"
+#include "remote-exec.h"
 
 /* A few functions used to build local commands, otherwise known as actions.
  *
@@ -53,7 +58,7 @@ static const char json_exceptions[] = { 0x7f, 0x80, 0x81, 0x82, 0x83, 0x84,
 
 static gchar *dump_json_value(JsonNode * node)
 {
-    GValue value = { 0, };
+    GValue value = G_VALUE_INIT;
     GString *buffer;
 
     buffer = g_string_new("");
diff --git a/src/requests.c b/src/requests.c
index 95be1d7..4e044ab 100644
--- a/src/requests.c
+++ b/src/requests.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 
 #include <glib/gstdio.h>
@@ -180,6 +184,7 @@ JsonNode *torrent_get(gint64 id)
     json_array_add_string_element(fields, FIELD_ADDED_DATE);
     json_array_add_string_element(fields, FIELD_DOWNLOADEDEVER);
     json_array_add_string_element(fields, FIELD_UPLOADEDEVER);
+    json_array_add_string_element(fields, FIELD_CORRUPTEVER);
     json_array_add_string_element(fields, FIELD_SIZEWHENDONE);
     json_array_add_string_element(fields, FIELD_QUEUE_POSITION);
     json_array_add_string_element(fields, FIELD_ID);
@@ -227,7 +232,22 @@ JsonNode *torrent_add_url(const gchar * url, gboolean paused)
     return root;
 }
 
-JsonNode *torrent_add(gchar * target, gint flags)
+JsonNode *torrent_add_from_response(trg_response *response, gint flags) {
+    JsonNode *root = base_request(METHOD_TORRENT_ADD);
+    JsonObject *args = node_get_arguments(root);
+    gchar *encoded = g_base64_encode((guchar *)response->raw, response->size);
+
+    json_object_set_string_member(args, PARAM_METAINFO,
+                                  encoded);
+    g_free(encoded);
+
+    json_object_set_boolean_member(args, PARAM_PAUSED,
+                                   (flags & TORRENT_ADD_FLAG_PAUSED));
+
+    return root;
+}
+
+JsonNode *torrent_add_from_file(gchar * target, gint flags)
 {
     JsonNode *root;
     JsonObject *args;
diff --git a/src/requests.h b/src/requests.h
index 5ea9b2a..7430fda 100644
--- a/src/requests.h
+++ b/src/requests.h
@@ -23,6 +23,8 @@
 #include <glib-object.h>
 #include <json-glib/json-glib.h>
 
+#include "trg-client.h"
+
 JsonNode *generic_request(gchar * method, JsonArray * array);
 
 JsonNode *session_set(void);
@@ -34,7 +36,8 @@ JsonNode *torrent_start(JsonArray * array);
 JsonNode *torrent_verify(JsonArray * array);
 JsonNode *torrent_reannounce(JsonArray * array);
 JsonNode *torrent_remove(JsonArray * array, int removeData);
-JsonNode *torrent_add(gchar * filename, gint flags);
+JsonNode *torrent_add_from_response(trg_response *response, gint flags);
+JsonNode *torrent_add_from_file(gchar * filename, gint flags);
 JsonNode *torrent_add_url(const gchar * url, gboolean paused);
 JsonNode *torrent_set_location(JsonArray * array, gchar * location,
                                gboolean move);
diff --git a/src/session-get.c b/src/session-get.c
index 98c466c..4706c72 100644
--- a/src/session-get.c
+++ b/src/session-get.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 
 #include <json-glib/json-glib.h>
diff --git a/src/torrent-cell-renderer.c b/src/torrent-cell-renderer.c
index 95f4d37..1157537 100644
--- a/src/torrent-cell-renderer.c
+++ b/src/torrent-cell-renderer.c
@@ -13,6 +13,10 @@
 /* This cell renderer has been modified heavily to work with the
  * TrgTorrentModel instead of libtransmission. */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include <glib/gi18n.h>
@@ -58,17 +62,10 @@ enum {
 #define COMPACT_ICON_SIZE GTK_ICON_SIZE_MENU
 #define FULL_ICON_SIZE GTK_ICON_SIZE_DND
 
-#if GTK_CHECK_VERSION( 3, 0, 0 )
 #define FOREGROUND_COLOR_KEY "foreground-rgba"
 typedef GdkRGBA GtrColor;
 typedef cairo_t GtrDrawable;
 typedef GtkRequisition GtrRequisition;
-#else
-#define FOREGROUND_COLOR_KEY "foreground-gdk"
-typedef GdkColor GtrColor;
-typedef GdkWindow GtrDrawable;
-typedef GdkRectangle GtrRequisition;
-#endif
 
 /***
 ****
@@ -329,16 +326,16 @@ static void getStatusString(GString * gstr, TorrentCellRenderer * r)
         if (priv->fileCount > 0) {
             g_string_append_printf(gstr,
                                    ngettext
-                                   ("Downloading from %1$li of %2$li connected peer",
-                                    "Downloading from %1$li of %2$li connected peers",
+                                   ("Downloading from %1$"G_GUINT64_FORMAT" of %2$"G_GUINT64_FORMAT" connected peer",
+                                    "Downloading from %1$"G_GUINT64_FORMAT" of %2$"G_GUINT64_FORMAT" connected peers",
                                     priv->webSeedsToUs + priv->peersToUs),
                                    priv->webSeedsToUs + priv->peersToUs,
                                    priv->webSeedsToUs + priv->connected);
         } else {
             g_string_append_printf(gstr,
                                    ngettext
-                                   ("Downloading metadata from %1$li peer (%2$s done)",
-                                    "Downloading metadata from %1$li peers (%2$s done)",
+                                   ("Downloading metadata from %1$"G_GUINT64_FORMAT" peer (%2$s done)",
+                                    "Downloading metadata from %1$"G_GUINT64_FORMAT" peers (%2$s done)",
                                     priv->connected + priv->webSeedsToUs),
                                    priv->connected + priv->webSeedsToUs,
                                    tr_strlpercent(buf,
@@ -348,8 +345,8 @@ static void getStatusString(GString * gstr, TorrentCellRenderer * r)
     } else if (priv->flags & TORRENT_FLAG_SEEDING) {
         g_string_append_printf(gstr,
                                ngettext
-                               ("Seeding to %1$li of %2$li connected peer",
-                                "Seeding to %1$li of %2$li connected peers",
+                               ("Seeding to %1$"G_GUINT64_FORMAT" of %2$"G_GUINT64_FORMAT" connected peer",
+                                "Seeding to %1$"G_GUINT64_FORMAT" of %2$"G_GUINT64_FORMAT" connected peers",
                                 priv->connected), priv->peersFromUs,
                                priv->connected);
     }
@@ -401,18 +398,8 @@ gtr_cell_renderer_get_preferred_size(GtkCellRenderer * renderer,
                                      GtkRequisition * minimum_size,
                                      GtkRequisition * natural_size)
 {
-#if GTK_CHECK_VERSION( 3, 0, 0 )
     gtk_cell_renderer_get_preferred_size(renderer, widget, minimum_size,
                                          natural_size);
-#else
-    GtkRequisition r;
-    gtk_cell_renderer_get_size(renderer, widget, NULL, NULL, NULL,
-                               &r.width, &r.height);
-    if (minimum_size)
-        *minimum_size = r;
-    if (natural_size)
-        *natural_size = r;
-#endif
 }
 
 static void
@@ -462,8 +449,6 @@ get_size_compact(TorrentCellRenderer * cell,
     g_object_unref(icon);
 }
 
-#define MAX3(a,b,c) MAX(a,MAX(b,c))
-
 static void
 get_size_full(TorrentCellRenderer * cell,
               GtkWidget * widget, gint * width, gint * height)
@@ -526,11 +511,7 @@ get_size_full(TorrentCellRenderer * cell,
 
 static void
 torrent_cell_renderer_get_size(GtkCellRenderer * cell, GtkWidget * widget,
-#if GTK_CHECK_VERSION( 3,0,0 )
                                const GdkRectangle * cell_area,
-#else
-                               GdkRectangle * cell_area,
-#endif
                                gint * x_offset,
                                gint * y_offset,
                                gint * width, gint * height)
@@ -570,7 +551,6 @@ get_text_color(TorrentCellRenderer * r, GtkWidget * widget,
                GtrColor * setme)
 {
     struct TorrentCellRendererPrivate *p = r->priv;
-#if GTK_CHECK_VERSION( 3,0,0 )
     static const GdkRGBA red = { 1.0, 0, 0, 0 };
 
     if (p->error)
@@ -581,16 +561,6 @@ get_text_color(TorrentCellRenderer * r, GtkWidget * widget,
     else
         gtk_style_context_get_color(gtk_widget_get_style_context(widget),
                                     GTK_STATE_FLAG_NORMAL, setme);
-#else
-    static const GdkColor red = { 0, 65535, 0, 0 };
-
-    if (p->error)
-        *setme = red;
-    else if (p->flags & TORRENT_FLAG_PAUSED)
-        *setme = gtk_widget_get_style(widget)->text[GTK_STATE_INSENSITIVE];
-    else
-        *setme = gtk_widget_get_style(widget)->text[GTK_STATE_NORMAL];
-#endif
 }
 
 static double get_percent_done(TorrentCellRenderer * r, gboolean * seed)
@@ -623,26 +593,15 @@ gtr_cell_renderer_render(GtkCellRenderer * renderer,
                          const GdkRectangle * area,
                          GtkCellRendererState flags)
 {
-#if GTK_CHECK_VERSION( 3, 0, 0 )
     gtk_cell_renderer_render(renderer, drawable, widget, area, area,
                              flags);
-#else
-    gtk_cell_renderer_render(renderer, drawable, widget, area, area, area,
-                             flags);
-#endif
 }
 
 static void
 torrent_cell_renderer_render(GtkCellRenderer * cell,
                              GtrDrawable * window, GtkWidget * widget,
-#if GTK_CHECK_VERSION( 3,0,0 )
                              const GdkRectangle * background_area,
                              const GdkRectangle * cell_area,
-#else
-                             GdkRectangle * background_area,
-                             GdkRectangle * cell_area,
-                             GdkRectangle * expose_area,
-#endif
                              GtkCellRendererState flags)
 {
     TorrentCellRenderer *self = TORRENT_CELL_RENDERER(cell);
diff --git a/src/torrent.c b/src/torrent.c
index ed595dd..e5577ee 100644
--- a/src/torrent.c
+++ b/src/torrent.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glib-object.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
@@ -176,6 +180,11 @@ gint64 torrent_get_uploaded(JsonObject * t)
     return json_object_get_int_member(t, FIELD_UPLOADEDEVER);
 }
 
+gint64 torrent_get_corrupted(JsonObject * t)
+{
+    return json_object_get_int_member(t, FIELD_CORRUPTEVER);
+}
+
 gint64 torrent_get_have_valid(JsonObject * t)
 {
     return json_object_get_int_member(t, FIELD_HAVEVALID);
@@ -299,23 +308,23 @@ torrent_get_flags(JsonObject * t, gint64 rpcv, gint64 status,
 gchar *torrent_get_status_icon(gint64 rpcv, guint flags)
 {
     if (flags & TORRENT_FLAG_ERROR)
-        return g_strdup(GTK_STOCK_DIALOG_WARNING);
+        return g_strdup("dialog-warning");
     else if (flags & TORRENT_FLAG_DOWNLOADING_METADATA)
-        return g_strdup(GTK_STOCK_FIND);
+        return g_strdup("edit-find");
     else if (flags & TORRENT_FLAG_DOWNLOADING)
-        return g_strdup(GTK_STOCK_GO_DOWN);
+        return g_strdup("go-down");
     else if (flags & TORRENT_FLAG_PAUSED)
-        return g_strdup(GTK_STOCK_MEDIA_PAUSE);
+        return g_strdup("media-playback-pause");
     else if (flags & TORRENT_FLAG_SEEDING)
-        return g_strdup(GTK_STOCK_GO_UP);
+        return g_strdup("go-up");
     else if (flags & TORRENT_FLAG_CHECKING)
-        return g_strdup(GTK_STOCK_REFRESH);
+        return g_strdup("view-refresh");
     else if (flags & TORRENT_FLAG_DOWNLOADING_WAIT)
-        return g_strdup(GTK_STOCK_MEDIA_REWIND);
+        return g_strdup("media-seek-backward");
     else if (flags & TORRENT_FLAG_SEEDING_WAIT)
-        return g_strdup(GTK_STOCK_MEDIA_FORWARD);
+        return g_strdup("media-seek-forward");
     else
-        return g_strdup(GTK_STOCK_DIALOG_QUESTION);
+        return g_strdup("dialog-question");
 }
 
 gint64 torrent_get_done_date(JsonObject * t)
diff --git a/src/torrent.h b/src/torrent.h
index cebdd76..c837046 100644
--- a/src/torrent.h
+++ b/src/torrent.h
@@ -51,6 +51,7 @@ gint64 torrent_get_rate_down(JsonObject * t);
 gint64 torrent_get_rate_up(JsonObject * t);
 gint64 torrent_get_eta(JsonObject * t);
 gint64 torrent_get_uploaded(JsonObject * t);
+gint64 torrent_get_corrupted(JsonObject * t);
 gint64 torrent_get_downloaded(JsonObject * t);
 const gchar *torrent_get_errorstr(JsonObject * t);
 gint64 torrent_get_error(JsonObject * t);
diff --git a/src/trg-about-window.c b/src/trg-about-window.c
index 8dbf7a8..c14482b 100644
--- a/src/trg-about-window.c
+++ b/src/trg-about-window.c
@@ -23,24 +23,14 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <json-glib/json-glib.h>
 
 #include "trg-about-window.h"
-#include "util.h"
 
 GtkWidget *trg_about_window_new(GtkWindow * parent)
 {
     GtkWidget *dialog;
     GdkPixbuf *logo;
-    gchar *licenseText = NULL;
     const gchar *trgAuthors[] = { "Alan Fitton <alan@eth0.org.uk>", NULL };
-    gchar *licenseFile;
-
-#ifdef WIN32
-    licenseFile = trg_win32_support_path("COPYING.TXT");
-#else
-    licenseFile = g_strdup(TRGLICENSE);
-#endif
 
     dialog = gtk_about_dialog_new();
     gtk_window_set_transient_for(GTK_WINDOW(dialog), parent);
@@ -56,12 +46,7 @@ GtkWidget *trg_about_window_new(GtkWindow * parent)
         g_object_unref(logo);
     }
 
-    if (g_file_get_contents(licenseFile, &licenseText, NULL, NULL)) {
-        gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(dialog),
-                                     licenseText);
-    } else {
-        gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(dialog), "GPL2");
-    }
+	gtk_about_dialog_set_license_type (GTK_ABOUT_DIALOG(dialog), GTK_LICENSE_GPL_2_0);
 
     gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(dialog),
                                       PACKAGE_NAME);
@@ -92,8 +77,6 @@ GtkWidget *trg_about_window_new(GtkWindow * parent)
                                             "* Ã…ke Svensson (Swedish)\n"
                                             "* ROR191 (Ukranian)\n");
 
-    g_free(licenseFile);
-    g_free(licenseText);
 
     return dialog;
 }
diff --git a/src/trg-cell-renderer-counter.c b/src/trg-cell-renderer-counter.c
index 9a4049c..b4494c2 100644
--- a/src/trg-cell-renderer-counter.c
+++ b/src/trg-cell-renderer-counter.c
@@ -17,27 +17,36 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <stdint.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gtk/gtk.h>
 
 #include "trg-cell-renderer-counter.h"
-#include "util.h"
 
-enum {
-    PROP_0, PROP_STATE_LABEL, PROP_STATE_COUNT
+enum
+{
+	PROP_0,
+	PROP_STATE_LABEL,
+	PROP_STATE_COUNT,
+	N_PROPS,
 };
 
-G_DEFINE_TYPE(TrgCellRendererCounter, trg_cell_renderer_counter,
-              GTK_TYPE_CELL_RENDERER_TEXT)
-#define TRG_CELL_RENDERER_COUNTER_GET_PRIVATE(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRG_TYPE_CELL_RENDERER_COUNTER, TrgCellRendererCounterPrivate))
-typedef struct _TrgCellRendererCounterPrivate
- TrgCellRendererCounterPrivate;
+struct _TrgCellRendererCounter
+{
+	GtkCellRendererText parent;
+};
 
-struct _TrgCellRendererCounterPrivate {
-    gint count;
+typedef struct
+{
+	gint count;
     gchar *originalLabel;
-};
+} TrgCellRendererCounterPrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE(TrgCellRendererCounter, trg_cell_renderer_counter,
+              GTK_TYPE_CELL_RENDERER_TEXT)
+
 
 static void trg_cell_renderer_counter_get_property(GObject * object,
                                                    guint property_id,
@@ -45,7 +54,7 @@ static void trg_cell_renderer_counter_get_property(GObject * object,
                                                    GParamSpec * pspec)
 {
     TrgCellRendererCounterPrivate *priv =
-        TRG_CELL_RENDERER_COUNTER_GET_PRIVATE(object);
+        trg_cell_renderer_counter_get_instance_private(TRG_CELL_RENDERER_COUNTER(object));
     switch (property_id) {
     case PROP_STATE_COUNT:
         g_value_set_int(value, priv->count);
@@ -59,7 +68,7 @@ static void trg_cell_renderer_counter_get_property(GObject * object,
 static void trg_cell_renderer_counter_refresh(TrgCellRendererCounter * cr)
 {
     TrgCellRendererCounterPrivate *priv =
-        TRG_CELL_RENDERER_COUNTER_GET_PRIVATE(cr);
+        trg_cell_renderer_counter_get_instance_private(cr);
     if (priv->originalLabel && priv->count > 0) {
         gchar *counterLabel =
             g_strdup_printf("%s <span size=\"small\">(%d)</span>",
@@ -79,7 +88,7 @@ trg_cell_renderer_counter_set_property(GObject * object,
                                        GParamSpec * pspec)
 {
     TrgCellRendererCounterPrivate *priv =
-        TRG_CELL_RENDERER_COUNTER_GET_PRIVATE(object);
+        trg_cell_renderer_counter_get_instance_private(TRG_CELL_RENDERER_COUNTER(object));
 
     if (property_id == PROP_STATE_LABEL) {
         g_free(priv->originalLabel);
@@ -101,10 +110,9 @@ trg_cell_renderer_counter_set_property(GObject * object,
 static void trg_cell_renderer_counter_dispose(GObject * object)
 {
     TrgCellRendererCounterPrivate *priv =
-        TRG_CELL_RENDERER_COUNTER_GET_PRIVATE(object);
+        trg_cell_renderer_counter_get_instance_private(TRG_CELL_RENDERER_COUNTER(object));
     g_free(priv->originalLabel);
-    G_OBJECT_CLASS(trg_cell_renderer_counter_parent_class)->dispose
-        (object);
+    G_OBJECT_CLASS(trg_cell_renderer_counter_parent_class)->dispose(object);
 }
 
 static void
@@ -125,9 +133,7 @@ trg_cell_renderer_counter_class_init(TrgCellRendererCounterClass * klass)
                                                      INT_MAX,
                                                      -1,
                                                      G_PARAM_READWRITE |
-                                                     G_PARAM_STATIC_NAME |
-                                                     G_PARAM_STATIC_NICK |
-                                                     G_PARAM_STATIC_BLURB));
+                                                     G_PARAM_STATIC_STRINGS));
 
     g_object_class_install_property(object_class,
                                     PROP_STATE_LABEL,
@@ -136,13 +142,7 @@ trg_cell_renderer_counter_class_init(TrgCellRendererCounterClass * klass)
                                                         "State Label",
                                                         NULL,
                                                         G_PARAM_READWRITE |
-                                                        G_PARAM_STATIC_NAME
-                                                        |
-                                                        G_PARAM_STATIC_NICK
-                                                        |
-                                                        G_PARAM_STATIC_BLURB));
-
-    g_type_class_add_private(klass, sizeof(TrgCellRendererCounterPrivate));
+                                                        G_PARAM_STATIC_STRINGS));
 }
 
 static void trg_cell_renderer_counter_init(TrgCellRendererCounter * self)
@@ -151,7 +151,5 @@ static void trg_cell_renderer_counter_init(TrgCellRendererCounter * self)
 
 GtkCellRenderer *trg_cell_renderer_counter_new(void)
 {
-    return
-        GTK_CELL_RENDERER(g_object_new
-                          (TRG_TYPE_CELL_RENDERER_COUNTER, NULL));
+    return g_object_new (TRG_TYPE_CELL_RENDERER_COUNTER, NULL);
 }
diff --git a/src/trg-cell-renderer-counter.h b/src/trg-cell-renderer-counter.h
index 7e70c4b..2c4f2ed 100644
--- a/src/trg-cell-renderer-counter.h
+++ b/src/trg-cell-renderer-counter.h
@@ -17,35 +17,16 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef TRG_CELL_RENDERER_COUNTER_H_
-#define TRG_CELL_RENDERER_COUNTER_H_
+#pragma once
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
-#define TRG_TYPE_CELL_RENDERER_COUNTER trg_cell_renderer_counter_get_type()
-#define TRG_CELL_RENDERER_COUNTER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRG_TYPE_CELL_RENDERER_COUNTER, TrgCellRendererCounter))
-#define TRG_CELL_RENDERER_COUNTER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), TRG_TYPE_CELL_RENDERER_COUNTER, TrgCellRendererCounterClass))
-#define TRG_IS_CELL_RENDERER_COUNTER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRG_TYPE_CELL_RENDERER_COUNTER))
-#define TRG_IS_CELL_RENDERER_COUNTER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), TRG_TYPE_CELL_RENDERER_COUNTER))
-#define TRG_CELL_RENDERER_COUNTER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), TRG_TYPE_CELL_RENDERER_COUNTER, TrgCellRendererCounterClass))
-    typedef struct {
-    GtkCellRendererText parent;
-} TrgCellRendererCounter;
-
-typedef struct {
-    GtkCellRendererTextClass parent_class;
-} TrgCellRendererCounterClass;
-
-GType trg_cell_renderer_counter_get_type(void);
+
+#define TRG_TYPE_CELL_RENDERER_COUNTER (trg_cell_renderer_counter_get_type())
+G_DECLARE_FINAL_TYPE (TrgCellRendererCounter, trg_cell_renderer_counter, TRG, CELL_RENDERER_COUNTER, GtkCellRendererText)
 
 GtkCellRenderer *trg_cell_renderer_counter_new(void);
 
 G_END_DECLS
-#endif                          /* TRG_CELL_RENDERER_COUNTER_H_ */
+
diff --git a/src/trg-cell-renderer-epoch.c b/src/trg-cell-renderer-epoch.c
index 8e38949..6036e0e 100644
--- a/src/trg-cell-renderer-epoch.c
+++ b/src/trg-cell-renderer-epoch.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdint.h>
 #include <time.h>
 #include <gtk/gtk.h>
diff --git a/src/trg-cell-renderer-eta.c b/src/trg-cell-renderer-eta.c
index 90e8886..455fcd9 100644
--- a/src/trg-cell-renderer-eta.c
+++ b/src/trg-cell-renderer-eta.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdint.h>
 #include <gtk/gtk.h>
 
diff --git a/src/trg-cell-renderer-file-icon.c b/src/trg-cell-renderer-file-icon.c
index e116d90..5642ace 100644
--- a/src/trg-cell-renderer-file-icon.c
+++ b/src/trg-cell-renderer-file-icon.c
@@ -17,13 +17,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <stdint.h>
-#include <gtk/gtk.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include <stdint.h>
+#include <gtk/gtk.h>
+
 #include "trg-cell-renderer-file-icon.h"
 #include "util.h"
 
diff --git a/src/trg-cell-renderer-numgteqthan.c b/src/trg-cell-renderer-numgteqthan.c
index 3be1cd6..6b648ad 100644
--- a/src/trg-cell-renderer-numgteqthan.c
+++ b/src/trg-cell-renderer-numgteqthan.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdint.h>
 #include <gtk/gtk.h>
 
diff --git a/src/trg-cell-renderer-priority.c b/src/trg-cell-renderer-priority.c
index d52129a..28c503a 100644
--- a/src/trg-cell-renderer-priority.c
+++ b/src/trg-cell-renderer-priority.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdint.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
diff --git a/src/trg-cell-renderer-ratio.c b/src/trg-cell-renderer-ratio.c
index ed0a453..3404282 100644
--- a/src/trg-cell-renderer-ratio.c
+++ b/src/trg-cell-renderer-ratio.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <limits.h>
 #include <gtk/gtk.h>
 
diff --git a/src/trg-cell-renderer-size.c b/src/trg-cell-renderer-size.c
index ebe6b25..23edb55 100644
--- a/src/trg-cell-renderer-size.c
+++ b/src/trg-cell-renderer-size.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdint.h>
 #include <gtk/gtk.h>
 
diff --git a/src/trg-cell-renderer-speed.c b/src/trg-cell-renderer-speed.c
index a527b59..7487e01 100644
--- a/src/trg-cell-renderer-speed.c
+++ b/src/trg-cell-renderer-speed.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdint.h>
 #include <gtk/gtk.h>
 
diff --git a/src/trg-cell-renderer-wanted.c b/src/trg-cell-renderer-wanted.c
index c23aae1..8fbe031 100644
--- a/src/trg-cell-renderer-wanted.c
+++ b/src/trg-cell-renderer-wanted.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdint.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
diff --git a/src/trg-client.c b/src/trg-client.c
index f20677a..6b47d7a 100644
--- a/src/trg-client.c
+++ b/src/trg-client.c
@@ -17,7 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <stdlib.h>
 #include <string.h>
@@ -71,6 +73,7 @@ struct _TrgClientPrivate {
     gint64 updateSerial;
     JsonObject *session;
     gboolean ssl;
+    gboolean ssl_validate;
     gdouble version;
     char *url;
     char *username;
@@ -79,9 +82,10 @@ struct _TrgClientPrivate {
     GHashTable *torrentTable;
     GThreadPool *pool;
     TrgPrefs *prefs;
-    GPrivate *tlsKey;
+    GPrivate tlsKey;
     gint configSerial;
-    GMutex *configMutex;
+    guint http_class;
+    GMutex configMutex;
     gboolean seedRatioLimited;
     gdouble seedRatioLimit;
 };
@@ -155,8 +159,8 @@ TrgClient *trg_client_new(void)
 
     trg_prefs_load(prefs);
 
-    priv->configMutex = g_mutex_new();
-    priv->tlsKey = g_private_new(NULL);
+    g_mutex_init(&priv->configMutex);
+    //priv->tlsKey = g_private_new(NULL);
     priv->seedRatioLimited = FALSE;
     priv->seedRatioLimit = 0.00;
 
@@ -227,7 +231,7 @@ int trg_client_populate_with_settings(TrgClient * tc)
     pxProxyFactory *pf = NULL;
 #endif
 
-    g_mutex_lock(priv->configMutex);
+    g_mutex_lock(&priv->configMutex);
 
     trg_prefs_set_connection(prefs, trg_prefs_get_profile(prefs));
 
@@ -249,12 +253,15 @@ int trg_client_populate_with_settings(TrgClient * tc)
 
     if (!host || strlen(host) < 1) {
         g_free(host);
-        g_mutex_unlock(priv->configMutex);
+        g_mutex_unlock(&priv->configMutex);
         return TRG_NO_HOSTNAME_SET;
     }
 #ifndef CURL_NO_SSL
     priv->ssl = trg_prefs_get_bool(prefs, TRG_PREFS_KEY_SSL,
                                    TRG_PREFS_CONNECTION);
+    priv->ssl_validate = trg_prefs_get_bool(prefs, TRG_PREFS_KEY_SSL_VALIDATE,
+                                   TRG_PREFS_CONNECTION);
+
 #else
     priv->ssl = FALSE;
 #endif
@@ -296,7 +303,7 @@ int trg_client_populate_with_settings(TrgClient * tc)
 #endif
 
     priv->configSerial++;
-    g_mutex_unlock(priv->configMutex);
+    g_mutex_unlock(&priv->configMutex);
     return 0;
 }
 
@@ -325,14 +332,14 @@ void trg_client_set_session_id(TrgClient * tc, gchar * session_id)
 {
     TrgClientPrivate *priv = tc->priv;
 
-    g_mutex_lock(priv->configMutex);
+    g_mutex_lock(&priv->configMutex);
 
     if (priv->session_id)
         g_free(priv->session_id);
 
     priv->session_id = session_id;
 
-    g_mutex_unlock(priv->configMutex);
+    g_mutex_unlock(&priv->configMutex);
 }
 
 void trg_client_status_change(TrgClient * tc, gboolean connected)
@@ -344,9 +351,9 @@ void trg_client_status_change(TrgClient * tc, gboolean connected)
             json_object_unref(priv->session);
             priv->session = NULL;
         }
-        g_mutex_lock(priv->configMutex);
+        g_mutex_lock(&priv->configMutex);
         trg_prefs_set_connection(priv->prefs, NULL);
-        g_mutex_unlock(priv->configMutex);
+        g_mutex_unlock(&priv->configMutex);
     }
 }
 
@@ -377,6 +384,11 @@ gboolean trg_client_get_ssl(TrgClient * tc)
 {
     return tc->priv->ssl;
 }
+
+gboolean trg_client_get_ssl_validate(TrgClient * tc)
+{
+    return tc->priv->ssl_validate;
+}
 #endif
 
 gchar *trg_client_get_proxy(TrgClient * tc)
@@ -404,7 +416,7 @@ gboolean trg_client_is_connected(TrgClient * tc)
 
 void trg_client_configlock(TrgClient * tc)
 {
-    g_mutex_lock(tc->priv->configMutex);
+    g_mutex_lock(&tc->priv->configMutex);
 }
 
 guint trg_client_get_failcount(TrgClient * tc)
@@ -425,16 +437,22 @@ void trg_client_reset_failcount(TrgClient * tc)
 
 void trg_client_configunlock(TrgClient * tc)
 {
-    g_mutex_unlock(tc->priv->configMutex);
+    g_mutex_unlock(&tc->priv->configMutex);
 }
 
 /* formerly http.c */
 
 void trg_response_free(trg_response * response)
 {
-    if (response->obj)
-        json_object_unref(response->obj);
-    g_free(response);
+	if (response) {
+		if (response->obj)
+			json_object_unref(response->obj);
+
+		if (response->raw)
+			g_free(response->raw);
+
+		g_free(response);
+	}
 }
 
 static size_t
@@ -474,100 +492,131 @@ header_callback(void *ptr, size_t size, size_t nmemb, void *data)
     return (nmemb * size);
 }
 
-static void trg_tls_update(TrgClient * tc, trg_tls * tls, gint serial)
-{
-    gchar *proxy;
-
-    curl_easy_setopt(tls->curl, CURLOPT_PASSWORD,
-                     trg_client_get_password(tc));
-    curl_easy_setopt(tls->curl, CURLOPT_USERNAME,
-                     trg_client_get_username(tc));
-    curl_easy_setopt(tls->curl, CURLOPT_URL, trg_client_get_url(tc));
-
-#ifndef CURL_NO_SSL
-    if (trg_client_get_ssl(tc))
-        curl_easy_setopt(tls->curl, CURLOPT_SSL_VERIFYPEER, 0);
-#endif
-
-    proxy = trg_client_get_proxy(tc);
-    if (proxy) {
-        curl_easy_setopt(tls->curl, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
-        curl_easy_setopt(tls->curl, CURLOPT_PROXY, proxy);
-    }
-
-    tls->serial = serial;
-}
-
-trg_tls *trg_tls_new(TrgClient * tc)
+static trg_tls *trg_tls_new(TrgClient * tc)
 {
     trg_tls *tls = g_new0(trg_tls, 1);
 
     tls->curl = curl_easy_init();
-    curl_easy_setopt(tls->curl, CURLOPT_USERAGENT, PACKAGE_NAME);
-    curl_easy_setopt(tls->curl, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
-    curl_easy_setopt(tls->curl, CURLOPT_WRITEFUNCTION,
-                     &http_receive_callback);
-    curl_easy_setopt(tls->curl, CURLOPT_HEADERFUNCTION, &header_callback);
-    curl_easy_setopt(tls->curl, CURLOPT_WRITEHEADER, (void *) tc);
-
     tls->serial = -1;
 
     return tls;
 }
 
-static int
-trg_http_perform_inner(TrgClient * tc, gchar * reqstr,
-                       trg_response * response, gboolean recurse)
-{
-    TrgClientPrivate *priv = tc->priv;
-    TrgPrefs *prefs = trg_client_get_prefs(tc);
-    gpointer threadLocalStorage = g_private_get(priv->tlsKey);
-    trg_tls *tls;
-    long httpCode = 0;
-    gchar *session_id;
-    struct curl_slist *headers = NULL;
+static trg_tls *get_tls(TrgClient *tc) {
+	TrgClientPrivate *priv = tc->priv;
+	gpointer threadLocalStorage = g_private_get(&priv->tlsKey);
+	trg_tls *tls;
 
     if (!threadLocalStorage) {
         tls = trg_tls_new(tc);
-        g_private_set(priv->tlsKey, tls);
+        g_private_set(&priv->tlsKey, tls);
     } else {
         tls = (trg_tls *) threadLocalStorage;
     }
 
-    g_mutex_lock(priv->configMutex);
+    return tls;
+}
+
+static CURL* get_curl(TrgClient *tc, guint http_class)
+{
+	TrgClientPrivate *priv = tc->priv;
+	TrgPrefs *prefs = trg_client_get_prefs(tc);
+	trg_tls *tls = get_tls(tc);
+	CURL *curl = tls->curl;
+
+    g_mutex_lock(&priv->configMutex);
 
-    if (priv->configSerial > tls->serial)
-        trg_tls_update(tc, tls, priv->configSerial);
+    if (priv->configSerial > tls->serial || http_class != priv->http_class) {
+    	gchar *proxy;
+
+        curl_easy_reset(curl);
+
+        curl_easy_setopt(curl, CURLOPT_USERAGENT, PACKAGE_NAME);
+        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION,
+                         &http_receive_callback);
+#ifdef DEBUG
+        if (g_getenv("TRG_CURL_VERBOSE") != NULL)
+        	curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+#endif
+
+        if (http_class == HTTP_CLASS_TRANSMISSION) {
+        	curl_easy_setopt(curl, CURLOPT_WRITEHEADER, (void *) tc);
+        	curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
+        	curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, &header_callback);
+            curl_easy_setopt(curl, CURLOPT_PASSWORD,
+                             trg_client_get_password(tc));
+            curl_easy_setopt(curl, CURLOPT_USERNAME,
+                             trg_client_get_username(tc));
+            curl_easy_setopt(curl, CURLOPT_URL, trg_client_get_url(tc));
+        }
 
-    session_id = trg_client_get_session_id(tc);
-    if (session_id) {
-        headers = curl_slist_append(NULL, session_id);
-        curl_easy_setopt(tls->curl, CURLOPT_HTTPHEADER, headers);
+    #ifndef CURL_NO_SSL
+        if (trg_client_get_ssl(tc) && !trg_client_get_ssl_validate(tc)) {
+
+            curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
+            curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
+        }
+    #endif
+
+        proxy = trg_client_get_proxy(tc);
+        if (proxy) {
+            curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
+            curl_easy_setopt(curl, CURLOPT_PROXY, proxy);
+        }
+
+        tls->serial = priv->configSerial;
+        priv->http_class = http_class;
     }
 
-    curl_easy_setopt(tls->curl, CURLOPT_TIMEOUT,
-                     (long) trg_prefs_get_int(prefs, TRG_PREFS_KEY_TIMEOUT,
-                                              TRG_PREFS_CONNECTION));
+    if (http_class == HTTP_CLASS_TRANSMISSION)
+    	curl_easy_setopt(curl, CURLOPT_URL, trg_client_get_url(tc));
+
+	curl_easy_setopt(curl, CURLOPT_TIMEOUT,
+					 (long) trg_prefs_get_int(prefs, TRG_PREFS_KEY_TIMEOUT,
+											  TRG_PREFS_CONNECTION));
 
-    g_mutex_unlock(priv->configMutex);
+    g_mutex_unlock(&priv->configMutex);
+
+    /* Headers are set on each use, then freed, so make sure invalid headers aren't still around. */
+    curl_easy_setopt(curl, CURLOPT_HTTPHEADER, NULL);
+
+    return curl;
+
+}
+
+static inline int
+trg_http_perform_inner(TrgClient * tc, trg_request * request,
+                       trg_response * response, gboolean recurse)
+{
+    CURL* curl = get_curl(tc, HTTP_CLASS_TRANSMISSION);
+	struct curl_slist *headers = NULL;
+	gchar *session_id = NULL;
+    long httpCode = 0;
 
     response->size = 0;
     response->raw = NULL;
 
-    curl_easy_setopt(tls->curl, CURLOPT_POSTFIELDS, reqstr);
-    curl_easy_setopt(tls->curl, CURLOPT_WRITEDATA, (void *) response);
-    response->status = curl_easy_perform(tls->curl);
+    curl_easy_setopt(curl, CURLOPT_POSTFIELDS, request->body);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *) response);
 
-    if (session_id) {
-        g_free(session_id);
-        curl_slist_free_all(headers);
-    }
+	session_id = trg_client_get_session_id(tc);
+	if (session_id)
+		headers = curl_slist_append(NULL, session_id);
+
+	curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
+
+    response->status = curl_easy_perform(curl);
 
-    curl_easy_getinfo(tls->curl, CURLINFO_RESPONSE_CODE, &httpCode);
+    curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &httpCode);
+
+    g_free(session_id);
+
+    if (headers)
+    	curl_slist_free_all(headers);
 
     if (response->status == CURLE_OK) {
         if (httpCode == HTTP_CONFLICT && recurse == TRUE)
-            return trg_http_perform_inner(tc, reqstr, response, FALSE);
+            return trg_http_perform_inner(tc, request, response, FALSE);
         else if (httpCode != HTTP_OK)
             response->status = (-httpCode) - 100;
     }
@@ -575,32 +624,37 @@ trg_http_perform_inner(TrgClient * tc, gchar * reqstr,
     return response->status;
 }
 
-int trg_http_perform(TrgClient * tc, gchar * reqstr, trg_response * reqrsp)
+int trg_http_perform(TrgClient * tc, trg_request *request, trg_response * rsp)
 {
-    return trg_http_perform_inner(tc, reqstr, reqrsp, TRUE);
+    return trg_http_perform_inner(tc, request, rsp, TRUE);
 }
 
-/* formerly dispatch.c */
+static void trg_request_free(trg_request *req) {
+	g_free(req->body);
+	g_free(req->url);
+	g_free(req->cookie);
 
-trg_response *dispatch(TrgClient * tc, JsonNode * req)
-{
-    gchar *serialized = trg_serialize(req);
-    json_node_free(req);
-#ifdef DEBUG
-    if (g_getenv("TRG_SHOW_OUTGOING"))
-        g_debug("=>(OUTgoing)=>: %s", serialized);
-#endif
-    return dispatch_str(tc, serialized);
+	if (req->node)
+		json_node_free(req->node);
 }
 
-trg_response *dispatch_str(TrgClient * tc, gchar * req)
+/* formerly dispatch.c */
+
+trg_response *dispatch(TrgClient * tc, trg_request *req)
 {
     trg_response *response = g_new0(trg_response, 1);
     GError *decode_error = NULL;
     JsonNode *result;
 
+	if (req->node && !req->body)
+		req->body = trg_serialize(req->node);
+
+#ifdef DEBUG
+    if (g_getenv("TRG_SHOW_OUTGOING"))
+        g_message("=>(OUTgoing)=>: %s", req->body);
+#endif
+
     trg_http_perform(tc, req, response);
-    g_free(req);
 
     if (response->status == CURLE_OK)
         response->obj = trg_deserialize(response, &decode_error);
@@ -625,16 +679,56 @@ trg_response *dispatch_str(TrgClient * tc, gchar * req)
     return response;
 }
 
+trg_response *dispatch_public_http(TrgClient *tc, trg_request *req) {
+	trg_response *response = g_new0(trg_response, 1);
+    CURL* curl = get_curl(tc, HTTP_CLASS_PUBLIC);
+    struct curl_slist *headers = NULL;
+    long httpCode = 0;
+    gchar *cookie_header = NULL;
+
+    response->size = 0;
+    response->raw = NULL;
+
+	curl_easy_setopt(curl, CURLOPT_URL, req->url);
+	curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *) response);
+
+	if (req->cookie) {
+		cookie_header = g_strdup_printf("Cookie: %s", req->cookie);
+		headers = curl_slist_append(NULL, cookie_header);
+	}
+
+	if (headers)
+		curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
+
+    response->status = curl_easy_perform(curl);
+
+    trg_request_free(req);
+
+    g_free(cookie_header);
+
+    if (headers)
+    	curl_slist_free_all(headers);
+
+    //g_message(response->raw);
+
+    curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &httpCode);
+
+    if (response->status == CURLE_OK && httpCode != HTTP_OK) {
+      response->status = (-httpCode) - 100;
+    }
+
+	return response;
+}
+
 static void dispatch_async_threadfunc(trg_request * req, TrgClient * tc)
 {
     TrgClientPrivate *priv = tc->priv;
-
     trg_response *rsp;
 
-    if (req->str)
-        rsp = dispatch_str(tc, req->str);
+    if (req->url)
+    	rsp = dispatch_public_http(tc, req);
     else
-        rsp = dispatch(tc, req->node);
+        rsp = dispatch(tc, req);
 
     rsp->cb_data = req->cb_data;
 
@@ -679,14 +773,14 @@ dispatch_async(TrgClient * tc, JsonNode * req,
     return dispatch_async_common(tc, trg_req, callback, data);
 }
 
-gboolean
-dispatch_async_str(TrgClient * tc, gchar * req,
-                   GSourceFunc callback, gpointer data)
-{
-    trg_request *trg_req = g_new0(trg_request, 1);
-    trg_req->str = req;
+gboolean async_http_request(TrgClient *tc, gchar *url, const gchar *cookie, GSourceFunc callback, gpointer data) {
+	trg_request *trg_req = g_new0(trg_request, 1);
+	trg_req->url = g_strdup(url);
 
-    return dispatch_async_common(tc, trg_req, callback, data);
+	if (cookie)
+		trg_req->cookie = g_strdup(cookie);
+
+	return dispatch_async_common(tc, trg_req, callback, data);
 }
 
 gboolean trg_client_update_session(TrgClient * tc, GSourceFunc callback,
diff --git a/src/trg-client.h b/src/trg-client.h
index 3b7d916..2c53628 100644
--- a/src/trg-client.h
+++ b/src/trg-client.h
@@ -22,10 +22,6 @@
 #ifndef _TRG_CLIENT_H_
 #define _TRG_CLIENT_H_
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <curl/curl.h>
 #include <curl/easy.h>
 
@@ -57,6 +53,9 @@
 #define FAIL_RESPONSE_UNSUCCESSFUL -3
 #define DISPATCH_POOL_SIZE 3
 
+#define HTTP_CLASS_TRANSMISSION 0
+#define HTTP_CLASS_PUBLIC 1
+
 typedef struct {
     int status;
     int size;
@@ -68,9 +67,11 @@ typedef struct {
 typedef struct {
     gint connid;
     JsonNode *node;
-    gchar *str;
+    gchar *body;
+    gchar *url;
     GSourceFunc callback;
     gpointer cb_data;
+    gchar *cookie;
 } trg_request;
 
 typedef struct _TrgClientPrivate TrgClientPrivate;
@@ -109,20 +110,23 @@ typedef struct {
      * We lock updating (and checking for updates) with priv->configMutex
      */
     int serial;
+    guint client_class;
     CURL *curl;
 } trg_tls;
 
 /* stuff that used to be in http.h */
 void trg_response_free(trg_response * response);
-int trg_http_perform(TrgClient * client, gchar * reqstr,
-                     trg_response * reqrsp);
+int trg_http_perform(TrgClient * tc, trg_request *request, trg_response * rsp);
+
 /* end http.h*/
 
 /* stuff that used to be in dispatch.c */
-trg_response *dispatch(TrgClient * client, JsonNode * req);
-trg_response *dispatch_str(TrgClient * client, gchar * req);
+trg_response *dispatch(TrgClient * tc, trg_request *req);
+trg_response *dispatch_public_http(TrgClient *tc, trg_request *req);
 gboolean dispatch_async(TrgClient * client, JsonNode * req,
                         GSourceFunc callback, gpointer data);
+gboolean async_http_request(TrgClient *tc, gchar *url, const gchar *cookie, GSourceFunc callback, gpointer data);
+
 /* end dispatch.c*/
 
 GType trg_client_get_type(void);
@@ -141,6 +145,7 @@ gchar *trg_client_get_session_id(TrgClient * tc);
 void trg_client_set_session_id(TrgClient * tc, gchar * session_id);
 #ifndef CURL_NO_SSL
 gboolean trg_client_get_ssl(TrgClient * tc);
+gboolean trg_client_get_ssl_validate(TrgClient * tc);
 #endif
 gchar *trg_client_get_proxy(TrgClient * tc);
 gint64 trg_client_get_serial(TrgClient * tc);
diff --git a/src/trg-destination-combo.c b/src/trg-destination-combo.c
index d2e3eb0..a361bae 100644
--- a/src/trg-destination-combo.c
+++ b/src/trg-destination-combo.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
@@ -26,25 +30,24 @@
 #include "trg-destination-combo.h"
 #include "util.h"
 
-G_DEFINE_TYPE(TrgDestinationCombo, trg_destination_combo,
-              GTK_TYPE_COMBO_BOX)
-#define TRG_DESTINATION_COMBO_GET_PRIVATE(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRG_TYPE_DESTINATION_COMBO, TrgDestinationComboPrivate))
-typedef struct _TrgDestinationComboPrivate TrgDestinationComboPrivate;
+struct _TrgDestinationCombo {
+    GtkComboBox parent_instance;
+};
 
-struct _TrgDestinationComboPrivate {
+typedef struct {
     TrgClient *client;
     gchar *last_selection;
-    GtkWidget *entry;
-    GtkCellRenderer *text_renderer;
-};
+} TrgDestinationComboPrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE(TrgDestinationCombo, trg_destination_combo,
+              GTK_TYPE_COMBO_BOX)
 
 enum {
     PROP_0, PROP_CLIENT, PROP_LAST_SELECTION
 };
 
 enum {
-    DEST_DEFAULT, DEST_LABEL, DEST_EXISTING, DEST_USERADD
+    DEST_DEFAULT, DEST_LABEL, DEST_EXISTING
 };
 
 enum {
@@ -54,7 +57,7 @@ enum {
 static void trg_destination_combo_finalize(GObject * object)
 {
     TrgDestinationComboPrivate *priv =
-        TRG_DESTINATION_COMBO_GET_PRIVATE(object);
+        trg_destination_combo_get_instance_private(TRG_DESTINATION_COMBO(object));
     g_free(priv->last_selection);
 }
 
@@ -64,7 +67,7 @@ trg_destination_combo_get_property(GObject * object,
                                    GValue * value, GParamSpec * pspec)
 {
     TrgDestinationComboPrivate *priv =
-        TRG_DESTINATION_COMBO_GET_PRIVATE(object);
+        trg_destination_combo_get_instance_private(TRG_DESTINATION_COMBO(object));
     switch (property_id) {
     case PROP_CLIENT:
         g_value_set_pointer(value, priv->client);
@@ -85,7 +88,7 @@ trg_destination_combo_set_property(GObject * object,
                                    GParamSpec * pspec)
 {
     TrgDestinationComboPrivate *priv =
-        TRG_DESTINATION_COMBO_GET_PRIVATE(object);
+        trg_destination_combo_get_instance_private(TRG_DESTINATION_COMBO(object));
     switch (property_id) {
     case PROP_CLIENT:
         priv->client = g_value_get_pointer(value);
@@ -115,7 +118,7 @@ static gboolean g_slist_str_set_add(GSList ** list, const gchar * string)
 void trg_destination_combo_save_selection(TrgDestinationCombo * combo_box)
 {
     TrgDestinationComboPrivate *priv =
-        TRG_DESTINATION_COMBO_GET_PRIVATE(combo_box);
+        trg_destination_combo_get_instance_private(combo_box);
     GtkTreeIter iter;
 
     if (priv->last_selection
@@ -126,53 +129,16 @@ void trg_destination_combo_save_selection(TrgDestinationCombo * combo_box)
         TrgPrefs *prefs = trg_client_get_prefs(priv->client);
         gchar *text;
 
-        gtk_tree_model_get(model, &iter, DEST_COLUMN_LABEL, &text, -1);
+        gtk_tree_model_get(model, &iter, DEST_COLUMN_DIR, &text, -1);
         trg_prefs_set_string(prefs, priv->last_selection, text,
                              TRG_PREFS_CONNECTION);
         g_free(text);
     }
 }
 
-static void
-gtk_combo_box_entry_active_changed(GtkComboBox * combo_box,
-                                   gpointer user_data)
+static inline GtkEntry *trg_destination_combo_get_entry(TrgDestinationCombo * combo)
 {
-    GtkTreeModel *model;
-    GtkTreeIter iter;
-    gboolean editableEntry = TRUE;
-
-    if (gtk_combo_box_get_active_iter(combo_box, &iter)) {
-        GtkEntry *entry =
-            trg_destination_combo_get_entry(TRG_DESTINATION_COMBO
-                                            (combo_box));
-
-        if (entry) {
-            GValue value = { 0, };
-            guint type;
-
-            model = gtk_combo_box_get_model(combo_box);
-
-            gtk_tree_model_get_value(model, &iter, DEST_COLUMN_LABEL,
-                                     &value);
-            gtk_tree_model_get(model, &iter, DEST_COLUMN_TYPE, &type, -1);
-
-            g_object_set_property(G_OBJECT(entry), "text", &value);
-            g_value_unset(&value);
-
-            if (type == DEST_LABEL)
-                editableEntry = FALSE;
-        }
-    }
-#if GTK_CHECK_VERSION( 3, 0, 0 )
-    gtk_editable_set_editable(GTK_EDITABLE
-                              (trg_destination_combo_get_entry
-                               (TRG_DESTINATION_COMBO(combo_box))),
-                              editableEntry);
-#else
-    gtk_entry_set_editable(trg_destination_combo_get_entry
-                           (TRG_DESTINATION_COMBO(combo_box)),
-                           editableEntry);
-#endif
+    return GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo)));
 }
 
 gboolean trg_destination_combo_has_text(TrgDestinationCombo * combo)
@@ -183,35 +149,12 @@ gboolean trg_destination_combo_has_text(TrgDestinationCombo * combo)
     return strlen(text) > 0;
 }
 
-GtkEntry *trg_destination_combo_get_entry(TrgDestinationCombo * combo)
-{
-    TrgDestinationComboPrivate *priv =
-        TRG_DESTINATION_COMBO_GET_PRIVATE(combo);
-    return GTK_ENTRY(priv->entry);
-}
-
-static void
-add_entry_cb(GtkEntry * entry,
-             GtkEntryIconPosition icon_pos,
-             GdkEvent * event, gpointer user_data)
-{
-    GtkComboBox *combo = GTK_COMBO_BOX(user_data);
-    GtkTreeModel *model = gtk_combo_box_get_model(combo);
-    GtkTreeIter iter;
-
-    gtk_list_store_insert_with_values(GTK_LIST_STORE(model), &iter,
-                                      INT_MAX, DEST_COLUMN_LABEL, "",
-                                      DEST_COLUMN_DIR, "",
-                                      DEST_COLUMN_TYPE, DEST_USERADD, -1);
-    gtk_combo_box_set_active_iter(combo, &iter);
-}
-
 struct findDupeArg {
     const gchar *dir;
     gboolean isDupe;
 };
 
-gboolean
+static gboolean
 trg_destination_combo_insert_check_dupe_foreach(GtkTreeModel * model,
                                                 GtkTreePath *
                                                 path G_GNUC_UNUSED,
@@ -228,12 +171,11 @@ trg_destination_combo_insert_check_dupe_foreach(GtkTreeModel * model,
 static void
 trg_destination_combo_insert(GtkComboBox * box,
                              const gchar * label,
-                             const gchar * dir, guint type,
-                             const gchar * lastDestination)
+                             const gchar * dir,
+                             guint         type)
 {
     GtkTreeModel *model = gtk_combo_box_get_model(box);
     gchar *comboLabel;
-    GtkTreeIter iter;
 
     if (type == DEST_EXISTING) {
         struct findDupeArg args;
@@ -250,110 +192,88 @@ trg_destination_combo_insert(GtkComboBox * box,
     comboLabel =
         label ? g_strdup_printf("%s (%s)", label, dir) : g_strdup(dir);
 
-    gtk_list_store_insert_with_values(GTK_LIST_STORE(model), &iter,
-                                      INT_MAX, DEST_COLUMN_LABEL,
-                                      comboLabel, DEST_COLUMN_DIR, dir,
+    gtk_list_store_insert_with_values(GTK_LIST_STORE(model), NULL, -1,
+                                      DEST_COLUMN_LABEL, comboLabel,
+                                      DEST_COLUMN_DIR, dir,
                                       DEST_COLUMN_TYPE, type, -1);
-
-    if (lastDestination && !g_strcmp0(lastDestination, comboLabel))
-        gtk_combo_box_set_active_iter(box, &iter);
-
     g_free(comboLabel);
 }
 
-static GObject *trg_destination_combo_constructor(GType type,
-                                                  guint
-                                                  n_construct_properties,
-                                                  GObjectConstructParam *
-                                                  construct_params)
+gchar *trg_destination_combo_get_dir(TrgDestinationCombo * combo)
 {
-    GObject *object = G_OBJECT_CLASS
-        (trg_destination_combo_parent_class)->constructor(type,
-                                                          n_construct_properties,
-                                                          construct_params);
-    TrgDestinationComboPrivate *priv =
-        TRG_DESTINATION_COMBO_GET_PRIVATE(object);
+    GtkTreeModel *model = gtk_combo_box_get_model(GTK_COMBO_BOX(combo));
+    GtkTreeIter iter;
+
+    if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo), &iter)) {
+        gchar *value;
+        guint type;
+
+        gtk_tree_model_get(model, &iter, DEST_COLUMN_TYPE, &type, -1);
+
+        if (type == DEST_LABEL) {
+            gtk_tree_model_get(model, &iter, DEST_COLUMN_DIR, &value, -1);
+            return value;
+        }
+    }
+
+    return
+        g_strdup(gtk_entry_get_text
+                 (trg_destination_combo_get_entry(combo)));
+}
 
+static void
+load_directory_model(TrgDestinationCombo *self)
+{
+    TrgDestinationComboPrivate *priv = trg_destination_combo_get_instance_private(self);
     TrgClient *client = priv->client;
     TrgPrefs *prefs = trg_client_get_prefs(client);
 
     GSList *dirs = NULL, *sli;
     GList *li, *list;
-    GtkTreeRowReference *rr;
-    GtkTreeModel *model;
-    GtkTreePath *path;
-    GtkListStore *comboModel;
+
     JsonArray *savedDestinations;
     gchar *defaultDir;
-    gchar *lastDestination = NULL;
-
-    comboModel = gtk_list_store_new(N_DEST_COLUMNS, G_TYPE_STRING,
-                                    G_TYPE_STRING, G_TYPE_UINT);
-    gtk_combo_box_set_model(GTK_COMBO_BOX(object),
-                            GTK_TREE_MODEL(comboModel));
-    g_object_unref(comboModel);
-
-    g_signal_connect(object, "changed",
-                     G_CALLBACK(gtk_combo_box_entry_active_changed), NULL);
-
-    priv->entry = gtk_entry_new();
-    gtk_container_add(GTK_CONTAINER(object), priv->entry);
-
-    priv->text_renderer = gtk_cell_renderer_text_new();
-    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(object),
-                               priv->text_renderer, TRUE);
-
-    gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(object),
-                                   priv->text_renderer, "text", 0, NULL);
-
-    g_slist_foreach(dirs, (GFunc) g_free, NULL);
-    g_slist_free(dirs);
-
-    gtk_entry_set_icon_from_stock(GTK_ENTRY(priv->entry),
-                                  GTK_ENTRY_ICON_SECONDARY,
-                                  GTK_STOCK_CLEAR);
-
-    g_signal_connect(priv->entry, "icon-release",
-                     G_CALLBACK(add_entry_cb), object);
 
+    /* Add default dir */
     defaultDir =
         g_strdup(session_get_download_dir(trg_client_get_session(client)));
     rm_trailing_slashes(defaultDir);
 
+    trg_destination_combo_insert(GTK_COMBO_BOX(self),
+                                 NULL,
+                                 defaultDir, DEST_DEFAULT);
+    g_free (defaultDir);
+
+
+    /* Add saved dirs */
     savedDestinations =
         trg_prefs_get_array(prefs, TRG_PREFS_KEY_DESTINATIONS,
                             TRG_PREFS_CONNECTION);
-
-    if (priv->last_selection)
-        lastDestination = trg_prefs_get_string(prefs, priv->last_selection,
-                                               TRG_PREFS_CONNECTION);
-
-    trg_destination_combo_insert(GTK_COMBO_BOX(object),
-                                 NULL,
-                                 defaultDir, DEST_DEFAULT,
-                                 lastDestination);
-    gtk_combo_box_set_active(GTK_COMBO_BOX(object), 0);
-
     if (savedDestinations) {
         list = json_array_get_elements(savedDestinations);
         if (list) {
             for (li = list; li; li = g_list_next(li)) {
                 JsonObject *obj =
                     json_node_get_object((JsonNode *) li->data);
-                trg_destination_combo_insert(GTK_COMBO_BOX(object),
-                                             json_object_get_string_member
-                                             (obj, TRG_PREFS_SUBKEY_LABEL),
+                trg_destination_combo_insert(GTK_COMBO_BOX(self),
                                              json_object_get_string_member
-                                             (obj,
-                                              TRG_PREFS_KEY_DESTINATIONS_SUBKEY_DIR),
-                                             DEST_LABEL, lastDestination);
+                                                 (obj, TRG_PREFS_SUBKEY_LABEL),
+                                            json_object_get_string_member
+                                                 (obj, TRG_PREFS_KEY_DESTINATIONS_SUBKEY_DIR),
+                                             DEST_LABEL);
             }
             g_list_free(list);
         }
     }
 
+
+    /* Add all previously used download dirs */
     list = g_hash_table_get_values(trg_client_get_torrent_table(client));
     for (li = list; li; li = g_list_next(li)) {
+        GtkTreeRowReference *rr;
+        GtkTreeModel *model;
+        GtkTreePath *path;
+
         rr = (GtkTreeRowReference *) li->data;
         model = gtk_tree_row_reference_get_model(rr);
         path = gtk_tree_row_reference_get_path(rr);
@@ -378,38 +298,48 @@ static GObject *trg_destination_combo_constructor(GType type,
     }
 
     for (sli = dirs; sli; sli = g_slist_next(sli))
-        trg_destination_combo_insert(GTK_COMBO_BOX(object),
+        trg_destination_combo_insert(GTK_COMBO_BOX(self),
                                      NULL,
                                      (gchar *) sli->data,
-                                     DEST_EXISTING, lastDestination);
+                                     DEST_EXISTING);
 
+    g_slist_free_full (dirs, g_free);
     g_list_free(list);
-    g_free(defaultDir);
-    g_free(lastDestination);
+}
 
-    return object;
+static void set_text_column(GtkCellLayout *layout, guint col)
+{
+    GList *cells = gtk_cell_layout_get_cells (layout);
+    g_assert (cells != NULL);
+    gtk_cell_layout_set_attributes (layout, GTK_CELL_RENDERER(cells->data), "text", col, NULL);
+    g_list_free (cells);
 }
 
-gchar *trg_destination_combo_get_dir(TrgDestinationCombo * combo)
+static void trg_destination_combo_constructed(GObject *object)
 {
-    GtkTreeModel *model = gtk_combo_box_get_model(GTK_COMBO_BOX(combo));
-    GtkTreeIter iter;
+    TrgDestinationCombo *self = TRG_DESTINATION_COMBO (object);
+    TrgDestinationComboPrivate *priv =
+        trg_destination_combo_get_instance_private(self);
+    TrgPrefs *prefs = trg_client_get_prefs(priv->client);
 
-    if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo), &iter)) {
-        gchar *value;
-        guint type;
+    G_OBJECT_CLASS(trg_destination_combo_parent_class)->constructed(object);
 
-        gtk_tree_model_get(model, &iter, DEST_COLUMN_TYPE, &type, -1);
+    load_directory_model (self);
+    set_text_column (GTK_CELL_LAYOUT(self), DEST_COLUMN_LABEL);
 
-        if (type == DEST_LABEL) {
-            gtk_tree_model_get(model, &iter, DEST_COLUMN_DIR, &value, -1);
-            return value;
-        }
+    /* Must be set after constructed */
+    if (priv->last_selection) {
+        /* Restore any previous selection */
+        char *lastDestination = trg_prefs_get_string(prefs, priv->last_selection,
+                                               TRG_PREFS_CONNECTION);
+        if (!gtk_combo_box_set_active_id (GTK_COMBO_BOX(object), lastDestination))
+            g_warning ("Last selection was not a valid ID");
+        g_free(lastDestination);
+    }
+    else {
+        /* DefaultDir is the first item otherwise */
+        gtk_combo_box_set_active (GTK_COMBO_BOX(object), 0);
     }
-
-    return
-        g_strdup(gtk_entry_get_text
-                 (trg_destination_combo_get_entry(combo)));
 }
 
 static void
@@ -417,27 +347,19 @@ trg_destination_combo_class_init(TrgDestinationComboClass * klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS(klass);
 
-    g_type_class_add_private(klass, sizeof(TrgDestinationComboPrivate));
-
     object_class->get_property = trg_destination_combo_get_property;
     object_class->set_property = trg_destination_combo_set_property;
     object_class->finalize = trg_destination_combo_finalize;
-    object_class->constructor = trg_destination_combo_constructor;
+    object_class->constructed = trg_destination_combo_constructed;
 
     g_object_class_install_property(object_class,
                                     PROP_CLIENT,
                                     g_param_spec_pointer("trg-client",
                                                          "TClient",
                                                          "Client",
-                                                         G_PARAM_READWRITE
-                                                         |
-                                                         G_PARAM_CONSTRUCT_ONLY
-                                                         |
-                                                         G_PARAM_STATIC_NAME
-                                                         |
-                                                         G_PARAM_STATIC_NICK
-                                                         |
-                                                         G_PARAM_STATIC_BLURB));
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_CONSTRUCT_ONLY |
+                                                         G_PARAM_STATIC_STRINGS));
 
     g_object_class_install_property(object_class,
                                     PROP_LAST_SELECTION,
@@ -447,19 +369,25 @@ trg_destination_combo_class_init(TrgDestinationComboClass * klass)
                                      "LastSelectionKey", NULL,
                                      G_PARAM_READWRITE |
                                      G_PARAM_CONSTRUCT_ONLY |
-                                     G_PARAM_STATIC_NAME |
-                                     G_PARAM_STATIC_NICK |
-                                     G_PARAM_STATIC_BLURB));
+                                     G_PARAM_STATIC_STRINGS));
 }
 
 static void trg_destination_combo_init(TrgDestinationCombo * self)
 {
+    GtkListStore *store;
+
+    store = gtk_list_store_new(N_DEST_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT);
+    gtk_combo_box_set_model(GTK_COMBO_BOX(self), GTK_TREE_MODEL(store));
+    gtk_combo_box_set_id_column (GTK_COMBO_BOX(self), DEST_COLUMN_DIR);
+    gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX(self), DEST_COLUMN_LABEL);
+    g_object_unref(store);
 }
 
 GtkWidget *trg_destination_combo_new(TrgClient * client,
                                      const gchar * lastSelectionKey)
 {
     return GTK_WIDGET(g_object_new(TRG_TYPE_DESTINATION_COMBO,
+                                   "has-entry", TRUE,
                                    "trg-client", client,
                                    "last-selection-key", lastSelectionKey,
                                    NULL));
diff --git a/src/trg-destination-combo.h b/src/trg-destination-combo.h
index 9ab5076..9ece8cc 100644
--- a/src/trg-destination-combo.h
+++ b/src/trg-destination-combo.h
@@ -26,32 +26,14 @@
 #include "trg-client.h"
 
 G_BEGIN_DECLS
-#define TRG_TYPE_DESTINATION_COMBO trg_destination_combo_get_type()
-#define TRG_DESTINATION_COMBO(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRG_TYPE_DESTINATION_COMBO, TrgDestinationCombo))
-#define TRG_DESTINATION_COMBO_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), TRG_TYPE_DESTINATION_COMBO, TrgDestinationComboClass))
-#define TRG_IS_DESTINATION_COMBO(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRG_TYPE_DESTINATION_COMBO))
-#define TRG_IS_DESTINATION_COMBO_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), TRG_TYPE_DESTINATION_COMBO))
-#define TRG_DESTINATION_COMBO_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), TRG_TYPE_DESTINATION_COMBO, TrgDestinationComboClass))
-    typedef struct {
-    GtkComboBox parent;
-} TrgDestinationCombo;
-
-typedef struct {
-    GtkComboBoxClass parent_class;
-} TrgDestinationComboClass;
-
-GType trg_destination_combo_get_type(void);
+
+#define TRG_TYPE_DESTINATION_COMBO (trg_destination_combo_get_type())
+G_DECLARE_FINAL_TYPE(TrgDestinationCombo, trg_destination_combo, TRG, DESTINATION_COMBO, GtkComboBox)
 
 GtkWidget *trg_destination_combo_new(TrgClient * client,
                                      const gchar * lastSelectionKey);
 gchar *trg_destination_combo_get_dir(TrgDestinationCombo * combo);
 gboolean trg_destination_combo_has_text(TrgDestinationCombo * combo);
-GtkEntry *trg_destination_combo_get_entry(TrgDestinationCombo * combo);
 void trg_destination_combo_save_selection(TrgDestinationCombo * combo_box);
 
 G_END_DECLS
diff --git a/src/trg-file-parser.c b/src/trg-file-parser.c
index fbfb6aa..2200ec6 100644
--- a/src/trg-file-parser.c
+++ b/src/trg-file-parser.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 
@@ -134,32 +138,11 @@ static trg_files_tree_node *trg_parse_torrent_file_nodes(be_node *
     return top_node;
 }
 
-trg_torrent_file *trg_parse_torrent_file(const gchar * filename)
-{
-    GError *error = NULL;
-    GMappedFile *mf;
-    be_node *top_node, *info_node, *name_node;
-    trg_torrent_file *ret = NULL;
-
-    if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
-        g_message("%s does not exist", filename);
-        return NULL;
-    }
-
-    mf = g_mapped_file_new(filename, FALSE, &error);
-
-    if (error) {
-        g_error("%s", error->message);
-        g_error_free(error);
-        g_mapped_file_unref(mf);
-        return NULL;
-    } else {
-        top_node =
-            be_decoden(g_mapped_file_get_contents(mf),
-                       g_mapped_file_get_length(mf));
-    }
+trg_torrent_file *trg_parse_torrent_data(const gchar *data, gsize length) {
+	trg_torrent_file *ret = NULL;
+	be_node *top_node, *info_node, *name_node;
 
-    g_mapped_file_unref(mf);
+    top_node = be_decoden(data, length);
 
     if (!top_node) {
         return NULL;
@@ -199,3 +182,30 @@ trg_torrent_file *trg_parse_torrent_file(const gchar * filename)
     be_free(top_node);
     return ret;
 }
+
+trg_torrent_file *trg_parse_torrent_file(const gchar * filename)
+{
+    GError *error = NULL;
+    trg_torrent_file *ret = NULL;
+    GMappedFile *mf;
+
+    if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
+        g_message("%s does not exist", filename);
+        return NULL;
+    }
+
+    mf = g_mapped_file_new(filename, FALSE, &error);
+
+    if (error) {
+        g_error("%s", error->message);
+        g_error_free(error);
+        g_mapped_file_unref(mf);
+        return NULL;
+    } else {
+        ret = trg_parse_torrent_data(g_mapped_file_get_contents(mf), g_mapped_file_get_length(mf));
+    }
+
+    g_mapped_file_unref(mf);
+
+    return ret;
+}
diff --git a/src/trg-file-parser.h b/src/trg-file-parser.h
index 1344be2..caec42f 100644
--- a/src/trg-file-parser.h
+++ b/src/trg-file-parser.h
@@ -26,3 +26,4 @@ typedef struct {
 
 void trg_torrent_file_free(trg_torrent_file * t);
 trg_torrent_file *trg_parse_torrent_file(const gchar * filename);
+trg_torrent_file *trg_parse_torrent_data(const gchar *data, gsize length);
diff --git a/src/trg-files-model-common.c b/src/trg-files-model-common.c
index b435069..9be7aec 100644
--- a/src/trg-files-model-common.c
+++ b/src/trg-files-model-common.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 
 #include <glib.h>
diff --git a/src/trg-files-model.c b/src/trg-files-model.c
index bb1b46b..418748e 100644
--- a/src/trg-files-model.c
+++ b/src/trg-files-model.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 #include <limits.h>
 #include <gtk/gtk.h>
@@ -299,7 +303,7 @@ struct MinorUpdateData {
     JsonArray *wanted;
 };
 
-gboolean
+static gboolean
 trg_files_model_update_foreach(GtkListStore * model,
                                GtkTreePath * path G_GNUC_UNUSED,
                                GtkTreeIter * iter, gpointer data)
diff --git a/src/trg-files-tree-view-common.c b/src/trg-files-tree-view-common.c
index 4680d5f..37dc821 100644
--- a/src/trg-files-tree-view-common.c
+++ b/src/trg-files-tree-view-common.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 
 #include <glib.h>
@@ -62,31 +66,23 @@ view_popup_menu(GtkWidget * treeview, GdkEventButton * event,
     gtk_menu_shell_append(GTK_MENU_SHELL(menu),
                           gtk_separator_menu_item_new());
 
-    menuitem = gtk_image_menu_item_new_with_label(GTK_STOCK_APPLY);
-    gtk_image_menu_item_set_use_stock(GTK_IMAGE_MENU_ITEM(menuitem), TRUE);
-    gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM
-                                              (menuitem), TRUE);
-    gtk_menu_item_set_label(GTK_MENU_ITEM(menuitem), _("Download"));
+    menuitem = gtk_menu_item_new_with_label(_("Download"));
     g_signal_connect(menuitem, "activate", wanted_cb, treeview);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-    menuitem = gtk_image_menu_item_new_with_label(GTK_STOCK_CANCEL);
-    gtk_image_menu_item_set_use_stock(GTK_IMAGE_MENU_ITEM(menuitem), TRUE);
-    gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM
-                                              (menuitem), TRUE);
-    gtk_menu_item_set_label(GTK_MENU_ITEM(menuitem), _("Skip"));
+    menuitem = gtk_menu_item_new_with_label(_("Skip"));
     g_signal_connect(menuitem, "activate", unwanted_cb, treeview);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
     gtk_menu_shell_append(GTK_MENU_SHELL(menu),
                           gtk_separator_menu_item_new());
 
-    menuitem = gtk_image_menu_item_new_with_label(_("Expand All"));
+    menuitem = gtk_menu_item_new_with_label(_("Expand All"));
     g_signal_connect(menuitem, "activate", G_CALLBACK(expand_all_cb),
                      treeview);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-    menuitem = gtk_image_menu_item_new_with_label(_("Collapse All"));
+    menuitem = gtk_menu_item_new_with_label(_("Collapse All"));
     g_signal_connect(menuitem, "activate", G_CALLBACK(collapse_all_cb),
                      treeview);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
diff --git a/src/trg-files-tree-view.c b/src/trg-files-tree-view.c
index 1c93ad6..70147f7 100644
--- a/src/trg-files-tree-view.c
+++ b/src/trg-files-tree-view.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
@@ -93,7 +97,7 @@ static gboolean on_files_update(gpointer data)
 
     response->cb_data = priv->win;
 
-    return on_generic_interactive_action(data);
+    return on_generic_interactive_action_response(data);
 }
 
 static void send_updated_file_prefs(TrgFilesTreeView * tv)
diff --git a/src/trg-files-tree-view.h b/src/trg-files-tree-view.h
index dedcb3d..3cfecd7 100644
--- a/src/trg-files-tree-view.h
+++ b/src/trg-files-tree-view.h
@@ -38,12 +38,12 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_CLASS_TYPE ((klass), TRG_TYPE_FILES_TREE_VIEW))
 #define TRG_FILES_TREE_VIEW_GET_CLASS(obj) \
   (G_TYPE_INSTANCE_GET_CLASS ((obj), TRG_TYPE_FILES_TREE_VIEW, TrgFilesTreeViewClass))
-    typedef struct {
-    GtkTreeView parent;
+typedef struct {
+    TrgTreeView parent;
 } TrgFilesTreeView;
 
 typedef struct {
-    GtkTreeViewClass parent_class;
+    TrgTreeViewClass parent_class;
 } TrgFilesTreeViewClass;
 
 enum {
diff --git a/src/trg-files-tree.c b/src/trg-files-tree.c
index b3a3df9..1c93a8f 100644
--- a/src/trg-files-tree.c
+++ b/src/trg-files-tree.c
@@ -20,6 +20,11 @@
 /* This is the stuff common between both files trees, built up before
  * populating the model.
  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/trg-general-panel.c b/src/trg-general-panel.c
index cec641a..7cb2a90 100644
--- a/src/trg-general-panel.c
+++ b/src/trg-general-panel.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 #include <glib-object.h>
 #include <glib/gi18n.h>
@@ -27,6 +31,7 @@
 #include "util.h"
 #include "trg-general-panel.h"
 #include "trg-torrent-model.h"
+#include "protocol-constants.h"
 
 #define TRG_GENERAL_PANEL_WIDTH_FROM_KEY    20
 #define TRG_GENERAL_PANEL_WIDTH_FROM_VALUE  60
@@ -53,12 +58,15 @@ struct _TrgGeneralPanelPrivate {
     GtkLabel *gen_seeders_label;
     GtkLabel *gen_leechers_label;
     GtkLabel *gen_status_label;
+    GtkLabel *gen_priority_label;
     GtkLabel *gen_eta_label;
     GtkLabel *gen_downloaded_label;
     GtkLabel *gen_uploaded_label;
+    GtkLabel *gen_corrupted_label;
     GtkLabel *gen_down_rate_label;
     GtkLabel *gen_up_rate_label;
     GtkLabel *gen_ratio_label;
+    GtkLabel *gen_limit_label;
     GtkLabel *gen_completedat_label;
     GtkLabel *gen_downloaddir_label;
     GtkLabel *gen_comment_label;
@@ -77,12 +85,15 @@ void trg_general_panel_clear(TrgGeneralPanel * panel)
     gtk_label_clear(priv->gen_seeders_label);
     gtk_label_clear(priv->gen_leechers_label);
     gtk_label_clear(priv->gen_status_label);
+    gtk_label_clear(priv->gen_priority_label);
     gtk_label_clear(priv->gen_eta_label);
     gtk_label_clear(priv->gen_downloaded_label);
     gtk_label_clear(priv->gen_uploaded_label);
+    gtk_label_clear(priv->gen_corrupted_label);
     gtk_label_clear(priv->gen_down_rate_label);
     gtk_label_clear(priv->gen_up_rate_label);
     gtk_label_clear(priv->gen_ratio_label);
+    gtk_label_clear(priv->gen_limit_label);
     gtk_label_clear(priv->gen_completedat_label);
     gtk_label_clear(priv->gen_downloaddir_label);
     gtk_label_clear(priv->gen_comment_label);
@@ -111,12 +122,10 @@ trg_general_panel_update(TrgGeneralPanel * panel, JsonObject * t,
                          GtkTreeIter * iter)
 {
     TrgGeneralPanelPrivate *priv;
-    gchar buf[32];
-    gint sizeOfBuf;
-    gchar *statusString, *fullStatusString, *completedAtString, *comment,
-        *markup;
+    gchar buf[32], buf1[32]; //TODO: do it better
+    gchar *statusString, *fullStatusString, *completedAtString, *speed, *comment, *markup;
     const gchar *errorStr;
-    gint64 eta, uploaded, haveValid, completedAt;
+    gint64 eta, uploaded, corrupted, haveValid, completedAt;
     GtkLabel *keyLabel;
     gint64 seeders = 0, leechers = 0;
 
@@ -127,16 +136,30 @@ trg_general_panel_update(TrgGeneralPanel * panel, JsonObject * t,
                        TORRENT_COLUMN_LEECHERS, &leechers,
                        TORRENT_COLUMN_STATUS, &statusString, -1);
 
-    sizeOfBuf = sizeof(buf);
-
     trg_strlsize(buf, torrent_get_size_when_done(t));
     gtk_label_set_text(GTK_LABEL(priv->gen_size_label), buf);
 
-    trg_strlspeed(buf, torrent_get_rate_down(t) / disk_K);
-    gtk_label_set_text(GTK_LABEL(priv->gen_down_rate_label), buf);
-
-    trg_strlspeed(buf, torrent_get_rate_up(t) / disk_K);
-    gtk_label_set_text(GTK_LABEL(priv->gen_up_rate_label), buf);
+	trg_strlspeed(buf, torrent_get_rate_down(t) / disk_K);
+	if (torrent_get_download_limited(t)){
+		trg_strlspeed(buf1, torrent_get_download_limit(t));
+		speed = g_strdup_printf("%s [%s]", buf, buf1);
+	} else
+		speed = g_strdup_printf("%s", buf);
+    gtk_label_set_text(GTK_LABEL(priv->gen_down_rate_label), speed);
+    g_free(speed);
+
+	trg_strlspeed(buf, torrent_get_rate_up(t) / disk_K);
+    if (torrent_get_upload_limited(t)){
+		trg_strlspeed(buf1, torrent_get_upload_limit(t));
+		speed = g_strdup_printf("%s [%s]", buf, buf1);	
+	} else
+		speed = g_strdup_printf("%s", buf);
+    gtk_label_set_text(GTK_LABEL(priv->gen_up_rate_label), speed);
+	g_free(speed);
+
+	corrupted = torrent_get_corrupted(t);
+	trg_strlsize(buf, corrupted);
+	gtk_label_set_text(GTK_LABEL(priv->gen_corrupted_label), buf);
 
     uploaded = torrent_get_uploaded(t);
     trg_strlsize(buf, uploaded);
@@ -153,6 +176,9 @@ trg_general_panel_update(TrgGeneralPanel * panel, JsonObject * t,
         gtk_label_set_text(GTK_LABEL(priv->gen_ratio_label), _("N/A"));
     }
 
+	trg_strlratio(buf, torrent_get_seed_ratio_limit(t));
+	gtk_label_set_text(GTK_LABEL(priv->gen_limit_label), buf);
+
     completedAt = torrent_get_done_date(t);
     if (completedAt > 0) {
         completedAtString = epoch_to_string(completedAt);
@@ -171,6 +197,18 @@ trg_general_panel_update(TrgGeneralPanel * panel, JsonObject * t,
     g_free(fullStatusString);
     g_free(statusString);
 
+	switch(torrent_get_bandwidth_priority(t)){
+		case TR_PRI_LOW:
+			gtk_label_set_text(GTK_LABEL(priv->gen_priority_label), _("Low"));
+			break;
+		case TR_PRI_NORMAL:
+			gtk_label_set_text(GTK_LABEL(priv->gen_priority_label), _("Normal"));
+			break;
+		case TR_PRI_HIGH:
+			gtk_label_set_text(GTK_LABEL(priv->gen_priority_label), _("High"));
+			break;
+	}
+
     trg_strlpercent(buf, torrent_get_percent_done(t));
     gtk_label_set_text(GTK_LABEL(priv->gen_completed_label), buf);
 
@@ -206,16 +244,16 @@ trg_general_panel_update(TrgGeneralPanel * panel, JsonObject * t,
     }
 
     if ((eta = torrent_get_eta(t)) > 0) {
-        tr_strltime_long(buf, eta, sizeOfBuf);
+        tr_strltime_long(buf, eta, sizeof(buf));
         gtk_label_set_text(GTK_LABEL(priv->gen_eta_label), buf);
     } else {
         gtk_label_set_text(GTK_LABEL(priv->gen_eta_label), _("N/A"));
     }
 
-    snprintf(buf, sizeof(buf), "%" G_GINT64_FORMAT,
+    g_snprintf(buf, sizeof(buf), "%" G_GINT64_FORMAT,
              seeders >= 0 ? seeders : 0);
     gtk_label_set_text(GTK_LABEL(priv->gen_seeders_label), buf);
-    snprintf(buf, sizeof(buf), "%" G_GINT64_FORMAT,
+    g_snprintf(buf, sizeof(buf), "%" G_GINT64_FORMAT,
              leechers >= 0 ? leechers : 0);
     gtk_label_set_text(GTK_LABEL(priv->gen_leechers_label), buf);
 }
@@ -274,48 +312,52 @@ static void trg_general_panel_init(TrgGeneralPanel * self)
     g_object_set(G_OBJECT(self), "n-columns",
                  TRG_GENERAL_PANEL_COLUMNS_TOTAL, "n-rows", 7, NULL);
 
-    priv->gen_name_label =
-        trg_general_panel_add_label_with_width(self, _("Name"), 0, 0, -1);
-
-    priv->gen_size_label =
-        trg_general_panel_add_label(self, _("Size"), 0, 1);
-    priv->gen_eta_label =
-        trg_general_panel_add_label(self, _("ETA"), 1, 1);
-    priv->gen_completed_label =
-        trg_general_panel_add_label(self, _("Completed"), 2, 1);
-
-    priv->gen_seeders_label =
-        trg_general_panel_add_label(self, _("Seeders"), 0, 2);
-    priv->gen_down_rate_label =
-        trg_general_panel_add_label(self, _("Rate Down"), 1, 2);
-    priv->gen_downloaded_label =
-        trg_general_panel_add_label(self, _("Downloaded"), 2, 2);
-
-    priv->gen_leechers_label =
-        trg_general_panel_add_label(self, _("Leechers"), 0, 3);
-    priv->gen_up_rate_label =
-        trg_general_panel_add_label(self, _("Rate Up"), 1, 3);
-    priv->gen_uploaded_label =
-        trg_general_panel_add_label(self, _("Uploaded"), 2, 3);
-
-    priv->gen_status_label =
-        trg_general_panel_add_label(self, _("Status"), 0, 4);
-    priv->gen_ratio_label =
-        trg_general_panel_add_label(self, _("Ratio"), 1, 4);
-
-    priv->gen_comment_label =
-        trg_general_panel_add_label(self, _("Comment"), 2, 4);
-
-    priv->gen_completedat_label =
-        trg_general_panel_add_label_with_width(self, _("Completed At"), 0,
-                                               5, -1);
-
-    priv->gen_downloaddir_label =
-        trg_general_panel_add_label_with_width(self, _("Location"), 1, 5,
-                                               -1);
-
-    priv->gen_error_label =
-        trg_general_panel_add_label_with_width(self, "", 0, 6, -1);
+	priv->gen_name_label =
+		trg_general_panel_add_label_with_width(self, _("Name"), 0, 0, -1);
+
+	priv->gen_size_label =
+		trg_general_panel_add_label(self, _("Size"), 0, 1);
+	priv->gen_down_rate_label =
+		trg_general_panel_add_label(self, _("Rate Down"), 1, 1);
+	priv->gen_completed_label =
+		trg_general_panel_add_label(self, _("Completed"), 2, 1);
+
+	priv->gen_eta_label =
+		trg_general_panel_add_label(self, _("ETA"), 0, 2);
+	priv->gen_up_rate_label =
+		trg_general_panel_add_label(self, _("Rate Up"), 1, 2);
+	priv->gen_downloaded_label =
+		trg_general_panel_add_label(self, _("Downloaded"), 2, 2);
+
+	priv->gen_seeders_label =
+		trg_general_panel_add_label(self, _("Seeders"), 0, 3);
+	priv->gen_ratio_label =
+		trg_general_panel_add_label(self, _("Ratio"), 1, 3);
+	priv->gen_uploaded_label =
+		trg_general_panel_add_label(self, _("Uploaded"), 2, 3);
+
+	priv->gen_leechers_label =
+		trg_general_panel_add_label(self, _("Leechers"), 0, 4);
+	priv->gen_limit_label =
+		trg_general_panel_add_label(self, _("Ratio limit"), 1, 4);
+	priv->gen_corrupted_label =
+		trg_general_panel_add_label(self, _("Corrupted"), 2, 4);
+
+	priv->gen_status_label =
+		trg_general_panel_add_label(self, _("Status"), 0, 5);
+	priv->gen_priority_label =
+		trg_general_panel_add_label(self, _("Priority"), 1, 5);
+	priv->gen_completedat_label =
+		trg_general_panel_add_label(self, _("Completed At"), 2, 5);
+
+	priv->gen_downloaddir_label =
+		trg_general_panel_add_label_with_width(self, _("Location"), 0, 6, -1);
+
+	priv->gen_comment_label =
+		trg_general_panel_add_label(self, _("Comment"), 0, 7);
+
+	priv->gen_error_label =
+		trg_general_panel_add_label_with_width(self, "", 0, 8, -1);
 
     for (i = 0; i < TRG_GENERAL_PANEL_COLUMNS_TOTAL; i++)
         gtk_table_set_col_spacing(GTK_TABLE(self), i,
diff --git a/src/trg-gtk-app.c b/src/trg-gtk-app.c
index a0c9ac4..7865767 100644
--- a/src/trg-gtk-app.c
+++ b/src/trg-gtk-app.c
@@ -17,33 +17,42 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <gtk/gtk.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
-#if GTK_CHECK_VERSION( 3, 0, 0 )
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
 
 #include "trg-main-window.h"
 #include "trg-gtk-app.h"
 #include "util.h"
 
 enum {
-    PROP_0, PROP_CLIENT, PROP_MINIMISE_ON_START
+	PROP_0,
+	PROP_CLIENT,
+	PROP_MINIMISE_ON_START,
+	N_PROPS,
 };
 
-G_DEFINE_TYPE(TrgGtkApp, trg_gtk_app, GTK_TYPE_APPLICATION)
-#define GET_PRIVATE(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRG_TYPE_GTK_APP, TrgGtkAppPrivate))
-typedef struct _TrgGtkAppPrivate TrgGtkAppPrivate;
+struct _TrgGtkApp
+{
+	GtkApplication parent;
+};
 
-struct _TrgGtkAppPrivate {
+typedef struct
+{
     TrgClient *client;
     gboolean min_start;
-};
+} TrgGtkAppPrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE(TrgGtkApp, trg_gtk_app, GTK_TYPE_APPLICATION)
 
 static void
 trg_gtk_app_get_property(GObject * object, guint property_id,
                          GValue * value, GParamSpec * pspec)
 {
-    TrgGtkAppPrivate *priv = GET_PRIVATE(object);
+    TrgGtkAppPrivate *priv = trg_gtk_app_get_instance_private (TRG_GTK_APP(object));
     switch (property_id) {
     case PROP_CLIENT:
         g_value_set_pointer(value, priv->client);
@@ -61,7 +70,7 @@ static void
 trg_gtk_app_set_property(GObject * object, guint property_id,
                          const GValue * value, GParamSpec * pspec)
 {
-    TrgGtkAppPrivate *priv = GET_PRIVATE(object);
+    TrgGtkAppPrivate *priv = trg_gtk_app_get_instance_private (TRG_GTK_APP(object));
     switch (property_id) {
     case PROP_CLIENT:
         priv->client = g_value_get_pointer(value);
@@ -75,22 +84,12 @@ trg_gtk_app_set_property(GObject * object, guint property_id,
     }
 }
 
-static void trg_gtk_app_dispose(GObject * object)
-{
-    G_OBJECT_CLASS(trg_gtk_app_parent_class)->dispose(object);
-}
-
-static void trg_gtk_app_finalize(GObject * object)
-{
-    G_OBJECT_CLASS(trg_gtk_app_parent_class)->finalize(object);
-}
-
-static void trg_gtk_app_startup(GtkApplication * app, gpointer data)
+static void trg_gtk_app_startup(GApplication * app, gpointer userdata)
 {
-    TrgGtkAppPrivate *priv = GET_PRIVATE(app);
+    TrgGtkAppPrivate *priv = trg_gtk_app_get_instance_private (TRG_GTK_APP(app));
     TrgMainWindow *window =
         trg_main_window_new(priv->client, priv->min_start);
-    gtk_window_set_application(GTK_WINDOW(window), app);
+    gtk_window_set_application(GTK_WINDOW(window), GTK_APPLICATION(app));
 }
 
 static int
@@ -135,7 +134,7 @@ static gboolean
 test_local_cmdline(GApplication * application,
                    gchar *** arguments, gint * exit_status)
 {
-    TrgGtkAppPrivate *priv = GET_PRIVATE(application);
+    TrgGtkAppPrivate *priv = trg_gtk_app_get_instance_private (TRG_GTK_APP(application));
     gchar **argv;
     gchar *cwd = g_get_current_dir();
     gchar *tmp;
@@ -144,7 +143,7 @@ test_local_cmdline(GApplication * application,
     argv = *arguments;
     shift_args(argv, 0);
 
-    i = 1;
+    i = 0;
     while (argv[i]) {
         if (is_minimised_arg(argv[i])) {
             shift_args(argv, i);
@@ -171,44 +170,30 @@ static void trg_gtk_app_class_init(TrgGtkAppClass * klass)
     GObjectClass *object_class = G_OBJECT_CLASS(klass);
     GApplicationClass *app_class = G_APPLICATION_CLASS(klass);
 
-    g_type_class_add_private(klass, sizeof(TrgGtkAppPrivate));
-
     object_class->get_property = trg_gtk_app_get_property;
     object_class->set_property = trg_gtk_app_set_property;
-    object_class->dispose = trg_gtk_app_dispose;
-    object_class->finalize = trg_gtk_app_finalize;
     app_class->local_command_line = test_local_cmdline;
+	//app_class->startup = trg_gtk_app_startup;
+    app_class->command_line = trg_gtk_app_command_line;
 
     g_object_class_install_property(object_class,
                                     PROP_CLIENT,
                                     g_param_spec_pointer("trg-client",
                                                          "TClient",
-                                                         "Client",
-                                                         G_PARAM_READWRITE
-                                                         |
-                                                         G_PARAM_CONSTRUCT_ONLY
-                                                         |
-                                                         G_PARAM_STATIC_NAME
-                                                         |
-                                                         G_PARAM_STATIC_NICK
-                                                         |
-                                                         G_PARAM_STATIC_BLURB));
+                                                         _("Client"),
+                                                         G_PARAM_READWRITE|
+                                                         G_PARAM_CONSTRUCT_ONLY|
+                                                         G_PARAM_STATIC_STRINGS));
 
     g_object_class_install_property(object_class,
                                     PROP_MINIMISE_ON_START,
                                     g_param_spec_boolean("min-on-start",
                                                          "Min On Start",
-                                                         "Min On Start",
+                                                         _("Min On Start"),
                                                          FALSE,
-                                                         G_PARAM_READWRITE
-                                                         |
-                                                         G_PARAM_CONSTRUCT_ONLY
-                                                         |
-                                                         G_PARAM_STATIC_NAME
-                                                         |
-                                                         G_PARAM_STATIC_NICK
-                                                         |
-                                                         G_PARAM_STATIC_BLURB));
+                                                         G_PARAM_READWRITE|
+                                                         G_PARAM_CONSTRUCT_ONLY|
+                                                         G_PARAM_STATIC_STRINGS));
 }
 
 static void trg_gtk_app_init(TrgGtkApp * self)
@@ -216,8 +201,8 @@ static void trg_gtk_app_init(TrgGtkApp * self)
     g_application_set_inactivity_timeout(G_APPLICATION(self), 10000);
     g_signal_connect(self, "command-line",
                      G_CALLBACK(trg_gtk_app_command_line), NULL);
-    g_signal_connect(self, "startup", G_CALLBACK(trg_gtk_app_startup),
-                     NULL);
+    g_signal_connect(self, "startup",
+                     G_CALLBACK(trg_gtk_app_startup), NULL);
 }
 
 TrgGtkApp *trg_gtk_app_new(TrgClient * client)
@@ -227,5 +212,3 @@ TrgGtkApp *trg_gtk_app_new(TrgClient * client)
                         "flags", G_APPLICATION_HANDLES_COMMAND_LINE,
                         "trg-client", client, NULL);
 }
-
-#endif
diff --git a/src/trg-gtk-app.h b/src/trg-gtk-app.h
index b60425a..e369fae 100644
--- a/src/trg-gtk-app.h
+++ b/src/trg-gtk-app.h
@@ -17,39 +17,17 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <gtk/gtk.h>
-
-#ifndef TRG_GTKAPP_
-#define TRG_GTKAPP_
-#if GTK_CHECK_VERSION( 3, 0, 0 )
 
-#include <glib-object.h>
+#pragma once
 
+#include <gtk/gtk.h>
 #include "trg-client.h"
 
 G_BEGIN_DECLS
-#define TRG_TYPE_GTK_APP trg_gtk_app_get_type()
-#define TRG_GTK_APP(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRG_TYPE_GTK_APP, TrgGtkApp))
-#define TRG_GTK_APP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), TRG_TYPE_GTK_APP, TrgGtkAppClass))
-#define TRG_IS_GTK_APP(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRG_TYPE_GTK_APP))
-#define TRG_IS_GTK_APP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), TRG_TYPE_GTK_APP))
-#define TRG_GTK_APP_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), TRG_TYPE_GTK_APP, TrgGtkAppClass))
-    typedef struct {
-    GtkApplication parent;
-} TrgGtkApp;
-
-typedef struct {
-    GtkApplicationClass parent_class;
-} TrgGtkAppClass;
-
-GType trg_gtk_app_get_type(void);
-
-TrgGtkApp *trg_gtk_app_new(TrgClient * client);
-
-#endif
-#endif
+
+#define TRG_TYPE_GTK_APP (trg_gtk_app_get_type())
+G_DECLARE_FINAL_TYPE (TrgGtkApp, trg_gtk_app, TRG, GTK_APP, GtkApplication)
+
+TrgGtkApp *trg_gtk_app_new (TrgClient *client);
+
+G_END_DECLS
diff --git a/src/trg-icons.c b/src/trg-icons.c
index efa45a7..20fb577 100644
--- a/src/trg-icons.c
+++ b/src/trg-icons.c
@@ -17,8 +17,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gtk/gtk.h>
 
+#include "trg-icons.h"
 #include "icon-turtle.h"
 
 typedef struct {
diff --git a/src/trg-json-widgets.c b/src/trg-json-widgets.c
index abca7e1..79299c6 100644
--- a/src/trg-json-widgets.c
+++ b/src/trg-json-widgets.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gtk/gtk.h>
 #include <json-glib/json-glib.h>
 
@@ -117,16 +121,6 @@ GtkWidget *trg_json_widget_entry_new(GList ** wl, JsonObject * obj,
     return w;
 }
 
-void
-trg_json_widget_time_save(GtkWidget * widget, JsonObject * obj,
-                          gchar * key)
-{
-
-    json_object_set_double_member(obj, key,
-                                  gtk_spin_button_get_value(GTK_SPIN_BUTTON
-                                                            (widget)));
-}
-
 GtkWidget *trg_json_widget_spin_new(GList ** wl, JsonObject * obj,
                                     const gchar * key,
                                     GtkWidget * toggleDep, gdouble min,
diff --git a/src/trg-main-window.c b/src/trg-main-window.c
index 975e68f..d85a364 100644
--- a/src/trg-main-window.c
+++ b/src/trg-main-window.c
@@ -31,9 +31,7 @@
 #include <gtk/gtk.h>
 #include <json-glib/json-glib.h>
 #include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION( 3, 0, 0 )
 #include <gdk/gdkkeysyms-compat.h>
-#endif
 #include <curl/curl.h>
 #ifdef HAVE_LIBNOTIFY
 #include <libnotify/notify.h>
@@ -75,8 +73,12 @@
 #include "trg-menu-bar.h"
 #include "trg-status-bar.h"
 #include "trg-stats-dialog.h"
+#ifdef HAVE_RSS
+#include "trg-rss-window.h"
+#endif
 #include "trg-remote-prefs-dialog.h"
 #include "trg-preferences-dialog.h"
+#include "upload.h"
 
 /* The rather large main window class, which glues everything together. */
 
@@ -206,9 +208,13 @@ static gboolean window_state_event(TrgMainWindow * win,
                                    GdkEventWindowState * event,
                                    gpointer trayIcon);
 
+struct _TrgMainWindow
+{
+	GtkApplicationWindow parent;
+};
 
-G_DEFINE_TYPE(TrgMainWindow, trg_main_window, GTK_TYPE_WINDOW)
-struct _TrgMainWindowPrivate {
+typedef struct
+{
     TrgClient *client;
     TrgToolbar *toolBar;
     TrgMenuBar *menuBar;
@@ -257,7 +263,9 @@ struct _TrgMainWindowPrivate {
     gboolean queuesEnabled;
 
     gchar **args;
-};
+} TrgMainWindowPrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE(TrgMainWindow, trg_main_window, GTK_TYPE_WINDOW)
 
 enum {
     PROP_0, PROP_CLIENT, PROP_MINIMISE_ON_START
@@ -265,7 +273,7 @@ enum {
 
 static void reset_connect_args(TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     if (priv->args) {
         g_strfreev(priv->args);
         priv->args = NULL;
@@ -274,21 +282,18 @@ static void reset_connect_args(TrgMainWindow * win)
 
 static void trg_main_window_init(TrgMainWindow * self)
 {
-    self->priv =
-        G_TYPE_INSTANCE_GET_PRIVATE(self, TRG_TYPE_MAIN_WINDOW,
-                                    TrgMainWindowPrivate);
 }
 
 gint trg_mw_get_selected_torrent_id(TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     return priv->selectedTorrentId;
 }
 
 static void
 update_selected_torrent_notebook(TrgMainWindow * win, gint mode, gint64 id)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgClient *client = priv->client;
     gint64 serial = trg_client_get_serial(client);
     JsonObject *t;
@@ -322,7 +327,7 @@ torrent_event_notification(TrgTorrentModel * model,
                            GtkTreeIter * iter, gpointer data)
 {
     TrgMainWindow *win = TRG_MAIN_WINDOW(data);
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgPrefs *prefs = trg_client_get_prefs(priv->client);
     gchar *name;
     NotifyNotification *notify;
@@ -388,7 +393,7 @@ delete_event(GtkWidget * w, GdkEvent * event G_GNUC_UNUSED,
 static void
 destroy_window(TrgMainWindow * win, gpointer data G_GNUC_UNUSED)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgPrefs *prefs = trg_client_get_prefs(priv->client);
 
     trg_prefs_set_int(prefs, TRG_PREFS_KEY_WINDOW_HEIGHT, priv->height,
@@ -421,7 +426,7 @@ destroy_window(TrgMainWindow * win, gpointer data G_GNUC_UNUSED)
                           TRG_TREE_VIEW_PERSIST_LAYOUT);
     trg_prefs_save(prefs);
 
-#if ! GTK_CHECK_VERSION( 3, 0, 0 )
+#if WIN32
     gtk_main_quit();
 #else
     g_application_quit (g_application_get_default ());
@@ -430,7 +435,7 @@ destroy_window(TrgMainWindow * win, gpointer data G_GNUC_UNUSED)
 
 static void open_props_cb(GtkWidget * w G_GNUC_UNUSED, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgTorrentPropsDialog *dialog;
 
     if (priv->selectedTorrentId < 0)
@@ -456,7 +461,7 @@ torrent_tv_onRowActivated(GtkTreeView * treeview,
 static void add_url_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data)
 {
     TrgMainWindow *win = TRG_MAIN_WINDOW(data);
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     TrgTorrentAddUrlDialog *dlg = trg_torrent_add_url_dialog_new(win,
                                                                  priv->
@@ -467,7 +472,7 @@ static void add_url_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data)
 static void add_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data)
 {
     TrgMainWindow *win = TRG_MAIN_WINDOW(data);
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (trg_client_is_connected(priv->client))
         trg_torrent_add_dialog(win, priv->client);
@@ -475,27 +480,27 @@ static void add_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data)
 
 static void pause_cb(GtkWidget * w G_GNUC_UNUSED, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (trg_client_is_connected(priv->client))
         dispatch_async(priv->client,
                        torrent_pause(build_json_id_array
                                      (priv->torrentTreeView)),
-                       on_generic_interactive_action, win);
+                       on_generic_interactive_action_response, win);
 }
 
 static void pause_all_cb(GtkWidget * w G_GNUC_UNUSED, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (trg_client_is_connected(priv->client))
         dispatch_async(priv->client, torrent_pause(NULL),
-                       on_generic_interactive_action, win);
+                       on_generic_interactive_action_response, win);
 }
 
 gint trg_add_from_filename(TrgMainWindow * win, gchar ** uris)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgClient *client = priv->client;
     TrgPrefs *prefs = trg_client_get_prefs(client);
     GSList *filesList = NULL;
@@ -506,10 +511,14 @@ gint trg_add_from_filename(TrgMainWindow * win, gchar ** uris)
         return EXIT_SUCCESS;
     }
 
-    if (uris)
-        for (i = 0; uris[i]; i++)
-            if (uris[i])
+    if (uris) {
+        for (i = 0; uris[i]; i++) {
+        	if (is_minimised_arg(uris[i]))
+        		g_free(uris[i]);
+        	else if (uris[i])
                 filesList = g_slist_append(filesList, uris[i]);
+        }
+    }
 
     g_free(uris);
 
@@ -519,20 +528,21 @@ gint trg_add_from_filename(TrgMainWindow * win, gchar ** uris)
     if (trg_prefs_get_bool(prefs, TRG_PREFS_KEY_ADD_OPTIONS_DIALOG,
                            TRG_PREFS_GLOBAL)) {
         TrgTorrentAddDialog *dialog =
-            trg_torrent_add_dialog_new(win, client,
+            trg_torrent_add_dialog_new_from_filenames(win, client,
                                        filesList);
 
         gtk_widget_show_all(GTK_WIDGET(dialog));
+        gtk_window_present(GTK_WINDOW(dialog));
     } else {
-        struct add_torrent_threadfunc_args *args =
-            g_new0(struct add_torrent_threadfunc_args, 1);
-        args->list = filesList;
-        args->cb_data = win;
-        args->client = client;
-        args->extraArgs = FALSE;
-        args->flags = trg_prefs_get_add_flags(prefs);
-
-        launch_add_thread(args);
+        trg_upload *upload = g_new0(trg_upload, 1);
+
+        upload->list = filesList;
+        upload->main_window = win;
+        upload->client = client;
+        upload->extra_args = FALSE;
+        upload->flags = trg_prefs_get_add_flags(prefs);
+
+        trg_do_upload(upload);
     }
 
     return EXIT_SUCCESS;
@@ -540,28 +550,28 @@ gint trg_add_from_filename(TrgMainWindow * win, gchar ** uris)
 
 static void resume_all_cb(GtkWidget * w G_GNUC_UNUSED, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (trg_client_is_connected(priv->client))
         dispatch_async(priv->client, torrent_start(NULL),
-                       on_generic_interactive_action, win);
+                       on_generic_interactive_action_response, win);
 }
 
 static void resume_cb(GtkWidget * w G_GNUC_UNUSED, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (trg_client_is_connected(priv->client))
         dispatch_async(priv->client,
                        torrent_start(build_json_id_array
                                      (priv->torrentTreeView)),
-                       on_generic_interactive_action, win);
+                       on_generic_interactive_action_response, win);
 }
 
 static void disconnect_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data)
 {
     TrgMainWindow *win = TRG_MAIN_WINDOW(data);
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     trg_client_inc_connid(priv->client);
     trg_main_window_conn_changed(TRG_MAIN_WINDOW(data), FALSE);
@@ -571,7 +581,7 @@ static void disconnect_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data)
 void connect_cb(GtkWidget * w, gpointer data)
 {
     TrgMainWindow *win = TRG_MAIN_WINDOW(data);
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     TrgPrefs *prefs = trg_client_get_prefs(priv->client);
     JsonObject *currentProfile = trg_prefs_get_profile(prefs);
@@ -628,7 +638,7 @@ void connect_cb(GtkWidget * w, gpointer data)
 static void
 open_local_prefs_cb(GtkWidget * w G_GNUC_UNUSED, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     GtkWidget *dlg = trg_preferences_dialog_get_instance(win,
                                                          priv->client);
@@ -638,7 +648,7 @@ open_local_prefs_cb(GtkWidget * w G_GNUC_UNUSED, TrgMainWindow * win)
 static void
 open_remote_prefs_cb(GtkWidget * w G_GNUC_UNUSED, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (trg_client_is_connected(priv->client))
         gtk_widget_show_all(GTK_WIDGET
@@ -650,7 +660,7 @@ static void
 main_window_toggle_filter_dirs(GtkCheckMenuItem * w, gpointer data)
 {
     TrgMainWindow *win = TRG_MAIN_WINDOW(data);
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (gtk_widget_is_sensitive(GTK_WIDGET(w)))
         trg_state_selector_set_show_dirs(priv->stateSelector,
@@ -662,7 +672,7 @@ static void
 main_window_toggle_filter_trackers(GtkCheckMenuItem * w, gpointer data)
 {
     TrgMainWindow *win = TRG_MAIN_WINDOW(data);
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (gtk_widget_is_sensitive(GTK_WIDGET(w)))
         trg_state_selector_set_show_trackers(priv->stateSelector,
@@ -670,9 +680,19 @@ main_window_toggle_filter_trackers(GtkCheckMenuItem * w, gpointer data)
                                              (w));
 }
 
+static void
+main_window_toggle_directories_first(GtkCheckMenuItem * w, gpointer data){
+	TrgMainWindow *win = TRG_MAIN_WINDOW(data);
+	TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
+
+	if (gtk_widget_is_sensitive(GTK_WIDGET(w)))
+		trg_state_selector_set_directories_first(priv->stateSelector,
+											gtk_check_menu_item_get_active(w));
+}
+
 static TrgToolbar *trg_main_window_toolbar_new(TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgPrefs *prefs = trg_client_get_prefs(priv->client);
 
     GObject *b_connect, *b_disconnect, *b_add, *b_resume, *b_pause;
@@ -708,80 +728,80 @@ static TrgToolbar *trg_main_window_toolbar_new(TrgMainWindow * win)
 
 static void reannounce_cb(GtkWidget * w G_GNUC_UNUSED, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (trg_client_is_connected(priv->client))
         dispatch_async(priv->client,
                        torrent_reannounce(build_json_id_array
                                           (priv->torrentTreeView)),
-                       on_generic_interactive_action, win);
+                       on_generic_interactive_action_response, win);
 }
 
 static void verify_cb(GtkWidget * w G_GNUC_UNUSED, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (is_ready_for_torrent_action(win))
         dispatch_async(priv->client,
                        torrent_verify(build_json_id_array
                                       (priv->torrentTreeView)),
-                       on_generic_interactive_action, win);
+                       on_generic_interactive_action_response, win);
 }
 
 static void start_now_cb(GtkWidget * w G_GNUC_UNUSED, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (is_ready_for_torrent_action(win))
         dispatch_async(priv->client,
                        torrent_start_now(build_json_id_array
                                          (priv->torrentTreeView)),
-                       on_generic_interactive_action, win);
+                       on_generic_interactive_action_response, win);
 }
 
 static void up_queue_cb(GtkWidget * w G_GNUC_UNUSED, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (priv->queuesEnabled && is_ready_for_torrent_action(win))
         dispatch_async(priv->client,
                        torrent_queue_move_up(build_json_id_array
                                              (priv->torrentTreeView)),
-                       on_generic_interactive_action, win);
+                       on_generic_interactive_action_response, win);
 }
 
 static void top_queue_cb(GtkWidget * w G_GNUC_UNUSED, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (priv->queuesEnabled && is_ready_for_torrent_action(win))
         dispatch_async(priv->client,
                        torrent_queue_move_top(build_json_id_array
                                               (priv->torrentTreeView)),
-                       on_generic_interactive_action, win);
+                       on_generic_interactive_action_response, win);
 }
 
 static void
 bottom_queue_cb(GtkWidget * w G_GNUC_UNUSED, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (priv->queuesEnabled && is_ready_for_torrent_action(win))
         dispatch_async(priv->client,
                        torrent_queue_move_bottom(build_json_id_array
                                                  (priv->torrentTreeView)),
-                       on_generic_interactive_action, win);
+                       on_generic_interactive_action_response, win);
 }
 
 static void down_queue_cb(GtkWidget * w G_GNUC_UNUSED, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (priv->queuesEnabled && is_ready_for_torrent_action(win))
         dispatch_async(priv->client,
                        torrent_queue_move_down(build_json_id_array
                                                (priv->torrentTreeView)),
-                       on_generic_interactive_action, win);
+                       on_generic_interactive_action_response, win);
 }
 
 static gint
@@ -792,7 +812,7 @@ confirm_action_dialog(GtkWindow * gtk_win,
                       const gchar * action_stock)
 {
     TrgMainWindow *win = TRG_MAIN_WINDOW(gtk_win);
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     gint selectCount;
     gint response;
     GtkWidget *dialog = NULL;
@@ -850,14 +870,14 @@ confirm_action_dialog(GtkWindow * gtk_win,
 
 static gboolean is_ready_for_torrent_action(TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     return priv->selectedTorrentId >= 0
         && trg_client_is_connected(priv->client);
 }
 
 static void move_cb(GtkWidget * w G_GNUC_UNUSED, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (is_ready_for_torrent_action(win))
         gtk_widget_show_all(GTK_WIDGET
@@ -867,7 +887,7 @@ static void move_cb(GtkWidget * w G_GNUC_UNUSED, TrgMainWindow * win)
 
 static void remove_cb(GtkWidget * w G_GNUC_UNUSED, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     GtkTreeSelection *selection;
     JsonArray *ids;
 
@@ -883,14 +903,14 @@ static void remove_cb(GtkWidget * w G_GNUC_UNUSED, TrgMainWindow * win)
                               _("<big><b>Remove %d torrents?</b></big>"),
                               GTK_STOCK_REMOVE) == GTK_RESPONSE_ACCEPT)
         dispatch_async(priv->client, torrent_remove(ids, FALSE),
-                       on_generic_interactive_action, win);
+                       on_generic_interactive_action_response, win);
     else
         json_array_unref(ids);
 }
 
 static void delete_cb(GtkWidget * w G_GNUC_UNUSED, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     GtkTreeSelection *selection;
     JsonArray *ids;
 
@@ -915,7 +935,7 @@ static void delete_cb(GtkWidget * w G_GNUC_UNUSED, TrgMainWindow * win)
 static void view_stats_toggled_cb(GtkWidget * w, gpointer data)
 {
     TrgMainWindow *win = TRG_MAIN_WINDOW(data);
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (trg_client_is_connected(priv->client)) {
         TrgStatsDialog *dlg =
@@ -926,10 +946,26 @@ static void view_stats_toggled_cb(GtkWidget * w, gpointer data)
     }
 }
 
+#ifdef HAVE_RSS
+static void view_rss_toggled_cb(GtkWidget * w, gpointer data)
+{
+    TrgMainWindow *win = TRG_MAIN_WINDOW(data);
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
+
+    if (trg_client_is_connected(priv->client)) {
+        TrgRssWindow *rss =
+            trg_rss_window_get_instance(TRG_MAIN_WINDOW(data), priv->client);
+
+        gtk_widget_show_all(GTK_WIDGET(rss));
+        gtk_window_present(GTK_WINDOW(rss));
+    }
+}
+#endif
+
 static void
 view_states_toggled_cb(GtkCheckMenuItem * w, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     trg_widget_set_visible(priv->stateSelectorScroller,
                            gtk_check_menu_item_get_active(w));
@@ -938,7 +974,7 @@ view_states_toggled_cb(GtkCheckMenuItem * w, TrgMainWindow * win)
 static void
 view_notebook_toggled_cb(GtkCheckMenuItem * w, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     trg_widget_set_visible(priv->notebook,
                            gtk_check_menu_item_get_active(w));
@@ -949,7 +985,7 @@ static void
 trg_main_window_toggle_graph_cb(GtkCheckMenuItem * w, gpointer data)
 {
     TrgMainWindow *win = TRG_MAIN_WINDOW(data);
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (!gtk_widget_is_sensitive(GTK_WIDGET(w))) {
         return;
@@ -965,13 +1001,13 @@ trg_main_window_toggle_graph_cb(GtkCheckMenuItem * w, gpointer data)
 void
 trg_main_window_notebook_set_visible(TrgMainWindow * win, gboolean visible)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     trg_widget_set_visible(priv->notebook, visible);
 }
 
 static GtkWidget *trg_main_window_notebook_new(TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgPrefs *prefs = trg_client_get_prefs(priv->client);
 
     GtkWidget *notebook = priv->notebook = gtk_notebook_new();
@@ -1029,7 +1065,7 @@ gboolean on_session_set(gpointer data)
 {
     trg_response *response = (trg_response *) data;
     TrgMainWindow *win = TRG_MAIN_WINDOW(response->cb_data);
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (response->status == CURLE_OK
         || response->status == FAIL_RESPONSE_UNSUCCESSFUL)
@@ -1053,7 +1089,7 @@ static gboolean on_session_get_timer(gpointer data)
 {
     trg_response *response = (trg_response *) data;
     TrgMainWindow *win = TRG_MAIN_WINDOW(response->cb_data);
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgPrefs *prefs = trg_client_get_prefs(priv->client);
 
     on_session_get(data);
@@ -1071,7 +1107,7 @@ static gboolean on_session_get(gpointer data)
 {
     trg_response *response = (trg_response *) data;
     TrgMainWindow *win = TRG_MAIN_WINDOW(response->cb_data);
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     TrgClient *client = priv->client;
     gboolean isConnected = trg_client_is_connected(client);
@@ -1156,7 +1192,7 @@ TRANSMISSION_MIN_SUPPORTED, version);
 static void
 connchange_whatever_statusicon(TrgMainWindow * win, gboolean connected)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgPrefs *prefs = trg_client_get_prefs(priv->client);
     gchar *display = connected ?
         trg_prefs_get_string(prefs, TRG_PREFS_KEY_PROFILE_NAME,
@@ -1187,7 +1223,7 @@ static void
 update_whatever_statusicon(TrgMainWindow * win,
                            trg_torrent_model_update_stats * stats)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
 #ifdef HAVE_LIBAPPINDICATOR
     if (!priv->appIndicator && !priv->statusIcon)
@@ -1229,7 +1265,7 @@ static gboolean on_torrent_get(gpointer data, int mode)
 {
     trg_response *response = (trg_response *) data;
     TrgMainWindow *win = TRG_MAIN_WINDOW(response->cb_data);
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgClient *client = priv->client;
     TrgPrefs *prefs = trg_client_get_prefs(client);
     trg_torrent_model_update_stats *stats;
@@ -1333,7 +1369,7 @@ static gboolean on_torrent_get_first(gpointer data)
 {
     trg_response *response = (trg_response *) data;
     TrgMainWindow *win = TRG_MAIN_WINDOW(response->cb_data);
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     gboolean result = on_torrent_get(data, TORRENT_GET_MODE_FIRST);
 
@@ -1358,7 +1394,7 @@ static gboolean on_torrent_get_update(gpointer data)
 static gboolean trg_session_update_timerfunc(gpointer data)
 {
     TrgMainWindow *win = TRG_MAIN_WINDOW(data);
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     trg_client_update_session(priv->client, on_session_get_timer, win);
 
@@ -1373,7 +1409,7 @@ static gboolean trg_update_torrents_timerfunc(gpointer data)
       return FALSE;
 
     TrgMainWindow *win = TRG_MAIN_WINDOW(data);
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgClient *tc = priv->client;
     TrgPrefs *prefs = trg_client_get_prefs(tc);
 
@@ -1411,7 +1447,7 @@ trg_torrent_tree_view_visible_func(GtkTreeModel * model,
                                    GtkTreeIter * iter, gpointer data)
 {
     TrgMainWindow *win = TRG_MAIN_WINDOW(data);
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     guint flags;
     gboolean visible;
     const gchar *filterText;
@@ -1478,7 +1514,7 @@ trg_torrent_tree_view_visible_func(GtkTreeModel * model,
 
 void trg_main_window_reload_dir_aliases(TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     trg_torrent_model_reload_dir_aliases(priv->client, GTK_TREE_MODEL
                                          (priv->torrentModel));
 }
@@ -1487,7 +1523,7 @@ static TrgTorrentTreeView
     * trg_main_window_torrent_tree_view_new(TrgMainWindow * win,
                                             GtkTreeModel * model)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgTorrentTreeView *torrentTreeView =
         trg_torrent_tree_view_new(priv->client,
                                   model);
@@ -1504,7 +1540,7 @@ static TrgTorrentTreeView
 static gboolean
 trg_dialog_error_handler(TrgMainWindow * win, trg_response * response)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (response->status != CURLE_OK) {
         GtkWidget *dialog;
@@ -1530,7 +1566,7 @@ static gboolean
 torrent_selection_changed(GtkTreeSelection * selection,
                           TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     GList *selectionList;
     GList *firstNode;
     gint64 id;
@@ -1565,21 +1601,18 @@ gboolean on_delete_complete(gpointer data)
 {
     trg_response *response = (trg_response *) data;
     TrgMainWindow *win = TRG_MAIN_WINDOW(response->cb_data);
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgClient *tc = priv->client;
 
     if (trg_client_is_connected(tc) && response->status == CURLE_OK)
         trg_client_update_session(priv->client, on_session_get,
                                   response->cb_data);
 
-    return on_generic_interactive_action(data);
+    return on_generic_interactive_action_response(data);
 }
 
-gboolean on_generic_interactive_action(gpointer data)
-{
-    trg_response *response = (trg_response *) data;
-    TrgMainWindow *win = TRG_MAIN_WINDOW(response->cb_data);
-    TrgMainWindowPrivate *priv = win->priv;
+void on_generic_interactive_action(TrgMainWindow *win, trg_response *response) {
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgClient *tc = priv->client;
 
     if (trg_client_is_connected(tc)) {
@@ -1598,12 +1631,21 @@ gboolean on_generic_interactive_action(gpointer data)
     }
 
     trg_response_free(response);
+}
+
+gboolean on_generic_interactive_action_response(gpointer data)
+{
+    trg_response *response = (trg_response *) data;
+    TrgMainWindow *win = TRG_MAIN_WINDOW(response->cb_data);
+
+    on_generic_interactive_action(win, response);
+
     return FALSE;
 }
 
 static void trg_main_window_torrent_scrub(TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     gtk_tree_store_clear(GTK_TREE_STORE(priv->filesModel));
     gtk_list_store_clear(GTK_LIST_STORE(priv->trackersModel));
@@ -1618,7 +1660,7 @@ static void trg_main_window_torrent_scrub(TrgMainWindow * win)
 
 static void entry_filter_changed_cb(GtkWidget * w, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     gboolean clearSensitive = gtk_entry_get_text_length(GTK_ENTRY(w)) > 0;
 
     gtk_tree_model_filter_refilter(GTK_TREE_MODEL_FILTER
@@ -1639,7 +1681,7 @@ torrent_state_selection_changed(TrgStateSelector *
 static void
 trg_main_window_conn_changed(TrgMainWindow * win, gboolean connected)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgClient *tc = priv->client;
 
     trg_toolbar_connected_change(priv->toolBar, connected);
@@ -1686,7 +1728,7 @@ trg_main_window_get_property(GObject * object,
                              GParamSpec * pspec)
 {
     TrgMainWindow *win = TRG_MAIN_WINDOW(object);
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     switch (property_id) {
     case PROP_CLIENT:
@@ -1707,7 +1749,7 @@ trg_main_window_set_property(GObject * object,
                              const GValue * value, GParamSpec * pspec)
 {
     TrgMainWindow *win = TRG_MAIN_WINDOW(object);
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     switch (property_id) {
     case PROP_CLIENT:
@@ -1729,17 +1771,20 @@ static void quit_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data)
 
 static TrgMenuBar *trg_main_window_menu_bar_new(TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     GObject *b_disconnect, *b_add, *b_resume, *b_pause, *b_verify,
         *b_remove, *b_delete, *b_props, *b_local_prefs, *b_remote_prefs,
         *b_about, *b_view_states, *b_view_notebook, *b_view_stats,
         *b_add_url, *b_quit, *b_move, *b_reannounce, *b_pause_all,
-        *b_resume_all, *b_dir_filters, *b_tracker_filters, *b_up_queue,
-        *b_down_queue, *b_top_queue, *b_bottom_queue,
+        *b_resume_all, *b_dir_filters, *b_tracker_filters, *b_directories_first,
+        *b_up_queue, *b_down_queue, *b_top_queue, *b_bottom_queue,
 #if TRG_WITH_GRAPH
     *b_show_graph,
 #endif
+#ifdef HAVE_RSS
+    *b_view_rss,
+#endif
     *b_start_now;
 
     TrgMenuBar *menuBar;
@@ -1764,10 +1809,13 @@ static TrgMenuBar *trg_main_window_menu_bar_new(TrgMainWindow * win)
                  "view-states-button", &b_view_states, "view-stats-button",
                  &b_view_stats, "about-button", &b_about, "quit-button",
                  &b_quit, "dir-filters", &b_dir_filters, "tracker-filters",
-                 &b_tracker_filters,
+                 &b_tracker_filters, TRG_PREFS_KEY_DIRECTORIES_FIRST, &b_directories_first,
 #if TRG_WITH_GRAPH
                  "show-graph", &b_show_graph,
 #endif
+#ifdef HAVE_RSS
+                 "view-rss-button", &b_view_rss,
+#endif
                  "up-queue", &b_up_queue, "down-queue", &b_down_queue,
                  "top-queue", &b_top_queue, "bottom-queue",
                  &b_bottom_queue, "start-now", &b_start_now, NULL);
@@ -1808,10 +1856,16 @@ static TrgMenuBar *trg_main_window_menu_bar_new(TrgMainWindow * win)
                      G_CALLBACK(main_window_toggle_filter_dirs), win);
     g_signal_connect(b_tracker_filters, "toggled",
                      G_CALLBACK(main_window_toggle_filter_trackers), win);
+	g_signal_connect(b_directories_first, "toggled",
+					 G_CALLBACK(main_window_toggle_directories_first), win);
     g_signal_connect(b_view_states, "toggled",
                      G_CALLBACK(view_states_toggled_cb), win);
     g_signal_connect(b_view_stats, "activate",
                      G_CALLBACK(view_stats_toggled_cb), win);
+#ifdef HAVE_RSS
+    g_signal_connect(b_view_rss, "activate",
+                     G_CALLBACK(view_rss_toggled_cb), win);
+#endif
 #if TRG_WITH_GRAPH
     g_signal_connect(b_show_graph, "toggled",
                      G_CALLBACK(trg_main_window_toggle_graph_cb), win);
@@ -1828,7 +1882,7 @@ static void
 status_icon_activated(GtkStatusIcon * icon G_GNUC_UNUSED,
                       TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgPrefs *prefs = trg_client_get_prefs(priv->client);
 
     trg_main_window_set_hidden_to_tray(win,
@@ -1841,7 +1895,7 @@ status_icon_activated(GtkStatusIcon * icon G_GNUC_UNUSED,
 static gboolean
 trg_status_icon_popup_menu_cb(GtkStatusIcon * icon, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     gtk_menu_popup(priv->iconMenu, NULL, NULL,
 #ifdef WIN32
@@ -1858,7 +1912,7 @@ static gboolean
 status_icon_button_press_event(GtkStatusIcon * icon,
                                GdkEventButton * event, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
 
@@ -1905,7 +1959,7 @@ static GtkWidget *trg_imagemenuitem_new(GtkMenuShell * shell,
 
 static void set_limit_cb(GtkWidget * w, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     GtkWidget *parent = gtk_widget_get_parent(w);
 
@@ -1930,7 +1984,7 @@ static void set_limit_cb(GtkWidget * w, TrgMainWindow * win)
     json_object_set_boolean_member(args, enabledKey, speed >= 0);
 
     if (limitIds)
-        dispatch_async(priv->client, req, on_generic_interactive_action,
+        dispatch_async(priv->client, req, on_generic_interactive_action_response,
                        win);
     else
         dispatch_async(priv->client, req, on_session_set, win);
@@ -1938,7 +1992,7 @@ static void set_limit_cb(GtkWidget * w, TrgMainWindow * win)
 
 static void set_priority_cb(GtkWidget * w, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     GtkWidget *parent = gtk_widget_get_parent(w);
 
@@ -1955,7 +2009,7 @@ static void set_priority_cb(GtkWidget * w, TrgMainWindow * win)
 
     json_object_set_int_member(args, FIELD_BANDWIDTH_PRIORITY, priority);
 
-    dispatch_async(priv->client, req, on_generic_interactive_action, win);
+    dispatch_async(priv->client, req, on_generic_interactive_action_response, win);
 }
 
 static GtkWidget *limit_item_new(TrgMainWindow * win, GtkWidget * menu,
@@ -1997,7 +2051,7 @@ static GtkWidget *priority_menu_item_new(TrgMainWindow * win,
 
 static GtkWidget *priority_menu_new(TrgMainWindow * win, JsonArray * ids)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgClient *client = priv->client;
     JsonObject *t = NULL;
     gint selected_pri = TR_PRI_UNSET;
@@ -2034,7 +2088,7 @@ static GtkWidget *limit_menu_new(TrgMainWindow * win, gchar * title,
                                  gchar * enabledKey, gchar * speedKey,
                                  JsonArray * ids)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgClient *client = priv->client;
     JsonObject *current = NULL;
     GtkTreeIter iter;
@@ -2102,7 +2156,7 @@ static GtkWidget *limit_menu_new(TrgMainWindow * win, gchar * title,
 
 static void exec_cmd_cb(GtkWidget * w, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     JsonObject *cmd_obj = (JsonObject *) g_object_get_data(G_OBJECT(w),
                                                            "cmd-object");
     GtkTreeSelection *selection =
@@ -2157,7 +2211,7 @@ static void
 trg_torrent_tv_view_menu(GtkWidget * treeview,
                          GdkEventButton * event, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgPrefs *prefs = trg_client_get_prefs(priv->client);
     GtkWidget *menu;
     gint n_cmds;
@@ -2188,8 +2242,8 @@ trg_torrent_tv_view_menu(GtkWidget * treeview,
     trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Remove"),
                           GTK_STOCK_REMOVE, TRUE, G_CALLBACK(remove_cb),
                           win);
-    trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Remove & Delete"),
-                          GTK_STOCK_CLEAR, TRUE, G_CALLBACK(delete_cb),
+    trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Remove and delete data"),
+                          GTK_STOCK_DELETE, TRUE, G_CALLBACK(delete_cb),
                           win);
 
     cmds = trg_prefs_get_array(prefs, TRG_PREFS_KEY_EXEC_COMMANDS,
@@ -2283,7 +2337,7 @@ trg_torrent_tv_view_menu(GtkWidget * treeview,
 static GtkMenu *trg_status_icon_view_menu(TrgMainWindow * win,
                                           const gchar * msg)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgPrefs *prefs = trg_client_get_prefs(priv->client);
     gboolean connected = trg_client_is_connected(priv->client);
     GtkWidget *menu, *connect;
@@ -2403,7 +2457,7 @@ static void trg_main_window_set_hidden_to_tray(TrgMainWindow * win,
                                                gboolean hidden)
 {
 
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (hidden) {
         gtk_widget_hide(GTK_WIDGET(win));
@@ -2426,7 +2480,7 @@ static gboolean
 window_state_event(TrgMainWindow * win,
                    GdkEventWindowState * event, gpointer trayIcon)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgPrefs *prefs = trg_client_get_prefs(priv->client);
 
     if (priv->statusIcon
@@ -2443,7 +2497,7 @@ window_state_event(TrgMainWindow * win,
 
 void trg_main_window_remove_status_icon(TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 #ifdef HAVE_LIBAPPINDICATOR
     if (priv->appIndicator) {
         g_object_unref(G_OBJECT(priv->appIndicator));
@@ -2463,7 +2517,7 @@ void trg_main_window_remove_status_icon(TrgMainWindow * win)
 #if TRG_WITH_GRAPH
 void trg_main_window_add_graph(TrgMainWindow * win, gboolean show)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     priv->graph =
         trg_torrent_graph_new(gtk_widget_get_style(priv->notebook));
@@ -2480,7 +2534,7 @@ void trg_main_window_add_graph(TrgMainWindow * win, gboolean show)
 
 void trg_main_window_remove_graph(TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if (priv->graphNotebookIndex >= 0) {
         gtk_notebook_remove_page(GTK_NOTEBOOK(priv->notebook),
@@ -2500,9 +2554,9 @@ void trg_main_window_remove_graph(TrgMainWindow * win)
 
 void trg_main_window_add_status_icon(TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 #ifdef HAVE_LIBAPPINDICATOR
-    if (is_unity() && (priv->appIndicator =
+    if ((priv->appIndicator =
                        app_indicator_new(PACKAGE_NAME, PACKAGE_NAME,
                                          APP_INDICATOR_CATEGORY_APPLICATION_STATUS)))
     {
@@ -2512,7 +2566,7 @@ void trg_main_window_add_status_icon(TrgMainWindow * win)
                                trg_status_icon_view_menu(win, NULL));
     } else {
 #else
-    if (!is_unity()) {
+    if (1) {
 #endif
         priv->statusIcon =
             gtk_status_icon_new_from_icon_name(PACKAGE_NAME);
@@ -2534,7 +2588,7 @@ void trg_main_window_add_status_icon(TrgMainWindow * win)
 
 TrgStateSelector *trg_main_window_get_state_selector(TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     return priv->stateSelector;
 }
 
@@ -2545,7 +2599,7 @@ trg_main_window_config_event(TrgMainWindow * win,
                              GdkEvent * event,
                              gpointer user_data G_GNUC_UNUSED)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     priv->width = event->configure.width;
     priv->height = event->configure.height;
     return FALSE;
@@ -2555,7 +2609,7 @@ static void
 trg_client_session_updated_cb(TrgClient * tc,
                               JsonObject * session, TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     gboolean queuesEnabled;
 
     trg_status_bar_session_update(priv->statusBar, session);
@@ -2615,10 +2669,11 @@ static gboolean window_key_press_handler(GtkWidget * widget,
                                          gpointer user_data)
 {
     TrgMainWindow *win = TRG_MAIN_WINDOW(widget);
+	TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
 
     if ((event->key.state & GDK_CONTROL_MASK)
         && event->key.keyval == GDK_k) {
-        gtk_widget_grab_focus(win->priv->filterEntry);
+        gtk_widget_grab_focus(priv->filterEntry);
         return TRUE;
     }
 
@@ -2641,7 +2696,7 @@ static GObject *trg_main_window_constructor(GType type,
     GtkWidget *w;
     GtkWidget *outerVbox;
     GtkWidget *toolbarHbox;
-    GtkWidget *outerAlignment;
+    //GtkWidget *outerAlignment;
     GtkIconTheme *theme;
     gint width, height, pos;
     gboolean tray;
@@ -2704,15 +2759,15 @@ static GObject *trg_main_window_constructor(GType type,
     g_signal_connect(priv->torrentTreeView, "row-activated",
                      G_CALLBACK(torrent_tv_onRowActivated), self);
 
-    outerVbox = trg_vbox_new(FALSE, 2);
+    outerVbox = trg_vbox_new(FALSE, 0);
 
     /* Create a GtkAlignment to hold the outerVbox making possible
      * some padding. */
-    outerAlignment = gtk_alignment_new (0.5f, 0.5f, 1.0f, 1.0f);
-    gtk_alignment_set_padding (GTK_ALIGNMENT (outerAlignment), 0, 0, 6, 6);
-    gtk_container_add (GTK_CONTAINER (outerAlignment), outerVbox);
+    //outerAlignment = gtk_alignment_new (0.5f, 0.5f, 1.0f, 1.0f);
+    //gtk_alignment_set_padding (GTK_ALIGNMENT (outerAlignment), 0, 0, 0, 0);
+    //gtk_container_add (GTK_CONTAINER (outerAlignment), outerVbox);
 
-    gtk_container_add(GTK_CONTAINER(self), outerAlignment);
+    gtk_container_add(GTK_CONTAINER(self), outerVbox);
 
     priv->menuBar = trg_main_window_menu_bar_new(self);
     gtk_box_pack_start(GTK_BOX(outerVbox), GTK_WIDGET(priv->menuBar),
@@ -2738,13 +2793,8 @@ static GObject *trg_main_window_constructor(GType type,
     gtk_box_pack_start(GTK_BOX(outerVbox), GTK_WIDGET(toolbarHbox), FALSE,
                        FALSE, 0);
 
-#if GTK_CHECK_VERSION( 3, 0, 0 )
     priv->hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
     priv->vpaned = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
-#else
-    priv->vpaned = gtk_vpaned_new();
-    priv->hpaned = gtk_hpaned_new();
-#endif
 
     gtk_box_pack_start(GTK_BOX(outerVbox), priv->vpaned, TRUE, TRUE, 0);
     gtk_paned_pack1(GTK_PANED(priv->vpaned), priv->hpaned, TRUE, TRUE);
@@ -2837,8 +2887,6 @@ static void trg_main_window_class_init(TrgMainWindowClass * klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS(klass);
 
-    g_type_class_add_private(klass, sizeof(TrgMainWindowPrivate));
-
     object_class->constructor = trg_main_window_constructor;
     object_class->get_property = trg_main_window_get_property;
     object_class->set_property = trg_main_window_set_property;
@@ -2848,15 +2896,9 @@ static void trg_main_window_class_init(TrgMainWindowClass * klass)
                                     g_param_spec_pointer("trg-client",
                                                          "TClient",
                                                          "Client",
-                                                         G_PARAM_READWRITE
-                                                         |
-                                                         G_PARAM_CONSTRUCT_ONLY
-                                                         |
-                                                         G_PARAM_STATIC_NAME
-                                                         |
-                                                         G_PARAM_STATIC_NICK
-                                                         |
-                                                         G_PARAM_STATIC_BLURB));
+                                                         G_PARAM_READWRITE|
+                                                         G_PARAM_CONSTRUCT_ONLY|
+                                                         G_PARAM_STATIC_STRINGS));
 
     g_object_class_install_property(object_class,
                                     PROP_MINIMISE_ON_START,
@@ -2864,26 +2906,20 @@ static void trg_main_window_class_init(TrgMainWindowClass * klass)
                                                          "Min On Start",
                                                          "Min On Start",
                                                          FALSE,
-                                                         G_PARAM_READWRITE
-                                                         |
-                                                         G_PARAM_CONSTRUCT_ONLY
-                                                         |
-                                                         G_PARAM_STATIC_NAME
-                                                         |
-                                                         G_PARAM_STATIC_NICK
-                                                         |
-                                                         G_PARAM_STATIC_BLURB));
+                                                         G_PARAM_READWRITE|
+                                                         G_PARAM_CONSTRUCT_ONLY|
+                                                         G_PARAM_STATIC_STRINGS));
 }
 
 void trg_main_window_set_start_args(TrgMainWindow * win, gchar ** args)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     priv->args = args;
 }
 
 void auto_connect_if_required(TrgMainWindow * win)
 {
-    TrgMainWindowPrivate *priv = win->priv;
+    TrgMainWindowPrivate *priv = trg_main_window_get_instance_private(win);
     TrgPrefs *prefs = trg_client_get_prefs(priv->client);
     gchar *host = trg_prefs_get_string(prefs, TRG_PREFS_KEY_HOSTNAME,
                                        TRG_PREFS_PROFILE);
diff --git a/src/trg-main-window.h b/src/trg-main-window.h
index 3c6ace5..1432502 100644
--- a/src/trg-main-window.h
+++ b/src/trg-main-window.h
@@ -17,13 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MAIN_WINDOW_H_
-#define MAIN_WINDOW_H_
+#pragma once
 
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtk.h>
 #include <json-glib/json-glib.h>
+#include <gtk/gtk.h>
 
 #include "trg-torrent-model.h"
 #include "trg-peers-model.h"
@@ -34,36 +31,18 @@
 #include "trg-client.h"
 
 G_BEGIN_DECLS
-#define TRG_TYPE_MAIN_WINDOW trg_main_window_get_type()
-#define TRG_MAIN_WINDOW(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRG_TYPE_MAIN_WINDOW, TrgMainWindow))
-#define TRG_MAIN_WINDOW_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), TRG_TYPE_MAIN_WINDOW, TrgMainWindowClass))
-#define TRG_IS_MAIN_WINDOW(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRG_TYPE_MAIN_WINDOW))
-#define TRG_IS_MAIN_WINDOW_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), TRG_TYPE_MAIN_WINDOW))
-#define TRG_MAIN_WINDOW_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), TRG_TYPE_MAIN_WINDOW, TrgMainWindowClass))
-typedef struct _TrgMainWindowPrivate TrgMainWindowPrivate;
 
-typedef struct {
-    GtkWindow parent;
-    TrgMainWindowPrivate *priv;
-} TrgMainWindow;
-
-typedef struct {
-    GtkWindowClass parent_class;
-} TrgMainWindowClass;
+#define TRG_TYPE_MAIN_WINDOW (trg_main_window_get_type())
+G_DECLARE_FINAL_TYPE (TrgMainWindow, trg_main_window, TRG, MAIN_WINDOW, GtkApplicationWindow)
 
 #define TORRENT_COMPLETE_NOTIFY_TMOUT 8000
 #define TORRENT_ADD_NOTIFY_TMOUT 3000
 
-GType trg_main_window_get_type(void);
 gint trg_add_from_filename(TrgMainWindow * win, gchar ** uris);
 gboolean on_session_set(gpointer data);
 gboolean on_delete_complete(gpointer data);
-gboolean on_generic_interactive_action(gpointer data);
+void on_generic_interactive_action(TrgMainWindow *win, trg_response *response);
+gboolean on_generic_interactive_action_response(gpointer data);
 void auto_connect_if_required(TrgMainWindow * win);
 void trg_main_window_set_start_args(TrgMainWindow * win, gchar ** args);
 TrgMainWindow *trg_main_window_new(TrgClient * tc, gboolean minonstart);
@@ -79,9 +58,4 @@ void trg_main_window_notebook_set_visible(TrgMainWindow * win,
 void connect_cb(GtkWidget * w, gpointer data);
 void trg_main_window_reload_dir_aliases(TrgMainWindow * win);
 
-#if !GTK_CHECK_VERSION(2, 21, 1)
-#define gdk_drag_context_get_actions(context) context->actions
-#endif
-
 G_END_DECLS
-#endif                          /* MAIN_WINDOW_H_ */
diff --git a/src/trg-menu-bar.c b/src/trg-menu-bar.c
index 4fcd06c..faf3548 100644
--- a/src/trg-menu-bar.c
+++ b/src/trg-menu-bar.c
@@ -17,12 +17,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION( 3, 0, 0 )
 #include <gdk/gdkkeysyms-compat.h>
-#endif
 
 #include "trg-prefs.h"
 #include "trg-torrent-graph.h"
@@ -51,6 +53,9 @@ enum {
     PROP_LOCAL_PREFS_BUTTON,
     PROP_ABOUT_BUTTON,
     PROP_VIEW_STATS_BUTTON,
+#ifdef HAVE_RSS
+    PROP_VIEW_RSS_BUTTON,
+#endif
     PROP_VIEW_STATES_BUTTON,
     PROP_VIEW_NOTEBOOK_BUTTON,
     PROP_QUIT,
@@ -60,6 +65,7 @@ enum {
     PROP_ACCEL_GROUP,
     PROP_DIR_FILTERS,
     PROP_TRACKER_FILTERS,
+    PROP_DIRECTORIES_FIRST,
 #if TRG_WITH_GRAPH
     PROP_VIEW_SHOW_GRAPH,
 #endif
@@ -98,10 +104,14 @@ struct _TrgMenuBarPrivate {
     GtkWidget *mb_view_states;
     GtkWidget *mb_view_notebook;
     GtkWidget *mb_view_stats;
+#ifdef HAVE_RSS
+    GtkWidget *mb_view_rss;
+#endif
     GtkWidget *mb_about;
     GtkWidget *mb_quit;
     GtkWidget *mb_directory_filters;
     GtkWidget *mb_tracker_filters;
+    GtkWidget *mb_directory_first;
 #if TRG_WITH_GRAPH
     GtkWidget *mb_view_graph;
 #endif
@@ -142,6 +152,9 @@ void trg_menu_bar_connected_change(TrgMenuBar * mb, gboolean connected)
     gtk_widget_set_sensitive(priv->mb_disconnect, connected);
     gtk_widget_set_sensitive(priv->mb_remote_prefs, connected);
     gtk_widget_set_sensitive(priv->mb_view_stats, connected);
+#ifdef HAVE_RSS
+    gtk_widget_set_sensitive(priv->mb_view_rss, connected);
+#endif
     gtk_widget_set_sensitive(priv->mb_resume_all, connected);
     gtk_widget_set_sensitive(priv->mb_pause_all, connected);
 }
@@ -275,6 +288,11 @@ trg_menu_bar_get_property(GObject * object, guint property_id,
     case PROP_VIEW_STATS_BUTTON:
         g_value_set_object(value, priv->mb_view_stats);
         break;
+#ifdef HAVE_RSS
+    case PROP_VIEW_RSS_BUTTON:
+        g_value_set_object(value, priv->mb_view_rss);
+        break;
+#endif
     case PROP_QUIT:
         g_value_set_object(value, priv->mb_quit);
         break;
@@ -284,6 +302,9 @@ trg_menu_bar_get_property(GObject * object, guint property_id,
     case PROP_TRACKER_FILTERS:
         g_value_set_object(value, priv->mb_tracker_filters);
         break;
+	case PROP_DIRECTORIES_FIRST:
+		g_value_set_object(value, priv->mb_directory_first);
+		break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
         break;
@@ -522,6 +543,14 @@ static GtkWidget *trg_menu_bar_view_menu_new(TrgMenuBar * mb)
     gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu),
                           priv->mb_tracker_filters);
 
+	priv->mb_directory_first =
+		trg_menu_bar_view_item_new(priv->prefs,
+									TRG_PREFS_KEY_DIRECTORIES_FIRST,
+									_("Directories first"),
+									priv->mb_view_states);
+	gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu),
+							priv->mb_directory_first);
+
     priv->mb_view_notebook =
         trg_menu_bar_view_item_new(priv->prefs,
                                    TRG_PREFS_KEY_SHOW_NOTEBOOK,
@@ -544,6 +573,14 @@ static GtkWidget *trg_menu_bar_view_menu_new(TrgMenuBar * mb)
     gtk_widget_set_sensitive(priv->mb_view_stats, FALSE);
     gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu), priv->mb_view_stats);
 
+#ifdef HAVE_RSS
+    priv->mb_view_rss =
+        gtk_menu_item_new_with_mnemonic(_("_RSS"));
+    //trg_menu_bar_accel_add(mb, priv->mb_view_rss, GDK_F7, 0);
+    gtk_widget_set_sensitive(priv->mb_view_rss, FALSE);
+    gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu), priv->mb_view_rss);
+#endif
+
     return view;
 }
 
@@ -580,7 +617,7 @@ trg_menu_bar_file_connect_item_new(TrgMainWindow * win,
 {
     GtkWidget *item = gtk_check_menu_item_new_with_label(text);
 
-    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), checked);
+    gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(item), checked);
     g_object_set_data(G_OBJECT(item), "profile", profile);
     gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(item), TRUE);
 
@@ -709,7 +746,7 @@ static GtkWidget *trg_menu_bar_torrent_menu_new(TrgMenuBar * menu)
 
     priv->mb_delete =
         trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu),
-                              _("Remove and Delete"), GTK_STOCK_CLEAR,
+                              _("Remove and delete data"), GTK_STOCK_DELETE,
                               FALSE);
     trg_menu_bar_accel_add(menu, priv->mb_delete, GDK_Delete,
                            GDK_SHIFT_MASK);
@@ -872,6 +909,11 @@ static void trg_menu_bar_class_init(TrgMenuBarClass * klass)
     trg_menu_bar_install_widget_prop(object_class, PROP_VIEW_STATS_BUTTON,
                                      "view-stats-button",
                                      "View stats button");
+#ifdef HAVE_RSS
+    trg_menu_bar_install_widget_prop(object_class, PROP_VIEW_RSS_BUTTON,
+                                     "view-rss-button",
+                                     "View rss button");
+#endif
     trg_menu_bar_install_widget_prop(object_class, PROP_VIEW_STATES_BUTTON,
                                      "view-states-button",
                                      "View states Button");
@@ -892,6 +934,8 @@ static void trg_menu_bar_class_init(TrgMenuBarClass * klass)
                                      "dir-filters", "Dir Filters");
     trg_menu_bar_install_widget_prop(object_class, PROP_TRACKER_FILTERS,
                                      "tracker-filters", "Tracker Filters");
+	trg_menu_bar_install_widget_prop(object_class, PROP_DIRECTORIES_FIRST,
+									 TRG_PREFS_KEY_DIRECTORIES_FIRST, "Directories first");
 #if TRG_WITH_GRAPH
     trg_menu_bar_install_widget_prop(object_class, PROP_VIEW_SHOW_GRAPH,
                                      "show-graph", "Show Graph");
diff --git a/src/trg-model.c b/src/trg-model.c
index fa67d08..c9ce968 100644
--- a/src/trg-model.c
+++ b/src/trg-model.c
@@ -17,9 +17,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <json-glib/json-glib.h>
+#include "trg-model.h"
 
 /* An extension of GtkListStore which provides some functions for looking up
  * an entry by ID. Also for removing entries which have an old update serial,
@@ -32,7 +37,7 @@ struct trg_model_remove_removed_foreachfunc_args {
     GList *toRemove;
 };
 
-gboolean
+static gboolean
 trg_model_remove_removed_foreachfunc(GtkTreeModel * model,
                                      GtkTreePath * path G_GNUC_UNUSED,
                                      GtkTreeIter * iter, gpointer data)
diff --git a/src/trg-peers-model.c b/src/trg-peers-model.c
index 0d15753..d8e42ed 100644
--- a/src/trg-peers-model.c
+++ b/src/trg-peers-model.c
@@ -28,6 +28,7 @@
 #include <glib/gstdio.h>
 #ifdef HAVE_GEOIP
 #include <GeoIP.h>
+#include <GeoIPCity.h>
 #endif
 
 #include "trg-tree-view.h"
@@ -46,6 +47,7 @@ typedef struct _TrgPeersModelPrivate TrgPeersModelPrivate;
 struct _TrgPeersModelPrivate {
     GeoIP *geoip;
     GeoIP *geoipv6;
+    GeoIP *geoipcity;
 };
 #endif
 
@@ -57,7 +59,7 @@ static void trg_peers_model_class_init(TrgPeersModelClass *
 #endif
 }
 
-gboolean
+static gboolean
 find_existing_peer_item_foreachfunc(GtkTreeModel * model,
                                     GtkTreePath *
                                     path G_GNUC_UNUSED,
@@ -78,7 +80,7 @@ find_existing_peer_item_foreachfunc(GtkTreeModel * model,
     return pi->found;
 }
 
-gboolean
+static gboolean
 find_existing_peer_item(TrgPeersModel * model, JsonObject * p,
                         GtkTreeIter * iter)
 {
@@ -143,6 +145,20 @@ static void resolved_dns_cb(GObject * source_object, GAsyncResult * res,
     }
 }
 
+#ifdef HAVE_GEOIP
+/* for handling v4 or v6 addresses. string is owned by GeoIP, should not be freed. */
+static const gchar* lookup_country(TrgPeersModel *model, const gchar *address) {
+	TrgPeersModelPrivate *priv = TRG_PEERS_MODEL_GET_PRIVATE(model);
+
+	if (strchr(address, ':') && priv->geoipv6)
+		return GeoIP_country_name_by_addr_v6(priv->geoipv6, address);
+	else if (priv->geoip)
+		return GeoIP_country_name_by_addr(priv->geoip, address);
+	else
+		return NULL;
+}
+#endif
+
 void
 trg_peers_model_update(TrgPeersModel * model, TrgTreeView * tv,
                        gint64 updateSerial, JsonObject * t, gint mode)
@@ -151,6 +167,8 @@ trg_peers_model_update(TrgPeersModel * model, TrgTreeView * tv,
     TrgPeersModelPrivate *priv = TRG_PEERS_MODEL_GET_PRIVATE(model);
     gboolean doGeoLookup =
         trg_tree_view_is_column_showing(tv, PEERSCOL_COUNTRY);
+    gboolean doGeoCityLookup =
+        trg_tree_view_is_column_showing(tv, PEERSCOL_CITY);
 #endif
 
     gboolean doHostLookup =
@@ -171,6 +189,7 @@ trg_peers_model_update(TrgPeersModel * model, TrgTreeView * tv,
         const gchar *address = NULL, *flagStr;
 #ifdef HAVE_GEOIP
         const gchar *country = NULL;
+        GeoIPRecord *city = NULL;
 #endif
 
         if (mode == TORRENT_GET_MODE_FIRST
@@ -179,21 +198,19 @@ trg_peers_model_update(TrgPeersModel * model, TrgTreeView * tv,
 
             address = peer_get_address(peer);
 #ifdef HAVE_GEOIP
-            if (address && doGeoLookup) {       /* just in case address wasn't set */
-                if (strchr(address, ':') && priv->geoipv6)
-                    country =
-                        GeoIP_country_name_by_addr_v6(priv->geoipv6,
-                                                      address);
-                else if (priv->geoip)
-                    country =
-                        GeoIP_country_name_by_addr(priv->geoip, address);
+            if (address) {       /* just in case address wasn't set */
+            	if (doGeoLookup)
+            		country = lookup_country(model, address);
+            	if (doGeoCityLookup)
+            		city = GeoIP_record_by_addr(priv->geoipcity, address);
             }
 #endif
             gtk_list_store_set(GTK_LIST_STORE(model), &peerIter,
-                               PEERSCOL_ICON, GTK_STOCK_NETWORK,
+                               PEERSCOL_ICON, "network-workgroup",
                                PEERSCOL_IP, address,
 #ifdef HAVE_GEOIP
                                PEERSCOL_COUNTRY, country ? country : "",
+                               PEERSCOL_CITY, city ? city->city : "",
 #endif
                                PEERSCOL_CLIENT, peer_get_client_name(peer),
                                -1);
@@ -203,6 +220,11 @@ trg_peers_model_update(TrgPeersModel * model, TrgTreeView * tv,
             isNew = FALSE;
         }
 
+#ifdef HAVE_GEOIP
+        if (city)
+        	GeoIPRecord_delete(city);
+#endif
+
         flagStr = peer_get_flagstr(peer);
         gtk_list_store_set(GTK_LIST_STORE(model), &peerIter,
                            PEERSCOL_FLAGS, flagStr, PEERSCOL_PROGRESS,
@@ -244,6 +266,8 @@ static void trg_peers_model_init(TrgPeersModel * self)
     TrgPeersModelPrivate *priv = TRG_PEERS_MODEL_GET_PRIVATE(self);
     gchar *geoip_db_path = NULL;
     gchar *geoip_v6_db_path = NULL;
+    gchar *geoip_city_db_path = NULL;
+    gchar *geoip_city_alt_db_path = NULL;
 #endif
 
     GType column_types[PEERSCOL_COLUMNS];
@@ -252,6 +276,7 @@ static void trg_peers_model_init(TrgPeersModel * self)
     column_types[PEERSCOL_IP] = G_TYPE_STRING;
 #ifdef HAVE_GEOIP
     column_types[PEERSCOL_COUNTRY] = G_TYPE_STRING;
+    column_types[PEERSCOL_CITY] = G_TYPE_STRING;
 #endif
     column_types[PEERSCOL_HOST] = G_TYPE_STRING;
     column_types[PEERSCOL_FLAGS] = G_TYPE_STRING;
@@ -268,9 +293,13 @@ static void trg_peers_model_init(TrgPeersModel * self)
 #ifdef WIN32
     geoip_db_path = trg_win32_support_path("GeoIP.dat");
     geoip_v6_db_path = trg_win32_support_path("GeoIPv6.dat");
+    geoip_city_db_path = trg_win32_support_path("GeoLiteCity.dat");
+    geoip_city_alt_db_path = trg_win32_support_path("GeoIPCity.dat");
 #else
     geoip_db_path = g_strdup(TRG_GEOIP_DATABASE);
     geoip_v6_db_path = g_strdup(TRG_GEOIPV6_DATABASE);
+    geoip_city_db_path = g_strdup(TRG_GEOIP_CITY_DATABASE);
+    geoip_city_alt_db_path = g_strdup(TRG_GEOIP_CITY_ALT_DATABASE);
 #endif
 
     if (g_file_test(geoip_db_path, G_FILE_TEST_EXISTS) == TRUE)
@@ -281,11 +310,83 @@ static void trg_peers_model_init(TrgPeersModel * self)
         priv->geoipv6 = GeoIP_open(geoip_v6_db_path,
                                    GEOIP_STANDARD | GEOIP_CHECK_CACHE);
 
+    if (g_file_test(geoip_city_db_path, G_FILE_TEST_EXISTS) == TRUE)
+        priv->geoipcity = GeoIP_open(geoip_city_db_path,
+                                   GEOIP_STANDARD | GEOIP_CHECK_CACHE);
+    else if (g_file_test(geoip_city_alt_db_path, G_FILE_TEST_EXISTS) == TRUE)
+        priv->geoipcity = GeoIP_open(geoip_city_alt_db_path,
+                                   GEOIP_STANDARD | GEOIP_CHECK_CACHE);
+
+    if (priv->geoipcity)
+    	GeoIP_set_charset(priv->geoipcity, GEOIP_CHARSET_UTF8);
+
+    g_free(geoip_city_db_path);
+    g_free(geoip_city_alt_db_path);
     g_free(geoip_db_path);
     g_free(geoip_v6_db_path);
 #endif
 }
 
+#ifdef HAVE_GEOIP
+static gboolean trg_peers_model_add_city_foreach(GtkTreeModel *model,
+        GtkTreePath *path,
+        GtkTreeIter *iter,
+        gpointer data) {
+	TrgPeersModelPrivate *priv = TRG_PEERS_MODEL_GET_PRIVATE(model);
+	gchar *address = NULL;
+	GeoIPRecord *record = NULL;
+
+	gtk_tree_model_get(GTK_TREE_MODEL(model), iter, PEERSCOL_IP, &address, -1);
+	record = GeoIP_record_by_addr(priv->geoipcity, address);
+
+	if (record) {
+		gtk_list_store_set(GTK_LIST_STORE(model), iter, PEERSCOL_CITY, record->city, -1);
+		GeoIPRecord_delete(record);
+	}
+
+	g_free(address);
+
+	return FALSE;
+}
+
+gboolean trg_peers_model_has_city_db(TrgPeersModel *model) {
+	TrgPeersModelPrivate *priv = TRG_PEERS_MODEL_GET_PRIVATE(model);
+	return priv->geoipcity != NULL;
+}
+
+gboolean trg_peers_model_has_country_db(TrgPeersModel *model) {
+	TrgPeersModelPrivate *priv = TRG_PEERS_MODEL_GET_PRIVATE(model);
+	return priv->geoip != NULL;
+}
+
+void trg_peers_model_add_city_column(TrgPeersModel *model) {
+	TrgPeersModelPrivate *priv = TRG_PEERS_MODEL_GET_PRIVATE(model);
+	if (priv->geoipcity)
+		gtk_tree_model_foreach(GTK_TREE_MODEL(model), trg_peers_model_add_city_foreach, NULL);
+}
+
+static gboolean trg_peers_model_add_country_foreach(GtkTreeModel *model,
+        GtkTreePath *path,
+        GtkTreeIter *iter,
+        gpointer data) {
+	gchar *address = NULL;
+
+	gtk_tree_model_get(GTK_TREE_MODEL(model), iter, PEERSCOL_IP, &address, -1);
+	gtk_list_store_set(GTK_LIST_STORE(model), iter, PEERSCOL_COUNTRY, lookup_country(TRG_PEERS_MODEL(model), address), -1);
+
+	g_free(address);
+
+	return FALSE;
+}
+
+void trg_peers_model_add_country_column(TrgPeersModel *model) {
+	TrgPeersModelPrivate *priv = TRG_PEERS_MODEL_GET_PRIVATE(model);
+	if (priv->geoip)
+		gtk_tree_model_foreach(GTK_TREE_MODEL(model), trg_peers_model_add_country_foreach, NULL);
+}
+#endif
+
+
 TrgPeersModel *trg_peers_model_new()
 {
     return g_object_new(TRG_TYPE_PEERS_MODEL, NULL);
diff --git a/src/trg-peers-model.h b/src/trg-peers-model.h
index 6ae941a..8d6b76c 100644
--- a/src/trg-peers-model.h
+++ b/src/trg-peers-model.h
@@ -56,7 +56,7 @@ typedef struct {
 
 GType trg_peers_model_get_type(void);
 
-TrgPeersModel *trg_peers_model_new();
+TrgPeersModel *trg_peers_model_new(void);
 
 G_END_DECLS struct peerAndIter {
     const gchar *ip;
@@ -69,6 +69,7 @@ enum {
     PEERSCOL_IP,
 #if HAVE_GEOIP
     PEERSCOL_COUNTRY,
+    PEERSCOL_CITY,
 #endif
     PEERSCOL_HOST,
     PEERSCOL_FLAGS,
@@ -84,7 +85,16 @@ void trg_peers_model_update(TrgPeersModel * model, TrgTreeView * tv,
                             gint64 updateSerial, JsonObject * t,
                             gboolean first);
 
+#if HAVE_GEOIP
+void trg_peers_model_add_city_column(TrgPeersModel *model);
+void trg_peers_model_add_country_column(TrgPeersModel *model);
+gboolean trg_peers_model_has_city_db(TrgPeersModel *model);
+gboolean trg_peers_model_has_country_db(TrgPeersModel *model);
+#endif
+
 #endif                          /* TRG_PEERS_MODEL_H_ */
 
 #define TRG_GEOIP_DATABASE "/usr/share/GeoIP/GeoIP.dat"
 #define TRG_GEOIPV6_DATABASE "/usr/share/GeoIP/GeoIPv6.dat"
+#define TRG_GEOIP_CITY_DATABASE "/usr/share/GeoIP/GeoLiteCity.dat"
+#define TRG_GEOIP_CITY_ALT_DATABASE "/usr/share/GeoIP/GeoIPCity.dat"
diff --git a/src/trg-peers-tree-view.c b/src/trg-peers-tree-view.c
index f7fbd7c..3d6052d 100644
--- a/src/trg-peers-tree-view.c
+++ b/src/trg-peers-tree-view.c
@@ -40,13 +40,17 @@ trg_peers_tree_view_class_init(TrgPeersTreeViewClass * klass G_GNUC_UNUSED)
 {
 }
 
-static void trg_peers_tree_view_init(TrgPeersTreeView * self)
+static void trg_peers_tree_view_init(TrgPeersTreeView * self) {
+
+}
+
+static void trg_peers_tree_view_setup_columns(TrgPeersTreeView * self, TrgPeersModel *model)
 {
     TrgTreeView *ttv = TRG_TREE_VIEW(self);
     trg_column_description *desc;
 
     desc =
-        trg_tree_view_reg_column(ttv, TRG_COLTYPE_STOCKICONTEXT,
+        trg_tree_view_reg_column(ttv, TRG_COLTYPE_ICONTEXT,
                                  PEERSCOL_IP, _("IP"), "ip", 0);
     desc->model_column_extra = PEERSCOL_ICON;
 
@@ -54,8 +58,13 @@ static void trg_peers_tree_view_init(TrgPeersTreeView * self)
                              _("Host"), "host", 0);
 
 #ifdef HAVE_GEOIP
-    trg_tree_view_reg_column(ttv, TRG_COLTYPE_TEXT, PEERSCOL_COUNTRY,
-                             _("Country"), "country", 0);
+    if (trg_peers_model_has_country_db(model))
+		trg_tree_view_reg_column(ttv, TRG_COLTYPE_TEXT, PEERSCOL_COUNTRY,
+								 _("Country"), "country", 0);
+
+    if (trg_peers_model_has_city_db(model))
+		trg_tree_view_reg_column(ttv, TRG_COLTYPE_TEXT, PEERSCOL_CITY,
+								 _("City"), "city", 0);
 #endif
     trg_tree_view_reg_column(ttv, TRG_COLTYPE_SPEED, PEERSCOL_DOWNSPEED,
                              _("Down Speed"), "down-speed", 0);
@@ -71,6 +80,17 @@ static void trg_peers_tree_view_init(TrgPeersTreeView * self)
     gtk_tree_view_set_search_column(GTK_TREE_VIEW(self), PEERSCOL_HOST);
 }
 
+#ifdef HAVE_GEOIP
+static void trg_peers_tree_view_column_added(TrgTreeView *tv, const gchar *id) {
+	TrgPeersModel *model = TRG_PEERS_MODEL(gtk_tree_view_get_model(GTK_TREE_VIEW(tv)));
+	if (!g_strcmp0(id, "city")) {
+		trg_peers_model_add_city_column(model);
+	} else if (!g_strcmp0(id, "country")) {
+		trg_peers_model_add_country_column(model);
+	}
+}
+#endif
+
 TrgPeersTreeView *trg_peers_tree_view_new(TrgPrefs * prefs,
                                           TrgPeersModel * model,
                                           const gchar * configId)
@@ -79,9 +99,15 @@ TrgPeersTreeView *trg_peers_tree_view_new(TrgPrefs * prefs,
                                 "config-id", configId,
                                 "prefs", prefs, NULL);
 
+    trg_peers_tree_view_setup_columns(TRG_PEERS_TREE_VIEW(obj), model);
+
     gtk_tree_view_set_model(GTK_TREE_VIEW(obj), GTK_TREE_MODEL(model));
     trg_tree_view_restore_sort(TRG_TREE_VIEW(obj), 0x00);
     trg_tree_view_setup_columns(TRG_TREE_VIEW(obj));
 
+#ifdef HAVE_GEOIP
+    g_signal_connect(obj, "column-added", G_CALLBACK(trg_peers_tree_view_column_added), NULL);
+#endif
+
     return TRG_PEERS_TREE_VIEW(obj);
 }
diff --git a/src/trg-peers-tree-view.h b/src/trg-peers-tree-view.h
index 57a09c1..3e683d3 100644
--- a/src/trg-peers-tree-view.h
+++ b/src/trg-peers-tree-view.h
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-
 #ifndef TRG_PEERS_TREE_VIEW_H_
 #define TRG_PEERS_TREE_VIEW_H_
 
@@ -40,11 +39,11 @@ G_BEGIN_DECLS
 #define TRG_PEERS_TREE_VIEW_GET_CLASS(obj) \
   (G_TYPE_INSTANCE_GET_CLASS ((obj), TRG_TYPE_PEERS_TREE_VIEW, TrgPeersTreeViewClass))
     typedef struct {
-    GtkTreeView parent;
+    TrgTreeView parent;
 } TrgPeersTreeView;
 
 typedef struct {
-    GtkTreeViewClass parent_class;
+    TrgTreeViewClass parent_class;
 } TrgPeersTreeViewClass;
 
 GType trg_peers_tree_view_get_type(void);
diff --git a/src/trg-persistent-tree-view.c b/src/trg-persistent-tree-view.c
index e116fdf..6a0aa01 100644
--- a/src/trg-persistent-tree-view.c
+++ b/src/trg-persistent-tree-view.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gtk/gtk.h>
 
 #include "trg-prefs.h"
@@ -37,7 +41,7 @@ typedef struct _TrgPersistentTreeViewPrivate
  TrgPersistentTreeViewPrivate;
 
 enum {
-    PROP_0, PROP_PREFS, PROP_KEY, PROP_MODEL
+    PROP_0, PROP_PREFS, PROP_KEY, PROP_MODEL, PROP_CONF_FLAGS
 };
 
 struct _TrgPersistentTreeViewPrivate {
@@ -52,6 +56,7 @@ struct _TrgPersistentTreeViewPrivate {
     trg_pref_widget_desc *wd;
     GtkTreeModel *model;
     trg_persistent_tree_view_column *addSelect;
+    gint conf_flags;
 };
 
 static void selection_changed(TrgPersistentTreeView * ptv,
@@ -322,6 +327,9 @@ trg_persistent_tree_view_set_property(GObject * object,
     case PROP_MODEL:
         priv->model = g_value_get_object(value);
         break;
+    case PROP_CONF_FLAGS:
+    	priv->conf_flags = g_value_get_int(value);
+    	break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
         break;
@@ -411,7 +419,7 @@ static GObject *trg_persistent_tree_view_constructor(GType type,
     gtk_box_pack_start(GTK_BOX(object), hbox, FALSE, FALSE, 4);
 
     priv->wd = trg_pref_widget_desc_new(GTK_WIDGET(priv->tv), priv->key,
-                                        TRG_PREFS_PROFILE);
+                                        priv->conf_flags);
     priv->wd->widget = GTK_WIDGET(object);
     priv->wd->saveFunc = &trg_persistent_tree_view_save;
     priv->wd->refreshFunc = &trg_persistent_tree_view_refresh;
@@ -462,6 +470,20 @@ trg_persistent_tree_view_class_init(TrgPersistentTreeViewClass * klass)
                                                         G_PARAM_STATIC_BLURB));
 
     g_object_class_install_property(object_class,
+                                    PROP_CONF_FLAGS,
+                                    g_param_spec_int("conf-flags",
+                                                     "Conf Flags",
+                                                     "Conf Flags",
+                                                     INT_MIN,
+                                                     INT_MAX,
+                                                     TRG_PREFS_PROFILE,
+                                                     G_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT_ONLY |
+                                                     G_PARAM_STATIC_NAME |
+                                                     G_PARAM_STATIC_NICK |
+                                                     G_PARAM_STATIC_BLURB));
+
+    g_object_class_install_property(object_class,
                                     PROP_MODEL,
                                     g_param_spec_object("persistent-model",
                                                         "Persistent Model",
@@ -483,12 +505,12 @@ static void trg_persistent_tree_view_init(TrgPersistentTreeView * self)
 
 TrgPersistentTreeView *trg_persistent_tree_view_new(TrgPrefs * prefs,
                                                     GtkListStore * model,
-                                                    const gchar * key)
+                                                    const gchar * key, gint conf_flags)
 {
     GObject *obj =
         g_object_new(TRG_TYPE_PERSISTENT_TREE_VIEW, "prefs", prefs,
                      "conf-key", key, "persistent-model",
-                     model,
+                     model, "conf-flags", conf_flags,
                      NULL);
 
     return TRG_PERSISTENT_TREE_VIEW(obj);
diff --git a/src/trg-persistent-tree-view.h b/src/trg-persistent-tree-view.h
index a5a7c8f..0d16fb6 100644
--- a/src/trg-persistent-tree-view.h
+++ b/src/trg-persistent-tree-view.h
@@ -57,7 +57,7 @@ typedef struct {
 
 TrgPersistentTreeView *trg_persistent_tree_view_new(TrgPrefs * prefs,
                                                     GtkListStore * model,
-                                                    const gchar * key);
+                                                    const gchar * key, gint conf_flags);
 
 trg_pref_widget_desc
     * trg_persistent_tree_view_get_widget_desc(TrgPersistentTreeView *
diff --git a/src/trg-preferences-dialog.c b/src/trg-preferences-dialog.c
index 6e98f25..6a0df94 100644
--- a/src/trg-preferences-dialog.c
+++ b/src/trg-preferences-dialog.c
@@ -60,6 +60,7 @@ struct _TrgPreferencesDialogPrivate {
     GtkWidget *profileNameEntry;
     GtkWidget *fullUpdateCheck;
     GList *widgets;
+    GtkWidget *notebook;
 };
 
 static GObject *instance = NULL;
@@ -329,6 +330,13 @@ static void toggle_filter_trackers(GtkToggleButton * w, gpointer win)
                                          gtk_toggle_button_get_active(w));
 }
 
+static void toggle_directories_first(GtkToggleButton * w, gpointer win){
+	TrgStateSelector *selector =
+		trg_main_window_get_state_selector(TRG_MAIN_WINDOW(win));
+	trg_state_selector_set_directories_first(selector,
+											gtk_toggle_button_get_active(w));
+}
+
 #if TRG_WITH_GRAPH
 static void toggle_graph(GtkToggleButton * w, gpointer win)
 {
@@ -601,7 +609,7 @@ static GtkWidget *trg_prefs_openExecPage(TrgPreferencesDialog * dlg)
     model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
 
     ptv = trg_persistent_tree_view_new(priv->prefs, model,
-                                       TRG_PREFS_KEY_EXEC_COMMANDS);
+                                       TRG_PREFS_KEY_EXEC_COMMANDS, TRG_PREFS_CONNECTION);
     trg_persistent_tree_view_set_add_select(ptv,
                                             trg_persistent_tree_view_add_column
                                             (ptv, 0,
@@ -614,13 +622,49 @@ static GtkWidget *trg_prefs_openExecPage(TrgPreferencesDialog * dlg)
     trg_pref_widget_refresh(dlg, wd);
     priv->widgets = g_list_append(priv->widgets, wd);
 
-    gtk_table_attach(GTK_TABLE(t), GTK_WIDGET(ptv), 1, 2, row, row + 1,
-                     GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-                     GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 0);
+    hig_workarea_add_wide_tall_control(t, &row, GTK_WIDGET(ptv));
 
     return t;
 }
 
+#ifdef HAVE_RSS
+static GtkWidget *trg_prefs_rss_page(TrgPreferencesDialog * dlg) {
+    TrgPreferencesDialogPrivate *priv =
+        TRG_PREFERENCES_DIALOG_GET_PRIVATE(dlg);
+    GtkWidget *t;
+    guint row = 0;
+    TrgPersistentTreeView *ptv;
+    trg_pref_widget_desc *wd;
+    GtkListStore *model;
+
+    t = hig_workarea_create();
+
+    hig_workarea_add_section_title(t, &row,
+                                   _("RSS Feeds"));
+
+    model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
+
+    ptv = trg_persistent_tree_view_new(priv->prefs, model,
+                                       TRG_PREFS_KEY_RSS, TRG_PREFS_GLOBAL);
+    trg_persistent_tree_view_set_add_select(ptv,
+                                            trg_persistent_tree_view_add_column
+                                            (ptv, 0,
+                                             TRG_PREFS_RSS_SUBKEY_ID,
+                                             _("Name")));
+    trg_persistent_tree_view_add_column(ptv, 1,
+                                        TRG_PREFS_RSS_SUBKEY_URL,
+                                        _("URL"));
+
+    wd = trg_persistent_tree_view_get_widget_desc(ptv);
+    trg_pref_widget_refresh(dlg, wd);
+    priv->widgets = g_list_append(priv->widgets, wd);
+
+    hig_workarea_add_wide_tall_control(t, &row, GTK_WIDGET(ptv));
+
+    return t;
+}
+#endif
+
 static GtkWidget *trg_prefs_dirsPage(TrgPreferencesDialog * dlg)
 {
     TrgPreferencesDialogPrivate *priv =
@@ -639,7 +683,7 @@ static GtkWidget *trg_prefs_dirsPage(TrgPreferencesDialog * dlg)
     model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
 
     ptv = trg_persistent_tree_view_new(priv->prefs, model,
-                                       TRG_PREFS_KEY_DESTINATIONS);
+                                       TRG_PREFS_KEY_DESTINATIONS, TRG_PREFS_CONNECTION);
     trg_persistent_tree_view_set_add_select(ptv,
                                             trg_persistent_tree_view_add_column
                                             (ptv, 0,
@@ -652,9 +696,7 @@ static GtkWidget *trg_prefs_dirsPage(TrgPreferencesDialog * dlg)
     trg_pref_widget_refresh(dlg, wd);
     priv->widgets = g_list_append(priv->widgets, wd);
 
-    gtk_table_attach(GTK_TABLE(t), GTK_WIDGET(ptv), 1, 2, row, row + 1,
-                     GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-                     GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 0);
+    hig_workarea_add_wide_tall_control(t, &row, GTK_WIDGET(ptv));
 
     return t;
 }
@@ -667,6 +709,7 @@ static GtkWidget *trg_prefs_viewPage(TrgPreferencesDialog * dlg)
     GtkWidget *w, *dep, *t, *tray;
     guint row = 0;
     gboolean _is_unity = is_unity();
+    gchar *tray_label;
 
     t = hig_workarea_create();
 
@@ -693,6 +736,13 @@ static GtkWidget *trg_prefs_viewPage(TrgPreferencesDialog * dlg)
                      G_CALLBACK(toggle_filter_trackers), priv->win);
     hig_workarea_add_wide_control(t, &row, w);
 
+	w = trgp_check_new(dlg, _("Directories first"),
+						TRG_PREFS_KEY_DIRECTORIES_FIRST, TRG_PREFS_GLOBAL,
+						GTK_TOGGLE_BUTTON(dep));
+	g_signal_connect(G_OBJECT(w), "toggled",
+					 G_CALLBACK(toggle_directories_first), priv->win);
+	hig_workarea_add_wide_control(t, &row, w);
+
     w = trgp_check_new(dlg, _("Torrent Details"),
                        TRG_PREFS_KEY_SHOW_NOTEBOOK, TRG_PREFS_GLOBAL,
                        NULL);
@@ -708,33 +758,29 @@ static GtkWidget *trg_prefs_viewPage(TrgPreferencesDialog * dlg)
     hig_workarea_add_wide_control(t, &row, w);
 #endif
 
-#ifndef HAVE_LIBAPPINDICATOR
-    if (!_is_unity) {
-#endif
-        hig_workarea_add_section_title(t, &row, _("System Tray"));
-
-        tray = trgp_check_new(dlg, _("Show in system tray"),
-                              TRG_PREFS_KEY_SYSTEM_TRAY, TRG_PREFS_GLOBAL,
-                              NULL);
-        g_signal_connect(G_OBJECT(tray), "toggled",
-                         G_CALLBACK(toggle_tray_icon), priv->win);
-        hig_workarea_add_wide_control(t, &row, tray);
-
-        if (!_is_unity) {
-            w = trgp_check_new(dlg, _("Minimise to system tray"),
-                               TRG_PREFS_KEY_SYSTEM_TRAY_MINIMISE,
-                               TRG_PREFS_GLOBAL, NULL);
-            gtk_widget_set_sensitive(w,
-                                     gtk_toggle_button_get_active
-                                     (GTK_TOGGLE_BUTTON(tray)));
-            g_signal_connect(G_OBJECT(tray), "toggled",
-                             G_CALLBACK(toggle_active_arg_is_sensitive),
-                             w);
-            hig_workarea_add_wide_control(t, &row, w);
-        }
-#ifndef HAVE_LIBAPPINDICATOR
-    }
-#endif
+	hig_workarea_add_section_title(t, &row, _("System Tray"));
+
+	if (_is_unity) {
+		tray_label = _("Show in system tray (needs whitelisting in unity)");
+	} else {
+		tray_label = _("Show in system tray");
+	}
+
+	tray = trgp_check_new(dlg, tray_label,
+	TRG_PREFS_KEY_SYSTEM_TRAY, TRG_PREFS_GLOBAL,
+	NULL);
+	g_signal_connect(G_OBJECT(tray), "toggled", G_CALLBACK(toggle_tray_icon),
+			priv->win);
+	hig_workarea_add_wide_control(t, &row, tray);
+
+	w = trgp_check_new(dlg, _("Minimise to system tray"),
+	TRG_PREFS_KEY_SYSTEM_TRAY_MINIMISE,
+	TRG_PREFS_GLOBAL, NULL);
+	gtk_widget_set_sensitive(w,
+			gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(tray)));
+	g_signal_connect(G_OBJECT(tray), "toggled",
+			G_CALLBACK(toggle_active_arg_is_sensitive), w);
+	hig_workarea_add_wide_control(t, &row, w);
 
 #ifdef HAVE_LIBNOTIFY
     hig_workarea_add_section_title(t, &row, _("Notifications"));
@@ -799,10 +845,7 @@ static GtkWidget *trg_prefs_serverPage(TrgPreferencesDialog * dlg)
     hig_workarea_add_row(t, &row, _("Name:"), priv->profileNameEntry,
                          NULL);
 
-    gtk_table_attach(GTK_TABLE(t), profileButtonsHbox, 1, 2, row, row + 1,
-                     GTK_EXPAND | GTK_SHRINK, 0, 0, 0);
-
-    row++;
+    hig_workarea_add_wide_control(t, &row, profileButtonsHbox);
 
     hig_workarea_add_section_title(t, &row, _("Connection"));
 
@@ -831,6 +874,10 @@ static GtkWidget *trg_prefs_serverPage(TrgPreferencesDialog * dlg)
     w = trgp_check_new(dlg, _("SSL"), TRG_PREFS_KEY_SSL, TRG_PREFS_PROFILE,
                        NULL);
     hig_workarea_add_wide_control(t, &row, w);
+    w = trgp_check_new(dlg, _("Validate SSL Certificate"), TRG_PREFS_KEY_SSL_VALIDATE, TRG_PREFS_PROFILE,
+                       GTK_TOGGLE_BUTTON(w));
+    hig_workarea_add_wide_control(t, &row, w);
+
 #endif
 
     w = trgp_spin_new(dlg, TRG_PREFS_KEY_TIMEOUT, 1, 3600, 1,
@@ -847,6 +894,7 @@ static GtkWidget *trg_prefs_serverPage(TrgPreferencesDialog * dlg)
     gtk_box_pack_start(GTK_BOX(frameHbox), priv->profileComboBox, FALSE,
                        FALSE, 4);
     gtk_frame_set_label_widget(GTK_FRAME(frame), frameHbox);
+    gtk_container_set_border_width(GTK_CONTAINER(frame), 5);
     gtk_container_add(GTK_CONTAINER(frame), t);
 
     return frame;
@@ -886,7 +934,7 @@ static GObject *trg_preferences_dialog_constructor(GType type,
     g_signal_connect(G_OBJECT(object), "response",
                      G_CALLBACK(trg_preferences_response_cb), NULL);
 
-    notebook = gtk_notebook_new();
+    notebook = priv->notebook = gtk_notebook_new();
 
     gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
                              trg_prefs_serverPage(TRG_PREFERENCES_DIALOG
@@ -913,6 +961,13 @@ static GObject *trg_preferences_dialog_constructor(GType type,
                                                 (object)),
                              gtk_label_new(_("Directories")));
 
+#ifdef HAVE_RSS
+    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+                             trg_prefs_rss_page(TRG_PREFERENCES_DIALOG
+                                                (object)),
+                             gtk_label_new(_("RSS Feeds")));
+#endif
+
     gtk_container_set_border_width(GTK_CONTAINER(notebook), GUI_PAD);
 
     gtk_box_pack_start(GTK_BOX(contentvbox), notebook, TRUE, TRUE, 0);
@@ -920,6 +975,11 @@ static GObject *trg_preferences_dialog_constructor(GType type,
     return object;
 }
 
+void trg_preferences_dialog_set_page(TrgPreferencesDialog *pref_dlg, guint page) {
+	TrgPreferencesDialogPrivate *priv = TRG_PREFERENCES_DIALOG_GET_PRIVATE(pref_dlg);
+	gtk_notebook_set_current_page(GTK_NOTEBOOK(priv->notebook), page);
+}
+
 static void trg_preferences_dialog_init(TrgPreferencesDialog * pref_dlg)
 {
 }
diff --git a/src/trg-preferences-dialog.h b/src/trg-preferences-dialog.h
index f5e9825..e163964 100644
--- a/src/trg-preferences-dialog.h
+++ b/src/trg-preferences-dialog.h
@@ -60,6 +60,7 @@ GtkWidget *trg_preferences_dialog_get_instance(TrgMainWindow * win,
                                                TrgClient * client);
 trg_pref_widget_desc *trg_pref_widget_desc_new(GtkWidget * w, gchar * key,
                                                int flags);
+void trg_preferences_dialog_set_page(TrgPreferencesDialog *pref_dlg, guint page);
 
 G_END_DECLS
 #endif                          /* TRG_PREFERENCES_WINDOW_H_ */
diff --git a/src/trg-prefs.c b/src/trg-prefs.c
index b559479..ff6b1b8 100644
--- a/src/trg-prefs.c
+++ b/src/trg-prefs.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <json-glib/json-glib.h>
@@ -106,6 +110,7 @@ static void trg_prefs_create_defaults(TrgPrefs * p)
 
     trg_prefs_add_default_bool_true(p, TRG_PREFS_KEY_FILTER_DIRS);
     trg_prefs_add_default_bool_true(p, TRG_PREFS_KEY_FILTER_TRACKERS);
+    trg_prefs_add_default_bool_true(p, TRG_PREFS_KEY_DIRECTORIES_FIRST);
     trg_prefs_add_default_bool_true(p, TRG_PREFS_KEY_SHOW_GRAPH);
     trg_prefs_add_default_bool_true(p, TRG_PREFS_KEY_ADD_OPTIONS_DIALOG);
     trg_prefs_add_default_bool_true(p, TRG_PREFS_KEY_SHOW_STATE_SELECTOR);
@@ -172,7 +177,7 @@ TrgPrefs *trg_prefs_new(void)
     return g_object_new(TRG_TYPE_PREFS, NULL);
 }
 
-static JsonObject *trg_prefs_new_profile_object()
+static JsonObject *trg_prefs_new_profile_object(void)
 {
     return json_object_new();
 }
@@ -421,6 +426,12 @@ JsonArray *trg_prefs_get_profiles(TrgPrefs * p)
                                         TRG_PREFS_KEY_PROFILES);
 }
 
+JsonArray *trg_prefs_get_rss(TrgPrefs *p) {
+	TrgPrefsPrivate *priv = p->priv;
+	return json_object_get_array_member(priv->userObj,
+            TRG_PREFS_KEY_RSS);
+}
+
 void
 trg_prefs_set_double(TrgPrefs * p, const gchar * key, gdouble value,
                      int flags)
@@ -487,7 +498,7 @@ JsonObject *trg_prefs_get_root(TrgPrefs * p)
     return priv->userObj;
 }
 
-void trg_prefs_empty_init(TrgPrefs * p)
+static void trg_prefs_empty_init(TrgPrefs * p)
 {
     TrgPrefsPrivate *priv = p->priv;
     JsonArray *profiles = json_array_new();
diff --git a/src/trg-prefs.h b/src/trg-prefs.h
index e7a7f48..3923e7d 100644
--- a/src/trg-prefs.h
+++ b/src/trg-prefs.h
@@ -33,6 +33,7 @@
 #define TRG_PREFS_KEY_RPC_URL_PATH "rpc-url-path"
 #define TRG_PREFS_KEY_PROFILE_ID    "profile-id"
 #define TRG_PREFS_KEY_PROFILES    "profiles"
+#define TRG_PREFS_KEY_RSS    "rss"
 #define TRG_PREFS_KEY_PROFILE_NAME   "profile-name"
 #define TRG_PREFS_KEY_HOSTNAME      "hostname"
 #define TRG_PREFS_KEY_PORT          "port"
@@ -41,6 +42,7 @@
 #define TRG_PREFS_KEY_PASSWORD      "password"
 #define TRG_PREFS_KEY_AUTO_CONNECT  "auto-connect"
 #define TRG_PREFS_KEY_SSL            "ssl"
+#define TRG_PREFS_KEY_SSL_VALIDATE   "ssl-validate"
 #define TRG_PREFS_KEY_TIMEOUT            "timeout"
 #define TRG_PREFS_KEY_RETRIES            "retries"
 #define TRG_PREFS_KEY_UPDATE_INTERVAL "update-interval"
@@ -54,6 +56,7 @@
 #define TRG_PREFS_KEY_SHOW_GRAPH    "show-graph"
 #define TRG_PREFS_KEY_SYSTEM_TRAY_MINIMISE  "system-tray-minimise"
 #define TRG_PREFS_KEY_FILTER_TRACKERS  "filter-trackers"
+#define TRG_PREFS_KEY_DIRECTORIES_FIRST  "directories-first"
 #define TRG_PREFS_KEY_FILTER_DIRS  "filter-dirs"
 #define TRG_PREFS_KEY_SHOW_STATE_SELECTOR "show-state-selector"
 #define TRG_PREFS_KEY_SHOW_NOTEBOOK "show-notebook"
@@ -77,6 +80,9 @@
 #define TRG_PREFS_KEY_EXEC_COMMANDS "exec-commands"
 #define TRG_PREFS_KEY_EXEC_COMMANDS_SUBKEY_CMD "cmd"
 #define TRG_PREFS_KEY_DESTINATIONS "destinations"
+#define TRG_PREFS_KEY_RSS "rss"
+#define TRG_PREFS_RSS_SUBKEY_ID "id"
+#define TRG_PREFS_RSS_SUBKEY_URL "url"
 #define TRG_PREFS_KEY_LAST_MOVE_DESTINATION "last-move-destination"
 #define TRG_PREFS_KEY_LAST_ADD_DESTINATION "last-add-destination"
 #define TRG_PREFS_KEY_DESTINATIONS_SUBKEY_DIR "dir"
@@ -138,6 +144,7 @@ gboolean trg_prefs_get_bool(TrgPrefs * p, const gchar * key, int flags);
 JsonObject *trg_prefs_get_profile(TrgPrefs * p);
 JsonObject *trg_prefs_get_connection(TrgPrefs * p);
 JsonArray *trg_prefs_get_profiles(TrgPrefs * p);
+JsonArray *trg_prefs_get_rss(TrgPrefs *p);
 void trg_prefs_set_connection(TrgPrefs * p, JsonObject * profile);
 gint trg_prefs_get_profile_id(TrgPrefs * p);
 void trg_prefs_del_profile(TrgPrefs * p, JsonObject * profile);
diff --git a/src/trg-remote-prefs-dialog.c b/src/trg-remote-prefs-dialog.c
index f8bd43b..3fcd910 100644
--- a/src/trg-remote-prefs-dialog.c
+++ b/src/trg-remote-prefs-dialog.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <math.h>
 #include <stdint.h>
 #include <glib/gi18n.h>
@@ -436,7 +440,7 @@ static gboolean on_port_tested(gpointer data)
                                      _
                                      ("Port is <span font_weight=\"bold\" fgcolor=\"red\">closed</span>"));
         } else {
-            trg_error_dialog(GTK_WINDOW(data), response);
+          trg_error_dialog(GTK_WINDOW(response->cb_data), response);
         }
     }
 
@@ -471,7 +475,7 @@ static gboolean on_blocklist_updated(gpointer data)
         if (response->status == CURLE_OK) {
             JsonObject *args = get_arguments(response->obj);
             gchar *labelText =
-                g_strdup_printf(_("Blocklist (%ld entries)"),
+                g_strdup_printf(_("Blocklist (%" G_GINT64_FORMAT " entries)"),
                                 json_object_get_int_member(args,
                                                            SGET_BLOCKLIST_SIZE));
             gtk_button_set_label(GTK_BUTTON(priv->blocklist_check),
@@ -565,7 +569,7 @@ static GtkWidget *trg_rprefs_connPage(TrgRemotePrefsDialog * win,
 
     hig_workarea_add_section_title(t, &row, _("Blocklist"));
 
-    stringValue = g_strdup_printf(_("Blocklist (%ld entries)"),
+    stringValue = g_strdup_printf(_("Blocklist (%" G_GINT64_FORMAT " entries)"),
                                   session_get_blocklist_size(s));
     tb = priv->blocklist_check =
         trg_json_widget_check_new(&priv->widgets, s,
diff --git a/src/trg-rss-cell-renderer.c b/src/trg-rss-cell-renderer.c
new file mode 100644
index 0000000..3477d4a
--- /dev/null
+++ b/src/trg-rss-cell-renderer.c
@@ -0,0 +1,431 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_RSS
+
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+#include <glib/gi18n.h>
+
+#include "icons.h"
+#include "hig.h"
+#include "util.h"
+#include "trg-rss-cell-renderer.h"
+
+enum {
+    PROP_TITLE = 1,
+    PROP_FEED,
+    PROP_PUBLISHED,
+    PROP_UPLOADED
+};
+
+#define SMALL_SCALE 0.9
+#define COMPACT_ICON_SIZE GTK_ICON_SIZE_MENU
+#define FULL_ICON_SIZE GTK_ICON_SIZE_DND
+
+#define FOREGROUND_COLOR_KEY "foreground-rgba"
+typedef GdkRGBA GtrColor;
+typedef cairo_t GtrDrawable;
+typedef GtkRequisition GtrRequisition;
+
+struct TrgRssCellRendererPrivate {
+    GtkCellRenderer *text_renderer;
+    GtkCellRenderer *icon_renderer;
+    GString *gstr1;
+    GString *gstr2;
+    gchar *title;
+    gchar *published;
+    gchar *feed;
+    gboolean uploaded;
+};
+
+static void
+trg_rss_cell_renderer_render(GtkCellRenderer * cell,
+                             GtrDrawable * window, GtkWidget * widget,
+                             const GdkRectangle * background_area,
+                             const GdkRectangle * cell_area,
+                             GtkCellRendererState flags);
+
+static void
+gtr_cell_renderer_render(GtkCellRenderer * renderer,
+                         GtrDrawable * drawable,
+                         GtkWidget * widget,
+                         const GdkRectangle * area,
+                         GtkCellRendererState flags)
+{
+    gtk_cell_renderer_render(renderer, drawable, widget, area, area,
+                             flags);
+}
+
+static void trg_rss_cell_renderer_set_property(GObject * object,
+                                               guint property_id,
+                                               const GValue * v,
+                                               GParamSpec * pspec)
+{
+    TrgRssCellRenderer *self = TRG_RSS_CELL_RENDERER(object);
+    struct TrgRssCellRendererPrivate *p = self->priv;
+
+    switch (property_id) {
+    case PROP_TITLE:
+    	g_free(p->title);
+    	p->title = g_value_dup_string(v);
+        break;
+    case PROP_PUBLISHED:
+    	g_free(p->published);
+    	p->published = g_value_dup_string(v);
+    	break;
+    case PROP_FEED:
+    	g_free(p->feed);
+    	p->feed = g_value_dup_string(v);
+    	break;
+    case PROP_UPLOADED:
+    	p->uploaded = g_value_get_boolean(v);
+    	break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+        break;
+    }
+}
+
+static void
+trg_rss_cell_renderer_get_property(GObject * object,
+                                   guint property_id,
+                                   GValue * v, GParamSpec * pspec)
+{
+    G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+}
+
+G_DEFINE_TYPE(TrgRssCellRenderer, trg_rss_cell_renderer,
+              GTK_TYPE_CELL_RENDERER)
+
+static void trg_rss_cell_renderer_dispose(GObject * o)
+{
+    TrgRssCellRenderer *r = TRG_RSS_CELL_RENDERER(o);
+
+    if (r && r->priv) {
+    	struct TrgRssCellRendererPrivate *priv = r->priv;
+
+        g_string_free(priv->gstr1, TRUE);
+        g_free(priv->feed);
+        g_free(priv->published);
+        g_free(priv->title);
+        g_object_unref(G_OBJECT(priv->text_renderer));
+        g_object_unref(G_OBJECT(priv->icon_renderer));
+        r->priv = NULL;
+    }
+
+    G_OBJECT_CLASS(trg_rss_cell_renderer_parent_class)->dispose(o);
+}
+
+static GdkPixbuf *get_icon(TrgRssCellRenderer * r, GtkIconSize icon_size,
+                           GtkWidget * for_widget)
+{
+    const char *mime_type = "file";
+
+    return gtr_get_mime_type_icon(mime_type, icon_size, for_widget);
+}
+
+static void
+trg_rss_cell_renderer_get_size(GtkCellRenderer * cell, GtkWidget * widget,
+                               const GdkRectangle * cell_area,
+                               gint * x_offset,
+                               gint * y_offset,
+                               gint * width, gint * height)
+{
+    TrgRssCellRenderer *self = TRG_RSS_CELL_RENDERER(cell);
+
+    if (self) {
+    	struct TrgRssCellRendererPrivate *p = self->priv;
+        int xpad, ypad;
+        int h, w;
+        GtkRequisition icon_size;
+        GtkRequisition name_size;
+        GtkRequisition stat_size;
+        GtkRequisition prog_size;
+        GdkPixbuf *icon;
+
+        icon = get_icon(self, FULL_ICON_SIZE, widget);
+
+        gtk_cell_renderer_get_padding(cell, &xpad, &ypad);
+
+        /* get the idealized cell dimensions */
+        g_object_set(p->icon_renderer, "pixbuf", icon, NULL);
+        gtk_cell_renderer_get_preferred_size(p->icon_renderer, widget, NULL,
+                                             &icon_size);
+        g_object_set(p->text_renderer, "text", p->title,
+                     "weight", PANGO_WEIGHT_BOLD, "scale", 1.0, "ellipsize",
+                     PANGO_ELLIPSIZE_NONE, NULL);
+        gtk_cell_renderer_get_preferred_size(p->text_renderer, widget, NULL,
+                                             &name_size);
+        g_object_set(p->text_renderer, "text", p->feed, "weight",
+                     PANGO_WEIGHT_NORMAL, "scale", SMALL_SCALE, NULL);
+        gtk_cell_renderer_get_preferred_size(p->text_renderer, widget, NULL,
+                                             &prog_size);
+        g_object_set(p->text_renderer, "text", p->published, NULL);
+        gtk_cell_renderer_get_preferred_size(p->text_renderer, widget, NULL,
+                                             &stat_size);
+
+        /**
+        *** LAYOUT
+        **/
+
+        if (width != NULL)
+            *width = w =
+                xpad * 2 + icon_size.width + GUI_PAD + MAX3(name_size.width,
+                                                            prog_size.width,
+                                                            stat_size.width);
+        if (height != NULL)
+            *height = h =
+                ypad * 2 + name_size.height + prog_size.height +
+                GUI_PAD_SMALL + stat_size.height;
+
+        /* cleanup */
+        g_object_unref(icon);
+
+        if (x_offset)
+            *x_offset = cell_area ? cell_area->x : 0;
+
+        if (y_offset) {
+            int xpad, ypad;
+            gtk_cell_renderer_get_padding(cell, &xpad, &ypad);
+            *y_offset =
+                cell_area ? (int) ((cell_area->height - (ypad * 2 + h)) /
+                                   2.0) : 0;
+        }
+    }
+}
+
+static void
+trg_rss_cell_renderer_class_init(TrgRssCellRendererClass * klass)
+{
+    GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+    GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS(klass);
+
+    g_type_class_add_private(klass,
+                             sizeof(struct TrgRssCellRendererPrivate));
+
+    cell_class->render = trg_rss_cell_renderer_render;
+    cell_class->get_size = trg_rss_cell_renderer_get_size;
+    gobject_class->set_property = trg_rss_cell_renderer_set_property;
+    gobject_class->get_property = trg_rss_cell_renderer_get_property;
+    gobject_class->dispose = trg_rss_cell_renderer_dispose;
+
+    g_object_class_install_property(gobject_class,
+                                    PROP_TITLE,
+                                    g_param_spec_string("title",
+                                                        "title",
+                                                        "Title",
+                                                        NULL,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_STATIC_NAME
+                                                        |
+                                                        G_PARAM_STATIC_NICK
+                                                        |
+                                                        G_PARAM_STATIC_BLURB));
+
+    g_object_class_install_property(gobject_class,
+                                    PROP_PUBLISHED,
+                                    g_param_spec_string("published",
+                                                        "published",
+                                                        "Published",
+                                                        NULL,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_STATIC_NAME
+                                                        |
+                                                        G_PARAM_STATIC_NICK
+                                                        |
+                                                        G_PARAM_STATIC_BLURB));
+
+    g_object_class_install_property(gobject_class,
+                                    PROP_FEED,
+                                    g_param_spec_string("feed",
+                                                        "feed",
+                                                        "Feed",
+                                                        NULL,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_STATIC_NAME
+                                                        |
+                                                        G_PARAM_STATIC_NICK
+                                                        |
+                                                        G_PARAM_STATIC_BLURB));
+
+    g_object_class_install_property(gobject_class,
+                                    PROP_UPLOADED,
+                                    g_param_spec_boolean("uploaded",
+                                                        "uploaded",
+                                                        "Uploaded",
+                                                        FALSE,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_STATIC_NAME
+                                                        |
+                                                        G_PARAM_STATIC_NICK
+                                                        |
+                                                        G_PARAM_STATIC_BLURB));
+
+    /*g_object_class_install_property(gobject_class, P_BAR_HEIGHT,
+                                    g_param_spec_int("bar-height", NULL,
+                                                     "Bar Height",
+                                                     1, INT_MAX,
+                                                     DEFAULT_BAR_HEIGHT,
+                                                     G_PARAM_READWRITE));*/
+
+}
+
+static void trg_rss_cell_renderer_init(TrgRssCellRenderer * self)
+{
+    struct TrgRssCellRendererPrivate *p;
+
+    p = self->priv = G_TYPE_INSTANCE_GET_PRIVATE(self,
+                                                 TRG_RSS_CELL_RENDERER_TYPE,
+                                                 struct
+                                                 TrgRssCellRendererPrivate);
+
+    p->gstr1 = g_string_new(NULL);
+    p->gstr2 = g_string_new(NULL);
+    p->text_renderer = gtk_cell_renderer_text_new();
+    g_object_set(p->text_renderer, "xpad", 0, "ypad", 0, NULL);
+    p->icon_renderer = gtk_cell_renderer_pixbuf_new();
+    g_object_ref_sink(p->text_renderer);
+    g_object_ref_sink(p->icon_renderer);
+}
+
+
+GtkCellRenderer *trg_rss_cell_renderer_new(void)
+{
+    return (GtkCellRenderer *) g_object_new(TRG_RSS_CELL_RENDERER_TYPE,
+                                            NULL);
+}
+
+static void
+get_text_color(TrgRssCellRenderer * r, GtkWidget * widget,
+               GtrColor * setme)
+{
+    struct TrgRssCellRendererPrivate *p = r->priv;
+
+    if (p->uploaded)
+        gtk_style_context_get_color(gtk_widget_get_style_context(widget),
+                                    GTK_STATE_FLAG_INSENSITIVE, setme);
+    else
+        gtk_style_context_get_color(gtk_widget_get_style_context(widget),
+                                    GTK_STATE_FLAG_NORMAL, setme);
+}
+
+static void
+trg_rss_cell_renderer_render(GtkCellRenderer * cell,
+                             GtrDrawable * window, GtkWidget * widget,
+                             const GdkRectangle * background_area,
+                             const GdkRectangle * cell_area,
+                             GtkCellRendererState flags)
+{
+    TrgRssCellRenderer *self = TRG_RSS_CELL_RENDERER(cell);
+    int xpad, ypad;
+    GtkRequisition size;
+    GdkRectangle fill_area;
+    GdkRectangle icon_area;
+    GdkRectangle name_area;
+    GdkRectangle stat_area;
+    GdkRectangle prog_area;
+    GdkRectangle prct_area;
+    GdkPixbuf *icon;
+    GtrColor text_color;
+    struct TrgRssCellRendererPrivate *p;
+
+    if (!self)
+    	return;
+
+    p = self->priv;
+
+    icon = get_icon(self, FULL_ICON_SIZE, widget);
+    gtk_cell_renderer_get_padding(GTK_CELL_RENDERER(cell), &xpad, &ypad);
+    get_text_color(self, widget, &text_color);
+
+    /* get the idealized cell dimensions */
+    g_object_set(p->icon_renderer, "pixbuf", icon, NULL);
+    gtk_cell_renderer_get_preferred_size(p->icon_renderer, widget, NULL,
+                                         &size);
+    icon_area.width = size.width;
+    icon_area.height = size.height;
+    g_object_set(p->text_renderer, "text", p->title,
+                 "weight", PANGO_WEIGHT_BOLD, "ellipsize",
+                 PANGO_ELLIPSIZE_NONE, "scale", 1.0, NULL);
+    gtk_cell_renderer_get_preferred_size(p->text_renderer, widget, NULL,
+                                         &size);
+    name_area.width = size.width;
+    name_area.height = size.height;
+    g_object_set(p->text_renderer, "text", p->feed, "weight",
+                 PANGO_WEIGHT_NORMAL, "scale", SMALL_SCALE, NULL);
+    gtk_cell_renderer_get_preferred_size(p->text_renderer, widget, NULL,
+                                         &size);
+    prog_area.width = size.width;
+    prog_area.height = size.height;
+    g_object_set(p->text_renderer, "text", p->published, NULL);
+    gtk_cell_renderer_get_preferred_size(p->text_renderer, widget, NULL,
+                                         &size);
+    stat_area.width = size.width;
+    stat_area.height = size.height;
+
+    /**
+    *** LAYOUT
+    **/
+
+    fill_area = *background_area;
+    fill_area.x += xpad;
+    fill_area.y += ypad;
+    fill_area.width -= xpad * 2;
+    fill_area.height -= ypad * 2;
+
+    /* icon */
+    icon_area.x = fill_area.x;
+    icon_area.y = fill_area.y + (fill_area.height - icon_area.height) / 2;
+
+    /* name */
+    name_area.x = icon_area.x + icon_area.width + GUI_PAD;
+    name_area.y = fill_area.y;
+    name_area.width =
+        fill_area.width - GUI_PAD - icon_area.width - GUI_PAD_SMALL;
+
+    /* prog */
+    prog_area.x = name_area.x;
+    prog_area.y = name_area.y + name_area.height;
+    prog_area.width = name_area.width;
+
+    /* progressbar */
+    prct_area.x = prog_area.x;
+    prct_area.y = prog_area.y + prog_area.height + GUI_PAD_SMALL;
+    prct_area.width = prog_area.width;
+    prct_area.height = 0;
+
+    /* status */
+    stat_area.x = prct_area.x;
+    stat_area.y = prct_area.y + prct_area.height + GUI_PAD_SMALL;
+    stat_area.width = prct_area.width;
+
+    /**
+    *** RENDER
+    **/
+
+    g_object_set(p->icon_renderer, "pixbuf", icon, "sensitive", TRUE,
+                 NULL);
+    gtr_cell_renderer_render(p->icon_renderer, window, widget, &icon_area,
+                             flags);
+    g_object_set(p->text_renderer, "text", p->title,
+                 "scale", 1.0, FOREGROUND_COLOR_KEY, &text_color,
+                 "ellipsize", PANGO_ELLIPSIZE_END, "weight",
+                 PANGO_WEIGHT_BOLD, NULL);
+    gtr_cell_renderer_render(p->text_renderer, window, widget, &name_area,
+                             flags);
+    g_object_set(p->text_renderer, "text", p->feed, "scale",
+                 SMALL_SCALE, "weight", PANGO_WEIGHT_NORMAL, NULL);
+    gtr_cell_renderer_render(p->text_renderer, window, widget, &prog_area,
+                             flags);
+    g_object_set(p->text_renderer, "text", p->published,
+                 FOREGROUND_COLOR_KEY, &text_color, NULL);
+    gtr_cell_renderer_render(p->text_renderer, window, widget, &stat_area,
+                             flags);
+
+    /* cleanup */
+    g_object_unref(icon);
+}
+
+#endif
diff --git a/src/trg-rss-cell-renderer.h b/src/trg-rss-cell-renderer.h
new file mode 100644
index 0000000..17c6c69
--- /dev/null
+++ b/src/trg-rss-cell-renderer.h
@@ -0,0 +1,53 @@
+/*
+ * transmission-remote-gtk - A GTK RPC client to Transmission
+ * Copyright (C) 2011-2013  Alan Fitton
+
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef TRG_RSS_CELL_RENDERER_H
+#define TRG_RSS_CELL_RENDERER_H
+
+#ifdef HAVE_RSS
+
+#include <gtk/gtk.h>
+
+#define TRG_RSS_CELL_RENDERER_TYPE ( trg_rss_cell_renderer_get_type( ) )
+
+#define TRG_RSS_CELL_RENDERER( o ) \
+    ( G_TYPE_CHECK_INSTANCE_CAST( ( o ), \
+                                 TRG_RSS_CELL_RENDERER_TYPE, \
+                                 TrgRssCellRenderer ) )
+
+typedef struct TrgRssCellRenderer TrgRssCellRenderer;
+
+typedef struct TrgRssCellRendererClass TrgRssCellRendererClass;
+
+struct TrgRssCellRenderer {
+    GtkCellRenderer parent;
+    struct TrgRssCellRendererPrivate *priv;
+};
+
+struct TrgRssCellRendererClass {
+    GtkCellRendererClass parent;
+};
+
+GType trg_rss_cell_renderer_get_type(void) G_GNUC_CONST;
+
+GtkCellRenderer *trg_rss_cell_renderer_new(void);
+
+#endif
+
+#endif                          /* TRG_RSS_CELL_RENDERER_H */
diff --git a/src/trg-rss-model.c b/src/trg-rss-model.c
new file mode 100644
index 0000000..aa15829
--- /dev/null
+++ b/src/trg-rss-model.c
@@ -0,0 +1,277 @@
+/*
+ * transmission-remote-gtk - A GTK RPC client to Transmission
+ * Copyright (C) 2011-2013  Alan Fitton
+
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_RSS
+
+#include <gtk/gtk.h>
+#include <json-glib/json-glib.h>
+#include <rss-glib/rss-glib.h>
+
+#include "config.h"
+#include "torrent.h"
+#include "trg-client.h"
+#include "trg-model.h"
+#include "trg-rss-model.h"
+
+enum {
+	PROP_0, PROP_CLIENT
+};
+
+enum {
+	SIGNAL_GET_ERROR, SIGNAL_PARSE_ERROR, SIGNAL_COUNT
+};
+
+static guint signals[SIGNAL_COUNT] = { 0 };
+
+G_DEFINE_TYPE(TrgRssModel, trg_rss_model, GTK_TYPE_LIST_STORE)
+#define TRG_RSS_MODEL_GET_PRIVATE(o) \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRG_TYPE_RSS_MODEL, TrgRssModelPrivate))
+typedef struct _TrgRssModelPrivate TrgRssModelPrivate;
+
+struct _TrgRssModelPrivate {
+	TrgClient *client;
+	GHashTable *table;
+	guint index;
+};
+
+typedef struct {
+	TrgRssModel *model;
+	gchar *feed_id;
+	gchar *feed_url;
+	gchar *feed_cookie;
+	GError *error;
+	trg_response *response;
+} feed_update;
+
+static void feed_update_free(feed_update *update) {
+	if (update->error)
+		g_error_free(update->error);
+
+	g_free(update->feed_id);
+	g_free(update->feed_url);
+	g_free(update->feed_cookie);
+
+	g_free(update);
+}
+
+static gboolean on_rss_receive(gpointer data) {
+	trg_response *response = (trg_response *) data;
+	feed_update *update = (feed_update*) response->cb_data;
+	TrgRssModel *model = update->model;
+	TrgRssModelPrivate *priv = TRG_RSS_MODEL_GET_PRIVATE(model);
+
+	if (response->status == CURLE_OK) {
+		RssParser* parser = rss_parser_new();
+		GError *error = NULL;
+		if (rss_parser_load_from_data(parser, response->raw,
+				response->size, &error)) {
+			RssDocument *doc = rss_parser_get_document(parser);
+			GtkTreeIter iter;
+			GList *list, *tmp;
+
+			list = rss_document_get_items(doc);
+
+			for (tmp = list; tmp != NULL; tmp = tmp->next) {
+				RssItem *item = (RssItem*) tmp->data;
+				const gchar *guid = rss_item_get_guid(item);
+				if (g_hash_table_lookup(priv->table, guid) != (void*) 1) {
+					gtk_list_store_append(GTK_LIST_STORE(model), &iter);
+					gtk_list_store_set(GTK_LIST_STORE(model), &iter, RSSCOL_ID,
+							guid, RSSCOL_TITLE, rss_item_get_title(item),
+							RSSCOL_LINK, rss_item_get_link(item), RSSCOL_FEED,
+							update->feed_id, RSSCOL_COOKIE, update->feed_cookie, RSSCOL_PUBDATE,
+							rss_item_get_pub_date(item), -1);
+					g_hash_table_insert(priv->table, g_strdup(guid), (void*) 1);
+				}
+			}
+
+			g_list_free(list);
+			g_object_unref(doc);
+			g_object_unref(parser);
+		} else {
+			rss_parse_error perror;
+			perror.error = error;
+			perror.feed_id = update->feed_id;
+
+		    g_signal_emit(model, signals[SIGNAL_PARSE_ERROR], 0,
+		                  &perror);
+
+		    g_message("parse error: %s", error->message);
+			g_error_free(error);
+		}
+	} else {
+		rss_get_error get_error;
+		get_error.error_code = response->status;
+		get_error.feed_id = update->feed_id;
+
+	    g_signal_emit(model, signals[SIGNAL_GET_ERROR], 0,
+	                  &get_error);
+	}
+
+	trg_response_free(response);
+	feed_update_free(update);
+
+	return FALSE;
+}
+
+void trg_rss_model_update(TrgRssModel * model) {
+	TrgRssModelPrivate *priv = TRG_RSS_MODEL_GET_PRIVATE(model);
+	TrgPrefs *prefs = trg_client_get_prefs(priv->client);
+	JsonArray *feeds = trg_prefs_get_rss(prefs);
+	GRegex *cookie_regex;
+	GList *li;
+
+	if (!feeds)
+		return;
+
+	cookie_regex = g_regex_new("(.*):COOKIE:(.*)", 0, 0, NULL);
+
+	for (li = json_array_get_elements(feeds); li != NULL;
+			li = g_list_next(li)) {
+		JsonObject *feed = json_node_get_object((JsonNode *) li->data);
+		const gchar *feed_url = json_object_get_string_member(feed, "url");
+		const gchar *id = json_object_get_string_member(feed, "id");
+		feed_update *update;
+		GMatchInfo *match;
+
+		if (!feed_url || !id)
+			continue;
+
+		update = g_new0(feed_update, 1);
+		update->feed_id = g_strdup(id);
+		update->model = model;
+
+		if (g_regex_match (cookie_regex, feed_url, 0, &match)) {
+			update->feed_url = g_match_info_fetch(match, 1);
+			update->feed_cookie = g_match_info_fetch(match, 2);
+			g_match_info_free(match);
+		} else {
+			update->feed_url = g_strdup(feed_url);
+		}
+
+		async_http_request(priv->client, update->feed_url, update->feed_cookie, on_rss_receive,
+				update);
+	}
+
+	g_regex_unref(cookie_regex);
+
+	/*trg_model_remove_removed(GTK_LIST_STORE(model),
+	 RSSCOL_UPDATESERIAL, updateSerial);*/
+}
+
+static void trg_rss_model_set_property(GObject * object, guint prop_id,
+		const GValue * value, GParamSpec * pspec G_GNUC_UNUSED) {
+	TrgRssModelPrivate *priv = TRG_RSS_MODEL_GET_PRIVATE(object);
+
+	switch (prop_id) {
+	case PROP_CLIENT:
+		priv->client = g_value_get_pointer(value);
+		break;
+	}
+}
+
+static void trg_rss_model_get_property(GObject * object, guint prop_id,
+		GValue * value, GParamSpec * pspec G_GNUC_UNUSED) {
+}
+
+static GObject *trg_rss_model_constructor(GType type,
+		guint n_construct_properties, GObjectConstructParam * construct_params) {
+	GObject *obj = G_OBJECT_CLASS
+	(trg_rss_model_parent_class)->constructor(type,
+			n_construct_properties, construct_params);
+	TrgRssModelPrivate *priv = TRG_RSS_MODEL_GET_PRIVATE(obj);
+
+	priv->table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+
+	return obj;
+}
+
+static void trg_rss_model_dispose(GObject * object) {
+	TrgRssModelPrivate *priv = TRG_RSS_MODEL_GET_PRIVATE(object);
+	g_hash_table_destroy(priv->table);
+	G_OBJECT_CLASS(trg_rss_model_parent_class)->dispose(object);
+}
+
+static void trg_rss_model_class_init(TrgRssModelClass * klass) {
+	GObjectClass *object_class = G_OBJECT_CLASS(klass);
+
+	g_type_class_add_private(klass, sizeof(TrgRssModelPrivate));
+
+	object_class->set_property = trg_rss_model_set_property;
+	object_class->get_property = trg_rss_model_get_property;
+	object_class->constructor = trg_rss_model_constructor;
+	object_class->dispose = trg_rss_model_dispose;
+
+	g_object_class_install_property(object_class, PROP_CLIENT,
+			g_param_spec_pointer("client", "client", "client",
+					G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY
+							| G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK
+							| G_PARAM_STATIC_BLURB));
+
+    signals[SIGNAL_GET_ERROR] = g_signal_new("get-error",
+                                                     G_TYPE_FROM_CLASS
+                                                     (object_class),
+                                                     G_SIGNAL_RUN_LAST |
+                                                     G_SIGNAL_ACTION,
+                                                     G_STRUCT_OFFSET
+                                                     (TrgRssModelClass,
+                                                      get_error),
+                                                     NULL, NULL,
+                                                     g_cclosure_marshal_VOID__POINTER,
+                                                     G_TYPE_NONE, 1,
+                                                     G_TYPE_POINTER);
+
+    signals[SIGNAL_PARSE_ERROR] = g_signal_new("parse-error",
+                                                     G_TYPE_FROM_CLASS
+                                                     (object_class),
+                                                     G_SIGNAL_RUN_LAST |
+                                                     G_SIGNAL_ACTION,
+                                                     G_STRUCT_OFFSET
+                                                     (TrgRssModelClass,
+                                                      parse_error),
+                                                     NULL, NULL,
+                                                     g_cclosure_marshal_VOID__POINTER,
+                                                     G_TYPE_NONE, 1,
+                                                     G_TYPE_POINTER);
+}
+
+static void trg_rss_model_init(TrgRssModel * self) {
+	GType column_types[RSSCOL_COLUMNS];
+
+	column_types[RSSCOL_ID] = G_TYPE_STRING;
+	column_types[RSSCOL_TITLE] = G_TYPE_STRING;
+	column_types[RSSCOL_LINK] = G_TYPE_STRING;
+	column_types[RSSCOL_COOKIE] = G_TYPE_STRING;
+	column_types[RSSCOL_FEED] = G_TYPE_STRING;
+	column_types[RSSCOL_PUBDATE] = G_TYPE_STRING;
+	column_types[RSSCOL_UPLOADED] = G_TYPE_BOOLEAN;
+
+	gtk_list_store_set_column_types(GTK_LIST_STORE(self), RSSCOL_COLUMNS,
+			column_types);
+}
+
+TrgRssModel *trg_rss_model_new(TrgClient *client) {
+	return g_object_new(TRG_TYPE_RSS_MODEL, "client", client, NULL);
+}
+
+#endif
diff --git a/src/trg-rss-model.h b/src/trg-rss-model.h
new file mode 100644
index 0000000..a97ab3c
--- /dev/null
+++ b/src/trg-rss-model.h
@@ -0,0 +1,85 @@
+/*
+ * transmission-remote-gtk - A GTK RPC client to Transmission
+ * Copyright (C) 2011-2013  Alan Fitton
+
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef TRG_RSS_MODEL_H_
+#define TRG_RSS_MODEL_H_
+
+#ifdef HAVE_RSS
+
+#include <glib-object.h>
+#include <json-glib/json-glib.h>
+
+#include "trg-client.h"
+#include "trg-model.h"
+
+G_BEGIN_DECLS
+#define TRG_TYPE_RSS_MODEL trg_rss_model_get_type()
+#define TRG_RSS_MODEL(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRG_TYPE_RSS_MODEL, TrgRssModel))
+#define TRG_RSS_MODEL_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), TRG_TYPE_RSS_MODEL, TrgRssModelClass))
+#define TRG_IS_RSS_MODEL(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRG_TYPE_RSS_MODEL))
+#define TRG_IS_RSS_MODEL_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), TRG_TYPE_RSS_MODEL))
+#define TRG_RSS_MODEL_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), TRG_TYPE_RSS_MODEL, TrgRssModelClass))
+    typedef struct {
+    GtkListStore parent;
+} TrgRssModel;
+
+typedef struct {
+	gchar *feed_id;
+	gint error_code;
+} rss_get_error;
+
+typedef struct {
+	GError *error;
+	gchar *feed_id;
+} rss_parse_error;
+
+typedef struct {
+    GtkListStoreClass parent_class;
+    void (*get_error) (TrgRssModel * model,
+                               rss_get_error *error);
+    void (*parse_error) (TrgRssModel * model,
+                               rss_parse_error *error);
+} TrgRssModelClass;
+
+GType trg_rss_model_get_type(void);
+
+TrgRssModel *trg_rss_model_new(TrgClient *client);
+
+G_END_DECLS
+void trg_rss_model_update(TrgRssModel * model);
+
+enum {
+    RSSCOL_ID,
+    RSSCOL_TITLE,
+    RSSCOL_LINK,
+    RSSCOL_FEED,
+    RSSCOL_COOKIE,
+    RSSCOL_PUBDATE,
+    RSSCOL_UPLOADED,
+    RSSCOL_COLUMNS
+};
+
+#endif
+
+#endif                          /* TRG_RSS_MODEL_H_ */
diff --git a/src/trg-rss-window.c b/src/trg-rss-window.c
new file mode 100644
index 0000000..a4b6f63
--- /dev/null
+++ b/src/trg-rss-window.c
@@ -0,0 +1,371 @@
+/*
+ * transmission-remote-gtk - A GTK RPC client to Transmission
+ * Copyright (C) 2011-2013  Alan Fitton
+
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_RSS
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <rss-glib/rss-glib.h>
+
+#include "trg-rss-window.h"
+#include "trg-rss-model.h"
+#include "trg-rss-cell-renderer.h"
+#include "trg-torrent-add-dialog.h"
+#include "trg-preferences-dialog.h"
+#include "trg-client.h"
+#include "upload.h"
+#include "util.h"
+
+G_DEFINE_TYPE(TrgRssWindow, trg_rss_window,
+              GTK_TYPE_WINDOW)
+#define TRG_RSS_WINDOW_GET_PRIVATE(o) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((o), TRG_TYPE_RSS_WINDOW, TrgRssWindowPrivate))
+enum {
+	PROP_0, PROP_PARENT, PROP_CLIENT
+};
+
+typedef struct _TrgRssWindowPrivate TrgRssWindowPrivate;
+
+struct _TrgRssWindowPrivate {
+    TrgMainWindow *parent;
+    TrgClient *client;
+    GtkTreeView *tree_view;
+    TrgRssModel *tree_model;
+};
+
+static GObject *instance = NULL;
+
+static void
+trg_rss_window_get_property(GObject * object,
+                                     guint property_id,
+                                     GValue * value, GParamSpec * pspec)
+{
+    TrgRssWindowPrivate *priv =
+        TRG_RSS_WINDOW_GET_PRIVATE(object);
+    switch (property_id) {
+    case PROP_CLIENT:
+        g_value_set_pointer(value, priv->client);
+        break;
+    case PROP_PARENT:
+        g_value_set_object(value, priv->parent);
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+        break;
+    }
+}
+
+static void
+trg_rss_window_set_property(GObject * object,
+                                     guint property_id,
+                                     const GValue * value,
+                                     GParamSpec * pspec)
+{
+    TrgRssWindowPrivate *priv =
+        TRG_RSS_WINDOW_GET_PRIVATE(object);
+    switch (property_id) {
+    case PROP_PARENT:
+        priv->parent = g_value_get_object(value);
+        break;
+    case PROP_CLIENT:
+        priv->client = g_value_get_pointer(value);
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+        break;
+    }
+}
+
+static gboolean upload_complete_searchfunc(GtkTreeModel *model,
+                                                         GtkTreePath *path,
+                                                         GtkTreeIter *iter,
+                                                         gpointer data) {
+	trg_upload *upload = (trg_upload*)data;
+	gchar *item_guid = NULL;
+	gboolean stop = FALSE;
+
+	gtk_tree_model_get(model, iter, RSSCOL_ID, &item_guid, -1);
+
+	if (!g_strcmp0(item_guid, upload->uid)) {
+		gtk_list_store_set(GTK_LIST_STORE(model), iter, RSSCOL_UPLOADED, TRUE, -1);
+		stop = TRUE;
+	}
+
+	g_free(item_guid);
+
+	return stop;
+}
+
+static gboolean on_upload_complete(gpointer data) {
+	trg_response *response = (trg_response*)data;
+	trg_upload *upload = (trg_upload*)response->cb_data;
+	TrgRssWindowPrivate *priv = TRG_RSS_WINDOW_GET_PRIVATE(upload->cb_data);
+
+	if (response->status == CURLE_OK)
+		gtk_tree_model_foreach(GTK_TREE_MODEL(priv->tree_model), upload_complete_searchfunc, upload);
+
+	return FALSE;
+}
+
+static gboolean on_torrent_receive(gpointer data) {
+	trg_response *response = (trg_response *) data;
+	trg_upload *upload = (trg_upload*)response->cb_data;
+	TrgRssWindowPrivate *priv = TRG_RSS_WINDOW_GET_PRIVATE(upload->cb_data);
+	TrgClient *client = priv->client;
+	TrgPrefs *prefs = trg_client_get_prefs(client);
+	TrgMainWindow *main_win = priv->parent;
+
+	upload->upload_response = response;
+
+	if (response->status == CURLE_OK) {
+	    if (trg_prefs_get_bool(prefs, TRG_PREFS_KEY_ADD_OPTIONS_DIALOG,
+	                           TRG_PREFS_GLOBAL)) {
+	        TrgTorrentAddDialog *dialog =
+	            trg_torrent_add_dialog_new_from_upload(main_win, client,
+	                                       upload);
+	        gtk_widget_show_all(GTK_WIDGET(dialog));
+	    } else {
+	    	trg_do_upload(upload);
+	    }
+	} else {
+		trg_error_dialog(GTK_WINDOW(main_win), response);
+		trg_upload_free(upload);
+	}
+
+	return FALSE;
+}
+
+static void
+rss_item_activated(GtkTreeView * treeview,
+                          GtkTreePath * path,
+                          GtkTreeViewColumn *
+                          col G_GNUC_UNUSED, gpointer userdata)
+{
+	TrgRssWindow *win = TRG_RSS_WINDOW(userdata);
+	TrgRssWindowPrivate *priv = TRG_RSS_WINDOW_GET_PRIVATE(win);
+	TrgClient *client = priv->client;
+	TrgPrefs *prefs = trg_client_get_prefs(client);
+	GtkTreeModel *model = gtk_tree_view_get_model(treeview);
+	trg_upload *upload = g_new0(trg_upload, 1);
+	GtkTreeIter iter;
+	gchar *link, *uid, *cookie;
+
+    //upload->upload_response = response;
+    upload->main_window = priv->parent;
+    upload->client = client;
+    upload->extra_args = FALSE;
+    upload->flags = trg_prefs_get_add_flags(prefs);
+    upload->callback = on_upload_complete;
+    upload->cb_data = win;
+
+	gtk_tree_model_get_iter(model, &iter, path);
+
+	gtk_tree_model_get(model, &iter, RSSCOL_LINK, &link, RSSCOL_ID, &uid, RSSCOL_COOKIE, &cookie, -1);
+
+	upload->uid = uid;
+
+	async_http_request(priv->client, link, cookie, on_torrent_receive, upload);
+
+	g_free(cookie);
+	g_free(link);
+}
+
+static void trg_rss_on_get_error(TrgRssModel *model, rss_get_error *error, gpointer data) {
+	GtkWindow *win = GTK_WINDOW(data);
+	gchar *msg;
+	if (error->error_code <= -100) {
+		msg = g_strdup_printf(_("Request failed with HTTP code %d"), -(error->error_code + 100));
+	} else {
+		msg = g_strdup(curl_easy_strerror(error->error_code));
+	}
+    GtkWidget *dialog = gtk_message_dialog_new(win,
+                                               GTK_DIALOG_MODAL,
+                                               GTK_MESSAGE_ERROR,
+                                               GTK_BUTTONS_OK,
+                                               "%s", msg);
+    g_free(msg);
+    gtk_window_set_title(GTK_WINDOW(dialog), _("Error"));
+    gtk_dialog_run(GTK_DIALOG(dialog));
+    gtk_widget_destroy(dialog);
+}
+
+static void trg_rss_on_parse_error(TrgRssModel *model, rss_parse_error *error, gpointer data) {
+	GtkWindow *win = GTK_WINDOW(data);
+	gchar *msg = g_strdup_printf(_("Error parsing RSS feed \"%s\": %s"), error->feed_id, error->error->message);
+    GtkWidget *dialog = gtk_message_dialog_new(win,
+                                               GTK_DIALOG_MODAL,
+                                               GTK_MESSAGE_ERROR,
+                                               GTK_BUTTONS_OK,
+                                               "%s", msg);
+    g_free(msg);
+    gtk_window_set_title(GTK_WINDOW(dialog), _("Error"));
+    gtk_dialog_run(GTK_DIALOG(dialog));
+    gtk_widget_destroy(dialog);
+}
+
+static void on_configure(GtkWidget *widget, gpointer data) {
+	TrgRssWindowPrivate *priv = TRG_RSS_WINDOW_GET_PRIVATE(data);
+	GtkWidget *dlg = trg_preferences_dialog_get_instance(priv->parent, priv->client);
+	gtk_widget_show_all(dlg);
+	trg_preferences_dialog_set_page(TRG_PREFERENCES_DIALOG(dlg), 5);
+}
+
+static void on_refresh(GtkWidget *widget, gpointer data) {
+	TrgRssWindowPrivate *priv = TRG_RSS_WINDOW_GET_PRIVATE(data);
+	trg_rss_model_update(priv->tree_model);
+}
+
+static GObject *trg_rss_window_constructor(GType type,
+                                                    guint
+                                                    n_construct_properties,
+                                                    GObjectConstructParam *
+                                                    construct_params)
+{
+    GObject *object;
+    TrgRssWindowPrivate *priv;
+    GtkWidget *vbox;
+    GtkToolItem *item;
+    GtkWidget *toolbar;
+
+    object = G_OBJECT_CLASS
+        (trg_rss_window_parent_class)->constructor(type,
+                                                            n_construct_properties,
+                                                            construct_params);
+    priv = TRG_RSS_WINDOW_GET_PRIVATE(object);
+
+    priv->tree_model = trg_rss_model_new(priv->client);
+
+    g_signal_connect(priv->tree_model, "get-error",
+                      G_CALLBACK(trg_rss_on_get_error), object);
+    g_signal_connect(priv->tree_model, "parse-error",
+                      G_CALLBACK(trg_rss_on_parse_error), object);
+
+    trg_rss_model_update(priv->tree_model);
+
+    priv->tree_view = GTK_TREE_VIEW(gtk_tree_view_new());
+    gtk_tree_view_set_headers_visible(priv->tree_view, FALSE);
+    gtk_tree_view_set_model(priv->tree_view, GTK_TREE_MODEL(priv->tree_model));
+
+    gtk_tree_view_insert_column_with_attributes(priv->tree_view, -1, NULL, trg_rss_cell_renderer_new(), "title", RSSCOL_TITLE, "feed", RSSCOL_FEED, "published", RSSCOL_PUBDATE, "uploaded", RSSCOL_UPLOADED, NULL);
+
+    g_signal_connect(priv->tree_view, "row-activated",
+                      G_CALLBACK(rss_item_activated), object);
+
+    gtk_window_set_title(GTK_WINDOW(object), _("RSS Feeds"));
+
+    toolbar = gtk_toolbar_new();
+
+    item = gtk_tool_button_new_from_stock(GTK_STOCK_REFRESH);
+    gtk_widget_set_sensitive(GTK_WIDGET(item), TRUE);
+    gtk_tool_item_set_tooltip_text(item, "Refresh");
+    g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(on_refresh), object);
+    gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, 0);
+
+    item = gtk_tool_button_new_from_stock(GTK_STOCK_PREFERENCES);
+    gtk_widget_set_sensitive(GTK_WIDGET(item), TRUE);
+    gtk_tool_item_set_tooltip_text(item, "Configure Feeds");
+    g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(on_configure), object);
+    gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, 0);
+
+    vbox = trg_vbox_new(FALSE, 0);
+
+    gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(toolbar),
+                           FALSE, FALSE, 0);
+    gtk_box_pack_start(GTK_BOX(vbox), my_scrolledwin_new(GTK_WIDGET(priv->tree_view)),
+                           TRUE, TRUE, 0);
+
+    gtk_container_add(GTK_CONTAINER(object), vbox);
+
+    /*g_signal_connect(object, "response",
+                     G_CALLBACK(trg_rss_window_response_cb), NULL);*/
+
+    gtk_widget_set_size_request(GTK_WIDGET(object), 500, 300);
+
+    return object;
+}
+
+static void trg_rss_window_dispose(GObject * object)
+{
+	instance = NULL;
+    G_OBJECT_CLASS(trg_rss_window_parent_class)->dispose(object);
+}
+
+static void
+trg_rss_window_class_init(TrgRssWindowClass * klass)
+{
+    GObjectClass *object_class = G_OBJECT_CLASS(klass);
+
+    g_type_class_add_private(klass, sizeof(TrgRssWindowPrivate));
+
+    object_class->constructor = trg_rss_window_constructor;
+    object_class->get_property = trg_rss_window_get_property;
+    object_class->set_property = trg_rss_window_set_property;
+    object_class->dispose = trg_rss_window_dispose;
+
+    g_object_class_install_property(object_class,
+                                    PROP_CLIENT,
+                                    g_param_spec_pointer("trg-client",
+                                                         "TClient",
+                                                         "Client",
+                                                         G_PARAM_READWRITE
+                                                         |
+                                                         G_PARAM_CONSTRUCT_ONLY
+                                                         |
+                                                         G_PARAM_STATIC_NAME
+                                                         |
+                                                         G_PARAM_STATIC_NICK
+                                                         |
+                                                         G_PARAM_STATIC_BLURB));
+
+    g_object_class_install_property(object_class,
+                                    PROP_PARENT,
+                                    g_param_spec_object("parent-window",
+                                                        "Parent window",
+                                                        "Parent window",
+                                                        TRG_TYPE_MAIN_WINDOW,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY
+                                                        |
+                                                        G_PARAM_STATIC_NAME
+                                                        |
+                                                        G_PARAM_STATIC_NICK
+                                                        |
+                                                        G_PARAM_STATIC_BLURB));
+}
+
+static void
+trg_rss_window_init(TrgRssWindow * self G_GNUC_UNUSED)
+{
+}
+
+TrgRssWindow *trg_rss_window_get_instance(TrgMainWindow *parent, TrgClient *client)
+{
+    if (instance == NULL) {
+        instance =
+            g_object_new(TRG_TYPE_RSS_WINDOW, "parent-window", parent, "trg-client", client, NULL);
+    }
+
+    return TRG_RSS_WINDOW(instance);
+}
+
+#endif
diff --git a/src/trg-rss-window.h b/src/trg-rss-window.h
new file mode 100644
index 0000000..714451e
--- /dev/null
+++ b/src/trg-rss-window.h
@@ -0,0 +1,58 @@
+/*
+ * transmission-remote-gtk - A GTK RPC client to Transmission
+ * Copyright (C) 2011-2013  Alan Fitton
+
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef TRG_RSS_WINDOW_H_
+#define TRG_RSS_WINDOW_H_
+
+#ifdef HAVE_RSS
+
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+#include "trg-main-window.h"
+
+G_BEGIN_DECLS
+#define TRG_TYPE_RSS_WINDOW trg_rss_window_get_type()
+#define TRG_RSS_WINDOW(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRG_TYPE_RSS_WINDOW, TrgRssWindow))
+#define TRG_RSS_WINDOW_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), TRG_TYPE_RSS_WINDOW, TrgRssWindowClass))
+#define TRG_IS_RSS_WINDOW(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRG_TYPE_RSS_WINDOW))
+#define TRG_IS_RSS_WINDOW_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), TRG_TYPE_RSS_WINDOW))
+#define TRG_RSS_WINDOW_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), TRG_TYPE_RSS_WINDOW, TrgRssWindowClass))
+    typedef struct {
+    GtkWindow parent;
+} TrgRssWindow;
+
+typedef struct {
+    GtkWindowClass parent_class;
+} TrgRssWindowClass;
+
+GType trg_rss_window_get_type(void);
+
+TrgRssWindow *trg_rss_window_get_instance(TrgMainWindow *parent, TrgClient *client);
+
+G_END_DECLS
+
+#endif
+
+#endif                          /* TRG_RSS_WINDOW_H_ */
diff --git a/src/trg-sortable-filtered-model.c b/src/trg-sortable-filtered-model.c
index 9db1827..3acc443 100644
--- a/src/trg-sortable-filtered-model.c
+++ b/src/trg-sortable-filtered-model.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gtk/gtk.h>
 
 #include "trg-sortable-filtered-model.h"
diff --git a/src/trg-state-selector.c b/src/trg-state-selector.c
index cee0c56..4110f7b 100644
--- a/src/trg-state-selector.c
+++ b/src/trg-state-selector.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glib-object.h>
 #include <json-glib/json-glib.h>
 #include <glib/gi18n.h>
@@ -49,6 +53,7 @@ struct _TrgStateSelectorPrivate {
     guint flag;
     gboolean showDirs;
     gboolean showTrackers;
+    gboolean dirsFirst;
     TrgClient *client;
     TrgPrefs *prefs;
     GHashTable *trackers;
@@ -163,7 +168,7 @@ trg_state_selector_update_dynamic_filter(GtkTreeModel * model,
     GtkTreeIter iter;
     GtkTreePath *path = gtk_tree_row_reference_get_path(rr);
     gint64 oldSerial;
-    GValue gvalue = { 0 };
+    GValue gvalue = G_VALUE_INIT;
     gint oldCount;
 
     gtk_tree_model_get_iter(model, &iter, path);
@@ -356,10 +361,13 @@ void trg_state_selector_update(TrgStateSelector * s, guint whatsChanged)
                                                              updateSerial);
                     g_free(announceHost);
                 } else {
-                    trg_state_selector_insert(s, priv->n_categories,
-                                              g_hash_table_size
-                                              (priv->trackers),
-                                              announceHost, &iter);
+					if (priv->dirsFirst){
+							trg_state_selector_insert(s, priv->n_categories +
+										g_hash_table_size(priv->directories), -1, announceHost, &iter);
+					} else {
+						trg_state_selector_insert(s, priv->n_categories,
+										g_hash_table_size(priv->trackers), announceHost, &iter);
+					}
                     gtk_list_store_set(GTK_LIST_STORE(model), &iter,
                                        STATE_SELECTOR_ICON,
                                        GTK_STOCK_NETWORK,
@@ -390,11 +398,13 @@ void trg_state_selector_update(TrgStateSelector * s, guint whatsChanged)
                                                           *) result,
                                                          updateSerial);
             } else {
-                trg_state_selector_insert(s,
-                                          priv->n_categories +
-                                          g_hash_table_size
-                                          (priv->trackers), -1, dir,
-                                          &iter);
+                if (priv->dirsFirst){
+					trg_state_selector_insert(s, priv->n_categories,
+								g_hash_table_size(priv->directories), dir, &iter);
+				} else {
+					trg_state_selector_insert(s, priv->n_categories +
+									g_hash_table_size(priv->trackers), -1, dir, &iter);
+				}
                 gtk_list_store_set(GTK_LIST_STORE(model), &iter,
                                    STATE_SELECTOR_ICON,
                                    GTK_STOCK_DIRECTORY,
@@ -466,6 +476,15 @@ trg_state_selector_set_show_trackers(TrgStateSelector * s, gboolean show)
         trg_state_selector_update(s, TORRENT_UPDATE_ADDREMOVE);
 }
 
+void
+trg_state_selector_set_directories_first(TrgStateSelector * s, gboolean _dirsFirst){
+	TrgStateSelectorPrivate *priv = TRG_STATE_SELECTOR_GET_PRIVATE(s);
+	priv->dirsFirst = _dirsFirst;
+	g_hash_table_remove_all(priv->directories);
+	g_hash_table_remove_all(priv->trackers);
+	trg_state_selector_update(s, TORRENT_UPDATE_ADDREMOVE);
+}
+
 static void
 trg_state_selector_add_state(TrgStateSelector * selector,
                              GtkTreeIter * iter, gint pos,
@@ -511,7 +530,7 @@ static void
 trg_state_selector_update_stat(GtkTreeRowReference * rr, gint count)
 {
     if (rr) {
-        GValue gvalue = { 0 };
+        GValue gvalue = G_VALUE_INIT;
         GtkTreeIter iter;
         GtkTreePath *path = gtk_tree_row_reference_get_path(rr);
         GtkTreeModel *model = gtk_tree_row_reference_get_model(rr);
@@ -715,6 +734,9 @@ static GObject *trg_state_selector_constructor(GType type,
     priv->showTrackers =
         trg_prefs_get_bool(priv->prefs, TRG_PREFS_KEY_FILTER_TRACKERS,
                            TRG_PREFS_GLOBAL);
+	priv->dirsFirst =
+		trg_prefs_get_bool(priv->prefs, TRG_PREFS_KEY_DIRECTORIES_FIRST,
+							TRG_PREFS_GLOBAL);
 
     return object;
 }
diff --git a/src/trg-state-selector.h b/src/trg-state-selector.h
index 5107505..ece419a 100644
--- a/src/trg-state-selector.h
+++ b/src/trg-state-selector.h
@@ -71,6 +71,7 @@ GRegex *trg_state_selector_get_url_host_regex(TrgStateSelector * s);
 void trg_state_selector_disconnect(TrgStateSelector * s);
 void trg_state_selector_set_show_trackers(TrgStateSelector * s,
                                           gboolean show);
+void trg_state_selector_set_directories_first(TrgStateSelector * s, gboolean _dirsFirst);
 void trg_state_selector_set_show_dirs(TrgStateSelector * s, gboolean show);
 void trg_state_selector_set_queues_enabled(TrgStateSelector * s,
                                            gboolean enabled);
diff --git a/src/trg-stats-dialog.c b/src/trg-stats-dialog.c
index 3ae0336..c23628d 100644
--- a/src/trg-stats-dialog.c
+++ b/src/trg-stats-dialog.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <json-glib/json-glib.h>
@@ -56,7 +60,7 @@ struct _TrgStatsDialogPrivate {
     TrgMainWindow *parent;
     GtkWidget *tv;
     GtkListStore *model;
-    GtkTreeRowReference *rr_up, *rr_down, *rr_files_added,
+    GtkTreeRowReference *rr_down, *rr_up, *rr_ratio, *rr_files_added,
         *rr_session_count, *rr_active, *rr_version;
 };
 
@@ -156,8 +160,7 @@ update_int_stat(JsonObject * args, GtkTreeRowReference * rr,
 }
 
 static void
-update_size_stat(JsonObject * args, GtkTreeRowReference * rr,
-                 gchar * jsonKey)
+update_size_stat(JsonObject * args, GtkTreeRowReference * rr, gchar * jsonKey)
 {
     gchar session_val[32];
     gchar cumulat_val[32];
@@ -173,6 +176,23 @@ update_size_stat(JsonObject * args, GtkTreeRowReference * rr,
 }
 
 static void
+update_ratio_stat(JsonObject * args, GtkTreeRowReference * rr, gchar * jsonKeyA, gchar * jsonKeyB)
+{
+	gchar session_val[32];
+	gchar cumulat_val[32];
+
+	trg_strlratio(session_val, 
+				  json_object_get_double_member(get_session_arg(args), jsonKeyA) /
+				  json_object_get_double_member(get_session_arg(args), jsonKeyB) );
+
+	trg_strlratio(cumulat_val, 
+				  json_object_get_double_member(get_cumulat_arg(args), jsonKeyA) /
+				  json_object_get_double_member(get_cumulat_arg(args), jsonKeyB) );
+
+    update_statistic(rr, session_val, cumulat_val);
+}
+
+static void
 update_time_stat(JsonObject * args, GtkTreeRowReference * rr,
                  gchar * jsonKey)
 {
@@ -214,6 +234,7 @@ static gboolean on_stats_reply(gpointer data)
 
         update_size_stat(args, priv->rr_up, "uploadedBytes");
         update_size_stat(args, priv->rr_down, "downloadedBytes");
+        update_ratio_stat(args, priv->rr_ratio, "uploadedBytes", "downloadedBytes");
         update_int_stat(args, priv->rr_files_added, "filesAdded");
         update_int_stat(args, priv->rr_session_count, "sessionCount");
         update_time_stat(args, priv->rr_active, "secondsActive");
@@ -296,6 +317,8 @@ static GObject *trg_stats_dialog_constructor(GType type,
         stats_dialog_add_statistic(priv->model, _("Download Total"));
     priv->rr_up =
         stats_dialog_add_statistic(priv->model, _("Upload Total"));
+    priv->rr_ratio =
+        stats_dialog_add_statistic(priv->model, _("Ratio"));
     priv->rr_files_added =
         stats_dialog_add_statistic(priv->model, _("Files Added"));
     priv->rr_session_count =
diff --git a/src/trg-status-bar.c b/src/trg-status-bar.c
index 34454df..862e3f9 100644
--- a/src/trg-status-bar.c
+++ b/src/trg-status-bar.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glib/gi18n.h>
 #include <glib/gprintf.h>
 #include <gtk/gtk.h>
@@ -133,15 +137,14 @@ trg_status_bar_set_connected_label(TrgStatusBar * sb, JsonObject * session,
                                    TrgClient * client)
 {
     TrgPrefs *prefs = trg_client_get_prefs(client);
-    gdouble version = session_get_version(session);
 
     gchar *profileName = trg_prefs_get_string(prefs,
                                               TRG_PREFS_KEY_PROFILE_NAME,
                                               TRG_PREFS_CONNECTION);
     gchar *statusMsg =
-        g_strdup_printf(_("Connected: %s (Transmission %g)"),
+        g_strdup_printf(_("Connected: %s :: Transmission %s"),
                         profileName,
-                        version);
+                        session_get_version_string(session));
 
     trg_status_bar_push_connection_msg(sb, statusMsg);
 
@@ -200,19 +203,19 @@ trg_status_bar_update_speed(TrgStatusBar * sb,
     gchar downRateTotalString[32], upRateTotalString[32];
     gchar uplimit[64], downlimit[64];
 
-    if (session_get_speed_limit_down_enabled(session))
-        downlimitraw = session_get_speed_limit_down(session);
-    else if (altLimits)
+    if (altLimits) {
         downlimitraw = session_get_alt_speed_limit_down(session);
-    else
-        downlimitraw = -1;
-
-    if (session_get_speed_limit_up_enabled(session))
-        uplimitraw = session_get_speed_limit_up(session);
-    else if (altLimits)
         uplimitraw = session_get_alt_speed_limit_up(session);
-    else
-        uplimitraw = -1;
+    } else {
+        if (session_get_speed_limit_down_enabled(session))
+            downlimitraw = session_get_speed_limit_down(session);
+        else
+            downlimitraw = -1;
+        if (session_get_speed_limit_up_enabled(session))
+            uplimitraw = session_get_speed_limit_up(session);
+        else
+            uplimitraw = -1;
+    }
 
     trg_strlspeed(downRateTotalString, stats->downRateTotal / disk_K);
     trg_strlspeed(upRateTotalString, stats->upRateTotal / disk_K);
diff --git a/src/trg-status-bar.h b/src/trg-status-bar.h
index b4942ee..a5edfe8 100644
--- a/src/trg-status-bar.h
+++ b/src/trg-status-bar.h
@@ -47,7 +47,7 @@ typedef struct {
 
 GType trg_status_bar_get_type(void);
 
-TrgStatusBar *trg_status_bar_new();
+TrgStatusBar *trg_status_bar_new(TrgMainWindow * win, TrgClient * client);
 
 G_END_DECLS
     void trg_status_bar_update(TrgStatusBar * sb,
diff --git a/src/trg-toolbar.c b/src/trg-toolbar.c
index 96dd95d..cb870d3 100644
--- a/src/trg-toolbar.c
+++ b/src/trg-toolbar.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
@@ -143,7 +147,7 @@ trg_toolbar_install_widget_prop(GObjectClass * class, guint propId,
                                                         G_PARAM_STATIC_BLURB));
 }
 
-GtkWidget *trg_toolbar_item_new(TrgToolbar * toolbar,
+static GtkWidget *trg_toolbar_item_new(TrgToolbar * toolbar,
                                 gchar * text,
                                 int *index, gchar * icon,
                                 gboolean sensitive)
@@ -229,8 +233,8 @@ static GObject *trg_toolbar_constructor(GType type,
                              GTK_STOCK_REMOVE, FALSE);
 
     priv->tb_delete =
-        trg_toolbar_item_new(TRG_TOOLBAR(obj), _("Remove with data"),
-                             &position, GTK_STOCK_CLEAR, FALSE);
+        trg_toolbar_item_new(TRG_TOOLBAR(obj), _("Remove and delete data"),
+                             &position, GTK_STOCK_DELETE, FALSE);
 
     separator = gtk_separator_tool_item_new();
     gtk_toolbar_insert(GTK_TOOLBAR(obj), separator, position++);
@@ -243,10 +247,6 @@ static GObject *trg_toolbar_constructor(GType type,
         trg_toolbar_item_new(TRG_TOOLBAR(obj), _("Remote Preferences"),
                              &position, GTK_STOCK_NETWORK, FALSE);
 
-#if !GTK_CHECK_VERSION( 3, 0, 0 )
-    gtk_toolbar_set_tooltips(GTK_TOOLBAR(obj), TRUE);
-#endif
-
     g_signal_connect(G_OBJECT(priv->prefs), "pref-profile-changed",
                      G_CALLBACK(trg_toolbar_refresh_menu), obj);
 
diff --git a/src/trg-toolbar.h b/src/trg-toolbar.h
index 7d12b2d..6887a16 100644
--- a/src/trg-toolbar.h
+++ b/src/trg-toolbar.h
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-
 #ifndef TRG_TOOLBAR_H_
 #define TRG_TOOLBAR_H_
 
diff --git a/src/trg-torrent-add-dialog.c b/src/trg-torrent-add-dialog.c
index bde24eb..31ddd85 100644
--- a/src/trg-torrent-add-dialog.c
+++ b/src/trg-torrent-add-dialog.c
@@ -22,6 +22,10 @@
  * and JSON dispatch.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <json-glib/json-glib.h>
@@ -45,9 +49,10 @@
 #include "torrent.h"
 #include "json.h"
 #include "protocol-constants.h"
+#include "upload.h"
 
 enum {
-    PROP_0, PROP_FILENAME, PROP_PARENT, PROP_CLIENT
+    PROP_0, PROP_FILENAME, PROP_PARENT, PROP_CLIENT, PROP_UPLOAD
 };
 
 enum {
@@ -63,6 +68,7 @@ struct _TrgTorrentAddDialogPrivate {
     TrgClient *client;
     TrgMainWindow *parent;
     GSList *filenames;
+    trg_upload *upload;
     GtkWidget *source_chooser;
     GtkWidget *dest_combo;
     GtkWidget *priority_combo;
@@ -70,6 +76,7 @@ struct _TrgTorrentAddDialogPrivate {
     GtkTreeStore *store;
     GtkWidget *paused_check;
     GtkWidget *delete_check;
+    guint n_files;
 };
 
 #define MAGNET_MAX_LINK_WIDTH		75
@@ -90,6 +97,9 @@ static void trg_torrent_add_dialog_set_property(GObject * object,
     case PROP_PARENT:
         priv->parent = g_value_get_object(value);
         break;
+    case PROP_UPLOAD:
+    	priv->upload = g_value_get_pointer(value);
+    	break;
     case PROP_CLIENT:
         priv->client = g_value_get_pointer(value);
         break;
@@ -115,72 +125,13 @@ trg_torrent_add_dialog_get_property(GObject * object,
     }
 }
 
-static void
-add_set_common_args(JsonObject * args, gint priority, gchar * dir)
-{
-    json_object_set_string_member(args, FIELD_FILE_DOWNLOAD_DIR, dir);
-    json_object_set_int_member(args, FIELD_BANDWIDTH_PRIORITY,
-                               (gint64) priority);
-}
-
-static gpointer add_files_threadfunc(gpointer data)
-{
-    struct add_torrent_threadfunc_args *files_thread_data =
-        (struct add_torrent_threadfunc_args *) data;
-
-    GSList *li;
-
-    for (li = files_thread_data->list; li; li = g_slist_next(li)) {
-        gchar *fileName = (gchar *) li->data;
-        JsonNode *request =
-            torrent_add(fileName, files_thread_data->flags);
-        JsonObject *args;
-        trg_response *response;
-
-        if (!request)
-            continue;
-
-        args = node_get_arguments(request);
-
-        if (files_thread_data->extraArgs)
-            add_set_common_args(args, files_thread_data->priority,
-                                files_thread_data->dir);
-
-        response = dispatch(files_thread_data->client, request);
-        response->cb_data = files_thread_data->cb_data;
-        g_idle_add(on_generic_interactive_action, response);
-    }
-
-    g_str_slist_free(files_thread_data->list);
-
-    if (files_thread_data->extraArgs)
-        g_free(files_thread_data->dir);
-
-    g_free(files_thread_data);
-
-    return NULL;
-}
-
-void launch_add_thread(struct add_torrent_threadfunc_args *args)
-{
-    GError *error = NULL;
-    g_thread_create(add_files_threadfunc, args, FALSE, &error);
-
-    if (error) {
-        g_error("thread creation error: %s", error->message);
-        g_error_free(error);
-        g_str_slist_free(args->list);
-        g_free(args);
-    }
-}
-
 static gboolean
 add_file_indexes_foreachfunc(GtkTreeModel * model,
                              GtkTreePath *
                              path G_GNUC_UNUSED,
                              GtkTreeIter * iter, gpointer data)
 {
-    JsonObject *args = (JsonObject *) data;
+    trg_upload *upload = (trg_upload *) data;
     gint priority, index, wanted;
 
     gtk_tree_model_get(model, iter, FC_PRIORITY, &priority, FC_ENABLED,
@@ -189,17 +140,8 @@ add_file_indexes_foreachfunc(GtkTreeModel * model,
     if (gtk_tree_model_iter_has_child(model, iter) || index < 0)
         return FALSE;
 
-    if (wanted)
-        add_file_id_to_array(args, FIELD_FILES_WANTED, index);
-    else
-        add_file_id_to_array(args, FIELD_FILES_UNWANTED, index);
-
-    if (priority == TR_PRI_LOW)
-        add_file_id_to_array(args, FIELD_FILES_PRIORITY_LOW, index);
-    else if (priority == TR_PRI_HIGH)
-        add_file_id_to_array(args, FIELD_FILES_PRIORITY_HIGH, index);
-    else
-        add_file_id_to_array(args, FIELD_FILES_PRIORITY_NORMAL, index);
+    upload->file_wanted[index] = wanted;
+    upload->file_priorities[index] = priority;
 
     return FALSE;
 }
@@ -225,38 +167,33 @@ trg_torrent_add_response_cb(GtkDialog * dlg, gint res_id, gpointer data)
         gchar *dir =
             trg_destination_combo_get_dir(TRG_DESTINATION_COMBO
                                           (priv->dest_combo));
+        trg_upload *upload;
 
-        if (g_slist_length(priv->filenames) == 1) {
-            JsonNode *req =
-                torrent_add((gchar *) priv->filenames->data, flags);
-            if (req) {
-                JsonObject *args = node_get_arguments(req);
-                gtk_tree_model_foreach(GTK_TREE_MODEL(priv->store),
-                                       add_file_indexes_foreachfunc, args);
-                add_set_common_args(args, priority, dir);
-                dispatch_async(priv->client, req,
-                               on_generic_interactive_action,
-                               priv->parent);
-            }
-            g_str_slist_free(priv->filenames);
+        if (priv->upload) {
+        	upload = priv->upload;
         } else {
-            struct add_torrent_threadfunc_args *args =
-                g_new(struct add_torrent_threadfunc_args, 1);
-            args->list = priv->filenames;
-            args->cb_data = priv->parent;
-            args->client = priv->client;
-            args->dir = g_strdup(dir);
-            args->priority = priority;
-            args->flags = flags;
-            args->extraArgs = TRUE;
-
-            launch_add_thread(args);
+        	upload = g_new0(trg_upload, 1);
+			upload->list = priv->filenames;
         }
 
+        upload->main_window = priv->parent;
+        upload->client = priv->client;
+        upload->dir = dir;
+        upload->priority = priority;
+        upload->flags = flags;
+        upload->extra_args = TRUE;
+
+        upload->n_files = priv->n_files;
+        upload->file_priorities = g_new0(gint, priv->n_files);
+        upload->file_wanted = g_new0(gint, priv->n_files);
+
+        gtk_tree_model_foreach(GTK_TREE_MODEL(priv->store),
+                                               add_file_indexes_foreachfunc, upload);
+
+        trg_do_upload(upload);
+
         trg_destination_combo_save_selection(TRG_DESTINATION_COMBO
                                              (priv->dest_combo));
-
-        g_free(dir);
     } else {
         g_str_slist_free(priv->filenames);
     }
@@ -305,7 +242,7 @@ onViewButtonPressed(GtkWidget * w, GdkEventButton * event, gpointer gdata)
                                                    (set_unwanted), gdata);
 }
 
-GtkWidget *gtr_file_list_new(GtkTreeStore ** store)
+static GtkWidget *gtr_file_list_new(GtkTreeStore ** store)
 {
     int size;
     int width;
@@ -323,7 +260,6 @@ GtkWidget *gtr_file_list_new(GtkTreeStore ** store)
     /* create the view */
     view = gtk_tree_view_new();
     tree_view = GTK_TREE_VIEW(view);
-    gtk_tree_view_set_rules_hint(tree_view, TRUE);
     gtk_container_set_border_width(GTK_CONTAINER(view), GUI_PAD_BIG);
     g_signal_connect(view, "button-press-event",
                      G_CALLBACK(onViewButtonPressed), view);
@@ -431,11 +367,7 @@ GtkWidget *gtr_file_list_new(GtkTreeStore ** store)
 
 static GtkWidget *gtr_dialog_get_content_area(GtkDialog * dialog)
 {
-#if GTK_CHECK_VERSION( 2,14,0 )
     return gtk_dialog_get_content_area(dialog);
-#else
-    return dialog->vbox;
-#endif
 }
 
 static void gtr_dialog_set_content(GtkDialog * dialog, GtkWidget * content)
@@ -445,7 +377,7 @@ static void gtr_dialog_set_content(GtkDialog * dialog, GtkWidget * content)
     gtk_widget_show_all(content);
 }
 
-GtkWidget *gtr_priority_combo_new(void)
+static GtkWidget *gtr_priority_combo_new(void)
 {
     return gtr_combo_box_new_enum(_("Low"), TR_PRI_LOW, _("Normal"),
                                   TR_PRI_NORMAL, _("High"), TR_PRI_HIGH,
@@ -469,7 +401,7 @@ static void addTorrentFilters(GtkFileChooser * chooser)
 
 static void
 store_add_node(GtkTreeStore * store, GtkTreeIter * parent,
-               trg_files_tree_node * node)
+               trg_files_tree_node * node, guint *n_files)
 {
     GtkTreeIter child;
     GList *li;
@@ -480,11 +412,14 @@ store_add_node(GtkTreeStore * store, GtkTreeIter * parent,
                            1, FC_INDEX, node->index,
                            FC_PRIORITY, TR_PRI_NORMAL,
                            FC_SIZE, node->length, -1);
+
+        if (!node->children)
+            *n_files = *n_files + 1;
     }
 
     for (li = node->children; li; li = g_list_next(li))
         store_add_node(store, node->name ? &child : NULL,
-                       (trg_files_tree_node *) li->data);
+                       (trg_files_tree_node *) li->data, n_files);
 }
 
 static void torrent_not_parsed_warning(GtkWindow * parent)
@@ -515,6 +450,28 @@ static void torrent_not_found_error(GtkWindow * parent, gchar * file)
 }
 
 static void
+trg_torrent_add_dialog_set_upload(TrgTorrentAddDialog *d, trg_upload *upload) {
+    TrgTorrentAddDialogPrivate *priv =
+        TRG_TORRENT_ADD_DIALOG_GET_PRIVATE(d);
+    GtkButton *chooser = GTK_BUTTON(priv->source_chooser);
+    trg_torrent_file *tor_data = NULL;
+
+    if (upload->uid)
+        gtk_button_set_label(chooser, upload->uid);
+
+    tor_data = trg_parse_torrent_data(upload->upload_response->raw, upload->upload_response->size);
+
+    if (!tor_data) {
+      torrent_not_parsed_warning(GTK_WINDOW(priv->parent));
+    } else {
+      store_add_node(priv->store, NULL, tor_data->top_node, &priv->n_files);
+      trg_torrent_file_free(tor_data);
+    }
+
+    gtk_widget_set_sensitive(priv->file_list, tor_data != NULL);
+}
+
+static void
 trg_torrent_add_dialog_set_filenames(TrgTorrentAddDialog * d,
                                      GSList * filenames)
 {
@@ -525,6 +482,11 @@ trg_torrent_add_dialog_set_filenames(TrgTorrentAddDialog * d,
 
     gtk_tree_store_clear(priv->store);
 
+    if (priv->upload) {
+    	trg_upload_free(priv->upload);
+    	priv->upload = NULL;
+    }
+
     if (nfiles == 1) {
         gchar *file_name = (gchar *) filenames->data;
         if (is_url(file_name) || is_magnet(file_name)) {
@@ -560,7 +522,7 @@ trg_torrent_add_dialog_set_filenames(TrgTorrentAddDialog * d,
                 if (!tor_data) {
                     torrent_not_parsed_warning(GTK_WINDOW(priv->parent));
                 } else {
-                    store_add_node(priv->store, NULL, tor_data->top_node);
+                    store_add_node(priv->store, NULL, tor_data->top_node, &priv->n_files);
                     trg_torrent_file_free(tor_data);
                 }
             } else {
@@ -738,7 +700,8 @@ static GObject *trg_torrent_add_dialog_constructor(GType type,
         TRG_TORRENT_ADD_DIALOG_GET_PRIVATE(obj);
     TrgPrefs *prefs = trg_client_get_prefs(priv->client);
 
-    GtkWidget *t, *l, *applyall_combo;
+    GtkWidget *t, *applyall_combo;
+    guint row = 0;
 
     /* window */
     gtk_window_set_title(GTK_WINDOW(obj), _("Add Torrent"));
@@ -757,10 +720,8 @@ static GObject *trg_torrent_add_dialog_constructor(GType type,
     gtk_dialog_set_default_response(GTK_DIALOG(obj), GTK_RESPONSE_ACCEPT);
 
     /* workspace */
-    t = gtk_table_new(6, 2, FALSE);
-    gtk_container_set_border_width(GTK_CONTAINER(t), GUI_PAD_BIG);
-    gtk_table_set_row_spacings(GTK_TABLE(t), GUI_PAD);
-    gtk_table_set_col_spacings(GTK_TABLE(t), GUI_PAD_BIG);
+    t = hig_workarea_create();
+    //gtk_container_set_border_width(GTK_CONTAINER(t), GUI_PAD_BIG);
 
     priv->file_list = gtr_file_list_new(&priv->store);
     gtk_widget_set_sensitive(priv->file_list, FALSE);
@@ -782,59 +743,41 @@ static GObject *trg_torrent_add_dialog_constructor(GType type,
     priv->priority_combo = gtr_priority_combo_new();
     gtk_combo_box_set_active(GTK_COMBO_BOX(priv->priority_combo), 1);
 
-    l = gtk_label_new_with_mnemonic(_("_Torrent file:"));
-    gtk_misc_set_alignment(GTK_MISC(l), 0.0f, 0.5f);
-    gtk_table_attach(GTK_TABLE(t), l, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
-
     priv->source_chooser = gtk_button_new();
+    hig_workarea_add_row(t, &row, _("_Torrent file:"), priv->source_chooser, NULL);
+
     gtk_button_set_alignment(GTK_BUTTON(priv->source_chooser), 0.0f, 0.5f);
-    trg_torrent_add_dialog_set_filenames(TRG_TORRENT_ADD_DIALOG(obj),
-                                         priv->filenames);
 
-    gtk_table_attach(GTK_TABLE(t), priv->source_chooser, 1, 2, 0,
-                     1, ~0, 0, 0, 0);
-    gtk_label_set_mnemonic_widget(GTK_LABEL(l), priv->source_chooser);
+    if (priv->filenames)
+		trg_torrent_add_dialog_set_filenames(TRG_TORRENT_ADD_DIALOG(obj),
+											 priv->filenames);
+    else if (priv->upload)
+    	trg_torrent_add_dialog_set_upload(TRG_TORRENT_ADD_DIALOG(obj), priv->upload);
+
+
     g_signal_connect(priv->source_chooser, "clicked",
                      G_CALLBACK(trg_torrent_add_dialog_source_click_cb),
                      obj);
 
-    l = gtk_label_new_with_mnemonic(_("_Destination folder:"));
-    gtk_misc_set_alignment(GTK_MISC(l), 0.0f, 0.5f);
-    gtk_table_attach(GTK_TABLE(t), l, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
-
     priv->dest_combo =
         trg_destination_combo_new(priv->client,
                                   TRG_PREFS_KEY_LAST_ADD_DESTINATION);
-    gtk_table_attach(GTK_TABLE(t), priv->dest_combo, 1, 2, 1,
-                     2, ~0, 0, 0, 0);
-    gtk_label_set_mnemonic_widget(GTK_LABEL(l), priv->dest_combo);
+
+    hig_workarea_add_row(t, &row, _("_Destination folder:"), priv->dest_combo, NULL);
 
     gtk_widget_set_size_request(priv->file_list, 466u, 300u);
-    gtk_table_attach_defaults(GTK_TABLE(t), priv->file_list, 0, 2, 2, 3);
 
-    l = gtk_label_new_with_mnemonic(_("Apply to all:"));
-    gtk_misc_set_alignment(GTK_MISC(l), 0.0f, 0.5f);
-    gtk_table_attach(GTK_TABLE(t), l, 0, 1, 3, 4, ~0, 0, 0, 0);
+    hig_workarea_add_wide_tall_control(t, &row, priv->file_list);
 
     applyall_combo =
-        trg_torrent_add_dialog_apply_all_combo_new(TRG_TORRENT_ADD_DIALOG
-                                                   (obj));
-    gtk_table_attach(GTK_TABLE(t), applyall_combo, 1, 2, 3, 4, ~0, 0, 0,
-                     0);
+        trg_torrent_add_dialog_apply_all_combo_new(TRG_TORRENT_ADD_DIALOG(obj));
 
-    l = gtk_label_new_with_mnemonic(_("Torrent _priority:"));
-    gtk_misc_set_alignment(GTK_MISC(l), 0.0f, 0.5f);
-    gtk_table_attach(GTK_TABLE(t), l, 0, 1, 4, 5, ~0, 0, 0, 0);
+    hig_workarea_add_row(t, &row, _("Apply to all:"), applyall_combo, NULL);
 
-    gtk_table_attach(GTK_TABLE(t), priv->priority_combo, 1, 2, 4,
-                     5, ~0, 0, 0, 0);
-    gtk_label_set_mnemonic_widget(GTK_LABEL(l), priv->priority_combo);
+    hig_workarea_add_row(t, &row, _("Torrent _priority:"), priv->priority_combo, NULL);
 
-    gtk_table_attach(GTK_TABLE(t), priv->paused_check, 0, 2, 5,
-                     6, GTK_FILL, 0, 0, 0);
-
-    gtk_table_attach(GTK_TABLE(t), priv->delete_check, 0, 2, 6,
-                     7, GTK_FILL, 0, 0, 0);
+    hig_workarea_add_wide_control(t, &row, priv->paused_check);
+    hig_workarea_add_wide_control(t, &row, priv->delete_check);
 
     gtr_dialog_set_content(GTK_DIALOG(obj), t);
 
@@ -872,6 +815,21 @@ trg_torrent_add_dialog_class_init(TrgTorrentAddDialogClass * klass)
                                                          G_PARAM_STATIC_BLURB));
 
     g_object_class_install_property(object_class,
+                                    PROP_UPLOAD,
+                                    g_param_spec_pointer("upload",
+                                                         "upload",
+                                                         "upload",
+                                                         G_PARAM_READWRITE
+                                                         |
+                                                         G_PARAM_CONSTRUCT_ONLY
+                                                         |
+                                                         G_PARAM_STATIC_NAME
+                                                         |
+                                                         G_PARAM_STATIC_NICK
+                                                         |
+                                                         G_PARAM_STATIC_BLURB));
+
+    g_object_class_install_property(object_class,
                                     PROP_CLIENT,
                                     g_param_spec_pointer("client",
                                                          "client",
@@ -906,7 +864,7 @@ static void trg_torrent_add_dialog_init(TrgTorrentAddDialog * self)
 {
 }
 
-TrgTorrentAddDialog *trg_torrent_add_dialog_new(TrgMainWindow * parent,
+TrgTorrentAddDialog *trg_torrent_add_dialog_new_from_filenames(TrgMainWindow * parent,
                                                 TrgClient * client,
                                                 GSList * filenames)
 {
@@ -915,6 +873,15 @@ TrgTorrentAddDialog *trg_torrent_add_dialog_new(TrgMainWindow * parent,
                         NULL);
 }
 
+TrgTorrentAddDialog *trg_torrent_add_dialog_new_from_upload(TrgMainWindow * parent,
+                                                TrgClient * client,
+                                                trg_upload *upload)
+{
+    return g_object_new(TRG_TYPE_TORRENT_ADD_DIALOG, "upload",
+                        upload, "parent", parent, "client", client,
+                        NULL);
+}
+
 void trg_torrent_add_dialog(TrgMainWindow * win, TrgClient * client)
 {
     GtkWidget *w;
@@ -941,22 +908,21 @@ void trg_torrent_add_dialog(TrgMainWindow * win, TrgClient * client)
                                                 prefs);
 
         if (showOptions) {
-            TrgTorrentAddDialog *dialog = trg_torrent_add_dialog_new(win,
+            TrgTorrentAddDialog *dialog = trg_torrent_add_dialog_new_from_filenames(win,
                                                                      client,
                                                                      l);
-
             gtk_widget_show_all(GTK_WIDGET(dialog));
+            gtk_window_present(GTK_WINDOW(dialog));
         } else {
-            struct add_torrent_threadfunc_args *args =
-                g_new0(struct add_torrent_threadfunc_args, 1);
+        	trg_upload *upload = g_new0(trg_upload, 1);
 
-            args->list = l;
-            args->cb_data = win;
-            args->client = client;
-            args->extraArgs = FALSE;
-            args->flags = trg_prefs_get_add_flags(prefs);
+            upload->list = l;
+            upload->main_window = win;
+            upload->client = client;
+            upload->extra_args = FALSE;
+            upload->flags = trg_prefs_get_add_flags(prefs);
 
-            launch_add_thread(args);
+            trg_do_upload(upload);
         }
     }
 
diff --git a/src/trg-torrent-add-dialog.h b/src/trg-torrent-add-dialog.h
index 0f45e2c..eebea45 100644
--- a/src/trg-torrent-add-dialog.h
+++ b/src/trg-torrent-add-dialog.h
@@ -24,6 +24,7 @@
 #include <gtk/gtk.h>
 
 #include "trg-client.h"
+#include "upload.h"
 #include "trg-main-window.h"
 
 G_BEGIN_DECLS
@@ -46,28 +47,15 @@ typedef struct {
     GtkDialogClass parent_class;
 } TrgTorrentAddDialogClass;
 
-/* Use synchronous dispatch() in our dedicated thread function.
- * This means torrents are added in sequence, instead of dispatch_async()
- * working concurrently for each upload.
- */
-
-struct add_torrent_threadfunc_args {
-    GSList *list;
-    TrgClient *client;
-    gpointer cb_data;
-    guint flags;
-    gchar *dir;
-    gint priority;
-    gboolean extraArgs;
-};
-
 GType trg_torrent_add_dialog_get_type(void);
 
-TrgTorrentAddDialog *trg_torrent_add_dialog_new(TrgMainWindow * win,
+TrgTorrentAddDialog *trg_torrent_add_dialog_new_from_filenames(TrgMainWindow * parent,
                                                 TrgClient * client,
                                                 GSList * filenames);
+TrgTorrentAddDialog *trg_torrent_add_dialog_new_from_upload(TrgMainWindow * parent,
+                                                TrgClient * client,
+                                                trg_upload *upload);
 void trg_torrent_add_dialog(TrgMainWindow * win, TrgClient * client);
-void launch_add_thread(struct add_torrent_threadfunc_args *args);
 
 G_END_DECLS
 #endif                          /* TRG_TORRENT_ADD_DIALOG_H_ */
diff --git a/src/trg-torrent-add-url-dialog.c b/src/trg-torrent-add-url-dialog.c
index 7f6335e..2562008 100644
--- a/src/trg-torrent-add-url-dialog.c
+++ b/src/trg-torrent-add-url-dialog.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <json-glib/json-glib.h>
@@ -90,7 +94,7 @@ trg_torrent_add_url_response_cb(TrgTorrentAddUrlDialog * dlg, gint res_id,
                             gtk_toggle_button_get_active
                             (GTK_TOGGLE_BUTTON(priv->startCheck)));
         dispatch_async(priv->client, request,
-                       on_generic_interactive_action, data);
+                       on_generic_interactive_action_response, data);
     }
 
     gtk_widget_destroy(GTK_WIDGET(dlg));
diff --git a/src/trg-torrent-graph.c b/src/trg-torrent-graph.c
index 40d3b4a..8c768f6 100644
--- a/src/trg-torrent-graph.c
+++ b/src/trg-torrent-graph.c
@@ -27,6 +27,11 @@
  * on this widget but with some improvements I didn't do.
  */
 
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "trg-torrent-graph.h"
 
 #if TRG_WITH_GRAPH
diff --git a/src/trg-torrent-model.c b/src/trg-torrent-model.c
index b1e98e5..8e916f4 100644
--- a/src/trg-torrent-model.c
+++ b/src/trg-torrent-model.c
@@ -17,15 +17,15 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 #include <gtk/gtk.h>
 #include <json-glib/json-glib.h>
 #include <glib/gi18n.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "torrent.h"
 #include "json.h"
 #include "trg-torrent-model.h"
@@ -504,7 +504,7 @@ update_torrent_iter(TrgTorrentModel * model,
                                 peerfrom_get_resume(pf));
         }
     }
-#ifdef DEBUG
+#ifdef TRG_DEBUG
     gtk_list_store_set(ls, iter, TORRENT_COLUMN_ICON, statusIcon, -1);
     gtk_list_store_set(ls, iter,
                        TORRENT_COLUMN_NAME, torrent_get_name(t), -1);
@@ -536,6 +536,10 @@ update_torrent_iter(TrgTorrentModel * model,
                        -1);
     gtk_list_store_set(ls, iter, TORRENT_COLUMN_DOWNLOADDIR, downloadDir,
                        -1);
+    gtk_list_store_set(ls, iter, TORRENT_COLUMN_PEERS_CONNECTED, torrent_get_peers_connected(t),
+                       -1);
+    gtk_list_store_set(ls, iter, TORRENT_COLUMN_ETA, torrent_get_eta(t),
+                       -1);
     gtk_list_store_set(ls, iter, TORRENT_COLUMN_BANDWIDTH_PRIORITY,
                        torrent_get_bandwidth_priority(t), -1);
     gtk_list_store_set(ls, iter, TORRENT_COLUMN_TOTALSIZE,
@@ -667,7 +671,7 @@ GHashTable *get_torrent_table(TrgTorrentModel * model)
     return priv->ht;
 }
 
-gboolean
+static gboolean
 trg_model_find_removed_foreachfunc(GtkTreeModel * model,
                                    GtkTreePath *
                                    path G_GNUC_UNUSED,
@@ -688,7 +692,7 @@ trg_model_find_removed_foreachfunc(GtkTreeModel * model,
     return FALSE;
 }
 
-GList *trg_torrent_model_find_removed(GtkTreeModel * model,
+static GList *trg_torrent_model_find_removed(GtkTreeModel * model,
                                       gint64 currentSerial)
 {
     struct TrgModelRemoveData args;
diff --git a/src/trg-torrent-model.h b/src/trg-torrent-model.h
index 078afe8..4f17a8c 100644
--- a/src/trg-torrent-model.h
+++ b/src/trg-torrent-model.h
@@ -74,7 +74,7 @@ typedef struct {
 
 GType trg_torrent_model_get_type(void);
 
-TrgTorrentModel *trg_torrent_model_new();
+TrgTorrentModel *trg_torrent_model_new(void);
 
 G_END_DECLS
     gboolean
diff --git a/src/trg-torrent-move-dialog.c b/src/trg-torrent-move-dialog.c
index 7669545..fec1932 100644
--- a/src/trg-torrent-move-dialog.c
+++ b/src/trg-torrent-move-dialog.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
@@ -69,14 +73,14 @@ trg_torrent_move_response_cb(GtkDialog * dlg, gint res_id, gpointer data)
         trg_destination_combo_save_selection(TRG_DESTINATION_COMBO
                                              (priv->location_combo));
         dispatch_async(priv->client, request,
-                       on_generic_interactive_action, data);
+                       on_generic_interactive_action_response, data);
     } else {
         json_array_unref(priv->ids);
     }
     gtk_widget_destroy(GTK_WIDGET(dlg));
 }
 
-static void location_changed(GtkWidget * w, gpointer data)
+static void location_changed(GtkComboBox * w, gpointer data)
 {
     TrgTorrentMoveDialogPrivate *priv =
         TRG_TORRENT_MOVE_DIALOG_GET_PRIVATE(data);
@@ -110,8 +114,7 @@ static GObject *trg_torrent_move_dialog_constructor(GType type,
     w = priv->location_combo =
         trg_destination_combo_new(priv->client,
                                   TRG_PREFS_KEY_LAST_MOVE_DESTINATION);
-    g_signal_connect(trg_destination_combo_get_entry
-                     (TRG_DESTINATION_COMBO(w)), "changed",
+    g_signal_connect(w, "changed",
                      G_CALLBACK(location_changed), object);
     hig_workarea_add_row(t, &row, _("Location:"), w, NULL);
 
diff --git a/src/trg-torrent-props-dialog.c b/src/trg-torrent-props-dialog.c
index 90ef4e3..ae75146 100644
--- a/src/trg-torrent-props-dialog.c
+++ b/src/trg-torrent-props-dialog.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <json-glib/json-glib.h>
@@ -172,7 +176,7 @@ static void trg_torrent_props_response_cb(GtkDialog * dialog, gint res_id,
         trg_json_widgets_save(priv->widgets, args);
         trg_json_widget_desc_list_free(priv->widgets);
 
-        dispatch_async(priv->client, request, on_generic_interactive_action,
+        dispatch_async(priv->client, request, on_generic_interactive_action_response,
                 priv->parent);
     }
 
@@ -329,11 +333,15 @@ static void info_page_update(TrgTorrentPropsDialog * dialog,
         gint64 dateCreated = torrent_get_date_created(t);
         gchar *dateStr = epoch_to_string(dateCreated);
 
-        if (!creator || strlen(creator) <= 0)
-            g_snprintf(buf, sizeof(buf), _("Created on %1$s"), dateStr);
-        else
-            g_snprintf(buf, sizeof(buf), _("Created by %1$s on %2$s"),
-                       creator, dateStr);
+        if (creator && strlen(creator) > 0 && dateCreated > 0)
+			g_snprintf(buf, sizeof(buf), _("Created by %1$s on %2$s"),
+						creator, dateStr);
+		else if (dateCreated > 0)
+			g_snprintf(buf, sizeof(buf), _("Created on %1$s"), dateStr);
+		else if (creator && strlen(creator) > 0)
+			g_snprintf(buf, sizeof(buf), _("Created by %1$s"), creator);
+		else
+			g_strlcpy(buf, _("N/A"), sizeof(buf));
 
         g_free(dateStr);
         gtk_label_set_text(GTK_LABEL(priv->origin_lb), buf);
diff --git a/src/trg-torrent-tree-view.c b/src/trg-torrent-tree-view.c
index 207bef7..bba78c2 100644
--- a/src/trg-torrent-tree-view.c
+++ b/src/trg-torrent-tree-view.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
@@ -48,7 +52,7 @@ static void trg_torrent_tree_view_init(TrgTorrentTreeView * tttv)
     trg_column_description *desc;
 
     desc =
-        trg_tree_view_reg_column(ttv, TRG_COLTYPE_STOCKICONTEXT,
+        trg_tree_view_reg_column(ttv, TRG_COLTYPE_ICONTEXT,
                                  TORRENT_COLUMN_NAME, _("Name"), "name",
                                  0);
     desc->model_column_extra = TORRENT_COLUMN_ICON;
@@ -206,11 +210,7 @@ trg_torrent_tree_view_renderer_pref_changed(TrgPrefs * p,
             TRG_STYLE_TR_COMPACT;
         g_object_set(G_OBJECT(data), "compact", GINT_TO_POINTER(compact),
                      NULL);
-#if GTK_CHECK_VERSION( 3,0,0 )
         g_signal_emit_by_name(tv, "style-updated", NULL, NULL);
-#else
-        g_signal_emit_by_name(tv, "style-set", NULL, NULL);
-#endif
     }
 }
 
diff --git a/src/trg-trackers-model.c b/src/trg-trackers-model.c
index c998c93..2e7fb9b 100644
--- a/src/trg-trackers-model.c
+++ b/src/trg-trackers-model.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gtk/gtk.h>
 #include <json-glib/json-glib.h>
 
@@ -85,7 +89,7 @@ trg_trackers_model_update(TrgTrackersModel * model,
 
 #ifdef DEBUG
         gtk_list_store_set(GTK_LIST_STORE(model), &trackIter,
-                           TRACKERCOL_ICON, GTK_STOCK_NETWORK, -1);
+                           TRACKERCOL_ICON, "network-workgroup", -1);
         gtk_list_store_set(GTK_LIST_STORE(model), &trackIter,
                            TRACKERCOL_TIER,
                            tracker_stats_get_tier(tracker), -1);
@@ -123,7 +127,7 @@ trg_trackers_model_update(TrgTrackersModel * model,
                            tracker_stats_get_seeder_count(tracker), -1);
 #else
         gtk_list_store_set(GTK_LIST_STORE(model), &trackIter,
-                           TRACKERCOL_ICON, GTK_STOCK_NETWORK,
+                           TRACKERCOL_ICON, "network-workgroup",
                            TRACKERCOL_ID, trackerId,
                            TRACKERCOL_UPDATESERIAL, updateSerial,
                            TRACKERCOL_TIER,
diff --git a/src/trg-trackers-tree-view.c b/src/trg-trackers-tree-view.c
index 0dfd4f9..58a732c 100644
--- a/src/trg-trackers-tree-view.c
+++ b/src/trg-trackers-tree-view.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
@@ -66,7 +70,7 @@ static gboolean on_trackers_update(gpointer data)
     trg_trackers_model_set_accept(TRG_TRACKERS_MODEL(model), TRUE);
 
     response->cb_data = priv->win;
-    return on_generic_interactive_action(data);
+    return on_generic_interactive_action_response(data);
 }
 
 void
@@ -115,7 +119,7 @@ trg_tracker_announce_edited(GtkCellRendererText * renderer,
     req = torrent_set(torrentIds);
     args = node_get_arguments(req);
 
-    if (!g_strcmp0(icon, GTK_STOCK_ADD)) {
+    if (!g_strcmp0(icon, "list-add")) {
         json_array_add_string_element(trackerModifiers, new_text);
         json_object_set_array_member(args, "trackerAdd", trackerModifiers);
     } else {
@@ -164,7 +168,7 @@ static void trg_trackers_tree_view_init(TrgTrackersTreeView * self)
     trg_column_description *desc;
 
     desc =
-        trg_tree_view_reg_column(ttv, TRG_COLTYPE_STOCKICONTEXT,
+        trg_tree_view_reg_column(ttv, TRG_COLTYPE_ICONTEXT,
                                  TRACKERCOL_TIER, _("Tier"), "tier",
                                  TRG_COLUMN_UNREMOVABLE);
     desc->model_column_extra = TRACKERCOL_ICON;
@@ -220,7 +224,7 @@ static void add_tracker(GtkWidget * w, gpointer data)
 
     gtk_list_store_append(GTK_LIST_STORE(model), &iter);
     gtk_list_store_set(GTK_LIST_STORE(model), &iter, TRACKERCOL_ICON,
-                       GTK_STOCK_ADD, -1);
+                       "list-add", -1);
 
     path = gtk_tree_model_get_path(model, &iter);
     gtk_tree_view_set_cursor(tv, path, priv->announceColumn, TRUE);
diff --git a/src/trg-tree-view.c b/src/trg-tree-view.c
index 3f7b95e..bea3cbf 100644
--- a/src/trg-tree-view.c
+++ b/src/trg-tree-view.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include <json-glib/json-glib.h>
@@ -49,6 +53,12 @@ enum {
     PROP_0, PROP_PREFS, PROP_CONFIGID
 };
 
+enum {
+	SIGNAL_COLUMN_ADDED, SIGNAL_COUNT
+};
+
+static guint signals[SIGNAL_COUNT] = { 0 };
+
 G_DEFINE_TYPE(TrgTreeView, trg_tree_view, GTK_TYPE_TREE_VIEW)
 #define TRG_TREE_VIEW_GET_PRIVATE(o) \
   (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRG_TYPE_TREE_VIEW, TrgTreeViewPrivate))
@@ -215,6 +225,8 @@ trg_tree_view_user_add_column_cb(GtkWidget * w,
         TRG_TREE_VIEW(gtk_tree_view_column_get_tree_view(col));
 
     trg_tree_view_add_column_after(tv, desc, -1, col);
+
+    g_signal_emit(tv, signals[SIGNAL_COLUMN_ADDED], 0, desc->id);
 }
 
 static void trg_tree_view_sort_menu_item_toggled(GtkCheckMenuItem * w,
@@ -324,18 +336,12 @@ view_popup_menu(GtkButton * button, GdkEventButton * event,
     TrgTreeViewPrivate *priv = TRG_TREE_VIEW_GET_PRIVATE(tv);
     GtkWidget *menu, *menuitem;
     trg_column_description *desc;
+    guint n_showing = 0;
     GList *li;
 
     menu = gtk_menu_new();
 
     desc = g_object_get_data(G_OBJECT(column), GDATA_KEY_COLUMN_DESC);
-    menuitem = gtk_check_menu_item_new_with_label(desc->header);
-    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
-    g_signal_connect(menuitem, "activate",
-                     G_CALLBACK(trg_tree_view_hide_column), column);
-    gtk_widget_set_sensitive(menuitem,
-                             !(desc->flags & TRG_COLUMN_UNREMOVABLE));
-    gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
     for (li = priv->columns; li; li = g_list_next(li)) {
         trg_column_description *desc = (trg_column_description *) li->data;
@@ -346,8 +352,19 @@ view_popup_menu(GtkButton * button, GdkEventButton * event,
                              G_CALLBACK(trg_tree_view_user_add_column_cb),
                              desc);
             gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+        } else {
+        	n_showing++;
         }
     }
+
+    menuitem = gtk_check_menu_item_new_with_label(desc->header);
+    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+    g_signal_connect(menuitem, "activate",
+                     G_CALLBACK(trg_tree_view_hide_column), column);
+    gtk_widget_set_sensitive(menuitem,
+                             !(desc->flags & TRG_COLUMN_UNREMOVABLE) && n_showing > 1);
+    gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), menuitem);
+
     gtk_widget_show_all(menu);
 
     gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
@@ -355,12 +372,28 @@ view_popup_menu(GtkButton * button, GdkEventButton * event,
                    gdk_event_get_time((GdkEvent *) event));
 }
 
+/* This used to get the column as an argument binded when the signal was
+ * created, but it seems GTK now destroys and recreates them in some
+ * circumstances. So bind the column description instead and search for the
+ * column by its title.
+ */
 static gboolean
 col_onButtonPressed(GtkButton * button,
-                    GdkEventButton * event, GtkTreeViewColumn * col)
+                    GdkEventButton * event, trg_column_description *desc)
 {
     if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
-        view_popup_menu(button, event, col);
+    	GtkTreeView *gtv = GTK_TREE_VIEW(gtk_widget_get_parent(GTK_WIDGET(button)));
+        GList *cols = gtk_tree_view_get_columns(gtv);
+        GList *li;
+        for (li = cols; li; li = g_list_next(li)) {
+        	GtkTreeViewColumn *col = GTK_TREE_VIEW_COLUMN(li->data);
+        	if (!g_strcmp0(desc->header, gtk_tree_view_column_get_title(col))) {
+        		view_popup_menu(button, event, col);
+        		break;
+        	}
+        }
+        g_list_free(cols);
+
         return TRUE;
     }
 
@@ -417,6 +450,7 @@ trg_tree_view_add_column_after(TrgTreeView * tv,
 {
     GtkCellRenderer *renderer;
     GtkTreeViewColumn *column = NULL;
+    GtkButton *column_button = NULL;
 
     switch (desc->type) {
     case TRG_COLTYPE_TEXT:
@@ -495,8 +529,8 @@ trg_tree_view_add_column_after(TrgTreeView * tv,
                                             "wanted-value",
                                             desc->model_column, NULL);
         break;
-    case TRG_COLTYPE_STOCKICONTEXT:
-        column = trg_tree_view_icontext_column_new(desc, "stock-id");
+    case TRG_COLTYPE_ICONTEXT:
+        column = trg_tree_view_icontext_column_new(desc, "icon-name");
         break;
     case TRG_COLTYPE_FILEICONTEXT:
         column = trg_tree_view_fileicontext_column_new(desc);
@@ -533,15 +567,17 @@ trg_tree_view_add_column_after(TrgTreeView * tv,
         return;
     }
 
-    gtk_tree_view_column_set_min_width(column, 0);
+    //gtk_tree_view_column_set_min_width(column, 0);
     gtk_tree_view_column_set_resizable(column, TRUE);
     gtk_tree_view_column_set_reorderable(column, TRUE);
     gtk_tree_view_column_set_sort_column_id(column, desc->model_column);
+    gtk_tree_view_column_set_expand(column, TRUE);
+
+    /*gtk_tree_view_column_set_sizing(column,
+                                    GTK_TREE_VIEW_COLUMN_FIXED);*/
 
     if (width > 0) {
-        gtk_tree_view_column_set_sizing(column,
-                                        GTK_TREE_VIEW_COLUMN_FIXED);
-        gtk_tree_view_column_set_fixed_width(column, width);
+        //gtk_tree_view_column_set_fixed_width(column, width);
     }
 
     g_object_set_data(G_OBJECT(column), GDATA_KEY_COLUMN_DESC, desc);
@@ -552,14 +588,11 @@ trg_tree_view_add_column_after(TrgTreeView * tv,
         gtk_tree_view_move_column_after(GTK_TREE_VIEW(tv), column,
                                         after_col);
 
-#if GTK_CHECK_VERSION( 3,0,0 )
-    g_signal_connect(gtk_tree_view_column_get_button(column),
+    column_button = GTK_BUTTON(gtk_tree_view_column_get_button(column));
+
+    g_signal_connect(column_button,
                      "button-press-event", G_CALLBACK(col_onButtonPressed),
-                     column);
-#else
-    g_signal_connect(column->button, "button-press-event",
-                     G_CALLBACK(col_onButtonPressed), column);
-#endif
+                     desc);
 
     if (desc->out)
         *(desc->out) = column;
@@ -770,6 +803,16 @@ static void trg_tree_view_class_init(TrgTreeViewClass * klass)
                                      G_PARAM_STATIC_NAME |
                                      G_PARAM_STATIC_NICK |
                                      G_PARAM_STATIC_BLURB));
+
+    signals[SIGNAL_COLUMN_ADDED] =
+        g_signal_new("column-added",
+                     G_TYPE_FROM_CLASS(object_class),
+                     G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                     G_STRUCT_OFFSET(TrgTreeViewClass,
+                                     column_added), NULL,
+                     NULL, g_cclosure_marshal_VOID__STRING,
+                     G_TYPE_NONE, 1, G_TYPE_STRING);
+
 }
 
 static void trg_tree_view_init(TrgTreeView * tv)
diff --git a/src/trg-tree-view.h b/src/trg-tree-view.h
index 5a17073..435848f 100644
--- a/src/trg-tree-view.h
+++ b/src/trg-tree-view.h
@@ -42,6 +42,7 @@ G_BEGIN_DECLS
 
 typedef struct {
     GtkTreeViewClass parent_class;
+    void (*column_added) (TrgTreeView * tv, const gchar *id);
 } TrgTreeViewClass;
 
 GType trg_tree_view_get_type(void);
@@ -51,7 +52,7 @@ GtkWidget *trg_tree_view_new(void);
 G_END_DECLS GList *trg_tree_view_get_selected_refs_list(GtkTreeView * tv);
 
 enum {
-    TRG_COLTYPE_STOCKICONTEXT,
+    TRG_COLTYPE_ICONTEXT,
     TRG_COLTYPE_FILEICONTEXT,
     TRG_COLTYPE_WANTED,
     TRG_COLTYPE_TEXT,
diff --git a/src/upload.c b/src/upload.c
new file mode 100644
index 0000000..1f2f8c0
--- /dev/null
+++ b/src/upload.c
@@ -0,0 +1,107 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "protocol-constants.h"
+#include "requests.h"
+#include "trg-client.h"
+#include "util.h"
+#include "trg-main-window.h"
+#include "json.h"
+#include "upload.h"
+
+static gboolean upload_complete_callback(gpointer data);
+static void next_upload(trg_upload *upload);
+
+static void
+add_set_common_args(JsonObject * args, gint priority, gchar * dir)
+{
+    json_object_set_string_member(args, FIELD_FILE_DOWNLOAD_DIR, dir);
+    json_object_set_int_member(args, FIELD_BANDWIDTH_PRIORITY,
+                               (gint64) priority);
+}
+
+void trg_upload_free(trg_upload *upload) {
+	g_str_slist_free(upload->list);
+	g_free(upload->dir);
+	g_free(upload->uid);
+	g_free(upload->file_wanted);
+	g_free(upload->file_priorities);
+	trg_response_free(upload->upload_response);
+	g_free(upload);
+}
+
+static void add_priorities(JsonObject *args, gint* priorities, gint n_files)
+{
+	gint i;
+	for (i = 0; i < n_files; i++) {
+		gint priority = priorities[i];
+	    if (priority == TR_PRI_LOW)
+	        add_file_id_to_array(args, FIELD_FILES_PRIORITY_LOW, i);
+	    else if (priority == TR_PRI_HIGH)
+	        add_file_id_to_array(args, FIELD_FILES_PRIORITY_HIGH, i);
+	    else
+	        add_file_id_to_array(args, FIELD_FILES_PRIORITY_NORMAL, i);
+	}
+}
+
+static void add_wanteds(JsonObject *args, gint* wanteds, gint n_files) {
+	gint i;
+	for (i = 0; i < n_files; i++) {
+		if (wanteds[i])
+			add_file_id_to_array(args, FIELD_FILES_WANTED, i);
+		else
+			add_file_id_to_array(args, FIELD_FILES_UNWANTED, i);
+	}
+}
+
+static void next_upload(trg_upload *upload) {
+	JsonNode *req = NULL;
+
+	if (upload->upload_response && upload->progress_index < 1)
+		req = torrent_add_from_response(upload->upload_response, upload->flags);
+	else if (upload->list && upload->progress_index < g_slist_length(upload->list))
+		req = torrent_add_from_file((gchar*)g_slist_nth_data(upload->list, upload->progress_index), upload->flags);
+
+	if (req) {
+		JsonObject *args = node_get_arguments(req);
+
+		if (upload->extra_args)
+			add_set_common_args(args, upload->priority, upload->dir);
+
+		if (upload->file_wanted)
+			add_wanteds(args, upload->file_wanted, upload->n_files);
+
+		if (upload->file_priorities)
+			add_priorities(args, upload->file_priorities, upload->n_files);
+
+		upload->progress_index++;
+		dispatch_async(upload->client, req, upload_complete_callback, upload);
+	} else {
+		trg_upload_free(upload);
+	}
+}
+
+static gboolean upload_complete_callback(gpointer data) {
+	trg_response *response = (trg_response*)data;
+	trg_upload *upload = (trg_upload*)response->cb_data;
+
+	if (upload->callback)
+		upload->callback(data);
+
+	/* the callback we're delegating to will destroy the response */
+
+	if (upload->main_window)
+		on_generic_interactive_action(upload->main_window, response);
+	else
+		trg_response_free(response);
+
+	next_upload(upload);
+
+	return FALSE;
+}
+
+void trg_do_upload(trg_upload *upload)
+{
+	next_upload(upload);
+}
diff --git a/src/upload.h b/src/upload.h
new file mode 100644
index 0000000..5dc17e2
--- /dev/null
+++ b/src/upload.h
@@ -0,0 +1,30 @@
+#ifndef UPLOAD_H_
+#define UPLOAD_H_
+
+#include <glib.h>
+
+#include "trg-client.h"
+#include "trg-main-window.h"
+
+typedef struct {
+    GSList *list; // list of filenames
+    trg_response *upload_response; // OR: a HTTP response containing a torrent
+    TrgClient *client;
+    gpointer cb_data;
+    TrgMainWindow *main_window; // a parent window to attach any error dialogs to
+    guint flags;
+    gchar *dir;
+    gint priority;
+    gint* file_priorities;
+    gint* file_wanted;
+    guint n_files;
+    gboolean extra_args;
+    guint progress_index;
+    GSourceFunc callback;
+    gchar *uid;
+} trg_upload;
+
+void trg_upload_free(trg_upload *upload);
+void trg_do_upload(trg_upload *upload);
+
+#endif
diff --git a/src/util.c b/src/util.c
index 312c564..de050aa 100644
--- a/src/util.c
+++ b/src/util.c
@@ -113,7 +113,7 @@ static char *formatter_get_size_str(const struct formatter_units *u,
         precision = 2;
     else
         precision = 1;
-    tr_snprintf(buf, buflen, "%.*f %s", precision, value, units);
+    g_snprintf(buf, buflen, "%.*f %s", precision, value, units);
     return buf;
 }
 
@@ -151,19 +151,19 @@ char *tr_formatter_speed_KBps(char *buf, double KBps, size_t buflen)
     double speed = KBps;
 
     if (speed <= 999.95)        /* 0.0 KB to 999.9 KB */
-        tr_snprintf(buf, buflen, "%d %s", (int) speed,
+        g_snprintf(buf, buflen, "%d %s", (int) speed,
                     speed_units.units[TR_FMT_KB].name);
     else {
         speed /= K;
         if (speed <= 99.995)    /* 0.98 MB to 99.99 MB */
-            tr_snprintf(buf, buflen, "%.2f %s", speed,
+            g_snprintf(buf, buflen, "%.2f %s", speed,
                         speed_units.units[TR_FMT_MB].name);
         else if (speed <= 999.95)       /* 100.0 MB to 999.9 MB */
-            tr_snprintf(buf, buflen, "%.1f %s", speed,
+            g_snprintf(buf, buflen, "%.1f %s", speed,
                         speed_units.units[TR_FMT_MB].name);
         else {
             speed /= K;
-            tr_snprintf(buf, buflen, "%.1f %s", speed,
+            g_snprintf(buf, buflen, "%.1f %s", speed,
                         speed_units.units[TR_FMT_GB].name);
         }
     }
@@ -340,7 +340,7 @@ gchar *make_error_message(JsonObject * response, int status)
 {
     if (status == FAIL_JSON_DECODE) {
         return g_strdup(_("JSON decoding error."));
-    } else if (status == FAIL_RESPONSE_UNSUCCESSFUL) {
+    } else if (response && status == FAIL_RESPONSE_UNSUCCESSFUL) {
         const gchar *resultStr =
             json_object_get_string_member(response, "result");
         if (resultStr == NULL)
@@ -367,7 +367,7 @@ char *tr_strlpercent(char *buf, double x, size_t buflen)
     else
         precision = 0;
 
-    tr_snprintf(buf, buflen, "%.*f%%", precision, tr_truncd(x, precision));
+    g_snprintf(buf, buflen, "%.*f%%", precision, tr_truncd(x, precision));
     return buf;
 }
 
@@ -382,15 +382,15 @@ char *tr_strratio(char *buf, size_t buflen, double ratio,
                   const char *infinity)
 {
     if ((int) ratio == TR_RATIO_NA)
-        tr_strlcpy(buf, _("None"), buflen);
+        g_strlcpy(buf, _("None"), buflen);
     else if ((int) ratio == TR_RATIO_INF)
-        tr_strlcpy(buf, infinity, buflen);
+        g_strlcpy(buf, infinity, buflen);
     else if (ratio < 10.0)
-        tr_snprintf(buf, buflen, "%.2f", tr_truncd(ratio, 2));
+        g_snprintf(buf, buflen, "%.2f", tr_truncd(ratio, 2));
     else if (ratio < 100.0)
-        tr_snprintf(buf, buflen, "%.1f", tr_truncd(ratio, 1));
+        g_snprintf(buf, buflen, "%.1f", tr_truncd(ratio, 1));
     else
-        tr_snprintf(buf, buflen, "%'.0f", ratio);
+        g_snprintf(buf, buflen, "%'.0f", ratio);
     return buf;
 }
 
@@ -481,31 +481,14 @@ char *gtr_localtime2(char *buf, time_t time, size_t buflen)
     return buf;
 }
 
-int tr_snprintf(char *buf, size_t buflen, const char *fmt, ...)
-{
-    int len;
-    va_list args;
-
-    va_start(args, fmt);
-    len = evutil_vsnprintf(buf, buflen, fmt, args);
-    va_end(args);
-    return len;
-}
-
 gchar *epoch_to_string(gint64 epoch)
 {
-#if GLIB_CHECK_VERSION(2, 26, 00)
+	if(epoch == 0)
+		return g_strdup(_("N/A"));
     GDateTime *dt = g_date_time_new_from_unix_local(epoch);
     gchar *timestring = g_date_time_format(dt, "%F %H:%M:%S");
     g_date_time_unref(dt);
     return timestring;
-#else
-    char buf[64];
-    time_t time_val = epoch;
-    struct tm *ts = localtime(&time_val);
-    int wrote = strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", ts);
-    return g_strndup(buf, wrote);
-#endif
 }
 
 /* wrap a link in text with a hyperlink, for use in pango markup.
@@ -542,51 +525,6 @@ gchar *add_links_to_text(const gchar * original)
     return newText;
 }
 
-size_t tr_strlcpy(char *dst, const void *src, size_t siz)
-{
-#ifdef HAVE_STRLCPY
-    return strlcpy(dst, src, siz);
-#else
-    char *d = dst;
-    const char *s = src;
-    size_t n = siz;
-
-    /* Copy as many bytes as will fit */
-    if (n != 0) {
-        while (--n != 0) {
-            if ((*d++ = *s++) == '\0')
-                break;
-        }
-    }
-
-    /* Not enough room in dst, add NUL and traverse rest of src */
-    if (n == 0) {
-        if (siz != 0)
-            *d = '\0';          /* NUL-terminate dst */
-        while (*s++);
-    }
-
-    return s - (char *) src - 1;        /* count does not include NUL */
-#endif
-}
-
-int
-evutil_vsnprintf(char *buf, size_t buflen, const char *format, va_list ap)
-{
-#ifdef _MSC_VER
-    int r = _vsnprintf(buf, buflen, format, ap);
-    buf[buflen - 1] = '\0';
-    if (r >= 0)
-        return r;
-    else
-        return _vscprintf(format, ap);
-#else
-    int r = vsnprintf(buf, buflen, format, ap);
-    buf[buflen - 1] = '\0';
-    return r;
-#endif
-}
-
 char *tr_strlsize(char *buf, guint64 bytes, size_t buflen)
 {
     if (!bytes)
@@ -616,24 +554,16 @@ gboolean should_be_minimised(int argc, char *argv[])
 GtkWidget *trg_hbox_new(gboolean homogeneous, gint spacing)
 {
     GtkWidget *box;
-#if GTK_CHECK_VERSION( 3, 0, 0 )
     box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, spacing);
     gtk_box_set_homogeneous(GTK_BOX(box), homogeneous);
-#else
-    box = gtk_hbox_new(homogeneous, spacing);
-#endif
     return box;
 }
 
 GtkWidget *trg_vbox_new(gboolean homogeneous, gint spacing)
 {
     GtkWidget *box;
-#if GTK_CHECK_VERSION( 3, 0, 0 )
     box = gtk_box_new(GTK_ORIENTATION_VERTICAL, spacing);
     gtk_box_set_homogeneous(GTK_BOX(box), homogeneous);
-#else
-    box = gtk_vbox_new(homogeneous, spacing);
-#endif
     return box;
 }
 
@@ -648,7 +578,7 @@ gchar *trg_win32_support_path(gchar * file)
 }
 #endif
 
-gboolean is_unity()
+gboolean is_unity(void)
 {
     return g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity") == 0;
 }
diff --git a/src/util.h b/src/util.h
index 351f565..76d95a5 100644
--- a/src/util.h
+++ b/src/util.h
@@ -32,6 +32,7 @@
 #define trg_strlpercent(a, b) tr_strlpercent(a, b, sizeof(a))
 #define trg_strlsize(a, b) tr_formatter_size_B(a, b, sizeof(a))
 #define trg_strlratio(a, b) tr_strlratio(a, b, sizeof(a))
+#define MAX3(a,b,c) MAX(a,MAX(b,c))
 
 #define TR_RATIO_NA  -1
 #define TR_RATIO_INF -2
@@ -78,12 +79,7 @@ char *tr_strratio(char *buf, size_t buflen, double ratio,
 char *tr_strlratio(char *buf, double ratio, size_t buflen);
 char *gtr_localtime(time_t time);
 char *gtr_localtime2(char *buf, time_t time, size_t buflen);
-int tr_snprintf(char *buf, size_t buflen, const char *fmt, ...);
-int tr_snprintf(char *buf, size_t buflen, const char *fmt, ...);
-size_t tr_strlcpy(char *dst, const void *src, size_t siz);
 double tr_truncd(double x, int decimal_places);
-int evutil_vsnprintf(char *buf, size_t buflen, const char *format,
-                     va_list ap);
 char *tr_strlsize(char *buf, guint64 bytes, size_t buflen);
 void rm_trailing_slashes(gchar * str);
 void trg_widget_set_visible(GtkWidget * w, gboolean visible);
@@ -97,7 +93,7 @@ gboolean should_be_minimised(int argc, char *argv[]);
 gboolean is_minimised_arg(const gchar * arg);
 GtkWidget *trg_vbox_new(gboolean homogeneous, gint spacing);
 GtkWidget *trg_hbox_new(gboolean homogeneous, gint spacing);
-gboolean is_unity();
+gboolean is_unity(void);
 
 #ifdef WIN32
 gchar *trg_win32_support_path(gchar * file);
diff --git a/src/win32-mailslot.c b/src/win32-mailslot.c
index 0ca52a9..4fb5af2 100644
--- a/src/win32-mailslot.c
+++ b/src/win32-mailslot.c
@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #if WIN32
 
 #define TRG_MAILSLOT_NAME "\\\\.\\mailslot\\TransmissionRemoteGTK"