[DebianGIS-dev] r987 - in packages/gpsdrive/trunk/debian: . man/man1 patches
nd-guest at alioth.debian.org
nd-guest at alioth.debian.org
Fri Jul 27 20:51:00 UTC 2007
Author: nd-guest
Date: 2007-07-27 20:51:00 +0000 (Fri, 27 Jul 2007)
New Revision: 987
Added:
packages/gpsdrive/trunk/debian/README.Debian
packages/gpsdrive/trunk/debian/compat
packages/gpsdrive/trunk/debian/man/man1/friendsd2.1
packages/gpsdrive/trunk/debian/man/man1/gpsfetchmap.1
packages/gpsdrive/trunk/debian/patches/
packages/gpsdrive/trunk/debian/patches/00list
packages/gpsdrive/trunk/debian/patches/01old.dpatch
packages/gpsdrive/trunk/debian/patches/02configure.dpatch
packages/gpsdrive/trunk/debian/patches/03manpage.dpatch
packages/gpsdrive/trunk/debian/patches/04missing_includes.dpatch
packages/gpsdrive/trunk/debian/patches/05start_gpsd.dpatch
packages/gpsdrive/trunk/debian/patches/06libtool.dpatch
Modified:
packages/gpsdrive/trunk/debian/changelog
packages/gpsdrive/trunk/debian/control
packages/gpsdrive/trunk/debian/man/man1/garble.1
packages/gpsdrive/trunk/debian/manpages
packages/gpsdrive/trunk/debian/rules
Log:
update to 2.10pre2
Added: packages/gpsdrive/trunk/debian/README.Debian
===================================================================
--- packages/gpsdrive/trunk/debian/README.Debian (rev 0)
+++ packages/gpsdrive/trunk/debian/README.Debian 2007-07-27 20:51:00 UTC (rev 987)
@@ -0,0 +1,7 @@
+gpsdrive for Debian
+-------------------
+
+All scripts installed by gpsdrive has been renamed to a version without language extension,
+ e.g. /usr/bin/gpsfetchmap.pl has been renamed to /usr/bin/gpsfetchmap.
+
+ -- Andreas Putzo <andreas at putzo.de> Wed Jul 18 16:18:55 CEST 2007
Modified: packages/gpsdrive/trunk/debian/changelog
===================================================================
--- packages/gpsdrive/trunk/debian/changelog 2007-07-27 20:44:45 UTC (rev 986)
+++ packages/gpsdrive/trunk/debian/changelog 2007-07-27 20:51:00 UTC (rev 987)
@@ -1,3 +1,29 @@
+gpsdrive (2.10~pre2-1) unstable; urgency=low
+
+ * New upstream release. Closes: #321429.
+ - Proxy support works again
+ Closes: #300443.
+ Closes: #400745.
+ - Package can be build twice in a row (FTBFS). Closes: #424369.
+ * Acknowledge NMU. Closes: 343815.
+ * Set Debian GIS Project as new Maintainer and myself as Uploader.
+ Closes: #406522.
+ * Added missing #includes (FTBFS gcc-4.3). Closes: #417498.
+ * Fixed typos.
+ Closes: #363622.
+ Closes: #428263.
+ * Suggesting libmysqlclient15off now.
+ Closes: #357397.
+ * Switched to dpatch, rewrite of debian/rules.
+ * Build-depend on autotools-dev to symlink to config.guess/config.sub.
+ * Updated debian/copyright, debin/control
+ * Fixed misspelled email address in debian/changelog.
+ * Created manpages for gpsfetchmap and friendsd2
+ * Changed gpsdrive.c to use the correct command line switches for gpsd
+ Closes: #317809
+
+ -- Andreas Putzo <andreas at putzo.net> Tue, 17 Jul 2007 16:29:39 +0200
+
gpsdrive (2.09-2.2) unstable; urgency=low
* Porter NMU.
@@ -77,7 +103,7 @@
* new upstream release.
- -- Frank Kirschner <kirfrank at ibmtux> Tue, 1 Jul 2003 20:00:06 +0200
+ -- Frank Kirschner <kirfrank at debian.org> Tue, 1 Jul 2003 20:00:06 +0200
gpsdrive (1.32-1) unstable; urgency=low
Added: packages/gpsdrive/trunk/debian/compat
===================================================================
--- packages/gpsdrive/trunk/debian/compat (rev 0)
+++ packages/gpsdrive/trunk/debian/compat 2007-07-27 20:51:00 UTC (rev 987)
@@ -0,0 +1 @@
+4
Modified: packages/gpsdrive/trunk/debian/control
===================================================================
--- packages/gpsdrive/trunk/debian/control 2007-07-27 20:44:45 UTC (rev 986)
+++ packages/gpsdrive/trunk/debian/control 2007-07-27 20:51:00 UTC (rev 987)
@@ -1,21 +1,22 @@
Source: gpsdrive
Section: utils
Priority: optional
-Maintainer: Frank Kirschner <kirfrank at debian.org>
-Build-Depends: debhelper (>> 3.0.0), pkg-config, libpcre3-dev, libgtk2.0-dev, libmysqlclient15-dev, xutils
-Standards-Version: 3.6.1
+Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+Uploaders: Andreas Putzo <andreas at putzo.net>
+Build-Depends: debhelper (>> 3.0.0), pkg-config, libpcre3-dev, libgtk2.0-dev, libmysqlclient15-dev, xutils, autotools-dev, dpatch
+Standards-Version: 3.7.2
Package: gpsdrive
Architecture: any
Depends: ${shlibs:Depends}
Recommends: gpsd
-Suggests: libmysqlclient15, imagemagick
+Suggests: libmysqlclient15off, imagemagick
Description: Car navigation system
GpsDrive is a car (bike, ship, plane) navigation system.
GpsDrive displays your position provided from your NMEA capable GPS
receiver on a zoomable map, the map file is autoselected depending
of the position and preferred scale. Speech output is supported if the
"festival" software is running. The maps are autoselected for best
- resolution depending of your position. All Garmin GPS reveiver with a
+ resolution depending of your position. All Garmin GPS reveivers with a
serial output should be usable, also other GPS receiver which supports
NMEA protocol.
Added: packages/gpsdrive/trunk/debian/man/man1/friendsd2.1
===================================================================
--- packages/gpsdrive/trunk/debian/man/man1/friendsd2.1 (rev 0)
+++ packages/gpsdrive/trunk/debian/man/man1/friendsd2.1 2007-07-27 20:51:00 UTC (rev 987)
@@ -0,0 +1,31 @@
+.TH FRIENDSD2 1
+.SH NAME
+friendsd2 \- friend server for gpsdrive
+.SH SYNOPSIS
+friendsd2 [OPTION]
+.PP
+.B friendsd2
+[
+.B \-n
+.I servername
+]
+.SH DESCRIPTION
+.\" Putting a newline after each sentence can generate better output.
+friendsd2 acts as a server for the position of your friends. If you enable it in
+the settings menu of \fBgpsdrive\fR you can see the position of other gpsdrive users that are connected to this server.
+
+The server listens port 50123 (udp).
+
+There is a friends server running on www.gpsdrive.cc which can be used.
+.SH CAVEATS
+\fBfriendsd2\fR was NOT tested for security. It should be run in a secured environment and/or as a user with no
+privileges.
+.SH AUTHOR
+Fritz Ganter
+.br
+E-Mail: ganter at ganter.at
+.br
+http://www.gpsdrive.de
+.SH "SEE ALSO"
+.\" Always quote multiple words for .SH
+.BR gpsdrive (1).
Modified: packages/gpsdrive/trunk/debian/man/man1/garble.1
===================================================================
--- packages/gpsdrive/trunk/debian/man/man1/garble.1 2007-07-27 20:44:45 UTC (rev 986)
+++ packages/gpsdrive/trunk/debian/man/man1/garble.1 2007-07-27 20:51:00 UTC (rev 987)
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
.TH GARBLE "1" "October 2003" "Garble v1.0.2 04 Aug 2002" "User Commands"
.SH NAME
-Garble \- manual page for Garble v1.0.2 04 Aug 2002
+Garble \- Console program for downloading data (waypoints, proximity waypoints, tracks and routes) from Garmin GPS receivers.
.SH DESCRIPTION
usage:
All data is sent to standard out. Only the last GPS action option is used.
Added: packages/gpsdrive/trunk/debian/man/man1/gpsfetchmap.1
===================================================================
--- packages/gpsdrive/trunk/debian/man/man1/gpsfetchmap.1 (rev 0)
+++ packages/gpsdrive/trunk/debian/man/man1/gpsfetchmap.1 2007-07-27 20:51:00 UTC (rev 987)
@@ -0,0 +1,257 @@
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sh \" Subsection heading
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings. \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote. \*(C+ will
+.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+. ds -- \(*W-
+. ds PI pi
+. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
+. ds L" ""
+. ds R" ""
+. ds C` ""
+. ds C' ""
+'br\}
+.el\{\
+. ds -- \|\(em\|
+. ds PI \(*p
+. ds L" ``
+. ds R" ''
+'br\}
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" entries marked with X<> in POD. Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.if \nF \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
+..
+. nr % 0
+. rr F
+.\}
+.\"
+.\" For nroff, turn off justification. Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.hy 0
+.if n .na
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear. Run. Save yourself. No user-serviceable parts.
+. \" fudge factors for nroff and troff
+.if n \{\
+. ds #H 0
+. ds #V .8m
+. ds #F .3m
+. ds #[ \f1
+. ds #] \fP
+.\}
+.if t \{\
+. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+. ds #V .6m
+. ds #F 0
+. ds #[ \&
+. ds #] \&
+.\}
+. \" simple accents for nroff and troff
+.if n \{\
+. ds ' \&
+. ds ` \&
+. ds ^ \&
+. ds , \&
+. ds ~ ~
+. ds /
+.\}
+.if t \{\
+. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+. \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+. \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+. \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+. ds : e
+. ds 8 ss
+. ds o a
+. ds d- d\h'-1'\(ga
+. ds D- D\h'-1'\(hy
+. ds th \o'bp'
+. ds Th \o'LP'
+. ds ae ae
+. ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "GPSFETCHMAP 1"
+.TH GPSFETCHMAP 1 "2007-07-16" "perl v5.8.8" "User Contributed Perl Documentation"
+.SH "NAME"
+\&\fBgpsfetchmap\fR Version 1.04
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+\&\fBgpsfetchmap\fR is a program to download maps from a mapserver for use with gpsdrive.
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBCommon usages:\fR
+.PP
+gpsfetchmap \-w <\s-1WAYPOINT\s0 \s-1NAME\s0> \-sc <\s-1SCALE\s0> \-a <#> \-p
+.PP
+gpsfetchmap \-la <latitude \s-1MM\s0.DDDD> \-lo <latitude \s-1MM\s0.DDDD> \-sc <\s-1SCALE\s0> \-a <#> \-p
+.PP
+gpsfetchmap \-sla <start latitude \s-1MM\s0.DDDD> \-endla <end latitude \s-1MM\s0.DDDD> \-slo <start longitude \s-1MM\s0.DDDD> \-endlo <end longitude \s-1MM\s0.DDDD> \-sc <\s-1SCALE\s0> \-a <#> \-p
+.PP
+\&\fBAll options:\fR
+.PP
+gpsfetchmap [\-w <\s-1WAYPOINT\s0 \s-1NAME\s0>]
+ [\-la <latitude \s-1DD\s0.MMMM>] [\-lo <longitude \s-1DD\s0.MMMM>]
+ [\-sla <start latitude \s-1DD\s0.MMMM>] [\-endla <end latitude \s-1DD\s0.MMMM>]
+ [\-slo <start longitude \s-1DD\s0.MMMM>] [\-endlo <end longitude \s-1DD\s0.MMMM>]
+ [\-sc <\s-1SCALE\s0>] [\-a <#>] [\-p] [\-m <\s-1MAPSERVER\s0>]
+ [\-u <\s-1UNIT\s0>] [\-md <\s-1DIR\s0>] [\-W <\s-1FILE\s0>]
+ [\-C <\s-1FILE\s0>] [\-P <\s-1PREFIX\s0>] [\-F] [\-d] [\-v] [\-h] [\-M]
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+.IP "\fB\-w, \-\-waypoint <\s-1WAYPOINT\s0 \s-1NAME\s0\fR>" 8
+.IX Item "-w, --waypoint <WAYPOINT NAME>"
+Takes a waypoint name and uses the latitude and longitude for that waypoint as the centerpoint
+of the area to be covered. Waypoints are read from 'way.txt', or file defined by '\-W'. This, '\-la' and '\-lo' or '\-sla', '\-ela', '\-slo', '\-elo' is required.
+.IP "\fB\-la, \-\-lat <latitude \s-1DD\s0.MMMM\fR>" 8
+.IX Item "-la, --lat <latitude DD.MMMM>"
+Takes a latitude in format \s-1DD\s0.MMMM and uses that as the latitude for the centerpoint of the area
+to be covered. Will be overriden by the latitude of waypoint if '\-w' is used. This and '\-lo', '\-w' or '\-sla', '\-ela', '\-slo', '\-elo' is required.
+.IP "\fB\-lo, \-\-lon <longitude \s-1DD\s0.MMMM\fR>" 8
+.IX Item "-lo, --lon <longitude DD.MMMM>"
+Takes a longitude in format \s-1DD\s0.MMMM and uses that as the longitude for the centerpoint of the area
+to be covered. Will be overriden by the longitude of waypoint if '\-w' is used. This and '\-la', '\-w' or '\-sla', '\-ela', '\-slo', '\-elo' is required.
+.IP "\fB\-sla \-\-start\-lat <start latitude \s-1DD\s0.MMMM\fR>" 8
+.IX Item "-sla --start-lat <start latitude DD.MMMM>"
+Takes a latitude in format \s-1DD\s0.MMMM and uses that as the start latitude for the area to be covered. Will override '\-la' and '\-lo' but will be overriden by '\-w'. This, '\-ela', '\-slo' and '\-elo' or '\-w' or '\-la' and '\-lo' is required.
+.IP "\fB\-ela \-\-end\-lat <end latitude \s-1DD\s0.MMMM\fR>" 8
+.IX Item "-ela --end-lat <end latitude DD.MMMM>"
+Takes a latitude in format \s-1DD\s0.MMMM and uses that as the end latitude for the area to be covered. Will override '\-la' and '\-lo' but will be overriden by '\-w'.
+This, '\-sla', '\-slo' and '\-elo' or '\-w' or '\-la' and '\-lo' is required.
+.IP "\fB\-slo \-\-start\-lon <start longitude \s-1DD\s0.MMMM\fR>" 8
+.IX Item "-slo --start-lon <start longitude DD.MMMM>"
+Takes a longitude in format \s-1DD\s0.MMMM and uses that as the start longitude for the area to be covered. Will override '\-la' and '\-lo' but will be overriden by '\-w'. This, '\-sla', '\-ela' and '\-elo' or '\-w' or '\-la' and '\-lo' is required.
+.IP "\fB\-elo \-\-end\-lon <end longitude \s-1DD\s0.MMMM\fR>" 8
+.IX Item "-elo --end-lon <end longitude DD.MMMM>"
+Takes a longitude in format \s-1DD\s0.MMMM and uses that as the end longitude for the area to be covered. Will override '\-la' and '\-lo' but will be overriden by '\-w'. This, '\-sla', '\-ela' and '\-slo' or '\-w' or '\-la' and '\-lo' is required.
+.IP "\fB\-sc, \-\-scale <\s-1SCALE\s0\fR>" 8
+.IX Item "-sc, --scale <SCALE>"
+Scales of map(s) to download. Default: 50000.
+.Sp
+Formats:
+.Sp
+.Vb 2
+\& '####'
+\& \- Just this scale.
+.Ve
+.Sp
+.Vb 2
+\& '####,####,####'
+\& \- All scales in the list. May be combined with other formats.
+.Ve
+.Sp
+.Vb 2
+\& '>####'
+\& \- All scales above and including the number given.
+.Ve
+.Sp
+.Vb 2
+\& '<####'
+\& \- All scales below and including the number given.
+.Ve
+.Sp
+.Vb 2
+\& '####\-####'
+\& \- All scales from first to last number given.
+.Ve
+.IP "\fB\-a, \-\-area <#\fR>" 8
+.IX Item "-a, --area <#>"
+Area to cover. # of 'units' size square around the centerpoint. You can use a single number
+for square area. Or you can use '#x#' to do a rectangle, where the first number is distance
+latitude and the second number is distance of longitude. 'units' is read from the configuration
+file (\-C) or as defined by (\-u).
+.IP "\fB\-p, \-\-polite\fR" 8
+.IX Item "-p, --polite"
+This causes the program to sleep one second between downloads to be polite to the mapserver.
+Takes an optional value of number of seconds to sleep.
+.IP "\fB\-m, \-\-mapserver <\s-1MAPSERVER\s0\fR>" 8
+.IX Item "-m, --mapserver <MAPSERVER>"
+Mapserver to download from. Currently can use: 'mapblast' or 'expedia'.Default: 'mapblast'.
+.IP "\fB\-u, \-\-unit <\s-1UNIT\s0\fR>" 8
+.IX Item "-u, --unit <UNIT>"
+The measurement system to use. Default is read from configuration file <\-C>. Possibles are:
+miles, nautical, kilometers.
+.IP "\fB\-md \-\-mapdir <\s-1DIR\s0\fR>" 8
+.IX Item "-md --mapdir <DIR>"
+Override the configfiles mapdir with this value.
+.IP "\fB\-W, \-\-WAYPOINT <\s-1FILE\s0\fR>" 8
+.IX Item "-W, --WAYPOINT <FILE>"
+File to read waypoints from. Default: '~/.gpsdrive/way.txt'.
+.IP "\fB\-C, \-\-CONFIG\fR" 8
+.IX Item "-C, --CONFIG"
+File to read for GPSDrive configuration information. Default: '~/.gpsdrive/gpsdriverc'.
+.IP "\fB\-P, \-\-PREFIX <\s-1PREFIX\s0\fR>" 8
+.IX Item "-P, --PREFIX <PREFIX>"
+Takes a prefix string to be used as the start of all saved map files. Default: \*(L"map_\*(R".
+.IP "\fB\-F, \-\-FORCE\fR" 8
+.IX Item "-F, --FORCE"
+Force program to download maps without asking you to confirm the download.
+.IP "\fB\-d, \-\-debug\fR" 8
+.IX Item "-d, --debug"
+Prints debugging information.
+.IP "\fB\-v, \-\-version\fR" 8
+.IX Item "-v, --version"
+Prints version information and exits.
+.IP "\fB\-\-help \-h \-x\fR" 8
+.IX Item "--help -h -x"
+Prints the usage page and exits.
+.IP "\fB\-\-MAN \-M\fR" 8
+.IX Item "--MAN -M"
+Prints the manual page and exits.
Modified: packages/gpsdrive/trunk/debian/manpages
===================================================================
--- packages/gpsdrive/trunk/debian/manpages 2007-07-27 20:44:45 UTC (rev 986)
+++ packages/gpsdrive/trunk/debian/manpages 2007-07-27 20:51:00 UTC (rev 987)
@@ -1,3 +1,5 @@
debian/man/man1/garble.1
debian/man/man1/geo-code.1
debian/man/man1/geo-nearest.1
+debian/man/man1/gpsfetchmap.1
+debian/man/man1/friendsd2.1
Added: packages/gpsdrive/trunk/debian/patches/00list
===================================================================
--- packages/gpsdrive/trunk/debian/patches/00list (rev 0)
+++ packages/gpsdrive/trunk/debian/patches/00list 2007-07-27 20:51:00 UTC (rev 987)
@@ -0,0 +1,6 @@
+01old.dpatch
+02configure.dpatch
+03manpage.dpatch
+04missing_includes.dpatch
+05start_gpsd.dpatch
+06libtool.dpatch
Added: packages/gpsdrive/trunk/debian/patches/01old.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/01old.dpatch (rev 0)
+++ packages/gpsdrive/trunk/debian/patches/01old.dpatch 2007-07-27 20:51:00 UTC (rev 987)
@@ -0,0 +1,118 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01old.dpatch by <andreas at putzo.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Former patches to gpsdrive.
+## DP: Switch over to use libmysqlclient.so.15
+## DP: Bugfix in friendsd.c by security team (#337495)
+
+ at DPATCH@
+diff -urNad gpsdrive-2.09~/README.SQL gpsdrive-2.09/README.SQL
+--- gpsdrive-2.09~/README.SQL 2007-07-17 13:58:06.000000000 +0200
++++ gpsdrive-2.09/README.SQL 2007-07-17 14:54:09.000000000 +0200
+@@ -7,7 +7,7 @@
+ Compiling:
+ ----------
+ There is no MySQL needed for compiling, the needed library
+-libmysqlclient.so.10 will be loaded at runtime, if found.
++libmysqlclient.so.15 will be loaded at runtime, if found.
+
+ Running and first initialization:
+ ---------------------------------
+diff -urNad gpsdrive-2.09~/man/gpsdrive.1 gpsdrive-2.09/man/gpsdrive.1
+--- gpsdrive-2.09~/man/gpsdrive.1 2007-07-17 13:58:06.000000000 +0200
++++ gpsdrive-2.09/man/gpsdrive.1 2007-07-17 14:52:45.000000000 +0200
+@@ -633,7 +633,7 @@
+ menu.
+
+ GpsDrive use MySQL automatically if it finds the shared library
+-.I libmysqlclient.so.10
++.I libmysqlclient.so.15
+ and the MySQL Server is running and a connection to the database is possible. For first use you have to run
+ .B create.sql
+ once.
+diff -urNad gpsdrive-2.09~/src/friendsd.c gpsdrive-2.09/src/friendsd.c
+--- gpsdrive-2.09~/src/friendsd.c 2007-07-17 13:58:05.000000000 +0200
++++ gpsdrive-2.09/src/friendsd.c 2007-07-17 15:00:28.000000000 +0200
+@@ -364,7 +364,7 @@
+ fprintf (stderr, "%d clients, last: %s[%s]:\n",
+ listnum, hname, fromaddr);
+
+- fprintf (stderr, txt);
++ fprintf (stderr, "%s", txt);
+ /* printf ("sende\n%s, Länge %d, clilen %d", txt, l,clilen); */
+ if ((nosent = sendto (sockfd, txt, l, 0, pcli_addr, clilen)) != l)
+ {
+diff -urNad gpsdrive-2.10+pre2~/src/gpsdrive.c gpsdrive-2.10+pre2/src/gpsdrive.c
+--- gpsdrive-2.10+pre2~/src/gpsdrive.c 2007-07-17 16:37:22.000000000 +0200
++++ gpsdrive-2.10+pre2/src/gpsdrive.c 2007-07-17 16:39:24.000000000 +0200
+@@ -10498,28 +10498,28 @@
+ handle = dlopen ("/usr/local/lib/libmysqlclient.dll", RTLD_LAZY);
+ if (!handle)
+ handle =
+- dlopen ("@PREFIX@/lib/mysql/libmysqlclient.10.dylib", RTLD_LAZY);
++ dlopen ("@PREFIX@/lib/mysql/libmysqlclient.15.dylib", RTLD_LAZY);
+ if (!handle)
+ handle = dlopen ("/usr/lib/libmysqlclient.so", RTLD_LAZY);
+ if (!handle)
+ handle = dlopen ("libmysqlclient.so", RTLD_LAZY);
+ if (!handle)
+- handle = dlopen ("libmysqlclient.so.10", RTLD_LAZY);
++ handle = dlopen ("libmysqlclient.so.15", RTLD_LAZY);
+ if (!handle)
+- handle = dlopen ("/opt/lib/mysql/libmysqlclient.so.10", RTLD_LAZY);
++ handle = dlopen ("/opt/lib/mysql/libmysqlclient.so.15", RTLD_LAZY);
+ if (!handle)
+- handle = dlopen ("/opt/mysql/lib/libmysqlclient.so.10", RTLD_LAZY);
++ handle = dlopen ("/opt/mysql/lib/libmysqlclient.so.15", RTLD_LAZY);
+ if (!handle)
+- handle = dlopen ("/usr/lib/mysql/libmysqlclient.so.10", RTLD_LAZY);
++ handle = dlopen ("/usr/lib/mysql/libmysqlclient.so.15", RTLD_LAZY);
+ if (!handle)
+- handle = dlopen ("/usr/lib/libmysqlclient.so.10", RTLD_LAZY);
++ handle = dlopen ("/usr/lib/libmysqlclient.so.15", RTLD_LAZY);
+ if (!handle)
+ handle =
+- dlopen ("/usr/local/lib/mysql/libmysqlclient.so.10", RTLD_LAZY);
++ dlopen ("/usr/local/lib/mysql/libmysqlclient.so.15", RTLD_LAZY);
+ if (!handle)
+- handle = dlopen ("/usr/local/mysql/libmysqlclient.so.10", RTLD_LAZY);
++ handle = dlopen ("/usr/local/mysql/libmysqlclient.so.15", RTLD_LAZY);
+ if (!handle)
+- handle = dlopen ("/usr/local/lib/libmysqlclient.so.10", RTLD_LAZY);
++ handle = dlopen ("/usr/local/lib/libmysqlclient.so.15", RTLD_LAZY);
+ if (!handle)
+ handle = dlopen ("/sw/lib/libmysqlclient.dylib", RTLD_LAZY);
+
+diff -urNad gpsdrive-2.09~/src/gpsdrive.h gpsdrive-2.09/src/gpsdrive.h
+--- gpsdrive-2.09~/src/gpsdrive.h 2007-07-17 13:58:05.000000000 +0200
++++ gpsdrive-2.09/src/gpsdrive.h 2007-07-17 14:54:28.000000000 +0200
+@@ -237,7 +237,7 @@
+ const char *db,
+ unsigned int port,
+ const char *unix_socket,
+- unsigned int clientflag);
++ unsigned long clientflag);
+ void (*dl_mysql_close)(MYSQL *sock);
+ int (*dl_mysql_query)(MYSQL *mysql, const char *q);
+ my_ulonglong (*dl_mysql_affected_rows)(MYSQL *mysql);
+diff -urNad gpsdrive-2.09~/src/mysql/mysql.h gpsdrive-2.09/src/mysql/mysql.h
+--- gpsdrive-2.09~/src/mysql/mysql.h 2007-07-17 13:58:05.000000000 +0200
++++ gpsdrive-2.09/src/mysql/mysql.h 2007-07-17 14:59:32.000000000 +0200
+@@ -229,14 +229,14 @@
+ const char *db,
+ unsigned int port,
+ const char *unix_socket,
+- unsigned int clientflag);
++ unsigned long clientflag);
+ #else
+ MYSQL * STDCALL mysql_real_connect(MYSQL *mysql, const char *host,
+ const char *user,
+ const char *passwd,
+ unsigned int port,
+ const char *unix_socket,
+- unsigned int clientflag);
++ unsigned long clientflag);
+ #endif
+ void STDCALL mysql_close(MYSQL *sock);
+ int STDCALL mysql_select_db(MYSQL *mysql, const char *db);
Added: packages/gpsdrive/trunk/debian/patches/02configure.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/02configure.dpatch (rev 0)
+++ packages/gpsdrive/trunk/debian/patches/02configure.dpatch 2007-07-27 20:51:00 UTC (rev 987)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02configure.dpatch by <andreas at putzo.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: remove gcc >= 3.x check
+
+ at DPATCH@
+diff -urNad gpsdrive-2.09~/configure gpsdrive-2.09/configure
+--- gpsdrive-2.09~/configure 2007-07-17 13:58:06.000000000 +0200
++++ gpsdrive-2.09/configure 2007-07-17 15:20:54.000000000 +0200
+@@ -9511,20 +9511,6 @@
+
+ echo "Using $CC compiler"
+
+-if test "$CC" = "gcc" ; then
+-
+-if $CC -dumpversion|egrep -q "^3\.*"; then
+-echo "GCC ok"
+-else
+-echo "*****************************************"
+-echo "You need a gcc >= 3.x to compile GpsDrive"
+-echo "*****************************************"
+-exit
+-fi
+-
+-fi
+-
+-
+ UNAMEP=`uname -p`
+ ARCHP=`arch`
+ CFLAGS="$CFLAGS"
Added: packages/gpsdrive/trunk/debian/patches/03manpage.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/03manpage.dpatch (rev 0)
+++ packages/gpsdrive/trunk/debian/patches/03manpage.dpatch 2007-07-27 20:51:00 UTC (rev 987)
@@ -0,0 +1,257 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03manpage.dpatch by <andreas at putzo.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes typo in manpage. Closes: #414240.
+
+ at DPATCH@
+diff -urNad gpsdrive-2.10+pre2~/man/gpsdrive.1 gpsdrive-2.10+pre2/man/gpsdrive.1
+--- gpsdrive-2.10+pre2~/man/gpsdrive.1 2007-07-17 21:07:37.000000000 +0000
++++ gpsdrive-2.10+pre2/man/gpsdrive.1 2007-07-17 21:08:59.000000000 +0000
+@@ -6,7 +6,7 @@
+
+ .SH About this manual page
+
+-This manual page explain the basic functions of GpsDrive and some
++This manual page explains the basic functions of GpsDrive and some
+ additional info.
+
+ In GpsDrive you find tooltips for nearly all buttons, there is also a
+@@ -25,12 +25,12 @@
+
+ GpsDrive displays your position provided from your NMEA capable GPS
+ receiver on a zoomable map . The maps are autoselected depending on
+-your position. You can set prefered scale, which the program tries to
++your position. You can set preferred scale, which the program tries to
+ get from available maps.
+
+ GpsDrive was tested with a GARMIN GPS III, a Crux II GPS PCMCIA
+-card and a Navilock USB receiver. All Garmin GPS reveivers with a serial output should be
+-usable. Other GPS reveivers that sends NMEA protocol over the
++card and a Navilock USB receiver. All Garmin GPS receivers with a serial output should be
++usable. Other GPS receivers that sends NMEA protocol over the
+ serial output should also work with GpsDrive.
+
+ These GPS receivers are reported to work with gpsdrive:
+@@ -132,7 +132,7 @@
+ Displays, where the menu should be hidden.
+ .TP
+ .BI \-s "\| height\^"
+-Set the height of the screen, if autodetection don't satisfy you,
++Set the height of the screen, if autodetection doesn't satisfy you,
+ .IR height
+ is i.e. 768,600,480,200
+ .TP
+@@ -144,8 +144,8 @@
+ .IR -s
+ .TP
+ .BI \-f "\| friendsserver\^"
+-Define a friendsserver to exchange position information with other
+-people. You can also set it in the Settings/Friends menu. You can start your own friendsserver with the program
++Define a friends server to exchange position information with other
++people. You can also set it in the Settings/Friends menu. You can start your own friends server with the program
+ .B friendsd
+ , which is included. More details are in section
+ .I FRIENDSD server
+@@ -170,7 +170,7 @@
+ from your currently used waypoint list.
+ .TP
+ .B \-q
+-Disables SQL support. Only usefull if you have SQL support compiled in.
++Disables SQL support. Only useful if you have SQL support compiled in.
+ .TP
+ .B \-z
+ Don't show zoom and scaling on the map.
+@@ -211,7 +211,7 @@
+ .br
+ You can force the use of gpsd by adding the
+ .B \-n
+-commandline parameter, even if you enabled the direct serial connection
++command line parameter, even if you enabled the direct serial connection
+ in the settings menu.
+
+ .br
+@@ -315,7 +315,7 @@
+ from your shell, if you want another language see section
+ .I LOCALISATION
+
+-On some distribution you may find a "GpsDrive" entry in your Gnome or
++On some distributions you may find a "GpsDrive" entry in your Gnome or
+ KDE menu.
+
+ It is important that you have installed GpsDrive as root, so it can
+@@ -333,15 +333,15 @@
+
+ If you have connected a GPS-Receiver, you see in the
+ .I GPS Info
+-window how much satellites are in view. You can click on this image to switch to the
++window how many satellites are in view. You can click on this image to switch to the
+ .I Satellite position view.
+ .br
+ You must have at least 3 satellites in view. If you want to see your
+ altitude, you need at least 4 satellites. The antenna of your GPS
+ receiver must have free sight to the sky, so you cannot use it
+-indoor. More satellites gives you a better accuracy.
++indoors. More satellites gives you a better accuracy.
+
+-If your receiver have not enough satellites with usable signal, the
++If your receiver has not enough satellites with usable signals, the
+ GPS Info window is red. If your signal is ok and gives a valid
+ position, the GPS Info window is green.
+
+@@ -351,7 +351,7 @@
+
+ This mode is entered if you have a GPS receiver connected. The cursor is at the position your receiver sends.
+
+-The black and a red arrow shows your position on the map. The
++Black and red arrows show your position on the map. The
+ .B black arrow
+ is pointing to your selected target, the
+ .B red arrow
+@@ -371,13 +371,13 @@
+ This mode is activated by clicking on the "Pos. mode" button or if you
+ "Jump" to a target in the FIND menu.
+
+-At this mode, you can temporary change the position for looking around and
++In this mode, you can temporarily change the position for looking around and
+ jump to another positions (i.e. for downloading maps). In this mode this
+ is
+ .B not your real position
+ and is marked as an rectangle.
+
+-You can set the position by simple left-mouse click on the map.
++You can set the position by a simple left-mouse click on the map.
+
+ You can leave the position mode by by clicking on the "Pos. mode"
+ button or middle-mouse click or right-mouse click (which also sets
+@@ -387,11 +387,11 @@
+
+ .SH MAP DOWNLOAD
+
+-You can easily download maps from internet with the
++You can easily download maps from the internet with the
+ .B Download
+ button. GpsDrive stores an index of your maps in the file
+ map_koord.txt in your ~/.gpsdrive directory. You can also use any
+-directory for your maps, but you have set the directory in the
++directory for your maps, but you have to set the directory in the
+ settings menu.
+
+ .SH About maps
+@@ -421,15 +421,15 @@
+ Vienna.
+
+
+-There is also the programs
++There is also the program
+ .IR gpsfetchmap.pl
+ provided to download multiple maps for a bigger area.
+ .br
+ .B Please consider the copyright information
+ www.expedia.com if you want to use their maps!
+ .br
+-.B Don't missuse this service by downloading more maps as you need!
+-You will risc that you will be blocked by this servers.
++.B Don't misuse this service by downloading more maps than you need!
++You will risk being blocked by these servers.
+
+ File formats:
+
+@@ -451,12 +451,12 @@
+ and top_* for topographical maps. If not, gpsdrive won't
+ display the maps.
+
+-There is an "import assistant" build in. Use this to import your maps.
++There is an "import assistant" built in. Use it to import your maps.
+
+ .SH Importing waypoints:
+
+
+-The easiest way is to use the script "wpget" which does all for you if
++The easiest way is to use the script "wpget" which does everything for you if
+ you use a GARMIN receiver.
+ You can use the program "garble" (included in the package) to read
+ out your waypoints from the Garmin GPS (Transfer mode must be set to
+@@ -465,7 +465,7 @@
+ Scripts: "wpget" is a script which calls "garble" in the proper way.
+
+ Be sure to have "wpget", "wpcvt" and "garble" in your path. This is
+-fullfilled, if you did install the program as root and /usr/local/bin
++fulfilled, if you did install the program as root and /usr/local/bin
+ is in your path.
+
+ The manual way:
+@@ -494,7 +494,7 @@
+
+ .SH PROXY SERVER
+ If you must access the internet via a proxy server, you have to set the
+-enviroment variable
++environmental variable
+ .B HTTP_PROXY
+ or
+ .B http_proxy
+@@ -514,7 +514,7 @@
+ position. If you click with the left button near the border, GpsDrive will
+ scroll the map or load the next map if you are on the margin of the map.
+
+-The middle mouse button switches back to normal mode, or select the
++The middle mouse button switches back to normal mode, or selects the
+ "Pos. mode" menu entry. The same if you select a target with the right
+ mouse button. Shift-left-mouse-button and shift-right-mouse-button
+ changes the map scale.
+@@ -548,7 +548,7 @@
+ predefined.
+ .SH Icons for waypoints
+ You can define freely your waypoint type names. But there are special
+-names, which results in special icons display in GpsDrive:
++names, which display special icons in GpsDrive:
+ .TP
+ .B WLAN
+ open WLAN accesspoint
+@@ -572,7 +572,7 @@
+ Shop
+ .TP
+ .B Monu
+-Monument, touristic attraction
++Monument, a tourist attraction
+ .TP
+ .B Speedtrap
+ Speedtrap (Radar), gives warning if this is in front of you
+@@ -618,7 +618,7 @@
+ The PNG image can have transparency, and should have a size around
+ 16x16 until 32x32, bigger icons may result in a performance hit.
+
+-Your user defined waypoints override the built-in waypoint icons.
++Your user-defined waypoints override the built-in waypoint icons.
+
+ .SH SQL support
+
+@@ -626,7 +626,7 @@
+ support. This needs to install a SQL server on your machine. At the
+ moment, only MySQL is supported.
+
+-Don't be afraid, MySQL don't need much resources, is very fast, but makes the
++Don't be afraid, MySQL doesn't need much resources, is very fast, but makes the
+ management (including selection of waypoint types) of the waypoints
+ much easier. In SQL mode you can select the shown waypoints in the
+ .B setup
+@@ -676,8 +676,8 @@
+ Gpsdrive supports
+ .IR kismet.
+ Kismet is a 802.11b wireless network (WLAN) sniffer. If you have
+-kismet running, gpsdrive will detect it and program start and shows
+-new WLAN accesspoints in realtime on the map. SQL mode is necessary to
++kismet running, gpsdrive will detect it and program starts and shows
++new WLAN access points in real time on the map. SQL mode is necessary to
+ run Gpsdrive in Kismet mode. WLAN accesspoints which are already
+ stored in the SQL database from prior wardrivings are ignored. If you
+ have voice output in gpsdrive, you hear information about the new
+@@ -724,7 +724,7 @@
+
+ When you start GpsDrive it will detect the server on port 1314 and
+ puts out some status information as speech. You also have an
+-additonal button (Mute) to switch off sound output.
++additional button (Mute) to switch off sound output.
+
+ GpsDrive tries to select the correct language for your locale.
+ The -l option can force the languages for speech
Added: packages/gpsdrive/trunk/debian/patches/04missing_includes.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/04missing_includes.dpatch (rev 0)
+++ packages/gpsdrive/trunk/debian/patches/04missing_includes.dpatch 2007-07-27 20:51:00 UTC (rev 987)
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04missing_includes.dpatch by <andreas at putzo.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Added header dependencies.
+## DP: Closes: #417498. FTBFS with GCC 4.3: missing #includes
+
+ at DPATCH@
+diff -urNad gpsdrive-2.10+pre2~/src/garmin_application.cpp gpsdrive-2.10+pre2/src/garmin_application.cpp
+--- gpsdrive-2.10+pre2~/src/garmin_application.cpp 2007-07-17 19:12:38.000000000 +0000
++++ gpsdrive-2.10+pre2/src/garmin_application.cpp 2007-07-17 19:13:55.000000000 +0000
+@@ -30,6 +30,7 @@
+ #include <algorithm>
+ #include <stdio.h>
+ #include <assert.h>
++#include <string.h>
+
+ namespace garmin
+ {
+diff -urNad gpsdrive-2.10+pre2~/src/garmin_data.cpp gpsdrive-2.10+pre2/src/garmin_data.cpp
+--- gpsdrive-2.10+pre2~/src/garmin_data.cpp 2007-07-17 19:12:38.000000000 +0000
++++ gpsdrive-2.10+pre2/src/garmin_data.cpp 2007-07-17 19:14:12.000000000 +0000
+@@ -16,6 +16,8 @@
+ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ // GNU General Public License for more details.
+
++#include <string.h>
++
+ #include "garmin_data.h"
+ #include "garmin_util.h"
+
+diff -urNad gpsdrive-2.10+pre2~/src/garmin_data.h gpsdrive-2.10+pre2/src/garmin_data.h
+--- gpsdrive-2.10+pre2~/src/garmin_data.h 2007-07-17 19:12:38.000000000 +0000
++++ gpsdrive-2.10+pre2/src/garmin_data.h 2007-07-17 19:14:32.000000000 +0000
+@@ -19,6 +19,8 @@
+ #ifndef _garmin_data
+ #define _garmin_data
+
++#include <string.h>
++
+ #include "garmin_types.h"
+
+ namespace garmin {
Added: packages/gpsdrive/trunk/debian/patches/05start_gpsd.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/05start_gpsd.dpatch (rev 0)
+++ packages/gpsdrive/trunk/debian/patches/05start_gpsd.dpatch 2007-07-27 20:51:00 UTC (rev 987)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05start_gpsd.dpatch by <andreas at putzo.net>
+##
+## DP: Make gpsdrive aware of debian's gpsd command line options.
+
+ at DPATCH@
+diff -urNad gpsdrive-2.10+pre2~/src/gpsdrive.c gpsdrive-2.10+pre2/src/gpsdrive.c
+--- gpsdrive-2.10+pre2~/src/gpsdrive.c 2007-07-18 16:44:51.000000000 +0000
++++ gpsdrive-2.10+pre2/src/gpsdrive.c 2007-07-18 16:57:44.000000000 +0000
+@@ -2309,12 +2309,14 @@
+ {
+ g_snprintf (s2, sizeof (s2), "%d", t[serialspeed]);
+ if (usedgps)
+- g_snprintf (s, sizeof (s), "gpsd -p %s -c -d %s -s %s -r %s",
+- serialdev, dgpsserver, s2, dgpsport);
++ g_snprintf (s, sizeof (s), "gpsd -d dgpsip://%s:%s %s",
++ dgpsserver, dgpsport, serialdev);
+ else
+- g_snprintf (s, sizeof (s), "gpsd -p %s -s %s", serialdev, s2);
++ g_snprintf (s, sizeof (s), "gpsd %s", serialdev);
++ /*
+ if (earthmate)
+ g_strlcat (s, " -T e -s 9600", sizeof (s));
++ */
+ system (s);
+ gtk_button_set_label (GTK_BUTTON (startgpsbt), _("Stop GPSD"));
+ gtk_tooltips_set_tip (GTK_TOOLTIPS (temptooltips), startgpsbt,
Added: packages/gpsdrive/trunk/debian/patches/06libtool.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/06libtool.dpatch (rev 0)
+++ packages/gpsdrive/trunk/debian/patches/06libtool.dpatch 2007-07-27 20:51:00 UTC (rev 987)
@@ -0,0 +1,6011 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06libtool.dpatch by <root at thorn.putzo.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad gpsdrive-2.10~pre2~/ltmain.sh gpsdrive-2.10~pre2/ltmain.sh
+--- gpsdrive-2.10~pre2~/ltmain.sh 2007-07-17 19:12:38.000000000 +0000
++++ gpsdrive-2.10~pre2/ltmain.sh 2007-07-20 15:57:19.000000000 +0000
+@@ -1,7 +1,7 @@
+ # ltmain.sh - Provide generalized library-building support services.
+ # NOTE: Changing this file will not affect anything until you rerun configure.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+ # Free Software Foundation, Inc.
+ # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ #
+@@ -17,13 +17,41 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+
++basename="s,^.*/,,g"
++
++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
++# is ksh but when the shell is invoked as "sh" and the current value of
++# the _XPG environment variable is not equal to 1 (one), the special
++# positional parameter $0, within a function call, is the name of the
++# function.
++progpath="$0"
++
++# The name of this program:
++progname=`echo "$progpath" | $SED $basename`
++modename="$progname"
++
++# Global variables:
++EXIT_SUCCESS=0
++EXIT_FAILURE=1
++
++PROGRAM=ltmain.sh
++PACKAGE=libtool
++VERSION="1.5.22 Debian 1.5.22-4"
++TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
++
++# See if we are running on zsh, and set the options which allow our
++# commands through without removal of \ escapes.
++if test -n "${ZSH_VERSION+set}" ; then
++ setopt NO_GLOB_SUBST
++fi
++
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+@@ -36,7 +64,7 @@
+ :
+ else
+ # Restart under the correct shell, and then maybe $echo will work.
+- exec $SHELL "$0" --no-reexec ${1+"$@"}
++ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+ fi
+
+ if test "X$1" = X--fallback-echo; then
+@@ -45,19 +73,9 @@
+ cat <<EOF
+ $*
+ EOF
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+-# The name of this program.
+-progname=`$echo "$0" | sed 's%^.*/%%'`
+-modename="$progname"
+-
+-# Constants.
+-PROGRAM=ltmain.sh
+-PACKAGE=libtool
+-VERSION=1.4.2
+-TIMESTAMP=" (1.922.2.53 2001/09/11 03:18:52)"
+-
+ default_mode=
+ help="Try \`$progname --help' for more information."
+ magic="%%%MAGIC variable%%%"
+@@ -67,10 +85,20 @@
+
+ # Sed substitution that helps us do robust quoting. It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e 1s/^X//'
++Xsed="${SED}"' -e 1s/^X//'
+ sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+-SP2NL='tr \040 \012'
+-NL2SP='tr \015\012 \040\040'
++# test EBCDIC or ASCII
++case `echo X|tr X '\101'` in
++ A) # ASCII based system
++ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
++ SP2NL='tr \040 \012'
++ NL2SP='tr \015\012 \040\040'
++ ;;
++ *) # EBCDIC based system
++ SP2NL='tr \100 \n'
++ NL2SP='tr \r\n \100\100'
++ ;;
++esac
+
+ # NLS nuisances.
+ # Only set LANG and LC_ALL to C if already set.
+@@ -85,12 +113,14 @@
+ fi
+
+ # Make sure IFS has a sensible default
+-: ${IFS=" "}
++lt_nl='
++'
++IFS=" $lt_nl"
+
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+- echo "$modename: not configured to build any kind of library" 1>&2
+- echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+- exit 1
++ $echo "$modename: not configured to build any kind of library" 1>&2
++ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
++ exit $EXIT_FAILURE
+ fi
+
+ # Global variables.
+@@ -102,11 +132,268 @@
+ show="$echo"
+ show_help=
+ execute_dlfiles=
++duplicate_deps=no
++preserve_args=
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
+
++#####################################
++# Shell function definitions:
++# This seems to be the best place for them
++
++# func_mktempdir [string]
++# Make a temporary directory that won't clash with other running
++# libtool processes, and avoids race conditions if possible. If
++# given, STRING is the basename for that directory.
++func_mktempdir ()
++{
++ my_template="${TMPDIR-/tmp}/${1-$progname}"
++
++ if test "$run" = ":"; then
++ # Return a directory name, but don't create it in dry-run mode
++ my_tmpdir="${my_template}-$$"
++ else
++
++ # If mktemp works, use that first and foremost
++ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
++
++ if test ! -d "$my_tmpdir"; then
++ # Failing that, at least try and use $RANDOM to avoid a race
++ my_tmpdir="${my_template}-${RANDOM-0}$$"
++
++ save_mktempdir_umask=`umask`
++ umask 0077
++ $mkdir "$my_tmpdir"
++ umask $save_mktempdir_umask
++ fi
++
++ # If we're not in dry-run mode, bomb out on failure
++ test -d "$my_tmpdir" || {
++ $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
++ exit $EXIT_FAILURE
++ }
++ fi
++
++ $echo "X$my_tmpdir" | $Xsed
++}
++
++
++# func_win32_libid arg
++# return the library type of file 'arg'
++#
++# Need a lot of goo to handle *both* DLLs and import libs
++# Has to be a shell function in order to 'eat' the argument
++# that is supplied when $file_magic_command is called.
++func_win32_libid ()
++{
++ win32_libid_type="unknown"
++ win32_fileres=`file -L $1 2>/dev/null`
++ case $win32_fileres in
++ *ar\ archive\ import\ library*) # definitely import
++ win32_libid_type="x86 archive import"
++ ;;
++ *ar\ archive*) # could be an import, or static
++ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
++ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
++ win32_nmres=`eval $NM -f posix -A $1 | \
++ $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
++ case $win32_nmres in
++ import*) win32_libid_type="x86 archive import";;
++ *) win32_libid_type="x86 archive static";;
++ esac
++ fi
++ ;;
++ *DLL*)
++ win32_libid_type="x86 DLL"
++ ;;
++ *executable*) # but shell scripts are "executable" too...
++ case $win32_fileres in
++ *MS\ Windows\ PE\ Intel*)
++ win32_libid_type="x86 DLL"
++ ;;
++ esac
++ ;;
++ esac
++ $echo $win32_libid_type
++}
++
++
++# func_infer_tag arg
++# Infer tagged configuration to use if any are available and
++# if one wasn't chosen via the "--tag" command line option.
++# Only attempt this if the compiler in the base compile
++# command doesn't match the default compiler.
++# arg is usually of the form 'gcc ...'
++func_infer_tag ()
++{
++ if test -n "$available_tags" && test -z "$tagname"; then
++ CC_quoted=
++ for arg in $CC; do
++ case $arg in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ arg="\"$arg\""
++ ;;
++ esac
++ CC_quoted="$CC_quoted $arg"
++ done
++ case $@ in
++ # Blanks in the command may have been stripped by the calling shell,
++ # but not from the CC environment variable when configure was run.
++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
++ # Blanks at the start of $base_compile will cause this to fail
++ # if we don't check for them as well.
++ *)
++ for z in $available_tags; do
++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
++ # Evaluate the configuration.
++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
++ CC_quoted=
++ for arg in $CC; do
++ # Double-quote args containing other shell metacharacters.
++ case $arg in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ arg="\"$arg\""
++ ;;
++ esac
++ CC_quoted="$CC_quoted $arg"
++ done
++ case "$@ " in
++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
++ # The compiler in the base compile command matches
++ # the one in the tagged configuration.
++ # Assume this is the tagged configuration we want.
++ tagname=$z
++ break
++ ;;
++ esac
++ fi
++ done
++ # If $tagname still isn't set, then no tagged configuration
++ # was found and let the user know that the "--tag" command
++ # line option must be used.
++ if test -z "$tagname"; then
++ $echo "$modename: unable to infer tagged configuration"
++ $echo "$modename: specify a tag with \`--tag'" 1>&2
++ exit $EXIT_FAILURE
++# else
++# $echo "$modename: using $tagname tagged configuration"
++ fi
++ ;;
++ esac
++ fi
++}
++
++
++# func_extract_an_archive dir oldlib
++func_extract_an_archive ()
++{
++ f_ex_an_ar_dir="$1"; shift
++ f_ex_an_ar_oldlib="$1"
++
++ $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
++ $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
++ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
++ :
++ else
++ $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
++ exit $EXIT_FAILURE
++ fi
++}
++
++# func_extract_archives gentop oldlib ...
++func_extract_archives ()
++{
++ my_gentop="$1"; shift
++ my_oldlibs=${1+"$@"}
++ my_oldobjs=""
++ my_xlib=""
++ my_xabs=""
++ my_xdir=""
++ my_status=""
++
++ $show "${rm}r $my_gentop"
++ $run ${rm}r "$my_gentop"
++ $show "$mkdir $my_gentop"
++ $run $mkdir "$my_gentop"
++ my_status=$?
++ if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
++ exit $my_status
++ fi
++
++ for my_xlib in $my_oldlibs; do
++ # Extract the objects.
++ case $my_xlib in
++ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
++ *) my_xabs=`pwd`"/$my_xlib" ;;
++ esac
++ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
++ my_xdir="$my_gentop/$my_xlib"
++
++ $show "${rm}r $my_xdir"
++ $run ${rm}r "$my_xdir"
++ $show "$mkdir $my_xdir"
++ $run $mkdir "$my_xdir"
++ exit_status=$?
++ if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
++ exit $exit_status
++ fi
++ case $host in
++ *-darwin*)
++ $show "Extracting $my_xabs"
++ # Do not bother doing anything if just a dry run
++ if test -z "$run"; then
++ darwin_orig_dir=`pwd`
++ cd $my_xdir || exit $?
++ darwin_archive=$my_xabs
++ darwin_curdir=`pwd`
++ darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
++ darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
++ if test -n "$darwin_arches"; then
++ darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
++ darwin_arch=
++ $show "$darwin_base_archive has multiple architectures $darwin_arches"
++ for darwin_arch in $darwin_arches ; do
++ mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++ lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
++ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++ func_extract_an_archive "`pwd`" "${darwin_base_archive}"
++ cd "$darwin_curdir"
++ $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
++ done # $darwin_arches
++ ## Okay now we have a bunch of thin objects, gotta fatten them up :)
++ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
++ darwin_file=
++ darwin_files=
++ for darwin_file in $darwin_filelist; do
++ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
++ lipo -create -output "$darwin_file" $darwin_files
++ done # $darwin_filelist
++ ${rm}r unfat-$$
++ cd "$darwin_orig_dir"
++ else
++ cd "$darwin_orig_dir"
++ func_extract_an_archive "$my_xdir" "$my_xabs"
++ fi # $darwin_arches
++ fi # $run
++ ;;
++ *)
++ func_extract_an_archive "$my_xdir" "$my_xabs"
++ ;;
++ esac
++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
++ done
++ func_extract_archives_result="$my_oldobjs"
++}
++# End of Shell function definitions
++#####################################
++
++# Darwin sucks
++eval std_shrext=\"$shrext_cmds\"
++
++disable_libs=no
++
+ # Parse our command line options once, thoroughly.
+-while test $# -gt 0
++while test "$#" -gt 0
+ do
+ arg="$1"
+ shift
+@@ -122,6 +409,34 @@
+ execute_dlfiles)
+ execute_dlfiles="$execute_dlfiles $arg"
+ ;;
++ tag)
++ tagname="$arg"
++ preserve_args="${preserve_args}=$arg"
++
++ # Check whether tagname contains only valid characters
++ case $tagname in
++ *[!-_A-Za-z0-9,/]*)
++ $echo "$progname: invalid tag name: $tagname" 1>&2
++ exit $EXIT_FAILURE
++ ;;
++ esac
++
++ case $tagname in
++ CC)
++ # Don't test for the "default" C tag, as we know, it's there, but
++ # not specially marked.
++ ;;
++ *)
++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
++ taglist="$taglist $tagname"
++ # Evaluate the configuration.
++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
++ else
++ $echo "$progname: ignoring unknown tag $tagname" 1>&2
++ fi
++ ;;
++ esac
++ ;;
+ *)
+ eval "$prev=\$arg"
+ ;;
+@@ -139,18 +454,27 @@
+ ;;
+
+ --version)
+- echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+- exit 0
++ $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
++ $echo
++ $echo "Copyright (C) 2005 Free Software Foundation, Inc."
++ $echo "This is free software; see the source for copying conditions. There is NO"
++ $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++ exit $?
+ ;;
+
+ --config)
+- sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
+- exit 0
++ ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
++ # Now print the configurations for the tags.
++ for tagname in $taglist; do
++ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
++ done
++ exit $?
+ ;;
+
+ --debug)
+- echo "$progname: enabling shell trace mode"
++ $echo "$progname: enabling shell trace mode"
+ set -x
++ preserve_args="$preserve_args $arg"
+ ;;
+
+ --dry-run | -n)
+@@ -158,18 +482,18 @@
+ ;;
+
+ --features)
+- echo "host: $host"
++ $echo "host: $host"
+ if test "$build_libtool_libs" = yes; then
+- echo "enable shared libraries"
++ $echo "enable shared libraries"
+ else
+- echo "disable shared libraries"
++ $echo "disable shared libraries"
+ fi
+ if test "$build_old_libs" = yes; then
+- echo "enable static libraries"
++ $echo "enable static libraries"
+ else
+- echo "disable static libraries"
++ $echo "disable static libraries"
+ fi
+- exit 0
++ exit $?
+ ;;
+
+ --finish) mode="finish" ;;
+@@ -177,8 +501,23 @@
+ --mode) prevopt="--mode" prev=mode ;;
+ --mode=*) mode="$optarg" ;;
+
++ --preserve-dup-deps) duplicate_deps="yes" ;;
++
+ --quiet | --silent)
+ show=:
++ preserve_args="$preserve_args $arg"
++ ;;
++
++ --tag)
++ prevopt="--tag"
++ prev=tag
++ preserve_args="$preserve_args --tag"
++ ;;
++ --tag=*)
++ set tag "$optarg" ${1+"$@"}
++ shift
++ prev=tag
++ preserve_args="$preserve_args --tag"
+ ;;
+
+ -dlopen)
+@@ -189,7 +528,7 @@
+ -*)
+ $echo "$modename: unrecognized option \`$arg'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+
+ *)
+@@ -202,9 +541,21 @@
+ if test -n "$prevopt"; then
+ $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
++case $disable_libs in
++no)
++ ;;
++shared)
++ build_libtool_libs=no
++ build_old_libs=yes
++ ;;
++static)
++ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
++ ;;
++esac
++
+ # 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.
+@@ -214,8 +565,10 @@
+
+ # Infer the operation mode.
+ if test -z "$mode"; then
++ $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
++ $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
+ case $nonopt in
+- *cc | *++ | gcc* | *-gcc*)
++ *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+ mode=link
+ for arg
+ do
+@@ -256,7 +609,7 @@
+ if test -n "$execute_dlfiles" && test "$mode" != execute; then
+ $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Change the help message to a mode-specific one.
+@@ -270,158 +623,127 @@
+ modename="$modename: compile"
+ # Get the compilation command and the source file.
+ base_compile=
+- prev=
+- lastarg=
+- srcfile="$nonopt"
++ srcfile="$nonopt" # always keep a non-empty value in "srcfile"
++ suppress_opt=yes
+ suppress_output=
++ arg_mode=normal
++ libobj=
++ later=
+
+- user_target=no
+ for arg
+ do
+- case $prev in
+- "") ;;
+- xcompiler)
+- # Aesthetically quote the previous argument.
+- prev=
+- lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+-
+- case $arg in
+- # Double-quote args containing other shell metacharacters.
+- # Many Bourne shells cannot handle close brackets correctly
+- # in scan sets, so we specify it separately.
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+- arg="\"$arg\""
+- ;;
+- esac
++ case $arg_mode in
++ arg )
++ # do not "continue". Instead, add this to base_compile
++ lastarg="$arg"
++ arg_mode=normal
++ ;;
+
+- # Add the previous argument to base_compile.
+- if test -z "$base_compile"; then
+- base_compile="$lastarg"
+- else
+- base_compile="$base_compile $lastarg"
+- fi
++ target )
++ libobj="$arg"
++ arg_mode=normal
+ continue
+ ;;
+- esac
+
+- # Accept any command-line options.
+- case $arg in
+- -o)
+- if test "$user_target" != "no"; then
+- $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+- exit 1
+- fi
+- user_target=next
+- ;;
++ normal )
++ # Accept any command-line options.
++ case $arg in
++ -o)
++ if test -n "$libobj" ; then
++ $echo "$modename: you cannot specify \`-o' more than once" 1>&2
++ exit $EXIT_FAILURE
++ fi
++ arg_mode=target
++ continue
++ ;;
+
+- -static)
+- build_old_libs=yes
+- continue
+- ;;
++ -static | -prefer-pic | -prefer-non-pic)
++ later="$later $arg"
++ continue
++ ;;
+
+- -prefer-pic)
+- pic_mode=yes
+- continue
+- ;;
++ -no-suppress)
++ suppress_opt=no
++ continue
++ ;;
+
+- -prefer-non-pic)
+- pic_mode=no
+- continue
+- ;;
++ -Xcompiler)
++ arg_mode=arg # the next one goes into the "base_compile" arg list
++ continue # The current "srcfile" will either be retained or
++ ;; # replaced later. I would guess that would be a bug.
+
+- -Xcompiler)
+- prev=xcompiler
+- continue
+- ;;
++ -Wc,*)
++ args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
++ lastarg=
++ save_ifs="$IFS"; IFS=','
++ for arg in $args; do
++ IFS="$save_ifs"
+
+- -Wc,*)
+- args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+- lastarg=
+- save_ifs="$IFS"; IFS=','
+- for arg in $args; do
++ # Double-quote args containing other shell metacharacters.
++ # Many Bourne shells cannot handle close brackets correctly
++ # in scan sets, so we specify it separately.
++ case $arg in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ arg="\"$arg\""
++ ;;
++ esac
++ lastarg="$lastarg $arg"
++ done
+ IFS="$save_ifs"
++ lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+
+- # Double-quote args containing other shell metacharacters.
+- # Many Bourne shells cannot handle close brackets correctly
+- # in scan sets, so we specify it separately.
+- case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+- arg="\"$arg\""
+- ;;
+- esac
+- lastarg="$lastarg $arg"
+- done
+- IFS="$save_ifs"
+- lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+-
+- # Add the arguments to base_compile.
+- if test -z "$base_compile"; then
+- base_compile="$lastarg"
+- else
++ # Add the arguments to base_compile.
+ base_compile="$base_compile $lastarg"
+- fi
+- continue
+- ;;
+- esac
++ continue
++ ;;
+
+- case $user_target in
+- next)
+- # The next one is the -o target name
+- user_target=yes
+- continue
+- ;;
+- yes)
+- # We got the output file
+- user_target=set
+- libobj="$arg"
+- continue
++ * )
++ # Accept the current argument as the source file.
++ # The previous "srcfile" becomes the current argument.
++ #
++ lastarg="$srcfile"
++ srcfile="$arg"
++ ;;
++ esac # case $arg
+ ;;
+- esac
+-
+- # Accept the current argument as the source file.
+- lastarg="$srcfile"
+- srcfile="$arg"
++ esac # case $arg_mode
+
+ # Aesthetically quote the previous argument.
+-
+- # Backslashify any backslashes, double quotes, and dollar signs.
+- # These are the only characters that are still specially
+- # interpreted inside of double-quoted scrings.
+ lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
+
++ case $lastarg in
+ # Double-quote args containing other shell metacharacters.
+ # Many Bourne shells cannot handle close brackets correctly
+- # in scan sets, so we specify it separately.
+- case $lastarg in
++ # in scan sets, and some SunOS ksh mistreat backslash-escaping
++ # in scan sets (worked around with variable expansion),
++ # and furthermore cannot handle '|' '&' '(' ')' in scan sets
++ # at all, so we specify them separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ lastarg="\"$lastarg\""
+ ;;
+ esac
+
+- # Add the previous argument to base_compile.
+- if test -z "$base_compile"; then
+- base_compile="$lastarg"
+- else
+- base_compile="$base_compile $lastarg"
+- fi
+- done
++ base_compile="$base_compile $lastarg"
++ done # for arg
+
+- case $user_target in
+- set)
++ case $arg_mode in
++ arg)
++ $echo "$modename: you must specify an argument for -Xcompile"
++ exit $EXIT_FAILURE
+ ;;
+- no)
+- # Get the name of the library object.
+- libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
++ target)
++ $echo "$modename: you must specify a target with \`-o'" 1>&2
++ exit $EXIT_FAILURE
+ ;;
+ *)
+- $echo "$modename: you must specify a target with \`-o'" 1>&2
+- exit 1
++ # Get the name of the library object.
++ [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+ ;;
+ esac
+
+ # Recognize several different file suffixes.
+ # If the user specifies -o file.o, it is replaced with file.lo
+- xform='[cCFSfmso]'
++ xform='[cCFSifmso]'
+ case $libobj in
+ *.ada) xform=ada ;;
+ *.adb) xform=adb ;;
+@@ -429,10 +751,13 @@
+ *.asm) xform=asm ;;
+ *.c++) xform=c++ ;;
+ *.cc) xform=cc ;;
++ *.ii) xform=ii ;;
++ *.class) xform=class ;;
+ *.cpp) xform=cpp ;;
+ *.cxx) xform=cxx ;;
+ *.f90) xform=f90 ;;
+ *.for) xform=for ;;
++ *.java) xform=java ;;
+ esac
+
+ libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+@@ -441,25 +766,63 @@
+ *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+ *)
+ $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
++ func_infer_tag $base_compile
++
++ for arg in $later; do
++ case $arg in
++ -static)
++ build_old_libs=yes
++ continue
++ ;;
++
++ -prefer-pic)
++ pic_mode=yes
++ continue
++ ;;
++
++ -prefer-non-pic)
++ pic_mode=no
++ continue
++ ;;
++ esac
++ done
++
++ qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
++ case $qlibobj in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ qlibobj="\"$qlibobj\"" ;;
++ esac
++ test "X$libobj" != "X$qlibobj" \
++ && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \
++ && $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
++ objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
++ xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
++ if test "X$xdir" = "X$obj"; then
++ xdir=
++ else
++ xdir=$xdir/
++ fi
++ lobj=${xdir}$objdir/$objname
++
+ if test -z "$base_compile"; then
+ $echo "$modename: you must specify a compilation command" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Delete any leftover library objects.
+ if test "$build_old_libs" = yes; then
+- removelist="$obj $libobj"
++ removelist="$obj $lobj $libobj ${libobj}T"
+ else
+- removelist="$libobj"
++ removelist="$lobj $libobj ${libobj}T"
+ fi
+
+ $run $rm $removelist
+- trap "$run $rm $removelist; exit 1" 1 2 15
++ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+
+ # On Cygwin there's no "real" PIC flag so we must build both object types
+ case $host_os in
+@@ -467,7 +830,7 @@
+ pic_mode=default
+ ;;
+ esac
+- if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
++ if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+ # non-PIC code in shared libraries is not supported
+ pic_mode=default
+ fi
+@@ -478,8 +841,9 @@
+ output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+ lockfile="$output_obj.lock"
+ removelist="$removelist $output_obj $lockfile"
+- trap "$run $rm $removelist; exit 1" 1 2 15
++ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+ else
++ output_obj=
+ need_locks=no
+ lockfile=
+ fi
+@@ -487,13 +851,13 @@
+ # Lock this critical section if it is needed
+ # We use this script file to make the link, it avoids creating a new file
+ if test "$need_locks" = yes; then
+- until $run ln "$0" "$lockfile" 2>/dev/null; do
++ until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+ $show "Waiting for $lockfile to be removed"
+ sleep 2
+ done
+ elif test "$need_locks" = warn; then
+ if test -f "$lockfile"; then
+- echo "\
++ $echo "\
+ *** ERROR, $lockfile exists and contains:
+ `cat $lockfile 2>/dev/null`
+
+@@ -505,14 +869,33 @@
+ compiler."
+
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+- echo $srcfile > "$lockfile"
++ $echo "$srcfile" > "$lockfile"
+ fi
+
+ if test -n "$fix_srcfile_path"; then
+ eval srcfile=\"$fix_srcfile_path\"
+ fi
++ qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
++ case $qsrcfile in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ qsrcfile="\"$qsrcfile\"" ;;
++ esac
++
++ $run $rm "$libobj" "${libobj}T"
++
++ # Create a libtool object file (analogous to a ".la" file),
++ # but don't create it if we're doing a dry run.
++ test -z "$run" && cat > ${libobj}T <<EOF
++# $libobj - a libtool object file
++# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
++#
++# Please DO NOT delete this file!
++# It is necessary for linking the library.
++
++# Name of the PIC object.
++EOF
+
+ # Only build a PIC object if we are building libtool libraries.
+ if test "$build_libtool_libs" = yes; then
+@@ -520,53 +903,38 @@
+ fbsd_hideous_sh_bug=$base_compile
+
+ if test "$pic_mode" != no; then
+- # All platforms use -DPIC, to notify preprocessed assembler code.
+- command="$base_compile $srcfile $pic_flag -DPIC"
++ command="$base_compile $qsrcfile $pic_flag"
+ else
+ # Don't build PIC code
+- command="$base_compile $srcfile"
++ command="$base_compile $qsrcfile"
+ fi
+- if test "$build_old_libs" = yes; then
+- lo_libobj="$libobj"
+- dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
+- if test "X$dir" = "X$libobj"; then
+- dir="$objdir"
+- else
+- dir="$dir/$objdir"
+- fi
+- libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
+
+- if test -d "$dir"; then
+- $show "$rm $libobj"
+- $run $rm $libobj
+- else
+- $show "$mkdir $dir"
+- $run $mkdir $dir
+- status=$?
+- if test $status -ne 0 && test ! -d $dir; then
+- exit $status
+- fi
++ if test ! -d "${xdir}$objdir"; then
++ $show "$mkdir ${xdir}$objdir"
++ $run $mkdir ${xdir}$objdir
++ exit_status=$?
++ if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
++ exit $exit_status
+ fi
+ fi
+- if test "$compiler_o_lo" = yes; then
+- output_obj="$libobj"
+- command="$command -o $output_obj"
+- elif test "$compiler_c_o" = yes; then
+- output_obj="$obj"
+- command="$command -o $output_obj"
++
++ if test -z "$output_obj"; then
++ # Place PIC objects in $objdir
++ command="$command -o $lobj"
+ fi
+
+- $run $rm "$output_obj"
++ $run $rm "$lobj" "$output_obj"
++
+ $show "$command"
+ if $run eval "$command"; then :
+ else
+ test -n "$output_obj" && $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test "$need_locks" = warn &&
+- test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
+- echo "\
++ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
++ $echo "\
+ *** ERROR, $lockfile contains:
+ `cat $lockfile 2>/dev/null`
+
+@@ -581,13 +949,13 @@
+ compiler."
+
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Just move the object if needed, then go on to compile the next one
+- if test x"$output_obj" != x"$libobj"; then
+- $show "$mv $output_obj $libobj"
+- if $run $mv $output_obj $libobj; then :
++ if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
++ $show "$mv $output_obj $lobj"
++ if $run $mv $output_obj $lobj; then :
+ else
+ error=$?
+ $run $rm $removelist
+@@ -595,77 +963,50 @@
+ fi
+ fi
+
+- # If we have no pic_flag, then copy the object into place and finish.
+- if (test -z "$pic_flag" || test "$pic_mode" != default) &&
+- test "$build_old_libs" = yes; then
+- # Rename the .lo from within objdir to obj
+- if test -f $obj; then
+- $show $rm $obj
+- $run $rm $obj
+- fi
++ # Append the name of the PIC object to the libtool object file.
++ test -z "$run" && cat >> ${libobj}T <<EOF
++pic_object='$objdir/$objname'
+
+- $show "$mv $libobj $obj"
+- if $run $mv $libobj $obj; then :
+- else
+- error=$?
+- $run $rm $removelist
+- exit $error
+- fi
++EOF
+
+- xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+- if test "X$xdir" = "X$obj"; then
+- xdir="."
+- else
+- xdir="$xdir"
+- fi
+- baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"`
+- libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
+- # Now arrange that obj and lo_libobj become the same file
+- $show "(cd $xdir && $LN_S $baseobj $libobj)"
+- if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
+- # Unlock the critical section if it was locked
+- if test "$need_locks" != no; then
+- $run $rm "$lockfile"
+- fi
+- exit 0
+- else
+- error=$?
+- $run $rm $removelist
+- exit $error
+- fi
++ # Allow error messages only from the first compilation.
++ if test "$suppress_opt" = yes; then
++ suppress_output=' >/dev/null 2>&1'
+ fi
++ else
++ # No PIC object so indicate it doesn't exist in the libtool
++ # object file.
++ test -z "$run" && cat >> ${libobj}T <<EOF
++pic_object=none
+
+- # Allow error messages only from the first compilation.
+- suppress_output=' >/dev/null 2>&1'
++EOF
+ fi
+
+ # Only build a position-dependent object if we build old libraries.
+ if test "$build_old_libs" = yes; then
+ if test "$pic_mode" != yes; then
+ # Don't build PIC code
+- command="$base_compile $srcfile"
++ command="$base_compile $qsrcfile"
+ else
+- # All platforms use -DPIC, to notify preprocessed assembler code.
+- command="$base_compile $srcfile $pic_flag -DPIC"
++ command="$base_compile $qsrcfile $pic_flag"
+ fi
+ if test "$compiler_c_o" = yes; then
+ command="$command -o $obj"
+- output_obj="$obj"
+ fi
+
+ # Suppress compiler output if we already did a PIC compilation.
+ command="$command$suppress_output"
+- $run $rm "$output_obj"
++ $run $rm "$obj" "$output_obj"
+ $show "$command"
+ if $run eval "$command"; then :
+ else
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test "$need_locks" = warn &&
+- test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
+- echo "\
++ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
++ $echo "\
+ *** ERROR, $lockfile contains:
+ `cat $lockfile 2>/dev/null`
+
+@@ -680,11 +1021,11 @@
+ compiler."
+
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Just move the object if needed
+- if test x"$output_obj" != x"$obj"; then
++ if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+ $show "$mv $output_obj $obj"
+ if $run $mv $output_obj $obj; then :
+ else
+@@ -694,29 +1035,31 @@
+ fi
+ fi
+
+- # Create an invalid libtool object if no PIC, so that we do not
+- # accidentally link it into a program.
+- if test "$build_libtool_libs" != yes; then
+- $show "echo timestamp > $libobj"
+- $run eval "echo timestamp > \$libobj" || exit $?
+- else
+- # Move the .lo from within objdir
+- $show "$mv $libobj $lo_libobj"
+- if $run $mv $libobj $lo_libobj; then :
+- else
+- error=$?
+- $run $rm $removelist
+- exit $error
+- fi
+- fi
++ # Append the name of the non-PIC object the libtool object file.
++ # Only append if the libtool object file exists.
++ test -z "$run" && cat >> ${libobj}T <<EOF
++# Name of the non-PIC object.
++non_pic_object='$objname'
++
++EOF
++ else
++ # Append the name of the non-PIC object the libtool object file.
++ # Only append if the libtool object file exists.
++ test -z "$run" && cat >> ${libobj}T <<EOF
++# Name of the non-PIC object.
++non_pic_object=none
++
++EOF
+ fi
+
++ $run $mv "${libobj}T" "${libobj}"
++
+ # Unlock the critical section if it was locked
+ if test "$need_locks" != no; then
+ $run $rm "$lockfile"
+ fi
+
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool link mode
+@@ -727,7 +1070,7 @@
+ # It is impossible to link a dll without this setting, and
+ # we shouldn't force the makefile maintainer to figure out
+ # which system we are compiling for in order to pass an extra
+- # flag for every libtool invokation.
++ # flag for every libtool invocation.
+ # allow_undefined=no
+
+ # FIXME: Unfortunately, there are problems with the above when trying
+@@ -742,6 +1085,7 @@
+ ;;
+ esac
+ libtool_args="$nonopt"
++ base_compile="$nonopt $@"
+ compile_command="$nonopt"
+ finalize_command="$nonopt"
+
+@@ -757,6 +1101,7 @@
+ linker_flags=
+ dllsearchpath=
+ lib_search_path=`pwd`
++ inst_prefix_dir=
+
+ avoid_version=no
+ dlfiles=
+@@ -771,6 +1116,9 @@
+ module=no
+ no_install=no
+ objs=
++ non_pic_objects=
++ notinst_path= # paths that contain not-installed libtool libraries
++ precious_files_regex=
+ prefer_static_libs=no
+ preload=no
+ prev=
+@@ -782,6 +1130,9 @@
+ temp_rpath=
+ thread_safe=no
+ vinfo=
++ vinfo_number=no
++
++ func_infer_tag $base_compile
+
+ # We need to know -static, to get the right output filenames.
+ for arg
+@@ -795,14 +1146,15 @@
+ if test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
++ prefer_static_libs=yes
+ else
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
++ prefer_static_libs=built
+ fi
+ build_libtool_libs=no
+ build_old_libs=yes
+- prefer_static_libs=yes
+ break
+ ;;
+ esac
+@@ -812,7 +1164,7 @@
+ test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+ # Go through the arguments, transforming them on the way.
+- while test $# -gt 0; do
++ while test "$#" -gt 0; do
+ arg="$1"
+ shift
+ case $arg in
+@@ -877,7 +1229,7 @@
+ export_symbols="$arg"
+ if test ! -f "$arg"; then
+ $echo "$modename: symbol file \`$arg' does not exist"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ prev=
+ continue
+@@ -887,18 +1239,140 @@
+ prev=
+ continue
+ ;;
++ inst_prefix)
++ inst_prefix_dir="$arg"
++ prev=
++ continue
++ ;;
++ precious_regex)
++ precious_files_regex="$arg"
++ prev=
++ continue
++ ;;
+ release)
+ release="-$arg"
+ prev=
+ continue
+ ;;
++ objectlist)
++ if test -f "$arg"; then
++ save_arg=$arg
++ moreargs=
++ for fil in `cat $save_arg`
++ do
++# moreargs="$moreargs $fil"
++ arg=$fil
++ # A libtool-controlled object.
++
++ # Check to see that this really is a libtool object.
++ if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++ pic_object=
++ non_pic_object=
++
++ # Read the .lo file
++ # If there is no directory component, then add one.
++ case $arg in
++ */* | *\\*) . $arg ;;
++ *) . ./$arg ;;
++ esac
++
++ if test -z "$pic_object" || \
++ test -z "$non_pic_object" ||
++ test "$pic_object" = none && \
++ test "$non_pic_object" = none; then
++ $echo "$modename: cannot find name of object for \`$arg'" 1>&2
++ exit $EXIT_FAILURE
++ fi
++
++ # Extract subdirectory from the argument.
++ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
++ if test "X$xdir" = "X$arg"; then
++ xdir=
++ else
++ xdir="$xdir/"
++ fi
++
++ if test "$pic_object" != none; then
++ # Prepend the subdirectory the object is found in.
++ pic_object="$xdir$pic_object"
++
++ if test "$prev" = dlfiles; then
++ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
++ dlfiles="$dlfiles $pic_object"
++ prev=
++ continue
++ else
++ # If libtool objects are unsupported, then we need to preload.
++ prev=dlprefiles
++ fi
++ fi
++
++ # CHECK ME: I think I busted this. -Ossama
++ if test "$prev" = dlprefiles; then
++ # Preload the old-style object.
++ dlprefiles="$dlprefiles $pic_object"
++ prev=
++ fi
++
++ # A PIC object.
++ libobjs="$libobjs $pic_object"
++ arg="$pic_object"
++ fi
++
++ # Non-PIC object.
++ if test "$non_pic_object" != none; then
++ # Prepend the subdirectory the object is found in.
++ non_pic_object="$xdir$non_pic_object"
++
++ # A standard non-PIC object
++ non_pic_objects="$non_pic_objects $non_pic_object"
++ if test -z "$pic_object" || test "$pic_object" = none ; then
++ arg="$non_pic_object"
++ fi
++ else
++ # If the PIC object exists, use it instead.
++ # $xdir was prepended to $pic_object above.
++ non_pic_object="$pic_object"
++ non_pic_objects="$non_pic_objects $non_pic_object"
++ fi
++ else
++ # Only an error if not doing a dry-run.
++ if test -z "$run"; then
++ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
++ exit $EXIT_FAILURE
++ else
++ # Dry-run case.
++
++ # Extract subdirectory from the argument.
++ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
++ if test "X$xdir" = "X$arg"; then
++ xdir=
++ else
++ xdir="$xdir/"
++ fi
++
++ pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
++ non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
++ libobjs="$libobjs $pic_object"
++ non_pic_objects="$non_pic_objects $non_pic_object"
++ fi
++ fi
++ done
++ else
++ $echo "$modename: link input file \`$save_arg' does not exist"
++ exit $EXIT_FAILURE
++ fi
++ arg=$save_arg
++ prev=
++ continue
++ ;;
+ rpath | xrpath)
+ # We need an absolute path.
+ case $arg in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ $echo "$modename: only absolute run-paths are allowed" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ if test "$prev" = rpath; then
+@@ -930,13 +1404,33 @@
+ finalize_command="$finalize_command $wl$qarg"
+ continue
+ ;;
++ xcclinker)
++ linker_flags="$linker_flags $qarg"
++ compiler_flags="$compiler_flags $qarg"
++ prev=
++ compile_command="$compile_command $qarg"
++ finalize_command="$finalize_command $qarg"
++ continue
++ ;;
++ shrext)
++ shrext_cmds="$arg"
++ prev=
++ continue
++ ;;
++ darwin_framework|darwin_framework_skip)
++ test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
++ prev=
++ continue
++ ;;
+ *)
+ eval "$prev=\"\$arg\""
+ prev=
+ continue
+ ;;
+ esac
+- fi # test -n $prev
++ fi # test -n "$prev"
+
+ prevarg="$arg"
+
+@@ -978,7 +1472,7 @@
+ -export-symbols | -export-symbols-regex)
+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ $echo "$modename: more than one -exported-symbols argument is not allowed"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ if test "X$arg" = "X-export-symbols"; then
+ prev=expsyms
+@@ -988,11 +1482,28 @@
+ continue
+ ;;
+
++ -framework|-arch|-isysroot)
++ case " $CC " in
++ *" ${arg} ${1} "* | *" ${arg} ${1} "*)
++ prev=darwin_framework_skip ;;
++ *) compiler_flags="$compiler_flags $arg"
++ prev=darwin_framework ;;
++ esac
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
++ continue
++ ;;
++
++ -inst-prefix-dir)
++ prev=inst_prefix
++ continue
++ ;;
++
+ # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+ # so, if we see these flags be careful not to treat them like -L
+ -L[A-Z][A-Z]*:*)
+ case $with_gcc/$host in
+- no/*-*-irix*)
++ no/*-*-irix* | /*-*-irix*)
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+ ;;
+@@ -1009,7 +1520,8 @@
+ absdir=`cd "$dir" && pwd`
+ if test -z "$absdir"; then
+ $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+- exit 1
++ absdir="$dir"
++ notinst_path="$notinst_path $dir"
+ fi
+ dir="$absdir"
+ ;;
+@@ -1023,10 +1535,15 @@
+ esac
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++ testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+ case :$dllsearchpath: in
+ *":$dir:"*) ;;
+ *) dllsearchpath="$dllsearchpath:$dir";;
+ esac
++ case :$dllsearchpath: in
++ *":$testbindir:"*) ;;
++ *) dllsearchpath="$dllsearchpath:$testbindir";;
++ esac
+ ;;
+ esac
+ continue
+@@ -1035,36 +1552,98 @@
+ -l*)
+ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ case $host in
+- *-*-cygwin* | *-*-pw32* | *-*-beos*)
++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+ # These systems don't actually have a C or math library (as such)
+ continue
+ ;;
+- *-*-mingw* | *-*-os2*)
++ *-*-os2*)
+ # These systems don't actually have a C library (as such)
+ test "X$arg" = "X-lc" && continue
+ ;;
+- *-*-openbsd*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc due to us having libc/libc_r.
+ test "X$arg" = "X-lc" && continue
+ ;;
+- esac
+- elif test "X$arg" = "X-lc_r"; then
+- case $host in
+- *-*-openbsd*)
+- # Do not include libc_r directly, use -pthread flag.
++ *-*-rhapsody* | *-*-darwin1.[012])
++ # Rhapsody C and math libraries are in the System framework
++ deplibs="$deplibs -framework System"
+ continue
+ ;;
++ *-*-sco3.2v5* | *-*-sco5v6*)
++ # Causes problems with __ctype
++ test "X$arg" = "X-lc" && continue
++ ;;
++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
++ # Compiler inserts libc in the correct place for threads to work
++ test "X$arg" = "X-lc" && continue
++ ;;
+ esac
++ elif test "X$arg" = "X-lc_r"; then
++ case $host in
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
++ # Do not include libc_r directly, use -pthread flag.
++ continue
++ ;;
++ esac
+ fi
+ deplibs="$deplibs $arg"
+ continue
+ ;;
+
++ # Tru64 UNIX uses -model [arg] to determine the layout of C++
++ # classes, name mangling, and exception handling.
++ -model)
++ compile_command="$compile_command $arg"
++ compiler_flags="$compiler_flags $arg"
++ finalize_command="$finalize_command $arg"
++ prev=xcompiler
++ continue
++ ;;
++
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++ compiler_flags="$compiler_flags $arg"
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
++ continue
++ ;;
++
+ -module)
+ module=yes
+ continue
+ ;;
+
++ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
++ # -r[0-9][0-9]* specifies the processor on the SGI compiler
++ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
++ # +DA*, +DD* enable 64-bit mode on the HP compiler
++ # -q* pass through compiler args for the IBM compiler
++ # -m* pass through architecture-specific compiler args for GCC
++ # -m*, -t[45]*, -txscale* pass through architecture-specific
++ # compiler args for GCC
++ # -pg pass through profiling flag for GCC
++ # @file GCC response files
++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
++ -t[45]*|-txscale*|@*)
++
++ # Unknown arguments in both finalize_command and compile_command need
++ # to be aesthetically quoted because they are evaled later.
++ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
++ case $arg in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ arg="\"$arg\""
++ ;;
++ esac
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
++ compiler_flags="$compiler_flags $arg"
++ continue
++ ;;
++
++ -shrext)
++ prev=shrext
++ continue
++ ;;
++
+ -no-fast-install)
+ fast_install=no
+ continue
+@@ -1089,8 +1668,18 @@
+ continue
+ ;;
+
++ -objectlist)
++ prev=objectlist
++ continue
++ ;;
++
+ -o) prev=output ;;
+
++ -precious-files-regex)
++ prev=precious_regex
++ continue
++ ;;
++
+ -release)
+ prev=release
+ continue
+@@ -1113,7 +1702,7 @@
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ $echo "$modename: only absolute run-paths are allowed" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ case "$xrpath " in
+@@ -1141,6 +1730,11 @@
+ prev=vinfo
+ continue
+ ;;
++ -version-number)
++ prev=vinfo
++ vinfo_number=yes
++ continue
++ ;;
+
+ -Wc,*)
+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
+@@ -1189,6 +1783,11 @@
+ continue
+ ;;
+
++ -XCClinker)
++ prev=xcclinker
++ continue
++ ;;
++
+ # Some other compiler flag.
+ -* | +*)
+ # Unknown arguments in both finalize_command and compile_command need
+@@ -1201,29 +1800,106 @@
+ esac
+ ;;
+
+- *.lo | *.$objext)
+- # A library or standard object.
+- if test "$prev" = dlfiles; then
+- # This file was specified with -dlopen.
+- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+- dlfiles="$dlfiles $arg"
+- prev=
+- continue
+- else
+- # If libtool objects are unsupported, then we need to preload.
+- prev=dlprefiles
+- fi
+- fi
++ *.$objext)
++ # A standard object.
++ objs="$objs $arg"
++ ;;
+
+- if test "$prev" = dlprefiles; then
+- # Preload the old-style object.
+- dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
+- prev=
+- else
++ *.lo)
++ # A libtool-controlled object.
++
++ # Check to see that this really is a libtool object.
++ if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++ pic_object=
++ non_pic_object=
++
++ # Read the .lo file
++ # If there is no directory component, then add one.
+ case $arg in
+- *.lo) libobjs="$libobjs $arg" ;;
+- *) objs="$objs $arg" ;;
++ */* | *\\*) . $arg ;;
++ *) . ./$arg ;;
+ esac
++
++ if test -z "$pic_object" || \
++ test -z "$non_pic_object" ||
++ test "$pic_object" = none && \
++ test "$non_pic_object" = none; then
++ $echo "$modename: cannot find name of object for \`$arg'" 1>&2
++ exit $EXIT_FAILURE
++ fi
++
++ # Extract subdirectory from the argument.
++ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
++ if test "X$xdir" = "X$arg"; then
++ xdir=
++ else
++ xdir="$xdir/"
++ fi
++
++ if test "$pic_object" != none; then
++ # Prepend the subdirectory the object is found in.
++ pic_object="$xdir$pic_object"
++
++ if test "$prev" = dlfiles; then
++ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
++ dlfiles="$dlfiles $pic_object"
++ prev=
++ continue
++ else
++ # If libtool objects are unsupported, then we need to preload.
++ prev=dlprefiles
++ fi
++ fi
++
++ # CHECK ME: I think I busted this. -Ossama
++ if test "$prev" = dlprefiles; then
++ # Preload the old-style object.
++ dlprefiles="$dlprefiles $pic_object"
++ prev=
++ fi
++
++ # A PIC object.
++ libobjs="$libobjs $pic_object"
++ arg="$pic_object"
++ fi
++
++ # Non-PIC object.
++ if test "$non_pic_object" != none; then
++ # Prepend the subdirectory the object is found in.
++ non_pic_object="$xdir$non_pic_object"
++
++ # A standard non-PIC object
++ non_pic_objects="$non_pic_objects $non_pic_object"
++ if test -z "$pic_object" || test "$pic_object" = none ; then
++ arg="$non_pic_object"
++ fi
++ else
++ # If the PIC object exists, use it instead.
++ # $xdir was prepended to $pic_object above.
++ non_pic_object="$pic_object"
++ non_pic_objects="$non_pic_objects $non_pic_object"
++ fi
++ else
++ # Only an error if not doing a dry-run.
++ if test -z "$run"; then
++ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
++ exit $EXIT_FAILURE
++ else
++ # Dry-run case.
++
++ # Extract subdirectory from the argument.
++ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
++ if test "X$xdir" = "X$arg"; then
++ xdir=
++ else
++ xdir="$xdir/"
++ fi
++
++ pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
++ non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
++ libobjs="$libobjs $pic_object"
++ non_pic_objects="$non_pic_objects $non_pic_object"
++ fi
+ fi
+ ;;
+
+@@ -1274,7 +1950,7 @@
+ if test -n "$prev"; then
+ $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+@@ -1283,6 +1959,7 @@
+ finalize_command="$finalize_command $arg"
+ fi
+
++ oldlibs=
+ # calculate the name of the file, without its directory
+ outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+ libobjs_save="$libobjs"
+@@ -1303,12 +1980,12 @@
+ output_objdir="$output_objdir/$objdir"
+ fi
+ # Create the object directory.
+- if test ! -d $output_objdir; then
++ if test ! -d "$output_objdir"; then
+ $show "$mkdir $output_objdir"
+ $run $mkdir $output_objdir
+- status=$?
+- if test $status -ne 0 && test ! -d $output_objdir; then
+- exit $status
++ exit_status=$?
++ if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
++ exit $exit_status
+ fi
+ fi
+
+@@ -1317,7 +1994,7 @@
+ "")
+ $echo "$modename: you must specify an output file" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ *.$libext) linkmode=oldlib ;;
+ *.lo | *.$objext) linkmode=obj ;;
+@@ -1325,22 +2002,52 @@
+ *) linkmode=prog ;; # Anything else should be a program.
+ esac
+
++ case $host in
++ *cygwin* | *mingw* | *pw32*)
++ # don't eliminate duplications in $postdeps and $predeps
++ duplicate_compiler_generated_deps=yes
++ ;;
++ *)
++ duplicate_compiler_generated_deps=$duplicate_deps
++ ;;
++ esac
+ specialdeplibs=
++
+ libs=
+ # Find all interdependent deplibs by searching for libraries
+ # that are linked more than once (e.g. -la -lb -la)
+ for deplib in $deplibs; do
+- case "$libs " in
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+- esac
++ if test "X$duplicate_deps" = "Xyes" ; then
++ case "$libs " in
++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++ esac
++ fi
+ libs="$libs $deplib"
+ done
++
++ if test "$linkmode" = lib; then
++ libs="$predeps $libs $compiler_lib_search_path $postdeps"
++
++ # Compute libraries that are listed more than once in $predeps
++ # $postdeps and mark them as special (i.e., whose duplicates are
++ # not to be eliminated).
++ pre_post_deps=
++ if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
++ for pre_post_dep in $predeps $postdeps; do
++ case "$pre_post_deps " in
++ *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
++ esac
++ pre_post_deps="$pre_post_deps $pre_post_dep"
++ done
++ fi
++ pre_post_deps=
++ fi
++
+ deplibs=
+ newdependency_libs=
+ newlib_search_path=
+ need_relink=no # whether we're linking any uninstalled libtool libraries
+ notinst_deplibs= # not-installed libtool libraries
+- notinst_path= # paths that contain not-installed libtool libraries
+ case $linkmode in
+ lib)
+ passes="conv link"
+@@ -1349,7 +2056,7 @@
+ *.la) ;;
+ *)
+ $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ done
+@@ -1366,39 +2073,58 @@
+ ;;
+ esac
+ for pass in $passes; do
+- if test $linkmode = prog; then
+- # Determine which files to process
++ if test "$linkmode,$pass" = "lib,link" ||
++ test "$linkmode,$pass" = "prog,scan"; then
++ libs="$deplibs"
++ deplibs=
++ fi
++ if test "$linkmode" = prog; then
+ case $pass in
+- dlopen)
+- libs="$dlfiles"
+- save_deplibs="$deplibs" # Collect dlpreopened libraries
+- deplibs=
+- ;;
++ dlopen) libs="$dlfiles" ;;
+ dlpreopen) libs="$dlprefiles" ;;
+- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++ link)
++ libs="$deplibs %DEPLIBS%"
++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++ ;;
+ esac
+ fi
++ if test "$pass" = dlopen; then
++ # Collect dlpreopened libraries
++ save_deplibs="$deplibs"
++ deplibs=
++ fi
+ for deplib in $libs; do
+ lib=
+ found=no
+ case $deplib in
+- -l*)
+- if test $linkmode = oldlib && test $linkmode = obj; then
+- $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
+- continue
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++ if test "$linkmode,$pass" = "prog,link"; then
++ compile_deplibs="$deplib $compile_deplibs"
++ finalize_deplibs="$deplib $finalize_deplibs"
++ else
++ compiler_flags="$compiler_flags $deplib"
+ fi
+- if test $pass = conv; then
+- deplibs="$deplib $deplibs"
++ continue
++ ;;
++ -l*)
++ if test "$linkmode" != lib && test "$linkmode" != prog; then
++ $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+ 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
+- # Search the libtool library
+- lib="$searchdir/lib${name}.la"
+- if test -f "$lib"; then
+- found=yes
+- break
+- fi
++ for search_ext in .la $std_shrext .so .a; do
++ # Search the libtool library
++ lib="$searchdir/lib${name}${search_ext}"
++ if test -f "$lib"; then
++ if test "$search_ext" = ".la"; then
++ found=yes
++ else
++ found=no
++ fi
++ break 2
++ fi
++ done
+ done
+ if test "$found" != yes; then
+ # deplib doesn't seem to be a libtool library
+@@ -1407,40 +2133,76 @@
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+- test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
++ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ fi
+ continue
++ else # deplib is a libtool library
++ # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
++ # We need to do some special things here, and not later.
++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++ case " $predeps $postdeps " in
++ *" $deplib "*)
++ if (${SED} -e '2q' $lib |
++ grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++ library_names=
++ old_library=
++ case $lib in
++ */* | *\\*) . $lib ;;
++ *) . ./$lib ;;
++ esac
++ for l in $old_library $library_names; do
++ ll="$l"
++ done
++ if test "X$ll" = "X$old_library" ; then # only static version available
++ found=no
++ ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
++ test "X$ladir" = "X$lib" && ladir="."
++ lib=$ladir/$old_library
++ if test "$linkmode,$pass" = "prog,link"; then
++ compile_deplibs="$deplib $compile_deplibs"
++ finalize_deplibs="$deplib $finalize_deplibs"
++ else
++ deplibs="$deplib $deplibs"
++ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
++ fi
++ continue
++ fi
++ fi
++ ;;
++ *) ;;
++ esac
++ fi
+ fi
+ ;; # -l
+ -L*)
+ case $linkmode in
+ lib)
+ deplibs="$deplib $deplibs"
+- test $pass = conv && continue
++ test "$pass" = conv && continue
+ newdependency_libs="$deplib $newdependency_libs"
+ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ ;;
+ prog)
+- if test $pass = conv; then
++ if test "$pass" = conv; then
+ deplibs="$deplib $deplibs"
+ continue
+ fi
+- if test $pass = scan; then
++ if test "$pass" = scan; then
+ deplibs="$deplib $deplibs"
+- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ else
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ fi
++ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ ;;
+ *)
+- $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2
++ $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+ ;;
+ esac # linkmode
+ continue
+ ;; # -L
+ -R*)
+- if test $pass = link; then
++ if test "$pass" = link; then
+ dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+ # Make sure the xrpath contains only unique directories.
+ case "$xrpath " in
+@@ -1453,28 +2215,45 @@
+ ;;
+ *.la) lib="$deplib" ;;
+ *.$libext)
+- if test $pass = conv; then
++ if test "$pass" = conv; then
+ deplibs="$deplib $deplibs"
+ continue
+ fi
+ case $linkmode in
+ lib)
+- if test "$deplibs_check_method" != pass_all; then
+- echo
+- echo "*** Warning: This library needs some functionality provided by $deplib."
+- echo "*** I have the capability to make that library automatically link in when"
+- echo "*** you link to this library. But I can only do this if you have a"
+- echo "*** shared version of the library, which you do not appear to have."
++ valid_a_lib=no
++ case $deplibs_check_method in
++ match_pattern*)
++ set dummy $deplibs_check_method
++ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++ if eval $echo \"$deplib\" 2>/dev/null \
++ | $SED 10q \
++ | $EGREP "$match_pattern_regex" > /dev/null; then
++ valid_a_lib=yes
++ fi
++ ;;
++ pass_all)
++ valid_a_lib=yes
++ ;;
++ esac
++ if test "$valid_a_lib" != yes; then
++ $echo
++ $echo "*** Warning: Trying to link with static lib archive $deplib."
++ $echo "*** I have the capability to make that library automatically link in when"
++ $echo "*** you link to this library. But I can only do this if you have a"
++ $echo "*** shared version of the library, which you do not appear to have"
++ $echo "*** because the file extensions .$libext of this argument makes me believe"
++ $echo "*** that it is just a static archive that I should not used here."
+ else
+- echo
+- echo "*** Warning: Linking the shared library $output against the"
+- echo "*** static library $deplib is not portable!"
++ $echo
++ $echo "*** Warning: Linking the shared library $output against the"
++ $echo "*** static library $deplib is not portable!"
+ deplibs="$deplib $deplibs"
+ fi
+ continue
+ ;;
+ prog)
+- if test $pass != link; then
++ if test "$pass" != link; then
+ deplibs="$deplib $deplibs"
+ else
+ compile_deplibs="$deplib $compile_deplibs"
+@@ -1485,14 +2264,18 @@
+ esac # linkmode
+ ;; # *.$libext
+ *.lo | *.$objext)
+- if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+- # If there is no dlopen support or we're linking statically,
+- # we need to preload.
+- newdlprefiles="$newdlprefiles $deplib"
+- compile_deplibs="$deplib $compile_deplibs"
+- finalize_deplibs="$deplib $finalize_deplibs"
+- else
+- newdlfiles="$newdlfiles $deplib"
++ if test "$pass" = conv; then
++ deplibs="$deplib $deplibs"
++ elif test "$linkmode" = prog; then
++ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++ # If there is no dlopen support or we're linking statically,
++ # we need to preload.
++ newdlprefiles="$newdlprefiles $deplib"
++ compile_deplibs="$deplib $compile_deplibs"
++ finalize_deplibs="$deplib $finalize_deplibs"
++ else
++ newdlfiles="$newdlfiles $deplib"
++ fi
+ fi
+ continue
+ ;;
+@@ -1501,17 +2284,17 @@
+ continue
+ ;;
+ esac # case $deplib
+- if test $found = yes || test -f "$lib"; then :
++ if test "$found" = yes || test -f "$lib"; then :
+ else
+- $echo "$modename: cannot find the library \`$lib'" 1>&2
+- exit 1
++ $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
++ exit $EXIT_FAILURE
+ fi
+
+ # Check to see that this really is a libtool archive.
+- if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++ if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ else
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+@@ -1524,8 +2307,11 @@
+ library_names=
+ old_library=
+ # If the library was installed with an old release of libtool,
+- # it will not redefine variable installed.
++ # it will not redefine variables installed, or shouldnotlink
+ installed=yes
++ shouldnotlink=no
++ avoidtemprpath=
++
+
+ # Read the .la file
+ case $lib in
+@@ -1535,19 +2321,18 @@
+
+ if test "$linkmode,$pass" = "lib,link" ||
+ test "$linkmode,$pass" = "prog,scan" ||
+- { test $linkmode = oldlib && test $linkmode = obj; }; then
+- # Add dl[pre]opened files of deplib
++ { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+ test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+ test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+ fi
+
+- if test $pass = conv; then
++ if test "$pass" = conv; then
+ # Only check for convenience libraries
+ deplibs="$lib $deplibs"
+ if test -z "$libdir"; then
+ if test -z "$old_library"; then
+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ # It is a libtool convenience library, so add in its objects.
+ convenience="$convenience $ladir/$objdir/$old_library"
+@@ -1555,18 +2340,21 @@
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+- case "$tmp_libs " in
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+- esac
++ if test "X$duplicate_deps" = "Xyes" ; then
++ case "$tmp_libs " in
++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++ esac
++ fi
+ tmp_libs="$tmp_libs $deplib"
+ done
+- elif test $linkmode != prog && test $linkmode != lib; then
++ elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ $echo "$modename: \`$lib' is not a convenience library" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ continue
+ fi # $pass = conv
+
++
+ # Get the name of the library we link against.
+ linklib=
+ for l in $old_library $library_names; do
+@@ -1574,19 +2362,23 @@
+ done
+ if test -z "$linklib"; then
+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # This library was specified with -dlopen.
+- if test $pass = dlopen; then
++ if test "$pass" = dlopen; then
+ if test -z "$libdir"; then
+ $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+- if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++ if test -z "$dlname" ||
++ test "$dlopen_support" != yes ||
++ test "$build_libtool_libs" = no; then
+ # If there is no dlname, no dlopen support or we're linking
+- # statically, we need to preload.
+- dlprefiles="$dlprefiles $lib"
++ # statically, we need to preload. We also need to preload any
++ # dependent libraries so libltdl's deplib preloader doesn't
++ # bomb out in the load deplibs phase.
++ dlprefiles="$dlprefiles $lib $dependency_libs"
+ else
+ newdlfiles="$newdlfiles $lib"
+ fi
+@@ -1618,19 +2410,27 @@
+ dir="$libdir"
+ absdir="$libdir"
+ fi
++ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ else
+- dir="$ladir/$objdir"
+- absdir="$abs_ladir/$objdir"
+- # Remove this search path later
+- notinst_path="$notinst_path $abs_ladir"
++ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++ dir="$ladir"
++ absdir="$abs_ladir"
++ # Remove this search path later
++ notinst_path="$notinst_path $abs_ladir"
++ else
++ dir="$ladir/$objdir"
++ absdir="$abs_ladir/$objdir"
++ # Remove this search path later
++ notinst_path="$notinst_path $abs_ladir"
++ fi
+ fi # $installed = yes
+ name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+
+ # This library was specified with -dlpreopen.
+- if test $pass = dlpreopen; then
++ if test "$pass" = dlpreopen; then
+ if test -z "$libdir"; then
+ $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ # Prefer using a static library (so that no silly _DYNAMIC symbols
+ # are required to link).
+@@ -1646,18 +2446,19 @@
+
+ if test -z "$libdir"; then
+ # Link the convenience library
+- if test $linkmode = lib; then
++ if test "$linkmode" = lib; then
+ deplibs="$dir/$old_library $deplibs"
+ elif test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$dir/$old_library $compile_deplibs"
+ finalize_deplibs="$dir/$old_library $finalize_deplibs"
+ else
+- deplibs="$lib $deplibs"
++ deplibs="$lib $deplibs" # used for prog,scan pass
+ fi
+ continue
+ fi
+
+- if test $linkmode = prog && test $pass != link; then
++
++ if test "$linkmode" = prog && test "$pass" != link; then
+ newlib_search_path="$newlib_search_path $ladir"
+ deplibs="$lib $deplibs"
+
+@@ -1673,28 +2474,36 @@
+ -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+ esac
+ # Need to link against all dependency_libs?
+- if test $linkalldeplibs = yes; then
++ if test "$linkalldeplibs" = yes; then
+ deplibs="$deplib $deplibs"
+ else
+ # Need to hardcode shared library paths
+ # or/and link against static libraries
+ newdependency_libs="$deplib $newdependency_libs"
+ fi
+- case "$tmp_libs " in
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+- esac
++ if test "X$duplicate_deps" = "Xyes" ; then
++ case "$tmp_libs " in
++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++ esac
++ fi
+ tmp_libs="$tmp_libs $deplib"
+ done # for deplib
+ continue
+ fi # $linkmode = prog...
+
+- link_static=no # Whether the deplib will be linked statically
+- if test -n "$library_names" &&
+- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+- # Link against this shared library
++ if test "$linkmode,$pass" = "prog,link"; then
++ if test -n "$library_names" &&
++ { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++ # We need to hardcode the library path
++ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
++ # Make sure the rpath contains only unique directories.
++ case "$temp_rpath " in
++ *" $dir "*) ;;
++ *" $absdir "*) ;;
++ *) temp_rpath="$temp_rpath $absdir" ;;
++ esac
++ fi
+
+- if test "$linkmode,$pass" = "prog,link" ||
+- { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
+ # Hardcode the library path.
+ # Skip directories that are in the system default run-time
+ # search path.
+@@ -1716,17 +2525,6 @@
+ esac
+ ;;
+ esac
+- if test $linkmode = prog; then
+- # We need to hardcode the library path
+- if test -n "$shlibpath_var"; then
+- # Make sure the rpath contains only unique directories.
+- case "$temp_rpath " in
+- *" $dir "*) ;;
+- *" $absdir "*) ;;
+- *) temp_rpath="$temp_rpath $dir" ;;
+- esac
+- fi
+- fi
+ fi # $linkmode,$pass = prog,link...
+
+ if test "$alldeplibs" = yes &&
+@@ -1736,11 +2534,56 @@
+ # We only need to search for static libraries
+ continue
+ fi
++ fi
+
++ link_static=no # Whether the deplib will be linked statically
++ use_static_libs=$prefer_static_libs
++ if test "$use_static_libs" = built && test "$installed" = yes ; then
++ use_static_libs=no
++ fi
++ if test -n "$library_names" &&
++ { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ if test "$installed" = no; then
+ notinst_deplibs="$notinst_deplibs $lib"
+ need_relink=yes
+ fi
++ # This is a shared library
++
++ # Warn about portability, can't link against -module's on
++ # some systems (darwin)
++ if test "$shouldnotlink" = yes && test "$pass" = link ; then
++ $echo
++ if test "$linkmode" = prog; then
++ $echo "*** Warning: Linking the executable $output against the loadable module"
++ else
++ $echo "*** Warning: Linking the shared library $output against the loadable module"
++ fi
++ $echo "*** $linklib is not portable!"
++ fi
++ if test "$linkmode" = lib &&
++ test "$hardcode_into_libs" = yes; then
++ # Hardcode the library path.
++ # Skip directories that are in the system default run-time
++ # search path.
++ case " $sys_lib_dlsearch_path " in
++ *" $absdir "*) ;;
++ *)
++ case "$compile_rpath " in
++ *" $absdir "*) ;;
++ *) compile_rpath="$compile_rpath $absdir"
++ esac
++ ;;
++ esac
++ case " $sys_lib_dlsearch_path " in
++ *" $libdir "*) ;;
++ *)
++ case "$finalize_rpath " in
++ *" $libdir "*) ;;
++ *) finalize_rpath="$finalize_rpath $libdir"
++ esac
++ ;;
++ esac
++ fi
+
+ if test -n "$old_archive_from_expsyms_cmds"; then
+ # figure out the soname
+@@ -1754,7 +2597,7 @@
+ elif test -n "$soname_spec"; then
+ # bleh windows
+ case $host in
+- *cygwin*)
++ *cygwin* | mingw*)
+ major=`expr $current - $age`
+ versuffix="-$major"
+ ;;
+@@ -1766,17 +2609,18 @@
+
+ # Make a new name for the extract_expsyms_cmds to use
+ soroot="$soname"
+- soname=`echo $soroot | sed -e 's/^.*\///'`
+- newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a"
++ soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
++ newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
+
+ # If the library has no export list, then create one now
+ if test -f "$output_objdir/$soname-def"; then :
+ else
+ $show "extracting exported symbol list from \`$soname'"
+ save_ifs="$IFS"; IFS='~'
+- eval cmds=\"$extract_expsyms_cmds\"
++ cmds=$extract_expsyms_cmds
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -1787,9 +2631,10 @@
+ if test -f "$output_objdir/$newlib"; then :; else
+ $show "generating import library for \`$soname'"
+ save_ifs="$IFS"; IFS='~'
+- eval cmds=\"$old_archive_from_expsyms_cmds\"
++ cmds=$old_archive_from_expsyms_cmds
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -1798,9 +2643,9 @@
+ # make sure the library variables are pointing to the new library
+ dir=$output_objdir
+ linklib=$newlib
+- fi # test -n $old_archive_from_expsyms_cmds
++ fi # test -n "$old_archive_from_expsyms_cmds"
+
+- if test $linkmode = prog || test "$mode" != relink; then
++ if test "$linkmode" = prog || test "$mode" != relink; then
+ add_shlibpath=
+ add_dir=
+ add=
+@@ -1809,6 +2654,26 @@
+ immediate | unsupported)
+ if test "$hardcode_direct" = no; then
+ add="$dir/$linklib"
++ case $host in
++ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
++ *-*-sysv4*uw2*) add_dir="-L$dir" ;;
++ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
++ *-*-unixware7*) add_dir="-L$dir" ;;
++ *-*-darwin* )
++ # if the lib is a module then we can not link against
++ # it, someone is ignoring the new warnings I added
++ if /usr/bin/file -L $add 2> /dev/null |
++ $EGREP ": [^:]* bundle" >/dev/null ; then
++ $echo "** Warning, lib $linklib is a module, not a shared library"
++ if test -z "$old_library" ; then
++ $echo
++ $echo "** And there doesn't seem to be a static archive available"
++ $echo "** The link will probably fail, sorry"
++ else
++ add="$dir/$old_library"
++ fi
++ fi
++ esac
+ elif test "$hardcode_minus_L" = no; then
+ case $host in
+ *-*-sunos*) add_shlibpath="$dir" ;;
+@@ -1827,6 +2692,14 @@
+ add="$dir/$linklib"
+ elif test "$hardcode_minus_L" = yes; then
+ add_dir="-L$dir"
++ # Try looking first in the location we're being installed to.
++ if test -n "$inst_prefix_dir"; then
++ case $libdir in
++ [\\/]*)
++ add_dir="$add_dir -L$inst_prefix_dir$libdir"
++ ;;
++ esac
++ fi
+ add="-l$name"
+ elif test "$hardcode_shlibpath_var" = yes; then
+ add_shlibpath="$dir"
+@@ -1840,7 +2713,7 @@
+
+ if test "$lib_linked" != yes; then
+ $echo "$modename: configuration error: unsupported hardcode properties"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$add_shlibpath"; then
+@@ -1849,7 +2722,7 @@
+ *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+ esac
+ fi
+- if test $linkmode = prog; then
++ if test "$linkmode" = prog; then
+ test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+ test -n "$add" && compile_deplibs="$add $compile_deplibs"
+ else
+@@ -1866,7 +2739,7 @@
+ fi
+ fi
+
+- if test $linkmode = prog || test "$mode" = relink; then
++ if test "$linkmode" = prog || test "$mode" = relink; then
+ add_shlibpath=
+ add_dir=
+ add=
+@@ -1882,17 +2755,28 @@
+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+ esac
+ add="-l$name"
++ elif test "$hardcode_automatic" = yes; then
++ if test -n "$inst_prefix_dir" &&
++ test -f "$inst_prefix_dir$libdir/$linklib" ; then
++ add="$inst_prefix_dir$libdir/$linklib"
++ else
++ add="$libdir/$linklib"
++ fi
+ else
+ # We cannot seem to hardcode it, guess we'll fake it.
+- if test "X$installed" = Xyes; then
+- add_dir="-L$libdir"
+- else
+- add_dir="-L$DESTDIR$libdir"
++ add_dir="-L$libdir"
++ # Try looking first in the location we're being installed to.
++ if test -n "$inst_prefix_dir"; then
++ case $libdir in
++ [\\/]*)
++ add_dir="$add_dir -L$inst_prefix_dir$libdir"
++ ;;
++ esac
+ fi
+ add="-l$name"
+ fi
+
+- if test $linkmode = prog; then
++ if test "$linkmode" = prog; then
+ test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+ test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+ else
+@@ -1900,16 +2784,7 @@
+ test -n "$add" && deplibs="$add $deplibs"
+ fi
+ fi
+- elif test $linkmode = prog; then
+- if test "$alldeplibs" = yes &&
+- { test "$deplibs_check_method" = pass_all ||
+- { test "$build_libtool_libs" = yes &&
+- test -n "$library_names"; }; }; then
+- # We only need to search for static libraries
+- continue
+- fi
+-
+- # Try to link the static library
++ elif test "$linkmode" = prog; then
+ # Here we assume that one of hardcode_direct or hardcode_minus_L
+ # is not unsupported. This is valid on all known static and
+ # shared platforms.
+@@ -1929,20 +2804,21 @@
+
+ # Just print a warning and add the library to dependency_libs so
+ # that the program can be linked against the static library.
+- echo
+- echo "*** Warning: This library needs some functionality provided by $lib."
+- echo "*** I have the capability to make that library automatically link in when"
+- echo "*** you link to this library. But I can only do this if you have a"
+- echo "*** shared version of the library, which you do not appear to have."
++ $echo
++ $echo "*** Warning: This system can not link to static lib archive $lib."
++ $echo "*** I have the capability to make that library automatically link in when"
++ $echo "*** you link to this library. But I can only do this if you have a"
++ $echo "*** shared version of the library, which you do not appear to have."
+ if test "$module" = yes; then
+- echo "*** Therefore, libtool will create a static module, that should work "
+- echo "*** as long as the dlopening application is linked with the -dlopen flag."
++ $echo "*** But as you try to build a module library, libtool will still create "
++ $echo "*** a static module, that should work as long as the dlopening application"
++ $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+ if test -z "$global_symbol_pipe"; then
+- echo
+- echo "*** However, this would only work if libtool was able to extract symbol"
+- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+- echo "*** not find such a program. So, this module is probably useless."
+- echo "*** \`nm' from GNU binutils and a full rebuild may help."
++ $echo
++ $echo "*** However, this would only work if libtool was able to extract symbol"
++ $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
++ $echo "*** not find such a program. So, this module is probably useless."
++ $echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ fi
+ if test "$build_old_libs" = no; then
+ build_libtool_libs=module
+@@ -1952,17 +2828,16 @@
+ fi
+ fi
+ else
+- convenience="$convenience $dir/$old_library"
+- old_convenience="$old_convenience $dir/$old_library"
+ deplibs="$dir/$old_library $deplibs"
+ link_static=yes
+ fi
+ fi # link shared/static library?
+
+- if test $linkmode = lib; then
++ if test "$linkmode" = lib; then
+ if test -n "$dependency_libs" &&
+- { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
+- test $link_static = yes; }; then
++ { test "$hardcode_into_libs" != yes ||
++ test "$build_old_libs" = yes ||
++ test "$link_static" = yes; }; then
+ # Extract -R from dependency_libs
+ temp_deplibs=
+ for libdir in $dependency_libs; do
+@@ -1985,13 +2860,15 @@
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ newdependency_libs="$deplib $newdependency_libs"
+- case "$tmp_libs " in
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+- esac
++ if test "X$duplicate_deps" = "Xyes" ; then
++ case "$tmp_libs " in
++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++ esac
++ fi
+ tmp_libs="$tmp_libs $deplib"
+ done
+
+- if test $link_all_deplibs != no; then
++ if test "$link_all_deplibs" != no; then
+ # Add the search paths of all dependency libraries
+ for deplib in $dependency_libs; do
+ case $deplib in
+@@ -2011,38 +2888,83 @@
+ ;;
+ esac
+ if grep "^installed=no" $deplib > /dev/null; then
+- path="-L$absdir/$objdir"
++ path="$absdir/$objdir"
+ else
+- eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ if test "$absdir" != "$libdir"; then
+ $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+ fi
+- path="-L$absdir"
++ path="$absdir"
+ fi
++ depdepl=
++ case $host in
++ *-*-darwin*)
++ # 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`
++ if test -n "$deplibrary_names" ; then
++ for tmp in $deplibrary_names ; do
++ depdepl=$tmp
++ done
++ if test -f "$path/$depdepl" ; then
++ depdepl="$path/$depdepl"
++ fi
++ # do not add paths which are already there
++ case " $newlib_search_path " in
++ *" $path "*) ;;
++ *) newlib_search_path="$newlib_search_path $path";;
++ esac
++ fi
++ path=""
++ ;;
++ *)
++ path="-L$path"
++ ;;
++ esac
++ ;;
++ -l*)
++ case $host in
++ *-*-darwin*)
++ # Again, we only want to link against shared libraries
++ eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
++ for tmp in $newlib_search_path ; do
++ if test -f "$tmp/lib$tmp_libs.dylib" ; then
++ eval depdepl="$tmp/lib$tmp_libs.dylib"
++ break
++ fi
++ done
++ path=""
++ ;;
++ *) continue ;;
++ esac
+ ;;
+ *) continue ;;
+ esac
+ case " $deplibs " in
+ *" $path "*) ;;
+- *) deplibs="$deplibs $path" ;;
++ *) deplibs="$path $deplibs" ;;
++ esac
++ case " $deplibs " in
++ *" $depdepl "*) ;;
++ *) deplibs="$depdepl $deplibs" ;;
+ esac
+ done
+ fi # link_all_deplibs != no
+ fi # linkmode = lib
+ done # for deplib in $libs
+- if test $pass = dlpreopen; then
++ dependency_libs="$newdependency_libs"
++ if test "$pass" = dlpreopen; then
+ # Link the dlpreopened libraries before other libraries
+ for deplib in $save_deplibs; do
+ deplibs="$deplib $deplibs"
+ done
+ fi
+- if test $pass != dlopen; then
+- test $pass != scan && dependency_libs="$newdependency_libs"
+- if test $pass != conv; then
++ if test "$pass" != dlopen; then
++ if test "$pass" != conv; then
+ # Make sure lib_search_path contains only unique directories.
+ lib_search_path=
+ for dir in $newlib_search_path; do
+@@ -2064,9 +2986,30 @@
+ eval tmp_libs=\"\$$var\"
+ new_libs=
+ for deplib in $tmp_libs; do
++ # FIXME: Pedantically, this is the right thing to do, so
++ # that some nasty dependency loop isn't accidentally
++ # broken:
++ #new_libs="$deplib $new_libs"
++ # Pragmatically, this seems to cause very few problems in
++ # practice:
+ case $deplib in
+ -L*) new_libs="$deplib $new_libs" ;;
++ -R*) ;;
+ *)
++ # And here is the reason: when a library appears more
++ # than once as an explicit dependence of a library, or
++ # is implicitly linked in more than once by the
++ # compiler, it is considered special, and multiple
++ # occurrences thereof are not removed. Compare this
++ # with having the same library being listed as a
++ # dependency of multiple other libraries: in this case,
++ # we know (pedantically, we assume) the library does not
++ # need to be listed more than once, so we keep only the
++ # last copy. This is not always right, but it is rare
++ # enough that we require users that really mean to play
++ # such unportable linking tricks to link the library
++ # using -Wl,-lname, so that libtool does not consider it
++ # for duplicate removal.
+ case " $specialdeplibs " in
+ *" $deplib "*) new_libs="$deplib $new_libs" ;;
+ *)
+@@ -2094,19 +3037,32 @@
+ eval $var=\"$tmp_libs\"
+ done # for var
+ fi
+- if test "$pass" = "conv" &&
+- { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then
+- libs="$deplibs" # reset libs
+- deplibs=
+- fi
++ # Last step: remove runtime libs from dependency_libs
++ # (they stay in deplibs)
++ tmp_libs=
++ for i in $dependency_libs ; do
++ case " $predeps $postdeps $compiler_lib_search_path " in
++ *" $i "*)
++ i=""
++ ;;
++ esac
++ if test -n "$i" ; then
++ tmp_libs="$tmp_libs $i"
++ fi
++ done
++ dependency_libs=$tmp_libs
+ done # for pass
+- if test $linkmode = prog; then
++ if test "$linkmode" = prog; then
+ dlfiles="$newdlfiles"
+ dlprefiles="$newdlprefiles"
+ fi
+
+ case $linkmode in
+ oldlib)
++ if test -n "$deplibs"; then
++ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
++ fi
++
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+ fi
+@@ -2120,7 +3076,7 @@
+ fi
+
+ if test -n "$vinfo"; then
+- $echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
++ $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
+ fi
+
+ if test -n "$release"; then
+@@ -2142,17 +3098,19 @@
+ case $outputname in
+ lib*)
+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
++ eval shared_ext=\"$shrext_cmds\"
+ eval libname=\"$libname_spec\"
+ ;;
+ *)
+ if test "$module" = no; then
+ $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ if test "$need_lib_prefix" != no; then
+ # Add the "lib" prefix for modules if required
+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
++ eval shared_ext=\"$shrext_cmds\"
+ eval libname=\"$libname_spec\"
+ else
+ libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+@@ -2163,11 +3121,11 @@
+ if test -n "$objs"; then
+ if test "$deplibs_check_method" != pass_all; then
+ $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+- exit 1
++ exit $EXIT_FAILURE
+ else
+- echo
+- echo "*** Warning: Linking the shared library $output against the non-libtool"
+- echo "*** objects $objs is not portable!"
++ $echo
++ $echo "*** Warning: Linking the shared library $output against the non-libtool"
++ $echo "*** objects $objs is not portable!"
+ libobjs="$libobjs $objs"
+ fi
+ fi
+@@ -2177,7 +3135,7 @@
+ fi
+
+ set dummy $rpath
+- if test $# -gt 2; then
++ if test "$#" -gt 2; then
+ $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+ fi
+ install_libdir="$2"
+@@ -2186,14 +3144,16 @@
+ if test -z "$rpath"; then
+ if test "$build_libtool_libs" = yes; then
+ # Building a libtool convenience library.
+- libext=al
++ # Some compilers have problems with a `.al' extension so
++ # convenience libraries should have the same extension an
++ # archive normally would.
+ oldlibs="$output_objdir/$libname.$libext $oldlibs"
+ build_libtool_libs=convenience
+ build_old_libs=yes
+ fi
+
+ if test -n "$vinfo"; then
+- $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
++ $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
+ fi
+
+ if test -n "$release"; then
+@@ -2209,45 +3169,87 @@
+ if test -n "$8"; then
+ $echo "$modename: too many parameters to \`-version-info'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+- current="$2"
+- revision="$3"
+- age="$4"
++ # convert absolute version numbers to libtool ages
++ # this retains compatibility with .la files and attempts
++ # to make the code below a bit more comprehensible
++
++ case $vinfo_number in
++ yes)
++ number_major="$2"
++ number_minor="$3"
++ number_revision="$4"
++ #
++ # There are really only two kinds -- those that
++ # use the current revision as the major version
++ # and those that subtract age and use age as
++ # a minor version. But, then there is irix
++ # which has an extra 1 added just for fun
++ #
++ case $version_type in
++ darwin|linux|osf|windows)
++ current=`expr $number_major + $number_minor`
++ age="$number_minor"
++ revision="$number_revision"
++ ;;
++ freebsd-aout|freebsd-elf|sunos)
++ current="$number_major"
++ revision="$number_minor"
++ age="0"
++ ;;
++ irix|nonstopux)
++ current=`expr $number_major + $number_minor - 1`
++ age="$number_minor"
++ revision="$number_minor"
++ ;;
++ *)
++ $echo "$modename: unknown library version type \`$version_type'" 1>&2
++ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
++ exit $EXIT_FAILURE
++ ;;
++ esac
++ ;;
++ no)
++ current="$2"
++ revision="$3"
++ age="$4"
++ ;;
++ esac
+
+ # Check that each of the things are valid numbers.
+ case $current in
+- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
++ $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ case $revision in
+- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
++ $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ case $age in
+- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
++ $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+- if test $age -gt $current; then
++ if test "$age" -gt "$current"; then
+ $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Calculate the version variables.
+@@ -2264,7 +3266,7 @@
+ versuffix="$major.$age.$revision"
+ # Darwin ld doesn't like 0 for these options...
+ minor_current=`expr $current + 1`
+- verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
++ verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ ;;
+
+ freebsd-aout)
+@@ -2277,16 +3279,21 @@
+ versuffix=".$current";
+ ;;
+
+- irix)
++ irix | nonstopux)
+ major=`expr $current - $age + 1`
+- verstring="sgi$major.$revision"
++
++ case $version_type in
++ nonstopux) verstring_prefix=nonstopux ;;
++ *) verstring_prefix=sgi ;;
++ esac
++ verstring="$verstring_prefix$major.$revision"
+
+ # Add in all the interfaces that we are compatible with.
+ loop=$revision
+- while test $loop != 0; do
++ while test "$loop" -ne 0; do
+ iface=`expr $revision - $loop`
+ loop=`expr $loop - 1`
+- verstring="sgi$major.$iface:$verstring"
++ verstring="$verstring_prefix$major.$iface:$verstring"
+ done
+
+ # Before this point, $major must not contain `.'.
+@@ -2300,13 +3307,13 @@
+ ;;
+
+ osf)
+- major=`expr $current - $age`
++ major=.`expr $current - $age`
+ versuffix=".$current.$age.$revision"
+ verstring="$current.$age.$revision"
+
+ # Add in all the interfaces that we are compatible with.
+ loop=$age
+- while test $loop != 0; do
++ while test "$loop" -ne 0; do
+ iface=`expr $current - $loop`
+ loop=`expr $loop - 1`
+ verstring="$verstring:${iface}.0"
+@@ -2330,20 +3337,19 @@
+
+ *)
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
+- echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+- exit 1
++ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ # Clear the version info if we defaulted, and they specified a release.
+ if test -z "$vinfo" && test -n "$release"; then
+ major=
+- verstring="0.0"
+ case $version_type in
+ darwin)
+ # we can't check for "0.0" in archive_cmds due to quoting
+ # problems, so we reset it completely
+- verstring=""
++ verstring=
+ ;;
+ *)
+ verstring="0.0"
+@@ -2377,9 +3383,30 @@
+ fi
+
+ if test "$mode" != relink; then
+- # Remove our outputs.
+- $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
+- $run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
++ # Remove our outputs, but don't remove object files since they
++ # may have been created when compiling PIC objects.
++ removelist=
++ tempremovelist=`$echo "$output_objdir/*"`
++ for p in $tempremovelist; do
++ case $p in
++ *.$objext)
++ ;;
++ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
++ if test "X$precious_files_regex" != "X"; then
++ if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
++ then
++ continue
++ fi
++ fi
++ removelist="$removelist $p"
++ ;;
++ *) ;;
++ esac
++ done
++ if test -n "$removelist"; then
++ $show "${rm}r $removelist"
++ $run ${rm}r $removelist
++ fi
+ fi
+
+ # Now set the variables for building old libraries.
+@@ -2392,9 +3419,9 @@
+
+ # Eliminate all temporary directories.
+ for path in $notinst_path; do
+- lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'`
+- deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'`
+- dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'`
++ lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
++ deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
++ dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+ done
+
+ if test -n "$xrpath"; then
+@@ -2407,7 +3434,7 @@
+ *) finalize_rpath="$finalize_rpath $libdir" ;;
+ esac
+ done
+- if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
++ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ dependency_libs="$temp_xrpath $dependency_libs"
+ fi
+ fi
+@@ -2445,12 +3472,18 @@
+ *-*-netbsd*)
+ # Don't link with libc until the a.out ld.so is fixed.
+ ;;
+- *-*-openbsd*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
+- *)
++ *-*-sco3.2v5* | *-*-sco5v6*)
++ # Causes problems with __ctype
++ ;;
++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
++ # Compiler inserts libc in the correct place for threads to work
++ ;;
++ *)
+ # Add libc to deplibs on all other systems if necessary.
+- if test $build_libtool_need_lc = "yes"; then
++ if test "$build_libtool_need_lc" = "yes"; then
+ deplibs="$deplibs -lc"
+ fi
+ ;;
+@@ -2477,7 +3510,7 @@
+ # This might be a little naive. We might want to check
+ # whether the library exists or not. But this is on
+ # osf3 & osf4 and I'm not really sure... Just
+- # implementing what was already the behaviour.
++ # implementing what was already the behavior.
+ newdeplibs=$deplibs
+ ;;
+ test_compile)
+@@ -2490,64 +3523,88 @@
+ int main() { return 0; }
+ EOF
+ $rm conftest
+- $CC -o conftest conftest.c $deplibs
+- if test $? -eq 0 ; then
++ $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
++ if test "$?" -eq 0 ; then
+ ldd_output=`ldd conftest`
+ for i in $deplibs; do
+- name="`expr $i : '-l\(.*\)'`"
++ name=`expr $i : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+- if test -n "$name" && test "$name" != "0"; then
+- libname=`eval \\$echo \"$libname_spec\"`
+- deplib_matches=`eval \\$echo \"$library_names_spec\"`
+- set dummy $deplib_matches
+- deplib_match=$2
+- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+- newdeplibs="$newdeplibs $i"
+- else
+- droppeddeps=yes
+- echo
+- echo "*** Warning: This library needs some functionality provided by $i."
+- echo "*** I have the capability to make that library automatically link in when"
+- echo "*** you link to this library. But I can only do this if you have a"
+- echo "*** shared version of the library, which you do not appear to have."
++ if test "$name" != "" && test "$name" -ne "0"; then
++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++ case " $predeps $postdeps " in
++ *" $i "*)
++ newdeplibs="$newdeplibs $i"
++ i=""
++ ;;
++ esac
++ fi
++ if test -n "$i" ; then
++ libname=`eval \\$echo \"$libname_spec\"`
++ deplib_matches=`eval \\$echo \"$library_names_spec\"`
++ set dummy $deplib_matches
++ deplib_match=$2
++ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
++ newdeplibs="$newdeplibs $i"
++ else
++ droppeddeps=yes
++ $echo
++ $echo "*** Warning: dynamic linker does not accept needed library $i."
++ $echo "*** I have the capability to make that library automatically link in when"
++ $echo "*** you link to this library. But I can only do this if you have a"
++ $echo "*** shared version of the library, which I believe you do not have"
++ $echo "*** because a test_compile did reveal that the linker did not use it for"
++ $echo "*** its dynamic dependency list that programs get resolved with at runtime."
++ fi
+ fi
+ else
+ newdeplibs="$newdeplibs $i"
+ fi
+ done
+ else
+- # Error occured in the first compile. Let's try to salvage the situation:
+- # Compile a seperate program for each library.
++ # 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
+- name="`expr $i : '-l\(.*\)'`"
+- # If $name is empty we are operating on a -L argument.
+- if test -n "$name" && test "$name" != "0"; then
++ name=`expr $i : '-l\(.*\)'`
++ # If $name is empty we are operating on a -L argument.
++ if test "$name" != "" && test "$name" != "0"; then
+ $rm conftest
+- $CC -o conftest conftest.c $i
++ $LTCC $LTCFLAGS -o conftest conftest.c $i
+ # Did it work?
+- if test $? -eq 0 ; then
++ if test "$?" -eq 0 ; then
+ ldd_output=`ldd conftest`
+- libname=`eval \\$echo \"$libname_spec\"`
+- deplib_matches=`eval \\$echo \"$library_names_spec\"`
+- set dummy $deplib_matches
+- deplib_match=$2
+- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+- newdeplibs="$newdeplibs $i"
+- else
+- droppeddeps=yes
+- echo
+- echo "*** Warning: This library needs some functionality provided by $i."
+- echo "*** I have the capability to make that library automatically link in when"
+- echo "*** you link to this library. But I can only do this if you have a"
+- echo "*** shared version of the library, which you do not appear to have."
++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++ case " $predeps $postdeps " in
++ *" $i "*)
++ newdeplibs="$newdeplibs $i"
++ i=""
++ ;;
++ esac
++ fi
++ if test -n "$i" ; then
++ libname=`eval \\$echo \"$libname_spec\"`
++ deplib_matches=`eval \\$echo \"$library_names_spec\"`
++ set dummy $deplib_matches
++ deplib_match=$2
++ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
++ newdeplibs="$newdeplibs $i"
++ else
++ droppeddeps=yes
++ $echo
++ $echo "*** Warning: dynamic linker does not accept needed library $i."
++ $echo "*** I have the capability to make that library automatically link in when"
++ $echo "*** you link to this library. But I can only do this if you have a"
++ $echo "*** shared version of the library, which you do not appear to have"
++ $echo "*** because a test_compile did reveal that the linker did not use this one"
++ $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
++ fi
+ fi
+ else
+ droppeddeps=yes
+- echo
+- echo "*** Warning! Library $i is needed by this library but I was not able to"
+- echo "*** make it link in! You will probably need to install it or some"
+- echo "*** library that it depends on before this library will be fully"
+- echo "*** functional. Installing it before continuing would be even better."
++ $echo
++ $echo "*** Warning! Library $i is needed by this library but I was not able to"
++ $echo "*** make it link in! You will probably need to install it or some"
++ $echo "*** library that it depends on before this library will be fully"
++ $echo "*** functional. Installing it before continuing would be even better."
+ fi
+ else
+ newdeplibs="$newdeplibs $i"
+@@ -2559,13 +3616,22 @@
+ set dummy $deplibs_check_method
+ file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ for a_deplib in $deplibs; do
+- name="`expr $a_deplib : '-l\(.*\)'`"
++ name=`expr $a_deplib : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+- if test -n "$name" && test "$name" != "0"; then
+- libname=`eval \\$echo \"$libname_spec\"`
+- for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+- for potent_lib in $potential_libs; do
++ if test "$name" != "" && test "$name" != "0"; then
++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++ case " $predeps $postdeps " in
++ *" $a_deplib "*)
++ newdeplibs="$newdeplibs $a_deplib"
++ a_deplib=""
++ ;;
++ esac
++ fi
++ if test -n "$a_deplib" ; then
++ libname=`eval \\$echo \"$libname_spec\"`
++ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
++ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
++ for potent_lib in $potential_libs; do
+ # Follow soft links.
+ if ls -lLd "$potent_lib" 2>/dev/null \
+ | grep " -> " >/dev/null; then
+@@ -2578,28 +3644,36 @@
+ # but so what?
+ potlib="$potent_lib"
+ while test -h "$potlib" 2>/dev/null; do
+- potliblink=`ls -ld $potlib | sed 's/.* -> //'`
++ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+ case $potliblink in
+ [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+ *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+ esac
+ done
+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
+- | sed 10q \
+- | egrep "$file_magic_regex" > /dev/null; then
++ | ${SED} 10q \
++ | $EGREP "$file_magic_regex" > /dev/null; then
+ newdeplibs="$newdeplibs $a_deplib"
+ a_deplib=""
+ break 2
+ fi
+- done
+- done
++ done
++ done
++ fi
+ if test -n "$a_deplib" ; then
+ droppeddeps=yes
+- echo
+- echo "*** Warning: This library needs some functionality provided by $a_deplib."
+- echo "*** I have the capability to make that library automatically link in when"
+- echo "*** you link to this library. But I can only do this if you have a"
+- echo "*** shared version of the library, which you do not appear to have."
++ $echo
++ $echo "*** Warning: linker path does not have real file for library $a_deplib."
++ $echo "*** I have the capability to make that library automatically link in when"
++ $echo "*** you link to this library. But I can only do this if you have a"
++ $echo "*** shared version of the library, which you do not appear to have"
++ $echo "*** because I did check the linker path looking for a file starting"
++ if test -z "$potlib" ; then
++ $echo "*** with $libname but no candidates were found. (...for file magic test)"
++ else
++ $echo "*** with $libname and none of the candidates passed a file format test"
++ $echo "*** using a file magic. Last file checked: $potlib"
++ fi
+ fi
+ else
+ # Add a -L argument.
+@@ -2611,29 +3685,47 @@
+ set dummy $deplibs_check_method
+ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ for a_deplib in $deplibs; do
+- name="`expr $a_deplib : '-l\(.*\)'`"
++ name=`expr $a_deplib : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+ if test -n "$name" && test "$name" != "0"; then
+- libname=`eval \\$echo \"$libname_spec\"`
+- for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+- for potent_lib in $potential_libs; do
+- if eval echo \"$potent_lib\" 2>/dev/null \
+- | sed 10q \
+- | egrep "$match_pattern_regex" > /dev/null; then
+- newdeplibs="$newdeplibs $a_deplib"
+- a_deplib=""
+- break 2
+- fi
++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++ case " $predeps $postdeps " in
++ *" $a_deplib "*)
++ newdeplibs="$newdeplibs $a_deplib"
++ a_deplib=""
++ ;;
++ esac
++ fi
++ if test -n "$a_deplib" ; then
++ libname=`eval \\$echo \"$libname_spec\"`
++ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
++ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
++ for potent_lib in $potential_libs; do
++ potlib="$potent_lib" # see symlink-check above in file_magic test
++ if eval $echo \"$potent_lib\" 2>/dev/null \
++ | ${SED} 10q \
++ | $EGREP "$match_pattern_regex" > /dev/null; then
++ newdeplibs="$newdeplibs $a_deplib"
++ a_deplib=""
++ break 2
++ fi
++ done
+ done
+- done
++ fi
+ if test -n "$a_deplib" ; then
+ droppeddeps=yes
+- echo
+- echo "*** Warning: This library needs some functionality provided by $a_deplib."
+- echo "*** I have the capability to make that library automatically link in when"
+- echo "*** you link to this library. But I can only do this if you have a"
+- echo "*** shared version of the library, which you do not appear to have."
++ $echo
++ $echo "*** Warning: linker path does not have real file for library $a_deplib."
++ $echo "*** I have the capability to make that library automatically link in when"
++ $echo "*** you link to this library. But I can only do this if you have a"
++ $echo "*** shared version of the library, which you do not appear to have"
++ $echo "*** because I did check the linker path looking for a file starting"
++ if test -z "$potlib" ; then
++ $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
++ else
++ $echo "*** with $libname and none of the candidates passed a file format test"
++ $echo "*** using a regex pattern. Last file checked: $potlib"
++ fi
+ fi
+ else
+ # Add a -L argument.
+@@ -2643,16 +3735,23 @@
+ ;;
+ none | unknown | *)
+ newdeplibs=""
+- if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
+- -e 's/ -[LR][^ ]*//g' -e 's/[ ]//g' |
+- grep . >/dev/null; then
+- echo
++ tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
++ -e 's/ -[LR][^ ]*//g'`
++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++ for i in $predeps $postdeps ; do
++ # can't use Xsed below, because $i might contain '/'
++ tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
++ done
++ fi
++ if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \
++ | grep . >/dev/null; then
++ $echo
+ if test "X$deplibs_check_method" = "Xnone"; then
+- echo "*** Warning: inter-library dependencies are not supported in this platform."
++ $echo "*** Warning: inter-library dependencies are not supported in this platform."
+ else
+- echo "*** Warning: inter-library dependencies are not known to be supported."
++ $echo "*** Warning: inter-library dependencies are not known to be supported."
+ fi
+- echo "*** All declared inter-library dependencies are being dropped."
++ $echo "*** All declared inter-library dependencies are being dropped."
+ droppeddeps=yes
+ fi
+ ;;
+@@ -2672,17 +3771,17 @@
+
+ if test "$droppeddeps" = yes; then
+ if test "$module" = yes; then
+- echo
+- echo "*** Warning: libtool could not satisfy all declared inter-library"
+- echo "*** dependencies of module $libname. Therefore, libtool will create"
+- echo "*** a static module, that should work as long as the dlopening"
+- echo "*** application is linked with the -dlopen flag."
++ $echo
++ $echo "*** Warning: libtool could not satisfy all declared inter-library"
++ $echo "*** dependencies of module $libname. Therefore, libtool will create"
++ $echo "*** a static module, that should work as long as the dlopening"
++ $echo "*** application is linked with the -dlopen flag."
+ if test -z "$global_symbol_pipe"; then
+- echo
+- echo "*** However, this would only work if libtool was able to extract symbol"
+- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+- echo "*** not find such a program. So, this module is probably useless."
+- echo "*** \`nm' from GNU binutils and a full rebuild may help."
++ $echo
++ $echo "*** However, this would only work if libtool was able to extract symbol"
++ $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
++ $echo "*** not find such a program. So, this module is probably useless."
++ $echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ fi
+ if test "$build_old_libs" = no; then
+ oldlibs="$output_objdir/$libname.$libext"
+@@ -2692,16 +3791,16 @@
+ build_libtool_libs=no
+ fi
+ else
+- echo "*** The inter-library dependencies that have been dropped here will be"
+- echo "*** automatically added whenever a program is linked with this library"
+- echo "*** or is declared to -dlopen it."
++ $echo "*** The inter-library dependencies that have been dropped here will be"
++ $echo "*** automatically added whenever a program is linked with this library"
++ $echo "*** or is declared to -dlopen it."
+
+- if test $allow_undefined = no; then
+- echo
+- echo "*** Since this library must not contain undefined symbols,"
+- echo "*** because either the platform does not support them or"
+- echo "*** it was explicitly requested with -no-undefined,"
+- echo "*** libtool will only create a static version of it."
++ if test "$allow_undefined" = no; then
++ $echo
++ $echo "*** Since this library must not contain undefined symbols,"
++ $echo "*** because either the platform does not support them or"
++ $echo "*** it was explicitly requested with -no-undefined,"
++ $echo "*** libtool will only create a static version of it."
+ if test "$build_old_libs" = no; then
+ oldlibs="$output_objdir/$libname.$libext"
+ build_libtool_libs=module
+@@ -2716,6 +3815,35 @@
+ deplibs=$newdeplibs
+ fi
+
++
++ # move library search paths that coincide with paths to not yet
++ # installed libraries to the beginning of the library search list
++ new_libs=
++ for path in $notinst_path; do
++ case " $new_libs " in
++ *" -L$path/$objdir "*) ;;
++ *)
++ case " $deplibs " in
++ *" -L$path/$objdir "*)
++ new_libs="$new_libs -L$path/$objdir" ;;
++ esac
++ ;;
++ esac
++ done
++ for deplib in $deplibs; do
++ case $deplib in
++ -L*)
++ case " $new_libs " in
++ *" $deplib "*) ;;
++ *) new_libs="$new_libs $deplib" ;;
++ esac
++ ;;
++ *) new_libs="$new_libs $deplib" ;;
++ esac
++ done
++ deplibs="$new_libs"
++
++
+ # All the library-specific variables (install_libdir is set above).
+ library_names=
+ old_library=
+@@ -2723,7 +3851,7 @@
+
+ # Test again, we may have decided not to build it any more
+ if test "$build_libtool_libs" = yes; then
+- if test $hardcode_into_libs = yes; then
++ if test "$hardcode_into_libs" = yes; then
+ # Hardcode the library paths
+ hardcode_libdirs=
+ dep_rpath=
+@@ -2759,7 +3887,11 @@
+ if test -n "$hardcode_libdir_separator" &&
+ test -n "$hardcode_libdirs"; then
+ libdir="$hardcode_libdirs"
+- eval dep_rpath=\"$hardcode_libdir_flag_spec\"
++ if test -n "$hardcode_libdir_flag_spec_ld"; then
++ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
++ else
++ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
++ fi
+ fi
+ if test -n "$runpath_var" && test -n "$perm_rpath"; then
+ # We should set the runpath_var.
+@@ -2779,6 +3911,7 @@
+ fi
+
+ # Get the real and link names of the library.
++ eval shared_ext=\"$shrext_cmds\"
+ eval library_names=\"$library_names_spec\"
+ set dummy $library_names
+ realname="$2"
+@@ -2789,31 +3922,17 @@
+ else
+ soname="$realname"
+ fi
+- test -z "$dlname" && dlname=$soname
++ if test -z "$dlname"; then
++ dlname=$soname
++ fi
+
+ lib="$output_objdir/$realname"
++ linknames=
+ for link
+ do
+ linknames="$linknames $link"
+ done
+
+- # Ensure that we have .o objects for linkers which dislike .lo
+- # (e.g. aix) in case we are running --disable-static
+- for obj in $libobjs; do
+- xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+- if test "X$xdir" = "X$obj"; then
+- xdir="."
+- else
+- xdir="$xdir"
+- fi
+- baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+- oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
+- if test ! -f $xdir/$oldobj; then
+- $show "(cd $xdir && ${LN_S} $baseobj $oldobj)"
+- $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $?
+- fi
+- done
+-
+ # Use standard objects if they are pic
+ test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+
+@@ -2823,17 +3942,29 @@
+ $show "generating symbol list for \`$libname.la'"
+ export_symbols="$output_objdir/$libname.exp"
+ $run $rm $export_symbols
+- eval cmds=\"$export_symbols_cmds\"
++ cmds=$export_symbols_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+- $show "$cmd"
+- $run eval "$cmd" || exit $?
++ eval cmd=\"$cmd\"
++ if len=`expr "X$cmd" : ".*"` &&
++ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
++ $show "$cmd"
++ $run eval "$cmd" || exit $?
++ skipped_export=false
++ else
++ # The command line is too long to execute in one step.
++ $show "using reloadable object file for export list..."
++ skipped_export=:
++ # Break out early, otherwise skipped_export may be
++ # set to false by a later but shorter cmd.
++ break
++ fi
+ done
+ IFS="$save_ifs"
+ if test -n "$export_symbols_regex"; then
+- $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
+- $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
++ $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
++ $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+ $show "$mv \"${export_symbols}T\" \"$export_symbols\""
+ $run eval '$mv "${export_symbols}T" "$export_symbols"'
+ fi
+@@ -2844,46 +3975,30 @@
+ $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
+ fi
+
++ tmp_deplibs=
++ for test_deplib in $deplibs; do
++ case " $convenience " in
++ *" $test_deplib "*) ;;
++ *)
++ tmp_deplibs="$tmp_deplibs $test_deplib"
++ ;;
++ esac
++ done
++ deplibs="$tmp_deplibs"
++
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
++ save_libobjs=$libobjs
+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ else
+ gentop="$output_objdir/${outputname}x"
+- $show "${rm}r $gentop"
+- $run ${rm}r "$gentop"
+- $show "mkdir $gentop"
+- $run mkdir "$gentop"
+- status=$?
+- if test $status -ne 0 && test ! -d "$gentop"; then
+- exit $status
+- fi
+ generated="$generated $gentop"
+
+- for xlib in $convenience; do
+- # Extract the objects.
+- case $xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+- *) xabs=`pwd`"/$xlib" ;;
+- esac
+- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+- xdir="$gentop/$xlib"
+-
+- $show "${rm}r $xdir"
+- $run ${rm}r "$xdir"
+- $show "mkdir $xdir"
+- $run mkdir "$xdir"
+- status=$?
+- if test $status -ne 0 && test ! -d "$xdir"; then
+- exit $status
+- fi
+- $show "(cd $xdir && $AR x $xabs)"
+- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-
+- libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
+- done
++ func_extract_archives $gentop $convenience
++ libobjs="$libobjs $func_extract_archives_result"
+ fi
+ fi
+-
++
+ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ eval flag=\"$thread_safe_flag_spec\"
+ linker_flags="$linker_flags $flag"
+@@ -2895,23 +4010,175 @@
+ fi
+
+ # Do each of the archive commands.
++ if test "$module" = yes && test -n "$module_cmds" ; then
++ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
++ eval test_cmds=\"$module_expsym_cmds\"
++ cmds=$module_expsym_cmds
++ else
++ eval test_cmds=\"$module_cmds\"
++ cmds=$module_cmds
++ fi
++ else
+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+- eval cmds=\"$archive_expsym_cmds\"
++ eval test_cmds=\"$archive_expsym_cmds\"
++ cmds=$archive_expsym_cmds
+ else
+- eval cmds=\"$archive_cmds\"
++ eval test_cmds=\"$archive_cmds\"
++ cmds=$archive_cmds
++ fi
++ fi
++
++ if test "X$skipped_export" != "X:" &&
++ len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
++ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
++ :
++ else
++ # The command line is too long to link in one step, link piecewise.
++ $echo "creating reloadable object files..."
++
++ # Save the value of $output and $libobjs because we want to
++ # use them later. If we have whole_archive_flag_spec, we
++ # want to use save_libobjs as it was before
++ # whole_archive_flag_spec was expanded, because we can't
++ # assume the linker understands whole_archive_flag_spec.
++ # This may have to be revisited, in case too many
++ # convenience libraries get linked in and end up exceeding
++ # the spec.
++ if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
++ save_libobjs=$libobjs
++ fi
++ save_output=$output
++ output_la=`$echo "X$output" | $Xsed -e "$basename"`
++
++ # Clear the reloadable object creation command queue and
++ # initialize k to one.
++ test_cmds=
++ concat_cmds=
++ objlist=
++ delfiles=
++ last_robj=
++ k=1
++ output=$output_objdir/$output_la-${k}.$objext
++ # Loop over the list of objects to be linked.
++ for obj in $save_libobjs
++ do
++ eval test_cmds=\"$reload_cmds $objlist $last_robj\"
++ if test "X$objlist" = X ||
++ { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
++ test "$len" -le "$max_cmd_len"; }; then
++ objlist="$objlist $obj"
++ else
++ # The command $test_cmds is almost too long, add a
++ # command to the queue.
++ if test "$k" -eq 1 ; then
++ # The first file doesn't have a previous command to add.
++ eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
++ else
++ # All subsequent reloadable object files will link in
++ # the last one created.
++ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
++ fi
++ last_robj=$output_objdir/$output_la-${k}.$objext
++ k=`expr $k + 1`
++ output=$output_objdir/$output_la-${k}.$objext
++ objlist=$obj
++ len=1
++ fi
++ done
++ # Handle the remaining objects by creating one last
++ # reloadable object file. All subsequent reloadable object
++ # files will link in the last one created.
++ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
++ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
++
++ if ${skipped_export-false}; then
++ $show "generating symbol list for \`$libname.la'"
++ export_symbols="$output_objdir/$libname.exp"
++ $run $rm $export_symbols
++ libobjs=$output
++ # Append the command to create the export file.
++ eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
++ fi
++
++ # Set up a command to remove the reloadable object files
++ # after they are used.
++ i=0
++ while test "$i" -lt "$k"
++ do
++ i=`expr $i + 1`
++ delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
++ done
++
++ $echo "creating a temporary reloadable object file: $output"
++
++ # Loop through the commands generated above and execute them.
++ save_ifs="$IFS"; IFS='~'
++ for cmd in $concat_cmds; do
++ IFS="$save_ifs"
++ $show "$cmd"
++ $run eval "$cmd" || exit $?
++ done
++ IFS="$save_ifs"
++
++ libobjs=$output
++ # Restore the value of output.
++ output=$save_output
++
++ if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
++ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
++ fi
++ # Expand the library linking commands again to reset the
++ # value of $libobjs for piecewise linking.
++
++ # Do each of the archive commands.
++ if test "$module" = yes && test -n "$module_cmds" ; then
++ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
++ cmds=$module_expsym_cmds
++ else
++ cmds=$module_cmds
++ fi
++ else
++ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
++ cmds=$archive_expsym_cmds
++ else
++ cmds=$archive_cmds
++ fi
++ fi
++
++ # Append the command to remove the reloadable object files
++ # to the just-reset $cmds.
++ eval cmds=\"\$cmds~\$rm $delfiles\"
+ fi
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+- $run eval "$cmd" || exit $?
++ $run eval "$cmd" || {
++ lt_exit=$?
++
++ # Restore the uninstalled library and exit
++ if test "$mode" = relink; then
++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++ fi
++
++ exit $lt_exit
++ }
+ done
+ IFS="$save_ifs"
+
+ # Restore the uninstalled library and exit
+ if test "$mode" = relink; then
+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+- exit 0
++
++ if test -n "$convenience"; then
++ if test -z "$whole_archive_flag_spec"; then
++ $show "${rm}r $gentop"
++ $run ${rm}r "$gentop"
++ fi
++ fi
++
++ exit $EXIT_SUCCESS
+ fi
+
+ # Create links to the real library.
+@@ -2959,7 +4226,7 @@
+ *.lo)
+ if test -n "$objs$old_deplibs"; then
+ $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ libobj="$output"
+ obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+@@ -2988,38 +4255,10 @@
+ eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ else
+ gentop="$output_objdir/${obj}x"
+- $show "${rm}r $gentop"
+- $run ${rm}r "$gentop"
+- $show "mkdir $gentop"
+- $run mkdir "$gentop"
+- status=$?
+- if test $status -ne 0 && test ! -d "$gentop"; then
+- exit $status
+- fi
+ generated="$generated $gentop"
+
+- for xlib in $convenience; do
+- # Extract the objects.
+- case $xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+- *) xabs=`pwd`"/$xlib" ;;
+- esac
+- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+- xdir="$gentop/$xlib"
+-
+- $show "${rm}r $xdir"
+- $run ${rm}r "$xdir"
+- $show "mkdir $xdir"
+- $run mkdir "$xdir"
+- status=$?
+- if test $status -ne 0 && test ! -d "$xdir"; then
+- exit $status
+- fi
+- $show "(cd $xdir && $AR x $xabs)"
+- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-
+- reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
+- done
++ func_extract_archives $gentop $convenience
++ reload_conv_objs="$reload_objs $func_extract_archives_result"
+ fi
+ fi
+
+@@ -3027,10 +4266,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"
+- eval cmds=\"$reload_cmds\"
++ cmds=$reload_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -3043,7 +4283,7 @@
+ $run ${rm}r $gentop
+ fi
+
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+ if test "$build_libtool_libs" != yes; then
+@@ -3054,37 +4294,24 @@
+
+ # Create an invalid libtool object if no PIC, so that we don't
+ # accidentally link it into a program.
+- $show "echo timestamp > $libobj"
+- $run eval "echo timestamp > $libobj" || exit $?
+- exit 0
++ # $show "echo timestamp > $libobj"
++ # $run eval "echo timestamp > $libobj" || exit $?
++ exit $EXIT_SUCCESS
+ fi
+
+ if test -n "$pic_flag" || test "$pic_mode" != default; then
+ # Only do commands if we really have different PIC objects.
+ reload_objs="$libobjs $reload_conv_objs"
+ output="$libobj"
+- eval cmds=\"$reload_cmds\"
++ cmds=$reload_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+- else
+- # Just create a symlink.
+- $show $rm $libobj
+- $run $rm $libobj
+- xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
+- if test "X$xdir" = "X$libobj"; then
+- xdir="."
+- else
+- xdir="$xdir"
+- fi
+- baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
+- oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
+- $show "(cd $xdir && $LN_S $oldobj $baseobj)"
+- $run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $?
+ fi
+
+ if test -n "$gentop"; then
+@@ -3092,12 +4319,12 @@
+ $run ${rm}r $gentop
+ fi
+
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ prog)
+ case $host in
+- *cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;;
++ *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
+ esac
+ if test -n "$vinfo"; then
+ $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
+@@ -3122,6 +4349,45 @@
+ ;;
+ esac
+
++ case $host in
++ *darwin*)
++ # Don't allow lazy linking, it breaks C++ global constructors
++ if test "$tagname" = CXX ; then
++ compile_command="$compile_command ${wl}-bind_at_load"
++ finalize_command="$finalize_command ${wl}-bind_at_load"
++ fi
++ ;;
++ esac
++
++
++ # move library search paths that coincide with paths to not yet
++ # installed libraries to the beginning of the library search list
++ new_libs=
++ for path in $notinst_path; do
++ case " $new_libs " in
++ *" -L$path/$objdir "*) ;;
++ *)
++ case " $compile_deplibs " in
++ *" -L$path/$objdir "*)
++ new_libs="$new_libs -L$path/$objdir" ;;
++ esac
++ ;;
++ esac
++ done
++ for deplib in $compile_deplibs; do
++ case $deplib in
++ -L*)
++ case " $new_libs " in
++ *" $deplib "*) ;;
++ *) new_libs="$new_libs $deplib" ;;
++ esac
++ ;;
++ *) new_libs="$new_libs $deplib" ;;
++ esac
++ done
++ compile_deplibs="$new_libs"
++
++
+ compile_command="$compile_command $compile_deplibs"
+ finalize_command="$finalize_command $finalize_deplibs"
+
+@@ -3166,10 +4432,15 @@
+ fi
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++ testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
+ case :$dllsearchpath: in
+ *":$libdir:"*) ;;
+ *) dllsearchpath="$dllsearchpath:$libdir";;
+ esac
++ case :$dllsearchpath: in
++ *":$testbindir:"*) ;;
++ *) dllsearchpath="$dllsearchpath:$testbindir";;
++ esac
+ ;;
+ esac
+ done
+@@ -3272,31 +4543,43 @@
+ done
+
+ if test -n "$exclude_expsyms"; then
+- $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
++ $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+ $run eval '$mv "$nlist"T "$nlist"'
+ fi
+
+ if test -n "$export_symbols_regex"; then
+- $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T'
++ $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+ $run eval '$mv "$nlist"T "$nlist"'
+ fi
+
+ # Prepare the list of exported symbols
+ if test -z "$export_symbols"; then
+- export_symbols="$output_objdir/$output.exp"
++ export_symbols="$output_objdir/$outputname.exp"
+ $run $rm $export_symbols
+- $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++ $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++ case $host in
++ *cygwin* | *mingw* )
++ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++ $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
++ ;;
++ esac
+ else
+- $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+- $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
++ $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
++ $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+ $run eval 'mv "$nlist"T "$nlist"'
++ case $host in
++ *cygwin* | *mingw* )
++ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++ $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
++ ;;
++ esac
+ fi
+ fi
+
+ for arg in $dlprefiles; do
+ $show "extracting global C symbols from \`$arg'"
+- name=`echo "$arg" | sed -e 's%^.*/%%'`
+- $run eval 'echo ": $name " >> "$nlist"'
++ name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
++ $run eval '$echo ": $name " >> "$nlist"'
+ $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+ done
+
+@@ -3305,12 +4588,18 @@
+ test -f "$nlist" || : > "$nlist"
+
+ if test -n "$exclude_expsyms"; then
+- egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
++ $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+ $mv "$nlist"T "$nlist"
+ fi
+
+ # Try sorting and uniquifying the output.
+- if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then
++ if grep -v "^: " < "$nlist" |
++ if sort -k 3 </dev/null >/dev/null 2>&1; then
++ sort -k 3
++ else
++ sort +2
++ fi |
++ uniq > "$nlist"S; then
+ :
+ else
+ grep -v "^: " < "$nlist" > "$nlist"S
+@@ -3319,7 +4608,7 @@
+ if test -f "$nlist"S; then
+ eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
+ else
+- echo '/* NONE */' >> "$output_objdir/$dlsyms"
++ $echo '/* NONE */' >> "$output_objdir/$dlsyms"
+ fi
+
+ $echo >> "$output_objdir/$dlsyms" "\
+@@ -3334,7 +4623,26 @@
+ #endif
+
+ /* The mapping between symbol names and symbols. */
++"
++
++ case $host in
++ *cygwin* | *mingw* )
++ $echo >> "$output_objdir/$dlsyms" "\
++/* DATA imports from DLLs on WIN32 can't be const, because
++ runtime relocations are performed -- see ld's documentation
++ on pseudo-relocs */
++struct {
++"
++ ;;
++ * )
++ $echo >> "$output_objdir/$dlsyms" "\
+ const struct {
++"
++ ;;
++ esac
++
++
++ $echo >> "$output_objdir/$dlsyms" "\
+ const char *name;
+ lt_ptr address;
+ }
+@@ -3371,30 +4679,43 @@
+ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ case "$compile_command " in
+ *" -static "*) ;;
+- *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
++ *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
+ esac;;
+ *-*-hpux*)
+ case "$compile_command " in
+ *" -static "*) ;;
+- *) pic_flag_for_symtable=" $pic_flag -DPIC";;
++ *) pic_flag_for_symtable=" $pic_flag";;
+ esac
+ esac
+
+ # Now compile the dynamic symbol file.
+- $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+- $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
++ $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
++ $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+
+ # Clean up the generated files.
+ $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+ $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
+
+ # Transform the symbol file into the correct name.
+- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++ case $host in
++ *cygwin* | *mingw* )
++ if test -f "$output_objdir/${outputname}.def" ; then
++ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
++ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
++ else
++ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++ fi
++ ;;
++ * )
++ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++ ;;
++ esac
+ ;;
+ *)
+ $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ else
+@@ -3407,7 +4728,7 @@
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ fi
+
+- if test $need_relink = no || test "$build_libtool_libs" != yes; then
++ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ # Replace the output file specification.
+ compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ link_command="$compile_command$compile_rpath"
+@@ -3415,7 +4736,7 @@
+ # We have no uninstalled library dependencies, so finalize right now.
+ $show "$link_command"
+ $run eval "$link_command"
+- status=$?
++ exit_status=$?
+
+ # Delete the generated files.
+ if test -n "$dlsyms"; then
+@@ -3423,7 +4744,7 @@
+ $run $rm "$output_objdir/${outputname}S.${objext}"
+ fi
+
+- exit $status
++ exit $exit_status
+ fi
+
+ if test -n "$shlibpath_var"; then
+@@ -3482,7 +4803,7 @@
+ # Link the executable and exit
+ $show "$link_command"
+ $run eval "$link_command" || exit $?
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+ if test "$hardcode_action" = relink; then
+@@ -3532,15 +4853,15 @@
+ relink_command="$var=\"$var_value\"; export $var; $relink_command"
+ fi
+ done
+- relink_command="cd `pwd`; $relink_command"
++ relink_command="(cd `pwd`; $relink_command)"
+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ fi
+
+ # Quote $echo for shipping.
+- if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
+- case $0 in
+- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
+- *) qecho="$SHELL `pwd`/$0 --fallback-echo";;
++ if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
++ case $progpath in
++ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
++ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+ esac
+ qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+ else
+@@ -3552,15 +4873,376 @@
+ # win32 will think the script is a binary if it has
+ # a .exe suffix, so we strip it off here.
+ case $output in
+- *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
++ *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
+ esac
+ # test for cygwin because mv fails w/o .exe extensions
+ case $host in
+- *cygwin*) exeext=.exe ;;
++ *cygwin*)
++ exeext=.exe
++ outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
+ *) exeext= ;;
+ esac
+- $rm $output
+- trap "$rm $output; exit 1" 1 2 15
++ case $host in
++ *cygwin* | *mingw* )
++ output_name=`basename $output`
++ output_path=`dirname $output`
++ cwrappersource="$output_path/$objdir/lt-$output_name.c"
++ cwrapper="$output_path/$output_name.exe"
++ $rm $cwrappersource $cwrapper
++ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
++
++ cat > $cwrappersource <<EOF
++
++/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
++ Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
++
++ The $output program cannot be directly executed until all the libtool
++ libraries that it depends on are installed.
++
++ This wrapper executable should never be moved out of the build directory.
++ If it is, it will not operate correctly.
++
++ Currently, it simply execs the wrapper *script* "/bin/sh $output",
++ but could eventually absorb all of the scripts functionality and
++ exec $objdir/$outputname directly.
++*/
++EOF
++ cat >> $cwrappersource<<"EOF"
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <malloc.h>
++#include <stdarg.h>
++#include <assert.h>
++#include <string.h>
++#include <ctype.h>
++#include <sys/stat.h>
++
++#if defined(PATH_MAX)
++# define LT_PATHMAX PATH_MAX
++#elif defined(MAXPATHLEN)
++# define LT_PATHMAX MAXPATHLEN
++#else
++# define LT_PATHMAX 1024
++#endif
++
++#ifndef DIR_SEPARATOR
++# define DIR_SEPARATOR '/'
++# define PATH_SEPARATOR ':'
++#endif
++
++#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
++ defined (__OS2__)
++# define HAVE_DOS_BASED_FILE_SYSTEM
++# ifndef DIR_SEPARATOR_2
++# define DIR_SEPARATOR_2 '\\'
++# endif
++# ifndef PATH_SEPARATOR_2
++# define PATH_SEPARATOR_2 ';'
++# endif
++#endif
++
++#ifndef DIR_SEPARATOR_2
++# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
++#else /* DIR_SEPARATOR_2 */
++# define IS_DIR_SEPARATOR(ch) \
++ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
++#endif /* DIR_SEPARATOR_2 */
++
++#ifndef PATH_SEPARATOR_2
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
++#else /* PATH_SEPARATOR_2 */
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
++#endif /* PATH_SEPARATOR_2 */
++
++#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
++#define XFREE(stale) do { \
++ if (stale) { free ((void *) stale); stale = 0; } \
++} while (0)
++
++/* -DDEBUG is fairly common in CFLAGS. */
++#undef DEBUG
++#if defined DEBUGWRAPPER
++# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
++#else
++# define DEBUG(format, ...)
++#endif
++
++const char *program_name = NULL;
++
++void * xmalloc (size_t num);
++char * xstrdup (const char *string);
++const char * base_name (const char *name);
++char * find_executable(const char *wrapper);
++int check_executable(const char *path);
++char * strendzap(char *str, const char *pat);
++void lt_fatal (const char *message, ...);
++
++int
++main (int argc, char *argv[])
++{
++ char **newargz;
++ int i;
++
++ program_name = (char *) xstrdup (base_name (argv[0]));
++ DEBUG("(main) argv[0] : %s\n",argv[0]);
++ DEBUG("(main) program_name : %s\n",program_name);
++ newargz = XMALLOC(char *, argc+2);
++EOF
++
++ cat >> $cwrappersource <<EOF
++ newargz[0] = (char *) xstrdup("$SHELL");
++EOF
++
++ cat >> $cwrappersource <<"EOF"
++ newargz[1] = find_executable(argv[0]);
++ if (newargz[1] == NULL)
++ lt_fatal("Couldn't find %s", argv[0]);
++ DEBUG("(main) found exe at : %s\n",newargz[1]);
++ /* we know the script has the same name, without the .exe */
++ /* so make sure newargz[1] doesn't end in .exe */
++ strendzap(newargz[1],".exe");
++ for (i = 1; i < argc; i++)
++ newargz[i+1] = xstrdup(argv[i]);
++ newargz[argc+1] = NULL;
++
++ for (i=0; i<argc+1; i++)
++ {
++ DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]);
++ ;
++ }
++
++EOF
++
++ case $host_os in
++ mingw*)
++ cat >> $cwrappersource <<EOF
++ execv("$SHELL",(char const **)newargz);
++EOF
++ ;;
++ *)
++ cat >> $cwrappersource <<EOF
++ execv("$SHELL",newargz);
++EOF
++ ;;
++ esac
++
++ cat >> $cwrappersource <<"EOF"
++ return 127;
++}
++
++void *
++xmalloc (size_t num)
++{
++ void * p = (void *) malloc (num);
++ if (!p)
++ lt_fatal ("Memory exhausted");
++
++ return p;
++}
++
++char *
++xstrdup (const char *string)
++{
++ return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
++;
++}
++
++const char *
++base_name (const char *name)
++{
++ const char *base;
++
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
++ /* Skip over the disk name in MSDOS pathnames. */
++ if (isalpha ((unsigned char)name[0]) && name[1] == ':')
++ name += 2;
++#endif
++
++ for (base = name; *name; name++)
++ if (IS_DIR_SEPARATOR (*name))
++ base = name + 1;
++ return base;
++}
++
++int
++check_executable(const char * path)
++{
++ struct stat st;
++
++ DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
++ if ((!path) || (!*path))
++ return 0;
++
++ if ((stat (path, &st) >= 0) &&
++ (
++ /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
++#if defined (S_IXOTH)
++ ((st.st_mode & S_IXOTH) == S_IXOTH) ||
++#endif
++#if defined (S_IXGRP)
++ ((st.st_mode & S_IXGRP) == S_IXGRP) ||
++#endif
++ ((st.st_mode & S_IXUSR) == S_IXUSR))
++ )
++ return 1;
++ else
++ return 0;
++}
++
++/* Searches for the full path of the wrapper. Returns
++ newly allocated full path name if found, NULL otherwise */
++char *
++find_executable (const char* wrapper)
++{
++ int has_slash = 0;
++ const char* p;
++ const char* p_next;
++ /* static buffer for getcwd */
++ char tmp[LT_PATHMAX + 1];
++ int tmp_len;
++ char* concat_name;
++
++ DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
++
++ if ((wrapper == NULL) || (*wrapper == '\0'))
++ return NULL;
++
++ /* Absolute path? */
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
++ if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
++ {
++ concat_name = xstrdup (wrapper);
++ if (check_executable(concat_name))
++ return concat_name;
++ XFREE(concat_name);
++ }
++ else
++ {
++#endif
++ if (IS_DIR_SEPARATOR (wrapper[0]))
++ {
++ concat_name = xstrdup (wrapper);
++ if (check_executable(concat_name))
++ return concat_name;
++ XFREE(concat_name);
++ }
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
++ }
++#endif
++
++ for (p = wrapper; *p; p++)
++ if (*p == '/')
++ {
++ has_slash = 1;
++ break;
++ }
++ if (!has_slash)
++ {
++ /* no slashes; search PATH */
++ const char* path = getenv ("PATH");
++ if (path != NULL)
++ {
++ for (p = path; *p; p = p_next)
++ {
++ const char* q;
++ size_t p_len;
++ for (q = p; *q; q++)
++ if (IS_PATH_SEPARATOR(*q))
++ break;
++ p_len = q - p;
++ p_next = (*q == '\0' ? q : q + 1);
++ if (p_len == 0)
++ {
++ /* empty path: current directory */
++ if (getcwd (tmp, LT_PATHMAX) == NULL)
++ lt_fatal ("getcwd failed");
++ tmp_len = strlen(tmp);
++ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
++ memcpy (concat_name, tmp, tmp_len);
++ concat_name[tmp_len] = '/';
++ strcpy (concat_name + tmp_len + 1, wrapper);
++ }
++ else
++ {
++ concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
++ memcpy (concat_name, p, p_len);
++ concat_name[p_len] = '/';
++ strcpy (concat_name + p_len + 1, wrapper);
++ }
++ if (check_executable(concat_name))
++ return concat_name;
++ XFREE(concat_name);
++ }
++ }
++ /* not found in PATH; assume curdir */
++ }
++ /* Relative path | not found in path: prepend cwd */
++ if (getcwd (tmp, LT_PATHMAX) == NULL)
++ lt_fatal ("getcwd failed");
++ tmp_len = strlen(tmp);
++ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
++ memcpy (concat_name, tmp, tmp_len);
++ concat_name[tmp_len] = '/';
++ strcpy (concat_name + tmp_len + 1, wrapper);
++
++ if (check_executable(concat_name))
++ return concat_name;
++ XFREE(concat_name);
++ return NULL;
++}
++
++char *
++strendzap(char *str, const char *pat)
++{
++ size_t len, patlen;
++
++ assert(str != NULL);
++ assert(pat != NULL);
++
++ len = strlen(str);
++ patlen = strlen(pat);
++
++ if (patlen <= len)
++ {
++ str += len - patlen;
++ if (strcmp(str, pat) == 0)
++ *str = '\0';
++ }
++ return str;
++}
++
++static void
++lt_error_core (int exit_status, const char * mode,
++ const char * message, va_list ap)
++{
++ fprintf (stderr, "%s: %s: ", program_name, mode);
++ vfprintf (stderr, message, ap);
++ fprintf (stderr, ".\n");
++
++ if (exit_status >= 0)
++ exit (exit_status);
++}
++
++void
++lt_fatal (const char *message, ...)
++{
++ va_list ap;
++ va_start (ap, message);
++ lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
++ va_end (ap);
++}
++EOF
++ # we should really use a build-platform specific compiler
++ # here, but OTOH, the wrappers (shell script and this C one)
++ # are only useful if you want to execute the "real" binary.
++ # Since the "real" binary is built for $host, then this
++ # wrapper might as well be built for $host, too.
++ $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
++ ;;
++ esac
++ $rm $output
++ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+
+ $echo > $output "\
+ #! $SHELL
+@@ -3576,12 +5258,12 @@
+
+ # Sed substitution that helps us do robust quoting. It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e 1s/^X//'
++Xsed='${SED} -e 1s/^X//'
+ sed_quote_subst='$sed_quote_subst'
+
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ relink_command=\"$relink_command\"
+
+@@ -3614,7 +5296,7 @@
+ test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+ # Follow symbolic links until we get to the real thisdir.
+- file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
++ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+ while test -n \"\$file\"; do
+ destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+
+@@ -3627,7 +5309,7 @@
+ fi
+
+ file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+- file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
++ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+ done
+
+ # Try to get the absolute directory name.
+@@ -3636,12 +5318,12 @@
+ "
+
+ if test "$fast_install" = yes; then
+- echo >> $output "\
++ $echo >> $output "\
+ program=lt-'$outputname'$exeext
+ progdir=\"\$thisdir/$objdir\"
+
+ if test ! -f \"\$progdir/\$program\" || \\
+- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
++ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+ test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+ file=\"\$\$-\$program\"
+@@ -3652,7 +5334,7 @@
+ $rm \"\$progdir/\$file\"
+ fi"
+
+- echo >> $output "\
++ $echo >> $output "\
+
+ # relink executable if necessary
+ if test -n \"\$relink_command\"; then
+@@ -3660,7 +5342,7 @@
+ else
+ $echo \"\$relink_command_output\" >&2
+ $rm \"\$progdir/\$file\"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi
+
+@@ -3670,13 +5352,13 @@
+ $rm \"\$progdir/\$file\"
+ fi"
+ else
+- echo >> $output "\
++ $echo >> $output "\
+ program='$outputname'
+ progdir=\"\$thisdir/$objdir\"
+ "
+ fi
+
+- echo >> $output "\
++ $echo >> $output "\
+
+ if test -f \"\$progdir/\$program\"; then"
+
+@@ -3707,47 +5389,35 @@
+ # Run the actual program with our arguments.
+ "
+ case $host in
+- # win32 systems need to use the prog path for dll
+- # lookup to work
+- *-*-cygwin* | *-*-pw32*)
+- $echo >> $output "\
+- exec \$progdir/\$program \${1+\"\$@\"}
+-"
+- ;;
+-
+ # Backslashes separate directories on plain windows
+ *-*-mingw | *-*-os2*)
+ $echo >> $output "\
+- exec \$progdir\\\\\$program \${1+\"\$@\"}
++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+ "
+ ;;
+
+ *)
+ $echo >> $output "\
+- # Export the path to the program.
+- PATH=\"\$progdir:\$PATH\"
+- export PATH
+-
+- exec \$program \${1+\"\$@\"}
++ exec \"\$progdir/\$program\" \${1+\"\$@\"}
+ "
+ ;;
+ esac
+ $echo >> $output "\
+ \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ else
+ # The program doesn't exist.
+- \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
++ \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+ \$echo \"This script is just a wrapper for \$program.\" 1>&2
+- echo \"See the $PACKAGE documentation for more information.\" 1>&2
+- exit 1
++ $echo \"See the $PACKAGE documentation for more information.\" 1>&2
++ exit $EXIT_FAILURE
+ fi
+ fi\
+ "
+ chmod +x $output
+ fi
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+ esac
+
+@@ -3763,74 +5433,130 @@
+ oldobjs="$libobjs_save"
+ build_libtool_libs=no
+ else
+- oldobjs="$objs$old_deplibs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
++ oldobjs="$old_deplibs $non_pic_objects"
+ fi
+ addlibs="$old_convenience"
+ fi
+
+ if test -n "$addlibs"; then
+ gentop="$output_objdir/${outputname}x"
+- $show "${rm}r $gentop"
+- $run ${rm}r "$gentop"
+- $show "mkdir $gentop"
+- $run mkdir "$gentop"
+- status=$?
+- if test $status -ne 0 && test ! -d "$gentop"; then
+- exit $status
+- fi
+ generated="$generated $gentop"
+
+- # Add in members from convenience archives.
+- for xlib in $addlibs; do
+- # Extract the objects.
+- case $xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+- *) xabs=`pwd`"/$xlib" ;;
+- esac
+- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+- xdir="$gentop/$xlib"
+-
+- $show "${rm}r $xdir"
+- $run ${rm}r "$xdir"
+- $show "mkdir $xdir"
+- $run mkdir "$xdir"
+- status=$?
+- if test $status -ne 0 && test ! -d "$xdir"; then
+- exit $status
+- fi
+- $show "(cd $xdir && $AR x $xabs)"
+- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-
+- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+- done
++ func_extract_archives $gentop $addlibs
++ oldobjs="$oldobjs $func_extract_archives_result"
+ fi
+
+ # Do each command in the archive commands.
+ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+- eval cmds=\"$old_archive_from_new_cmds\"
++ cmds=$old_archive_from_new_cmds
+ else
+- # Ensure that we have .o objects in place in case we decided
+- # not to build a shared library, and have fallen back to building
+- # static libs even though --disable-static was passed!
+- for oldobj in $oldobjs; do
+- if test ! -f $oldobj; then
+- xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'`
+- if test "X$xdir" = "X$oldobj"; then
+- xdir="."
+- else
+- xdir="$xdir"
++ # POSIX demands no paths to be encoded in archives. We have
++ # to avoid creating archives with duplicate basenames if we
++ # might have to extract them afterwards, e.g., when creating a
++ # static archive out of a convenience library, or when linking
++ # the entirety of a libtool archive into another (currently
++ # not supported by libtool).
++ if (for obj in $oldobjs
++ do
++ $echo "X$obj" | $Xsed -e 's%^.*/%%'
++ done | sort | sort -uc >/dev/null 2>&1); then
++ :
++ else
++ $echo "copying selected object files to avoid basename conflicts..."
++
++ if test -z "$gentop"; then
++ gentop="$output_objdir/${outputname}x"
++ generated="$generated $gentop"
++
++ $show "${rm}r $gentop"
++ $run ${rm}r "$gentop"
++ $show "$mkdir $gentop"
++ $run $mkdir "$gentop"
++ exit_status=$?
++ if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
++ exit $exit_status
+ fi
+- baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'`
+- obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
+- $show "(cd $xdir && ${LN_S} $obj $baseobj)"
+- $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $?
+ fi
+- done
++
++ save_oldobjs=$oldobjs
++ oldobjs=
++ counter=1
++ for obj in $save_oldobjs
++ do
++ objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
++ case " $oldobjs " in
++ " ") oldobjs=$obj ;;
++ *[\ /]"$objbase "*)
++ while :; do
++ # Make sure we don't pick an alternate name that also
++ # overlaps.
++ newobj=lt$counter-$objbase
++ counter=`expr $counter + 1`
++ case " $oldobjs " in
++ *[\ /]"$newobj "*) ;;
++ *) if test ! -f "$gentop/$newobj"; then break; fi ;;
++ esac
++ done
++ $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
++ $run ln "$obj" "$gentop/$newobj" ||
++ $run cp "$obj" "$gentop/$newobj"
++ oldobjs="$oldobjs $gentop/$newobj"
++ ;;
++ *) oldobjs="$oldobjs $obj" ;;
++ esac
++ done
++ fi
+
+ eval cmds=\"$old_archive_cmds\"
++
++ if len=`expr "X$cmds" : ".*"` &&
++ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
++ cmds=$old_archive_cmds
++ else
++ # the command line is too long to link in one step, link in parts
++ $echo "using piecewise archive linking..."
++ save_RANLIB=$RANLIB
++ RANLIB=:
++ objlist=
++ concat_cmds=
++ save_oldobjs=$oldobjs
++
++ # Is there a better way of finding the last object in the list?
++ for obj in $save_oldobjs
++ do
++ last_oldobj=$obj
++ done
++ for obj in $save_oldobjs
++ do
++ oldobjs="$objlist $obj"
++ objlist="$objlist $obj"
++ eval test_cmds=\"$old_archive_cmds\"
++ if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
++ test "$len" -le "$max_cmd_len"; then
++ :
++ else
++ # the above command should be used before it gets too long
++ oldobjs=$objlist
++ if test "$obj" = "$last_oldobj" ; then
++ RANLIB=$save_RANLIB
++ fi
++ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
++ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
++ objlist=
++ fi
++ done
++ RANLIB=$save_RANLIB
++ oldobjs=$objlist
++ if test "X$oldobjs" = "X" ; then
++ eval cmds=\"\$concat_cmds\"
++ else
++ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
++ fi
++ fi
+ fi
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
++ eval cmd=\"$cmd\"
+ IFS="$save_ifs"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+@@ -3862,8 +5588,12 @@
+ fi
+ done
+ # Quote the link command for shipping.
+- relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
++ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++ if test "$hardcode_automatic" = yes ; then
++ relink_command=
++ fi
++
+
+ # Only create the output if not a dry run.
+ if test -z "$run"; then
+@@ -3879,10 +5609,10 @@
+ case $deplib in
+ *.la)
+ name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+- eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ newdependency_libs="$newdependency_libs $libdir/$name"
+ ;;
+@@ -3893,10 +5623,10 @@
+ newdlfiles=
+ for lib in $dlfiles; do
+ name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+- eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ newdlfiles="$newdlfiles $libdir/$name"
+ done
+@@ -3904,20 +5634,39 @@
+ newdlprefiles=
+ for lib in $dlprefiles; do
+ name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+- eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ newdlprefiles="$newdlprefiles $libdir/$name"
+ done
+ dlprefiles="$newdlprefiles"
++ else
++ newdlfiles=
++ for lib in $dlfiles; do
++ case $lib in
++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++ *) abs=`pwd`"/$lib" ;;
++ esac
++ newdlfiles="$newdlfiles $abs"
++ done
++ dlfiles="$newdlfiles"
++ newdlprefiles=
++ for lib in $dlprefiles; do
++ case $lib in
++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++ *) abs=`pwd`"/$lib" ;;
++ esac
++ newdlprefiles="$newdlprefiles $abs"
++ done
++ dlprefiles="$newdlprefiles"
+ fi
+ $rm $output
+ # place dlname in correct position for cygwin
+ tdlname=$dlname
+ case $host,$output,$installed,$module,$dlname in
+- *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
++ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ esac
+ $echo > $output "\
+ # $outputname - a libtool library file
+@@ -3946,13 +5695,16 @@
+ # Is this an already installed library?
+ installed=$installed
+
++# Should we warn about portability when linking against -modules?
++shouldnotlink=$module
++
+ # Files to dlopen/dlpreopen
+ dlopen='$dlfiles'
+ dlpreopen='$dlprefiles'
+
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
+- if test "$installed" = no && test $need_relink = yes; then
++ if test "$installed" = no && test "$need_relink" = yes; then
+ $echo >> $output "\
+ relink_command=\"$relink_command\""
+ fi
+@@ -3965,7 +5717,7 @@
+ $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+ ;;
+ esac
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool install mode
+@@ -3976,11 +5728,11 @@
+ # install_prog (especially on Windows NT).
+ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ # Allow the use of GNU shtool's install command.
+- $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
++ $echo "X$nonopt" | grep shtool > /dev/null; then
+ # Aesthetically quote it.
+ arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+@@ -3989,14 +5741,14 @@
+ shift
+ else
+ install_prog=
+- arg="$nonopt"
++ arg=$nonopt
+ fi
+
+ # The real first argument should be the name of the installation program.
+ # Aesthetically quote it.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+@@ -4014,28 +5766,31 @@
+ do
+ if test -n "$dest"; then
+ files="$files $dest"
+- dest="$arg"
++ dest=$arg
+ continue
+ fi
+
+ case $arg in
+ -d) isdir=yes ;;
+- -f) prev="-f" ;;
+- -g) prev="-g" ;;
+- -m) prev="-m" ;;
+- -o) prev="-o" ;;
++ -f)
++ case " $install_prog " in
++ *[\\\ /]cp\ *) ;;
++ *) prev=$arg ;;
++ esac
++ ;;
++ -g | -m | -o) prev=$arg ;;
+ -s)
+ stripme=" -s"
+ continue
+ ;;
+- -*) ;;
+-
++ -*)
++ ;;
+ *)
+ # If the previous option needed an argument, then skip it.
+ if test -n "$prev"; then
+ prev=
+ else
+- dest="$arg"
++ dest=$arg
+ continue
+ fi
+ ;;
+@@ -4044,7 +5799,7 @@
+ # Aesthetically quote the argument.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+@@ -4054,13 +5809,13 @@
+ if test -z "$install_prog"; then
+ $echo "$modename: you must specify an install program" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$prev"; then
+ $echo "$modename: the \`$prev' option requires an argument" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -z "$files"; then
+@@ -4070,7 +5825,7 @@
+ $echo "$modename: you must specify a destination" 1>&2
+ fi
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Strip any trailing slash from the destination.
+@@ -4088,10 +5843,10 @@
+
+ # Not a directory, so check to see that there is only one file specified.
+ set dummy $files
+- if test $# -gt 2; then
++ if test "$#" -gt 2; then
+ $echo "$modename: \`$dest' is not a directory" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi
+ case $destdir in
+@@ -4103,7 +5858,7 @@
+ *)
+ $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ done
+@@ -4128,11 +5883,11 @@
+
+ *.la)
+ # Check to see that this really is a libtool archive.
+- if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ else
+ $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ library_names=
+@@ -4145,21 +5900,12 @@
+ esac
+
+ # Add the libdir to current_libdirs if it is the destination.
+- DESTDIR=
+ if test "X$destdir" = "X$libdir"; then
+ case "$current_libdirs " in
+ *" $libdir "*) ;;
+ *) current_libdirs="$current_libdirs $libdir" ;;
+ esac
+ else
+- case "$destdir" in
+- *"$libdir")
+- DESTDIR=`$echo "$destdir" | sed -e 's!'"$libdir"'$!!'`
+- if test "X$destdir" != "X$DESTDIR$libdir"; then
+- DESTDIR=
+- fi
+- ;;
+- esac
+ # Note the libdir as a future libdir.
+ case "$future_libdirs " in
+ *" $libdir "*) ;;
+@@ -4172,16 +5918,35 @@
+ dir="$dir$objdir"
+
+ if test -n "$relink_command"; then
++ # Determine the prefix the user has applied to our future dir.
++ inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
++
++ # Don't allow the user to place us outside of our expected
++ # location b/c this prevents finding dependent libraries that
++ # are installed to the same prefix.
++ # At present, this check doesn't affect windows .dll's that
++ # are installed into $libdir/../bin (currently, that works fine)
++ # but it's something to keep an eye on.
++ if test "$inst_prefix_dir" = "$destdir"; then
++ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
++ exit $EXIT_FAILURE
++ fi
++
++ if test -n "$inst_prefix_dir"; then
++ # Stick the inst_prefix_dir data into the link command.
++ relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++ else
++ relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
++ fi
++
+ $echo "$modename: warning: relinking \`$file'" 1>&2
+- export DESTDIR
+ $show "$relink_command"
+ if $run eval "$relink_command"; then :
+ else
+ $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+- continue
++ exit $EXIT_FAILURE
+ fi
+ fi
+- unset DESTDIR
+
+ # See the names of the shared library.
+ set dummy $library_names
+@@ -4201,25 +5966,38 @@
+ $run eval "$striplib $destdir/$realname" || exit $?
+ fi
+
+- if test $# -gt 0; then
++ if test "$#" -gt 0; then
+ # Delete the old symlinks, and create new ones.
++ # Try `ln -sf' first, because the `ln' binary might depend on
++ # the symlink we replace! Solaris /bin/ln does not understand -f,
++ # so we also need to try rm && ln -s.
+ for linkname
+ do
+ if test "$linkname" != "$realname"; then
+- $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+- $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
++ $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
++ $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+ fi
+ done
+ fi
+
+ # Do each command in the postinstall commands.
+ lib="$destdir/$realname"
+- eval cmds=\"$postinstall_cmds\"
++ cmds=$postinstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+- $run eval "$cmd" || exit $?
++ $run eval "$cmd" || {
++ lt_exit=$?
++
++ # Restore the uninstalled library and exit
++ if test "$mode" = relink; then
++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++ fi
++
++ exit $lt_exit
++ }
+ done
+ IFS="$save_ifs"
+ fi
+@@ -4257,7 +6035,7 @@
+ *)
+ $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+@@ -4275,7 +6053,7 @@
+ $show "$install_prog $staticobj $staticdest"
+ $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ fi
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ *)
+@@ -4287,21 +6065,47 @@
+ destfile="$destdir/$destfile"
+ fi
+
++ # If the file is missing, and there is a .exe on the end, strip it
++ # because it is most likely a libtool script we actually want to
++ # install
++ stripped_ext=""
++ case $file in
++ *.exe)
++ if test ! -f "$file"; then
++ file=`$echo $file|${SED} 's,.exe$,,'`
++ stripped_ext=".exe"
++ fi
++ ;;
++ esac
++
+ # Do a test to see if this is really a libtool program.
+- if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++ case $host in
++ *cygwin*|*mingw*)
++ wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
++ ;;
++ *)
++ wrapper=$file
++ ;;
++ esac
++ if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
+ notinst_deplibs=
+ relink_command=
+
++ # Note that it is not necessary on cygwin/mingw to append a dot to
++ # foo even if both foo and FILE.exe exist: automatic-append-.exe
++ # behavior happens only for exec(3), not for open(2)! Also, sourcing
++ # `FILE.' does not work on cygwin managed mounts.
++ #
+ # If there is no directory component, then add one.
+- case $file in
+- */* | *\\*) . $file ;;
+- *) . ./$file ;;
++ case $wrapper in
++ */* | *\\*) . ${wrapper} ;;
++ *) . ./${wrapper} ;;
+ esac
+
+ # Check the variables that should have been set.
+ if test -z "$notinst_deplibs"; then
+- $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
+- exit 1
++ $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
++ exit $EXIT_FAILURE
+ fi
+
+ finalize=yes
+@@ -4323,24 +6127,22 @@
+ done
+
+ relink_command=
++ # Note that it is not necessary on cygwin/mingw to append a dot to
++ # foo even if both foo and FILE.exe exist: automatic-append-.exe
++ # behavior happens only for exec(3), not for open(2)! Also, sourcing
++ # `FILE.' does not work on cygwin managed mounts.
++ #
+ # If there is no directory component, then add one.
+- case $file in
+- */* | *\\*) . $file ;;
+- *) . ./$file ;;
++ case $wrapper in
++ */* | *\\*) . ${wrapper} ;;
++ *) . ./${wrapper} ;;
+ esac
+
+ outputname=
+ if test "$fast_install" = no && test -n "$relink_command"; then
+ if test "$finalize" = yes && test -z "$run"; then
+- tmpdir="/tmp"
+- test -n "$TMPDIR" && tmpdir="$TMPDIR"
+- tmpdir="$tmpdir/libtool-$$"
+- if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
+- else
+- $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+- continue
+- fi
+- file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++ tmpdir=`func_mktempdir`
++ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+ outputname="$tmpdir/$file"
+ # Replace the output file specification.
+ relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+@@ -4358,14 +6160,14 @@
+ fi
+ else
+ # Install the binary that we compiled earlier.
+- file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
++ file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+ fi
+ fi
+
+ # remove .exe since cygwin /usr/bin/install will append another
+- # one anyways
++ # one anyway
+ case $install_prog,$host in
+- /usr/bin/install*,*cygwin*)
++ */usr/bin/install*,*cygwin*)
+ case $file:$destfile in
+ *.exe:*.exe)
+ # this is ok
+@@ -4374,7 +6176,7 @@
+ destfile=$destfile.exe
+ ;;
+ *:*.exe)
+- destfile=`echo $destfile | sed -e 's,.exe$,,'`
++ destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
+ ;;
+ esac
+ ;;
+@@ -4395,16 +6197,17 @@
+ $show "$install_prog $file $oldlib"
+ $run eval "$install_prog \$file \$oldlib" || exit $?
+
+- if test -n "$stripme" && test -n "$striplib"; then
++ if test -n "$stripme" && test -n "$old_striplib"; then
+ $show "$old_striplib $oldlib"
+ $run eval "$old_striplib $oldlib" || exit $?
+ fi
+
+ # Do each command in the postinstall commands.
+- eval cmds=\"$old_postinstall_cmds\"
++ cmds=$old_postinstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -4418,9 +6221,9 @@
+ if test -n "$current_libdirs"; then
+ # Maybe just do a dry run.
+ test -n "$run" && current_libdirs=" -n$current_libdirs"
+- exec_cmd='$SHELL $0 --finish$current_libdirs'
++ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+ else
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+ ;;
+
+@@ -4439,10 +6242,11 @@
+ for libdir in $libdirs; do
+ if test -n "$finish_cmds"; then
+ # Do each command in the finish commands.
+- eval cmds=\"$finish_cmds\"
++ cmds=$finish_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || admincmds="$admincmds
+ $cmd"
+@@ -4459,43 +6263,43 @@
+ fi
+
+ # Exit here if they wanted silent mode.
+- test "$show" = ":" && exit 0
++ test "$show" = : && exit $EXIT_SUCCESS
+
+- echo "----------------------------------------------------------------------"
+- echo "Libraries have been installed in:"
++ $echo "X----------------------------------------------------------------------" | $Xsed
++ $echo "Libraries have been installed in:"
+ for libdir in $libdirs; do
+- echo " $libdir"
++ $echo " $libdir"
+ done
+- echo
+- echo "If you ever happen to want to link against installed libraries"
+- echo "in a given directory, LIBDIR, you must either use libtool, and"
+- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+- echo "flag during linking and do at least one of the following:"
++ $echo
++ $echo "If you ever happen to want to link against installed libraries"
++ $echo "in a given directory, LIBDIR, you must either use libtool, and"
++ $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
++ $echo "flag during linking and do at least one of the following:"
+ if test -n "$shlibpath_var"; then
+- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
+- echo " during execution"
++ $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
++ $echo " during execution"
+ fi
+ if test -n "$runpath_var"; then
+- echo " - add LIBDIR to the \`$runpath_var' environment variable"
+- echo " during linking"
++ $echo " - add LIBDIR to the \`$runpath_var' environment variable"
++ $echo " during linking"
+ fi
+ if test -n "$hardcode_libdir_flag_spec"; then
+ libdir=LIBDIR
+ eval flag=\"$hardcode_libdir_flag_spec\"
+
+- echo " - use the \`$flag' linker flag"
++ $echo " - use the \`$flag' linker flag"
+ fi
+ if test -n "$admincmds"; then
+- echo " - have your system administrator run these commands:$admincmds"
++ $echo " - have your system administrator run these commands:$admincmds"
+ fi
+ if test -f /etc/ld.so.conf; then
+- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
++ $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ fi
+- echo
+- echo "See any operating system documentation about shared libraries for"
+- echo "more information, such as the ld(1) and ld.so(8) manual pages."
+- echo "----------------------------------------------------------------------"
+- exit 0
++ $echo
++ $echo "See any operating system documentation about shared libraries for"
++ $echo "more information, such as the ld(1) and ld.so(8) manual pages."
++ $echo "X----------------------------------------------------------------------" | $Xsed
++ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool execute mode
+@@ -4507,7 +6311,7 @@
+ if test -z "$cmd"; then
+ $echo "$modename: you must specify a COMMAND" 1>&2
+ $echo "$help"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Handle -dlopen flags immediately.
+@@ -4515,18 +6319,18 @@
+ if test ! -f "$file"; then
+ $echo "$modename: \`$file' is not a file" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ dir=
+ case $file in
+ *.la)
+ # Check to see that this really is a libtool archive.
+- if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ else
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Read the libtool library.
+@@ -4553,7 +6357,7 @@
+ dir="$dir/$objdir"
+ else
+ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ ;;
+
+@@ -4593,7 +6397,7 @@
+ -*) ;;
+ *)
+ # Do a test to see if this is really a libtool program.
+- if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++ if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ # If there is no directory component, then add one.
+ case $file in
+ */* | *\\*) . $file ;;
+@@ -4616,7 +6420,7 @@
+ eval "export $shlibpath_var"
+ fi
+
+- # Restore saved enviroment variables
++ # Restore saved environment variables
+ if test "${save_LC_ALL+set}" = set; then
+ LC_ALL="$save_LC_ALL"; export LC_ALL
+ fi
+@@ -4625,7 +6429,7 @@
+ fi
+
+ # Now prepare to actually exec the command.
+- exec_cmd='"$cmd"$args'
++ exec_cmd="\$cmd$args"
+ else
+ # Display what would be done.
+ if test -n "$shlibpath_var"; then
+@@ -4633,7 +6437,7 @@
+ $echo "export $shlibpath_var"
+ fi
+ $echo "$cmd$args"
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+ ;;
+
+@@ -4661,24 +6465,25 @@
+ if test -z "$rm"; then
+ $echo "$modename: you must specify an RM program" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ rmdirs=
+
++ origobjdir="$objdir"
+ for file in $files; do
+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$dir" = "X$file"; then
+ dir=.
+- objdir="$objdir"
++ objdir="$origobjdir"
+ else
+- objdir="$dir/$objdir"
++ objdir="$dir/$origobjdir"
+ fi
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+- test $mode = uninstall && objdir="$dir"
++ test "$mode" = uninstall && objdir="$dir"
+
+ # Remember objdir for removal later, being careful to avoid duplicates
+- if test $mode = clean; then
++ if test "$mode" = clean; then
+ case " $rmdirs " in
+ *" $objdir "*) ;;
+ *) rmdirs="$rmdirs $objdir" ;;
+@@ -4702,7 +6507,7 @@
+ case $name in
+ *.la)
+ # Possibly a libtool archive, so verify it.
+- if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ . $dir/$name
+
+ # Delete the libtool libraries and symlinks.
+@@ -4710,18 +6515,27 @@
+ rmfiles="$rmfiles $objdir/$n"
+ done
+ test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+- test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+
+- if test $mode = uninstall; then
++ case "$mode" in
++ clean)
++ case " $library_names " in
++ # " " in the beginning catches empty $dlname
++ *" $dlname "*) ;;
++ *) rmfiles="$rmfiles $objdir/$dlname" ;;
++ esac
++ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
++ ;;
++ uninstall)
+ if test -n "$library_names"; then
+ # Do each command in the postuninstall commands.
+- eval cmds=\"$postuninstall_cmds\"
++ cmds=$postuninstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd"
+- if test $? != 0 && test "$rmforce" != yes; then
++ if test "$?" -ne 0 && test "$rmforce" != yes; then
+ exit_status=1
+ fi
+ done
+@@ -4730,40 +6544,72 @@
+
+ if test -n "$old_library"; then
+ # Do each command in the old_postuninstall commands.
+- eval cmds=\"$old_postuninstall_cmds\"
++ cmds=$old_postuninstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd"
+- if test $? != 0 && test "$rmforce" != yes; then
++ if test "$?" -ne 0 && test "$rmforce" != yes; then
+ exit_status=1
+ fi
+ done
+ IFS="$save_ifs"
+ fi
+ # FIXME: should reinstall the best remaining shared library.
+- fi
++ ;;
++ esac
+ fi
+ ;;
+
+ *.lo)
+- if test "$build_old_libs" = yes; then
+- oldobj=`$echo "X$name" | $Xsed -e "$lo2o"`
+- rmfiles="$rmfiles $dir/$oldobj"
++ # Possibly a libtool object, so verify it.
++ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++
++ # Read the .lo file
++ . $dir/$name
++
++ # Add PIC object to the list of files to remove.
++ if test -n "$pic_object" \
++ && test "$pic_object" != none; then
++ rmfiles="$rmfiles $dir/$pic_object"
++ fi
++
++ # Add non-PIC object to the list of files to remove.
++ if test -n "$non_pic_object" \
++ && test "$non_pic_object" != none; then
++ rmfiles="$rmfiles $dir/$non_pic_object"
++ fi
+ fi
+ ;;
+
+ *)
+- # Do a test to see if this is a libtool program.
+- if test $mode = clean &&
+- (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+- relink_command=
+- . $dir/$file
++ if test "$mode" = clean ; then
++ noexename=$name
++ case $file in
++ *.exe)
++ file=`$echo $file|${SED} 's,.exe$,,'`
++ noexename=`$echo $name|${SED} 's,.exe$,,'`
++ # $file with .exe has already been added to rmfiles,
++ # add $file without .exe
++ rmfiles="$rmfiles $file"
++ ;;
++ esac
++ # Do a test to see if this is a libtool program.
++ if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++ relink_command=
++ . $dir/$noexename
+
+- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+- if test "$fast_install" = yes && test -n "$relink_command"; then
+- rmfiles="$rmfiles $objdir/lt-$name"
++ # note $name still contains .exe if it was in $file originally
++ # as does the version of $file that was added into $rmfiles
++ rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
++ if test "$fast_install" = yes && test -n "$relink_command"; then
++ rmfiles="$rmfiles $objdir/lt-$name"
++ fi
++ if test "X$noexename" != "X$name" ; then
++ rmfiles="$rmfiles $objdir/lt-${noexename}.c"
++ fi
+ fi
+ fi
+ ;;
+@@ -4771,6 +6617,7 @@
+ $show "$rm $rmfiles"
+ $run $rm $rmfiles || exit_status=1
+ done
++ objdir="$origobjdir"
+
+ # Try to remove the ${objdir}s in the directories where we deleted files
+ for dir in $rmdirs; do
+@@ -4786,20 +6633,20 @@
+ "")
+ $echo "$modename: you must specify a MODE" 1>&2
+ $echo "$generic_help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ if test -z "$exec_cmd"; then
+ $echo "$modename: invalid operation mode \`$mode'" 1>&2
+ $echo "$generic_help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi # test -z "$show_help"
+
+ if test -n "$exec_cmd"; then
+ eval exec $exec_cmd
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # We need to display help for each of the modes.
+@@ -4818,6 +6665,7 @@
+ --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS]
+ --quiet same as \`--silent'
+ --silent don't print informational messages
++ --tag=TAG use configuration variables from tag TAG
+ --version print version information
+
+ MODE must be one of the following:
+@@ -4831,8 +6679,10 @@
+ uninstall remove libraries from an installed directory
+
+ MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for
+-a more detailed description of MODE."
+- exit 0
++a more detailed description of MODE.
++
++Report bugs to <bug-libtool at gnu.org>."
++ exit $EXIT_SUCCESS
+ ;;
+
+ clean)
+@@ -4943,6 +6793,9 @@
+ -no-install link a not-installable executable
+ -no-undefined declare that a library does not refer to external symbols
+ -o OUTPUT-FILE create OUTPUT-FILE from the specified objects
++ -objectlist FILE Use a list of object files found in FILE to specify objects
++ -precious-files-regex REGEX
++ don't remove output files matching REGEX
+ -release RELEASE specify package release information
+ -rpath LIBDIR the created library will eventually be installed in LIBDIR
+ -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
+@@ -4984,14 +6837,33 @@
+ *)
+ $echo "$modename: invalid operation mode \`$mode'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+-echo
++$echo
+ $echo "Try \`$modename --help' for more information about other modes."
+
+-exit 0
++exit $?
++
++# The TAGs below are defined such that we never get into a situation
++# in which we disable both kinds of libraries. Given conflicting
++# choices, we go for a static library, that is the most portable,
++# since we can't tell whether shared libraries were disabled because
++# the user asked for that or because the platform doesn't support
++# them. This is particularly important on AIX, because we don't
++# support having both static and shared libraries enabled at the same
++# time on that platform, so we default to a shared-only configuration.
++# If a disable-shared tag is given, we'll fallback to a static-only
++# configuration. But we'll never go from static-only to shared-only.
++
++# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
++disable_libs=shared
++# ### END LIBTOOL TAG CONFIG: disable-shared
++
++# ### BEGIN LIBTOOL TAG CONFIG: disable-static
++disable_libs=static
++# ### END LIBTOOL TAG CONFIG: disable-static
+
+ # Local Variables:
+ # mode:shell-script
Modified: packages/gpsdrive/trunk/debian/rules
===================================================================
--- packages/gpsdrive/trunk/debian/rules 2007-07-27 20:44:45 UTC (rev 986)
+++ packages/gpsdrive/trunk/debian/rules 2007-07-27 20:51:00 UTC (rev 987)
@@ -1,94 +1,84 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
export destdir = $(CURDIR)/debian/gpsdrive/usr
-configure: configure-stamp
-configure-stamp:
+config.status: patch configure
dh_testdir
- # Add here commands to configure the package.
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
- touch configure-stamp
+build: build-stamp
-build: configure-stamp build-stamp
-build-stamp:
+build-stamp: config.status
dh_testdir
-
- # Add here commands to compile the package.
$(MAKE)
- #/usr/bin/docbook-to-man debian/gpsdrive.sgml > gpsdrive.1
+ touch $@
- touch build-stamp
+clean: clean-patched unpatch
-clean:
+clean-patched:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
+ rm -f build-stamp
-$(MAKE) distclean
-
+ rm -f config.sub config.guess
dh_clean
+patch: patch-stamp
+
+patch-stamp:
+ dpatch apply-all
+ dpatch cat-all > patch-stamp
+
+unpatch:
+ dpatch deapply-all
+ rm -rf patch-stamp debian/patched
+
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
-
- # Add here commands to install the package into debian/gpsdrive.
$(MAKE) install prefix=$(destdir)
+ # Remove gpsd since debian has its own gpsd package
+ rm -f $(destdir)/bin/gpsd
+ # Strip language extensions
+ mv -f $(destdir)/bin/gpsfetchmap.pl $(destdir)/bin/gpsfetchmap
+ mv -f $(destdir)/bin/gpspoint2gpsdrive.pl $(destdir)/bin/gpspoint2gpsdrive
+ mv -f $(destdir)/bin/gpssql_backup.sh $(destdir)/bin/gpssql_backup
+ mv -f $(destdir)/bin/gpssql_restore.sh $(destdir)/bin/gpssql_restore
+ # Remove executable bit and strip shared libraries
+ chmod -x $(destdir)/lib/libfly.2.0.0
+ chmod -x $(destdir)/lib/libnautic.2.0.0
+ strip --remove-section=.comment --remove-section=.note --strip-unneeded $(destdir)/lib/libfly.2.0.0
+ strip --remove-section=.comment --remove-section=.note --strip-unneeded $(destdir)/lib/libnautic.2.0.0
- # replace non-free script with a wrapper
- cp $(CURDIR)/debian/gpsfetchmap $(destdir)/bin/
- chmod +x $(destdir)/bin/gpsfetchmap
-
- # Remove gpsd, since debian has an own gpsd package
- rm $(destdir)/bin/gpsd
- # add old manpages
- #cp -r $(CURDIR)/debian/man/ $(destdir)/share/
-
-
-# Build architecture-independent files here.
binary-indep: build install
-# We have nothing to do by default.
-# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
-# dh_installdebconf
dh_installdocs
-# dh_installexamples
-# dh_installmenu
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
dh_installman
-# dh_installinfo
-# dh_undocumented friendsd2.1 gpsfetchmap.1 wpcvt.1 wpget.1 gpsfetchmap.pl.1 gpspoint2gpsdrive.pl.1 mb2gpsdrive.pl.1 geocache2way.1 gpssql_backup.sh.1 gpssql_restore.sh.1
dh_installchangelogs ChangeLog
-# dh_link
dh_strip
dh_compress
dh_fixperms
dh_makeshlibs
dh_installdeb
-# dh_perl
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install
More information about the Pkg-grass-devel
mailing list