[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 @@
+