--- seahorse-2.20.1.orig/debian/rules +++ seahorse-2.20.1/debian/rules @@ -0,0 +1,121 @@ +#!/usr/bin/make -f + +# C compiler information +CC = gcc +CFLAGS = -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2) +LDFLAGS = -Wl,-O1 + +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +confflags += --prefix=/usr \ + --sysconfdir=/etc \ + --disable-update-mime-database \ + --disable-schemas-install \ + --disable-scrollkeeper + +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build $(DEB_HOST_GNU_TYPE) +else + confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + +include /usr/share/dpatch/dpatch.make +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +# The autotools target is used to get the latest version of config.[guess,sub] +# files. This should avoid autobuild errors, but adds a Build-Dependency +# in autotools-dev +autotools: autotools-stamp +autotools-stamp: + -if [ -f config.sub.old ]; then \ + rm -f config.sub; \ + else \ + mv config.sub config.sub.old; \ + fi + -if [ -f config.guess.old ]; then \ + rm -f config.guess; \ + else \ + mv config.guess config.guess.old; \ + fi + ln -s /usr/share/misc/config.sub config.sub + ln -s /usr/share/misc/config.guess config.guess + touch $@ + +configure: configure-stamp +configure-stamp: autotools-stamp patch-stamp + dh_testdir + CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ + ./configure $(confflags) + touch $@ + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + $(MAKE) + touch $@ + +clean:: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + rm -f configure-stamp + rm -f autotools + -$(MAKE) distclean + -rm -f config.log + -rm -rf debian/seahorse + -if [ -f config.sub.old ]; then \ + mv config.sub.old config.sub; \ + fi + -if [ -f config.guess.old ]; then \ + mv config.guess.old config.guess; \ + fi + -rm -rf debian/patched + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) install DESTDIR=$(CURDIR)/debian/seahorse + mkdir -p $(CURDIR)/debian/seahorse/etc/X11/Xsession.d + cp debian/seahorse.Xsession $(CURDIR)/debian/seahorse/etc/X11/Xsession.d/60seahorse + # Remove mime-type catalog, it's in shared-mime-info since 0.20 + rm -f debian/seahorse/usr/share/mime/packages/seahorse.xml + # Remove library link + rm -f debian/seahorse/usr/lib/*.so + rm -rf debian/seahorse/usr/include + rm -rf debian/seahorse/usr/lib/pkgconfig + find debian/seahorse -name '*.a' -exec rm -f {} \; + find debian/seahorse -name '*.la' -exec rm -f {} \; + +binary-indep: + +binary-arch: build install + dh_testdir + dh_testroot + dh_install + dh_installdocs NEWS README TODO debian/NEWS.Debian + dh_installmenu + dh_installchangelogs ChangeLog + dh_installmime + dh_gconf + dh_scrollkeeper + dh_desktop + dh_icons + dh_link + dh_makeshlibs + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch + +.PHONY: autotools configure build install clean binary-indep binary-arch binary --- seahorse-2.20.1.orig/debian/copyright +++ seahorse-2.20.1/debian/copyright @@ -0,0 +1,389 @@ +This package was debianized by Jose Carlos Garcia Sogo on +Mon, 17 Jan 2003 20:14:10 +0100. + +It was downloaded from ftp://ftp.gnome.org/pub/GNOME/sources/seahorse + +Upstream Authors: Nate Nielsen , Adam Schreiber + +Copyright (C) 2001, 2002 Jose Carlos Garcia Sogo +Copyright (C) 2002, 2003 Jacob Perkins +Copyright (C) 2004, 2006 Nate Nielsen, Adam Schreiber + +Main License (everything except docs): + + This package 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 package 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +Documentation and help files are covered by GFDL license. + +GFDL License: + + GNU Free Documentation License + Version 1.1, March 2000 + + Copyright (C) 2000 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + +0. PREAMBLE + +The purpose of this License is to make a manual, textbook, or other +written document "free" in the sense of freedom: to assure everyone +the effective freedom to copy and redistribute it, with or without +modifying it, either commercially or noncommercially. Secondarily, +this License preserves for the author and publisher a way to get +credit for their work, while not being considered responsible for +modifications made by others. + +This License is a kind of "copyleft", which means that derivative +works of the document must themselves be free in the same sense. It +complements the GNU General Public License, which is a copyleft +license designed for free software. + +We have designed this License in order to use it for manuals for free +software, because free software needs free documentation: a free +program should come with manuals providing the same freedoms that the +software does. But this License is not limited to software manuals; +it can be used for any textual work, regardless of subject matter or +whether it is published as a printed book. We recommend this License +principally for works whose purpose is instruction or reference. + + +1. APPLICABILITY AND DEFINITIONS + +This License applies to any manual or other work that contains a +notice placed by the copyright holder saying it can be distributed +under the terms of this License. The "Document", below, refers to any +such manual or work. Any member of the public is a licensee, and is +addressed as "you". + +A "Modified Version" of the Document means any work containing the +Document or a portion of it, either copied verbatim, or with +modifications and/or translated into another language. + +A "Secondary Section" is a named appendix or a front-matter section of +the Document that deals exclusively with the relationship of the +publishers or authors of the Document to the Document's overall subject +(or to related matters) and contains nothing that could fall directly +within that overall subject. (For example, if the Document is in part a +textbook of mathematics, a Secondary Section may not explain any +mathematics.) The relationship could be a matter of historical +connection with the subject or with related matters, or of legal, +commercial, philosophical, ethical or political position regarding +them. + +The "Invariant Sections" are certain Secondary Sections whose titles +are designated, as being those of Invariant Sections, in the notice +that says that the Document is released under this License. + +The "Cover Texts" are certain short passages of text that are listed, +as Front-Cover Texts or Back-Cover Texts, in the notice that says that +the Document is released under this License. + +A "Transparent" copy of the Document means a machine-readable copy, +represented in a format whose specification is available to the +general public, whose contents can be viewed and edited directly and +straightforwardly with generic text editors or (for images composed of +pixels) generic paint programs or (for drawings) some widely available +drawing editor, and that is suitable for input to text formatters or +for automatic translation to a variety of formats suitable for input +to text formatters. A copy made in an otherwise Transparent file +format whose markup has been designed to thwart or discourage +subsequent modification by readers is not Transparent. A copy that is +not "Transparent" is called "Opaque". + +Examples of suitable formats for Transparent copies include plain +ASCII without markup, Texinfo input format, LaTeX input format, SGML +or XML using a publicly available DTD, and standard-conforming simple +HTML designed for human modification. Opaque formats include +PostScript, PDF, proprietary formats that can be read and edited only +by proprietary word processors, SGML or XML for which the DTD and/or +processing tools are not generally available, and the +machine-generated HTML produced by some word processors for output +purposes only. + +The "Title Page" means, for a printed book, the title page itself, +plus such following pages as are needed to hold, legibly, the material +this License requires to appear in the title page. For works in +formats which do not have any title page as such, "Title Page" means +the text near the most prominent appearance of the work's title, +preceding the beginning of the body of the text. + + +2. VERBATIM COPYING + +You may copy and distribute the Document in any medium, either +commercially or noncommercially, provided that this License, the +copyright notices, and the license notice saying this License applies +to the Document are reproduced in all copies, and that you add no other +conditions whatsoever to those of this License. You may not use +technical measures to obstruct or control the reading or further +copying of the copies you make or distribute. However, you may accept +compensation in exchange for copies. If you distribute a large enough +number of copies you must also follow the conditions in section 3. + +You may also lend copies, under the same conditions stated above, and +you may publicly display copies. + + +3. COPYING IN QUANTITY + +If you publish printed copies of the Document numbering more than 100, +and the Document's license notice requires Cover Texts, you must enclose +the copies in covers that carry, clearly and legibly, all these Cover +Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on +the back cover. Both covers must also clearly and legibly identify +you as the publisher of these copies. The front cover must present +the full title with all words of the title equally prominent and +visible. You may add other material on the covers in addition. +Copying with changes limited to the covers, as long as they preserve +the title of the Document and satisfy these conditions, can be treated +as verbatim copying in other respects. + +If the required texts for either cover are too voluminous to fit +legibly, you should put the first ones listed (as many as fit +reasonably) on the actual cover, and continue the rest onto adjacent +pages. + +If you publish or distribute Opaque copies of the Document numbering +more than 100, you must either include a machine-readable Transparent +copy along with each Opaque copy, or state in or with each Opaque copy +a publicly-accessible computer-network location containing a complete +Transparent copy of the Document, free of added material, which the +general network-using public has access to download anonymously at no +charge using public-standard network protocols. If you use the latter +option, you must take reasonably prudent steps, when you begin +distribution of Opaque copies in quantity, to ensure that this +Transparent copy will remain thus accessible at the stated location +until at least one year after the last time you distribute an Opaque +copy (directly or through your agents or retailers) of that edition to +the public. + +It is requested, but not required, that you contact the authors of the +Document well before redistributing any large number of copies, to give +them a chance to provide you with an updated version of the Document. + + +4. MODIFICATIONS + +You may copy and distribute a Modified Version of the Document under +the conditions of sections 2 and 3 above, provided that you release +the Modified Version under precisely this License, with the Modified +Version filling the role of the Document, thus licensing distribution +and modification of the Modified Version to whoever possesses a copy +of it. In addition, you must do these things in the Modified Version: + +A. Use in the Title Page (and on the covers, if any) a title distinct + from that of the Document, and from those of previous versions + (which should, if there were any, be listed in the History section + of the Document). You may use the same title as a previous version + if the original publisher of that version gives permission. +B. List on the Title Page, as authors, one or more persons or entities + responsible for authorship of the modifications in the Modified + Version, together with at least five of the principal authors of the + Document (all of its principal authors, if it has less than five). +C. State on the Title page the name of the publisher of the + Modified Version, as the publisher. +D. Preserve all the copyright notices of the Document. +E. Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices. +F. Include, immediately after the copyright notices, a license notice + giving the public permission to use the Modified Version under the + terms of this License, in the form shown in the Addendum below. +G. Preserve in that license notice the full lists of Invariant Sections + and required Cover Texts given in the Document's license notice. +H. Include an unaltered copy of this License. +I. Preserve the section entitled "History", and its title, and add to + it an item stating at least the title, year, new authors, and + publisher of the Modified Version as given on the Title Page. If + there is no section entitled "History" in the Document, create one + stating the title, year, authors, and publisher of the Document as + given on its Title Page, then add an item describing the Modified + Version as stated in the previous sentence. +J. Preserve the network location, if any, given in the Document for + public access to a Transparent copy of the Document, and likewise + the network locations given in the Document for previous versions + it was based on. These may be placed in the "History" section. + You may omit a network location for a work that was published at + least four years before the Document itself, or if the original + publisher of the version it refers to gives permission. +K. In any section entitled "Acknowledgements" or "Dedications", + preserve the section's title, and preserve in the section all the + substance and tone of each of the contributor acknowledgements + and/or dedications given therein. +L. Preserve all the Invariant Sections of the Document, + unaltered in their text and in their titles. Section numbers + or the equivalent are not considered part of the section titles. +M. Delete any section entitled "Endorsements". Such a section + may not be included in the Modified Version. +N. Do not retitle any existing section as "Endorsements" + or to conflict in title with any Invariant Section. + +If the Modified Version includes new front-matter sections or +appendices that qualify as Secondary Sections and contain no material +copied from the Document, you may at your option designate some or all +of these sections as invariant. To do this, add their titles to the +list of Invariant Sections in the Modified Version's license notice. +These titles must be distinct from any other section titles. + +You may add a section entitled "Endorsements", provided it contains +nothing but endorsements of your Modified Version by various +parties--for example, statements of peer review or that the text has +been approved by an organization as the authoritative definition of a +standard. + +You may add a passage of up to five words as a Front-Cover Text, and a +passage of up to 25 words as a Back-Cover Text, to the end of the list +of Cover Texts in the Modified Version. Only one passage of +Front-Cover Text and one of Back-Cover Text may be added by (or +through arrangements made by) any one entity. If the Document already +includes a cover text for the same cover, previously added by you or +by arrangement made by the same entity you are acting on behalf of, +you may not add another; but you may replace the old one, on explicit +permission from the previous publisher that added the old one. + +The author(s) and publisher(s) of the Document do not by this License +give permission to use their names for publicity for or to assert or +imply endorsement of any Modified Version. + + +5. COMBINING DOCUMENTS + +You may combine the Document with other documents released under this +License, under the terms defined in section 4 above for modified +versions, provided that you include in the combination all of the +Invariant Sections of all of the original documents, unmodified, and +list them all as Invariant Sections of your combined work in its +license notice. + +The combined work need only contain one copy of this License, and +multiple identical Invariant Sections may be replaced with a single +copy. If there are multiple Invariant Sections with the same name but +different contents, make the title of each such section unique by +adding at the end of it, in parentheses, the name of the original +author or publisher of that section if known, or else a unique number. +Make the same adjustment to the section titles in the list of +Invariant Sections in the license notice of the combined work. + +In the combination, you must combine any sections entitled "History" +in the various original documents, forming one section entitled +"History"; likewise combine any sections entitled "Acknowledgements", +and any sections entitled "Dedications". You must delete all sections +entitled "Endorsements." + + +6. COLLECTIONS OF DOCUMENTS + +You may make a collection consisting of the Document and other documents +released under this License, and replace the individual copies of this +License in the various documents with a single copy that is included in +the collection, provided that you follow the rules of this License for +verbatim copying of each of the documents in all other respects. + +You may extract a single document from such a collection, and distribute +it individually under this License, provided you insert a copy of this +License into the extracted document, and follow this License in all +other respects regarding verbatim copying of that document. + + +7. AGGREGATION WITH INDEPENDENT WORKS + +A compilation of the Document or its derivatives with other separate +and independent documents or works, in or on a volume of a storage or +distribution medium, does not as a whole count as a Modified Version +of the Document, provided no compilation copyright is claimed for the +compilation. Such a compilation is called an "aggregate", and this +License does not apply to the other self-contained works thus compiled +with the Document, on account of their being thus compiled, if they +are not themselves derivative works of the Document. + +If the Cover Text requirement of section 3 is applicable to these +copies of the Document, then if the Document is less than one quarter +of the entire aggregate, the Document's Cover Texts may be placed on +covers that surround only the Document within the aggregate. +Otherwise they must appear on covers around the whole aggregate. + + +8. TRANSLATION + +Translation is considered a kind of modification, so you may +distribute translations of the Document under the terms of section 4. +Replacing Invariant Sections with translations requires special +permission from their copyright holders, but you may include +translations of some or all Invariant Sections in addition to the +original versions of these Invariant Sections. You may include a +translation of this License provided that you also include the +original English version of this License. In case of a disagreement +between the translation and the original English version of this +License, the original English version will prevail. + + +9. TERMINATION + +You may not copy, modify, sublicense, or distribute the Document except +as expressly provided for under this License. Any other attempt to +copy, modify, sublicense or distribute the Document 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. + + +10. FUTURE REVISIONS OF THIS LICENSE + +The Free Software Foundation may publish new, revised versions +of the GNU Free Documentation 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. See +http://www.gnu.org/copyleft/. + +Each version of the License is given a distinguishing version number. +If the Document specifies that a particular numbered version of this +License "or any later version" applies to it, you have the option of +following the terms and conditions either of that specified version or +of any later version that has been published (not as a draft) by the +Free Software Foundation. If the Document does not specify a version +number of this License, you may choose any version ever published (not +as a draft) by the Free Software Foundation. + + +ADDENDUM: How to use this License for your documents + +To use this License in a document you have written, include a copy of +the License in the document and put the following copyright and +license notices just after the title page: + + Copyright (c) YEAR YOUR NAME. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.1 + or any later version published by the Free Software Foundation; + with the Invariant Sections being LIST THEIR TITLES, with the + Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. + A copy of the license is included in the section entitled "GNU + Free Documentation License". + +If you have no Invariant Sections, write "with no Invariant Sections" +instead of saying which ones are invariant. If you have no +Front-Cover Texts, write "no Front-Cover Texts" instead of +"Front-Cover Texts being LIST"; likewise for Back-Cover Texts. + +If your document contains nontrivial examples of program code, we +recommend releasing these examples in parallel under your choice of +free software license, such as the GNU General Public License, +to permit their use in free software. --- seahorse-2.20.1.orig/debian/changelog +++ seahorse-2.20.1/debian/changelog @@ -0,0 +1,795 @@ +seahorse (2.20.1-1ubuntu1) hardy; urgency=low + + * Sync with Debian: + + debian/rules: + - Call dh_icons. + + debian/control.in: + - Use firefox instead of xulrunner. + - Update maintainer field. + + -- Emilio Pozuelo Monfort Sun, 11 Nov 2007 19:45:44 +0100 + +seahorse (2.20.1-1) unstable; urgency=low + + * New upstream bugfix release, works with gedit 2.20: + + debian/patches/20_svn_fix_pointer_usage.dpatch, + debian/patches/21_svn_missing_include.dpatch: + - Dropped, merged upstream. + + debian/patches/10_relibtoolize.dpatch: + - Updated for the new version. + + -- Sebastian Dröge Tue, 16 Oct 2007 13:19:36 +0200 + +seahorse (2.20.0-1) unstable; urgency=low + + * New upstream release, only change is the corrected version number. + * debian/patches/20_svn_fix_pointer_usage.dpatch: + + Fix some broken pointer handling. Patch taken from SVN. + * debian/patches/21_svn_missing_include.dpatch: + + Add a missing include and call gnome_vfs_unescape_string correctly. + This fixes an implicit pointer conversion that will break on archs + where sizeof(void*)>sizeof(int). Patch taken from SVN (Closes: #443255). + * debian/patches/10_relibtoolize.dpatch: + + Updated for the new version. + + -- Sebastian Dröge Thu, 20 Sep 2007 20:30:07 +0200 + +seahorse (2.20-1ubuntu1) gutsy; urgency=low + + * Sync with Debian: + + debian/rules: + - Call dh_iconcache. + + debian/control.in: + - Use firefox instead of xulrunner. + - Update maintainer field. + + -- Sebastian Dröge Mon, 17 Sep 2007 23:06:14 +0200 + +seahorse (2.20-1) unstable; urgency=low + + [ Josselin Mouette ] + * debian/gconf-defaults: re-enable the notification area icon until + the "clean cache" feature is exposed somewhere else (closes: #432975). + + [ Sebastian Dröge ] + * New upstream release: + + Fixes help button in seahorse-preferences (Closes: #409692). + + Fixes missing icon warning (Closes: #403663). + + Fixes improper handling of gnome-keyring-daemon keys with < in + name(Closes: #429771). + * debian/control.in: + + Build depend on libebook1.2-dev. + * debian/patches/3_setuid.dpatch, + debian/patches/9_fix_ephy_crash.dpatch, + debian/patches/1_seahorse-agent-manpage.dpatch, + debian/patches/4_gpg-agent.dpatch: + + Dropped, merged upstream. + * debian/patches/2_mlock.dpatch, + debian/patches/10_relibtoolize.dpatch: + + Updated for the new version. + + -- Sebastian Dröge Mon, 17 Sep 2007 22:45:56 +0200 + +seahorse (1.0.1-6) unstable; urgency=low + + [ Sebastian Dröge ] + * debian/patches/multiple_messages.dpatch: + + Drop accidentially added patch from the diff. + + [ Josselin Mouette ] + * debian/gconf-defaults: disable the notification area icon by + default as it doesn't notify of anything. See bugzilla#432891. + + [ Sebastian Dröge ] + * debian/patches/4_gpg-agent.dpatch: + + Prevent seahorse from crashing when gpg-agent is running. Patch + taken from upstream. This makes it possible to have both installed + and still everything working. (Closes: #407800, #420415, #415842) + + -- Sebastian Dröge Sun, 08 Jul 2007 19:13:28 +0200 + +seahorse (1.0.1-5) unstable; urgency=low + + * debian/patches/9_fix_ephy_crash.dpatch: + + Fix epiphany extension crash (Closes: #422616). Patch taken from the + Gnome 2.18 branch of seahorse, thanks to Sam Morris for pointing at it. + + -- Sebastian Dröge Mon, 7 May 2007 16:07:00 +0200 + +seahorse (1.0.1-4) unstable; urgency=low + + [ Sebastian Dröge ] + * debian/control, + debian/control.in, + debian/rules: + + Put @GNOME_TEAM@ in Uploaders and include the required stuff in rules. + + [ Loic Minier ] + * Cleanups. + * Wrap build-deps and deps. + * Add watch file. + * Add a get-orig-source target to retrieve the upstream tarball. + * Include full licensing information in debian/copyright. + + [ Sebastian Dröge ] + * debian/control.in: + + Remove the gpg-agent conflict to make it at least possible to install + those two packages at the same time. gpg-agent will be used if both are + installed as it starts earlier and seahorse doesn't crash the session + anymore in that case. This is a partial fix for bug #415842. + * debian/rules: + + Drop circular target dependency. + + Fix rules so the patches get actually applied. + + -- Sebastian Dröge Thu, 3 May 2007 20:49:56 +0200 + +seahorse (1.0.1-3) unstable; urgency=low + + * debian/patches/2_mlock.dpatch: + + Fix the mlock() check. It failed whenever called as root or with + fakeroot although we support mlock() as normal user (Closes: #421728). + * debian/patches/3_setuid.dpatch: + + Run chmod u+s on the correct binary (Closes: #421666). + * debian/patches/10_relibtoolize.dpatch: + + Regenerated for the above changes. + + -- Sebastian Dröge Tue, 1 May 2007 22:59:05 +0200 + +seahorse (1.0.1-2) unstable; urgency=low + + * debian/rules: + + Don't ship the mime-type catalog with seahorse, it's in shared-mime-info + since 0.20. + + -- Sebastian Dröge Mon, 23 Apr 2007 12:31:52 +0200 + +seahorse (1.0.1-1) unstable; urgency=low + + * New upstream version + * Upload to unstable + * debian/po, + debian/seahorse.config, + debian/seahorse.templates, + debian/seahorse.postinst, + debian/control, + debian/rules: + + Remove debconf stuff. With kernels greater than 2.6.8 no suid binary + is needed to get mlock()'ed memory anymore. + * debian/patches/9_gtk-2.10-revert.dpatch: + + Dropped, we use gtk 2.10 now. + * debian/control: + + Update build dependencies. + * debian/control, + debian/rules: + + Enable epiphany plugin. + * debian/patches/10_relibtoolize.dpatch: + + Updated for new upstream version. + + -- Sebastian Dröge Sun, 15 Apr 2007 21:20:02 +0200 + +seahorse (1.0-1) experimental; urgency=low + + * New upstream release + * debian/control: + + Add Build-Conflicts with gnupg2 and Conflicts on + gnupg-agent (Closes: #407800) + * debian/patches/10_relibtoolize.dpatch: + + Updated + + -- Sebastian Dröge Mon, 12 Mar 2007 21:14:16 +0100 + +seahorse (0.9.92-1) experimental; urgency=low + + * New upstream release + * debian/patches/30_crash-fixes.dpatch, + debian/patches/40_crash-fix.dpatch: + + Dropped, merged upstream + * debian/patches/10_relibtoolize.dpatch: + + Updated for new upstream version + + -- Sebastian Dröge Sun, 25 Feb 2007 11:10:22 +0100 + +seahorse (0.9.91-2) experimental; urgency=low + + * debian/patches/30_crash-fixes.dpatch: + + Fix crash when editing gpg.conf and add missing paranthesis in SSH + agent. Patches from Gnome SVN. + * debian/patches/40_crash-fix.dpatch: + + Fix for crash that happens when using a cached passphrase + + -- Sebastian Dröge Fri, 23 Feb 2007 11:49:11 +0100 + +seahorse (0.9.91-1) experimental; urgency=low + + * New upstream release + * debian/patches/1_seahorse-agent-manpage.dpatch: + + Fix the binary name of seahorse-agent in the manpage. Patch from the + Ubuntu package by Emmet Hikory . + * debian/patches/10_relibtoolize.dpatch: + + Updated for new upstream version + + -- Sebastian Dröge Tue, 13 Feb 2007 13:23:01 +0100 + +seahorse (0.9.10-2) unstable; urgency=low + + * Upload to unstable + * debian/control: + + Remove duplicated libgnome2-dev build dependency + + -- Sebastian Dröge Mon, 15 Jan 2007 01:25:05 +0100 + +seahorse (0.9.10-1) experimental; urgency=low + + * New upstream release: + + Fixes lockup when viewing key properties (Closes: #406139) + + Fix crash in agent when listing transientkey in cache (Closes: #405725) + + Don't prompt for confirmation on each key when deleting multiple + keys (Closes: #396024) + * debian/patches/9_gtk-2.10-revert.dpatch: + + Don't require gtk 2.10 but revert upstream commit that changed from + the eggtrayicon to the gtk 2.10 status icon. This version should go to + unstable ASAP after some testing and a gtk 2.10 dependency would prevent + this. + * debian/patches/10_relibtoolize.dpatch: + + Regenerated + * debian/control: + + Updated build dependencies + + Updated to use my debian.org mail address + + -- Sebastian Dröge Sun, 7 Jan 2007 20:26:36 +0100 + +seahorse (0.9.9-1) UNRELEASED; urgency=low + + * New upstream release + * debian/patches/10_relibtoolize.dpatch: + + Regenerated for the new upstream version + * debian/seahorse.links: + + Removed seahorse-agent link... this is an application now + * debian/seahorse-daemon.Xsession: + + Call seahorse-agent instead of seahorse-daemon, renamed file to + seahorse.Xsession + + -- Sebastian Dröge Wed, 20 Dec 2006 18:12:50 +0100 + +seahorse (0.9.8-1) UNRELEASED; urgency=low + + * New upstream release + * debian/seahorse-daemon.Xsession, + debian/rules: + + Install Xsession script to properly start seahorse-daemon as explained + on http://live.gnome.org/Seahorse/SessionIntegration (Closes: #381313) + + -- Sebastian Dröge Mon, 4 Dec 2006 00:45:11 +0100 + +seahorse (0.9.7-1) unstable; urgency=low + + * New upstream release. + * debian/patches: + + 9_move_libexec: drop; applied upstream. + + -- Jose Carlos Garcia Sogo Tue, 21 Nov 2006 22:25:32 +0100 + +seahorse (0.9.6-1) unstable; urgency=low + + * New upstream version. + + Fixes crashes when deleting keys (Closes: #395815) + * debian/patches: + + 9_move_libexec: make sure that nothing needs libexec (Closes: #378178) + + 10_relibtoolize: updated + + 20_amd64-ssh-crash: deleted, included upstream + * debian/control: + + Remove debconf-2.0 dependency. It is going to be added automatically by + dh_installdebconf + + -- Jose Carlos Garcia Sogo Sun, 29 Oct 2006 12:39:56 +0100 + +seahorse (0.9.5-3) unstable; urgency=low + + * Use $(CURDIR) instead of $(PWD), to avoid generating empty packages + in arches using sudo instead of fakeroot (Closes: #390389) + + -- Jose Carlos Garcia Sogo Sat, 7 Oct 2006 10:40:26 +0200 + +seahorse (0.9.5-2) unstable; urgency=low + + * debian/seahorse.postinst, + debian/seahorse.postrm, + debian/rules: + + Removed update-mime-database calls and call dh_installmime to handle + this. + * debian/rules: + + Random cleanup for stuff that is not needed anymore + + Correctly set CFLAGS and other variables for configure + + Drop -Wl,--as-needed from LDFLAGS as it is known to break gedit plugins + * debian/seahorse.links, + debian/rules: + + Install a seahorse-agent link that points to seahorse-daemon + to allow painless upgrades from older versions and install + NEWS.Debian. (Closes: #359353) + * debian/control: + + Depend on debconf-2.0 + * debian/seahorse.dirs: + + Drop useless file. + * debian/control, + debian/rules, + debian/compat: + + Update to debhelper compat level 5 + * debian/patches/20_amd64-ssh-crash.dpatch: + + Fix amd64 crasher when using the SSH agent (Closes: #388276) + Patch from upstream CVS + + -- Sebastian Dröge Fri, 22 Sep 2006 02:08:02 +0200 + +seahorse (0.9.5-1) unstable; urgency=low + + * New upstream release (Closes: #386617) + * debian/control: + + Add myself to Uploaders + + Tighten libnautilus-extension-dev build dependency to (>= 2.9.0) and + libpanel-applet2-dev to (>= 2.9.4) according to configure.ac + + Add build dependency on libgnome-keyring-dev + * debian/rules: + + Also remove static libcryptui and libcryptui headers + + Don't remove usr/libexec, it's not created anymore (Closes: #386787) + + Remove usr/share/mime/mime.cache as it seems to be created under some + circumstances and should never be shipped + * debian/patches/.dpatch, + debian/patches/00list, + debian/patches/seahorse_desktop.dpatch: + + Drop unnecessary stuff + * debian/patches/10_relibtoolize.dpatch: + + Updated for new upstream version + + -- Sebastian Dröge Tue, 12 Sep 2006 19:02:49 +0200 + +seahorse (0.9.3-1) unstable; urgency=low + + * The "I move" release. + * New upstream version. + + Fixed crash when enabling key sharing (Closes: #380160) + + Pipes are no longer left in ~/.gnome2 dir (Closes: #344500) + * debian/patches: + + 8_force_ssh: update to new checks made in configure.in + + -- Jose Carlos Garcia Sogo Tue, 5 Sep 2006 23:02:14 +0200 + +seahorse (0.9.1-2) unstable; urgency=low + + * Add build dependency on gnome-doc-utils (Closes: #376307) + + -- Jose Carlos Garcia Sogo Sun, 2 Jul 2006 01:01:01 +0200 + +seahorse (0.9.1-1) unstable; urgency=low + + * New upstream release (Closes: #375723) + * debian/patches: + + seahorse-desktop: remove. Included upstream + + 8_force_ssh, 9_move_libexec: add a description + + 10_relibtoolize: remade + * debian/control: bumped to Standards-Version 3.7.2. No changes. + + -- Jose Carlos Garcia Sogo Sat, 1 Jul 2006 22:54:18 +0200 + +seahorse (0.9.0-2) unstable; urgency=low + + * debian/patches: + + Force ordering of patches. + + Fix 9_move_libexec to also move seahorse-applet location. + + Remade 10_relibtoolize to get every patch. + + -- Jose Carlos Garcia Sogo Sun, 26 Mar 2006 12:51:54 +0200 + +seahorse (0.9.0-1) unstable; urgency=low + + * New upstream release. + + Fixes problem signing imported keys (Closes: #353423) + + Fix critical warnings when launching seahorse in a console + (Closes: #342283, #328308) + + Do not crash on deleting multiple keys (Closes: #309571) + + Properties dialog shows secret keys to select (Closes: #287134) + + Doesn't depend on MIME type to show Nautilus menu integration. (Closes: #287131) + + Adds support for photo IDs (Closes: #284155) + + * New build depends on: + + libnotify-dev: enable libnotify support. + + libpanel-applet2-dev: compile new clipboard applet + + libavahi-glib-dev: allow your public keyring to be shared using md-dns + + libdbus-glib-1-dev: compil dbus support + + * debian/patches: + + force_ssh: force compiling ssh support without the need of depending on + openssh-client at compile time. + + 10_relibtoolize: updated to include changes from force_ssh in + configure script. + + seahorse_desktop: fixes menu categories for seahorse. + + move_libexec: use /usr/lib/seahorse instead of /usr/libexec + + 01_update_DE_po: applied upstream. + + fix-gnupg-1.4.2: included upstream. + + gpgme_1.1.0-check: included upstream. + + * debian/po: + + add sv.po file (Closes: #333694) + + s/agent/daemon/g in every .po file. + + * Recommend openssh-client, as we can now manage SSH keys as well. + + * Added NEWS.Debian file talking about renaming of seahorse-agent to + seahorse-daemon. + + * debian/seahorse.postinst, debian/seahorse.templates: change seahorse-agent + for seahorse-daemon. + + -- Jose Carlos Garcia Sogo Sat, 25 Mar 2006 14:09:59 +0100 + + +seahorse (0.8.0-1) unstable; urgency=low + + * New upstream version. + + fix-gnupg-1.4.2 patch disabled. Included upstream + * Build-Depend on libnautilus-extension-dev. Thanks to Sebastian Bacher for + pointing this + + -- Jose Carlos Garcia Sogo Wed, 12 Oct 2005 14:47:37 +0200 + +seahorse (0.7.9-4) unstable; urgency=low + + * debian/patches: + + fix-gnupg-1.4.2: fix problems when used with GnuPG 1.4.2. + Patch got from upstream Gnome Bugzilla, bug #313329 + + -- Jose Carlos Garcia Sogo Sat, 1 Oct 2005 20:33:37 +0200 + +seahorse (0.7.9-3) unstable; urgency=low + + * Binary upload in i386 didn't include nautilus-extension library. + Reuploading. + * Cleaning all .a and .la files around. I don't think nobody is going + to develop using seahorse internal libs. + + -- Jose Carlos Garcia Sogo Sat, 1 Oct 2005 10:18:08 +0200 + +seahorse (0.7.9-2) unstable; urgency=low + + * Actually include French debconf translation (Closes: #315587) + + -- Jose Carlos Garcia Sogo Sun, 18 Sep 2005 17:01:27 +0200 + +seahorse (0.7.9-1) unstable; urgency=low + + * New upstream release (only requested in IRC) + + Keyring backups not created world readable (Closes: #314726) + + Do not crash if gpg.conf is not available (Closes: #322658) + + * Debconf translations updated: + + Italian (Closes: #313238) + + French (Closes: #315587) + + German (Closes: #326143) + + Vietnamese (Closes: #317932) + + * debian/rules: remove left files in /usr/share/mime at install target + (Closes: #313408, #313130) + * debian/patches: + + 10_relibtoolize: update + + 01_update_DE_po: new (Closes: #313914) + * debian/control: + + Update Standards-Version to 3.6.2. No changes needed. + + -- Jose Carlos Garcia Sogo Fri, 16 Sep 2005 23:24:13 +0200 + +seahorse (0.7.8-2) unstable; urgency=low + + * Uploaded to unstable along with GNOME 2.10 transition. + * Build-depend on libsoup2.2-dev and libldap2-dev. (Closes: #311954) + * Added Czech debconf translation by Miroslav Kure. (Closes: #308469) + + -- Jose Carlos Garcia Sogo Sat, 11 Jun 2005 12:07:35 +0200 + +seahorse (0.7.8-1) experimental; urgency=low + + * New upstream version. (Closes: #306433) + * Compiled with GNOME 2.10 libs and new Nautilus extension. + * Hey, we are shipping gedit plugin since 0.7.6-5 (Closes: #283513) + * New Frech debconf translation. Julien Valroff (Closes: #298327) + * New Spanish debconf translation. (Me) + * Remove libeel from build-depends. No longer needed. + + -- Jose Carlos Garcia Sogo Sun, 8 May 2005 10:32:51 +0200 + +seahorse (0.7.6-5) unstable; urgency=low + + * Tighten build dependency in gedit to version >=2.8.3-3 (Closes: #303125) + + -- Jose Carlos Garcia Sogo Tue, 5 Apr 2005 21:49:34 +0200 + +seahorse (0.7.6-4) unstable; urgency=low + + * Enable gedit plugin, as we now have a gedit-dev package. + * debian/control: add gedit plugin to description and a Enhaces: gedit + field. + * Passing -Wl,-O1 -Wl,--as-needed to linker. Should reduce binary + dependencies. + + -- Jose Carlos Garcia Sogo Fri, 1 Apr 2005 21:18:35 +0200 + +seahorse (0.7.6-3) unstable; urgency=low + + * The "3rd in 3 days" release. I am sorry for autobuilders. + * Fixed postrm script. It does not fail on unknown parameters. + (Closes: #296189) + + -- Jose Carlos Garcia Sogo Mon, 21 Feb 2005 23:43:44 +0100 + +seahorse (0.7.6-2) unstable; urgency=low + + * The "seahorse is not cpufreq-selector" release. + * Patched debconf template. (Closes: #296044, #296045) + + -- Jose Carlos Garcia Sogo Sat, 19 Feb 2005 23:40:46 +0100 + +seahorse (0.7.6-1) unstable; urgency=low + + * New upstream release. + + Fixed yelp. (Closes: #279845) + + Works with GnuPG 1.4 (Closes: #294179) + + New key properties dialog. (Closes: #285711) + + Allows encryption to self. (Closes: #287132) + + Initial keyserver support. (Closes: #284156) + + -- Jose Carlos Garcia Sogo Sat, 19 Feb 2005 19:02:30 +0100 + +seahorse (0.7.5-3) unstable; urgency=low + + * debian/rules: + + Removed more mime stuff which was being installed with the package. + + * debian/seahorse.postrm: + + Only call update-mime-database on remove. + + * debian/seahorse.postinst: + + Only call update-mime-database on remove. + + Added a debconf question about setting seahorse-agent SUID root. + + * debian/seahorse.[config,templates]: + + New. Added a debconf question about setting seahorse-agent SUID root. + + + -- Jose Carlos Garcia Sogo Thu, 11 Nov 2004 00:07:36 +0100 + +seahorse (0.7.5-2) unstable; urgency=low + + * debian/rules: + + Removed from the package mime files that should be generated + by update-mime-database on each system. (Closes: #279742) + + * debian/seahorse.post[inst,rm]: + + Added to call update-mime-database on each install and removal, + so we fix systems broken by previous version. + + * debian/control: + + Let's Build-Depend on debhelper version containing dh_desktop. + + -- Jose Carlos Garcia Sogo Fri, 5 Nov 2004 18:48:42 +0100 + +seahorse (0.7.5-1) unstable; urgency=low + + * New upstream version + * Using dh_desktop now. + + -- Jose Carlos Garcia Sogo Wed, 3 Nov 2004 22:53:43 +0100 + +seahorse (0.7.4-1) unstable; urgency=low + + * New upstream release. (Closes: #277497) + + It now depends on gpgme 1.0.x (Closes: #221606) + + Fixed crash on exit. (Closes: #268301) + + Handle properly key signatures. (Closes: #268300) + + Don't freeze when using gpg. (Closes: #264404) + + * debian/control: + + Build-Depend on libgpgme11-dev + + * debian/rules: + + use dh_gconf, so gconf registry is restarted in postinst. (Closes: #254218) + + disable gedit plugin until a gedit-dev package is available. + + * debian/patches: + + 01_fix_pgp-preferences_icon: removed + + 10_relibtoolize: updated + + 00list: updated + + -- Jose Carlos Garcia Sogo Sat, 23 Oct 2004 12:29:03 +0200 + +seahorse (0.7.3-6) unstable; urgency=low + + * Added missing libxml-parser-perl to buil dependencies. (Closes: #265043) + + -- Jose Carlos Garcia Sogo Wed, 11 Aug 2004 18:29:39 +0200 + +seahorse (0.7.3-5) unstable; urgency=low + + * debian/patches: + - 10_relibtoolize: updated & really applied. The resulting package + shouldn't depend on libgcrypt7 (Closes: #263660) + + -- Jose Carlos Garcia Sogo Fri, 6 Aug 2004 01:27:16 +0200 + +seahorse (0.7.3-4) unstable; urgency=low + + * debian/patches: + - 10_relibtoolize: Relibtoolized to get only the needed dependencies. + + -- Jose Carlos Garcia Sogo Sat, 19 Jun 2004 17:34:37 +0200 + +seahorse (0.7.3-3) unstable; urgency=low + + * Using dh_gconf and dh_scrollkeeper now. + * Removed reference to /usr/share/common-licenses/GFDL. (Closes: #215017) + * Link with new gnutls. (Closes: #221626) + * Corrected reference from icon in Gnome menu. (Closes: #222032) + * Fixed Debian menu. (Closes: #229944) + + -- Jose Carlos Garcia Sogo Fri, 19 Mar 2004 15:37:08 +0100 + +seahorse (0.7.3-2) unstable; urgency=low + + * Relibtoolized. (Closes: #192316) + * Fixed a bug in postinst which made gconf schema not to + be installed. (Closes: #192357) + + -- Jose Carlos Garcia Sogo Thu, 8 May 2003 22:33:40 +0200 + +seahorse (0.7.3-1) unstable; urgency=low + + * New upstream version. + * Added libeel2-dev build-dependency. + * Added explicit build-dependency on debhelper (>= 4.0.0) + * Bumped standars-version to 3.5.9. No changes + + -- Jose Carlos Garcia Sogo Tue, 6 May 2003 22:28:39 +0200 + +seahorse (0.7.1-1) unstable; urgency=low + + * Another new upstream version. + + -- Jose Carlos Garcia Sogo Tue, 4 Mar 2003 21:08:41 +0100 + +seahorse (0.7.0-1) unstable; urgency=low + + * New upstream version. + No bugs closed, as no bugs have been filled :-) + + -- Jose Carlos Garcia Sogo Tue, 11 Feb 2003 23:21:59 +0100 + +seahorse (0.6.1-1) unstable; urgency=low + + * New upstream release. + + -- Jose Carlos Garcia Sogo Sat, 1 Feb 2003 10:10:50 +0100 + +seahorse (0.6.0-1) unstable; urgency=low + + * New upstream release. This is live again. (Closes: #170813) + * This is a completely rewrite, for GNOME 2 (Closes: #95848, #165769) + * Got es.po from CVS because file released with 0.6.0 is bad UTF-8 encoded + * Standars-Version -> 3.5.8 + + -- Jose Carlos Garcia Sogo Thu, 23 Jan 2003 23:48:10 +0100 + +seahorse (0.5.0-5) unstable; urgency=low + + * Moved to main. + + -- Jose Carlos Garcia Sogo Wed, 24 Apr 2002 00:55:30 +0200 + +seahorse (0.5.0-4) unstable; urgency=low + + * I forgot to change Mantainer field in debian/control file. Sorry + + -- Jose Carlos Garcia Sogo Fri, 8 Feb 2002 15:42:21 +0100 + +seahorse (0.5.0-3) unstable; urgency=low + + * I have adopted this package. (Closes: #132441) + * I have applied a little patch to not show passphrase when + signing a key (Closes: #132435) + + -- Jose Carlos Garcia Sogo Thu, 7 Feb 2002 20:37:25 +0100 + +seahorse (0.5.0-2) unstable; urgency=low + + * Package orphaned. + + -- Christian Marillat Wed, 6 Feb 2002 18:37:50 +0100 + +seahorse (0.5.0-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 20 Feb 2001 10:21:13 +0100 + +seahorse (0.4.9-3) unstable; urgency=low + + * Build against the latest gnome-libs 1.2.11 + + -- Christian Marillat Wed, 14 Feb 2001 14:19:36 +0100 + +seahorse (0.4.9-2) unstable; urgency=low + + * Switch to debhelper v2. + * debian/control removed unnecessary build-depends. + + -- Christian Marillat Thu, 25 Jan 2001 14:02:24 +0100 + +seahorse (0.4.9-1) unstable; urgency=low + + * New upstream release. + * Removed the debian folder from orig.tar.gz (Closes: #66793). + * Added build-depends field. Standards-Version: to 3.1.1.1 + * New e-mail address. + + -- Christian Marillat Mon, 10 Jul 2000 16:23:52 +0200 + +seahorse (0.4.8-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 13 Jun 2000 22:57:36 +0200 + +seahorse (0.4.6-2) unstable; urgency=low + + * Moved to non-US. + + -- Christian Marillat Tue, 23 May 2000 09:06:25 +0200 + +seahorse (0.4.6-1) unstable; urgency=low + + * New Seahorse Release, First official debian release.. + + -- Christian Marillat Fri, 19 May 2000 14:49:09 +0200 + +seahorse (0.4.5-1) unstable; urgency=low + + * New Seahorse Release. + + -- Anthony Mulcahy Sun, 7 May 2000 22:06:38 +0900 + +seahorse (0.4.0-1) unstable; urgency=low + + * New Seahorse Release. + + -- Anthony Mulcahy Sun, 7 May 2000 22:06:05 +0900 + +seahorse (0.3.6-1) unstable; urgency=low + + * New Seahorse Release. + + -- Anthony Mulcahy Sun, 20 Feb 2000 22:20:45 +0900 + +seahorse (0.3.5-1) unstable; urgency=low + + * New Seahorse Release. + + -- Anthony Mulcahy Sat, 19 Feb 2000 16:20:53 +0900 + +seahorse (0.3.4-1) unstable; urgency=low + + * New Seahorse Release. + * + + -- Anthony Mulcahy Sat, 19 Feb 2000 16:20:20 +0900 + +seahorse (0.3.2-1) unstable; urgency=low + + * New Seahorse Release. + + -- Anthony Mulcahy Wed, 26 Jan 2000 05:54:20 +0900 + +seahorse (0.3.1-1) unstable; urgency=low + + * Initial Release. + + -- Anthony Mulcahy Mon, 10 Jan 2000 22:17:00 +0900 + +Local variables: +mode: debian-changelog +End: --- seahorse-2.20.1.orig/debian/seahorse.Xsession +++ seahorse-2.20.1/debian/seahorse.Xsession @@ -0,0 +1,8 @@ +# This file is sourced by Xsession(5), not executed. + +SEAHORSE=/usr/bin/seahorse-agent + +if [ -x $SEAHORSE ]; then + STARTUP="$SEAHORSE --execute $STARTUP" +fi + --- seahorse-2.20.1.orig/debian/NEWS.Debian +++ seahorse-2.20.1/debian/NEWS.Debian @@ -0,0 +1,8 @@ + + From version 0.9.0 seahorse-agent has been renamed to seahorse-daemon. + For now, a convenient wrapper is provided, so old installations won't + break, but you should change your gnome-session settings, as this + wrapper will be dropped anytime. + +-- +Jose Carlos Garcia Sogo Tue, 21 March 2006 --- seahorse-2.20.1.orig/debian/control +++ seahorse-2.20.1/debian/control @@ -0,0 +1,51 @@ +Source: seahorse +Section: gnome +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Jose Carlos Garcia Sogo +Uploaders: Debian GNOME Maintainers , Sebastian Dröge +Build-Depends: debhelper (>= 5), + libgnome2-dev (>= 2.14.0), + libglade2-dev, + libgnomeui-dev (>= 2.10.0), + scrollkeeper, + libgpgme11-dev, + autotools-dev, + dpatch, + libxml-parser-perl, + gedit-dev (>= 2.10.0), + libsoup2.2-dev, + libldap2-dev, + libnautilus-extension-dev (>= 2.9.0), + libnotify-dev, + libpanel-applet2-dev (>= 2.9.4), + libavahi-glib-dev, + libdbus-glib-1-dev, + gnome-doc-utils, + libgnome-keyring-dev, + libglib2.0-dev (>= 2.10.0), + libgtk2.0-dev (>= 2.10.0), + epiphany-browser-dev (>= 2.14), + libxml2-dev (>= 2.6.0), + firefox-dev (>= 1.5), + libebook1.2-dev (>= 1.7.90), + gnome-pkg-tools +Build-Conflicts: gnupg2 +Standards-Version: 3.7.2 + +Package: seahorse +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Recommends: openssh-client +Description: A Gnome front end for GnuPG + Seahorse is a Gnome front end for GnuPG - the Gnu Privacy Guard program. It + is a tool for secure communications and data storage. Data encryption and + digital signature creation can easily be performed through a GUI and Key + Management operations can easily be carried out through an intuitive + interface. + . + In addition it includes a Gedit plugin, can handle files using Nautilus, + an applet for manging stuff put in the clipboard and an agent for storing + private passphrases, as well as a GnuPG and OpenSSH key manager. + --- seahorse-2.20.1.orig/debian/compat +++ seahorse-2.20.1/debian/compat @@ -0,0 +1 @@ +5 --- seahorse-2.20.1.orig/debian/patches/2_mlock.dpatch +++ seahorse-2.20.1/debian/patches/2_mlock.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run + +@DPATCH@ + +--- seahorse-1.0.1/acinclude.m4.old 2007-05-01 22:50:34.000000000 +0200 ++++ seahorse-1.0.1/acinclude.m4 2007-05-01 22:52:38.000000000 +0200 +@@ -67,10 +67,11 @@ + return 2; + } + /* Configure is being run as root? */ +- if (geteuid () == 0) { ++ /* breaks with fakeroot */ ++ /* if (geteuid () == 0) { + printf("assuming "); + return 1; +- } ++ } */ + return 0; + } + ], --- seahorse-2.20.1.orig/debian/patches/10_relibtoolize.dpatch +++ seahorse-2.20.1/debian/patches/10_relibtoolize.dpatch @@ -0,0 +1,5879 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run + +@DPATCH@ + +diff -Naur seahorse-2.20.1.old/aclocal.m4 seahorse-2.20.1/aclocal.m4 +--- seahorse-2.20.1.old/aclocal.m4 2007-10-15 18:15:54.000000000 +0200 ++++ seahorse-2.20.1/aclocal.m4 2007-10-16 13:22:56.000000000 +0200 +@@ -266,7 +266,7 @@ + AC_CHECK_FUNCS(dcgettext) + MSGFMT_OPTS= + AC_MSG_CHECKING([if msgfmt accepts -c]) +- GLIB_RUN_PROG([msgfmt -c -o /dev/null],[ ++ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ + msgid "" + msgstr "" + "Content-Type: text/plain; charset=UTF-8\n" +@@ -492,7 +492,7 @@ + + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +-# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL ++# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL + + + # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +@@ -655,7 +655,7 @@ + test -z "$ac_objext" && ac_objext=o + + # Determine commands to create old-style static archives. +-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' + old_postinstall_cmds='chmod 644 $oldlib' + old_postuninstall_cmds= + +@@ -742,8 +742,9 @@ + # Check for compiler boilerplate output or warnings with + # the simple compiler test code. + AC_DEFUN([_LT_COMPILER_BOILERPLATE], +-[ac_outfile=conftest.$ac_objext +-printf "$lt_simple_compile_test_code" >conftest.$ac_ext ++[AC_REQUIRE([LT_AC_PROG_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* +@@ -755,8 +756,9 @@ + # Check for linker boilerplate output or warnings with + # the simple link test code. + AC_DEFUN([_LT_LINKER_BOILERPLATE], +-[ac_outfile=conftest.$ac_objext +-printf "$lt_simple_link_test_code" >conftest.$ac_ext ++[AC_REQUIRE([LT_AC_PROG_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 conftest* +@@ -772,12 +774,20 @@ + # If we don't find anything, use the default library path according + # to the aix ld manual. + AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], +-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_LINK_IFELSE(AC_LANG_PROGRAM,[ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++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 "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi],[]) ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi],[]) + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + ])# _LT_AC_SYS_LIBPATH_AIX + +@@ -1008,13 +1018,17 @@ + rm -rf conftest* + ;; + +-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++s390*-*linux*|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" + ;; +@@ -1031,6 +1045,9 @@ + ;; + *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" + ;; +@@ -1102,7 +1119,7 @@ + AC_CACHE_CHECK([$1], [$2], + [$2=no + ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ 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. +@@ -1143,11 +1160,12 @@ + # ------------------------------------------------------------ + # Check whether the given compiler option works + AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], +-[AC_CACHE_CHECK([$1], [$2], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_CACHE_CHECK([$1], [$2], + [$2=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $3" +- printf "$lt_simple_link_test_code" > conftest.$ac_ext ++ 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 +@@ -1261,24 +1279,27 @@ + fi + ;; + *) +- # 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. +- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} +- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ ++ 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 ++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + = "XX$teststring") >/dev/null 2>&1 && +- new_result=`expr "X$teststring" : ".*" 2>&1` && +- lt_cv_sys_max_cmd_len=$new_result && +- test $i != 17 # 1/2 MB should be enough +- do +- i=`expr $i + 1` +- teststring=$teststring$teststring +- done +- 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` ++ new_result=`expr "X$teststring" : ".*" 2>&1` && ++ lt_cv_sys_max_cmd_len=$new_result && ++ test $i != 17 # 1/2 MB should be enough ++ do ++ i=`expr $i + 1` ++ teststring=$teststring$teststring ++ done ++ 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 + ]) +@@ -1505,7 +1526,8 @@ + # --------------------------------- + # Check to see if options -c and -o are simultaneously supported by compiler + AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], +-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl + AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], + [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], + [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no +@@ -1513,7 +1535,7 @@ + mkdir conftest + cd conftest + mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ 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 +@@ -1653,6 +1675,7 @@ + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" ++ old_striplib="$STRIP -S" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +@@ -1670,7 +1693,8 @@ + # ----------------------------- + # PORTME Fill in your ld.so characteristics + AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], +-[AC_MSG_CHECKING([dynamic linker characteristics]) ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_MSG_CHECKING([dynamic linker characteristics]) + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -1684,20 +1708,58 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" ++m4_if($1,[],[ + if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then ++ case $host_os in ++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; ++ *) lt_awk_arg="/^libraries:/" ;; ++ esac ++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then + # 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. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ lt_search_path_spec=`echo "$lt_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"` ++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi ++ # 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; } ++}'` ++ sys_lib_search_path_spec=`echo $lt_search_path_spec` + else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +-fi ++fi]) + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -1854,12 +1916,8 @@ + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi ++ 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' + ;; + +@@ -1913,7 +1971,7 @@ + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; +- freebsd*) # from 4.6 on ++ *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +@@ -1976,7 +2034,7 @@ + postinstall_cmds='chmod 555 $lib' + ;; + +-interix3*) ++interix[[3-9]]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -2047,7 +2105,7 @@ + + # 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)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + +@@ -2153,6 +2211,10 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + ++rdos*) ++ dynamic_linker=no ++ ;; ++ + solaris*) + version_type=linux + need_lib_prefix=no +@@ -2258,7 +2320,8 @@ + # _LT_AC_TAGCONFIG + # ---------------- + AC_DEFUN([_LT_AC_TAGCONFIG], +-[AC_ARG_WITH([tags], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_ARG_WITH([tags], + [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], + [include additional configurations @<:@automatic@:>@])], + [tagnames="$withval"]) +@@ -2519,7 +2582,7 @@ + + # AC_PATH_TOOL_PREFIX + # ------------------- +-# find a file program which can recognise shared library ++# find a file program which can recognize shared library + AC_DEFUN([AC_PATH_TOOL_PREFIX], + [AC_REQUIRE([AC_PROG_EGREP])dnl + AC_MSG_CHECKING([for $1]) +@@ -2582,7 +2645,7 @@ + + # AC_PATH_MAGIC + # ------------- +-# find a file program which can recognise a shared library ++# find a file program which can recognize a shared library + AC_DEFUN([AC_PATH_MAGIC], + [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) + if test -z "$lt_cv_path_MAGIC_CMD"; then +@@ -2729,7 +2792,7 @@ + # how to check for library dependencies + # -- PORTME fill in with the dynamic library characteristics + AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], +-[AC_CACHE_CHECK([how to recognise dependent libraries], ++[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= +@@ -2768,9 +2831,15 @@ + + 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'. +- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' +- lt_cv_file_magic_cmd='$OBJDUMP -f' ++ # func_win32_libid shell function, so use a weaker test based on 'objdump', ++ # unless we find 'file', for example because we are cross-compiling. ++ if ( 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 ++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ lt_cv_file_magic_cmd='$OBJDUMP -f' ++ fi + ;; + + darwin* | rhapsody*) +@@ -2815,7 +2884,7 @@ + esac + ;; + +-interix3*) ++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)$' + ;; +@@ -2865,6 +2934,10 @@ + lt_cv_deplibs_check_method=pass_all + ;; + ++rdos*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ + solaris*) + lt_cv_deplibs_check_method=pass_all + ;; +@@ -2917,7 +2990,7 @@ + lt_cv_path_NM="$NM" + else + lt_nm_to_check="${ac_tool_prefix}nm" +- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then ++ 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 +@@ -3133,10 +3206,10 @@ + _LT_AC_TAGVAR(objext, $1)=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code="int some_variable = 0;\n" ++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);}\n' ++lt_simple_link_test_code='int main(){return(0);}' + + _LT_AC_SYS_COMPILER + +@@ -3238,10 +3311,10 @@ + _LT_AC_TAGVAR(objext, $1)=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code="int some_variable = 0;\n" ++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); }\n' ++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_AC_SYS_COMPILER +@@ -3387,7 +3460,7 @@ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ : + else + # We have old collect2 + _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +@@ -3546,10 +3619,10 @@ + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) +@@ -3632,9 +3705,7 @@ + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' +- ;; ++ hppa*64*|ia64*) ;; + *) + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; +@@ -3702,7 +3773,7 @@ + ;; + esac + ;; +- interix3*) ++ interix[[3-9]]*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +@@ -3822,6 +3893,29 @@ + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $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; echo $list' + ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ ++ # Not sure whether something based on ++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 ++ # would be better. ++ output_verbose_link_cmd='echo' ++ ++ # 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_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++ ;; ++ esac ++ ;; + esac + ;; + lynxos*) +@@ -3860,16 +3954,20 @@ + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + openbsd*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- _LT_AC_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_AC_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_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ if test -f /usr/libexec/ld.so; then ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ _LT_AC_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_AC_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_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ fi ++ output_verbose_link_cmd='echo' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi +- output_verbose_link_cmd='echo' + ;; + osf3*) + case $cc_basename in +@@ -4031,15 +4129,10 @@ + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) +- # The C++ compiler is used as linker so we must use $wl +- # flag to pass the commands to the underlying system +- # linker. We must also pass each convience library through +- # to the system linker between allextract/defaultextract. +- # The C++ compiler will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl. ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + ;; + esac + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +@@ -4086,6 +4179,12 @@ + fi + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ *) ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ ;; ++ esac + fi + ;; + esac +@@ -4329,7 +4428,7 @@ + # PORTME: override above test on systems where it is broken + ifelse([$1],[CXX], + [case $host_os in +-interix3*) ++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_AC_TAGVAR(predep_objects,$1)= +@@ -4337,13 +4436,46 @@ + _LT_AC_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_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' ++ fi ++ ;; ++ esac ++ ;; ++ + solaris*) + case $cc_basename in + CC*) ++ # 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. +- _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun' ++ if test "$solaris_use_stlport4" != yes; then ++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' ++ fi + ;; + esac + ;; +@@ -4392,10 +4524,17 @@ + _LT_AC_TAGVAR(objext, $1)=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code=" subroutine t\n return\n end\n" ++lt_simple_compile_test_code="\ ++ subroutine t ++ return ++ end ++" + + # Code to be used in simple link tests +-lt_simple_link_test_code=" program t\n end\n" ++lt_simple_link_test_code="\ ++ program t ++ end ++" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_AC_SYS_COMPILER +@@ -4474,10 +4613,10 @@ + _LT_AC_TAGVAR(objext, $1)=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code="class foo {}\n" ++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) {}; }\n' ++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_AC_SYS_COMPILER +@@ -4530,7 +4669,7 @@ + _LT_AC_TAGVAR(objext, $1)=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' ++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" +@@ -4619,6 +4758,7 @@ + _LT_AC_TAGVAR(module_cmds, $1) \ + _LT_AC_TAGVAR(module_expsym_cmds, $1) \ + _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ ++ _LT_AC_TAGVAR(fix_srcfile_path, $1) \ + _LT_AC_TAGVAR(exclude_expsyms, $1) \ + _LT_AC_TAGVAR(include_expsyms, $1); do + +@@ -4665,7 +4805,7 @@ + # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) + # NOTE: Changes made to this file will be lost: look at ltmain.sh. + # +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + # Free Software Foundation, Inc. + # + # This file is part of GNU Libtool: +@@ -4990,7 +5130,7 @@ + sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + + # Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" ++fix_srcfile_path=$lt_fix_srcfile_path + + # Set to yes if exported symbols are required. + always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) +@@ -5073,6 +5213,7 @@ + # --------------------------------- + AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], + [AC_REQUIRE([AC_CANONICAL_HOST]) ++AC_REQUIRE([LT_AC_PROG_SED]) + AC_REQUIRE([AC_PROG_NM]) + AC_REQUIRE([AC_OBJEXT]) + # Check for command to grab the raw symbol name followed by C symbol from nm. +@@ -5299,12 +5440,14 @@ + # like `-m68040'. + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; +- mingw* | os2* | pw32*) ++ mingw* | cygwin* | os2* | pw32*) + # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + ;; + darwin* | rhapsody*) +@@ -5316,7 +5459,7 @@ + # DJGPP does not support shared libraries at all + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + ;; +- interix3*) ++ interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; +@@ -5452,6 +5595,14 @@ + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ ;; ++ esac + ;; + esac + ;; +@@ -5572,13 +5723,15 @@ + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + +- mingw* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + ;; + +@@ -5588,7 +5741,7 @@ + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + +- interix3*) ++ interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; +@@ -5646,7 +5799,7 @@ + esac + ;; + +- mingw* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' +@@ -5698,6 +5851,22 @@ + # All Alpha code is PIC. + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C 5.9 ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ ;; ++ *Sun\ F*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' ++ ;; ++ esac ++ ;; + esac + ;; + +@@ -5707,6 +5876,10 @@ + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + ++ rdos*) ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ + solaris*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +@@ -5801,7 +5974,8 @@ + # ------------------------------------ + # See if the linker supports building shared libraries. + AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], +-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + ifelse([$1],[CXX],[ + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in +@@ -5818,7 +5992,7 @@ + _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + ;; + cygwin* | mingw*) +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + ;; + linux* | k*bsd*-gnu) + _LT_AC_TAGVAR(link_all_deplibs, $1)=no +@@ -5960,7 +6134,7 @@ + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_AC_TAGVAR(always_export_symbols, $1)=no + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- _LT_AC_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' ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +@@ -5978,7 +6152,7 @@ + fi + ;; + +- interix3*) ++ interix[[3-9]]*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +@@ -5993,7 +6167,7 @@ + _LT_AC_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' + ;; + +- linux* | k*bsd*-gnu) ++ gnu* | linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -6011,13 +6185,22 @@ + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) # Sun C 5.9 ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_sharedflag='-G' ;; ++ *Sun\ F*) # Sun Fortran 8.3 ++ tmp_sharedflag='-G' ;; ++ *) ++ tmp_sharedflag='-shared' ;; ++ esac ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + _LT_AC_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 -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + _LT_AC_TAGVAR(link_all_deplibs, $1)=no + else +@@ -6058,7 +6241,7 @@ + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in +- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) ++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +@@ -6177,7 +6360,7 @@ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ : + else + # We have old collect2 + _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +@@ -6270,7 +6453,7 @@ + # The linker will automatically build a .lib file if we build a DLL. + _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; +@@ -6312,10 +6495,10 @@ + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) +@@ -6477,24 +6660,28 @@ + ;; + + openbsd*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ if test -f /usr/libexec/ld.so; then ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ else ++ case $host_os in ++ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ ;; ++ esac ++ fi + else +- case $host_os in +- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- ;; +- esac ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + +@@ -6553,17 +6740,16 @@ + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) +- # The compiler driver will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl, iff we do not link with $LD. +- # Luckily, gcc supports the same syntax we need for Sun Studio. ++ # 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?) +- case $wlarc in +- '') +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; +- *) +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; +- esac ;; ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ else ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ++ fi ++ ;; + esac + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; +@@ -6620,7 +6806,7 @@ + fi + ;; + +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +@@ -6695,7 +6881,7 @@ + # to ld, don't add -lc before -lgcc. + AC_MSG_CHECKING([whether -lc should be explicitly linked in]) + $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest +@@ -6798,6 +6984,30 @@ + [AC_CHECK_TOOL(RC, windres, no) + ]) + ++ ++# Cheap backport of AS_EXECUTABLE_P and required macros ++# from Autoconf 2.59; we should not use $as_executable_p directly. ++ ++# _AS_TEST_PREPARE ++# ---------------- ++m4_ifndef([_AS_TEST_PREPARE], ++[m4_defun([_AS_TEST_PREPARE], ++[if test -x / >/dev/null 2>&1; then ++ as_executable_p='test -x' ++else ++ as_executable_p='test -f' ++fi ++])])# _AS_TEST_PREPARE ++ ++# AS_EXECUTABLE_P ++# --------------- ++# Check whether a file is executable. ++m4_ifndef([AS_EXECUTABLE_P], ++[m4_defun([AS_EXECUTABLE_P], ++[AS_REQUIRE([_AS_TEST_PREPARE])dnl ++$as_executable_p $1[]dnl ++])])# AS_EXECUTABLE_P ++ + # 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 # +@@ -6818,12 +7028,13 @@ + 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 ++ 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 +@@ -6856,6 +7067,7 @@ + done + ]) + SED=$lt_cv_path_SED ++AC_SUBST([SED]) + AC_MSG_RESULT([$SED]) + ]) + +@@ -7007,7 +7219,7 @@ + + _PKG_TEXT + +-To get pkg-config, see .])], ++To get pkg-config, see .])], + [$4]) + else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS +diff -Naur seahorse-2.20.1.old/agent/Makefile.in seahorse-2.20.1/agent/Makefile.in +--- seahorse-2.20.1.old/agent/Makefile.in 2007-10-15 18:16:05.000000000 +0200 ++++ seahorse-2.20.1/agent/Makefile.in 2007-10-16 13:23:04.000000000 +0200 +@@ -170,14 +170,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -189,7 +187,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -239,15 +236,13 @@ + RANLIB = @RANLIB@ + SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ + SEAHORSE_LIBS = @SEAHORSE_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHARING_CFLAGS = @SHARING_CFLAGS@ + SHARING_LIBS = @SHARING_LIBS@ + SHELL = @SHELL@ + SOUP_CFLAGS = @SOUP_CFLAGS@ + SOUP_LIBS = @SOUP_LIBS@ +-SSH_ADD_PATH = @SSH_ADD_PATH@ +-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ +-SSH_PATH = @SSH_PATH@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +diff -Naur seahorse-2.20.1.old/config.guess seahorse-2.20.1/config.guess +diff -Naur seahorse-2.20.1.old/config.sub seahorse-2.20.1/config.sub +diff -Naur seahorse-2.20.1.old/configure seahorse-2.20.1/configure +--- seahorse-2.20.1.old/configure 2007-10-15 18:16:03.000000000 +0200 ++++ seahorse-2.20.1/configure 2007-10-16 13:23:02.000000000 +0200 +@@ -847,14 +847,11 @@ + INTLTOOL_SCHEMAS_RULE + INTLTOOL_THEME_RULE + INTLTOOL_SERVICE_RULE ++INTLTOOL_POLICY_RULE + INTLTOOL_EXTRACT + INTLTOOL_MERGE + INTLTOOL_UPDATE + INTLTOOL_PERL +-INTLTOOL_ICONV +-INTLTOOL_MSGFMT +-INTLTOOL_MSGMERGE +-INTLTOOL_XGETTEXT + ALL_LINGUAS + CC + CFLAGS +@@ -881,6 +878,7 @@ + host_cpu + host_vendor + host_os ++SED + GREP + EGREP + LN_S +@@ -996,9 +994,6 @@ + WITH_APPLET_FALSE + LIBNOTIFY_CFLAGS + LIBNOTIFY_LIBS +-SSH_KEYGEN_PATH +-SSH_ADD_PATH +-SSH_PATH + WITH_SSH_TRUE + WITH_SSH_FALSE + LIBEBOOK_CFLAGS +@@ -3847,6 +3842,8 @@ + 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 $< $@' ++ + + + +@@ -3938,171 +3935,6 @@ + fi + fi + +-# Extract the first word of "iconv", so it can be a program name with args. +-set dummy iconv; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $INTLTOOL_ICONV in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_INTLTOOL_ICONV="$INTLTOOL_ICONV" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv" +- ;; +-esac +-fi +-INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV +-if test -n "$INTLTOOL_ICONV"; then +- { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5 +-echo "${ECHO_T}$INTLTOOL_ICONV" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +-# Extract the first word of "msgfmt", so it can be a program name with args. +-set dummy msgfmt; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $INTLTOOL_MSGFMT in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_INTLTOOL_MSGFMT="$INTLTOOL_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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt" +- ;; +-esac +-fi +-INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT +-if test -n "$INTLTOOL_MSGFMT"; then +- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5 +-echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +-# Extract the first word of "msgmerge", so it can be a program name with args. +-set dummy msgmerge; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $INTLTOOL_MSGMERGE in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_INTLTOOL_MSGMERGE="$INTLTOOL_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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge" +- ;; +-esac +-fi +-INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE +-if test -n "$INTLTOOL_MSGMERGE"; then +- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5 +-echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +-# Extract the first word of "xgettext", so it can be a program name with args. +-set dummy xgettext; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $INTLTOOL_XGETTEXT in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext" +- ;; +-esac +-fi +-INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT +-if test -n "$INTLTOOL_XGETTEXT"; then +- { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5 +-echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +- + # Substitute ALL_LINGUAS so we can use it in po/Makefile + + +@@ -4120,7 +3952,7 @@ + main () + { + extern int _nl_msg_cat_cntr; +- return _nl_msg_cat_cntr ++ return _nl_msg_cat_cntr + ; + return 0; + } +@@ -4425,12 +4257,13 @@ + 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 ++ if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$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 +@@ -4465,6 +4298,7 @@ + fi + + SED=$lt_cv_path_SED ++ + { echo "$as_me:$LINENO: result: $SED" >&5 + echo "${ECHO_T}$SED" >&6; } + +@@ -4826,8 +4660,8 @@ + echo "${ECHO_T}no, using $LN_S" >&6; } + fi + +-{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 +-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 ++echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } + if test "${lt_cv_deplibs_check_method+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -4868,9 +4702,15 @@ + + 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'. +- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' +- lt_cv_file_magic_cmd='$OBJDUMP -f' ++ # func_win32_libid shell function, so use a weaker test based on 'objdump', ++ # unless we find 'file', for example because we are cross-compiling. ++ if ( 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 ++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ lt_cv_file_magic_cmd='$OBJDUMP -f' ++ fi + ;; + + darwin* | rhapsody*) +@@ -4915,7 +4755,7 @@ + esac + ;; + +-interix3*) ++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)$' + ;; +@@ -4965,6 +4805,10 @@ + lt_cv_deplibs_check_method=pass_all + ;; + ++rdos*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ + solaris*) + lt_cv_deplibs_check_method=pass_all + ;; +@@ -5051,7 +4895,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 5054 "configure"' > conftest.$ac_ext ++ echo '#line 4898 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -5086,7 +4930,8 @@ + rm -rf conftest* + ;; + +-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++s390*-*linux*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -5097,6 +4942,9 @@ + 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" + ;; +@@ -5113,6 +4961,9 @@ + ;; + *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" + ;; +@@ -6900,24 +6751,27 @@ + fi + ;; + *) +- # 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. +- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} +- while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ ++ 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 ++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ + = "XX$teststring") >/dev/null 2>&1 && +- new_result=`expr "X$teststring" : ".*" 2>&1` && +- lt_cv_sys_max_cmd_len=$new_result && +- test $i != 17 # 1/2 MB should be enough +- do +- i=`expr $i + 1` +- teststring=$teststring$teststring +- done +- 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` ++ new_result=`expr "X$teststring" : ".*" 2>&1` && ++ lt_cv_sys_max_cmd_len=$new_result && ++ test $i != 17 # 1/2 MB should be enough ++ do ++ i=`expr $i + 1` ++ teststring=$teststring$teststring ++ done ++ 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 + +@@ -6934,6 +6788,7 @@ + + + ++ + # Check for command to grab the raw symbol name followed by C symbol from nm. + { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 + echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } +@@ -7522,7 +7377,7 @@ + test -z "$ac_objext" && ac_objext=o + + # Determine commands to create old-style static archives. +-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' + old_postinstall_cmds='chmod 644 $oldlib' + old_postuninstall_cmds= + +@@ -7722,10 +7577,10 @@ + objext=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code="int some_variable = 0;\n" ++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);}\n' ++lt_simple_link_test_code='int main(){return(0);}' + + + # If no C compiler was specified, use CC. +@@ -7740,13 +7595,13 @@ + + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_compile_test_code" >conftest.$ac_ext ++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 +-printf "$lt_simple_link_test_code" >conftest.$ac_ext ++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 conftest* +@@ -7766,7 +7621,7 @@ + else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ 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. +@@ -7777,11 +7632,11 @@ + -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:7780: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7635: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7784: \$? = $ac_status" >&5 ++ echo "$as_me:7639: \$? = $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. +@@ -7832,13 +7687,15 @@ + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + +- mingw* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; + +@@ -7848,7 +7705,7 @@ + lt_prog_compiler_pic='-fno-common' + ;; + +- interix3*) ++ interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; +@@ -7906,7 +7763,7 @@ + esac + ;; + +- mingw* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' +@@ -7958,6 +7815,22 @@ + # All Alpha code is PIC. + lt_prog_compiler_static='-non_shared' + ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C 5.9 ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ lt_prog_compiler_wl='-Wl,' ++ ;; ++ *Sun\ F*) ++ # 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='' ++ ;; ++ esac ++ ;; + esac + ;; + +@@ -7967,6 +7840,10 @@ + lt_prog_compiler_static='-non_shared' + ;; + ++ rdos*) ++ lt_prog_compiler_static='-non_shared' ++ ;; ++ + solaris*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' +@@ -8034,7 +7911,7 @@ + else + lt_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ 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. +@@ -8045,11 +7922,11 @@ + -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:8048: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7925: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8052: \$? = $ac_status" >&5 ++ echo "$as_me:7929: \$? = $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. +@@ -8098,7 +7975,7 @@ + lt_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" +- printf "$lt_simple_link_test_code" > conftest.$ac_ext ++ 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 +@@ -8138,7 +8015,7 @@ + mkdir conftest + cd conftest + mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ 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 +@@ -8149,11 +8026,11 @@ + -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:8152: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8029: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8156: \$? = $ac_status" >&5 ++ echo "$as_me:8033: \$? = $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 +@@ -8345,7 +8222,7 @@ + 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/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + + 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' +@@ -8363,7 +8240,7 @@ + fi + ;; + +- interix3*) ++ interix[3-9]*) + hardcode_direct=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' +@@ -8378,7 +8255,7 @@ + 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' + ;; + +- linux* | k*bsd*-gnu) ++ gnu* | linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -8396,13 +8273,22 @@ + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac +- archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ 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; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_sharedflag='-G' ;; ++ *Sun\ F*) # Sun Fortran 8.3 ++ tmp_sharedflag='-G' ;; ++ *) ++ tmp_sharedflag='-shared' ;; ++ esac ++ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; 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 -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + link_all_deplibs=no + else +@@ -8562,7 +8448,7 @@ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 +- hardcode_direct=yes ++ : + else + # We have old collect2 + hardcode_direct=unsupported +@@ -8636,11 +8522,18 @@ + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++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 "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -8695,11 +8588,18 @@ + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++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 "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -8753,7 +8653,7 @@ + # 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' ++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes=yes + ;; +@@ -8795,10 +8695,10 @@ + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' +- archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' + module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) +@@ -8960,24 +8860,28 @@ + ;; + + openbsd*) +- hardcode_direct=yes +- hardcode_shlibpath_var=no +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- 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' ++ if test -f /usr/libexec/ld.so; then ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ 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 +- 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 ++ ld_shlibs=no + fi + ;; + +@@ -9036,17 +8940,16 @@ + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) +- # The compiler driver will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl, iff we do not link with $LD. +- # Luckily, gcc supports the same syntax we need for Sun Studio. ++ # 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?) +- case $wlarc in +- '') +- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; +- *) +- whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; +- esac ;; ++ 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 + ;; +@@ -9103,7 +9006,7 @@ + fi + ;; + +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) ++ 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 +@@ -9180,7 +9083,7 @@ + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 +@@ -9238,17 +9141,55 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" ++ + if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then ++ case $host_os in ++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; ++ *) lt_awk_arg="/^libraries:/" ;; ++ esac ++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then + # 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. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ lt_search_path_spec=`echo "$lt_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"` ++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi ++ # 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; } ++}'` ++ sys_lib_search_path_spec=`echo $lt_search_path_spec` + else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + fi +@@ -9408,12 +9349,8 @@ + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi ++ ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +@@ -9467,7 +9404,7 @@ + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; +- freebsd*) # from 4.6 on ++ *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +@@ -9530,7 +9467,7 @@ + postinstall_cmds='chmod 555 $lib' + ;; + +-interix3*) ++interix[3-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -9601,7 +9538,7 @@ + + # 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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + +@@ -9707,6 +9644,10 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + ++rdos*) ++ dynamic_linker=no ++ ;; ++ + solaris*) + version_type=linux + need_lib_prefix=no +@@ -9860,6 +9801,7 @@ + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" ++ old_striplib="$STRIP -S" + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } + else +@@ -10446,7 +10388,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext ++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 +-printf "$lt_simple_link_test_code" >conftest.$ac_ext ++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 conftest* +@@ -11565,7 +11508,7 @@ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 +- hardcode_direct_CXX=yes ++ : + else + # We have old collect2 + hardcode_direct_CXX=unsupported +@@ -11639,11 +11582,18 @@ + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++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 "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -11699,11 +11649,18 @@ + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++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 "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -11822,10 +11779,10 @@ + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' +- archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' + module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) +@@ -11908,9 +11865,7 @@ + hardcode_libdir_separator_CXX=: + + case $host_cpu in +- hppa*64*|ia64*) +- hardcode_libdir_flag_spec_ld_CXX='+b $libdir' +- ;; ++ hppa*64*|ia64*) ;; + *) + export_dynamic_flag_spec_CXX='${wl}-E' + ;; +@@ -11978,7 +11933,7 @@ + ;; + esac + ;; +- interix3*) ++ interix[3-9]*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' +@@ -12098,6 +12053,29 @@ + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $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; echo $list' + ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ no_undefined_flag_CXX=' -zdefs' ++ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' ++ hardcode_libdir_flag_spec_CXX='-R$libdir' ++ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ ++ # Not sure whether something based on ++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 ++ # would be better. ++ output_verbose_link_cmd='echo' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -xar", where "CC" is the Sun C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' ++ ;; ++ esac ++ ;; + esac + ;; + lynxos*) +@@ -12136,16 +12114,20 @@ + ld_shlibs_CXX=no + ;; + openbsd*) +- hardcode_direct_CXX=yes +- hardcode_shlibpath_var_CXX=no +- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' +- export_dynamic_flag_spec_CXX='${wl}-E' +- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ if test -f /usr/libexec/ld.so; then ++ hardcode_direct_CXX=yes ++ hardcode_shlibpath_var_CXX=no ++ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' ++ export_dynamic_flag_spec_CXX='${wl}-E' ++ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ fi ++ output_verbose_link_cmd='echo' ++ else ++ ld_shlibs_CXX=no + fi +- output_verbose_link_cmd='echo' + ;; + osf3*) + case $cc_basename in +@@ -12307,15 +12289,10 @@ + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) +- # The C++ compiler is used as linker so we must use $wl +- # flag to pass the commands to the underlying system +- # linker. We must also pass each convience library through +- # to the system linker between allextract/defaultextract. +- # The C++ compiler will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl. ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) +- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ++ whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' + ;; + esac + link_all_deplibs_CXX=yes +@@ -12362,6 +12339,12 @@ + fi + + hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' ++ case $host_os in ++ solaris2.[0-5] | solaris2.[0-5].*) ;; ++ *) ++ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ ;; ++ esac + fi + ;; + esac +@@ -12553,7 +12536,7 @@ + + # PORTME: override above test on systems where it is broken + case $host_os in +-interix3*) ++interix[3-9]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + predep_objects_CXX= +@@ -12561,13 +12544,46 @@ + postdeps_CXX= + ;; + ++linux*) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ # ++ # The more standards-conforming stlport4 library is ++ # incompatible with the Cstd library. Avoid specifying ++ # it if it's in CXXFLAGS. Ignore libCrun as ++ # -library=stlport4 depends on it. ++ case " $CXX $CXXFLAGS " in ++ *" -library=stlport4 "*) ++ solaris_use_stlport4=yes ++ ;; ++ esac ++ if test "$solaris_use_stlport4" != yes; then ++ postdeps_CXX='-library=Cstd -library=Crun' ++ fi ++ ;; ++ esac ++ ;; ++ + solaris*) + case $cc_basename in + CC*) ++ # 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. +- postdeps_CXX='-lCstd -lCrun' ++ if test "$solaris_use_stlport4" != yes; then ++ postdeps_CXX='-library=Cstd -library=Crun' ++ fi + ;; + esac + ;; +@@ -12604,12 +12620,14 @@ + # like `-m68040'. + lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' + ;; +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; +- mingw* | os2* | pw32*) ++ mingw* | cygwin* | os2* | pw32*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + ;; + darwin* | rhapsody*) +@@ -12621,7 +12639,7 @@ + # DJGPP does not support shared libraries at all + lt_prog_compiler_pic_CXX= + ;; +- interix3*) ++ interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; +@@ -12757,6 +12775,14 @@ + lt_prog_compiler_static_CXX='-non_shared' + ;; + *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ lt_prog_compiler_pic_CXX='-KPIC' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ lt_prog_compiler_wl_CXX='-Qoption ld ' ++ ;; ++ esac + ;; + esac + ;; +@@ -12871,7 +12897,7 @@ + else + lt_prog_compiler_pic_works_CXX=no + ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. +@@ -12882,11 +12908,11 @@ + -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:12885: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12911: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:12889: \$? = $ac_status" >&5 ++ echo "$as_me:12915: \$? = $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. +@@ -12935,7 +12961,7 @@ + lt_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" +- printf "$lt_simple_link_test_code" > conftest.$ac_ext ++ 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 +@@ -12975,7 +13001,7 @@ + mkdir conftest + cd conftest + mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ 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 +@@ -12986,11 +13012,11 @@ + -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:12989: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13015: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:12993: \$? = $ac_status" >&5 ++ echo "$as_me:13019: \$? = $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 +@@ -13056,7 +13082,7 @@ + export_symbols_cmds_CXX="$ltdll_cmds" + ;; + cygwin* | mingw*) +- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' ++ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + ;; + linux* | k*bsd*-gnu) + link_all_deplibs_CXX=no +@@ -13090,7 +13116,7 @@ + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 +@@ -13148,20 +13174,7 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" +-if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then +- # 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. +- 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 +-else +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +-fi ++ + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -13318,12 +13331,7 @@ + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi ++ + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +@@ -13377,7 +13385,7 @@ + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; +- freebsd*) # from 4.6 on ++ *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +@@ -13440,7 +13448,7 @@ + postinstall_cmds='chmod 555 $lib' + ;; + +-interix3*) ++interix[3-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -13511,7 +13519,7 @@ + + # 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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + +@@ -13617,6 +13625,10 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + ++rdos*) ++ dynamic_linker=no ++ ;; ++ + solaris*) + version_type=linux + need_lib_prefix=no +@@ -13811,6 +13823,7 @@ + module_cmds_CXX \ + module_expsym_cmds_CXX \ + lt_cv_prog_compiler_c_o_CXX \ ++ fix_srcfile_path_CXX \ + exclude_expsyms_CXX \ + include_expsyms_CXX; do + +@@ -14131,7 +14144,7 @@ + sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + + # Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$fix_srcfile_path_CXX" ++fix_srcfile_path=$lt_fix_srcfile_path + + # Set to yes if exported symbols are required. + always_export_symbols=$always_export_symbols_CXX +@@ -14222,10 +14235,17 @@ + objext_F77=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code=" subroutine t\n return\n end\n" ++lt_simple_compile_test_code="\ ++ subroutine t ++ return ++ end ++" + + # Code to be used in simple link tests +-lt_simple_link_test_code=" program t\n end\n" ++lt_simple_link_test_code="\ ++ program t ++ end ++" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + +@@ -14241,13 +14261,13 @@ + + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_compile_test_code" >conftest.$ac_ext ++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 +-printf "$lt_simple_link_test_code" >conftest.$ac_ext ++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 conftest* +@@ -14334,13 +14354,15 @@ + lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' + ;; + +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + +- mingw* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries + lt_prog_compiler_pic_F77='-DDLL_EXPORT' + ;; + +@@ -14350,7 +14372,7 @@ + lt_prog_compiler_pic_F77='-fno-common' + ;; + +- interix3*) ++ interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; +@@ -14408,7 +14430,7 @@ + esac + ;; + +- mingw* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_F77='-DDLL_EXPORT' +@@ -14460,6 +14482,22 @@ + # All Alpha code is PIC. + lt_prog_compiler_static_F77='-non_shared' + ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C 5.9 ++ lt_prog_compiler_pic_F77='-KPIC' ++ lt_prog_compiler_static_F77='-Bstatic' ++ lt_prog_compiler_wl_F77='-Wl,' ++ ;; ++ *Sun\ F*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ lt_prog_compiler_pic_F77='-KPIC' ++ lt_prog_compiler_static_F77='-Bstatic' ++ lt_prog_compiler_wl_F77='' ++ ;; ++ esac ++ ;; + esac + ;; + +@@ -14469,6 +14507,10 @@ + lt_prog_compiler_static_F77='-non_shared' + ;; + ++ rdos*) ++ lt_prog_compiler_static_F77='-non_shared' ++ ;; ++ + solaris*) + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' +@@ -14536,7 +14578,7 @@ + else + lt_prog_compiler_pic_works_F77=no + ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_F77" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. +@@ -14547,11 +14589,11 @@ + -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:14550: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14592: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14554: \$? = $ac_status" >&5 ++ echo "$as_me:14596: \$? = $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. +@@ -14600,7 +14642,7 @@ + lt_prog_compiler_static_works_F77=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" +- printf "$lt_simple_link_test_code" > conftest.$ac_ext ++ 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 +@@ -14640,7 +14682,7 @@ + mkdir conftest + cd conftest + mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ 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 +@@ -14651,11 +14693,11 @@ + -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:14654: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14696: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14658: \$? = $ac_status" >&5 ++ echo "$as_me:14700: \$? = $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 +@@ -14847,7 +14889,7 @@ + allow_undefined_flag_F77=unsupported + always_export_symbols_F77=no + enable_shared_with_static_runtimes_F77=yes +- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' ++ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +@@ -14865,7 +14907,7 @@ + fi + ;; + +- interix3*) ++ interix[3-9]*) + hardcode_direct_F77=no + hardcode_shlibpath_var_F77=no + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' +@@ -14880,7 +14922,7 @@ + archive_expsym_cmds_F77='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' + ;; + +- linux* | k*bsd*-gnu) ++ gnu* | linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -14898,13 +14940,22 @@ + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac +- archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) # Sun C 5.9 ++ whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_sharedflag='-G' ;; ++ *Sun\ F*) # Sun Fortran 8.3 ++ tmp_sharedflag='-G' ;; ++ *) ++ tmp_sharedflag='-shared' ;; ++ esac ++ archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + link_all_deplibs_F77=no + else +@@ -15064,7 +15115,7 @@ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 +- hardcode_direct_F77=yes ++ : + else + # We have old collect2 + hardcode_direct_F77=unsupported +@@ -15128,11 +15179,18 @@ + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++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 "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -15177,11 +15235,18 @@ + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++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 "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -15235,7 +15300,7 @@ + # The linker will automatically build a .lib file if we build a DLL. + old_archive_From_new_cmds_F77='true' + # FIXME: Should let the user specify the lib program. +- old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' ++ old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path_F77='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes_F77=yes + ;; +@@ -15277,10 +15342,10 @@ + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' +- archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' + module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) +@@ -15442,24 +15507,28 @@ + ;; + + openbsd*) +- hardcode_direct_F77=yes +- hardcode_shlibpath_var_F77=no +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' +- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' +- export_dynamic_flag_spec_F77='${wl}-E' ++ if test -f /usr/libexec/ld.so; then ++ hardcode_direct_F77=yes ++ hardcode_shlibpath_var_F77=no ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec_F77='${wl}-E' ++ else ++ case $host_os in ++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) ++ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec_F77='-R$libdir' ++ ;; ++ *) ++ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' ++ ;; ++ esac ++ fi + else +- case $host_os in +- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) +- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec_F77='-R$libdir' +- ;; +- *) +- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' +- ;; +- esac ++ ld_shlibs_F77=no + fi + ;; + +@@ -15518,17 +15587,16 @@ + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) +- # The compiler driver will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl, iff we do not link with $LD. +- # Luckily, gcc supports the same syntax we need for Sun Studio. ++ # 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?) +- case $wlarc in +- '') +- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; +- *) +- whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; +- esac ;; ++ if test "$GCC" = yes; then ++ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ else ++ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ++ fi ++ ;; + esac + link_all_deplibs_F77=yes + ;; +@@ -15585,7 +15653,7 @@ + fi + ;; + +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag_F77='${wl}-z,text' + archive_cmds_need_lc_F77=no + hardcode_shlibpath_var_F77=no +@@ -15662,7 +15730,7 @@ + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 +@@ -15720,20 +15788,7 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" +-if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then +- # 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. +- 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 +-else +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +-fi ++ + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -15890,12 +15945,7 @@ + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi ++ + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +@@ -15949,7 +15999,7 @@ + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; +- freebsd*) # from 4.6 on ++ *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +@@ -16012,7 +16062,7 @@ + postinstall_cmds='chmod 555 $lib' + ;; + +-interix3*) ++interix[3-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -16083,7 +16133,7 @@ + + # 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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + +@@ -16189,6 +16239,10 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + ++rdos*) ++ dynamic_linker=no ++ ;; ++ + solaris*) + version_type=linux + need_lib_prefix=no +@@ -16383,6 +16437,7 @@ + module_cmds_F77 \ + module_expsym_cmds_F77 \ + lt_cv_prog_compiler_c_o_F77 \ ++ fix_srcfile_path_F77 \ + exclude_expsyms_F77 \ + include_expsyms_F77; do + +@@ -16703,7 +16758,7 @@ + sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + + # Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$fix_srcfile_path_F77" ++fix_srcfile_path=$lt_fix_srcfile_path + + # Set to yes if exported symbols are required. + always_export_symbols=$always_export_symbols_F77 +@@ -16761,10 +16816,10 @@ + objext_GCJ=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code="class foo {}\n" ++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) {}; }\n' ++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. + +@@ -16780,13 +16835,13 @@ + + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_compile_test_code" >conftest.$ac_ext ++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 +-printf "$lt_simple_link_test_code" >conftest.$ac_ext ++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 conftest* +@@ -16827,7 +16882,7 @@ + else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ 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. +@@ -16838,11 +16893,11 @@ + -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:16841: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16896: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16845: \$? = $ac_status" >&5 ++ echo "$as_me:16900: \$? = $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. +@@ -16893,13 +16948,15 @@ + lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' + ;; + +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + +- mingw* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries + lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; + +@@ -16909,7 +16966,7 @@ + lt_prog_compiler_pic_GCJ='-fno-common' + ;; + +- interix3*) ++ interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; +@@ -16967,7 +17024,7 @@ + esac + ;; + +- mingw* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' +@@ -17019,6 +17076,22 @@ + # All Alpha code is PIC. + lt_prog_compiler_static_GCJ='-non_shared' + ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C 5.9 ++ lt_prog_compiler_pic_GCJ='-KPIC' ++ lt_prog_compiler_static_GCJ='-Bstatic' ++ lt_prog_compiler_wl_GCJ='-Wl,' ++ ;; ++ *Sun\ F*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ lt_prog_compiler_pic_GCJ='-KPIC' ++ lt_prog_compiler_static_GCJ='-Bstatic' ++ lt_prog_compiler_wl_GCJ='' ++ ;; ++ esac ++ ;; + esac + ;; + +@@ -17028,6 +17101,10 @@ + lt_prog_compiler_static_GCJ='-non_shared' + ;; + ++ rdos*) ++ lt_prog_compiler_static_GCJ='-non_shared' ++ ;; ++ + solaris*) + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' +@@ -17095,7 +17172,7 @@ + else + lt_prog_compiler_pic_works_GCJ=no + ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_GCJ" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. +@@ -17106,11 +17183,11 @@ + -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:17109: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17186: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17113: \$? = $ac_status" >&5 ++ echo "$as_me:17190: \$? = $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. +@@ -17159,7 +17236,7 @@ + lt_prog_compiler_static_works_GCJ=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" +- printf "$lt_simple_link_test_code" > conftest.$ac_ext ++ 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 +@@ -17199,7 +17276,7 @@ + mkdir conftest + cd conftest + mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ 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 +@@ -17210,11 +17287,11 @@ + -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:17213: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17290: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17217: \$? = $ac_status" >&5 ++ echo "$as_me:17294: \$? = $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 +@@ -17406,7 +17483,7 @@ + allow_undefined_flag_GCJ=unsupported + always_export_symbols_GCJ=no + enable_shared_with_static_runtimes_GCJ=yes +- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' ++ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +@@ -17424,7 +17501,7 @@ + fi + ;; + +- interix3*) ++ interix[3-9]*) + hardcode_direct_GCJ=no + hardcode_shlibpath_var_GCJ=no + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' +@@ -17439,7 +17516,7 @@ + archive_expsym_cmds_GCJ='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' + ;; + +- linux* | k*bsd*-gnu) ++ gnu* | linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -17457,13 +17534,22 @@ + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac +- archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) # Sun C 5.9 ++ whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_sharedflag='-G' ;; ++ *Sun\ F*) # Sun Fortran 8.3 ++ tmp_sharedflag='-G' ;; ++ *) ++ tmp_sharedflag='-shared' ;; ++ esac ++ archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + link_all_deplibs_GCJ=no + else +@@ -17623,7 +17709,7 @@ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 +- hardcode_direct_GCJ=yes ++ : + else + # We have old collect2 + hardcode_direct_GCJ=unsupported +@@ -17697,11 +17783,18 @@ + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++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 "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -17756,11 +17849,18 @@ + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++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 "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -17814,7 +17914,7 @@ + # The linker will automatically build a .lib file if we build a DLL. + old_archive_From_new_cmds_GCJ='true' + # FIXME: Should let the user specify the lib program. +- old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' ++ old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes_GCJ=yes + ;; +@@ -17856,10 +17956,10 @@ + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' +- archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' + module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) +@@ -18021,24 +18121,28 @@ + ;; + + openbsd*) +- hardcode_direct_GCJ=yes +- hardcode_shlibpath_var_GCJ=no +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' +- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' +- export_dynamic_flag_spec_GCJ='${wl}-E' ++ if test -f /usr/libexec/ld.so; then ++ hardcode_direct_GCJ=yes ++ hardcode_shlibpath_var_GCJ=no ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec_GCJ='${wl}-E' ++ else ++ case $host_os in ++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) ++ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec_GCJ='-R$libdir' ++ ;; ++ *) ++ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' ++ ;; ++ esac ++ fi + else +- case $host_os in +- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) +- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec_GCJ='-R$libdir' +- ;; +- *) +- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' +- ;; +- esac ++ ld_shlibs_GCJ=no + fi + ;; + +@@ -18097,17 +18201,16 @@ + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) +- # The compiler driver will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl, iff we do not link with $LD. +- # Luckily, gcc supports the same syntax we need for Sun Studio. ++ # 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?) +- case $wlarc in +- '') +- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; +- *) +- whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; +- esac ;; ++ if test "$GCC" = yes; then ++ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ else ++ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ++ fi ++ ;; + esac + link_all_deplibs_GCJ=yes + ;; +@@ -18164,7 +18267,7 @@ + fi + ;; + +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag_GCJ='${wl}-z,text' + archive_cmds_need_lc_GCJ=no + hardcode_shlibpath_var_GCJ=no +@@ -18241,7 +18344,7 @@ + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 +@@ -18299,20 +18402,7 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" +-if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then +- # 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. +- 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 +-else +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +-fi ++ + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -18469,12 +18559,7 @@ + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi ++ + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +@@ -18528,7 +18613,7 @@ + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; +- freebsd*) # from 4.6 on ++ *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +@@ -18591,7 +18676,7 @@ + postinstall_cmds='chmod 555 $lib' + ;; + +-interix3*) ++interix[3-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -18662,7 +18747,7 @@ + + # 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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + +@@ -18768,6 +18853,10 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + ++rdos*) ++ dynamic_linker=no ++ ;; ++ + solaris*) + version_type=linux + need_lib_prefix=no +@@ -18962,6 +19051,7 @@ + module_cmds_GCJ \ + module_expsym_cmds_GCJ \ + lt_cv_prog_compiler_c_o_GCJ \ ++ fix_srcfile_path_GCJ \ + exclude_expsyms_GCJ \ + include_expsyms_GCJ; do + +@@ -19282,7 +19372,7 @@ + sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + + # Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$fix_srcfile_path_GCJ" ++fix_srcfile_path=$lt_fix_srcfile_path + + # Set to yes if exported symbols are required. + always_export_symbols=$always_export_symbols_GCJ +@@ -19339,7 +19429,7 @@ + objext_RC=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' ++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" +@@ -19358,13 +19448,13 @@ + + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_compile_test_code" >conftest.$ac_ext ++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 +-printf "$lt_simple_link_test_code" >conftest.$ac_ext ++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 conftest* +@@ -19442,6 +19532,7 @@ + module_cmds_RC \ + module_expsym_cmds_RC \ + lt_cv_prog_compiler_c_o_RC \ ++ fix_srcfile_path_RC \ + exclude_expsyms_RC \ + include_expsyms_RC; do + +@@ -19762,7 +19853,7 @@ + sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + + # Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$fix_srcfile_path_RC" ++fix_srcfile_path=$lt_fix_srcfile_path + + # Set to yes if exported symbols are required. + always_export_symbols=$always_export_symbols_RC +@@ -21068,10 +21159,11 @@ + return 2; + } + /* Configure is being run as root? */ +- if (geteuid () == 0) { ++ /* breaks with fakeroot */ ++ /* if (geteuid () == 0) { + printf("assuming "); + return 1; +- } ++ } */ + return 0; + } + +@@ -21241,7 +21333,7 @@ + and SEAHORSE_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: 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 +@@ -21251,7 +21343,7 @@ + and SEAHORSE_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -22691,7 +22783,7 @@ + and LIBCRYPTUI_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: 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 +@@ -22701,7 +22793,7 @@ + and LIBCRYPTUI_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -47751,133 +47843,13 @@ + echo "disabling ssh support" + else + +- # Extract the first word of "ssh-keygen", so it can be a program name with args. +-set dummy ssh-keygen; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_SSH_KEYGEN_PATH+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $SSH_KEYGEN_PATH in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_SSH_KEYGEN_PATH="$SSH_KEYGEN_PATH" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_SSH_KEYGEN_PATH="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_SSH_KEYGEN_PATH" && ac_cv_path_SSH_KEYGEN_PATH=""failed"" +- ;; +-esac +-fi +-SSH_KEYGEN_PATH=$ac_cv_path_SSH_KEYGEN_PATH +-if test -n "$SSH_KEYGEN_PATH"; then +- { echo "$as_me:$LINENO: result: $SSH_KEYGEN_PATH" >&5 +-echo "${ECHO_T}$SSH_KEYGEN_PATH" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +- # Extract the first word of "ssh-add", so it can be a program name with args. +-set dummy ssh-add; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_SSH_ADD_PATH+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $SSH_ADD_PATH in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_SSH_ADD_PATH="$SSH_ADD_PATH" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_SSH_ADD_PATH="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_SSH_ADD_PATH" && ac_cv_path_SSH_ADD_PATH=""failed"" +- ;; +-esac +-fi +-SSH_ADD_PATH=$ac_cv_path_SSH_ADD_PATH +-if test -n "$SSH_ADD_PATH"; then +- { echo "$as_me:$LINENO: result: $SSH_ADD_PATH" >&5 +-echo "${ECHO_T}$SSH_ADD_PATH" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +- # Extract the first word of "ssh", so it can be a program name with args. +-set dummy ssh; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_SSH_PATH+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $SSH_PATH in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_SSH_PATH="$SSH_PATH" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_SSH_PATH="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_SSH_PATH" && ac_cv_path_SSH_PATH=""failed"" +- ;; +-esac +-fi +-SSH_PATH=$ac_cv_path_SSH_PATH +-if test -n "$SSH_PATH"; then +- { echo "$as_me:$LINENO: result: $SSH_PATH" >&5 +-echo "${ECHO_T}$SSH_PATH" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +- +- if test $SSH_KEYGEN_PATH != "failed" && +- test $SSH_PATH != "failed" && +- test $SSH_ADD_PATH != "failed"; then ++# AC_PATH_PROG(SSH_KEYGEN_PATH, ssh-keygen, "failed") ++# AC_PATH_PROG(SSH_ADD_PATH, ssh-add, "failed") ++# AC_PATH_PROG(SSH_PATH, ssh, "failed") ++ ++# if test $SSH_KEYGEN_PATH != "failed" && ++# test $SSH_PATH != "failed" && ++# test $SSH_ADD_PATH != "failed"; then + enable_ssh="yes" + + cat >>confdefs.h <<\_ACEOF +@@ -47886,20 +47858,20 @@ + + + cat >>confdefs.h <<_ACEOF +-#define SSH_KEYGEN_PATH "$SSH_KEYGEN_PATH" ++#define SSH_KEYGEN_PATH "/usr/bin/ssh-keygen" + _ACEOF + + + cat >>confdefs.h <<_ACEOF +-#define SSH_PATH "$SSH_PATH" ++#define SSH_PATH "/usr/bin/ssh" + _ACEOF + + + cat >>confdefs.h <<_ACEOF +-#define SSH_ADD_PATH "$SSH_ADD_PATH" ++#define SSH_ADD_PATH "/usr/bin/ssh-add" + _ACEOF + +- fi ++# fi + + fi + +@@ -49297,8 +49269,8 @@ + "Content-Transfer-Encoding: 8bit\n" + + _ACEOF +-if { (echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&5 +- (msgfmt -c -o /dev/null conftest.foo) 2>&5 ++if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 ++ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +@@ -50422,9 +50394,7 @@ + AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" + INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' + prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" +-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}' +-INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}' +-INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}' ++INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' + + + _ACEOF +@@ -50610,14 +50580,11 @@ + INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim + INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim + INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim ++INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim + INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim + INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim + INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim + INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim +-INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim +-INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim +-INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim +-INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim + ALL_LINGUAS!$ALL_LINGUAS$ac_delim + CC!$CC$ac_delim + CFLAGS!$CFLAGS$ac_delim +@@ -50627,6 +50594,9 @@ + EXEEXT!$EXEEXT$ac_delim + OBJEXT!$OBJEXT$ac_delim + DEPDIR!$DEPDIR$ac_delim ++am__include!$am__include$ac_delim ++am__quote!$am__quote$ac_delim ++AMDEP_TRUE!$AMDEP_TRUE$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -50668,9 +50638,6 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +-am__include!$am__include$ac_delim +-am__quote!$am__quote$ac_delim +-AMDEP_TRUE!$AMDEP_TRUE$ac_delim + AMDEP_FALSE!$AMDEP_FALSE$ac_delim + AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim + CCDEPMODE!$CCDEPMODE$ac_delim +@@ -50685,6 +50652,7 @@ + host_cpu!$host_cpu$ac_delim + host_vendor!$host_vendor$ac_delim + host_os!$host_os$ac_delim ++SED!$SED$ac_delim + GREP!$GREP$ac_delim + EGREP!$EGREP$ac_delim + LN_S!$LN_S$ac_delim +@@ -50765,6 +50733,8 @@ + HAVE_MOZILLA_TOOLKIT_FALSE!$HAVE_MOZILLA_TOOLKIT_FALSE$ac_delim + HAVE_GECKO_DEBUG_TRUE!$HAVE_GECKO_DEBUG_TRUE$ac_delim + HAVE_GECKO_DEBUG_FALSE!$HAVE_GECKO_DEBUG_FALSE$ac_delim ++HAVE_GECKO_1_7_TRUE!$HAVE_GECKO_1_7_TRUE$ac_delim ++HAVE_GECKO_1_7_FALSE!$HAVE_GECKO_1_7_FALSE$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -50806,8 +50776,6 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +-HAVE_GECKO_1_7_TRUE!$HAVE_GECKO_1_7_TRUE$ac_delim +-HAVE_GECKO_1_7_FALSE!$HAVE_GECKO_1_7_FALSE$ac_delim + HAVE_GECKO_1_8_TRUE!$HAVE_GECKO_1_8_TRUE$ac_delim + HAVE_GECKO_1_8_FALSE!$HAVE_GECKO_1_8_FALSE$ac_delim + HAVE_GECKO_1_8_1_TRUE!$HAVE_GECKO_1_8_1_TRUE$ac_delim +@@ -50841,9 +50809,6 @@ + WITH_APPLET_FALSE!$WITH_APPLET_FALSE$ac_delim + LIBNOTIFY_CFLAGS!$LIBNOTIFY_CFLAGS$ac_delim + LIBNOTIFY_LIBS!$LIBNOTIFY_LIBS$ac_delim +-SSH_KEYGEN_PATH!$SSH_KEYGEN_PATH$ac_delim +-SSH_ADD_PATH!$SSH_ADD_PATH$ac_delim +-SSH_PATH!$SSH_PATH$ac_delim + WITH_SSH_TRUE!$WITH_SSH_TRUE$ac_delim + WITH_SSH_FALSE!$WITH_SSH_FALSE$ac_delim + LIBEBOOK_CFLAGS!$LIBEBOOK_CFLAGS$ac_delim +@@ -50877,7 +50842,7 @@ + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 69; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +@@ -51448,10 +51413,6 @@ + for file in intltool-extract intltool-merge intltool-update; do + sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ + -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ +- -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \ +- -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \ +- -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \ +- -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \ + -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ + < ${ac_aux_dir}/${file}.in > ${file}.out + if cmp -s ${file} ${file}.out 2>/dev/null; then +diff -Naur seahorse-2.20.1.old/daemon/Makefile.in seahorse-2.20.1/daemon/Makefile.in +--- seahorse-2.20.1.old/daemon/Makefile.in 2007-10-15 18:16:05.000000000 +0200 ++++ seahorse-2.20.1/daemon/Makefile.in 2007-10-16 13:23:04.000000000 +0200 +@@ -170,14 +170,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -189,7 +187,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -239,15 +236,13 @@ + RANLIB = @RANLIB@ + SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ + SEAHORSE_LIBS = @SEAHORSE_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHARING_CFLAGS = @SHARING_CFLAGS@ + SHARING_LIBS = @SHARING_LIBS@ + SHELL = @SHELL@ + SOUP_CFLAGS = @SOUP_CFLAGS@ + SOUP_LIBS = @SOUP_LIBS@ +-SSH_ADD_PATH = @SSH_ADD_PATH@ +-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ +-SSH_PATH = @SSH_PATH@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +diff -Naur seahorse-2.20.1.old/data/Makefile.in seahorse-2.20.1/data/Makefile.in +--- seahorse-2.20.1.old/data/Makefile.in 2007-10-15 18:16:05.000000000 +0200 ++++ seahorse-2.20.1/data/Makefile.in 2007-10-16 13:23:04.000000000 +0200 +@@ -132,14 +132,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -151,7 +149,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -201,15 +198,13 @@ + RANLIB = @RANLIB@ + SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ + SEAHORSE_LIBS = @SEAHORSE_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHARING_CFLAGS = @SHARING_CFLAGS@ + SHARING_LIBS = @SHARING_LIBS@ + SHELL = @SHELL@ + SOUP_CFLAGS = @SOUP_CFLAGS@ + SOUP_LIBS = @SOUP_LIBS@ +-SSH_ADD_PATH = @SSH_ADD_PATH@ +-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ +-SSH_PATH = @SSH_PATH@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +diff -Naur seahorse-2.20.1.old/gnome-doc-utils.make seahorse-2.20.1/gnome-doc-utils.make +--- seahorse-2.20.1.old/gnome-doc-utils.make 2007-10-15 18:15:47.000000000 +0200 ++++ seahorse-2.20.1/gnome-doc-utils.make 2007-10-16 13:22:48.000000000 +0200 +@@ -416,6 +416,11 @@ + @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ ++ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ if ! test -d "$(distdir)/$$docdir"; then \ ++ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ ++ $(mkinstalldirs) "$(distdir)/$$docdir"; \ ++ fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done +@@ -486,6 +491,12 @@ + done + @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ ++ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \ ++ if ! test -d "$$docdir"; then \ ++ echo "$(mkinstalldirs) $$docdir"; \ ++ $(mkinstalldirs) "$$docdir"; \ ++ fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \ + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \ + done +@@ -554,7 +565,7 @@ + + uninstall-doc-omf: + @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ +- if test "x$(_ENABLE_SK)" == "xtrue"; then \ ++ if test "x$(_ENABLE_SK)" = "xtrue"; then \ + echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ + scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ + fi; \ +diff -Naur seahorse-2.20.1.old/help/Makefile.in seahorse-2.20.1/help/Makefile.in +--- seahorse-2.20.1.old/help/Makefile.in 2007-10-15 18:16:05.000000000 +0200 ++++ seahorse-2.20.1/help/Makefile.in 2007-10-16 13:23:04.000000000 +0200 +@@ -147,14 +147,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -166,7 +164,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -216,15 +213,13 @@ + RANLIB = @RANLIB@ + SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ + SEAHORSE_LIBS = @SEAHORSE_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHARING_CFLAGS = @SHARING_CFLAGS@ + SHARING_LIBS = @SHARING_LIBS@ + SHELL = @SHELL@ + SOUP_CFLAGS = @SOUP_CFLAGS@ + SOUP_LIBS = @SOUP_LIBS@ +-SSH_ADD_PATH = @SSH_ADD_PATH@ +-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ +-SSH_PATH = @SSH_PATH@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +@@ -785,6 +780,11 @@ + @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ ++ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ if ! test -d "$(distdir)/$$docdir"; then \ ++ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ ++ $(mkinstalldirs) "$(distdir)/$$docdir"; \ ++ fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done +@@ -853,6 +853,12 @@ + done + @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ ++ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \ ++ if ! test -d "$$docdir"; then \ ++ echo "$(mkinstalldirs) $$docdir"; \ ++ $(mkinstalldirs) "$$docdir"; \ ++ fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \ + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \ + done +@@ -920,7 +926,7 @@ + + uninstall-doc-omf: + @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ +- if test "x$(_ENABLE_SK)" == "xtrue"; then \ ++ if test "x$(_ENABLE_SK)" = "xtrue"; then \ + echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ + scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ + fi; \ +diff -Naur seahorse-2.20.1.old/intltool-extract.in seahorse-2.20.1/intltool-extract.in +--- seahorse-2.20.1.old/intltool-extract.in 2007-10-15 18:15:46.000000000 +0200 ++++ seahorse-2.20.1/intltool-extract.in 2007-10-16 13:22:48.000000000 +0200 +@@ -32,7 +32,7 @@ + ## Release information + my $PROGRAM = "intltool-extract"; + my $PACKAGE = "intltool"; +-my $VERSION = "0.35.5"; ++my $VERSION = "0.36.2"; + + ## Loaded modules + use strict; +@@ -237,9 +237,9 @@ + + s/'/'/g; # ' + s/"/"/g; # " +- s/&/&/g; + s/<//g; ++ s/&/&/g; + + return $_; + } +diff -Naur seahorse-2.20.1.old/intltool-merge.in seahorse-2.20.1/intltool-merge.in +--- seahorse-2.20.1.old/intltool-merge.in 2007-10-15 18:15:47.000000000 +0200 ++++ seahorse-2.20.1/intltool-merge.in 2007-10-16 13:22:48.000000000 +0200 +@@ -35,7 +35,7 @@ + ## Release information + my $PROGRAM = "intltool-merge"; + my $PACKAGE = "intltool"; +-my $VERSION = "0.35.5"; ++my $VERSION = "0.36.2"; + + ## Loaded modules + use strict; +@@ -93,9 +93,24 @@ + + my %po_files_by_lang = (); + my %translations = (); +-my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@"; ++my $iconv = $ENV{"ICONV"} || "iconv"; + my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null'); + ++sub isProgramInPath ++{ ++ my ($file) = @_; ++ # If either a file exists, or when run it returns 0 exit status ++ return 1 if ((-x $file) or (system("$file -l >$devnull") == 0)); ++ return 0; ++} ++ ++if (! isProgramInPath ("$iconv")) ++{ ++ print STDERR " *** iconv is not found on this system!\n". ++ " *** Without it, intltool-merge can not convert encodings.\n"; ++ exit; ++} ++ + # Use this instead of \w for XML files to handle more possible characters. + my $w = "[-A-Za-z0-9._:]"; + +@@ -260,8 +275,42 @@ + + sub gather_po_files + { +- for my $po_file (glob "$PO_DIR/*.po") { +- $po_files_by_lang{po_file2lang($po_file)} = $po_file; ++ if (my $linguas = $ENV{"LINGUAS"}) ++ { ++ for my $lang (split / /, $linguas) { ++ my $po_file = $PO_DIR . "/" . $lang . ".po"; ++ if (-e $po_file) { ++ $po_files_by_lang{$lang} = $po_file; ++ } ++ } ++ } ++ else ++ { ++ if (open LINGUAS_FILE, "$PO_DIR/LINGUAS") ++ { ++ while () ++ { ++ next if /^#/; ++ ++ if (/([-a-zA-Z_@.]+)\n/) ++ { ++ my $lang = $1; ++ ++ my $po_file = $PO_DIR . "/" . $lang . ".po"; ++ if (-e $po_file) { ++ $po_files_by_lang{$lang} = $po_file; ++ } ++ } ++ } ++ ++ close LINGUAS_FILE; ++ } ++ else ++ { ++ for my $po_file (glob "$PO_DIR/*.po") { ++ $po_files_by_lang{po_file2lang($po_file)} = $po_file; ++ } ++ } + } + } + +@@ -494,16 +543,15 @@ + return $string; + } + +-## NOTE: deal with < - < but not > - > because it seems its ok to have +-## > in the entity. For further info please look at #84738. + sub entity_decode + { + local ($_) = @_; + + s/'/'/g; # ' + s/"/"/g; # " +- s/&/&/g; + s/<//g; ++ s/&/&/g; + + return $_; + } +diff -Naur seahorse-2.20.1.old/intltool-update.in seahorse-2.20.1/intltool-update.in +--- seahorse-2.20.1.old/intltool-update.in 2007-10-15 18:15:47.000000000 +0200 ++++ seahorse-2.20.1/intltool-update.in 2007-10-16 13:22:48.000000000 +0200 +@@ -30,7 +30,7 @@ + + ## Release information + my $PROGRAM = "intltool-update"; +-my $VERSION = "0.35.5"; ++my $VERSION = "0.36.2"; + my $PACKAGE = "intltool"; + + ## Loaded modules +@@ -71,7 +71,8 @@ + "sheet(?:\\.in)+|". # ? + "schemas(?:\\.in)+|". # GConf specific + "pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer. +-"kbd(?:\\.in)+"; # GOK specific. ++"kbd(?:\\.in)+|". # GOK specific. ++"policy(?:\\.in)+"; # PolicyKit files + + my $ini_support = + "icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec +@@ -328,7 +329,12 @@ + push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/; + push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/; + }, ".."; +- ++ find sub { ++ push @buf_i18n_plain, "$File::Find::name" if /\.($buildin_gettext_support)$/; ++ push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/; ++ push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/; ++ push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/; ++ }, "$SRCDIR/.."; + + open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n"; + @buf_potfiles = grep !/^(#|\s*$)/, ; +@@ -489,11 +495,15 @@ + my %in2; + foreach (@buf_potfiles_sorted) + { ++ s#^$SRCDIR/../##; ++ s#^$SRCDIR/##; + $in2{$_} = 1; + } + + foreach (@buf_potfiles_ignore_sorted) + { ++ s#^$SRCDIR/../##; ++ s#^$SRCDIR/##; + $in2{$_} = 1; + } + +@@ -501,9 +511,16 @@ + + foreach (@buf_allfiles_sorted) + { +- if (!exists($in2{$_})) ++ my $dummy = $_; ++ my $srcdir = $SRCDIR; ++ ++ $srcdir =~ s#^../##; ++ $dummy =~ s#^$srcdir/../##; ++ $dummy =~ s#^$srcdir/##; ++ $dummy =~ s#_build/##; ++ if (!exists($in2{$dummy})) + { +- push @result, $_ ++ push @result, $dummy + } + } + +@@ -563,11 +580,23 @@ + exit 1; + } + +-sub isIntltoolExtractInPath ++sub isProgramInPath + { + my ($file) = @_; + # If either a file exists, or when run it returns 0 exit status +- return 1 if ((-x $file) or (system("$file >/dev/null") == 0)); ++ return 1 if ((-x $file) or (system("$file --version >$devnull") == 0)); ++ return 0; ++} ++ ++sub isGNUGettextTool ++{ ++ my ($file) = @_; ++ # Check that we are using GNU gettext tools ++ if (isProgramInPath ($file)) ++ { ++ my $version = `$file --version`; ++ return 1 if ($version =~ m/.*\(GNU .*\).*/); ++ } + return 0; + } + +@@ -577,7 +606,7 @@ + + ## Generate the .h header files, so we can allow glade and + ## xml translation support +- if (! isIntltoolExtractInPath("$EXTRACT")) ++ if (! isProgramInPath ("$EXTRACT")) + { + print STDERR "\n *** The intltool-extract script wasn't found!" + ."\n *** Without it, intltool-update can not generate files.\n"; +@@ -624,13 +653,13 @@ + # + sub GeneratePOTemplate + { +- my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@"; ++ my $XGETTEXT = $ENV{"XGETTEXT"} || "xgettext"; + my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || ''; + chomp $XGETTEXT; + +- if (! -x $XGETTEXT) ++ if (! isGNUGettextTool ("$XGETTEXT")) + { +- print STDERR " *** xgettext is not found on this system!\n". ++ print STDERR " *** GNU xgettext is not found on this system!\n". + " *** Without it, intltool-update can not extract strings.\n"; + exit; + } +@@ -726,7 +755,23 @@ + unlink "$MODULE.pot"; + my @xgettext_argument=("$XGETTEXT", + "--add-comments", +- "--directory\=\.", ++ "--directory\=.", ++ "--default-domain\=$MODULE", ++ "--flag\=g_strdup_printf:1:c-format", ++ "--flag\=g_string_printf:2:c-format", ++ "--flag\=g_string_append_printf:2:c-format", ++ "--flag\=g_error_new:3:c-format", ++ "--flag\=g_set_error:4:c-format", ++ "--flag\=g_markup_printf_escaped:1:c-format", ++ "--flag\=g_log:3:c-format", ++ "--flag\=g_print:1:c-format", ++ "--flag\=g_printerr:1:c-format", ++ "--flag\=g_printf:1:c-format", ++ "--flag\=g_fprintf:2:c-format", ++ "--flag\=g_sprintf:2:c-format", ++ "--flag\=g_snprintf:3:c-format", ++ "--flag\=g_scanner_error:2:c-format", ++ "--flag\=g_scanner_warn:2:c-format", + "--output\=$MODULE\.pot", + "--files-from\=\.\/POTFILES\.in\.temp"); + my $XGETTEXT_KEYWORDS = &FindPOTKeywords; +@@ -793,9 +838,16 @@ + { + -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n"; + +- my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@"; ++ my $MSGMERGE = $ENV{"MSGMERGE"} || "msgmerge"; + my ($lang, $outfile) = @_; + ++ if (! isGNUGettextTool ("$MSGMERGE")) ++ { ++ print STDERR " *** GNU msgmerge is not found on this system!\n". ++ " *** Without it, intltool-update can not extract strings.\n"; ++ exit; ++ } ++ + print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE; + + my $infile = "$SRCDIR/$lang.po"; +@@ -836,7 +888,14 @@ + sub Console_Write_TranslationStatus + { + my ($lang, $output_file) = @_; +- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@"; ++ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt"; ++ ++ if (! isGNUGettextTool ("$MSGFMT")) ++ { ++ print STDERR " *** GNU msgfmt is not found on this system!\n". ++ " *** Without it, intltool-update can not extract strings.\n"; ++ exit; ++ } + + $output_file = "$SRCDIR/$lang.po" if ($output_file eq ""); + +@@ -845,21 +904,28 @@ + + sub Console_Write_CoverageReport + { +- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@"; ++ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt"; ++ ++ if (! isGNUGettextTool ("$MSGFMT")) ++ { ++ print STDERR " *** GNU msgfmt is not found on this system!\n". ++ " *** Without it, intltool-update can not extract strings.\n"; ++ exit; ++ } + + &GatherPOFiles; + + foreach my $lang (@languages) + { +- print "$lang: "; ++ print STDERR "$lang: "; + &POFile_Update ($lang, ""); + } + +- print "\n\n * Current translation support in $MODULE \n\n"; ++ print STDERR "\n\n * Current translation support in $MODULE \n\n"; + + foreach my $lang (@languages) + { +- print "$lang: "; ++ print STDERR "$lang: "; + system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po"); + } + } +@@ -933,13 +999,13 @@ + + $conf_in || die "Cannot find top_builddir in Makevars."; + } +- elsif (-f "../configure.ac") ++ elsif (-f "$SRCDIR/../configure.ac") + { +- $conf_in = "../configure.ac"; ++ $conf_in = "$SRCDIR/../configure.ac"; + } +- elsif (-f "../configure.in") ++ elsif (-f "$SRCDIR/../configure.in") + { +- $conf_in = "../configure.in"; ++ $conf_in = "$SRCDIR/../configure.in"; + } + else + { +diff -Naur seahorse-2.20.1.old/libcryptui/Makefile.in seahorse-2.20.1/libcryptui/Makefile.in +--- seahorse-2.20.1.old/libcryptui/Makefile.in 2007-10-15 18:16:05.000000000 +0200 ++++ seahorse-2.20.1/libcryptui/Makefile.in 2007-10-16 13:23:04.000000000 +0200 +@@ -174,14 +174,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -193,7 +191,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -243,15 +240,13 @@ + RANLIB = @RANLIB@ + SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ + SEAHORSE_LIBS = @SEAHORSE_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHARING_CFLAGS = @SHARING_CFLAGS@ + SHARING_LIBS = @SHARING_LIBS@ + SHELL = @SHELL@ + SOUP_CFLAGS = @SOUP_CFLAGS@ + SOUP_LIBS = @SOUP_LIBS@ +-SSH_ADD_PATH = @SSH_ADD_PATH@ +-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ +-SSH_PATH = @SSH_PATH@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +diff -Naur seahorse-2.20.1.old/libcryptui/tests/Makefile.in seahorse-2.20.1/libcryptui/tests/Makefile.in +--- seahorse-2.20.1.old/libcryptui/tests/Makefile.in 2007-10-15 18:16:05.000000000 +0200 ++++ seahorse-2.20.1/libcryptui/tests/Makefile.in 2007-10-16 13:23:04.000000000 +0200 +@@ -151,14 +151,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -170,7 +168,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -220,15 +217,13 @@ + RANLIB = @RANLIB@ + SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ + SEAHORSE_LIBS = @SEAHORSE_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHARING_CFLAGS = @SHARING_CFLAGS@ + SHARING_LIBS = @SHARING_LIBS@ + SHELL = @SHELL@ + SOUP_CFLAGS = @SOUP_CFLAGS@ + SOUP_LIBS = @SOUP_LIBS@ +-SSH_ADD_PATH = @SSH_ADD_PATH@ +-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ +-SSH_PATH = @SSH_PATH@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +diff -Naur seahorse-2.20.1.old/libseahorse/Makefile.in seahorse-2.20.1/libseahorse/Makefile.in +--- seahorse-2.20.1.old/libseahorse/Makefile.in 2007-10-15 18:16:06.000000000 +0200 ++++ seahorse-2.20.1/libseahorse/Makefile.in 2007-10-16 13:23:05.000000000 +0200 +@@ -238,14 +238,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -257,7 +255,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -307,15 +304,13 @@ + RANLIB = @RANLIB@ + SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ + SEAHORSE_LIBS = @SEAHORSE_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHARING_CFLAGS = @SHARING_CFLAGS@ + SHARING_LIBS = @SHARING_LIBS@ + SHELL = @SHELL@ + SOUP_CFLAGS = @SOUP_CFLAGS@ + SOUP_LIBS = @SOUP_LIBS@ +-SSH_ADD_PATH = @SSH_ADD_PATH@ +-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ +-SSH_PATH = @SSH_PATH@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +diff -Naur seahorse-2.20.1.old/ltmain.sh seahorse-2.20.1/ltmain.sh +--- seahorse-2.20.1.old/ltmain.sh 2006-06-19 20:36:49.000000000 +0200 ++++ seahorse-2.20.1/ltmain.sh 2007-08-14 19:43:36.000000000 +0200 +@@ -1,8 +1,8 @@ + # ltmain.sh - Provide generalized library-building support services. + # NOTE: Changing this file will not affect anything until you rerun configure. + # +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 +-# Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, ++# 2007 Free Software Foundation, Inc. + # Originally by Gordon Matzigkeit , 1996 + # + # This program is free software; you can redistribute it and/or modify +@@ -43,14 +43,22 @@ + + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION="1.5.22 Debian 1.5.22-4" +-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" ++VERSION="1.5.24 Debian 1.5.24-1ubuntu1" ++TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" + +-# 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 ++# Be Bourne compatible (taken from Autoconf:_AS_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 + + # Check that we have a working $echo. + if test "X$1" = X--no-reexec; then +@@ -105,12 +113,14 @@ + # These must not be set unconditionally because not all systems understand + # e.g. LANG=C (notably SCO). + # We save the old values to restore during execute mode. +-if test "${LC_ALL+set}" = set; then +- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL +-fi +-if test "${LANG+set}" = set; then +- save_LANG="$LANG"; LANG=C; export LANG +-fi ++for lt_var in LANG 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 ++ fi" ++done + + # Make sure IFS has a sensible default + lt_nl=' +@@ -136,6 +146,8 @@ + preserve_args= + lo2o="s/\\.lo\$/.${objext}/" + o2lo="s/\\.${objext}\$/.lo/" ++extracted_archives= ++extracted_serial=0 + + ##################################### + # Shell function definitions: +@@ -196,7 +208,13 @@ + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ + $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then + win32_nmres=`eval $NM -f posix -A $1 | \ +- $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` ++ $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";; +@@ -327,7 +345,17 @@ + *) my_xabs=`pwd`"/$my_xlib" ;; + esac + my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` +- my_xdir="$my_gentop/$my_xlib" ++ my_xlib_u=$my_xlib ++ while :; do ++ case " $extracted_archives " in ++ *" $my_xlib_u "*) ++ extracted_serial=`expr $extracted_serial + 1` ++ 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" + + $show "${rm}r $my_xdir" + $run ${rm}r "$my_xdir" +@@ -454,11 +482,12 @@ + ;; + + --version) +- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" +- $echo +- $echo "Copyright (C) 2005 Free Software Foundation, Inc." +- $echo "This is free software; see the source for copying conditions. There is NO" +- $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." ++ echo "\ ++$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP ++ ++Copyright (C) 2007 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." + exit $? + ;; + +@@ -755,9 +784,10 @@ + *.class) xform=class ;; + *.cpp) xform=cpp ;; + *.cxx) xform=cxx ;; +- *.f90) xform=f90 ;; ++ *.[fF][09]?) xform=[fF][09]. ;; + *.for) xform=for ;; + *.java) xform=java ;; ++ *.obj) xform=obj ;; + esac + + libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` +@@ -1138,8 +1168,9 @@ + for arg + do + case $arg in +- -all-static | -static) +- if test "X$arg" = "X-all-static"; then ++ -all-static | -static | -static-libtool-libs) ++ case $arg in ++ -all-static) + if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 + fi +@@ -1147,12 +1178,20 @@ + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes +- else ++ ;; ++ -static) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=built +- fi ++ ;; ++ -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 +@@ -1600,7 +1639,7 @@ + continue + ;; + +- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) ++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + compiler_flags="$compiler_flags $arg" + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +@@ -1620,10 +1659,11 @@ + # -m* pass through architecture-specific compiler args for GCC + # -m*, -t[45]*, -txscale* pass through architecture-specific + # compiler args for GCC +- # -pg pass through profiling flag for GCC ++ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC ++ # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files +- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. +@@ -1651,9 +1691,9 @@ + + -no-install) + case $host in +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) + # The PATH hackery in wrapper scripts is required on Windows +- # in order for the loader to find any dlls it needs. ++ # and Darwin in order for the loader to find any dlls it needs. + $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 + $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 + fast_install=no +@@ -1712,7 +1752,7 @@ + continue + ;; + +- -static) ++ -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 +@@ -2097,7 +2137,7 @@ + lib= + found=no + case $deplib in +- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) ++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" +@@ -2493,7 +2533,9 @@ + + if test "$linkmode,$pass" = "prog,link"; then + if test -n "$library_names" && +- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then ++ { { 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. +@@ -3189,7 +3231,7 @@ + # which has an extra 1 added just for fun + # + case $version_type in +- darwin|linux|osf|windows) ++ darwin|linux|osf|windows|none) + current=`expr $number_major + $number_minor` + age="$number_minor" + revision="$number_revision" +@@ -3200,9 +3242,10 @@ + age="0" + ;; + irix|nonstopux) +- current=`expr $number_major + $number_minor - 1` ++ current=`expr $number_major + $number_minor` + age="$number_minor" + revision="$number_minor" ++ lt_irix_increment=no + ;; + *) + $echo "$modename: unknown library version type \`$version_type'" 1>&2 +@@ -3266,7 +3309,8 @@ + versuffix="$major.$age.$revision" + # Darwin ld doesn't like 0 for these options... + minor_current=`expr $current + 1` +- verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" ++ 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) +@@ -3280,8 +3324,11 @@ + ;; + + irix | nonstopux) +- major=`expr $current - $age + 1` +- ++ if test "X$lt_irix_increment" = "Xno"; then ++ major=`expr $current - $age` ++ else ++ major=`expr $current - $age + 1` ++ fi + case $version_type in + nonstopux) verstring_prefix=nonstopux ;; + *) verstring_prefix=sgi ;; +@@ -3418,11 +3465,11 @@ + fi + + # Eliminate all temporary directories. +- for path in $notinst_path; do +- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` +- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` +- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` +- done ++ #for path in $notinst_path; do ++ # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` ++ # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` ++ # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` ++ #done + + if test -n "$xrpath"; then + # If the user specified any rpath flags, then add them. +@@ -3523,13 +3570,12 @@ + int main() { return 0; } + EOF + $rm conftest +- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs +- if test "$?" -eq 0 ; then ++ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then + ldd_output=`ldd conftest` + for i in $deplibs; do + name=`expr $i : '-l\(.*\)'` + # If $name is empty we are operating on a -L argument. +- if test "$name" != "" && test "$name" -ne "0"; then ++ if test "$name" != "" && test "$name" != "0"; then + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $i "*) +@@ -3568,9 +3614,7 @@ + # If $name is empty we are operating on a -L argument. + if test "$name" != "" && test "$name" != "0"; then + $rm conftest +- $LTCC $LTCFLAGS -o conftest conftest.c $i +- # Did it work? +- if test "$?" -eq 0 ; then ++ 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 +@@ -3602,7 +3646,7 @@ + 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 "*** 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 +@@ -3888,7 +3932,10 @@ + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + if test -n "$hardcode_libdir_flag_spec_ld"; then +- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ++ case $archive_cmds in ++ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;; ++ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;; ++ esac + else + eval dep_rpath=\"$hardcode_libdir_flag_spec\" + fi +@@ -4247,12 +4294,14 @@ + reload_conv_objs= + gentop= + # reload_cmds runs $LD directly, so let us get rid of +- # -Wl from whole_archive_flag_spec ++ # -Wl from whole_archive_flag_spec and hope we can get by with ++ # turning comma into space.. + wl= + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then +- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" ++ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" ++ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` + else + gentop="$output_objdir/${obj}x" + generated="$generated $gentop" +@@ -4700,16 +4749,16 @@ + case $host in + *cygwin* | *mingw* ) + if test -f "$output_objdir/${outputname}.def" ; then +- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` +- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` ++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` ++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` + else +- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` +- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` ++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` ++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` + fi + ;; + * ) +- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` +- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` ++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` ++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` + ;; + esac + ;; +@@ -4724,13 +4773,13 @@ + # really was required. + + # Nullify the symbol file. +- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` +- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` ++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` ++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` + fi + + if test "$need_relink" = no || test "$build_libtool_libs" != yes; then + # Replace the output file specification. +- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` ++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` + link_command="$compile_command$compile_rpath" + + # We have no uninstalled library dependencies, so finalize right now. +@@ -4817,7 +4866,7 @@ + if test "$fast_install" != no; then + link_command="$finalize_var$compile_command$finalize_rpath" + if test "$fast_install" = yes; then +- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` ++ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP` + else + # fast_install is set to needless + relink_command= +@@ -4854,7 +4903,7 @@ + fi + done + relink_command="(cd `pwd`; $relink_command)" +- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` ++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` + fi + + # Quote $echo for shipping. +@@ -5261,6 +5310,20 @@ + Xsed='${SED} -e 1s/^X//' + sed_quote_subst='$sed_quote_subst' + ++# Be Bourne compatible (taken from Autoconf:_AS_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 +@@ -5403,7 +5466,7 @@ + ;; + esac + $echo >> $output "\ +- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" ++ \$echo \"\$0: cannot exec \$program \$*\" + exit $EXIT_FAILURE + fi + else +@@ -5589,7 +5652,7 @@ + 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 "X$relink_command" | $Xsed -e "$sed_quote_subst"` ++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` + if test "$hardcode_automatic" = yes ; then + relink_command= + fi +@@ -5934,9 +5997,9 @@ + + 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%"` ++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` + else +- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` ++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` + fi + + $echo "$modename: warning: relinking \`$file'" 1>&2 +@@ -6145,7 +6208,7 @@ + file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` + outputname="$tmpdir/$file" + # Replace the output file specification. +- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` ++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` + + $show "$relink_command" + if $run eval "$relink_command"; then : +@@ -6356,8 +6419,10 @@ + if test -f "$dir/$objdir/$dlname"; then + dir="$dir/$objdir" + else +- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 +- exit $EXIT_FAILURE ++ if test ! -f "$dir/$dlname"; then ++ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 ++ exit $EXIT_FAILURE ++ fi + fi + ;; + +@@ -6421,12 +6486,12 @@ + fi + + # Restore saved environment variables +- if test "${save_LC_ALL+set}" = set; then +- LC_ALL="$save_LC_ALL"; export LC_ALL +- fi +- if test "${save_LANG+set}" = set; then +- LANG="$save_LANG"; export LANG +- fi ++ for lt_var in LANG 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 ++ fi" ++ done + + # Now prepare to actually exec the command. + exec_cmd="\$cmd$args" +@@ -6783,9 +6848,9 @@ + -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 ++ try to export only the symbols listed in SYMFILE + -export-symbols-regex REGEX +- try to export only the symbols matching 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 +@@ -6799,9 +6864,11 @@ + -release RELEASE specify package release information + -rpath LIBDIR the created library will eventually be installed in LIBDIR + -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries +- -static do not do any dynamic linking of libtool libraries ++ -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] ++ specify library version info [each variable defaults to 0] + + All other options (arguments beginning with \`-') are ignored. + +diff -Naur seahorse-2.20.1.old/m4/intltool.m4 seahorse-2.20.1/m4/intltool.m4 +--- seahorse-2.20.1.old/m4/intltool.m4 2007-10-15 18:15:47.000000000 +0200 ++++ seahorse-2.20.1/m4/intltool.m4 2007-10-16 13:22:48.000000000 +0200 +@@ -23,7 +23,7 @@ + ## the same distribution terms that you use for the rest of that program. + + dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) +-# serial 35 IT_PROG_INTLTOOL ++# serial 36 IT_PROG_INTLTOOL + AC_DEFUN([IT_PROG_INTLTOOL], + [AC_PREREQ([2.50])dnl + +@@ -36,7 +36,7 @@ + esac + + if test -n "$1"; then +- AC_MSG_CHECKING(for intltool >= $1) ++ AC_MSG_CHECKING([for intltool >= $1]) + + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` +@@ -65,6 +65,7 @@ + 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 $< [$]@' + + AC_SUBST(INTLTOOL_DESKTOP_RULE) + AC_SUBST(INTLTOOL_DIRECTORY_RULE) +@@ -84,6 +85,7 @@ + AC_SUBST(INTLTOOL_SCHEMAS_RULE) + AC_SUBST(INTLTOOL_THEME_RULE) + AC_SUBST(INTLTOOL_SERVICE_RULE) ++AC_SUBST(INTLTOOL_POLICY_RULE) + + # Use the tools built into the package, not the ones that are installed. + AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') +@@ -106,19 +108,16 @@ + fi + fi + +-AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv) +-AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt) +-AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge) +-AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext) +- + # 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_TRY_LINK(, [extern int _nl_msg_cat_cntr; +- return _nl_msg_cat_cntr], ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM([[]], ++ [[extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr]])], + [DATADIRNAME=share], + [case $host in + *-*-solaris*) +@@ -159,10 +158,6 @@ + for file in intltool-extract intltool-merge intltool-update; do + sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ + -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ +- -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \ +- -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \ +- -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \ +- -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \ + -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ + < ${ac_aux_dir}/${file}.in > ${file}.out + if cmp -s ${file} ${file}.out 2>/dev/null; then +@@ -177,9 +172,7 @@ + ], + [INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' + prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" +-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}' +-INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}' +-INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}']) ++INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}']) + + ]) + +diff -Naur seahorse-2.20.1.old/Makefile.in seahorse-2.20.1/Makefile.in +--- seahorse-2.20.1.old/Makefile.in 2007-10-15 18:16:08.000000000 +0200 ++++ seahorse-2.20.1/Makefile.in 2007-10-16 13:23:07.000000000 +0200 +@@ -152,14 +152,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -171,7 +169,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -221,15 +218,13 @@ + RANLIB = @RANLIB@ + SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ + SEAHORSE_LIBS = @SEAHORSE_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHARING_CFLAGS = @SHARING_CFLAGS@ + SHARING_LIBS = @SHARING_LIBS@ + SHELL = @SHELL@ + SOUP_CFLAGS = @SOUP_CFLAGS@ + SOUP_LIBS = @SOUP_LIBS@ +-SSH_ADD_PATH = @SSH_ADD_PATH@ +-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ +-SSH_PATH = @SSH_PATH@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +diff -Naur seahorse-2.20.1.old/pixmaps/22x22/Makefile.in seahorse-2.20.1/pixmaps/22x22/Makefile.in +--- seahorse-2.20.1.old/pixmaps/22x22/Makefile.in 2007-10-15 18:16:06.000000000 +0200 ++++ seahorse-2.20.1/pixmaps/22x22/Makefile.in 2007-10-16 13:23:05.000000000 +0200 +@@ -134,14 +134,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -153,7 +151,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -203,15 +200,13 @@ + RANLIB = @RANLIB@ + SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ + SEAHORSE_LIBS = @SEAHORSE_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHARING_CFLAGS = @SHARING_CFLAGS@ + SHARING_LIBS = @SHARING_LIBS@ + SHELL = @SHELL@ + SOUP_CFLAGS = @SOUP_CFLAGS@ + SOUP_LIBS = @SOUP_LIBS@ +-SSH_ADD_PATH = @SSH_ADD_PATH@ +-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ +-SSH_PATH = @SSH_PATH@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +diff -Naur seahorse-2.20.1.old/pixmaps/48x48/Makefile.in seahorse-2.20.1/pixmaps/48x48/Makefile.in +--- seahorse-2.20.1.old/pixmaps/48x48/Makefile.in 2007-10-15 18:16:06.000000000 +0200 ++++ seahorse-2.20.1/pixmaps/48x48/Makefile.in 2007-10-16 13:23:05.000000000 +0200 +@@ -135,14 +135,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -154,7 +152,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -204,15 +201,13 @@ + RANLIB = @RANLIB@ + SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ + SEAHORSE_LIBS = @SEAHORSE_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHARING_CFLAGS = @SHARING_CFLAGS@ + SHARING_LIBS = @SHARING_LIBS@ + SHELL = @SHELL@ + SOUP_CFLAGS = @SOUP_CFLAGS@ + SOUP_LIBS = @SOUP_LIBS@ +-SSH_ADD_PATH = @SSH_ADD_PATH@ +-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ +-SSH_PATH = @SSH_PATH@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +diff -Naur seahorse-2.20.1.old/pixmaps/Makefile.in seahorse-2.20.1/pixmaps/Makefile.in +--- seahorse-2.20.1.old/pixmaps/Makefile.in 2007-10-15 18:16:06.000000000 +0200 ++++ seahorse-2.20.1/pixmaps/Makefile.in 2007-10-16 13:23:05.000000000 +0200 +@@ -134,14 +134,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -153,7 +151,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -203,15 +200,13 @@ + RANLIB = @RANLIB@ + SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ + SEAHORSE_LIBS = @SEAHORSE_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHARING_CFLAGS = @SHARING_CFLAGS@ + SHARING_LIBS = @SHARING_LIBS@ + SHELL = @SHELL@ + SOUP_CFLAGS = @SOUP_CFLAGS@ + SOUP_LIBS = @SOUP_LIBS@ +-SSH_ADD_PATH = @SSH_ADD_PATH@ +-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ +-SSH_PATH = @SSH_PATH@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +diff -Naur seahorse-2.20.1.old/pixmaps/scalable/Makefile.in seahorse-2.20.1/pixmaps/scalable/Makefile.in +--- seahorse-2.20.1.old/pixmaps/scalable/Makefile.in 2007-10-15 18:16:06.000000000 +0200 ++++ seahorse-2.20.1/pixmaps/scalable/Makefile.in 2007-10-16 13:23:05.000000000 +0200 +@@ -135,14 +135,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -154,7 +152,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -204,15 +201,13 @@ + RANLIB = @RANLIB@ + SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ + SEAHORSE_LIBS = @SEAHORSE_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHARING_CFLAGS = @SHARING_CFLAGS@ + SHARING_LIBS = @SHARING_LIBS@ + SHELL = @SHELL@ + SOUP_CFLAGS = @SOUP_CFLAGS@ + SOUP_LIBS = @SOUP_LIBS@ +-SSH_ADD_PATH = @SSH_ADD_PATH@ +-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ +-SSH_PATH = @SSH_PATH@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +diff -Naur seahorse-2.20.1.old/plugins/applet/docs/Makefile.in seahorse-2.20.1/plugins/applet/docs/Makefile.in +--- seahorse-2.20.1.old/plugins/applet/docs/Makefile.in 2007-10-15 18:16:07.000000000 +0200 ++++ seahorse-2.20.1/plugins/applet/docs/Makefile.in 2007-10-16 13:23:06.000000000 +0200 +@@ -147,14 +147,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -166,7 +164,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -216,15 +213,13 @@ + RANLIB = @RANLIB@ + SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ + SEAHORSE_LIBS = @SEAHORSE_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHARING_CFLAGS = @SHARING_CFLAGS@ + SHARING_LIBS = @SHARING_LIBS@ + SHELL = @SHELL@ + SOUP_CFLAGS = @SOUP_CFLAGS@ + SOUP_LIBS = @SOUP_LIBS@ +-SSH_ADD_PATH = @SSH_ADD_PATH@ +-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ +-SSH_PATH = @SSH_PATH@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +@@ -772,6 +767,11 @@ + @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ ++ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ if ! test -d "$(distdir)/$$docdir"; then \ ++ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ ++ $(mkinstalldirs) "$(distdir)/$$docdir"; \ ++ fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done +@@ -840,6 +840,12 @@ + done + @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ ++ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \ ++ if ! test -d "$$docdir"; then \ ++ echo "$(mkinstalldirs) $$docdir"; \ ++ $(mkinstalldirs) "$$docdir"; \ ++ fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \ + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \ + done +@@ -907,7 +913,7 @@ + + uninstall-doc-omf: + @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ +- if test "x$(_ENABLE_SK)" == "xtrue"; then \ ++ if test "x$(_ENABLE_SK)" = "xtrue"; then \ + echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ + scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ + fi; \ +diff -Naur seahorse-2.20.1.old/plugins/applet/Makefile.in seahorse-2.20.1/plugins/applet/Makefile.in +--- seahorse-2.20.1.old/plugins/applet/Makefile.in 2007-10-15 18:16:06.000000000 +0200 ++++ seahorse-2.20.1/plugins/applet/Makefile.in 2007-10-16 13:23:05.000000000 +0200 +@@ -170,14 +170,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -189,7 +187,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -239,15 +236,13 @@ + RANLIB = @RANLIB@ + SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ + SEAHORSE_LIBS = @SEAHORSE_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHARING_CFLAGS = @SHARING_CFLAGS@ + SHARING_LIBS = @SHARING_LIBS@ + SHELL = @SHELL@ + SOUP_CFLAGS = @SOUP_CFLAGS@ + SOUP_LIBS = @SOUP_LIBS@ +-SSH_ADD_PATH = @SSH_ADD_PATH@ +-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ +-SSH_PATH = @SSH_PATH@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +diff -Naur seahorse-2.20.1.old/plugins/epiphany/Makefile.in seahorse-2.20.1/plugins/epiphany/Makefile.in +--- seahorse-2.20.1.old/plugins/epiphany/Makefile.in 2007-10-15 18:16:07.000000000 +0200 ++++ seahorse-2.20.1/plugins/epiphany/Makefile.in 2007-10-16 13:23:06.000000000 +0200 +@@ -172,14 +172,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -191,7 +189,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -241,15 +238,13 @@ + RANLIB = @RANLIB@ + SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ + SEAHORSE_LIBS = @SEAHORSE_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHARING_CFLAGS = @SHARING_CFLAGS@ + SHARING_LIBS = @SHARING_LIBS@ + SHELL = @SHELL@ + SOUP_CFLAGS = @SOUP_CFLAGS@ + SOUP_LIBS = @SOUP_LIBS@ +-SSH_ADD_PATH = @SSH_ADD_PATH@ +-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ +-SSH_PATH = @SSH_PATH@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +diff -Naur seahorse-2.20.1.old/plugins/epiphany/mozilla/Makefile.in seahorse-2.20.1/plugins/epiphany/mozilla/Makefile.in +--- seahorse-2.20.1.old/plugins/epiphany/mozilla/Makefile.in 2007-10-15 18:16:07.000000000 +0200 ++++ seahorse-2.20.1/plugins/epiphany/mozilla/Makefile.in 2007-10-16 13:23:06.000000000 +0200 +@@ -154,14 +154,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -173,7 +171,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -223,15 +220,13 @@ + RANLIB = @RANLIB@ + SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ + SEAHORSE_LIBS = @SEAHORSE_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHARING_CFLAGS = @SHARING_CFLAGS@ + SHARING_LIBS = @SHARING_LIBS@ + SHELL = @SHELL@ + SOUP_CFLAGS = @SOUP_CFLAGS@ + SOUP_LIBS = @SOUP_LIBS@ +-SSH_ADD_PATH = @SSH_ADD_PATH@ +-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ +-SSH_PATH = @SSH_PATH@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +diff -Naur seahorse-2.20.1.old/plugins/gedit/Makefile.in seahorse-2.20.1/plugins/gedit/Makefile.in +--- seahorse-2.20.1.old/plugins/gedit/Makefile.in 2007-10-15 18:16:07.000000000 +0200 ++++ seahorse-2.20.1/plugins/gedit/Makefile.in 2007-10-16 13:23:06.000000000 +0200 +@@ -164,14 +164,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -183,7 +181,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -233,15 +230,13 @@ + RANLIB = @RANLIB@ + SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ + SEAHORSE_LIBS = @SEAHORSE_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHARING_CFLAGS = @SHARING_CFLAGS@ + SHARING_LIBS = @SHARING_LIBS@ + SHELL = @SHELL@ + SOUP_CFLAGS = @SOUP_CFLAGS@ + SOUP_LIBS = @SOUP_LIBS@ +-SSH_ADD_PATH = @SSH_ADD_PATH@ +-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ +-SSH_PATH = @SSH_PATH@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +diff -Naur seahorse-2.20.1.old/plugins/Makefile.in seahorse-2.20.1/plugins/Makefile.in +--- seahorse-2.20.1.old/plugins/Makefile.in 2007-10-15 18:16:06.000000000 +0200 ++++ seahorse-2.20.1/plugins/Makefile.in 2007-10-16 13:23:05.000000000 +0200 +@@ -134,14 +134,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -153,7 +151,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -203,15 +200,13 @@ + RANLIB = @RANLIB@ + SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ + SEAHORSE_LIBS = @SEAHORSE_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHARING_CFLAGS = @SHARING_CFLAGS@ + SHARING_LIBS = @SHARING_LIBS@ + SHELL = @SHELL@ + SOUP_CFLAGS = @SOUP_CFLAGS@ + SOUP_LIBS = @SOUP_LIBS@ +-SSH_ADD_PATH = @SSH_ADD_PATH@ +-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ +-SSH_PATH = @SSH_PATH@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +diff -Naur seahorse-2.20.1.old/plugins/nautilus/Makefile.in seahorse-2.20.1/plugins/nautilus/Makefile.in +--- seahorse-2.20.1.old/plugins/nautilus/Makefile.in 2007-10-15 18:16:07.000000000 +0200 ++++ seahorse-2.20.1/plugins/nautilus/Makefile.in 2007-10-16 13:23:06.000000000 +0200 +@@ -169,14 +169,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -188,7 +186,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -238,15 +235,13 @@ + RANLIB = @RANLIB@ + SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ + SEAHORSE_LIBS = @SEAHORSE_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHARING_CFLAGS = @SHARING_CFLAGS@ + SHARING_LIBS = @SHARING_LIBS@ + SHELL = @SHELL@ + SOUP_CFLAGS = @SOUP_CFLAGS@ + SOUP_LIBS = @SOUP_LIBS@ +-SSH_ADD_PATH = @SSH_ADD_PATH@ +-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ +-SSH_PATH = @SSH_PATH@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +diff -Naur seahorse-2.20.1.old/plugins/nautilus-ext/Makefile.in seahorse-2.20.1/plugins/nautilus-ext/Makefile.in +--- seahorse-2.20.1.old/plugins/nautilus-ext/Makefile.in 2007-10-15 18:16:07.000000000 +0200 ++++ seahorse-2.20.1/plugins/nautilus-ext/Makefile.in 2007-10-16 13:23:06.000000000 +0200 +@@ -155,14 +155,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -174,7 +172,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -224,15 +221,13 @@ + RANLIB = @RANLIB@ + SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ + SEAHORSE_LIBS = @SEAHORSE_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHARING_CFLAGS = @SHARING_CFLAGS@ + SHARING_LIBS = @SHARING_LIBS@ + SHELL = @SHELL@ + SOUP_CFLAGS = @SOUP_CFLAGS@ + SOUP_LIBS = @SOUP_LIBS@ +-SSH_ADD_PATH = @SSH_ADD_PATH@ +-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ +-SSH_PATH = @SSH_PATH@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +diff -Naur seahorse-2.20.1.old/po/Makefile.in.in seahorse-2.20.1/po/Makefile.in.in +--- seahorse-2.20.1.old/po/Makefile.in.in 2007-10-15 18:15:47.000000000 +0200 ++++ seahorse-2.20.1/po/Makefile.in.in 2007-10-16 13:22:48.000000000 +0200 +@@ -133,7 +133,7 @@ + dvi info tags TAGS ID: + + # Define this as empty until I found a useful application. +-installcheck: ++install-exec installcheck: + + uninstall: + linguas="$(USE_LINGUAS)"; \ +diff -Naur seahorse-2.20.1.old/src/Makefile.in seahorse-2.20.1/src/Makefile.in +--- seahorse-2.20.1.old/src/Makefile.in 2007-10-15 18:16:07.000000000 +0200 ++++ seahorse-2.20.1/src/Makefile.in 2007-10-16 13:23:07.000000000 +0200 +@@ -202,14 +202,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -221,7 +219,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -271,15 +268,13 @@ + RANLIB = @RANLIB@ + SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ + SEAHORSE_LIBS = @SEAHORSE_LIBS@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHARING_CFLAGS = @SHARING_CFLAGS@ + SHARING_LIBS = @SHARING_LIBS@ + SHELL = @SHELL@ + SOUP_CFLAGS = @SOUP_CFLAGS@ + SOUP_LIBS = @SOUP_LIBS@ +-SSH_ADD_PATH = @SSH_ADD_PATH@ +-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ +-SSH_PATH = @SSH_PATH@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ --- seahorse-2.20.1.orig/debian/patches/8_force_ssh.dpatch +++ seahorse-2.20.1/debian/patches/8_force_ssh.dpatch @@ -0,0 +1,41 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## force_ssh.dpatch by Jose Carlos Garcia Sogo +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Force ssh support without requiring it as a Build Dependency only +## DP: for checking that ssh-keygen does exist + +@DPATCH@ +diff -urNad seahorse-0.9.3.obsolete.0.486755549050034~/configure.in seahorse-0.9.3.obsolete.0.486755549050034/configure.in +--- seahorse-0.9.3.obsolete.0.486755549050034~/configure.in 2006-08-24 22:13:04.000000000 +0200 ++++ seahorse-0.9.3.obsolete.0.486755549050034/configure.in 2006-08-27 23:58:27.000000000 +0200 +@@ -592,19 +592,19 @@ + echo "disabling ssh support" + else + +- AC_PATH_PROG(SSH_KEYGEN_PATH, ssh-keygen, "failed") +- AC_PATH_PROG(SSH_ADD_PATH, ssh-add, "failed") +- AC_PATH_PROG(SSH_PATH, ssh, "failed") ++# AC_PATH_PROG(SSH_KEYGEN_PATH, ssh-keygen, "failed") ++# AC_PATH_PROG(SSH_ADD_PATH, ssh-add, "failed") ++# AC_PATH_PROG(SSH_PATH, ssh, "failed") + +- if test $SSH_KEYGEN_PATH != "failed" && +- test $SSH_PATH != "failed" && +- test $SSH_ADD_PATH != "failed"; then ++# if test $SSH_KEYGEN_PATH != "failed" && ++# test $SSH_PATH != "failed" && ++# test $SSH_ADD_PATH != "failed"; then + enable_ssh="yes" + AC_DEFINE(WITH_SSH, 1, [With SSH Support]) +- AC_DEFINE_UNQUOTED(SSH_KEYGEN_PATH, "$SSH_KEYGEN_PATH", [Path to ssh-keygen]) +- AC_DEFINE_UNQUOTED(SSH_PATH, "$SSH_PATH", [Path to ssh]) +- AC_DEFINE_UNQUOTED(SSH_ADD_PATH, "$SSH_ADD_PATH", [Path to ssh-add]) +- fi ++ AC_DEFINE_UNQUOTED(SSH_KEYGEN_PATH, "/usr/bin/ssh-keygen", [Path to ssh-keygen]) ++ AC_DEFINE_UNQUOTED(SSH_PATH, "/usr/bin/ssh", [Path to ssh]) ++ AC_DEFINE_UNQUOTED(SSH_ADD_PATH, "/usr/bin/ssh-add", [Path to ssh-add]) ++# fi + + fi + --- seahorse-2.20.1.orig/debian/patches/00list +++ seahorse-2.20.1/debian/patches/00list @@ -0,0 +1,3 @@ +2_mlock.dpatch +8_force_ssh.dpatch +10_relibtoolize.dpatch --- seahorse-2.20.1.orig/debian/control.in +++ seahorse-2.20.1/debian/control.in @@ -0,0 +1,51 @@ +Source: seahorse +Section: gnome +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Jose Carlos Garcia Sogo +Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>= 5), + libgnome2-dev (>= 2.14.0), + libglade2-dev, + libgnomeui-dev (>= 2.10.0), + scrollkeeper, + libgpgme11-dev, + autotools-dev, + dpatch, + libxml-parser-perl, + gedit-dev (>= 2.10.0), + libsoup2.2-dev, + libldap2-dev, + libnautilus-extension-dev (>= 2.9.0), + libnotify-dev, + libpanel-applet2-dev (>= 2.9.4), + libavahi-glib-dev, + libdbus-glib-1-dev, + gnome-doc-utils, + libgnome-keyring-dev, + libglib2.0-dev (>= 2.10.0), + libgtk2.0-dev (>= 2.10.0), + epiphany-browser-dev (>= 2.14), + libxml2-dev (>= 2.6.0), + firefox-dev (>= 1.5), + libebook1.2-dev (>= 1.7.90), + gnome-pkg-tools +Build-Conflicts: gnupg2 +Standards-Version: 3.7.2 + +Package: seahorse +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Recommends: openssh-client +Description: A Gnome front end for GnuPG + Seahorse is a Gnome front end for GnuPG - the Gnu Privacy Guard program. It + is a tool for secure communications and data storage. Data encryption and + digital signature creation can easily be performed through a GUI and Key + Management operations can easily be carried out through an intuitive + interface. + . + In addition it includes a Gedit plugin, can handle files using Nautilus, + an applet for manging stuff put in the clipboard and an agent for storing + private passphrases, as well as a GnuPG and OpenSSH key manager. + --- seahorse-2.20.1.orig/debian/menu +++ seahorse-2.20.1/debian/menu @@ -0,0 +1,7 @@ +?package(seahorse):needs="X11" \ + section="Apps/Tools" \ + hints="Gnome" \ + title="Seahorse" \ + longtitle="A GNOME frontend for GnuPG" \ + command="/usr/bin/seahorse" \ + icon="/usr/share/pixmaps/seahorse.png" --- seahorse-2.20.1.orig/debian/watch +++ seahorse-2.20.1/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://ftp.gnome.org/pub/gnome/sources/seahorse/([\d\.]+)[02468]/seahorse-([\d\.]+)\.tar\.gz