rev 9497 - in kde-extras/komparator/trunk/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Sat Mar 1 19:40:46 UTC 2008
Author: fabo
Date: 2008-03-01 19:40:46 +0000 (Sat, 01 Mar 2008)
New Revision: 9497
Added:
kde-extras/komparator/trunk/debian/patches/98_buildprep.diff
Removed:
kde-extras/komparator/trunk/debian/README.Debian
Modified:
kde-extras/komparator/trunk/debian/changelog
kde-extras/komparator/trunk/debian/control
kde-extras/komparator/trunk/debian/copyright
kde-extras/komparator/trunk/debian/patches/02_autotools_update.diff
kde-extras/komparator/trunk/debian/patches/03_libtool_update.diff
kde-extras/komparator/trunk/debian/patches/05_pedantic-errors.diff
kde-extras/komparator/trunk/debian/patches/06_disable_no_undefined.diff
kde-extras/komparator/trunk/debian/patches/series
Log:
* New upstream release
* Refresh patches
* Bump Standards-Version to 3.7.3
* Use Homepage, Vcs-Browser and Vcs-Svn fields
* Remove GFDL embedded copy since it can be found in common-licenses
Deleted: kde-extras/komparator/trunk/debian/README.Debian
Modified: kde-extras/komparator/trunk/debian/changelog
===================================================================
--- kde-extras/komparator/trunk/debian/changelog 2008-03-01 19:11:02 UTC (rev 9496)
+++ kde-extras/komparator/trunk/debian/changelog 2008-03-01 19:40:46 UTC (rev 9497)
@@ -1,8 +1,12 @@
-komparator (0.8-2) UNRELEASED; urgency=low
+komparator (0.9-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release
+ * Refresh patches
+ * Bump Standards-Version to 3.7.3
+ * Use Homepage, Vcs-Browser and Vcs-Svn fields
+ * Remove GFDL embedded copy since it can be found in common-licenses
- -- Mark Purcell <msp at debian.org> Sat, 20 Oct 2007 12:36:41 +0100
+ -- Fathi Boudra <fabo at debian.org> Sat, 01 Mar 2008 20:13:39 +0100
komparator (0.8-1) unstable; urgency=low
Modified: kde-extras/komparator/trunk/debian/control
===================================================================
--- kde-extras/komparator/trunk/debian/control 2008-03-01 19:11:02 UTC (rev 9496)
+++ kde-extras/komparator/trunk/debian/control 2008-03-01 19:40:46 UTC (rev 9497)
@@ -3,8 +3,11 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt, automake1.9, kdelibs4-dev
-Standards-Version: 3.7.2
+Build-Depends: cdbs, debhelper (>= 5), quilt, automake, kdelibs4-dev
+Standards-Version: 3.7.3
+Homepage: http://komparator.sourceforge.net
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/komparator/trunk
+Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/komparator/trunk
Package: komparator
Architecture: any
@@ -13,5 +16,3 @@
Komparator is an application that searches and synchronizes two directories.
It discovers duplicate, newer or missing files and empty folders. It works on
local and network or kioslave protocol folders.
- .
- Homepage: http://komparator.sourceforge.net
Modified: kde-extras/komparator/trunk/debian/copyright
===================================================================
--- kde-extras/komparator/trunk/debian/copyright 2008-03-01 19:11:02 UTC (rev 9496)
+++ kde-extras/komparator/trunk/debian/copyright 2008-03-01 19:40:46 UTC (rev 9497)
@@ -5,9 +5,9 @@
Upstream Author: Georg Hennig <georg.hennig at web.de>
-Copyright: (C) 2005-2007 Georg Hennig <georg.hennig at web.de>
+Copyright: © 2005-2007 Georg Hennig <georg.hennig at web.de>
-Copyright for fdupes: (C) 1999 Adrian Lopez <adrian2 at caribe.net>
+Copyright for fdupes: © 1999 Adrian Lopez <adrian2 at caribe.net>
fdupes license:
@@ -32,7 +32,7 @@
Komparator uses the compare function from fdupes, version 1.40, in a modified
way. It uses also kquery.cpp, kquery.h, kdatecombo.cpp and kdatecombo.h taken
-without changes from kfind which is (C) Stephan Kulow <coolo at kde.org> and
+without changes from kfind which is © Stephan Kulow <coolo at kde.org> and
is licensed under the GPL, see below.
komparator license:
@@ -54,410 +54,13 @@
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
-The Debian packaging is (C) 2006, Fathi Boudra <fboudra at free.fr> and
+The Debian packaging is © 2006, Fathi Boudra <fboudra at free.fr> and
is licensed under the GPL, see above.
The documentations provided with komparator is distributed under
the GNU Free Documentation License (FDL). They are considered free with
regards to the Debian Free Software Guidelines (DFSG) because they don't
-contain any unmodifiable parts (invariant sections). The complete text of
-the GNU Free Documentation License can be found below:
+contain any unmodifiable parts (invariant sections).
- GNU Free Documentation License
- Version 1.2, November 2002
-
-
- Copyright (C) 2000,2001,2002 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-0. PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-functional and useful 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, in any medium, that
-contains a notice placed by the copyright holder saying it can be
-distributed under the terms of this License. Such a notice grants a
-world-wide, royalty-free license, unlimited in duration, to use that
-work under the conditions stated herein. The "Document", below,
-refers to any such manual or work. Any member of the public is a
-licensee, and is addressed as "you". You accept the license if you
-copy, modify or distribute the work in a way requiring permission
-under copyright law.
-
-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. (Thus, 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. If a
-section does not fit the above definition of Secondary then it is not
-allowed to be designated as Invariant. The Document may contain zero
-Invariant Sections. If the Document does not identify any Invariant
-Sections then there are none.
-
-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 Front-Cover Text may
-be at most 5 words, and a Back-Cover Text may be at most 25 words.
-
-A "Transparent" copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, that is suitable for revising the document
-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, or absence of markup, has been arranged to thwart
-or discourage subsequent modification by readers is not Transparent.
-An image format is not Transparent if used for any substantial amount
-of text. 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, PostScript or PDF designed for human modification. Examples of
-transparent image formats include PNG, XCF and JPG. Opaque formats
-include 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, PostScript or PDF 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.
-
-A section "Entitled XYZ" means a named subunit of the Document whose
-title either is precisely XYZ or contains XYZ in parentheses following
-text that translates XYZ in another language. (Here XYZ stands for a
-specific section name mentioned below, such as "Acknowledgements",
-"Dedications", "Endorsements", or "History".) To "Preserve the Title"
-of such a section when you modify the Document means that it remains a
-section "Entitled XYZ" according to this definition.
-
-The Document may include Warranty Disclaimers next to the notice which
-states that this License applies to the Document. These Warranty
-Disclaimers are considered to be included by reference in this
-License, but only as regards disclaiming warranties: any other
-implication that these Warranty Disclaimers may have is void and has
-no effect on the meaning of this License.
-
-
-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 (or copies in media that commonly have
-printed covers) 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 computer-network location from which the general network-using
-public has access to download using public-standard network protocols
-a complete Transparent copy of the Document, free of added material.
-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 fewer than five),
- unless they release you from this requirement.
-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", Preserve 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. For any section Entitled "Acknowledgements" or "Dedications",
- Preserve the Title of the section, 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 to be Entitled "Endorsements"
- or to conflict in title with any Invariant Section.
-O. Preserve any Warranty Disclaimers.
-
-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, and that you preserve all their Warranty Disclaimers.
-
-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, is called an "aggregate" if the copyright
-resulting from the compilation is not used to limit the legal rights
-of the compilation's users beyond what the individual works permit.
-When the Document is included in an aggregate, this License does not
-apply to the other works in the aggregate which 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 half of
-the entire aggregate, the Document's Cover Texts may be placed on
-covers that bracket the Document within the aggregate, or the
-electronic equivalent of covers if the Document is in electronic form.
-Otherwise they must appear on printed covers that bracket 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, and all the license notices in the
-Document, and any Warranty Disclaimers, provided that you also include
-the original English version of this License and the original versions
-of those notices and disclaimers. In case of a disagreement between
-the translation and the original version of this License or a notice
-or disclaimer, the original version will prevail.
-
-If a section in the Document is Entitled "Acknowledgements",
-"Dedications", or "History", the requirement (section 4) to Preserve
-its Title (section 1) will typically require changing the actual
-title.
-
-
-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.2
- or any later version published by the Free Software Foundation;
- with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
- A copy of the license is included in the section entitled "GNU
- Free Documentation License".
-
-If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the "with...Texts." line with this:
-
- with the Invariant Sections being LIST THEIR TITLES, with the
- Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-
-If you have Invariant Sections without Cover Texts, or some other
-combination of the three, merge those two alternatives to suit the
-situation.
-
-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.
-
+On Debian systems, the complete text of the GNU Free Documentation
+License can be found in `/usr/share/common-licenses/GFDL'.
Modified: kde-extras/komparator/trunk/debian/patches/02_autotools_update.diff
===================================================================
--- kde-extras/komparator/trunk/debian/patches/02_autotools_update.diff 2008-03-01 19:11:02 UTC (rev 9496)
+++ kde-extras/komparator/trunk/debian/patches/02_autotools_update.diff 2008-03-01 19:40:46 UTC (rev 9497)
@@ -1,113 +1,507 @@
-diff -Nrua a/admin/install-sh b/admin/install-sh
---- a/admin/install-sh 2006-08-03 14:25:42.000000000 +0200
-+++ b/admin/install-sh 2007-10-03 19:15:24.000000000 +0200
+--- a/admin/depcomp
++++ b/admin/depcomp
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # depcomp - compile a program generating dependencies as side-effects
+
+-scriptversion=2005-07-09.11
++scriptversion=2007-03-29.01
+
+-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
++# Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -91,7 +92,20 @@
+ ## gcc 3 implements dependency tracking that does exactly what
+ ## we want. Yay! Note: for some reason libtool 1.4 doesn't like
+ ## it if -MD -MP comes after the -MF stuff. Hmm.
+- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
++## Unfortunately, FreeBSD c89 acceptance of flags depends upon
++## the command line argument order; so add the flags where they
++## appear in depend2.am. Note that the slowdown incurred here
++## affects only configure: in makefiles, %FASTDEP% shortcuts this.
++ for arg
++ do
++ case $arg in
++ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
++ *) set fnord "$@" "$arg" ;;
++ esac
++ shift # fnord
++ shift # $arg
++ done
++ "$@"
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+@@ -201,34 +215,39 @@
+ # current directory. Also, the AIX compiler puts `$object:' at the
+ # start of each line; $object doesn't have directory information.
+ # Version 6 uses the directory in both cases.
+- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+- tmpdepfile="$stripped.u"
++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++ test "x$dir" = "x$object" && dir=
++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ if test "$libtool" = yes; then
++ tmpdepfile1=$dir$base.u
++ tmpdepfile2=$base.u
++ tmpdepfile3=$dir.libs/$base.u
+ "$@" -Wc,-M
+ else
++ tmpdepfile1=$dir$base.u
++ tmpdepfile2=$dir$base.u
++ tmpdepfile3=$dir$base.u
+ "$@" -M
+ fi
+ stat=$?
+
+- if test -f "$tmpdepfile"; then :
+- else
+- stripped=`echo "$stripped" | sed 's,^.*/,,'`
+- tmpdepfile="$stripped.u"
+- fi
+-
+ if test $stat -eq 0; then :
+ else
+- rm -f "$tmpdepfile"
++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ exit $stat
+ fi
+
++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
++ do
++ test -f "$tmpdepfile" && break
++ done
+ if test -f "$tmpdepfile"; then
+- outname="$stripped.o"
+ # Each line is of the form `foo.o: dependent.h'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
++ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
++ # That's a tab and a space in the [].
++ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ else
+ # The sourcefile does not contain any dependencies, so just
+ # store a dummy comment line, to avoid errors with the Makefile
+@@ -276,6 +295,46 @@
+ rm -f "$tmpdepfile"
+ ;;
+
++hp2)
++ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
++ # compilers, which have integrated preprocessors. The correct option
++ # to use with these is +Maked; it writes dependencies to a file named
++ # 'foo.d', which lands next to the object file, wherever that
++ # happens to be.
++ # Much of this is similar to the tru64 case; see comments there.
++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++ test "x$dir" = "x$object" && dir=
++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
++ if test "$libtool" = yes; then
++ tmpdepfile1=$dir$base.d
++ tmpdepfile2=$dir.libs/$base.d
++ "$@" -Wc,+Maked
++ else
++ tmpdepfile1=$dir$base.d
++ tmpdepfile2=$dir$base.d
++ "$@" +Maked
++ fi
++ stat=$?
++ if test $stat -eq 0; then :
++ else
++ rm -f "$tmpdepfile1" "$tmpdepfile2"
++ exit $stat
++ fi
++
++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
++ do
++ test -f "$tmpdepfile" && break
++ done
++ if test -f "$tmpdepfile"; then
++ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
++ # Add `dependent.h:' lines.
++ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
++ else
++ echo "#dummy" > "$depfile"
++ fi
++ rm -f "$tmpdepfile" "$tmpdepfile2"
++ ;;
++
+ tru64)
+ # The Tru64 compiler uses -MD to generate dependencies as a side
+ # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+@@ -288,13 +347,13 @@
+
+ if test "$libtool" = yes; then
+ # With Tru64 cc, shared objects can also be used to make a
+- # static library. This mecanism is used in libtool 1.4 series to
++ # static library. This mechanism is used in libtool 1.4 series to
+ # handle both shared and static libraries in a single compilation.
+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+ #
+ # With libtool 1.5 this exception was removed, and libtool now
+ # generates 2 separate objects for the 2 libraries. These two
+- # compilations output dependencies in in $dir.libs/$base.o.d and
++ # compilations output dependencies in $dir.libs/$base.o.d and
+ # in $dir$base.o.d. We have to check for both files, because
+ # one of the two compilations can be disabled. We should prefer
+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+--- a/admin/install-sh
++++ b/admin/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2005-11-07.23
-+scriptversion=2005-05-14.22
++scriptversion=2006-12-25.00
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
-@@ -58,21 +58,7 @@
- rmprog="${RMPROG-rm}"
- mkdirprog="${MKDIRPROG-mkdir}"
+@@ -39,52 +39,68 @@
+ # when there is no Makefile.
+ #
+ # This script is compatible with the BSD install script, but was written
+-# from scratch. It can only install one file at a time, a restriction
+-# shared with many OS's install programs.
++# from scratch.
++
++nl='
++'
++IFS=" "" $nl"
+ # set DOITPROG to echo to test this script
+
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+-doit="${DOITPROG-}"
++doit=${DOITPROG-}
++if test -z "$doit"; then
++ doit_exec=exec
++else
++ doit_exec=$doit
++fi
+
+-# put in absolute paths if you don't have them in your path; or use env. vars.
++# Put in absolute file names if you don't have them in your path;
++# or use environment vars.
+
+-mvprog="${MVPROG-mv}"
+-cpprog="${CPPROG-cp}"
+-chmodprog="${CHMODPROG-chmod}"
+-chownprog="${CHOWNPROG-chown}"
+-chgrpprog="${CHGRPPROG-chgrp}"
+-stripprog="${STRIPPROG-strip}"
+-rmprog="${RMPROG-rm}"
+-mkdirprog="${MKDIRPROG-mkdir}"
++chgrpprog=${CHGRPPROG-chgrp}
++chmodprog=${CHMODPROG-chmod}
++chownprog=${CHOWNPROG-chown}
++cmpprog=${CMPPROG-cmp}
++cpprog=${CPPROG-cp}
++mkdirprog=${MKDIRPROG-mkdir}
++mvprog=${MVPROG-mv}
++rmprog=${RMPROG-rm}
++stripprog=${STRIPPROG-strip}
++
++posix_glob='?'
++initialize_posix_glob='
++ test "$posix_glob" != "?" || {
++ if (set -f) 2>/dev/null; then
++ posix_glob=
++ else
++ posix_glob=:
++ fi
++ }
++'
+
-posix_glob=
--posix_mkdir=
--
+ posix_mkdir=
+
-# Symbolic mode for testing mkdir with directories.
-# It is the same as 755, but also tests that "u+" works.
-test_mode=u=rwx,g=rx,o=rx,u+wx
-
--# Desired mode of installed file.
--mode=0755
--
+ # Desired mode of installed file.
+ mode=0755
+
-# Desired mode of newly created intermediate directories.
-# It is empty if not known yet.
-intermediate_mode=
-
--chmodcmd=$chmodprog
-+chmodcmd="$chmodprog 0755"
++chgrpcmd=
+ chmodcmd=$chmodprog
chowncmd=
- chgrpcmd=
- stripcmd=
-@@ -125,7 +111,7 @@
+-chgrpcmd=
+-stripcmd=
++mvcmd=$mvprog
+ rmcmd="$rmprog -f"
+-mvcmd="$mvprog"
++stripcmd=
++
+ src=
+ dst=
+ dir_arg=
+-dstarg=
++dst_arg=
++
++copy_on_change=false
+ no_target_directory=
+-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
++usage="\
++Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+ or: $0 [OPTION]... SRCFILES... DIRECTORY
+ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+ or: $0 [OPTION]... -d DIRECTORIES...
+@@ -94,81 +110,86 @@
+ In the 4th, create DIRECTORIES.
+
+ Options:
+--c (ignored)
+--d create directories instead of installing files.
+--g GROUP $chgrpprog installed files to GROUP.
+--m MODE $chmodprog installed files to MODE.
+--o USER $chownprog installed files to USER.
+--s $stripprog installed files.
+--t DIRECTORY install into DIRECTORY.
+--T report an error if DSTFILE is a directory.
+---help display this help and exit.
+---version display version info and exit.
++ --help display this help and exit.
++ --version display version info and exit.
++
++ -c (ignored)
++ -C install only if different (preserve the last data modification time)
++ -d create directories instead of installing files.
++ -g GROUP $chgrpprog installed files to GROUP.
++ -m MODE $chmodprog installed files to MODE.
++ -o USER $chownprog installed files to USER.
++ -s $stripprog installed files.
++ -t DIRECTORY install into DIRECTORY.
++ -T report an error if DSTFILE is a directory.
+
+ Environment variables override the default commands:
+- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
++ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
++ RMPROG STRIPPROG
+ "
+
+-while test -n "$1"; do
++while test $# -ne 0; do
+ case $1 in
+- -c) shift
+- continue;;
++ -c) ;;
+
+- -d) dir_arg=true
+- shift
+- continue;;
++ -C) copy_on_change=true;;
++
++ -d) dir_arg=true;;
+
+ -g) chgrpcmd="$chgrpprog $2"
+- shift
+- shift
+- continue;;
++ shift;;
+
--help) echo "$usage"; exit $?;;
-- -m) mode=$2
-+ -m) chmodcmd="$chmodprog $2"
- shift
- shift
- continue;;
-@@ -178,8 +164,6 @@
+ -m) mode=$2
+- shift
+- shift
+- continue;;
++ case $mode in
++ *' '* | *' '* | *'
++'* | *'*'* | *'?'* | *'['*)
++ echo "$0: invalid mode: $mode" >&2
++ exit 1;;
++ esac
++ shift;;
+
+ -o) chowncmd="$chownprog $2"
+- shift
+- shift
+- continue;;
+-
+- -s) stripcmd=$stripprog
+- shift
+- continue;;
+-
+- -t) dstarg=$2
+- shift
+- shift
+- continue;;
+-
+- -T) no_target_directory=true
+- shift
+- continue;;
++ shift;;
++
++ -s) stripcmd=$stripprog;;
++
++ -t) dst_arg=$2
++ shift;;
++
++ -T) no_target_directory=true;;
+
+ --version) echo "$0 $scriptversion"; exit $?;;
+
+- *) # When -d is used, all remaining arguments are directories to create.
+- # When -t is used, the destination is already specified.
+- test -n "$dir_arg$dstarg" && break
+- # Otherwise, the last argument is the destination. Remove it from $@.
+- for arg
+- do
+- if test -n "$dstarg"; then
+- # $@ is not empty: it contains at least $arg.
+- set fnord "$@" "$dstarg"
+- shift # fnord
+- fi
+- shift # arg
+- dstarg=$arg
+- done
++ --) shift
+ break;;
++
++ -*) echo "$0: invalid option: $1" >&2
++ exit 1;;
++
++ *) break;;
+ esac
++ shift
+ done
+
+-if test -z "$1"; then
++if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
++ # When -d is used, all remaining arguments are directories to create.
++ # When -t is used, the destination is already specified.
++ # Otherwise, the last argument is the destination. Remove it from $@.
++ for arg
++ do
++ if test -n "$dst_arg"; then
++ # $@ is not empty: it contains at least $arg.
++ set fnord "$@" "$dst_arg"
++ shift # fnord
++ fi
++ shift # arg
++ dst_arg=$arg
++ done
++fi
++
++if test $# -eq 0; then
+ if test -z "$dir_arg"; then
+ echo "$0: no input file specified." >&2
+ exit 1
+@@ -178,13 +199,38 @@
exit 0
fi
-test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15
--
++if test -z "$dir_arg"; then
++ trap '(exit $?); exit' 1 2 13 15
++
++ # Set umask so as not to create temps with too-generous modes.
++ # However, 'strip' requires both read and write access to temps.
++ case $mode in
++ # Optimize common cases.
++ *644) cp_umask=133;;
++ *755) cp_umask=22;;
++
++ *[0-7])
++ if test -z "$stripcmd"; then
++ u_plus_rw=
++ else
++ u_plus_rw='% 200'
++ fi
++ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
++ *)
++ if test -z "$stripcmd"; then
++ u_plus_rw=
++ else
++ u_plus_rw=,u+rw
++ fi
++ cp_umask=$mode$u_plus_rw;;
++ esac
++fi
+
for src
do
# Protect names starting with `-'.
-@@ -189,11 +173,15 @@
+ case $src in
+- -*) src=./$src ;;
++ -*) src=./$src;;
+ esac
if test -n "$dir_arg"; then
- dst=$src
-- dstdir=$dst
-- test -d "$dstdir"
-- dstdir_status=$?
-- else
-+ src=
+@@ -202,22 +248,22 @@
+ exit 1
+ fi
-+ if test -d "$dst"; then
-+ mkdircmd=:
-+ chmodcmd=
-+ else
-+ mkdircmd=$mkdirprog
-+ fi
-+ else
- # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
- # might cause directories to be created, which would be especially bad
- # if $src (and thus $dsttmp) contains '*'.
-@@ -220,122 +208,53 @@
- echo "$0: $dstarg: Is a directory" >&2
+- if test -z "$dstarg"; then
++ if test -z "$dst_arg"; then
+ echo "$0: no destination specified." >&2
+ exit 1
+ fi
+
+- dst=$dstarg
++ dst=$dst_arg
+ # Protect names starting with `-'.
+ case $dst in
+- -*) dst=./$dst ;;
++ -*) dst=./$dst;;
+ esac
+
+ # If destination is a directory, append the input filename; won't work
+ # if double slashes aren't ignored.
+ if test -d "$dst"; then
+ if test -n "$no_target_directory"; then
+- echo "$0: $dstarg: Is a directory" >&2
++ echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
-- dstdir=$dst
-- dst=$dstdir/`basename "$src"`
-- dstdir_status=0
-- else
-- # Prefer dirname, but fall back on a substitute if dirname fails.
-- dstdir=`
-- (dirname "$dst") 2>/dev/null ||
-- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$dst" : 'X\(//\)[^/]' \| \
-- X"$dst" : 'X\(//\)$' \| \
+ dstdir=$dst
+@@ -230,14 +276,25 @@
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
- X"$dst" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-- echo X"$dst" |
++ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$dst" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'
-- `
--
-- test -d "$dstdir"
-- dstdir_status=$?
-+ dst=$dst/`basename "$src"`
- fi
- fi
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'
+ `
-- obsolete_mkdir_used=false
-+ # This sed command emulates the dirname command.
-+ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-
-- if test $dstdir_status != 0; then
-- case $posix_mkdir in
-- '')
+ test -d "$dstdir"
+@@ -250,83 +307,131 @@
+ if test $dstdir_status != 0; then
+ case $posix_mkdir in
+ '')
- posix_mkdir=false
- if $mkdirprog -m $test_mode -p -- / >/dev/null 2>&1; then
- posix_mkdir=true
@@ -116,32 +510,36 @@
- rmdir ./-m "$test_mode" ./-p ./-- 2>/dev/null
- fi ;;
- esac
-+ # Make sure that the destination directory exists.
-
+-
- if
- $posix_mkdir && {
-+ # Skip lots of stat calls in the usual case.
-+ if test ! -d "$dstdir"; then
-+ defaultIFS='
-+ '
-+ IFS="${IFS-$defaultIFS}"
++ # Create intermediate dirs using mode 755 as modified by the umask.
++ # This is like FreeBSD 'install' as of 1997-10-28.
++ umask=`umask`
++ case $stripcmd.$umask in
++ # Optimize common cases.
++ *[2367][2367]) mkdir_umask=$umask;;
++ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
-+ oIFS=$IFS
-+ # Some sh's can't handle IFS=/ for some reason.
-+ IFS='%'
-+ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-+ shift
-+ IFS=$oIFS
++ *[0-7])
++ mkdir_umask=`expr $umask + 22 \
++ - $umask % 100 % 40 + $umask % 20 \
++ - $umask % 10 % 4 + $umask % 2
++ `;;
++ *) mkdir_umask=$umask,go-w;;
++ esac
-- # With -d, create the new directory with the user-specified mode.
+ # With -d, create the new directory with the user-specified mode.
- # Otherwise, create it using the same intermediate mode that
- # mkdir -p would use when creating intermediate directories.
- # POSIX says that this mode is "$(umask -S),u+wx", so use that
- # if umask -S works.
-
-- if test -n "$dir_arg"; then
++ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
- mkdir_mode=$mode
-- else
++ mkdir_mode=-m$mode
+ else
- case $intermediate_mode in
- '')
- if umask_S=`(umask -S) 2>/dev/null`; then
@@ -151,24 +549,75 @@
- fi ;;
- esac
- mkdir_mode=$intermediate_mode
-- fi
--
++ mkdir_mode=
+ fi
+
- $mkdirprog -m "$mkdir_mode" -p -- "$dstdir"
- }
-- then :
-- else
-+ pathcomp=
++ posix_mkdir=false
++ case $umask in
++ *[123567][0-7][0-7])
++ # POSIX mkdir -p sets u+wx bits regardless of umask, which
++ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
++ ;;
++ *)
++ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
++ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
++
++ if (umask $mkdir_umask &&
++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
++ then
++ if test -z "$dir_arg" || {
++ # Check for POSIX incompatibilities with -m.
++ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
++ # other-writeable bit of parent directory when it shouldn't.
++ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
++ ls_ld_tmpdir=`ls -ld "$tmpdir"`
++ case $ls_ld_tmpdir in
++ d????-?r-*) different_mode=700;;
++ d????-?--*) different_mode=755;;
++ *) false;;
++ esac &&
++ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
++ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
++ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
++ }
++ }
++ then posix_mkdir=:
++ fi
++ rmdir "$tmpdir/d" "$tmpdir"
++ else
++ # Remove any dirs left behind by ancient mkdir implementations.
++ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
++ fi
++ trap '' 0;;
++ esac;;
++ esac
++
++ if
++ $posix_mkdir && (
++ umask $mkdir_umask &&
++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
++ )
+ then :
+ else
- # mkdir does not conform to POSIX, or it failed possibly due to
- # a race condition. Create the directory the slow way, step by
- # step, checking for races as we go.
--
-- case $dstdir in
++ # The umask is ridiculous, or mkdir does not conform to POSIX,
++ # or it failed possibly due to a race condition. Create the
++ # directory the slow way, step by step, checking for races as we go.
+
+ case $dstdir in
- /*) pathcomp=/ ;;
- -*) pathcomp=./ ;;
- *) pathcomp= ;;
-- esac
--
++ /*) prefix='/';;
++ -*) prefix='./';;
++ *) prefix='';;
+ esac
+
- case $posix_glob in
- '')
- if (set -f) 2>/dev/null; then
@@ -177,131 +626,181 @@
- posix_glob=false
- fi ;;
- esac
--
-- oIFS=$IFS
-- IFS=/
++ eval "$initialize_posix_glob"
+
+ oIFS=$IFS
+ IFS=/
- $posix_glob && set -f
-- set fnord $dstdir
-+ while test $# -ne 0 ; do
-+ pathcomp=$pathcomp$1
++ $posix_glob set -f
+ set fnord $dstdir
shift
- $posix_glob && set +f
-- IFS=$oIFS
--
-- for d
-- do
++ $posix_glob set +f
+ IFS=$oIFS
+
++ prefixes=
++
+ for d
+ do
- test "x$d" = x && continue
--
++ test -z "$d" && continue
+
- pathcomp=$pathcomp$d
- if test ! -d "$pathcomp"; then
- $mkdirprog "$pathcomp"
- # Don't fail if two instances are running concurrently.
- test -d "$pathcomp" || exit 1
-- fi
++ prefix=$prefix$d
++ if test -d "$prefix"; then
++ prefixes=
++ else
++ if $posix_mkdir; then
++ (umask=$mkdir_umask &&
++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
++ # Don't fail if two instances are running concurrently.
++ test -d "$prefix" || exit 1
++ else
++ case $prefix in
++ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
++ *) qprefix=$prefix;;
++ esac
++ prefixes="$prefixes '$qprefix'"
++ fi
+ fi
- pathcomp=$pathcomp/
-- done
++ prefix=$prefix/
+ done
- obsolete_mkdir_used=true
-- fi
-+ if test ! -d "$pathcomp"; then
-+ $mkdirprog "$pathcomp"
-+ # mkdir can fail with a `File exist' error in case several
-+ # install-sh are creating the directory concurrently. This
-+ # is OK.
-+ test -d "$pathcomp" || exit
++
++ if test -n "$prefixes"; then
++ # Don't fail if two instances are running concurrently.
++ (umask $mkdir_umask &&
++ eval "\$doit_exec \$mkdirprog $prefixes") ||
++ test -d "$dstdir" || exit 1
++ obsolete_mkdir_used=true
+ fi
-+ pathcomp=$pathcomp/
-+ done
+ fi
fi
- if test -n "$dir_arg"; then
-- { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-- { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+@@ -334,7 +439,7 @@
+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
- test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dst"; } || exit 1
-+ $doit $mkdircmd "$dst" \
-+ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-+ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-+
++ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
else
-+ dstfile=`basename "$dst"`
# Make a couple of temp file names in the proper directory.
- dsttmp=$dstdir/_inst.$$_
-@@ -343,6 +262,7 @@
-
- # Trap to clean up those temp files at exit.
+@@ -345,7 +450,7 @@
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-+ trap '(exit $?); exit' 1 2 13 15
# Copy the file name to the temp name.
- $doit $cpprog "$src" "$dsttmp" &&
-@@ -356,10 +276,10 @@
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+- $doit $cpprog "$src" "$dsttmp" &&
++ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+ # and set any options; do chmod last to preserve setuid bits.
+ #
+@@ -353,41 +458,54 @@
+ # ignore errors from any of these, just make sure not to ignore
+ # errors from the above "$doit $cpprog $src $dsttmp" command.
+ #
+- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dsttmp"; } &&
-+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-
- # Now rename the file to the real destination.
+-
+- # Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
-+ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
- || {
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
-@@ -371,12 +291,11 @@
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
+- || {
+- # The rename failed, perhaps because mv can't rename something else
+- # to itself, or perhaps because mv is so ancient that it does not
+- # support -f.
+-
+- # Now remove or move aside any old file at destination location.
+- # We try this two ways since rm can't unlink itself on some
+- # systems and the destination file might be busy for other
+- # reasons. In this case, the final cleanup might fail but the new
+- # file should still install successfully.
+- {
- if test -f "$dst"; then
- $doit $rmcmd -f "$dst" 2>/dev/null \
- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
-+ if test -f "$dstdir/$dstfile"; then
-+ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-+ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
- || {
+- || {
- echo "$0: cannot unlink or rename $dst" >&2
-+ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
- (exit 1); exit 1
- }
- else
-@@ -385,14 +304,17 @@
- } &&
-
- # Now rename the file to the real destination.
+- (exit 1); exit 1
+- }
+- else
+- :
+- fi
+- } &&
+-
+- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
-+ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
- }
+- }
- } || exit 1
--
-- trap '' 0
-- fi
-+ }
-+ fi || { (exit 1); exit 1; }
- done
++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
++ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
++ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
++
++ # If -C, don't bother to copy if it wouldn't change the file.
++ if $copy_on_change &&
++ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
++ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
++
++ eval "$initialize_posix_glob" &&
++ $posix_glob set -f &&
++ set X $old && old=:$2:$4:$5:$6 &&
++ set X $new && new=:$2:$4:$5:$6 &&
++ $posix_glob set +f &&
++
++ test "$old" = "$new" &&
++ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
++ then
++ rm -f "$dsttmp"
++ else
++ # Rename the file to the real destination.
++ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
++
++ # The rename failed, perhaps because mv can't rename something else
++ # to itself, or perhaps because mv is so ancient that it does not
++ # support -f.
++ {
++ # Now remove or move aside any old file at destination location.
++ # We try this two ways since rm can't unlink itself on some
++ # systems and the destination file might be busy for other
++ # reasons. In this case, the final cleanup might fail but the new
++ # file should still install successfully.
++ {
++ test ! -f "$dst" ||
++ $doit $rmcmd -f "$dst" 2>/dev/null ||
++ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
++ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
++ } ||
++ { echo "$0: cannot unlink or rename $dst" >&2
++ (exit 1); exit 1
++ }
++ } &&
++
++ # Now rename the file to the real destination.
++ $doit $mvcmd "$dsttmp" "$dst"
++ }
++ fi || exit 1
-+# The final little trick to "correctly" pass the exit status to the exit trap.
-+{
-+ (exit 0); exit 0
-+}
-+
- # Local variables:
- # eval: (add-hook 'write-file-hooks 'time-stamp)
- # time-stamp-start: "scriptversion="
-diff -Nrua a/admin/missing b/admin/missing
---- a/admin/missing 2006-08-03 14:25:42.000000000 +0200
-+++ b/admin/missing 2007-10-03 19:15:24.000000000 +0200
+ trap '' 0
+ fi
+--- a/admin/missing
++++ b/admin/missing
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2004-09-07.08
-+scriptversion=2005-06-08.21
++scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
@@ -316,7 +815,33 @@
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
-@@ -87,12 +87,12 @@
+@@ -33,6 +33,8 @@
+ fi
+
+ run=:
++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
++sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+ # In the cases where this matters, `missing' is being run in the
+ # srcdir already.
+@@ -44,7 +46,7 @@
+
+ msg="missing on your system"
+
+-case "$1" in
++case $1 in
+ --run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+@@ -77,6 +79,7 @@
+ aclocal touch file \`aclocal.m4'
+ autoconf touch file \`configure'
+ autoheader touch file \`config.h.in'
++ autom4te touch the output file, or create a stub one
+ automake touch all \`Makefile.in' files
+ bison create \`y.tab.[ch]', if possible, from existing .[ch]
+ flex create \`lex.yy.c', if possible, from existing .c
+@@ -87,12 +90,12 @@
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Send bug reports to <bug-automake at gnu.org>."
@@ -331,19 +856,134 @@
;;
-*)
-@@ -288,11 +288,18 @@
+@@ -106,7 +109,7 @@
+ # Now exit if we have it, but it failed. Also exit now if we
+ # don't have it and --version was passed (most likely to detect
+ # the program).
+-case "$1" in
++case $1 in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+@@ -135,7 +138,7 @@
+
+ # If it does not exist, or fails to run (possibly an outdated version),
+ # try to emulate it.
+-case "$1" in
++case $1 in
+ aclocal*)
+ echo 1>&2 "\
+ WARNING: \`$1' is $msg. You should only need it if
+@@ -164,7 +167,7 @@
+ test -z "$files" && files="config.h"
+ touch_files=
+ for f in $files; do
+- case "$f" in
++ case $f in
+ *:*) touch_files="$touch_files "`echo "$f" |
+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+ *) touch_files="$touch_files $f.in";;
+@@ -192,8 +195,8 @@
+ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+@@ -214,25 +217,25 @@
+ in order for those modifications to take effect. You can get
+ \`Bison' from any GNU archive site."
+ rm -f y.tab.c y.tab.h
+- if [ $# -ne 1 ]; then
++ if test $# -ne 1; then
+ eval LASTARG="\${$#}"
+- case "$LASTARG" in
++ case $LASTARG in
+ *.y)
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.c
+ fi
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.h
+ fi
+ ;;
+ esac
+ fi
+- if [ ! -f y.tab.h ]; then
++ if test ! -f y.tab.h; then
+ echo >y.tab.h
+ fi
+- if [ ! -f y.tab.c ]; then
++ if test ! -f y.tab.c; then
+ echo 'main() { return 0; }' >y.tab.c
+ fi
+ ;;
+@@ -244,18 +247,18 @@
+ in order for those modifications to take effect. You can get
+ \`Flex' from any GNU archive site."
+ rm -f lex.yy.c
+- if [ $# -ne 1 ]; then
++ if test $# -ne 1; then
+ eval LASTARG="\${$#}"
+- case "$LASTARG" in
++ case $LASTARG in
+ *.l)
+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" lex.yy.c
+ fi
+ ;;
+ esac
+ fi
+- if [ ! -f lex.yy.c ]; then
++ if test ! -f lex.yy.c; then
+ echo 'main() { return 0; }' >lex.yy.c
+ fi
+ ;;
+@@ -267,11 +270,9 @@
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+- if test -z "$file"; then
+- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+- fi
+- if [ -f "$file" ]; then
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
++ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+@@ -288,11 +289,24 @@
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
+- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
++ file=`sed -n '
++ /^@setfilename/{
++ s/.* \([^ ]*\) *$/\1/
++ p
++ q
++ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
@@ -353,3 +993,74 @@
touch $file
;;
+@@ -310,13 +324,13 @@
+ fi
+ firstarg="$1"
+ if shift; then
+- case "$firstarg" in
++ case $firstarg in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+- case "$firstarg" in
++ case $firstarg in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" "$@" && exit 0
+--- a/admin/mkinstalldirs
++++ b/admin/mkinstalldirs
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # mkinstalldirs --- make directory hierarchy
+
+-scriptversion=2005-06-29.22
++scriptversion=2006-05-11.19
+
+ # Original author: Noah Friedman <friedman at prep.ai.mit.edu>
+ # Created: 1993-05-16
+@@ -11,6 +11,9 @@
+ # bugs to <bug-automake at gnu.org> or send patches to
+ # <automake-patches at gnu.org>.
+
++nl='
++'
++IFS=" "" $nl"
+ errstatus=0
+ dirmode=
+
+--- a/admin/ylwrap
++++ b/admin/ylwrap
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # ylwrap - wrapper for lex/yacc invocations.
+
+-scriptversion=2005-05-14.22
++scriptversion=2007-11-22.22
+
+-# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
++# 2007 Free Software Foundation, Inc.
+ #
+ # Written by Tom Tromey <tromey at cygnus.com>.
+ #
+@@ -101,14 +101,14 @@
+ # FIXME: add hostname here for parallel makes that run commands on
+ # other machines. But that might take us over the 14-char limit.
+ dirname=ylwrap$$
+-trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
++trap "cd '`pwd`'; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
+ mkdir $dirname || exit 1
+
+ cd $dirname
+
+ case $# in
+- 0) $prog "$input" ;;
+- *) $prog "$@" "$input" ;;
++ 0) "$prog" "$input" ;;
++ *) "$prog" "$@" "$input" ;;
+ esac
+ ret=$?
+
Modified: kde-extras/komparator/trunk/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/komparator/trunk/debian/patches/03_libtool_update.diff 2008-03-01 19:11:02 UTC (rev 9496)
+++ kde-extras/komparator/trunk/debian/patches/03_libtool_update.diff 2008-03-01 19:40:46 UTC (rev 9497)
@@ -1,11 +1,11 @@
-diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in 2007-05-01 16:04:06.000000000 +0200
-+++ b/admin/libtool.m4.in 2007-10-03 19:15:24.000000000 +0200
+--- a/admin/libtool.m4.in
++++ b/admin/libtool.m4.in
@@ -1,28 +1,13 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
-+## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007
- ## Free Software Foundation, Inc.
+-## Free Software Foundation, Inc.
++## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007,
++## 2008 Free Software Foundation, Inc.
## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
##
-## This program is free software; you can redistribute it and/or modify
@@ -31,7 +31,7 @@
+## modifications, as long as this notice is preserved.
-# serial 47 AC_PROG_LIBTOOL
-+# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -44,7 +44,15 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -132,7 +117,7 @@
+@@ -110,7 +95,6 @@
+ AC_REQUIRE([AC_OBJEXT])dnl
+ AC_REQUIRE([AC_EXEEXT])dnl
+ dnl
+-
+ AC_LIBTOOL_SYS_MAX_CMD_LEN
+ AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+ AC_LIBTOOL_OBJDIR
+@@ -132,7 +116,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -53,7 +61,7 @@
[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references.
-@@ -152,7 +137,7 @@
+@@ -152,7 +136,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -62,7 +70,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -172,6 +157,7 @@
+@@ -172,6 +156,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -70,7 +78,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -184,22 +170,24 @@
+@@ -184,22 +169,24 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -98,7 +106,16 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -240,11 +228,58 @@
+@@ -209,6 +196,8 @@
+ ;;
+ esac
+
++_LT_REQUIRED_DARWIN_CHECKS
++
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ enable_win32_dll=yes, enable_win32_dll=no)
+@@ -240,11 +229,129 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -150,14 +167,85 @@
+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*
++$rm -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
++# _LT_REQUIRED_DARWIN_CHECKS
++# --------------------------
++# Check for some things on darwin
++AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
++ case $host_os in
++ rhapsody* | darwin*)
++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
++ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
++ [lt_cv_apple_cc_single_mod=no
++ if test -z "${LT_MULTI_MODULE}"; then
++ # By default we will add the -single_module flag. You can override
++ # by either setting the environment variable LT_MULTI_MODULE
++ # non-empty at configure time, or by adding -multi_module to the
++ # link flags.
++ echo "int foo(void){return 1;}" > conftest.c
++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++ -dynamiclib ${wl}-single_module conftest.c
++ if test -f libconftest.dylib; then
++ lt_cv_apple_cc_single_mod=yes
++ rm -rf libconftest.dylib*
++ fi
++ rm conftest.c
++ fi])
++ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
++ [lt_cv_ld_exported_symbols_list],
++ [lt_cv_ld_exported_symbols_list=no
++ save_LDFLAGS=$LDFLAGS
++ echo "_main" > conftest.sym
++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++ [lt_cv_ld_exported_symbols_list=yes],
++ [lt_cv_ld_exported_symbols_list=no])
++ LDFLAGS="$save_LDFLAGS"
++ ])
++ case $host_os in
++ rhapsody* | darwin1.[[0123]])
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++ darwin1.*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ darwin*)
++ # if running on 10.5 or later, the deployment target defaults
++ # to the OS version, if on x86, and 10.4, the deployment
++ # target defaults to 10.4. Don't you love it?
++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ 10.[[012]]*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ 10.*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ esac
++ ;;
++ esac
++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++ _lt_dar_single_mod='$single_module'
++ fi
++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++ else
++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++ fi
++ if test "$DSYMUTIL" != ":"; then
++ _lt_dsymutil="~$DSYMUTIL \$lib || :"
++ else
++ _lt_dsymutil=
++ fi
++ ;;
++ esac
++])
++
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
-@@ -254,12 +289,20 @@
+@@ -254,12 +361,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],
@@ -183,7 +271,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
])# _LT_AC_SYS_LIBPATH_AIX
-@@ -317,15 +360,15 @@
+@@ -317,15 +432,15 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -202,7 +290,7 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -490,18 +533,21 @@
+@@ -490,18 +605,21 @@
rm -rf conftest*
;;
@@ -228,7 +316,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -513,8 +559,10 @@
+@@ -513,8 +631,10 @@
esac
;;
*64-bit*)
@@ -240,7 +328,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -547,6 +595,22 @@
+@@ -547,6 +667,26 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -252,7 +340,11 @@
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
-+ *) LD="${LD-ld} -64" ;;
++ *)
++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++ LD="${LD-ld} -64"
++ fi
++ ;;
+ esac
+ ;;
+ esac
@@ -263,7 +355,7 @@
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-@@ -570,7 +634,7 @@
+@@ -570,7 +710,7 @@
AC_CACHE_CHECK([$1], [$2],
[$2=no
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
@@ -272,7 +364,7 @@
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.
-@@ -578,7 +642,7 @@
+@@ -578,7 +718,7 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -281,7 +373,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -588,8 +652,10 @@
+@@ -588,8 +728,10 @@
echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -294,7 +386,7 @@
$2=yes
fi
fi
-@@ -609,17 +675,23 @@
+@@ -609,22 +751,28 @@
# ------------------------------------------------------------
# Check whether the given compiler option works
AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
@@ -321,7 +413,13 @@
else
$2=yes
fi
-@@ -643,7 +715,7 @@
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+ ])
+
+@@ -643,7 +791,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -330,7 +428,7 @@
case $build_os in
msdosdjgpp*)
-@@ -672,24 +744,77 @@
+@@ -672,24 +820,77 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -426,7 +524,7 @@
;;
esac
])
-@@ -702,7 +827,7 @@
+@@ -702,7 +903,7 @@
# _LT_AC_CHECK_DLFCN
@@ -435,7 +533,7 @@
AC_DEFUN([_LT_AC_CHECK_DLFCN],
[AC_CHECK_HEADERS(dlfcn.h)dnl
])# _LT_AC_CHECK_DLFCN
-@@ -710,7 +835,7 @@
+@@ -710,7 +911,7 @@
# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
@@ -444,7 +542,7 @@
AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "$cross_compiling" = yes; then :
-@@ -776,17 +901,19 @@
+@@ -776,17 +977,19 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -466,7 +564,7 @@
esac
else :
# compilation failed
-@@ -798,7 +925,7 @@
+@@ -798,7 +1001,7 @@
# AC_LIBTOOL_DLOPEN_SELF
@@ -475,7 +573,7 @@
AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "x$enable_dlopen" != xyes; then
-@@ -835,7 +962,7 @@
+@@ -835,12 +1038,12 @@
lt_cv_dlopen_self=yes
])
;;
@@ -484,7 +582,22 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -869,7 +996,7 @@
+ [AC_CHECK_LIB([dld], [shl_load],
+- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [AC_CHECK_FUNC([dlopen],
+ [lt_cv_dlopen="dlopen"],
+ [AC_CHECK_LIB([dl], [dlopen],
+@@ -848,7 +1051,7 @@
+ [AC_CHECK_LIB([svld], [dlopen],
+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ [AC_CHECK_LIB([dld], [dld_link],
+- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ ])
+ ])
+ ])
+@@ -869,7 +1072,7 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -493,7 +606,7 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -882,7 +1009,7 @@
+@@ -882,7 +1085,7 @@
])
if test "x$lt_cv_dlopen_self" = xyes; then
@@ -502,7 +615,7 @@
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
_LT_AC_TRY_DLOPEN_SELF(
-@@ -914,7 +1041,8 @@
+@@ -914,7 +1117,8 @@
# ---------------------------------
# Check to see if options -c and -o are simultaneously supported by compiler
AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
@@ -512,7 +625,7 @@
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
-@@ -922,14 +1050,7 @@
+@@ -922,14 +1126,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -528,7 +641,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -937,7 +1058,7 @@
+@@ -937,7 +1134,7 @@
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
@@ -537,7 +650,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -949,13 +1070,18 @@
+@@ -949,13 +1146,18 @@
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -560,7 +673,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -1014,8 +1140,8 @@
+@@ -1014,8 +1216,8 @@
[AC_MSG_CHECKING([how to hardcode library paths into programs])
_LT_AC_TAGVAR(hardcode_action, $1)=
if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
@@ -571,7 +684,7 @@
# We can hardcode non-existant directories.
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -1064,6 +1190,7 @@
+@@ -1064,6 +1266,7 @@
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -579,7 +692,7 @@
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
-@@ -1072,7 +1199,7 @@
+@@ -1072,7 +1275,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -588,7 +701,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -1081,11 +1208,12 @@
+@@ -1081,11 +1284,12 @@
# -----------------------------
# PORTME Fill in your ld.so characteristics
AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
@@ -603,7 +716,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -1095,7 +1223,58 @@
+@@ -1095,7 +1299,58 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -663,7 +776,16 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -1160,7 +1339,7 @@
+@@ -1113,7 +1368,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[[4-9]]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -1160,7 +1415,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -672,7 +794,7 @@
;;
beos*)
-@@ -1169,7 +1348,7 @@
+@@ -1169,7 +1424,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -681,7 +803,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -1185,7 +1364,7 @@
+@@ -1185,7 +1440,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -690,7 +812,7 @@
need_version=no
need_lib_prefix=no
-@@ -1197,7 +1376,8 @@
+@@ -1197,7 +1452,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -700,7 +822,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -1227,7 +1407,7 @@
+@@ -1227,7 +1483,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -709,7 +831,7 @@
;;
esac
;;
-@@ -1250,13 +1430,9 @@
+@@ -1250,13 +1506,9 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -726,7 +848,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -1273,20 +1449,17 @@
+@@ -1273,20 +1525,17 @@
dynamic_linker=no
;;
@@ -758,7 +880,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -1304,14 +1477,19 @@
+@@ -1304,14 +1553,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -780,7 +902,7 @@
esac
;;
-@@ -1331,9 +1509,9 @@
+@@ -1331,9 +1585,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -792,7 +914,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -1348,7 +1526,7 @@
+@@ -1348,7 +1602,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -801,7 +923,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -1359,7 +1537,7 @@
+@@ -1359,7 +1613,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -810,7 +932,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -1371,6 +1549,18 @@
+@@ -1371,6 +1625,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -829,7 +951,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -1414,29 +1604,26 @@
+@@ -1414,29 +1680,26 @@
;;
# This must be Linux ELF.
@@ -866,7 +988,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -1446,6 +1633,18 @@
+@@ -1446,6 +1709,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -885,7 +1007,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -1455,7 +1654,7 @@
+@@ -1455,7 +1730,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -894,7 +1016,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -1483,8 +1682,13 @@
+@@ -1483,8 +1758,13 @@
openbsd*)
version_type=sunos
@@ -909,7 +1031,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -1504,7 +1708,7 @@
+@@ -1504,7 +1784,7 @@
os2*)
libname_spec='$name'
@@ -918,7 +1040,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -1522,11 +1726,8 @@
+@@ -1522,11 +1802,8 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -932,7 +1054,7 @@
;;
solaris*)
-@@ -1554,7 +1755,7 @@
+@@ -1554,7 +1831,7 @@
need_version=yes
;;
@@ -941,7 +1063,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -1587,6 +1788,29 @@
+@@ -1587,6 +1864,29 @@
fi
;;
@@ -971,11 +1093,18 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -1600,13 +1824,19 @@
+@@ -1600,13 +1900,26 @@
esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
+
++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -992,7 +1121,7 @@
[AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
[include additional configurations @<:@automatic@:>@])],
[tagnames="$withval"])
-@@ -1624,6 +1854,9 @@
+@@ -1624,6 +1937,9 @@
AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
fi
fi
@@ -1002,7 +1131,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -1650,7 +1883,9 @@
+@@ -1650,7 +1966,9 @@
case $tagname in
CXX)
@@ -1013,7 +1142,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -1712,7 +1947,7 @@
+@@ -1712,7 +2030,7 @@
# AC_LIBTOOL_WIN32_DLL
# --------------------
@@ -1022,7 +1151,7 @@
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
-@@ -1750,7 +1985,7 @@
+@@ -1750,7 +2068,7 @@
# AC_DISABLE_SHARED
# -----------------
@@ -1031,7 +1160,7 @@
AC_DEFUN([AC_DISABLE_SHARED],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_SHARED(no)
-@@ -1862,7 +2097,7 @@
+@@ -1862,7 +2180,7 @@
# AC_PATH_TOOL_PREFIX
# -------------------
@@ -1040,7 +1169,7 @@
AC_DEFUN([AC_PATH_TOOL_PREFIX],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_MSG_CHECKING([for $1])
-@@ -1886,7 +2121,7 @@
+@@ -1886,7 +2204,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -1049,7 +1178,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -1925,7 +2160,7 @@
+@@ -1925,7 +2243,7 @@
# AC_PATH_MAGIC
# -------------
@@ -1058,7 +1187,7 @@
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
-@@ -1996,7 +2231,7 @@
+@@ -1996,7 +2314,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -1067,7 +1196,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -2028,7 +2263,7 @@
+@@ -2028,7 +2346,7 @@
AC_DEFUN([AC_PROG_LD_GNU],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
@@ -1076,7 +1205,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -2055,6 +2290,15 @@
+@@ -2055,6 +2373,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -1092,7 +1221,7 @@
])# AC_PROG_LD_RELOAD_FLAG
-@@ -2063,7 +2307,7 @@
+@@ -2063,7 +2390,7 @@
# how to check for library dependencies
# -- PORTME fill in with the dynamic library characteristics
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
@@ -1101,10 +1230,19 @@
lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
-@@ -2088,44 +2332,42 @@
+@@ -2080,7 +2407,7 @@
+ # whether `pass_all' will *always* work, you probably want this one.
+
+ case $host_os in
+-aix4* | aix5*)
++aix[[4-9]]*)
lt_cv_deplibs_check_method=pass_all
;;
+@@ -2088,44 +2415,42 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
-bsdi4*)
+bsdi[[45]]*)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
@@ -1163,7 +1301,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -2141,7 +2383,7 @@
+@@ -2141,7 +2466,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -1172,7 +1310,7 @@
ia64*)
lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -2157,43 +2399,27 @@
+@@ -2157,43 +2482,27 @@
esac
;;
@@ -1229,7 +1367,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -2212,32 +2438,26 @@
+@@ -2212,32 +2521,26 @@
;;
openbsd*)
@@ -1266,7 +1404,7 @@
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-@@ -2258,10 +2478,13 @@
+@@ -2258,10 +2561,13 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1281,7 +1419,7 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -2281,36 +2504,43 @@
+@@ -2281,36 +2587,43 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -1349,7 +1487,7 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi])
NM="$lt_cv_path_NM"
-@@ -2342,13 +2572,13 @@
+@@ -2342,13 +2655,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl convenience library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1370,7 +1508,7 @@
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
-@@ -2367,13 +2597,13 @@
+@@ -2367,13 +2680,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl installable library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1391,7 +1529,7 @@
# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-@@ -2411,10 +2641,21 @@
+@@ -2411,10 +2724,21 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -1414,7 +1552,7 @@
# AC_LIBTOOL_F77
# --------------
-@@ -2454,7 +2695,7 @@
+@@ -2454,7 +2778,7 @@
# AC_LIBTOOL_RC
@@ -1423,7 +1561,7 @@
# enable support for Windows resource files
AC_DEFUN([AC_LIBTOOL_RC],
[AC_REQUIRE([LT_AC_PROG_RC])
-@@ -2480,43 +2721,16 @@
+@@ -2480,43 +2804,16 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -1472,7 +1610,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
-@@ -2530,9 +2744,9 @@
+@@ -2530,9 +2827,9 @@
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_SYS_LIB_STRIP
@@ -1484,7 +1622,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -2541,7 +2755,7 @@
+@@ -2541,7 +2838,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -1493,12 +1631,12 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -2550,48 +2764,11 @@
+@@ -2550,48 +2847,11 @@
fi
;;
-aix4*)
-+aix4* | aix5*)
++aix[[4-9]]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -1544,7 +1682,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -2616,7 +2793,7 @@
+@@ -2616,7 +2876,7 @@
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -1553,7 +1691,7 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -2628,6 +2805,7 @@
+@@ -2628,6 +2888,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
@@ -1561,8 +1699,11 @@
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -2645,21 +2823,25 @@
+@@ -2643,23 +2904,28 @@
+ _LT_AC_TAGVAR(predeps, $1)=
+ _LT_AC_TAGVAR(postdeps, $1)=
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
# Source file extension for C++ test sources.
-ac_ext=cc
@@ -1590,7 +1731,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -2670,18 +2852,18 @@
+@@ -2670,18 +2936,18 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -1612,7 +1753,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -2699,8 +2881,8 @@
+@@ -2699,8 +2965,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -1623,7 +1764,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -2726,7 +2908,7 @@
+@@ -2726,7 +2992,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -1632,22 +1773,27 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -2756,13 +2938,28 @@
+@@ -2748,7 +3014,7 @@
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -2756,8 +3022,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
- # KDE requires run time linking. Make it the default.
- aix_use_runtimelinking=yes
-- exp_sym_flag='-bexport'
-- no_entry_flag='-bnoentry'
-- fi
+ aix_use_runtimelinking=no
-
-- # When large executables or shared objects are built, AIX ld can
++
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
-+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+ case $ld_flag in
+ *-brtl*)
@@ -1659,15 +1805,10 @@
+ ;;
+ esac
+
-+ exp_sym_flag='-bexport'
-+ no_entry_flag='-bnoentry'
-+ fi
-+
-+ # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
-@@ -2774,7 +2971,7 @@
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
+@@ -2774,7 +3055,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
@@ -1676,7 +1817,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -2782,7 +2979,7 @@
+@@ -2782,7 +3063,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -1685,7 +1826,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -2793,8 +2990,12 @@
+@@ -2793,8 +3074,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -1698,7 +1839,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -2803,15 +3004,16 @@
+@@ -2803,15 +3088,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1719,7 +1860,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -2820,13 +3022,12 @@
+@@ -2820,13 +3106,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -1735,7 +1876,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -2835,16 +3036,26 @@
+@@ -2835,16 +3120,26 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1767,7 +1908,7 @@
chorus*)
case $cc_basename in
*)
-@@ -2858,12 +3069,12 @@
+@@ -2858,12 +3153,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1782,7 +1923,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -2872,70 +3083,81 @@
+@@ -2872,70 +3167,53 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1792,33 +1933,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
-+ darwin* | rhapsody*)
-+ case $host_os in
-+ rhapsody* | darwin1.[[012]])
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-+ ;;
-+ *) # Darwin 1.3 on
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[[012]])
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ ;;
-+ 10.*)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-+ ;;
-+ esac
-+ fi
-+ ;;
-+ esac
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
+-
- darwin* | rhapsody*)
- if test "$GXX" = yes; then
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -1829,14 +1944,24 @@
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+ if test "$GXX" = yes ; then
-+ lt_int_apple_cc_single_mod=no
++ darwin* | rhapsody*)
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
++ if test "$GXX" = yes ; then
+ output_verbose_link_cmd='echo'
-+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-+ lt_int_apple_cc_single_mod=yes
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ fi
-+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
@@ -1846,17 +1971,6 @@
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ fi
-+ _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
-+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ else
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ fi
-+ _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}'
-+ else
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
@@ -1915,7 +2029,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -2946,14 +3168,14 @@
+@@ -2946,14 +3224,14 @@
;;
esac
;;
@@ -1932,7 +2046,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -2970,12 +3192,12 @@
+@@ -2970,12 +3248,12 @@
# location of the library.
case $cc_basename in
@@ -1948,7 +2062,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -2984,11 +3206,11 @@
+@@ -2984,11 +3262,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1962,7 +2076,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -2998,33 +3220,20 @@
+@@ -2998,33 +3276,20 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -2003,7 +2117,7 @@
;;
*)
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -3035,17 +3244,20 @@
+@@ -3035,17 +3300,20 @@
esac
case $cc_basename in
@@ -2030,7 +2144,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -3061,12 +3273,15 @@
+@@ -3061,12 +3329,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -2050,7 +2164,7 @@
;;
esac
fi
-@@ -3077,11 +3292,25 @@
+@@ -3077,11 +3348,25 @@
;;
esac
;;
@@ -2078,7 +2192,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -3092,9 +3321,9 @@
+@@ -3092,9 +3377,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -2090,7 +2204,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -3103,16 +3332,16 @@
+@@ -3103,16 +3388,16 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -2111,7 +2225,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -3130,20 +3359,44 @@
+@@ -3130,20 +3415,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -2144,7 +2258,7 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- cxx)
-+ pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -2162,7 +2276,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -3159,6 +3412,29 @@
+@@ -3159,6 +3468,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'
;;
@@ -2192,7 +2306,7 @@
esac
;;
lynxos*)
-@@ -3171,7 +3447,7 @@
+@@ -3171,7 +3503,7 @@
;;
mvs*)
case $cc_basename in
@@ -2201,7 +2315,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -3181,7 +3457,7 @@
+@@ -3181,7 +3513,7 @@
;;
esac
;;
@@ -2210,7 +2324,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -3192,15 +3468,35 @@
+@@ -3192,15 +3524,35 @@
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
@@ -2248,7 +2362,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3210,14 +3506,14 @@
+@@ -3210,14 +3562,14 @@
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -2266,7 +2380,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3235,7 +3531,7 @@
+@@ -3235,7 +3587,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2275,7 +2389,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3254,13 +3550,13 @@
+@@ -3254,13 +3606,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -2291,7 +2405,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3269,17 +3565,17 @@
+@@ -3269,17 +3621,17 @@
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
@@ -2313,7 +2427,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -3298,7 +3594,7 @@
+@@ -3298,7 +3650,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2322,7 +2436,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3319,27 +3615,14 @@
+@@ -3319,27 +3671,14 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -2352,7 +2466,7 @@
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3352,36 +3635,28 @@
+@@ -3352,36 +3691,28 @@
;;
solaris*)
case $cc_basename in
@@ -2398,7 +2512,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -3389,9 +3664,9 @@
+@@ -3389,9 +3720,9 @@
# in the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
@@ -2410,7 +2524,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -3401,9 +3676,9 @@
+@@ -3401,9 +3732,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -2422,7 +2536,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -3412,9 +3687,9 @@
+@@ -3412,9 +3743,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -2434,7 +2548,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -3423,16 +3698,73 @@
+@@ -3423,16 +3754,73 @@
fi
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -2510,7 +2624,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3469,8 +3801,6 @@
+@@ -3469,8 +3857,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2519,7 +2633,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -3488,7 +3818,7 @@
+@@ -3488,12 +3874,13 @@
])# AC_LIBTOOL_LANG_CXX_CONFIG
# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2528,7 +2642,14 @@
# Figure out "hidden" library dependencies from verbose
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
-@@ -3542,7 +3872,7 @@
+ # objects, libraries and library flags.
+-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ dnl we can't use the lt_simple_compile_test_code here,
+ dnl because it contains code intended for an executable,
+ dnl not a library. It's possible we should let each
+@@ -3542,7 +3929,7 @@
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
@@ -2537,7 +2658,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -3582,7 +3912,7 @@
+@@ -3582,7 +3969,7 @@
fi
;;
@@ -2546,10 +2667,15 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -3618,13 +3948,70 @@
+@@ -3618,13 +4005,74 @@
$rm -f confest.$objext
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
++if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
++
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
@@ -2606,7 +2732,6 @@
+ ;;
+esac
+])
-+
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
@@ -2618,7 +2743,7 @@
# Ensure that the configuration vars for the C compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -3660,20 +4047,31 @@
+@@ -3660,20 +4108,31 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -2653,7 +2778,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -3683,7 +4081,7 @@
+@@ -3683,7 +4142,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -2662,20 +2787,20 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -3691,8 +4089,10 @@
+@@ -3691,8 +4150,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix4*)
- test "$enable_shared" = yes && enable_static=no
-+aix4* | aix5*)
++aix[[4-9]]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -3702,8 +4102,6 @@
+@@ -3702,8 +4163,6 @@
test "$enable_shared" = yes || enable_static=yes
AC_MSG_RESULT([$enable_static])
@@ -2684,7 +2809,7 @@
_LT_AC_TAGVAR(GCC, $1)="$G77"
_LT_AC_TAGVAR(LD, $1)="$LD"
-@@ -3713,8 +4111,6 @@
+@@ -3713,8 +4172,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2693,7 +2818,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -3740,23 +4136,30 @@
+@@ -3740,23 +4197,30 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -2726,7 +2851,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
## the running order or otherwise move them around unless you know exactly
-@@ -3768,8 +4171,6 @@
+@@ -3768,8 +4232,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2735,7 +2860,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -3779,7 +4180,7 @@
+@@ -3779,7 +4241,7 @@
# AC_LIBTOOL_LANG_RC_CONFIG
@@ -2744,7 +2869,7 @@
# Ensure that the configuration vars for the Windows resource compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -3795,7 +4196,7 @@
+@@ -3795,7 +4257,7 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -2753,7 +2878,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -3803,11 +4204,16 @@
+@@ -3803,11 +4265,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2770,7 +2895,7 @@
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
-@@ -3833,11 +4239,12 @@
+@@ -3833,11 +4300,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -2785,7 +2910,15 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -3878,6 +4285,7 @@
+@@ -3863,6 +4331,7 @@
+ _LT_AC_TAGVAR(predeps, $1) \
+ _LT_AC_TAGVAR(postdeps, $1) \
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
+ _LT_AC_TAGVAR(archive_cmds, $1) \
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+ _LT_AC_TAGVAR(postinstall_cmds, $1) \
+@@ -3878,6 +4347,7 @@
_LT_AC_TAGVAR(module_cmds, $1) \
_LT_AC_TAGVAR(module_expsym_cmds, $1) \
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
@@ -2793,7 +2926,7 @@
_LT_AC_TAGVAR(exclude_expsyms, $1) \
_LT_AC_TAGVAR(include_expsyms, $1); do
-@@ -3887,7 +4295,7 @@
+@@ -3887,7 +4357,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -2802,16 +2935,16 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -3924,7 +4332,7 @@
+@@ -3924,7 +4394,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
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -3953,11 +4361,11 @@
+@@ -3953,11 +4423,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2825,7 +2958,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -3988,6 +4396,12 @@
+@@ -3988,6 +4458,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -2838,7 +2971,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -3999,6 +4413,9 @@
+@@ -3999,6 +4475,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -2848,7 +2981,7 @@
# A language-specific compiler.
CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-@@ -4018,7 +4435,7 @@
+@@ -4018,7 +4497,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -2857,7 +2990,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -4049,7 +4466,7 @@
+@@ -4049,7 +4528,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -2866,7 +2999,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -4064,7 +4481,7 @@
+@@ -4064,7 +4543,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
@@ -2875,7 +3008,18 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -4240,7 +4657,7 @@
+@@ -4152,6 +4631,10 @@
+ # shared library.
+ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+@@ -4240,7 +4723,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -2884,7 +3028,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-@@ -4293,7 +4710,10 @@
+@@ -4293,7 +4776,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -2896,7 +3040,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -4320,6 +4740,7 @@
+@@ -4320,6 +4806,7 @@
# ---------------------------------
AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
[AC_REQUIRE([AC_CANONICAL_HOST])
@@ -2904,7 +3048,7 @@
AC_REQUIRE([AC_PROG_NM])
AC_REQUIRE([AC_OBJEXT])
# Check for command to grab the raw symbol name followed by C symbol from nm.
-@@ -4335,9 +4756,6 @@
+@@ -4335,9 +4822,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
@@ -2914,7 +3058,7 @@
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-@@ -4359,14 +4777,30 @@
+@@ -4359,14 +4843,30 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -2947,7 +3091,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -4384,14 +4818,17 @@
+@@ -4384,14 +4884,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -2967,7 +3111,16 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -4530,12 +4967,14 @@
+@@ -4481,7 +4984,7 @@
+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+ cat conftest.$ac_ext >&5
+ fi
+- rm -f conftest* conftst*
++ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+ if test "$pipe_works" = yes; then
+@@ -4530,13 +5033,16 @@
# like `-m68040'.
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -2979,12 +3132,15 @@
+ 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).
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ # 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'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
darwin* | rhapsody*)
-@@ -4547,6 +4986,10 @@
+ # PIC is the default on this platform
+@@ -4547,6 +5053,10 @@
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -2995,7 +3151,7 @@
sysv4*MP*)
if test -d /usr/nec; then
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -4555,7 +4998,7 @@
+@@ -4555,7 +5065,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -3004,7 +3160,16 @@
hppa*64*|ia64*)
;;
*)
-@@ -4580,18 +5023,28 @@
+@@ -4569,7 +5079,7 @@
+ esac
+ else
+ case $host_os in
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+@@ -4580,18 +5090,28 @@
;;
chorus*)
case $cc_basename in
@@ -3036,7 +3201,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -4599,22 +5052,22 @@
+@@ -4599,22 +5119,22 @@
;;
esac
;;
@@ -3065,7 +3230,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -4627,9 +5080,13 @@
+@@ -4627,9 +5147,13 @@
;;
esac
;;
@@ -3080,7 +3245,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -4638,20 +5095,26 @@
+@@ -4638,20 +5162,26 @@
;;
esac
;;
@@ -3102,7 +3267,7 @@
- ;;
- cxx)
+ ;;
-+ pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler.
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
@@ -3112,7 +3277,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -4659,6 +5122,14 @@
+@@ -4659,6 +5189,14 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
*)
@@ -3127,7 +3292,7 @@
;;
esac
;;
-@@ -4668,25 +5139,25 @@
+@@ -4668,25 +5206,25 @@
;;
mvs*)
case $cc_basename in
@@ -3158,7 +3323,7 @@
# Digital/Compaq C++
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -4700,24 +5171,15 @@
+@@ -4700,24 +5238,15 @@
;;
psos*)
;;
@@ -3185,7 +3350,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -4727,12 +5189,12 @@
+@@ -4727,12 +5256,12 @@
;;
sunos4*)
case $cc_basename in
@@ -3200,7 +3365,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -4742,7 +5204,7 @@
+@@ -4742,7 +5271,7 @@
;;
tandem*)
case $cc_basename in
@@ -3209,7 +3374,7 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -4750,7 +5212,14 @@
+@@ -4750,7 +5279,14 @@
;;
esac
;;
@@ -3225,7 +3390,7 @@
;;
vxworks*)
;;
-@@ -4781,13 +5250,15 @@
+@@ -4781,14 +5317,17 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -3238,12 +3403,15 @@
+ 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'
+ # 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'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
-@@ -4797,6 +5268,11 @@
+ darwin* | rhapsody*)
+@@ -4797,6 +5336,11 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -3255,7 +3423,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -4813,7 +5289,7 @@
+@@ -4813,7 +5357,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -3264,7 +3432,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -4839,8 +5315,18 @@
+@@ -4839,18 +5383,29 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -3283,8 +3451,12 @@
+ 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'
-@@ -4850,7 +5336,7 @@
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -3293,7 +3465,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -4873,18 +5359,41 @@
+@@ -4873,18 +5428,41 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -3337,7 +3509,7 @@
esac
;;
-@@ -4894,15 +5403,19 @@
+@@ -4894,15 +5472,19 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -3361,7 +3533,7 @@
;;
sunos4*)
-@@ -4911,7 +5424,7 @@
+@@ -4911,7 +5493,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -3370,7 +3542,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4924,6 +5437,17 @@
+@@ -4924,6 +5506,17 @@
fi
;;
@@ -3388,7 +3560,16 @@
uts4*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4951,7 +5475,7 @@
+@@ -4942,7 +5535,7 @@
+ #
+ if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
+ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+ "" | " "*) ;;
+@@ -4951,7 +5544,7 @@
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
@@ -3397,7 +3578,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -4960,6 +5484,16 @@
+@@ -4960,6 +5553,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
;;
esac
@@ -3407,14 +3588,14 @@
+#
+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-+ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+ $lt_tmp_static_flag,
+ [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
])
-@@ -4967,7 +5501,8 @@
+@@ -4967,11 +5570,12 @@
# ------------------------------------
# See if the linker supports building shared libraries.
AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
@@ -3424,7 +3605,12 @@
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
-@@ -4984,7 +5519,10 @@
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+@@ -4984,12 +5588,16 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -3436,7 +3622,13 @@
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -5010,7 +5548,7 @@
+ ;;
+ esac
++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ ],[
+ runpath_var=
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -5010,7 +5618,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -3445,9 +3637,19 @@
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always*
-@@ -5027,7 +5565,8 @@
+@@ -5020,14 +5628,17 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
++dnl Note also adjust exclude_expsyms for C++ above.
extract_expsyms_cmds=
-
+ # Just being paranoid about ensuring that cc_basename is set.
@@ -3455,7 +3657,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -5037,6 +5576,10 @@
+@@ -5037,6 +5648,10 @@
with_gnu_ld=no
fi
;;
@@ -3466,7 +3668,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -5047,6 +5590,27 @@
+@@ -5047,9 +5662,30 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -3493,8 +3695,12 @@
+
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
-@@ -5084,7 +5648,7 @@
+- aix3* | aix4* | aix5*)
++ aix[[3-9]]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -5084,7 +5720,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -3503,7 +3709,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -5094,13 +5658,13 @@
+@@ -5094,13 +5730,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -3520,19 +3726,17 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -5109,23 +5673,79 @@
+@@ -5109,23 +5745,79 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
-- ld_shlibs=no
++ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
-- netbsd*)
++ fi
++ ;;
++
+ interix[[3-9]]*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -3584,11 +3788,13 @@
+ $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
+ else
+- ld_shlibs=no
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
+ fi
+ ;;
+
+- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -3606,7 +3812,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<EOF 1>&2
-@@ -5139,13 +5759,40 @@
+@@ -5139,13 +5831,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3649,7 +3855,7 @@
sunos4*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -5155,24 +5802,19 @@
+@@ -5155,24 +5874,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3681,7 +3887,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -5184,7 +5826,7 @@
+@@ -5184,14 +5898,14 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -3690,7 +3896,15 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -5206,9 +5848,21 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -5206,9 +5920,21 @@
else
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
fi
@@ -3699,7 +3913,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
-+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
@@ -3714,7 +3928,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -5225,7 +5879,7 @@
+@@ -5225,7 +5951,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
@@ -3723,7 +3937,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -5233,7 +5887,7 @@
+@@ -5233,7 +5959,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -3732,7 +3946,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -5244,8 +5898,12 @@
+@@ -5244,8 +5970,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -3745,7 +3959,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -5253,30 +5911,30 @@
+@@ -5253,30 +5983,30 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -3787,7 +4001,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -5285,13 +5943,11 @@
+@@ -5285,13 +6015,11 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -3804,7 +4018,7 @@
fi
fi
;;
-@@ -5304,7 +5960,7 @@
+@@ -5304,7 +6032,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -3813,7 +4027,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -5314,69 +5970,69 @@
+@@ -5314,69 +6042,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -3907,11 +4121,10 @@
- fi
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ _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 -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~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}'
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ else
+ case $cc_basename in
+ xlc*)
@@ -3930,7 +4143,7 @@
;;
dgux*)
-@@ -5409,8 +6065,8 @@
+@@ -5409,8 +6136,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3941,7 +4154,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -5418,7 +6074,7 @@
+@@ -5418,7 +6145,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -3950,7 +4163,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -5432,47 +6088,62 @@
+@@ -5432,47 +6159,62 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
@@ -4019,25 +4232,25 @@
+ hppa*64*|ia64*)
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- ;;
+- ia64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-- ia64*)
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=no
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-- ;;
+ ;;
*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-@@ -5486,7 +6157,7 @@
+@@ -5486,7 +6228,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -4046,7 +4259,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -5496,7 +6167,7 @@
+@@ -5496,7 +6238,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -4055,7 +4268,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -5516,23 +6187,28 @@
+@@ -5516,23 +6258,28 @@
;;
openbsd*)
@@ -4100,7 +4313,7 @@
fi
;;
-@@ -5540,14 +6216,14 @@
+@@ -5540,14 +6287,14 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -4117,7 +4330,7 @@
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -5559,13 +6235,13 @@
+@@ -5559,13 +6306,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -4133,7 +4346,7 @@
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -5573,21 +6249,15 @@
+@@ -5573,21 +6320,15 @@
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -4159,7 +4372,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -5596,8 +6266,17 @@
+@@ -5596,8 +6337,17 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -4179,7 +4392,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -5606,7 +6285,7 @@
+@@ -5606,7 +6356,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -4188,7 +4401,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -5654,36 +6333,45 @@
+@@ -5654,36 +6404,45 @@
fi
;;
@@ -4255,7 +4468,7 @@
;;
uts4*)
-@@ -5701,11 +6389,6 @@
+@@ -5701,11 +6460,6 @@
AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
@@ -4267,7 +4480,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -5725,14 +6408,15 @@
+@@ -5725,14 +6479,15 @@
# to ld, don't add -lc before -lgcc.
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
@@ -4285,7 +4498,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -5827,6 +6511,30 @@
+@@ -5827,6 +6582,30 @@
[AC_CHECK_TOOL(RC, windres, no)
])
@@ -4316,7 +4529,7 @@
############################################################
# NOTE: This macro has been submitted for inclusion into #
# GNU Autoconf as AC_PROG_SED. When it is available in #
-@@ -5849,18 +6557,19 @@
+@@ -5849,18 +6628,19 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4338,16 +4551,15 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -5887,5 +6596,6 @@
+@@ -5887,5 +6667,6 @@
done
])
SED=$lt_cv_path_SED
+AC_SUBST([SED])
AC_MSG_RESULT([$SED])
])
-diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
---- a/admin/ltmain.sh 2006-08-03 14:25:42.000000000 +0200
-+++ b/admin/ltmain.sh 2007-10-03 19:15:24.000000000 +0200
+--- a/admin/ltmain.sh
++++ b/admin/ltmain.sh
@@ -1,8 +1,8 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -4355,7 +4567,7 @@
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-+# 2007 Free Software Foundation, Inc.
++# 2007, 2008 Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
#
# This program is free software; you can redistribute it and/or modify
@@ -4382,8 +4594,8 @@
+
+PROGRAM=ltmain.sh
+PACKAGE=libtool
-+VERSION="1.5.24 Debian 1.5.24-1"
-+TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
++VERSION="1.5.26 Debian 1.5.26-1"
++TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
+
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -4455,7 +4667,7 @@
;;
esac
-@@ -86,20 +113,24 @@
+@@ -86,20 +113,30 @@
# 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.
@@ -4464,15 +4676,20 @@
-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
++lt_env=
++for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+ eval "if test \"\${$lt_var+set}\" = set; then
+ save_$lt_var=\$$lt_var
++ lt_env=\"$lt_var=\$$lt_var \$lt_env\"
+ $lt_var=C
+ export $lt_var
+ fi"
+done
++
++if test -n "$lt_env"; then
++ lt_env="env $lt_env"
+ fi
# Make sure IFS has a sensible default
-: ${IFS=" "}
@@ -4488,7 +4705,7 @@
fi
# Global variables.
-@@ -111,17 +142,62 @@
+@@ -111,17 +148,62 @@
show="$echo"
show_help=
execute_dlfiles=
@@ -4552,7 +4769,7 @@
win32_libid_type="unknown"
win32_fileres=`file -L $1 2>/dev/null`
case $win32_fileres in
-@@ -130,17 +206,22 @@
+@@ -130,17 +212,22 @@
;;
*ar\ archive*) # could be an import, or static
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
@@ -4583,7 +4800,7 @@
win32_libid_type="x86 DLL"
;;
*executable*) # but shell scripts are "executable" too...
-@@ -154,9 +235,191 @@
+@@ -154,9 +241,191 @@
$echo $win32_libid_type
}
@@ -4775,7 +4992,7 @@
# Parse our command line options once, thoroughly.
while test "$#" -gt 0
do
-@@ -176,12 +439,13 @@
+@@ -176,12 +445,13 @@
;;
tag)
tagname="$arg"
@@ -4790,7 +5007,7 @@
;;
esac
-@@ -191,10 +455,10 @@
+@@ -191,10 +461,10 @@
# not specially marked.
;;
*)
@@ -4803,7 +5020,7 @@
else
$echo "$progname: ignoring unknown tag $tagname" 1>&2
fi
-@@ -218,26 +482,28 @@
+@@ -218,26 +488,28 @@
;;
--version)
@@ -4816,7 +5033,7 @@
+ echo "\
+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
+
-+Copyright (C) 2007 Free Software Foundation, Inc.
++Copyright (C) 2008 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 $?
@@ -4841,7 +5058,7 @@
;;
--dry-run | -n)
-@@ -256,7 +522,7 @@
+@@ -256,7 +528,7 @@
else
$echo "disable static libraries"
fi
@@ -4850,7 +5067,7 @@
;;
--finish) mode="finish" ;;
-@@ -268,13 +534,19 @@
+@@ -268,13 +540,19 @@
--quiet | --silent)
show=:
@@ -4871,7 +5088,7 @@
;;
-dlopen)
-@@ -285,7 +557,7 @@
+@@ -285,7 +563,7 @@
-*)
$echo "$modename: unrecognized option \`$arg'" 1>&2
$echo "$help" 1>&2
@@ -4880,7 +5097,7 @@
;;
*)
-@@ -298,9 +570,21 @@
+@@ -298,9 +576,21 @@
if test -n "$prevopt"; then
$echo "$modename: option \`$prevopt' requires an argument" 1>&2
$echo "$help" 1>&2
@@ -4903,7 +5120,7 @@
# If this variable is set in any of the actions, the command in it
# will be execed at the end. This prevents here-documents from being
# left over by shells.
-@@ -311,7 +595,7 @@
+@@ -311,7 +601,7 @@
# Infer the operation mode.
if test -z "$mode"; then
$echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
@@ -4912,7 +5129,7 @@
case $nonopt in
*cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
mode=link
-@@ -354,7 +638,7 @@
+@@ -354,7 +644,7 @@
if test -n "$execute_dlfiles" && test "$mode" != execute; then
$echo "$modename: unrecognized option \`-dlopen'" 1>&2
$echo "$help" 1>&2
@@ -4921,7 +5138,7 @@
fi
# Change the help message to a mode-specific one.
-@@ -369,13 +653,15 @@
+@@ -369,13 +659,15 @@
# Get the compilation command and the source file.
base_compile=
srcfile="$nonopt" # always keep a non-empty value in "srcfile"
@@ -4938,7 +5155,7 @@
arg )
# do not "continue". Instead, add this to base_compile
lastarg="$arg"
-@@ -394,24 +680,19 @@
+@@ -394,24 +686,19 @@
-o)
if test -n "$libobj" ; then
$echo "$modename: you cannot specify \`-o' more than once" 1>&2
@@ -4951,16 +5168,16 @@
- -static)
- build_old_libs=yes
+- continue
+- ;;
+-
+- -prefer-pic)
+- pic_mode=yes
+ -static | -prefer-pic | -prefer-non-pic)
+ later="$later $arg"
continue
;;
-- -prefer-pic)
-- pic_mode=yes
-- continue
-- ;;
--
- -prefer-non-pic)
- pic_mode=no
+ -no-suppress)
@@ -4968,7 +5185,7 @@
continue
;;
-@@ -424,7 +705,7 @@
+@@ -424,7 +711,7 @@
args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
lastarg=
save_ifs="$IFS"; IFS=','
@@ -4977,7 +5194,7 @@
IFS="$save_ifs"
# Double-quote args containing other shell metacharacters.
-@@ -462,7 +743,10 @@
+@@ -462,7 +749,10 @@
case $lastarg in
# Double-quote args containing other shell metacharacters.
# Many Bourne shells cannot handle close brackets correctly
@@ -4989,7 +5206,7 @@
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
lastarg="\"$lastarg\""
;;
-@@ -474,11 +758,11 @@
+@@ -474,11 +764,11 @@
case $arg_mode in
arg)
$echo "$modename: you must specify an argument for -Xcompile"
@@ -5003,7 +5220,7 @@
;;
*)
# Get the name of the library object.
-@@ -500,9 +784,10 @@
+@@ -500,9 +790,11 @@
*.class) xform=class ;;
*.cpp) xform=cpp ;;
*.cxx) xform=cxx ;;
@@ -5012,10 +5229,11 @@
*.for) xform=for ;;
*.java) xform=java ;;
+ *.obj) xform=obj ;;
++ *.sx) xform=sx ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-@@ -511,51 +796,39 @@
+@@ -511,51 +803,39 @@
*.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
*)
$echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
@@ -5094,7 +5312,7 @@
objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
if test "X$xdir" = "X$obj"; then
-@@ -568,7 +841,7 @@
+@@ -568,7 +848,7 @@
if test -z "$base_compile"; then
$echo "$modename: you must specify a compilation command" 1>&2
$echo "$help" 1>&2
@@ -5103,7 +5321,7 @@
fi
# Delete any leftover library objects.
-@@ -579,7 +852,7 @@
+@@ -579,7 +859,7 @@
fi
$run $rm $removelist
@@ -5112,7 +5330,7 @@
# On Cygwin there's no "real" PIC flag so we must build both object types
case $host_os in
-@@ -598,7 +871,7 @@
+@@ -598,7 +878,7 @@
output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
removelist="$removelist $output_obj $lockfile"
@@ -5121,7 +5339,7 @@
else
output_obj=
need_locks=no
-@@ -608,7 +881,7 @@
+@@ -608,7 +888,7 @@
# Lock this critical section if it is needed
# We use this script file to make the link, it avoids creating a new file
if test "$need_locks" = yes; then
@@ -5130,7 +5348,7 @@
$show "Waiting for $lockfile to be removed"
sleep 2
done
-@@ -626,14 +899,19 @@
+@@ -626,14 +906,19 @@
compiler."
$run $rm $removelist
@@ -5152,7 +5370,7 @@
$run $rm "$libobj" "${libobj}T"
-@@ -655,18 +933,18 @@
+@@ -655,18 +940,18 @@
fbsd_hideous_sh_bug=$base_compile
if test "$pic_mode" != no; then
@@ -5176,8 +5394,12 @@
fi
fi
-@@ -681,7 +959,7 @@
- if $run eval "$command"; then :
+@@ -678,10 +963,10 @@
+ $run $rm "$lobj" "$output_obj"
+
+ $show "$command"
+- if $run eval "$command"; then :
++ if $run eval $lt_env "$command"; then :
else
test -n "$output_obj" && $run $rm $removelist
- exit 1
@@ -5185,7 +5407,7 @@
fi
if test "$need_locks" = warn &&
-@@ -701,7 +979,7 @@
+@@ -701,7 +986,7 @@
compiler."
$run $rm $removelist
@@ -5194,7 +5416,7 @@
fi
# Just move the object if needed, then go on to compile the next one
-@@ -722,7 +1000,9 @@
+@@ -722,7 +1007,9 @@
EOF
# Allow error messages only from the first compilation.
@@ -5205,7 +5427,7 @@
else
# No PIC object so indicate it doesn't exist in the libtool
# object file.
-@@ -736,9 +1016,9 @@
+@@ -736,9 +1023,9 @@
if test "$build_old_libs" = yes; then
if test "$pic_mode" != yes; then
# Don't build PIC code
@@ -5217,8 +5439,12 @@
fi
if test "$compiler_c_o" = yes; then
command="$command -o $obj"
-@@ -751,7 +1031,7 @@
- if $run eval "$command"; then :
+@@ -748,10 +1035,10 @@
+ command="$command$suppress_output"
+ $run $rm "$obj" "$output_obj"
+ $show "$command"
+- if $run eval "$command"; then :
++ if $run eval $lt_env "$command"; then :
else
$run $rm $removelist
- exit 1
@@ -5226,7 +5452,7 @@
fi
if test "$need_locks" = warn &&
-@@ -771,7 +1051,7 @@
+@@ -771,7 +1058,7 @@
compiler."
$run $rm $removelist
@@ -5235,7 +5461,7 @@
fi
# Just move the object if needed
-@@ -809,7 +1089,7 @@
+@@ -809,7 +1096,7 @@
$run $rm "$lockfile"
fi
@@ -5244,7 +5470,7 @@
;;
# libtool link mode
-@@ -835,7 +1115,7 @@
+@@ -835,7 +1122,7 @@
;;
esac
libtool_args="$nonopt"
@@ -5253,7 +5479,7 @@
compile_command="$nonopt"
finalize_command="$nonopt"
-@@ -847,7 +1127,6 @@
+@@ -847,7 +1134,6 @@
old_convenience=
deplibs=
old_deplibs=
@@ -5261,7 +5487,7 @@
compiler_flags=
linker_flags=
dllsearchpath=
-@@ -868,6 +1147,8 @@
+@@ -868,6 +1154,8 @@
no_install=no
objs=
non_pic_objects=
@@ -5270,12 +5496,14 @@
prefer_static_libs=no
preload=no
prev=
-@@ -881,26 +1162,38 @@
+@@ -880,27 +1168,40 @@
+ thread_safe=no
vinfo=
vinfo_number=no
++ single_module="${wl}-single_module"
++
++ func_infer_tag $base_compile
-+ func_infer_tag $base_compile
-+
# We need to know -static, to get the right output filenames.
for arg
do
@@ -5314,7 +5542,7 @@
break
;;
esac
-@@ -912,7 +1205,6 @@
+@@ -912,7 +1213,6 @@
# Go through the arguments, transforming them on the way.
while test "$#" -gt 0; do
arg="$1"
@@ -5322,7 +5550,7 @@
shift
case $arg in
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
-@@ -976,7 +1268,7 @@
+@@ -976,7 +1276,7 @@
export_symbols="$arg"
if test ! -f "$arg"; then
$echo "$modename: symbol file \`$arg' does not exist"
@@ -5331,7 +5559,7 @@
fi
prev=
continue
-@@ -991,6 +1283,11 @@
+@@ -991,6 +1291,11 @@
prev=
continue
;;
@@ -5343,7 +5571,7 @@
release)
release="-$arg"
prev=
-@@ -1023,7 +1320,7 @@
+@@ -1023,7 +1328,7 @@
test "$pic_object" = none && \
test "$non_pic_object" = none; then
$echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -5352,7 +5580,7 @@
fi
# Extract subdirectory from the argument.
-@@ -1071,12 +1368,17 @@
+@@ -1071,12 +1376,17 @@
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
@@ -5371,7 +5599,7 @@
else
# Dry-run case.
-@@ -1097,7 +1399,7 @@
+@@ -1097,7 +1407,7 @@
done
else
$echo "$modename: link input file \`$save_arg' does not exist"
@@ -5380,7 +5608,7 @@
fi
arg=$save_arg
prev=
-@@ -1109,7 +1411,7 @@
+@@ -1109,7 +1419,7 @@
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
$echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -5389,7 +5617,7 @@
;;
esac
if test "$prev" = rpath; then
-@@ -1149,16 +1451,15 @@
+@@ -1149,16 +1459,15 @@
finalize_command="$finalize_command $qarg"
continue
;;
@@ -5415,7 +5643,7 @@
prev=
continue
;;
-@@ -1210,7 +1511,7 @@
+@@ -1210,7 +1519,7 @@
-export-symbols | -export-symbols-regex)
if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
$echo "$modename: more than one -exported-symbols argument is not allowed"
@@ -5424,7 +5652,7 @@
fi
if test "X$arg" = "X-export-symbols"; then
prev=expsyms
-@@ -1220,6 +1521,18 @@
+@@ -1220,6 +1529,18 @@
continue
;;
@@ -5443,7 +5671,7 @@
-inst-prefix-dir)
prev=inst_prefix
continue
-@@ -1246,7 +1559,8 @@
+@@ -1246,7 +1567,8 @@
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
$echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
@@ -5453,7 +5681,7 @@
fi
dir="$absdir"
;;
-@@ -1260,10 +1574,15 @@
+@@ -1260,10 +1582,15 @@
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -5469,7 +5697,7 @@
;;
esac
continue
-@@ -1272,26 +1591,35 @@
+@@ -1272,26 +1599,35 @@
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
@@ -5510,7 +5738,7 @@
# Do not include libc_r directly, use -pthread flag.
continue
;;
-@@ -1301,18 +1629,42 @@
+@@ -1301,18 +1637,47 @@
continue
;;
@@ -5531,6 +5759,11 @@
+ continue
+ ;;
+
++ -multi_module)
++ single_module="${wl}-multi_module"
++ continue
++ ;;
++
-module)
module=yes
continue
@@ -5560,7 +5793,7 @@
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-@@ -1323,9 +1675,7 @@
+@@ -1323,9 +1688,7 @@
esac
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
@@ -5571,7 +5804,7 @@
continue
;;
-@@ -1341,9 +1691,9 @@
+@@ -1341,9 +1704,9 @@
-no-install)
case $host in
@@ -5583,7 +5816,7 @@
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
fast_install=no
-@@ -1365,6 +1715,11 @@
+@@ -1365,6 +1728,11 @@
-o) prev=output ;;
@@ -5595,7 +5828,7 @@
-release)
prev=release
continue
-@@ -1387,7 +1742,7 @@
+@@ -1387,7 +1755,7 @@
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
$echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -5604,7 +5837,7 @@
;;
esac
case "$xrpath " in
-@@ -1397,7 +1752,7 @@
+@@ -1397,7 +1765,7 @@
continue
;;
@@ -5613,7 +5846,7 @@
# 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
-@@ -1473,11 +1828,6 @@
+@@ -1473,11 +1841,6 @@
continue
;;
@@ -5625,7 +5858,7 @@
# Some other compiler flag.
-* | +*)
# Unknown arguments in both finalize_command and compile_command need
-@@ -1488,7 +1838,6 @@
+@@ -1488,7 +1851,6 @@
arg="\"$arg\""
;;
esac
@@ -5633,7 +5866,7 @@
;;
*.$objext)
-@@ -1516,7 +1865,7 @@
+@@ -1516,7 +1878,7 @@
test "$pic_object" = none && \
test "$non_pic_object" = none; then
$echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -5642,7 +5875,7 @@
fi
# Extract subdirectory from the argument.
-@@ -1564,12 +1913,17 @@
+@@ -1564,12 +1926,17 @@
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
@@ -5661,7 +5894,7 @@
else
# Dry-run case.
-@@ -1623,7 +1977,6 @@
+@@ -1623,7 +1990,6 @@
arg="\"$arg\""
;;
esac
@@ -5669,7 +5902,7 @@
;;
esac # arg
-@@ -1637,48 +1990,7 @@
+@@ -1637,48 +2003,7 @@
if test -n "$prev"; then
$echo "$modename: the \`$prevarg' option requires an argument" 1>&2
$echo "$help" 1>&2
@@ -5719,7 +5952,7 @@
fi
if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-@@ -1711,9 +2023,9 @@
+@@ -1711,9 +2036,9 @@
if test ! -d "$output_objdir"; then
$show "$mkdir $output_objdir"
$run $mkdir $output_objdir
@@ -5732,7 +5965,7 @@
fi
fi
-@@ -1722,7 +2034,7 @@
+@@ -1722,7 +2047,7 @@
"")
$echo "$modename: you must specify an output file" 1>&2
$echo "$help" 1>&2
@@ -5741,7 +5974,7 @@
;;
*.$libext) linkmode=oldlib ;;
*.lo | *.$objext) linkmode=obj ;;
-@@ -1732,7 +2044,7 @@
+@@ -1732,7 +2057,7 @@
case $host in
*cygwin* | *mingw* | *pw32*)
@@ -5750,7 +5983,7 @@
duplicate_compiler_generated_deps=yes
;;
*)
-@@ -1776,7 +2088,6 @@
+@@ -1776,7 +2101,6 @@
newlib_search_path=
need_relink=no # whether we're linking any uninstalled libtool libraries
notinst_deplibs= # not-installed libtool libraries
@@ -5758,7 +5991,7 @@
case $linkmode in
lib)
passes="conv link"
-@@ -1785,7 +2096,7 @@
+@@ -1785,7 +2109,7 @@
*.la) ;;
*)
$echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
@@ -5767,7 +6000,7 @@
;;
esac
done
-@@ -1811,7 +2122,10 @@
+@@ -1811,7 +2135,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -5779,7 +6012,7 @@
esac
fi
if test "$pass" = dlopen; then
-@@ -1823,18 +2137,23 @@
+@@ -1823,18 +2150,28 @@
lib=
found=no
case $deplib in
@@ -5802,13 +6035,19 @@
- continue
- fi
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
- for search_ext in .la $shrext .so .a; do
++ if test "$linkmode" = lib; then
++ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
++ else
++ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
++ fi
++ for searchdir in $searchdirs; do
+ for search_ext in .la $std_shrext .so .a; do
# Search the libtool library
lib="$searchdir/lib${name}${search_ext}"
if test -f "$lib"; then
-@@ -1895,18 +2214,6 @@
+@@ -1895,18 +2232,6 @@
fi
fi
;; # -l
@@ -5827,7 +6066,7 @@
-L*)
case $linkmode in
lib)
-@@ -1922,11 +2229,11 @@
+@@ -1922,11 +2247,11 @@
fi
if test "$pass" = scan; then
deplibs="$deplib $deplibs"
@@ -5840,7 +6079,7 @@
;;
*)
$echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-@@ -1954,7 +2261,22 @@
+@@ -1954,7 +2279,22 @@
fi
case $linkmode in
lib)
@@ -5864,7 +6103,7 @@
$echo
$echo "*** Warning: Trying to link with static lib archive $deplib."
$echo "*** I have the capability to make that library automatically link in when"
-@@ -2004,15 +2326,15 @@
+@@ -2004,15 +2344,15 @@
esac # case $deplib
if test "$found" = yes || test -f "$lib"; then :
else
@@ -5883,7 +6122,7 @@
fi
ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-@@ -2028,6 +2350,8 @@
+@@ -2028,6 +2368,8 @@
# it will not redefine variables installed, or shouldnotlink
installed=yes
shouldnotlink=no
@@ -5892,7 +6131,7 @@
# Read the .la file
case $lib in
-@@ -2035,13 +2359,6 @@
+@@ -2035,13 +2377,6 @@
*) . ./$lib ;;
esac
@@ -5906,7 +6145,7 @@
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
-@@ -2052,33 +2369,32 @@
+@@ -2052,33 +2387,32 @@
if test "$pass" = conv; then
# Only check for convenience libraries
deplibs="$lib $deplibs"
@@ -5953,7 +6192,7 @@
# Get the name of the library we link against.
linklib=
for l in $old_library $library_names; do
-@@ -2086,16 +2402,18 @@
+@@ -2086,16 +2420,18 @@
done
if test -z "$linklib"; then
$echo "$modename: cannot find name of link library for \`$lib'" 1>&2
@@ -5975,7 +6214,7 @@
# If there is no dlname, no dlopen support or we're linking
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
-@@ -2132,11 +2450,19 @@
+@@ -2132,11 +2468,19 @@
dir="$libdir"
absdir="$libdir"
fi
@@ -5999,7 +6238,7 @@
fi # $installed = yes
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-@@ -2144,7 +2470,7 @@
+@@ -2144,7 +2488,7 @@
if test "$pass" = dlpreopen; then
if test -z "$libdir"; then
$echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
@@ -6008,7 +6247,7 @@
fi
# Prefer using a static library (so that no silly _DYNAMIC symbols
# are required to link).
-@@ -2171,7 +2497,7 @@
+@@ -2171,7 +2515,7 @@
continue
fi
@@ -6017,7 +6256,7 @@
if test "$linkmode" = prog && test "$pass" != link; then
newlib_search_path="$newlib_search_path $ladir"
deplibs="$lib $deplibs"
-@@ -2207,14 +2533,16 @@
+@@ -2207,14 +2551,16 @@
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
@@ -6037,7 +6276,7 @@
esac
fi
-@@ -2251,24 +2579,29 @@
+@@ -2251,24 +2597,29 @@
fi
link_static=no # Whether the deplib will be linked statically
@@ -6073,7 +6312,7 @@
if test "$linkmode" = lib &&
test "$hardcode_into_libs" = yes; then
# Hardcode the library path.
-@@ -2326,9 +2659,10 @@
+@@ -2326,9 +2677,10 @@
else
$show "extracting exported symbol list from \`$soname'"
save_ifs="$IFS"; IFS='~'
@@ -6085,7 +6324,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -2339,9 +2673,10 @@
+@@ -2339,9 +2691,10 @@
if test -f "$output_objdir/$newlib"; then :; else
$show "generating import library for \`$soname'"
save_ifs="$IFS"; IFS='~'
@@ -6097,7 +6336,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -2362,11 +2697,15 @@
+@@ -2362,11 +2715,15 @@
if test "$hardcode_direct" = no; then
add="$dir/$linklib"
case $host in
@@ -6117,7 +6356,7 @@
$echo "** Warning, lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
$echo
-@@ -2374,7 +2713,7 @@
+@@ -2374,7 +2731,7 @@
$echo "** The link will probably fail, sorry"
else
add="$dir/$old_library"
@@ -6126,7 +6365,7 @@
fi
esac
elif test "$hardcode_minus_L" = no; then
-@@ -2397,9 +2736,9 @@
+@@ -2397,9 +2754,9 @@
add_dir="-L$dir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
@@ -6138,7 +6377,7 @@
;;
esac
fi
-@@ -2416,7 +2755,7 @@
+@@ -2416,7 +2773,7 @@
if test "$lib_linked" != yes; then
$echo "$modename: configuration error: unsupported hardcode properties"
@@ -6147,7 +6386,7 @@
fi
if test -n "$add_shlibpath"; then
-@@ -2459,7 +2798,8 @@
+@@ -2459,7 +2816,8 @@
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
@@ -6157,7 +6396,7 @@
add="$inst_prefix_dir$libdir/$linklib"
else
add="$libdir/$linklib"
-@@ -2469,9 +2809,9 @@
+@@ -2469,9 +2827,9 @@
add_dir="-L$libdir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
@@ -6169,7 +6408,7 @@
;;
esac
fi
-@@ -2530,17 +2870,16 @@
+@@ -2530,17 +2888,16 @@
fi
fi
else
@@ -6191,7 +6430,7 @@
# Extract -R from dependency_libs
temp_deplibs=
for libdir in $dependency_libs; do
-@@ -2554,7 +2893,7 @@
+@@ -2554,7 +2911,7 @@
esac
done
dependency_libs="$temp_deplibs"
@@ -6200,7 +6439,7 @@
newlib_search_path="$newlib_search_path $absdir"
# Link against this library
-@@ -2596,20 +2935,18 @@
+@@ -2596,76 +2953,70 @@
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -z "$libdir"; then
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
@@ -6223,13 +6462,20 @@
+ # we do not want to link against static libs,
+ # but need to link against shared
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
++ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -n "$deplibrary_names" ; then
for tmp in $deplibrary_names ; do
-@@ -2617,55 +2954,45 @@
+ depdepl=$tmp
done
- if test -f "$path/$depdepl" ; then
+- if test -f "$path/$depdepl" ; then
++ if test -f "$deplibdir/$depdepl" ; then
++ depdepl="$deplibdir/$depdepl"
++ elif test -f "$path/$depdepl" ; then
depdepl="$path/$depdepl"
- fi
++ else
++ # Can't find it, oh well...
++ depdepl=
+ fi
# do not add paths which are already there
case " $newlib_search_path " in
@@ -6301,7 +6547,7 @@
esac
done
fi # link_all_deplibs != no
-@@ -2752,7 +3079,8 @@
+@@ -2752,7 +3103,8 @@
eval $var=\"$tmp_libs\"
done # for var
fi
@@ -6311,7 +6557,21 @@
tmp_libs=
for i in $dependency_libs ; do
case " $predeps $postdeps $compiler_lib_search_path " in
-@@ -2812,19 +3140,19 @@
+@@ -2773,9 +3125,10 @@
+
+ case $linkmode in
+ oldlib)
+- if test -n "$deplibs"; then
+- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
+- fi
++ case " $deplibs" in
++ *\ -l* | *\ -L*)
++ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
++ esac
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+@@ -2812,19 +3165,19 @@
case $outputname in
lib*)
name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
@@ -6334,7 +6594,7 @@
eval libname=\"$libname_spec\"
else
libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-@@ -2835,7 +3163,7 @@
+@@ -2835,7 +3188,7 @@
if test -n "$objs"; then
if test "$deplibs_check_method" != pass_all; then
$echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
@@ -6343,7 +6603,7 @@
else
$echo
$echo "*** Warning: Linking the shared library $output against the non-libtool"
-@@ -2883,13 +3211,13 @@
+@@ -2883,13 +3236,13 @@
if test -n "$8"; then
$echo "$modename: too many parameters to \`-version-info'" 1>&2
$echo "$help" 1>&2
@@ -6359,7 +6619,7 @@
case $vinfo_number in
yes)
number_major="$2"
-@@ -2903,7 +3231,7 @@
+@@ -2903,7 +3256,7 @@
# which has an extra 1 added just for fun
#
case $version_type in
@@ -6368,7 +6628,7 @@
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
-@@ -2914,9 +3242,15 @@
+@@ -2914,9 +3267,15 @@
age="0"
;;
irix|nonstopux)
@@ -6385,7 +6645,7 @@
;;
esac
;;
-@@ -2929,36 +3263,36 @@
+@@ -2929,36 +3288,36 @@
# Check that each of the things are valid numbers.
case $current in
@@ -6432,7 +6692,7 @@
fi
# Calculate the version variables.
-@@ -2975,6 +3309,7 @@
+@@ -2975,6 +3334,7 @@
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1`
@@ -6440,7 +6700,7 @@
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
;;
-@@ -2989,8 +3324,11 @@
+@@ -2989,8 +3349,11 @@
;;
irix | nonstopux)
@@ -6454,7 +6714,7 @@
case $version_type in
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
-@@ -3047,7 +3385,7 @@
+@@ -3047,7 +3410,7 @@
*)
$echo "$modename: unknown library version type \`$version_type'" 1>&2
$echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
@@ -6463,7 +6723,7 @@
;;
esac
-@@ -3098,9 +3436,15 @@
+@@ -3098,9 +3461,15 @@
tempremovelist=`$echo "$output_objdir/*"`
for p in $tempremovelist; do
case $p in
@@ -6480,7 +6740,7 @@
removelist="$removelist $p"
;;
*) ;;
-@@ -3121,11 +3465,11 @@
+@@ -3121,11 +3490,11 @@
fi
# Eliminate all temporary directories.
@@ -6497,7 +6757,7 @@
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
-@@ -3137,7 +3481,7 @@
+@@ -3137,7 +3506,7 @@
*) finalize_rpath="$finalize_rpath $libdir" ;;
esac
done
@@ -6506,7 +6766,7 @@
dependency_libs="$temp_xrpath $dependency_libs"
fi
fi
-@@ -3170,14 +3514,19 @@
+@@ -3170,14 +3539,19 @@
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
@@ -6529,7 +6789,7 @@
;;
*)
# Add libc to deplibs on all other systems if necessary.
-@@ -3221,13 +3570,12 @@
+@@ -3221,13 +3595,12 @@
int main() { return 0; }
EOF
$rm conftest
@@ -6546,7 +6806,7 @@
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
-@@ -3262,13 +3610,11 @@
+@@ -3262,13 +3635,11 @@
# Error occurred in the first compile. Let's try to salvage
# the situation: Compile a separate program for each library.
for i in $deplibs; do
@@ -6562,7 +6822,7 @@
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
-@@ -3300,7 +3646,7 @@
+@@ -3300,7 +3671,7 @@
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but I was not able to"
@@ -6571,7 +6831,7 @@
$echo "*** library that it depends on before this library will be fully"
$echo "*** functional. Installing it before continuing would be even better."
fi
-@@ -3314,7 +3660,7 @@
+@@ -3314,7 +3685,7 @@
set dummy $deplibs_check_method
file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
@@ -6580,7 +6840,7 @@
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3383,7 +3729,7 @@
+@@ -3383,7 +3754,7 @@
set dummy $deplibs_check_method
match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
@@ -6589,7 +6849,7 @@
# If $name is empty we are operating on a -L argument.
if test -n "$name" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3463,7 +3809,7 @@
+@@ -3463,7 +3834,7 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -6598,7 +6858,7 @@
;;
esac
-@@ -3509,17 +3855,39 @@
+@@ -3509,17 +3880,39 @@
fi
fi
fi
@@ -6645,7 +6905,7 @@
# All the library-specific variables (install_libdir is set above).
library_names=
old_library=
-@@ -3532,7 +3900,7 @@
+@@ -3532,7 +3925,7 @@
hardcode_libdirs=
dep_rpath=
rpath="$finalize_rpath"
@@ -6654,7 +6914,7 @@
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
-@@ -3564,7 +3932,10 @@
+@@ -3564,7 +3957,10 @@
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
if test -n "$hardcode_libdir_flag_spec_ld"; then
@@ -6666,7 +6926,7 @@
else
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
fi
-@@ -3587,7 +3958,7 @@
+@@ -3587,7 +3983,7 @@
fi
# Get the real and link names of the library.
@@ -6675,7 +6935,7 @@
eval library_names=\"$library_names_spec\"
set dummy $library_names
realname="$2"
-@@ -3603,6 +3974,7 @@
+@@ -3603,6 +3999,7 @@
fi
lib="$output_objdir/$realname"
@@ -6683,7 +6943,7 @@
for link
do
linknames="$linknames $link"
-@@ -3617,10 +3989,11 @@
+@@ -3617,10 +4014,11 @@
$show "generating symbol list for \`$libname.la'"
export_symbols="$output_objdir/$libname.exp"
$run $rm $export_symbols
@@ -6696,7 +6956,7 @@
if len=`expr "X$cmd" : ".*"` &&
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
$show "$cmd"
-@@ -3630,6 +4003,9 @@
+@@ -3630,6 +4028,9 @@
# The command line is too long to execute in one step.
$show "using reloadable object file for export list..."
skipped_export=:
@@ -6706,7 +6966,7 @@
fi
done
IFS="$save_ifs"
-@@ -3650,12 +4026,12 @@
+@@ -3650,12 +4051,12 @@
for test_deplib in $deplibs; do
case " $convenience " in
*" $test_deplib "*) ;;
@@ -6721,7 +6981,7 @@
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
-@@ -3663,67 +4039,13 @@
+@@ -3663,67 +4064,13 @@
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
else
gentop="$output_objdir/${outputname}x"
@@ -6792,7 +7052,7 @@
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
linker_flags="$linker_flags $flag"
-@@ -3734,31 +4056,27 @@
+@@ -3734,31 +4081,27 @@
$run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
fi
@@ -6834,7 +7094,7 @@
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
:
else
-@@ -3777,6 +4095,7 @@
+@@ -3777,6 +4120,7 @@
save_libobjs=$libobjs
fi
save_output=$output
@@ -6842,7 +7102,7 @@
# Clear the reloadable object creation command queue and
# initialize k to one.
-@@ -3786,13 +4105,13 @@
+@@ -3786,13 +4130,13 @@
delfiles=
last_robj=
k=1
@@ -6858,7 +7118,7 @@
test "$len" -le "$max_cmd_len"; }; then
objlist="$objlist $obj"
else
-@@ -3806,9 +4125,9 @@
+@@ -3806,9 +4150,9 @@
# the last one created.
eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
fi
@@ -6870,7 +7130,7 @@
objlist=$obj
len=1
fi
-@@ -3828,13 +4147,13 @@
+@@ -3828,13 +4172,13 @@
eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
fi
@@ -6886,7 +7146,7 @@
done
$echo "creating a temporary reloadable object file: $output"
-@@ -3859,28 +4178,54 @@
+@@ -3859,28 +4203,54 @@
# value of $libobjs for piecewise linking.
# Do each of the archive commands.
@@ -6946,7 +7206,21 @@
fi
# Create links to the real library.
-@@ -3928,7 +4273,7 @@
+@@ -3900,9 +4270,10 @@
+ ;;
+
+ obj)
+- if test -n "$deplibs"; then
+- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
+- fi
++ case " $deplibs" in
++ *\ -l* | *\ -L*)
++ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
++ esac
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+@@ -3928,7 +4299,7 @@
*.lo)
if test -n "$objs$old_deplibs"; then
$echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
@@ -6955,7 +7229,7 @@
fi
libobj="$output"
obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-@@ -3949,72 +4294,20 @@
+@@ -3949,72 +4320,20 @@
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
@@ -7034,7 +7308,7 @@
fi
fi
-@@ -4022,10 +4315,11 @@
+@@ -4022,10 +4341,11 @@
reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
output="$obj"
@@ -7047,7 +7321,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -4038,7 +4332,7 @@
+@@ -4038,7 +4358,7 @@
$run ${rm}r $gentop
fi
@@ -7056,7 +7330,7 @@
fi
if test "$build_libtool_libs" != yes; then
-@@ -4051,17 +4345,18 @@
+@@ -4051,17 +4371,18 @@
# accidentally link it into a program.
# $show "echo timestamp > $libobj"
# $run eval "echo timestamp > $libobj" || exit $?
@@ -7077,7 +7351,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -4073,7 +4368,7 @@
+@@ -4073,7 +4394,7 @@
$run ${rm}r $gentop
fi
@@ -7086,7 +7360,7 @@
;;
prog)
-@@ -4098,24 +4393,50 @@
+@@ -4098,24 +4419,50 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -7143,7 +7417,7 @@
compile_command="$compile_command $compile_deplibs"
finalize_command="$finalize_command $finalize_deplibs"
-@@ -4160,10 +4481,15 @@
+@@ -4160,10 +4507,15 @@
fi
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -7159,7 +7433,7 @@
;;
esac
done
-@@ -4277,13 +4603,25 @@
+@@ -4277,13 +4629,25 @@
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
@@ -7189,7 +7463,7 @@
fi
fi
-@@ -4334,7 +4672,26 @@
+@@ -4334,7 +4698,26 @@
#endif
/* The mapping between symbol names and symbols. */
@@ -7216,7 +7490,7 @@
const char *name;
lt_ptr address;
}
-@@ -4381,20 +4738,33 @@
+@@ -4381,20 +4764,33 @@
esac
# Now compile the dynamic symbol file.
@@ -7255,7 +7529,7 @@
;;
esac
else
-@@ -4403,30 +4773,19 @@
+@@ -4403,30 +4799,19 @@
# really was required.
# Nullify the symbol file.
@@ -7290,7 +7564,7 @@
# Delete the generated files.
if test -n "$dlsyms"; then
-@@ -4434,7 +4793,7 @@
+@@ -4434,7 +4819,7 @@
$run $rm "$output_objdir/${outputname}S.${objext}"
fi
@@ -7299,7 +7573,7 @@
fi
if test -n "$shlibpath_var"; then
-@@ -4493,7 +4852,7 @@
+@@ -4493,7 +4878,7 @@
# Link the executable and exit
$show "$link_command"
$run eval "$link_command" || exit $?
@@ -7308,7 +7582,7 @@
fi
if test "$hardcode_action" = relink; then
-@@ -4507,7 +4866,7 @@
+@@ -4507,7 +4892,7 @@
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
@@ -7317,7 +7591,7 @@
else
# fast_install is set to needless
relink_command=
-@@ -4544,14 +4903,14 @@
+@@ -4544,14 +4929,14 @@
fi
done
relink_command="(cd `pwd`; $relink_command)"
@@ -7337,7 +7611,7 @@
esac
qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
else
-@@ -4573,11 +4932,13 @@
+@@ -4573,11 +4958,13 @@
*) exeext= ;;
esac
case $host in
@@ -7356,7 +7630,7 @@
cat > $cwrappersource <<EOF
-@@ -4586,7 +4947,7 @@
+@@ -4586,7 +4973,7 @@
The $output program cannot be directly executed until all the libtool
libraries that it depends on are installed.
@@ -7365,7 +7639,7 @@
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
-@@ -4602,6 +4963,9 @@
+@@ -4602,6 +4989,9 @@
#include <malloc.h>
#include <stdarg.h>
#include <assert.h>
@@ -7375,7 +7649,7 @@
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
-@@ -4612,15 +4976,19 @@
+@@ -4612,15 +5002,19 @@
#endif
#ifndef DIR_SEPARATOR
@@ -7400,7 +7674,7 @@
#endif
#ifndef DIR_SEPARATOR_2
-@@ -4630,17 +4998,32 @@
+@@ -4630,17 +5024,32 @@
(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
#endif /* DIR_SEPARATOR_2 */
@@ -7435,7 +7709,7 @@
char * strendzap(char *str, const char *pat);
void lt_fatal (const char *message, ...);
-@@ -4649,30 +5032,52 @@
+@@ -4649,30 +5058,52 @@
{
char **newargz;
int i;
@@ -7497,7 +7771,7 @@
}
void *
-@@ -4685,59 +5090,159 @@
+@@ -4685,59 +5116,159 @@
return p;
}
@@ -7679,7 +7953,7 @@
{
size_t len, patlen;
-@@ -4757,7 +5262,7 @@
+@@ -4757,7 +5288,7 @@
}
static void
@@ -7688,7 +7962,7 @@
const char * message, va_list ap)
{
fprintf (stderr, "%s: %s: ", program_name, mode);
-@@ -4777,16 +5282,16 @@
+@@ -4777,16 +5308,16 @@
va_end (ap);
}
EOF
@@ -7715,7 +7989,7 @@
$echo > $output "\
#! $SHELL
-@@ -4805,9 +5310,23 @@
+@@ -4805,9 +5336,23 @@
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
@@ -7740,7 +8014,7 @@
relink_command=\"$relink_command\"
-@@ -4886,7 +5405,7 @@
+@@ -4886,7 +5431,7 @@
else
$echo \"\$relink_command_output\" >&2
$rm \"\$progdir/\$file\"
@@ -7749,7 +8023,7 @@
fi
fi
-@@ -4936,34 +5455,32 @@
+@@ -4936,34 +5481,32 @@
# Backslashes separate directories on plain windows
*-*-mingw | *-*-os2*)
$echo >> $output "\
@@ -7791,7 +8065,7 @@
;;
esac
-@@ -4986,78 +5503,78 @@
+@@ -4986,78 +5529,78 @@
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
@@ -7931,7 +8205,7 @@
else
# the command line is too long to link in one step, link in parts
$echo "using piecewise archive linking..."
-@@ -5066,31 +5583,18 @@
+@@ -5066,31 +5609,18 @@
objlist=
concat_cmds=
save_oldobjs=$oldobjs
@@ -7966,7 +8240,7 @@
test "$len" -le "$max_cmd_len"; then
:
else
-@@ -5098,7 +5602,7 @@
+@@ -5098,7 +5628,7 @@
oldobjs=$objlist
if test "$obj" = "$last_oldobj" ; then
RANLIB=$save_RANLIB
@@ -7975,7 +8249,7 @@
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
objlist=
-@@ -5109,12 +5613,13 @@
+@@ -5109,12 +5639,13 @@
if test "X$oldobjs" = "X" ; then
eval cmds=\"\$concat_cmds\"
else
@@ -7990,7 +8264,7 @@
IFS="$save_ifs"
$show "$cmd"
$run eval "$cmd" || exit $?
-@@ -5146,11 +5651,13 @@
+@@ -5146,11 +5677,13 @@
fi
done
# Quote the link command for shipping.
@@ -8008,7 +8282,7 @@
# Only create the output if not a dry run.
if test -z "$run"; then
for installed in no yes; do
-@@ -5168,7 +5675,7 @@
+@@ -5168,7 +5701,7 @@
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -z "$libdir"; then
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
@@ -8017,7 +8291,7 @@
fi
newdependency_libs="$newdependency_libs $libdir/$name"
;;
-@@ -5182,7 +5689,7 @@
+@@ -5182,7 +5715,7 @@
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
if test -z "$libdir"; then
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
@@ -8026,7 +8300,7 @@
fi
newdlfiles="$newdlfiles $libdir/$name"
done
-@@ -5193,11 +5700,30 @@
+@@ -5193,11 +5726,30 @@
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
if test -z "$libdir"; then
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
@@ -8058,7 +8332,7 @@
fi
$rm $output
# place dlname in correct position for cygwin
-@@ -5241,7 +5767,7 @@
+@@ -5241,7 +5793,7 @@
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
@@ -8067,7 +8341,7 @@
$echo >> $output "\
relink_command=\"$relink_command\""
fi
-@@ -5254,7 +5780,7 @@
+@@ -5254,7 +5806,7 @@
$run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
;;
esac
@@ -8076,7 +8350,7 @@
;;
# libtool install mode
-@@ -5265,11 +5791,11 @@
+@@ -5265,11 +5817,11 @@
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
@@ -8090,7 +8364,7 @@
arg="\"$arg\""
;;
esac
-@@ -5278,14 +5804,14 @@
+@@ -5278,14 +5830,14 @@
shift
else
install_prog=
@@ -8107,7 +8381,7 @@
arg="\"$arg\""
;;
esac
-@@ -5303,28 +5829,31 @@
+@@ -5303,28 +5855,31 @@
do
if test -n "$dest"; then
files="$files $dest"
@@ -8147,7 +8421,7 @@
continue
fi
;;
-@@ -5333,7 +5862,7 @@
+@@ -5333,7 +5888,7 @@
# Aesthetically quote the argument.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
case $arg in
@@ -8156,7 +8430,7 @@
arg="\"$arg\""
;;
esac
-@@ -5343,13 +5872,13 @@
+@@ -5343,13 +5898,13 @@
if test -z "$install_prog"; then
$echo "$modename: you must specify an install program" 1>&2
$echo "$help" 1>&2
@@ -8172,7 +8446,7 @@
fi
if test -z "$files"; then
-@@ -5359,7 +5888,7 @@
+@@ -5359,7 +5914,7 @@
$echo "$modename: you must specify a destination" 1>&2
fi
$echo "$help" 1>&2
@@ -8181,7 +8455,7 @@
fi
# Strip any trailing slash from the destination.
-@@ -5380,7 +5909,7 @@
+@@ -5380,7 +5935,7 @@
if test "$#" -gt 2; then
$echo "$modename: \`$dest' is not a directory" 1>&2
$echo "$help" 1>&2
@@ -8190,7 +8464,7 @@
fi
fi
case $destdir in
-@@ -5392,7 +5921,7 @@
+@@ -5392,7 +5947,7 @@
*)
$echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
$echo "$help" 1>&2
@@ -8199,7 +8473,7 @@
;;
esac
done
-@@ -5421,7 +5950,7 @@
+@@ -5421,7 +5976,7 @@
else
$echo "$modename: \`$file' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
@@ -8208,7 +8482,7 @@
fi
library_names=
-@@ -5463,14 +5992,14 @@
+@@ -5463,14 +6018,14 @@
# but it's something to keep an eye on.
if test "$inst_prefix_dir" = "$destdir"; then
$echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
@@ -8226,7 +8500,7 @@
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
-@@ -5478,7 +6007,7 @@
+@@ -5478,7 +6033,7 @@
if $run eval "$relink_command"; then :
else
$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
@@ -8235,7 +8509,7 @@
fi
fi
-@@ -5502,23 +6031,36 @@
+@@ -5502,23 +6057,36 @@
if test "$#" -gt 0; then
# Delete the old symlinks, and create new ones.
@@ -8276,7 +8550,7 @@
done
IFS="$save_ifs"
fi
-@@ -5556,7 +6098,7 @@
+@@ -5556,7 +6124,7 @@
*)
$echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
$echo "$help" 1>&2
@@ -8285,7 +8559,7 @@
;;
esac
-@@ -5574,7 +6116,7 @@
+@@ -5574,7 +6142,7 @@
$show "$install_prog $staticobj $staticdest"
$run eval "$install_prog \$staticobj \$staticdest" || exit $?
fi
@@ -8294,7 +8568,7 @@
;;
*)
-@@ -5612,23 +6154,21 @@
+@@ -5612,23 +6180,21 @@
notinst_deplibs=
relink_command=
@@ -8327,7 +8601,7 @@
fi
finalize=yes
-@@ -5650,34 +6190,25 @@
+@@ -5650,34 +6216,25 @@
done
relink_command=
@@ -8372,7 +8646,7 @@
$show "$relink_command"
if $run eval "$relink_command"; then :
-@@ -5697,7 +6228,7 @@
+@@ -5697,7 +6254,7 @@
fi
# remove .exe since cygwin /usr/bin/install will append another
@@ -8381,7 +8655,7 @@
case $install_prog,$host in
*/usr/bin/install*,*cygwin*)
case $file:$destfile in
-@@ -5729,16 +6260,17 @@
+@@ -5729,16 +6286,17 @@
$show "$install_prog $file $oldlib"
$run eval "$install_prog \$file \$oldlib" || exit $?
@@ -8401,7 +8675,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -5752,9 +6284,9 @@
+@@ -5752,9 +6310,9 @@
if test -n "$current_libdirs"; then
# Maybe just do a dry run.
test -n "$run" && current_libdirs=" -n$current_libdirs"
@@ -8413,7 +8687,7 @@
fi
;;
-@@ -5773,10 +6305,11 @@
+@@ -5773,10 +6331,11 @@
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
@@ -8426,7 +8700,7 @@
$show "$cmd"
$run eval "$cmd" || admincmds="$admincmds
$cmd"
-@@ -5793,9 +6326,9 @@
+@@ -5793,9 +6352,9 @@
fi
# Exit here if they wanted silent mode.
@@ -8438,7 +8712,7 @@
$echo "Libraries have been installed in:"
for libdir in $libdirs; do
$echo " $libdir"
-@@ -5828,8 +6361,8 @@
+@@ -5828,8 +6387,8 @@
$echo
$echo "See any operating system documentation about shared libraries for"
$echo "more information, such as the ld(1) and ld.so(8) manual pages."
@@ -8449,7 +8723,7 @@
;;
# libtool execute mode
-@@ -5841,7 +6374,7 @@
+@@ -5841,7 +6400,7 @@
if test -z "$cmd"; then
$echo "$modename: you must specify a COMMAND" 1>&2
$echo "$help"
@@ -8458,7 +8732,7 @@
fi
# Handle -dlopen flags immediately.
-@@ -5849,7 +6382,7 @@
+@@ -5849,7 +6408,7 @@
if test ! -f "$file"; then
$echo "$modename: \`$file' is not a file" 1>&2
$echo "$help" 1>&2
@@ -8467,7 +8741,7 @@
fi
dir=
-@@ -5860,7 +6393,7 @@
+@@ -5860,7 +6419,7 @@
else
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
@@ -8476,7 +8750,7 @@
fi
# Read the libtool library.
-@@ -5886,8 +6419,10 @@
+@@ -5886,8 +6445,10 @@
if test -f "$dir/$objdir/$dlname"; then
dir="$dir/$objdir"
else
@@ -8489,7 +8763,7 @@
fi
;;
-@@ -5951,12 +6486,12 @@
+@@ -5951,12 +6512,12 @@
fi
# Restore saved environment variables
@@ -8499,7 +8773,7 @@
- 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
++ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+ do
+ eval "if test \"\${save_$lt_var+set}\" = set; then
+ $lt_var=\$save_$lt_var; export $lt_var
@@ -8508,7 +8782,7 @@
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
-@@ -5967,7 +6502,7 @@
+@@ -5967,7 +6528,7 @@
$echo "export $shlibpath_var"
fi
$echo "$cmd$args"
@@ -8517,7 +8791,7 @@
fi
;;
-@@ -5995,7 +6530,7 @@
+@@ -5995,7 +6556,7 @@
if test -z "$rm"; then
$echo "$modename: you must specify an RM program" 1>&2
$echo "$help" 1>&2
@@ -8526,7 +8800,7 @@
fi
rmdirs=
-@@ -6045,15 +6580,24 @@
+@@ -6045,15 +6606,24 @@
rmfiles="$rmfiles $objdir/$n"
done
test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
@@ -8554,7 +8828,7 @@
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6065,10 +6609,11 @@
+@@ -6065,10 +6635,11 @@
if test -n "$old_library"; then
# Do each command in the old_postuninstall commands.
@@ -8567,7 +8841,7 @@
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6078,7 +6623,8 @@
+@@ -6078,7 +6649,8 @@
IFS="$save_ifs"
fi
# FIXME: should reinstall the best remaining shared library.
@@ -8577,7 +8851,7 @@
fi
;;
-@@ -6107,7 +6653,7 @@
+@@ -6107,7 +6679,7 @@
if test "$mode" = clean ; then
noexename=$name
case $file in
@@ -8586,7 +8860,7 @@
file=`$echo $file|${SED} 's,.exe$,,'`
noexename=`$echo $name|${SED} 's,.exe$,,'`
# $file with .exe has already been added to rmfiles,
-@@ -6152,20 +6698,20 @@
+@@ -6152,20 +6724,20 @@
"")
$echo "$modename: you must specify a MODE" 1>&2
$echo "$generic_help" 1>&2
@@ -8610,7 +8884,7 @@
fi
# We need to display help for each of the modes.
-@@ -6201,7 +6747,7 @@
+@@ -6201,7 +6773,7 @@
a more detailed description of MODE.
Report bugs to <bug-libtool at gnu.org>."
@@ -8619,7 +8893,7 @@
;;
clean)
-@@ -6302,9 +6848,9 @@
+@@ -6302,9 +6874,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
@@ -8631,7 +8905,7 @@
-LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
-@@ -6313,12 +6859,16 @@
+@@ -6313,12 +6885,16 @@
-no-undefined declare that a library does not refer to external symbols
-o OUTPUT-FILE create OUTPUT-FILE from the specified objects
-objectlist FILE Use a list of object files found in FILE to specify objects
@@ -8650,7 +8924,7 @@
All other options (arguments beginning with \`-') are ignored.
-@@ -6354,14 +6904,14 @@
+@@ -6354,14 +6930,14 @@
*)
$echo "$modename: invalid operation mode \`$mode'" 1>&2
$echo "$help" 1>&2
@@ -8667,7 +8941,7 @@
# The TAGs below are defined such that we never get into a situation
# in which we disable both kinds of libraries. Given conflicting
-@@ -6375,12 +6925,11 @@
+@@ -6375,12 +6951,11 @@
# configuration. But we'll never go from static-only to shared-only.
# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
Modified: kde-extras/komparator/trunk/debian/patches/05_pedantic-errors.diff
===================================================================
--- kde-extras/komparator/trunk/debian/patches/05_pedantic-errors.diff 2008-03-01 19:11:02 UTC (rev 9496)
+++ kde-extras/komparator/trunk/debian/patches/05_pedantic-errors.diff 2008-03-01 19:40:46 UTC (rev 9497)
@@ -1,6 +1,6 @@
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
-@@ -2144,9 +2144,6 @@
+@@ -2168,9 +2168,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
Modified: kde-extras/komparator/trunk/debian/patches/06_disable_no_undefined.diff
===================================================================
--- kde-extras/komparator/trunk/debian/patches/06_disable_no_undefined.diff 2008-03-01 19:11:02 UTC (rev 9496)
+++ kde-extras/komparator/trunk/debian/patches/06_disable_no_undefined.diff 2008-03-01 19:40:46 UTC (rev 9497)
@@ -1,6 +1,6 @@
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
+@@ -1713,15 +1713,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
Added: kde-extras/komparator/trunk/debian/patches/98_buildprep.diff
===================================================================
Modified: kde-extras/komparator/trunk/debian/patches/series
===================================================================
--- kde-extras/komparator/trunk/debian/patches/series 2008-03-01 19:11:02 UTC (rev 9496)
+++ kde-extras/komparator/trunk/debian/patches/series 2008-03-01 19:40:46 UTC (rev 9497)
@@ -3,3 +3,5 @@
04_am_maintainer_mode.diff
05_pedantic-errors.diff
06_disable_no_undefined.diff
+98_buildprep.diff
+
More information about the pkg-kde-commits
mailing list