summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/applications/kasablanca
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-07-26 03:51:48 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-07-26 03:51:48 +0200
commit1f5633e4d813ba42e7253c68b2eaef32e8f722d5 (patch)
tree87b5f535c877ab2ae75620cdfae3b35080ec4fb4 /ubuntu/maverick/applications/kasablanca
parentfee752ab2accf52c3a6c77574b7d8271a806257f (diff)
downloadtde-packaging-1f5633e4d813ba42e7253c68b2eaef32e8f722d5.tar.gz
tde-packaging-1f5633e4d813ba42e7253c68b2eaef32e8f722d5.zip
Fix kasablanca packaging files for Debian and Ubuntu
Diffstat (limited to 'ubuntu/maverick/applications/kasablanca')
-rw-r--r--ubuntu/maverick/applications/kasablanca/debian/cdbs/buildvars.mk86
-rw-r--r--ubuntu/maverick/applications/kasablanca/debian/cdbs/debian-qt-kde.mk109
-rw-r--r--ubuntu/maverick/applications/kasablanca/debian/cdbs/kde.mk97
-rw-r--r--ubuntu/maverick/applications/kasablanca/debian/cdbs/uploaders.mk29
-rw-r--r--ubuntu/maverick/applications/kasablanca/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/maverick/applications/kasablanca/debian/changelog6
-rw-r--r--ubuntu/maverick/applications/kasablanca/debian/control2
-rw-r--r--ubuntu/maverick/applications/kasablanca/debian/kasablanca.xml10
-rw-r--r--ubuntu/maverick/applications/kasablanca/debian/manpages1
-rw-r--r--ubuntu/maverick/applications/kasablanca/debian/menu6
-rw-r--r--ubuntu/maverick/applications/kasablanca/debian/patches/02_autotools_update.diff1985
-rw-r--r--ubuntu/maverick/applications/kasablanca/debian/patches/03_libtool_update.diff7543
-rw-r--r--ubuntu/maverick/applications/kasablanca/debian/patches/05_pedantic-errors.diff12
-rw-r--r--ubuntu/maverick/applications/kasablanca/debian/patches/10_desktop_file_update.diff146
-rwxr-xr-xubuntu/maverick/applications/kasablanca/debian/rules36
-rw-r--r--ubuntu/maverick/applications/kasablanca/debian/source.lintian-overrides2
-rw-r--r--ubuntu/maverick/applications/kasablanca/debian/source/format1
-rw-r--r--ubuntu/maverick/applications/kasablanca/debian/source/options6
18 files changed, 388 insertions, 9708 deletions
diff --git a/ubuntu/maverick/applications/kasablanca/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/kasablanca/debian/cdbs/buildvars.mk
new file mode 100644
index 000000000..23d4709dc
--- /dev/null
+++ b/ubuntu/maverick/applications/kasablanca/debian/cdbs/buildvars.mk
@@ -0,0 +1,86 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: Defines some useful variables, but no rules
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_buildvars
+_cdbs_rules_buildvars = 1
+
+CDBS_VERSION = something
+
+# Common useful variables
+DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
+
+# Split into arch/indep packages
+ifneq ($(DEB_INDEP_PACKAGES),cdbs)
+DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
+DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
+endif
+# Split into normal and udeb packages
+ifeq ($(DEB_UDEB_PACKAGES),)
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+else
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+endif
+# Too much bother for now. If someone complains we'll fix it.
+#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
+#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
+# A handy list of every package, udeb or not
+DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
+DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
+DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
+
+DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+
+# Some support for srcdir != builddir builds.
+# These are relative to the root of the package
+DEB_SRCDIR ?= .
+DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
+
+# Miscellaneous bits
+DEB_ARCH = $(shell dpkg --print-architecture)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+ifeq ($(words $(DEB_ALL_PACKAGES)),1)
+ DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
+else
+ DEB_DESTDIR = $(CURDIR)/debian/tmp/
+endif
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
+
+endif
diff --git a/ubuntu/maverick/applications/kasablanca/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kasablanca/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..ba002080b
--- /dev/null
+++ b/ubuntu/maverick/applications/kasablanca/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,109 @@
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+ cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+ touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+#include debian/cdbs/uploaders.mk
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+ ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+ else
+ cdbs_kde_enable_final =
+ endif
+endif
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+ if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+ for f in $$(find debian/man -name '*.sgml'); do \
+ docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+ done
+ for f in $$(find debian/man -name '*.man'); do \
+ soelim -I debian/man $$f \
+ > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+ done
+ touch debian/stamp-man-pages
+
+common-binary-indep::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_INDEP_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+
+common-binary-arch::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_ARCH_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+
+clean::
+ rm -rf debian/man/out
+ -rmdir debian/man
+ rm -f debian/stamp-man-pages
+ rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+ if test -e debian/$(cdbs_curpkg).lintian; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+ debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+ fi
+ if test -e debian/$(cdbs_curpkg).presubj; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+ fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+ set -e; \
+ for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+ pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+ echo Building $$pkg HTML docs...; \
+ mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+ done
+ for pkg in $(DOC_HTML_PRUNE) ; do \
+ rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ done
+
+clean::
+ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
+ rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/maverick/applications/kasablanca/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kasablanca/debian/cdbs/kde.mk
new file mode 100644
index 000000000..765560c89
--- /dev/null
+++ b/ubuntu/maverick/applications/kasablanca/debian/cdbs/kde.mk
@@ -0,0 +1,97 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Description: A class for KDE packages; sets KDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_class_kde
+_cdbs_class_kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final =
+ cdbs_kde_enable_debug = --enable-debug=yes
+else
+ cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+
+cleanbuilddir::
+ -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+ touch $@
+
+common-install-prehook-impl::
+ mkdir -p po
+ -XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages
+ -for file in po/*pot; do \
+ sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+ done
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+ rm -f debian/stamp-kde-apidox
+ rm -rf po/*.pot
+
+# This is a convenience target for calling manually. It's not part of
+# the build process.
+buildprep: clean apply-patches
+ $(MAKE) -f admin/Makefile.common dist
+ debian/rules clean
+
+endif
diff --git a/ubuntu/maverick/applications/kasablanca/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/kasablanca/debian/cdbs/uploaders.mk
new file mode 100644
index 000000000..31adfe31e
--- /dev/null
+++ b/ubuntu/maverick/applications/kasablanca/debian/cdbs/uploaders.mk
@@ -0,0 +1,29 @@
+
+MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
+
+
+debian/control.tmp:
+ @if [ ! -e debian/control.in ] ; then \
+ echo "this package is not yet prepared for using automatic update of uploaders"; \
+ echo "Please do so."; \
+ exit 1; \
+ fi
+ @sed 's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in > debian/control.tmp
+
+check-uploaders: debian/control.tmp
+ @if ! diff -q debian/control debian/control.tmp ; then \
+ echo "WARNING:: Control file differs from manually generated one" ; \
+ echo "WARNING:: Please update it manually and check it afterwards" ; \
+ echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
+ echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
+ fi
+
+
+clean::
+ rm -f debian/control.tmp
+
+update-uploaders: debian/control.tmp
+ @mv -f debian/control.tmp debian/control
+
+makebuilddir:: check-uploaders
diff --git a/ubuntu/maverick/applications/kasablanca/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kasablanca/debian/cdbs/versions.pl
new file mode 100644
index 000000000..75c9add4b
--- /dev/null
+++ b/ubuntu/maverick/applications/kasablanca/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/maverick/applications/kasablanca/debian/changelog b/ubuntu/maverick/applications/kasablanca/debian/changelog
index 4b0e11509..22010973d 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/changelog
+++ b/ubuntu/maverick/applications/kasablanca/debian/changelog
@@ -1,3 +1,9 @@
+kasablanca-trinity (0.4.0.2-2ubuntu1) feisty; urgency=low
+
+ * Initial Release for TDE
+
+ -- Slávek Banko <slavek.banko@axis.cz> Fri, 26 Jul 2013 03:25:28 +0200
+
kasablanca (0.4.0.2-2ubuntu1) feisty; urgency=low
* Fake sync.
diff --git a/ubuntu/maverick/applications/kasablanca/debian/control b/ubuntu/maverick/applications/kasablanca/debian/control
index cbab18286..a21aa57bd 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/control
+++ b/ubuntu/maverick/applications/kasablanca/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: Debian TDE Extras Team <pkg-tde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), automake, tdelibs4-trinity-dev, docbook2x
+Build-Depends: cdbs, debhelper (>= 5), automake, libtool, tdelibs4-trinity-dev, docbook2x, docbook-xml
Standards-Version: 3.8.3
Package: kasablanca-trinity
diff --git a/ubuntu/maverick/applications/kasablanca/debian/kasablanca.xml b/ubuntu/maverick/applications/kasablanca/debian/kasablanca.xml
index 8a344a0a7..5f142fd2b 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/kasablanca.xml
+++ b/ubuntu/maverick/applications/kasablanca/debian/kasablanca.xml
@@ -37,7 +37,7 @@
<refnamediv>
<refname>&dhpackage;</refname>
- <refpurpose>fast and free ftp client for KDE</refpurpose>
+ <refpurpose>fast and free ftp client for TDE</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
@@ -50,7 +50,7 @@
<refsect1>
<title>DESCRIPTION</title>
- <para><command>&dhpackage;</command> is an ftp client, written in c++, using the kde libraries.</para>
+ <para><command>&dhpackage;</command> is an ftp client, written in c++, using the tde libraries.</para>
<para>Features:
<simplelist>
@@ -68,7 +68,7 @@
<refsect1>
<title>OPTIONS</title>
- <para>All KDE and Qt programs accept some common command-line options.
+ <para>All TDE and Qt programs accept some common command-line options.
<command>&dhpackage;</command> has no application-specific options.</para>
<variablelist>
@@ -90,10 +90,10 @@
</varlistentry>
<varlistentry>
<term>
- <option>--help-kde</option>
+ <option>--help-tde</option>
</term>
<listitem>
- <para>Show KDE specific options</para>
+ <para>Show TDE specific options</para>
</listitem>
</varlistentry>
<varlistentry>
diff --git a/ubuntu/maverick/applications/kasablanca/debian/manpages b/ubuntu/maverick/applications/kasablanca/debian/manpages
new file mode 100644
index 000000000..8ae2d25f3
--- /dev/null
+++ b/ubuntu/maverick/applications/kasablanca/debian/manpages
@@ -0,0 +1 @@
+kasablanca.1
diff --git a/ubuntu/maverick/applications/kasablanca/debian/menu b/ubuntu/maverick/applications/kasablanca/debian/menu
index e61a25f58..2b2588878 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/menu
+++ b/ubuntu/maverick/applications/kasablanca/debian/menu
@@ -1,7 +1,7 @@
-?package(kasablanca):\
+?package(kasablanca-trinity):\
needs="X11" \
- hints="KDE" \
+ hints="TDE" \
section="Apps/Net"\
title="kasablanca" \
longtitle="kasablanca - ftp client" \
- command="/usr/bin/kasablanca"
+ command="/opt/trinity/bin/kasablanca"
diff --git a/ubuntu/maverick/applications/kasablanca/debian/patches/02_autotools_update.diff b/ubuntu/maverick/applications/kasablanca/debian/patches/02_autotools_update.diff
deleted file mode 100644
index 51818ca9c..000000000
--- a/ubuntu/maverick/applications/kasablanca/debian/patches/02_autotools_update.diff
+++ /dev/null
@@ -1,1985 +0,0 @@
-diff -Nrua a/admin/compile b/admin/compile
---- a/admin/compile 2004-03-22 19:59:16.000000000 +0100
-+++ b/admin/compile 2006-03-21 19:11:17.000000000 +0100
-@@ -1,8 +1,9 @@
- #! /bin/sh
--
- # Wrapper for compilers which do not understand `-c -o'.
-
--# Copyright 1999, 2000 Free Software Foundation, Inc.
-+scriptversion=2005-05-14.22
-+
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
- # Written by Tom Tromey <tromey@cygnus.com>.
- #
- # This program is free software; you can redistribute it and/or modify
-@@ -17,83 +18,125 @@
- #
- # 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.
-
--# Usage:
--# compile PROGRAM [ARGS]...
--# `-o FOO.o' is removed from the args passed to the actual compile.
--
--prog=$1
--shift
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake@gnu.org> or send patches to
-+# <automake-patches@gnu.org>.
-+
-+case $1 in
-+ '')
-+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
-+ exit 1;
-+ ;;
-+ -h | --h*)
-+ cat <<\EOF
-+Usage: compile [--help] [--version] PROGRAM [ARGS]
-+
-+Wrapper for compilers which do not understand `-c -o'.
-+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-+arguments, and rename the output as expected.
-+
-+If you are trying to build a whole package this is not the
-+right script to run: please start by reading the file `INSTALL'.
-+
-+Report bugs to <bug-automake@gnu.org>.
-+EOF
-+ exit $?
-+ ;;
-+ -v | --v*)
-+ echo "compile $scriptversion"
-+ exit $?
-+ ;;
-+esac
-
- ofile=
- cfile=
--args=
--while test $# -gt 0; do
-- case "$1" in
-- -o)
-- # configure might choose to run compile as `compile cc -o foo foo.c'.
-- # So we do something ugly here.
-- ofile=$2
-- shift
-- case "$ofile" in
-- *.o | *.obj)
-- ;;
-- *)
-- args="$args -o $ofile"
-- ofile=
-- ;;
-- esac
-- ;;
-- *.c)
-- cfile=$1
-- args="$args $1"
-- ;;
-- *)
-- args="$args $1"
-- ;;
-- esac
-- shift
-+eat=
-+
-+for arg
-+do
-+ if test -n "$eat"; then
-+ eat=
-+ else
-+ case $1 in
-+ -o)
-+ # configure might choose to run compile as `compile cc -o foo foo.c'.
-+ # So we strip `-o arg' only if arg is an object.
-+ eat=1
-+ case $2 in
-+ *.o | *.obj)
-+ ofile=$2
-+ ;;
-+ *)
-+ set x "$@" -o "$2"
-+ shift
-+ ;;
-+ esac
-+ ;;
-+ *.c)
-+ cfile=$1
-+ set x "$@" "$1"
-+ shift
-+ ;;
-+ *)
-+ set x "$@" "$1"
-+ shift
-+ ;;
-+ esac
-+ fi
-+ shift
- done
-
- if test -z "$ofile" || test -z "$cfile"; then
-- # If no `-o' option was seen then we might have been invoked from a
-- # pattern rule where we don't need one. That is ok -- this is a
-- # normal compilation that the losing compiler can handle. If no
-- # `.c' file was seen then we are probably linking. That is also
-- # ok.
-- exec "$prog" $args
-+ # If no `-o' option was seen then we might have been invoked from a
-+ # pattern rule where we don't need one. That is ok -- this is a
-+ # normal compilation that the losing compiler can handle. If no
-+ # `.c' file was seen then we are probably linking. That is also
-+ # ok.
-+ exec "$@"
- fi
-
- # Name of file we expect compiler to create.
--cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
- # Create the lock directory.
- # Note: use `[/.-]' here to ensure that we don't use the same name
- # that we are using for the .o file. Also, base the name on the expected
- # object file name, since that is what matters with a parallel build.
--lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
-+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
- while true; do
-- if mkdir $lockdir > /dev/null 2>&1; then
-- break
-- fi
-- sleep 1
-+ if mkdir "$lockdir" >/dev/null 2>&1; then
-+ break
-+ fi
-+ sleep 1
- done
- # FIXME: race condition here if user kills between mkdir and trap.
--trap "rmdir $lockdir; exit 1" 1 2 15
-+trap "rmdir '$lockdir'; exit 1" 1 2 15
-
- # Run the compile.
--"$prog" $args
--status=$?
-+"$@"
-+ret=$?
-
- if test -f "$cofile"; then
-- mv "$cofile" "$ofile"
-+ mv "$cofile" "$ofile"
-+elif test -f "${cofile}bj"; then
-+ mv "${cofile}bj" "$ofile"
- fi
-
--rmdir $lockdir
--exit $status
-+rmdir "$lockdir"
-+exit $ret
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
-diff -Nrua a/admin/depcomp b/admin/depcomp
---- a/admin/depcomp 2004-03-22 19:59:17.000000000 +0100
-+++ b/admin/depcomp 2006-03-21 19:11:17.000000000 +0100
-@@ -1,7 +1,9 @@
- #! /bin/sh
--
- # depcomp - compile a program generating dependencies as side-effects
--# Copyright 1999, 2000 Free Software Foundation, Inc.
-+
-+scriptversion=2005-07-09.11
-+
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -15,8 +17,8 @@
-
- # 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
-@@ -25,13 +27,45 @@
-
- # Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-+case $1 in
-+ '')
-+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
-+ exit 1;
-+ ;;
-+ -h | --h*)
-+ cat <<\EOF
-+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-+
-+Run PROGRAMS ARGS to compile a file, generating dependencies
-+as side-effects.
-+
-+Environment variables:
-+ depmode Dependency tracking mode.
-+ source Source file read by `PROGRAMS ARGS'.
-+ object Object file output by `PROGRAMS ARGS'.
-+ DEPDIR directory where to store dependencies.
-+ depfile Dependency file to output.
-+ tmpdepfile Temporary file to use when outputing dependencies.
-+ libtool Whether libtool is used (yes/no).
-+
-+Report bugs to <bug-automake@gnu.org>.
-+EOF
-+ exit $?
-+ ;;
-+ -v | --v*)
-+ echo "depcomp $scriptversion"
-+ exit $?
-+ ;;
-+esac
-+
- if test -z "$depmode" || test -z "$source" || test -z "$object"; then
- echo "depcomp: Variables source, object and depmode must be set" 1>&2
- exit 1
- fi
--# `libtool' can also be set to `yes' or `no'.
-
--depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
-+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-+depfile=${depfile-`echo "$object" |
-+ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
- tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
- rm -f "$tmpdepfile"
-@@ -163,19 +197,25 @@
-
- aix)
- # The C for AIX Compiler uses -M and outputs the dependencies
-- # in a .u file. This file always lives in the current directory.
-- # Also, the AIX compiler puts `$object:' at the start of each line;
-- # $object doesn't have directory information.
-- stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
-+ # in a .u file. In older versions, this file always lives in the
-+ # current directory. Also, the AIX compiler puts `$object:' at the
-+ # start of each line; $object doesn't have directory information.
-+ # Version 6 uses the directory in both cases.
-+ stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
- tmpdepfile="$stripped.u"
-- outname="$stripped.o"
- if test "$libtool" = yes; then
- "$@" -Wc,-M
- else
- "$@" -M
- fi
--
- stat=$?
-+
-+ if test -f "$tmpdepfile"; then :
-+ else
-+ stripped=`echo "$stripped" | sed 's,^.*/,,'`
-+ tmpdepfile="$stripped.u"
-+ fi
-+
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
-@@ -183,6 +223,7 @@
- fi
-
- if test -f "$tmpdepfile"; then
-+ outname="$stripped.o"
- # Each line is of the form `foo.o: dependent.h'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
-@@ -198,11 +239,9 @@
- ;;
-
- icc)
-- # Must come before tru64.
--
-- # Intel's C compiler understands `-MD -MF file'. However
-+ # Intel's C compiler understands `-MD -MF file'. However on
- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-- # will fill foo.d with something like
-+ # ICC 7.0 will fill foo.d with something like
- # foo.o: sub/foo.c
- # foo.o: sub/foo.h
- # which is wrong. We want:
-@@ -210,6 +249,12 @@
- # sub/foo.o: sub/foo.h
- # sub/foo.c:
- # sub/foo.h:
-+ # ICC 7.1 will output
-+ # foo.o: sub/foo.c sub/foo.h
-+ # and will wrap long lines using \ :
-+ # foo.o: sub/foo.c ... \
-+ # sub/foo.h ... \
-+ # ...
-
- "$@" -MD -MF "$tmpdepfile"
- stat=$?
-@@ -219,45 +264,70 @@
- exit $stat
- fi
- rm -f "$depfile"
-- # Each line is of the form `foo.o: dependent.h'.
-+ # Each line is of the form `foo.o: dependent.h',
-+ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
-- sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-- sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-+ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-+ # Some versions of the HPUX 10.20 sed can't process this invocation
-+ # correctly. Breaking it into two sed invocations is a workaround.
-+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-+ sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
- tru64)
-- # The Tru64 AIX compiler uses -MD to generate dependencies as a side
-+ # The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
- # dependencies in `foo.d' instead, so we check for that too.
- # Subdirectories are respected.
-+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+ test "x$dir" = "x$object" && dir=
-+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-- tmpdepfile1="$object.d"
-- tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'`
- if test "$libtool" = yes; then
-+ # With Tru64 cc, shared objects can also be used to make a
-+ # static library. This mecanism is used in libtool 1.4 series to
-+ # handle both shared and static libraries in a single compilation.
-+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-+ #
-+ # With libtool 1.5 this exception was removed, and libtool now
-+ # generates 2 separate objects for the 2 libraries. These two
-+ # compilations output dependencies in in $dir.libs/$base.o.d and
-+ # in $dir$base.o.d. We have to check for both files, because
-+ # one of the two compilations can be disabled. We should prefer
-+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-+ # automatically cleaned when .libs/ is deleted, while ignoring
-+ # the former would cause a distcleancheck panic.
-+ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
-+ tmpdepfile2=$dir$base.o.d # libtool 1.5
-+ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
-+ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
- "$@" -Wc,-MD
- else
-+ tmpdepfile1=$dir$base.o.d
-+ tmpdepfile2=$dir$base.d
-+ tmpdepfile3=$dir$base.d
-+ tmpdepfile4=$dir$base.d
- "$@" -MD
- fi
-
- stat=$?
- if test $stat -eq 0; then :
- else
-- rm -f "$tmpdepfile1" "$tmpdepfile2"
-+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- exit $stat
- fi
-
-- if test -f "$tmpdepfile1"; then
-- tmpdepfile="$tmpdepfile1"
-- else
-- tmpdepfile="$tmpdepfile2"
-- fi
-+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+ do
-+ test -f "$tmpdepfile" && break
-+ done
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-- # That's a space and a tab in the [].
-- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-+ # That's a tab and a space in the [].
-+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
-@@ -270,34 +340,42 @@
-
- dashmstdout)
- # Important note: in order to support this mode, a compiler *must*
-- # always write the proprocessed file to stdout, regardless of -o,
-- # because we must use -o when running libtool.
-- test -z "$dashmflag" && dashmflag=-M
-- ( IFS=" "
-- case " $* " in
-- *" --mode=compile "*) # this is libtool, let us make it quiet
-- for arg
-- do # cycle over the arguments
-- case "$arg" in
-- "--mode=compile")
-- # insert --quiet before "--mode=compile"
-- set fnord "$@" --quiet
-- shift # fnord
-- ;;
-- esac
-- set fnord "$@" "$arg"
-- shift # fnord
-- shift # "$arg"
-- done
-+ # always write the preprocessed file to stdout, regardless of -o.
-+ "$@" || exit $?
-+
-+ # Remove the call to Libtool.
-+ if test "$libtool" = yes; then
-+ while test $1 != '--mode=compile'; do
-+ shift
-+ done
-+ shift
-+ fi
-+
-+ # Remove `-o $object'.
-+ IFS=" "
-+ for arg
-+ do
-+ case $arg in
-+ -o)
-+ shift
-+ ;;
-+ $object)
-+ shift
-+ ;;
-+ *)
-+ set fnord "$@" "$arg"
-+ shift # fnord
-+ shift # $arg
- ;;
- esac
-- "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
-- ) &
-- proc=$!
-- "$@"
-- stat=$?
-- wait "$proc"
-- if test "$stat" != 0; then exit $stat; fi
-+ done
-+
-+ test -z "$dashmflag" && dashmflag=-M
-+ # Require at least two characters before searching for `:'
-+ # in the target name. This is to cope with DOS-style filenames:
-+ # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-+ "$@" $dashmflag |
-+ sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
- rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
- tr ' ' '
-@@ -315,36 +393,40 @@
- ;;
-
- makedepend)
-- # X makedepend
-- (
-- shift
-- cleared=no
-- for arg in "$@"; do
-- case $cleared in no)
-- set ""; shift
-- cleared=yes
-- esac
-- case "$arg" in
-- -D*|-I*)
-- set fnord "$@" "$arg"; shift;;
-- -*)
-- ;;
-- *)
-- set fnord "$@" "$arg"; shift;;
-- esac
-+ "$@" || exit $?
-+ # Remove any Libtool call
-+ if test "$libtool" = yes; then
-+ while test $1 != '--mode=compile'; do
-+ shift
- done
-- obj_suffix="`echo $object | sed 's/^.*\././'`"
-- touch "$tmpdepfile"
-- ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
-- ) &
-- proc=$!
-- "$@"
-- stat=$?
-- wait "$proc"
-- if test "$stat" != 0; then exit $stat; fi
-+ shift
-+ fi
-+ # X makedepend
-+ shift
-+ cleared=no
-+ for arg in "$@"; do
-+ case $cleared in
-+ no)
-+ set ""; shift
-+ cleared=yes ;;
-+ esac
-+ case "$arg" in
-+ -D*|-I*)
-+ set fnord "$@" "$arg"; shift ;;
-+ # Strip any option that makedepend may not understand. Remove
-+ # the object too, otherwise makedepend will parse it as a source file.
-+ -*|$object)
-+ ;;
-+ *)
-+ set fnord "$@" "$arg"; shift ;;
-+ esac
-+ done
-+ obj_suffix="`echo $object | sed 's/^.*\././'`"
-+ touch "$tmpdepfile"
-+ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
- rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
-- tail +3 "$tmpdepfile" | tr ' ' '
-+ sed '1,2d' "$tmpdepfile" | tr ' ' '
- ' | \
- ## Some versions of the HPUX 10.20 sed can't process this invocation
- ## correctly. Breaking it into two sed invocations is a workaround.
-@@ -354,35 +436,40 @@
-
- cpp)
- # Important note: in order to support this mode, a compiler *must*
-- # always write the proprocessed file to stdout, regardless of -o,
-- # because we must use -o when running libtool.
-- ( IFS=" "
-- case " $* " in
-- *" --mode=compile "*)
-- for arg
-- do # cycle over the arguments
-- case $arg in
-- "--mode=compile")
-- # insert --quiet before "--mode=compile"
-- set fnord "$@" --quiet
-- shift # fnord
-- ;;
-- esac
-- set fnord "$@" "$arg"
-- shift # fnord
-- shift # "$arg"
-- done
-+ # always write the preprocessed file to stdout.
-+ "$@" || exit $?
-+
-+ # Remove the call to Libtool.
-+ if test "$libtool" = yes; then
-+ while test $1 != '--mode=compile'; do
-+ shift
-+ done
-+ shift
-+ fi
-+
-+ # Remove `-o $object'.
-+ IFS=" "
-+ for arg
-+ do
-+ case $arg in
-+ -o)
-+ shift
-+ ;;
-+ $object)
-+ shift
-+ ;;
-+ *)
-+ set fnord "$@" "$arg"
-+ shift # fnord
-+ shift # $arg
- ;;
- esac
-- "$@" -E |
-- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-+ done
-+
-+ "$@" -E |
-+ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-+ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
- sed '$ s: \\$::' > "$tmpdepfile"
-- ) &
-- proc=$!
-- "$@"
-- stat=$?
-- wait "$proc"
-- if test "$stat" != 0; then exit $stat; fi
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- cat < "$tmpdepfile" >> "$depfile"
-@@ -392,34 +479,27 @@
-
- msvisualcpp)
- # Important note: in order to support this mode, a compiler *must*
-- # always write the proprocessed file to stdout, regardless of -o,
-+ # always write the preprocessed file to stdout, regardless of -o,
- # because we must use -o when running libtool.
-- ( IFS=" "
-- case " $* " in
-- *" --mode=compile "*)
-- for arg
-- do # cycle over the arguments
-- case $arg in
-- "--mode=compile")
-- # insert --quiet before "--mode=compile"
-- set fnord "$@" --quiet
-- shift # fnord
-- ;;
-- esac
-+ "$@" || exit $?
-+ IFS=" "
-+ for arg
-+ do
-+ case "$arg" in
-+ "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-+ set fnord "$@"
-+ shift
-+ shift
-+ ;;
-+ *)
- set fnord "$@" "$arg"
-- shift # fnord
-- shift # "$arg"
-- done
-- ;;
-+ shift
-+ shift
-+ ;;
- esac
-- "$@" -E |
-- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-- ) &
-- proc=$!
-- "$@"
-- stat=$?
-- wait "$proc"
-- if test "$stat" != 0; then exit $stat; fi
-+ done
-+ "$@" -E |
-+ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
-@@ -439,3 +519,12 @@
- esac
-
- exit 0
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
-diff -Nrua a/admin/install-sh b/admin/install-sh
---- a/admin/install-sh 2004-05-19 04:10:18.000000000 +0200
-+++ b/admin/install-sh 2006-03-21 19:11:17.000000000 +0100
-@@ -1,19 +1,38 @@
- #!/bin/sh
--#
- # install - install a program, script, or datafile
--# This comes from X11R5 (mit/util/scripts/install.sh).
-+
-+scriptversion=2005-05-14.22
-+
-+# This originates from X11R5 (mit/util/scripts/install.sh), which was
-+# later released in X11R6 (xc/config/util/install.sh) with the
-+# following copyright and license.
-+#
-+# Copyright (C) 1994 X Consortium
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a copy
-+# of this software and associated documentation files (the "Software"), to
-+# deal in the Software without restriction, including without limitation the
-+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-+# sell copies of the Software, and to permit persons to whom the Software is
-+# furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice shall be included in
-+# all copies or substantial portions of the Software.
- #
--# Copyright 1991 by the Massachusetts Institute of Technology
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- #
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation, and that the name of M.I.T. not be used in advertising or
--# publicity pertaining to distribution of the software without specific,
--# written prior permission. M.I.T. makes no representations about the
--# suitability of this software for any purpose. It is provided "as is"
--# without express or implied warranty.
-+# Except as contained in this notice, the name of the X Consortium shall not
-+# be used in advertising or otherwise to promote the sale, use or other deal-
-+# ings in this Software without prior written authorization from the X Consor-
-+# tium.
-+#
-+#
-+# FSF changes to this file are in the public domain.
- #
- # Calling this script install-sh is preferred over install.sh, to prevent
- # `make' implicit rules from creating a file called install from it
-@@ -23,13 +42,11 @@
- # from scratch. It can only install one file at a time, a restriction
- # shared with many OS's install programs.
-
--
- # set DOITPROG to echo to test this script
-
- # Don't use :- since 4.3BSD and earlier shells don't like it.
- doit="${DOITPROG-}"
-
--
- # put in absolute paths if you don't have them in your path; or use env. vars.
-
- mvprog="${MVPROG-mv}"
-@@ -41,236 +58,266 @@
- rmprog="${RMPROG-rm}"
- mkdirprog="${MKDIRPROG-mkdir}"
-
--transformbasename=""
--transform_arg=""
--instcmd="$mvprog"
- chmodcmd="$chmodprog 0755"
--chowncmd=""
--chgrpcmd=""
--stripcmd=""
-+chowncmd=
-+chgrpcmd=
-+stripcmd=
- rmcmd="$rmprog -f"
- mvcmd="$mvprog"
--src=""
--dst=""
--dir_arg=""
--
--while [ x"$1" != x ]; do
-- case $1 in
-- -c) instcmd=$cpprog
-- shift
-- continue;;
--
-- -d) dir_arg=true
-- shift
-- continue;;
--
-- -m) chmodcmd="$chmodprog $2"
-- shift
-- shift
-- continue;;
--
-- -o) chowncmd="$chownprog $2"
-- shift
-- shift
-- continue;;
--
-- -g) chgrpcmd="$chgrpprog $2"
-- shift
-- shift
-- continue;;
--
-- -s) stripcmd=$stripprog
-- shift
-- continue;;
--
-- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
-- shift
-- continue;;
--
-- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-- shift
-- continue;;
--
-- *) if [ x"$src" = x ]
-- then
-- src=$1
-- else
-- # this colon is to work around a 386BSD /bin/sh bug
-- :
-- dst=$1
-- fi
-- shift
-- continue;;
-- esac
--done
-+src=
-+dst=
-+dir_arg=
-+dstarg=
-+no_target_directory=
-+
-+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-+ or: $0 [OPTION]... SRCFILES... DIRECTORY
-+ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-+ or: $0 [OPTION]... -d DIRECTORIES...
-+
-+In the 1st form, copy SRCFILE to DSTFILE.
-+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-+In the 4th, create DIRECTORIES.
-+
-+Options:
-+-c (ignored)
-+-d create directories instead of installing files.
-+-g GROUP $chgrpprog installed files to GROUP.
-+-m MODE $chmodprog installed files to MODE.
-+-o USER $chownprog installed files to USER.
-+-s $stripprog installed files.
-+-t DIRECTORY install into DIRECTORY.
-+-T report an error if DSTFILE is a directory.
-+--help display this help and exit.
-+--version display version info and exit.
-+
-+Environment variables override the default commands:
-+ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-+"
-+
-+while test -n "$1"; do
-+ case $1 in
-+ -c) shift
-+ continue;;
-+
-+ -d) dir_arg=true
-+ shift
-+ continue;;
-+
-+ -g) chgrpcmd="$chgrpprog $2"
-+ shift
-+ shift
-+ continue;;
-+
-+ --help) echo "$usage"; exit $?;;
-+
-+ -m) chmodcmd="$chmodprog $2"
-+ shift
-+ shift
-+ continue;;
-+
-+ -o) chowncmd="$chownprog $2"
-+ shift
-+ shift
-+ continue;;
-+
-+ -s) stripcmd=$stripprog
-+ shift
-+ continue;;
-
--if [ x"$src" = x ]
--then
-- echo "$0: no input file specified" >&2
-- exit 1
--else
-- :
--fi
--
--if [ x"$dir_arg" != x ]; then
-- dst=$src
-- src=""
--
-- if [ -d "$dst" ]; then
-- instcmd=:
-- chmodcmd=""
-- else
-- instcmd=$mkdirprog
-- fi
--else
--
--# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
--# might cause directories to be created, which would be especially bad
--# if $src (and thus $dsttmp) contains '*'.
--
-- if [ -f "$src" ] || [ -d "$src" ]
-- then
-- :
-- else
-- echo "$0: $src does not exist" >&2
-- exit 1
-- fi
--
-- if [ x"$dst" = x ]
-- then
-- echo "$0: no destination specified" >&2
-- exit 1
-- else
-- :
-- fi
--
--# If destination is a directory, append the input filename; if your system
--# does not like double slashes in filenames, you may need to add some logic
--
-- if [ -d "$dst" ]
-- then
-- dst=$dst/`basename "$src"`
-- else
-- :
-- fi
--fi
--
--## this sed command emulates the dirname command
--dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
--
--# Make sure that the destination directory exists.
--# this part is taken from Noah Friedman's mkinstalldirs script
--
--# Skip lots of stat calls in the usual case.
--if [ ! -d "$dstdir" ]; then
--defaultIFS='
-- '
--IFS="${IFS-$defaultIFS}"
--
--oIFS=$IFS
--# Some sh's can't handle IFS=/ for some reason.
--IFS='%'
--set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
--IFS=$oIFS
--
--pathcomp=''
-+ -t) dstarg=$2
-+ shift
-+ shift
-+ continue;;
-
--while [ $# -ne 0 ] ; do
-- pathcomp=$pathcomp$1
-+ -T) no_target_directory=true
- shift
-+ continue;;
-
-- if [ ! -d "$pathcomp" ] ;
-- then
-- $mkdirprog "$pathcomp"
-- else
-- :
-- fi
-+ --version) echo "$0 $scriptversion"; exit $?;;
-
-- pathcomp=$pathcomp/
-+ *) # When -d is used, all remaining arguments are directories to create.
-+ # When -t is used, the destination is already specified.
-+ test -n "$dir_arg$dstarg" && break
-+ # Otherwise, the last argument is the destination. Remove it from $@.
-+ for arg
-+ do
-+ if test -n "$dstarg"; then
-+ # $@ is not empty: it contains at least $arg.
-+ set fnord "$@" "$dstarg"
-+ shift # fnord
-+ fi
-+ shift # arg
-+ dstarg=$arg
-+ done
-+ break;;
-+ esac
- done
--fi
--
--if [ x"$dir_arg" != x ]
--then
-- $doit $instcmd "$dst" &&
-
-- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
-- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
-- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
-- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
--else
--
--# If we're going to rename the final executable, determine the name now.
--
-- if [ x"$transformarg" = x ]
-- then
-- dstfile=`basename "$dst"`
-- else
-- dstfile=`basename "$dst" $transformbasename |
-- sed $transformarg`$transformbasename
-- fi
--
--# don't allow the sed command to completely eliminate the filename
--
-- if [ x"$dstfile" = x ]
-- then
-- dstfile=`basename "$dst"`
-- else
-- :
-- fi
--
--# Make a couple of temp file names in the proper directory.
--
-- dsttmp=$dstdir/#inst.$$#
-- rmtmp=$dstdir/#rm.$$#
--
--# Trap to clean up temp files at exit.
--
-- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
-- trap '(exit $?); exit' 1 2 13 15
--
--# Move or copy the file name to the temp name
--
-- $doit $instcmd "$src" "$dsttmp" &&
--
--# and set any options; do chmod last to preserve setuid bits
--
--# If any of these fail, we abort the whole thing. If we want to
--# ignore errors from any of these, just make sure not to ignore
--# errors from the above "$doit $instcmd $src $dsttmp" command.
--
-- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
-- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
-- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
-- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
--
--# Now remove or move aside any old file at destination location. We try this
--# two ways since rm can't unlink itself on some systems and the destination
--# file might be busy for other reasons. In this case, the final cleanup
--# might fail but the new file should still install successfully.
--
--{
-- if [ -f "$dstdir/$dstfile" ]
-- then
-- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
-- $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
-- {
-- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-- (exit 1); exit
-- }
-- else
-- :
-- fi
--} &&
--
--# Now rename the file to the real destination.
-+if test -z "$1"; then
-+ if test -z "$dir_arg"; then
-+ echo "$0: no input file specified." >&2
-+ exit 1
-+ fi
-+ # It's OK to call `install-sh -d' without argument.
-+ # This can happen when creating conditional directories.
-+ exit 0
-+fi
-
-- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-+for src
-+do
-+ # Protect names starting with `-'.
-+ case $src in
-+ -*) src=./$src ;;
-+ esac
-+
-+ if test -n "$dir_arg"; then
-+ dst=$src
-+ src=
-+
-+ if test -d "$dst"; then
-+ mkdircmd=:
-+ chmodcmd=
-+ else
-+ mkdircmd=$mkdirprog
-+ fi
-+ else
-+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-+ # might cause directories to be created, which would be especially bad
-+ # if $src (and thus $dsttmp) contains '*'.
-+ if test ! -f "$src" && test ! -d "$src"; then
-+ echo "$0: $src does not exist." >&2
-+ exit 1
-+ fi
-+
-+ if test -z "$dstarg"; then
-+ echo "$0: no destination specified." >&2
-+ exit 1
-+ fi
-+
-+ dst=$dstarg
-+ # Protect names starting with `-'.
-+ case $dst in
-+ -*) dst=./$dst ;;
-+ esac
-
--fi &&
-+ # If destination is a directory, append the input filename; won't work
-+ # if double slashes aren't ignored.
-+ if test -d "$dst"; then
-+ if test -n "$no_target_directory"; then
-+ echo "$0: $dstarg: Is a directory" >&2
-+ exit 1
-+ fi
-+ dst=$dst/`basename "$src"`
-+ fi
-+ fi
-+
-+ # This sed command emulates the dirname command.
-+ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-+
-+ # Make sure that the destination directory exists.
-+
-+ # Skip lots of stat calls in the usual case.
-+ if test ! -d "$dstdir"; then
-+ defaultIFS='
-+ '
-+ IFS="${IFS-$defaultIFS}"
-+
-+ oIFS=$IFS
-+ # Some sh's can't handle IFS=/ for some reason.
-+ IFS='%'
-+ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-+ shift
-+ IFS=$oIFS
-+
-+ pathcomp=
-+
-+ while test $# -ne 0 ; do
-+ pathcomp=$pathcomp$1
-+ shift
-+ if test ! -d "$pathcomp"; then
-+ $mkdirprog "$pathcomp"
-+ # mkdir can fail with a `File exist' error in case several
-+ # install-sh are creating the directory concurrently. This
-+ # is OK.
-+ test -d "$pathcomp" || exit
-+ fi
-+ pathcomp=$pathcomp/
-+ done
-+ fi
-+
-+ if test -n "$dir_arg"; then
-+ $doit $mkdircmd "$dst" \
-+ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-+ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-+
-+ else
-+ dstfile=`basename "$dst"`
-+
-+ # Make a couple of temp file names in the proper directory.
-+ dsttmp=$dstdir/_inst.$$_
-+ rmtmp=$dstdir/_rm.$$_
-+
-+ # Trap to clean up those temp files at exit.
-+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-+ trap '(exit $?); exit' 1 2 13 15
-+
-+ # Copy the file name to the temp name.
-+ $doit $cpprog "$src" "$dsttmp" &&
-+
-+ # and set any options; do chmod last to preserve setuid bits.
-+ #
-+ # If any of these fail, we abort the whole thing. If we want to
-+ # ignore errors from any of these, just make sure not to ignore
-+ # errors from the above "$doit $cpprog $src $dsttmp" command.
-+ #
-+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-+ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-+
-+ # Now rename the file to the real destination.
-+ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-+ || {
-+ # The rename failed, perhaps because mv can't rename something else
-+ # to itself, or perhaps because mv is so ancient that it does not
-+ # support -f.
-+
-+ # Now remove or move aside any old file at destination location.
-+ # We try this two ways since rm can't unlink itself on some
-+ # systems and the destination file might be busy for other
-+ # reasons. In this case, the final cleanup might fail but the new
-+ # file should still install successfully.
-+ {
-+ if test -f "$dstdir/$dstfile"; then
-+ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-+ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-+ || {
-+ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-+ (exit 1); exit 1
-+ }
-+ else
-+ :
-+ fi
-+ } &&
-+
-+ # Now rename the file to the real destination.
-+ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-+ }
-+ }
-+ fi || { (exit 1); exit 1; }
-+done
-
- # The final little trick to "correctly" pass the exit status to the exit trap.
--
- {
-- (exit 0); exit
-+ (exit 0); exit 0
- }
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
-diff -Nrua a/admin/missing b/admin/missing
---- a/admin/missing 2004-03-22 19:59:32.000000000 +0100
-+++ b/admin/missing 2006-03-21 19:11:17.000000000 +0100
-@@ -1,6 +1,10 @@
- #! /bin/sh
- # Common stub for a few missing GNU programs while installing.
--# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
-+
-+scriptversion=2005-06-08.21
-+
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
- # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
- # This program is free software; you can redistribute it and/or modify
-@@ -15,8 +19,8 @@
-
- # 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
-@@ -38,18 +42,24 @@
- configure_ac=configure.in
- fi
-
-+msg="missing on your system"
-+
- case "$1" in
- --run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
-+ # Exit code 63 means version mismatch. This often happens
-+ # when the user try to use an ancient version of a tool on
-+ # a file that requires a minimum version. In this case we
-+ # we should proceed has if the program had been absent, or
-+ # if --run hadn't been passed.
-+ if test $? = 63; then
-+ run=:
-+ msg="probably too old"
-+ fi
- ;;
--esac
--
--# If it does not exist, or fails to run (possibly an outdated version),
--# try to emulate it.
--case "$1" in
-
- -h|--h|--he|--hel|--help)
- echo "\
-@@ -74,11 +84,15 @@
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
-- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
-+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
-+
-+Send bug reports to <bug-automake@gnu.org>."
-+ exit $?
- ;;
-
- -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-- echo "missing 0.4 - GNU automake"
-+ echo "missing $scriptversion (GNU Automake)"
-+ exit $?
- ;;
-
- -*)
-@@ -87,14 +101,44 @@
- exit 1
- ;;
-
-- aclocal*)
-+esac
-+
-+# Now exit if we have it, but it failed. Also exit now if we
-+# don't have it and --version was passed (most likely to detect
-+# the program).
-+case "$1" in
-+ lex|yacc)
-+ # Not GNU programs, they don't have --version.
-+ ;;
-+
-+ tar)
-+ if test -n "$run"; then
-+ echo 1>&2 "ERROR: \`tar' requires --run"
-+ exit 1
-+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-+ exit 1
-+ fi
-+ ;;
-+
-+ *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
-+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-+ # Could not run --version or --help. This is probably someone
-+ # running `$TOOL --version' or `$TOOL --help' to check whether
-+ # $TOOL exists and not knowing $TOOL uses missing.
-+ exit 1
- fi
-+ ;;
-+esac
-
-+# If it does not exist, or fails to run (possibly an outdated version),
-+# try to emulate it.
-+case "$1" in
-+ aclocal*)
- echo 1>&2 "\
--WARNING: \`$1' is missing on your system. You should only need it if
-+WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
-@@ -102,13 +146,8 @@
- ;;
-
- autoconf)
-- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-- # We have it, but it failed.
-- exit 1
-- fi
--
- echo 1>&2 "\
--WARNING: \`$1' is missing on your system. You should only need it if
-+WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
-@@ -116,13 +155,8 @@
- ;;
-
- autoheader)
-- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-- # We have it, but it failed.
-- exit 1
-- fi
--
- echo 1>&2 "\
--WARNING: \`$1' is missing on your system. You should only need it if
-+WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
-@@ -140,13 +174,8 @@
- ;;
-
- automake*)
-- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-- # We have it, but it failed.
-- exit 1
-- fi
--
- echo 1>&2 "\
--WARNING: \`$1' is missing on your system. You should only need it if
-+WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
-@@ -156,16 +185,11 @@
- ;;
-
- autom4te)
-- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-- # We have it, but it failed.
-- exit 1
-- fi
--
- echo 1>&2 "\
--WARNING: \`$1' is needed, and you do not seem to have it handy on your
-- system. You might have modified some files without having the
-+WARNING: \`$1' is needed, but is $msg.
-+ You might have modified some files without having the
- proper tools for further handling them.
-- You can get \`$1Help2man' as part of \`Autoconf' from any GNU
-+ You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-@@ -185,7 +209,7 @@
-
- bison|yacc)
- echo 1>&2 "\
--WARNING: \`$1' is missing on your system. You should only need it if
-+WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
-@@ -215,7 +239,7 @@
-
- lex|flex)
- echo 1>&2 "\
--WARNING: \`$1' is missing on your system. You should only need it if
-+WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
-@@ -237,13 +261,8 @@
- ;;
-
- help2man)
-- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-- # We have it, but it failed.
-- exit 1
-- fi
--
- echo 1>&2 "\
--WARNING: \`$1' is missing on your system. You should only need it if
-+WARNING: \`$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-@@ -262,32 +281,30 @@
- ;;
-
- makeinfo)
-- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-- # We have makeinfo, but it failed.
-- exit 1
-- fi
--
- echo 1>&2 "\
--WARNING: \`$1' is missing on your system. You should only need it if
-+WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
-+ # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
-- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-- fi
-+ # ... or it is the one specified with @setfilename ...
-+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
-+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-+ fi
-+ # If the file does not exist, the user really needs makeinfo;
-+ # let's fail without touching anything.
-+ test -f $file || exit 1
- touch $file
- ;;
-
- tar)
- shift
-- if test -n "$run"; then
-- echo 1>&2 "ERROR: \`tar' requires --run"
-- exit 1
-- fi
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
-@@ -323,10 +340,10 @@
-
- *)
- echo 1>&2 "\
--WARNING: \`$1' is needed, and you do not seem to have it handy on your
-- system. You might have modified some files without having the
-+WARNING: \`$1' is needed, and is $msg.
-+ You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
-- it often tells you about the needed prerequirements for installing
-+ it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
- exit 1
-@@ -334,3 +351,10 @@
- esac
-
- exit 0
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
-diff -Nrua a/admin/mkinstalldirs b/admin/mkinstalldirs
---- a/admin/mkinstalldirs 2004-03-22 19:59:32.000000000 +0100
-+++ b/admin/mkinstalldirs 2006-03-21 19:11:17.000000000 +0100
-@@ -1,21 +1,33 @@
- #! /bin/sh
- # mkinstalldirs --- make directory hierarchy
--# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-+
-+scriptversion=2005-06-29.22
-+
-+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
- # Created: 1993-05-16
--# Public domain
-+# Public domain.
-+#
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake@gnu.org> or send patches to
-+# <automake-patches@gnu.org>.
-
- errstatus=0
--dirmode=""
-+dirmode=
-
- usage="\
--Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-+
-+Create each directory DIR (with mode MODE, if specified), including all
-+leading file name components.
-+
-+Report bugs to <bug-automake@gnu.org>."
-
- # process command line arguments
- while test $# -gt 0 ; do
- case $1 in
- -h | --help | --h*) # -h for help
-- echo "$usage" 1>&2
-- exit 0
-+ echo "$usage"
-+ exit $?
- ;;
- -m) # -m PERM arg
- shift
-@@ -23,6 +35,10 @@
- dirmode=$1
- shift
- ;;
-+ --version)
-+ echo "$0 $scriptversion"
-+ exit $?
-+ ;;
- --) # stop option processing
- shift
- break
-@@ -50,30 +66,58 @@
- 0) exit 0 ;;
- esac
-
-+# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
-+# mkdir -p a/c at the same time, both will detect that a is missing,
-+# one will create a, then the other will try to create a and die with
-+# a "File exists" error. This is a problem when calling mkinstalldirs
-+# from a parallel make. We use --version in the probe to restrict
-+# ourselves to GNU mkdir, which is thread-safe.
- case $dirmode in
- '')
-- if mkdir -p -- . 2>/dev/null; then
-+ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- echo "mkdir -p -- $*"
- exec mkdir -p -- "$@"
-+ else
-+ # On NextStep and OpenStep, the `mkdir' command does not
-+ # recognize any option. It will interpret all options as
-+ # directories to create, and then abort because `.' already
-+ # exists.
-+ test -d ./-p && rmdir ./-p
-+ test -d ./--version && rmdir ./--version
- fi
- ;;
- *)
-- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-+ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-+ test ! -d ./--version; then
- echo "mkdir -m $dirmode -p -- $*"
- exec mkdir -m "$dirmode" -p -- "$@"
-+ else
-+ # Clean up after NextStep and OpenStep mkdir.
-+ for d in ./-m ./-p ./--version "./$dirmode";
-+ do
-+ test -d $d && rmdir $d
-+ done
- fi
- ;;
- esac
-
- for file
- do
-- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-+ case $file in
-+ /*) pathcomp=/ ;;
-+ *) pathcomp= ;;
-+ esac
-+ oIFS=$IFS
-+ IFS=/
-+ set fnord $file
- shift
-+ IFS=$oIFS
-
-- pathcomp=
- for d
- do
-- pathcomp="$pathcomp$d"
-+ test "x$d" = x && continue
-+
-+ pathcomp=$pathcomp$d
- case $pathcomp in
- -*) pathcomp=./$pathcomp ;;
- esac
-@@ -84,21 +128,21 @@
- mkdir "$pathcomp" || lasterr=$?
-
- if test ! -d "$pathcomp"; then
-- errstatus=$lasterr
-+ errstatus=$lasterr
- else
-- if test ! -z "$dirmode"; then
-+ if test ! -z "$dirmode"; then
- echo "chmod $dirmode $pathcomp"
-- lasterr=""
-- chmod "$dirmode" "$pathcomp" || lasterr=$?
-+ lasterr=
-+ chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-- if test ! -z "$lasterr"; then
-- errstatus=$lasterr
-- fi
-- fi
-+ if test ! -z "$lasterr"; then
-+ errstatus=$lasterr
-+ fi
-+ fi
- fi
- fi
-
-- pathcomp="$pathcomp/"
-+ pathcomp=$pathcomp/
- done
- done
-
-@@ -107,5 +151,8 @@
- # Local Variables:
- # mode: shell-script
- # sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
- # End:
--# mkinstalldirs ends here
-diff -Nrua a/admin/ylwrap b/admin/ylwrap
---- a/admin/ylwrap 2004-03-22 19:59:43.000000000 +0100
-+++ b/admin/ylwrap 2006-03-21 19:11:17.000000000 +0100
-@@ -1,6 +1,11 @@
- #! /bin/sh
- # ylwrap - wrapper for lex/yacc invocations.
--# Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
-+
-+scriptversion=2005-05-14.22
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
- # Written by Tom Tromey <tromey@cygnus.com>.
- #
- # This program is free software; you can redistribute it and/or modify
-@@ -15,51 +20,73 @@
- #
- # 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.
-
--# Usage:
--# ylwrap INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
--# * INPUT is the input file
--# * OUTPUT is file PROG generates
--# * DESIRED is file we actually want
--# * PROGRAM is program to run
--# * ARGS are passed to PROG
--# Any number of OUTPUT,DESIRED pairs may be used.
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake@gnu.org> or send patches to
-+# <automake-patches@gnu.org>.
-+
-+case "$1" in
-+ '')
-+ echo "$0: No files given. Try \`$0 --help' for more information." 1>&2
-+ exit 1
-+ ;;
-+ --basedir)
-+ basedir=$2
-+ shift 2
-+ ;;
-+ -h|--h*)
-+ cat <<\EOF
-+Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
-+
-+Wrapper for lex/yacc invocations, renaming files as desired.
-+
-+ INPUT is the input file
-+ OUTPUT is one file PROG generates
-+ DESIRED is the file we actually want instead of OUTPUT
-+ PROGRAM is program to run
-+ ARGS are passed to PROG
-+
-+Any number of OUTPUT,DESIRED pairs may be used.
-+
-+Report bugs to <bug-automake@gnu.org>.
-+EOF
-+ exit $?
-+ ;;
-+ -v|--v*)
-+ echo "ylwrap $scriptversion"
-+ exit $?
-+ ;;
-+esac
-+
-
- # The input.
- input="$1"
- shift
- case "$input" in
-- [\\/]* | ?:[\\/]*)
-+ [\\/]* | ?:[\\/]*)
- # Absolute path; do nothing.
- ;;
-- *)
-+ *)
- # Relative path. Make it absolute.
- input="`pwd`/$input"
- ;;
- esac
-
--# The directory holding the input.
--input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
--# Quote $INPUT_DIR so we can use it in a regexp.
--# FIXME: really we should care about more than `.' and `\'.
--input_rx=`echo "$input_dir" | sed -e 's,\\\\,\\\\\\\\,g' -e 's,\\.,\\\\.,g'`
--
--echo "got $input_rx"
--
- pairlist=
- while test "$#" -ne 0; do
-- if test "$1" = "--"; then
-- shift
-- break
-- fi
-- pairlist="$pairlist $1"
-- shift
-+ if test "$1" = "--"; then
-+ shift
-+ break
-+ fi
-+ pairlist="$pairlist $1"
-+ shift
- done
-
- # The program to run.
-@@ -67,8 +94,8 @@
- shift
- # Make any relative path in $prog absolute.
- case "$prog" in
-- [\\/]* | ?:[\\/]*) ;;
-- *[\\/]*) prog="`pwd`/$prog" ;;
-+ [\\/]* | ?:[\\/]*) ;;
-+ *[\\/]*) prog="`pwd`/$prog" ;;
- esac
-
- # FIXME: add hostname here for parallel makes that run commands on
-@@ -79,65 +106,118 @@
-
- cd $dirname
-
--$prog ${1+"$@"} "$input"
--status=$?
-+case $# in
-+ 0) $prog "$input" ;;
-+ *) $prog "$@" "$input" ;;
-+esac
-+ret=$?
-
--if test $status -eq 0; then
-- set X $pairlist
-- shift
-- first=yes
-- # Since DOS filename conventions don't allow two dots,
-- # the DOS version of Bison writes out y_tab.c instead of y.tab.c
-- # and y_tab.h instead of y.tab.h. Test to see if this is the case.
-- y_tab_nodot="no"
-- if test -f y_tab.c || test -f y_tab.h; then
-- y_tab_nodot="yes"
-- fi
--
-- while test "$#" -ne 0; do
-- from="$1"
-- # Handle y_tab.c and y_tab.h output by DOS
-- if test $y_tab_nodot = "yes"; then
-- if test $from = "y.tab.c"; then
-- from="y_tab.c"
-- else
-- if test $from = "y.tab.h"; then
-- from="y_tab.h"
-- fi
-- fi
-- fi
-- if test -f "$from"; then
-- # If $2 is an absolute path name, then just use that,
-- # otherwise prepend `../'.
-- case "$2" in
-- [\\/]* | ?:[\\/]*) target="$2";;
-- *) target="../$2";;
-- esac
--
-- # Edit out `#line' or `#' directives. We don't want the
-- # resulting debug information to point at an absolute srcdir;
-- # it is better for it to just mention the .y file with no
-- # path.
-- sed -e "/^#/ s,$input_rx,," "$from" > "$target" || status=$?
-+if test $ret -eq 0; then
-+ set X $pairlist
-+ shift
-+ first=yes
-+ # Since DOS filename conventions don't allow two dots,
-+ # the DOS version of Bison writes out y_tab.c instead of y.tab.c
-+ # and y_tab.h instead of y.tab.h. Test to see if this is the case.
-+ y_tab_nodot="no"
-+ if test -f y_tab.c || test -f y_tab.h; then
-+ y_tab_nodot="yes"
-+ fi
-+
-+ # The directory holding the input.
-+ input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
-+ # Quote $INPUT_DIR so we can use it in a regexp.
-+ # FIXME: really we should care about more than `.' and `\'.
-+ input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
-+
-+ while test "$#" -ne 0; do
-+ from="$1"
-+ # Handle y_tab.c and y_tab.h output by DOS
-+ if test $y_tab_nodot = "yes"; then
-+ if test $from = "y.tab.c"; then
-+ from="y_tab.c"
- else
-- # A missing file is only an error for the first file. This
-- # is a blatant hack to let us support using "yacc -d". If -d
-- # is not specified, we don't want an error when the header
-- # file is "missing".
-- if test $first = yes; then
-- status=1
-- fi
-+ if test $from = "y.tab.h"; then
-+ from="y_tab.h"
-+ fi
- fi
-- shift
-- shift
-- first=no
-- done
-+ fi
-+ if test -f "$from"; then
-+ # If $2 is an absolute path name, then just use that,
-+ # otherwise prepend `../'.
-+ case "$2" in
-+ [\\/]* | ?:[\\/]*) target="$2";;
-+ *) target="../$2";;
-+ esac
-+
-+ # We do not want to overwrite a header file if it hasn't
-+ # changed. This avoid useless recompilations. However the
-+ # parser itself (the first file) should always be updated,
-+ # because it is the destination of the .y.c rule in the
-+ # Makefile. Divert the output of all other files to a temporary
-+ # file so we can compare them to existing versions.
-+ if test $first = no; then
-+ realtarget="$target"
-+ target="tmp-`echo $target | sed s/.*[\\/]//g`"
-+ fi
-+ # Edit out `#line' or `#' directives.
-+ #
-+ # We don't want the resulting debug information to point at
-+ # an absolute srcdir; it is better for it to just mention the
-+ # .y file with no path.
-+ #
-+ # We want to use the real output file name, not yy.lex.c for
-+ # instance.
-+ #
-+ # We want the include guards to be adjusted too.
-+ FROM=`echo "$from" | sed \
-+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
-+ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
-+ TARGET=`echo "$2" | sed \
-+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
-+ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
-+
-+ sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
-+ -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
-+
-+ # Check whether header files must be updated.
-+ if test $first = no; then
-+ if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
-+ echo "$2" is unchanged
-+ rm -f "$target"
-+ else
-+ echo updating "$2"
-+ mv -f "$target" "$realtarget"
-+ fi
-+ fi
-+ else
-+ # A missing file is only an error for the first file. This
-+ # is a blatant hack to let us support using "yacc -d". If -d
-+ # is not specified, we don't want an error when the header
-+ # file is "missing".
-+ if test $first = yes; then
-+ ret=1
-+ fi
-+ fi
-+ shift
-+ shift
-+ first=no
-+ done
- else
-- status=$?
-+ ret=$?
- fi
-
- # Remove the directory.
- cd ..
- rm -rf $dirname
-
--exit $status
-+exit $ret
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
diff --git a/ubuntu/maverick/applications/kasablanca/debian/patches/03_libtool_update.diff b/ubuntu/maverick/applications/kasablanca/debian/patches/03_libtool_update.diff
deleted file mode 100644
index 23b25867b..000000000
--- a/ubuntu/maverick/applications/kasablanca/debian/patches/03_libtool_update.diff
+++ /dev/null
@@ -1,7543 +0,0 @@
-diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in 2004-06-11 14:04:39.000000000 +0200
-+++ b/admin/libtool.m4.in 2006-03-21 19:11:17.000000000 +0100
-@@ -1,28 +1,13 @@
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
--## Copyright 1996, 1997, 1998, 1999, 2000, 2001
-+## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
- ## Free Software Foundation, Inc.
- ## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
- ##
--## This program is free software; you can redistribute it and/or modify
--## it under the terms of the GNU General Public License as published by
--## the Free Software Foundation; either version 2 of the License, or
--## (at your option) any later version.
--##
--## This program is distributed in the hope that it will be useful, but
--## WITHOUT ANY WARRANTY; without even the implied warranty of
--## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--## General Public License for more details.
--##
--## You should have received a copy of the GNU General Public License
--## along with this program; if not, write to the Free Software
--## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--##
--## As a special exception to the GNU General Public License, if you
--## distribute this file as part of a program that contains a
--## configuration script generated by Autoconf, you may include it under
--## the same distribution terms that you use for the rest of that program.
-+## This file is free software; the Free Software Foundation gives
-+## unlimited permission to copy and/or distribute it, with or without
-+## modifications, as long as this notice is preserved.
-
--# serial 47 AC_PROG_LIBTOOL
-+# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
-
-
- # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -82,7 +67,7 @@
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- AC_SUBST(LIBTOOL)dnl
-
- # Prevent multiple expansion
-@@ -132,7 +117,7 @@
-
- # Sed substitution that helps us do robust quoting. It backslashifies
- # metacharacters that are still active within double-quoted strings.
--Xsed='sed -e s/^X//'
-+Xsed='sed -e 1s/^X//'
- [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-
- # Same as above, but do not quote variable references.
-@@ -152,7 +137,7 @@
- default_ofile=libtool
- can_build_shared=yes
-
--# All known linkers require a `.a' archive for static linking (except M$VC,
-+# All known linkers require a `.a' archive for static linking (except MSVC,
- # which needs '.lib').
- libext=a
- ltmain="$ac_aux_dir/ltmain.sh"
-@@ -172,6 +157,7 @@
- test -z "$AS" && AS=as
- test -z "$CC" && CC=cc
- test -z "$LTCC" && LTCC=$CC
-+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
- test -z "$DLLTOOL" && DLLTOOL=dlltool
- test -z "$LD" && LD=ld
- test -z "$LN_S" && LN_S="ln -s"
-@@ -191,15 +177,17 @@
- if test -n "$RANLIB"; then
- case $host_os in
- openbsd*)
-- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
- ;;
- *)
-- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
- ;;
- esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- fi
-
-+_LT_CC_BASENAME([$compiler])
-+
- # Only perform the check for file, if the check method requires it
- case $deplibs_check_method in
- file_magic*)
-@@ -240,11 +228,56 @@
- # If no C compiler was specified, use CC.
- LTCC=${LTCC-"$CC"}
-
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
- # Allow CC to be a program name with arguments.
- compiler=$CC
- ])# _LT_AC_SYS_COMPILER
-
-
-+# _LT_CC_BASENAME(CC)
-+# -------------------
-+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
-+AC_DEFUN([_LT_CC_BASENAME],
-+[for cc_temp in $1""; do
-+ case $cc_temp in
-+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-+ \-*) ;;
-+ *) break;;
-+ esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+])
-+
-+
-+# _LT_COMPILER_BOILERPLATE
-+# ------------------------
-+# Check for compiler boilerplate output or warnings with
-+# the simple compiler test code.
-+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-+[ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+])# _LT_COMPILER_BOILERPLATE
-+
-+
-+# _LT_LINKER_BOILERPLATE
-+# ----------------------
-+# Check for linker boilerplate output or warnings with
-+# the simple link test code.
-+AC_DEFUN([_LT_LINKER_BOILERPLATE],
-+[ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+])# _LT_LINKER_BOILERPLATE
-+
-+
- # _LT_AC_SYS_LIBPATH_AIX
- # ----------------------
- # Links a minimal program and checks the executable
-@@ -317,15 +350,15 @@
-
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
- if test -z "$ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-- if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-- echo_test_string="`eval $cmd`" &&
-+ if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-+ echo_test_string=`eval $cmd` &&
- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
- then
- break
-@@ -494,14 +527,13 @@
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
-- case "`/usr/bin/file conftest.o`" in
-+ case `/usr/bin/file conftest.o` in
- *32-bit*)
-- LINUX_64_MODE="32"
- case $host in
- x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
- ;;
-- ppc64-*linux*)
-+ ppc64-*linux*|powerpc64-*linux*)
- LD="${LD-ld} -m elf32ppclinux"
- ;;
- s390x-*linux*)
-@@ -513,7 +545,6 @@
- esac
- ;;
- *64-bit*)
-- LINUX_64_MODE="64"
- case $host in
- x86_64-*linux*)
- LD="${LD-ld} -m elf_x86_64"
-@@ -547,6 +578,22 @@
- CFLAGS="$SAVE_CFLAGS"
- fi
- ;;
-+sparc*-*solaris*)
-+ # Find out which ABI we are using.
-+ echo 'int i;' > conftest.$ac_ext
-+ if AC_TRY_EVAL(ac_compile); then
-+ case `/usr/bin/file conftest.o` in
-+ *64-bit*)
-+ case $lt_cv_prog_gnu_ld in
-+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
-+ *) LD="${LD-ld} -64" ;;
-+ esac
-+ ;;
-+ esac
-+ fi
-+ rm -rf conftest*
-+ ;;
-+
- AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
- [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-@@ -578,7 +625,7 @@
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
-- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -588,8 +635,10 @@
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
-- # So say no if there are warnings
-- if test ! -s conftest.err; then
-+ # So say no if there are warnings other than the usual output.
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- $2=yes
- fi
- fi
-@@ -615,11 +664,16 @@
- LDFLAGS="$LDFLAGS $3"
- printf "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-- # The compiler can only warn and ignore the option if not recognized
-+ # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test -s conftest.err; then
- # Append any errors to the config.log.
- cat conftest.err 1>&AS_MESSAGE_LOG_FD
-+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+ if diff conftest.exp conftest.er2 >/dev/null; then
-+ $2=yes
-+ fi
- else
- $2=yes
- fi
-@@ -643,7 +697,7 @@
- AC_MSG_CHECKING([the maximum length of command line arguments])
- AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
- i=0
-- testring="ABCD"
-+ teststring="ABCD"
-
- case $build_os in
- msdosdjgpp*)
-@@ -672,20 +726,70 @@
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
-- *)
-+ amigaos*)
-+ # On AmigaOS with pdksh, this test takes hours, literally.
-+ # So we just punt and use a minimum line length of 8192.
-+ lt_cv_sys_max_cmd_len=8192;
-+ ;;
-+
-+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+ # This has been around since 386BSD, at least. Likely further.
-+ if test -x /sbin/sysctl; then
-+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+ elif test -x /usr/sbin/sysctl; then
-+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+ else
-+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
-+ fi
-+ # And add a safety zone
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+ ;;
-+
-+ interix*)
-+ # We know the value 262144 and hardcode it with a safety zone (like BSD)
-+ lt_cv_sys_max_cmd_len=196608
-+ ;;
-+
-+ osf*)
-+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-+ # nice to cause kernel panics so lets avoid the loop below.
-+ # First set a reasonable default.
-+ lt_cv_sys_max_cmd_len=16384
-+ #
-+ if test -x /sbin/sysconfig; then
-+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-+ *1*) lt_cv_sys_max_cmd_len=-1 ;;
-+ esac
-+ fi
-+ ;;
-+ sco3.2v5*)
-+ lt_cv_sys_max_cmd_len=102400
-+ ;;
-+ sysv5* | sco5v6* | sysv4.2uw2*)
-+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-+ if test -n "$kargmax"; then
-+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
-+ else
-+ lt_cv_sys_max_cmd_len=32768
-+ fi
-+ ;;
-+ *)
- # If test is not a shell built-in, we'll probably end up computing a
- # maximum length that is only half of the actual maximum length, but
- # we can't tell.
-- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
-- = "XX$testring") >/dev/null 2>&1 &&
-- new_result=`expr "X$testring" : ".*" 2>&1` &&
-+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-+ = "XX$teststring") >/dev/null 2>&1 &&
-+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
- lt_cv_sys_max_cmd_len=$new_result &&
- test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
-- testring=$testring$testring
-+ teststring=$teststring$teststring
- done
-- testring=
-+ teststring=
- # Add a significant safety factor because C++ compilers can tack on massive
- # amounts of additional arguments before passing them to the linker.
- # It appears as though 1/2 is a usable value.
-@@ -702,7 +806,7 @@
-
-
- # _LT_AC_CHECK_DLFCN
--# --------------------
-+# ------------------
- AC_DEFUN([_LT_AC_CHECK_DLFCN],
- [AC_CHECK_HEADERS(dlfcn.h)dnl
- ])# _LT_AC_CHECK_DLFCN
-@@ -710,7 +814,7 @@
-
- # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
- # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
--# ------------------------------------------------------------------
-+# ---------------------------------------------------------------------
- AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
- [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
- if test "$cross_compiling" = yes; then :
-@@ -776,17 +880,19 @@
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-+ else
-+ puts (dlerror ());
-
- exit (status);
- }]
- EOF
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-- (./conftest; exit; ) 2>/dev/null
-+ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) $1 ;;
- x$lt_dlneed_uscore) $2 ;;
-- x$lt_unknown|x*) $3 ;;
-+ x$lt_dlunknown|x*) $3 ;;
- esac
- else :
- # compilation failed
-@@ -798,7 +904,7 @@
-
-
- # AC_LIBTOOL_DLOPEN_SELF
--# -------------------
-+# ----------------------
- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
- [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
- if test "x$enable_dlopen" != xyes; then
-@@ -835,7 +941,7 @@
- lt_cv_dlopen_self=yes
- ])
- ;;
--
-+
- *)
- AC_CHECK_FUNC([shl_load],
- [lt_cv_dlopen="shl_load"],
-@@ -869,7 +975,7 @@
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
- save_LDFLAGS="$LDFLAGS"
-- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -882,7 +988,7 @@
- ])
-
- if test "x$lt_cv_dlopen_self" = xyes; then
-- LDFLAGS="$LDFLAGS $link_static_flag"
-+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
- AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
- lt_cv_dlopen_self_static, [dnl
- _LT_AC_TRY_DLOPEN_SELF(
-@@ -924,20 +1030,13 @@
- mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-- # that will create temporary files in the current directory regardless of
-- # the output directory. Thus, making CWD read-only will cause this test
-- # to fail, enabling locking or at least warning the user not to do parallel
-- # builds.
-- chmod -w .
--
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- lt_compile=`echo "$ac_compile" | $SED \
-- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -949,13 +1048,18 @@
- then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
-- if test ! -s out/conftest.err; then
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
- fi
- fi
-- chmod u+w .
-- $rm conftest* out/*
-- rmdir out
-+ chmod u+w . 2>&AS_MESSAGE_LOG_FD
-+ $rm conftest*
-+ # SGI C++ compiler will create directory out/ii_files/ for
-+ # template instantiation
-+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-+ $rm out/* && rmdir out
- cd ..
- rmdir conftest
- $rm conftest*
-@@ -1014,8 +1118,8 @@
- [AC_MSG_CHECKING([how to hardcode library paths into programs])
- _LT_AC_TAGVAR(hardcode_action, $1)=
- if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-- test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
-- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
-+ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
-+ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
- # We can hardcode non-existant directories.
- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -1072,7 +1176,7 @@
- *)
- AC_MSG_RESULT([no])
- ;;
-- esac
-+ esac
- fi
- ])# AC_LIBTOOL_SYS_LIB_STRIP
-
-@@ -1085,7 +1189,7 @@
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
--shrext=".so"
-+shrext_cmds=".so"
- postinstall_cmds=
- postuninstall_cmds=
- finish_cmds=
-@@ -1095,7 +1199,20 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+if test "$GCC" = yes; then
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+ # if the path contains ";" then we assume it to be the separator
-+ # otherwise default to the standard path separator (i.e. ":") - it is
-+ # assumed that no part of a normal pathname contains ";" but that should
-+ # okay in the real world where ";" in dirpaths is itself problematic.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+else
-+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
- need_lib_prefix=unknown
- hardcode_into_libs=no
-
-@@ -1160,7 +1277,7 @@
- amigaos*)
- library_names_spec='$libname.ixlibrary $libname.a'
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
-- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
- ;;
-
- beos*)
-@@ -1169,7 +1286,7 @@
- shlibpath_var=LIBRARY_PATH
- ;;
-
--bsdi4*)
-+bsdi[[45]]*)
- version_type=linux
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -1185,7 +1302,7 @@
-
- cygwin* | mingw* | pw32*)
- version_type=windows
-- shrext=".dll"
-+ shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
-
-@@ -1197,7 +1314,8 @@
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
-- $install_prog $dir/$dlname \$dldir/$dlname'
-+ $install_prog $dir/$dlname \$dldir/$dlname~
-+ chmod a+x \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $rm \$dlpath'
-@@ -1227,7 +1345,7 @@
- ;;
- pw32*)
- # pw32 DLLs use 'pw' prefix rather than 'lib'
-- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- ;;
-@@ -1250,7 +1368,7 @@
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
-- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -1273,20 +1391,17 @@
- dynamic_linker=no
- ;;
-
--freebsd*-gnu*)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
-- ;;
--
--freebsd*)
-- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+freebsd* | dragonfly*)
-+ # DragonFly does not have aout. When/if they implement a new
-+ # versioning mechanism, adjust this.
-+ if test -x /usr/bin/objformat; then
-+ objformat=`/usr/bin/objformat`
-+ else
-+ case $host_os in
-+ freebsd[[123]]*) objformat=aout ;;
-+ *) objformat=elf ;;
-+ esac
-+ fi
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
-@@ -1304,14 +1419,19 @@
- freebsd2*)
- shlibpath_overrides_runpath=yes
- ;;
-- freebsd3.[01]* | freebsdelf3.[01]*)
-+ freebsd3.[[01]]* | freebsdelf3.[[01]]*)
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-- *) # from 3.2 on
-+ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-+ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-+ freebsd*) # from 4.6 on
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
- esac
- ;;
-
-@@ -1331,9 +1451,9 @@
- version_type=sunos
- need_lib_prefix=no
- need_version=no
-- case "$host_cpu" in
-+ case $host_cpu in
- ia64*)
-- shrext='.so'
-+ shrext_cmds='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
-@@ -1348,7 +1468,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
-- shrext='.sl'
-+ shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -1359,7 +1479,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
-- shrext='.sl'
-+ shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -1371,6 +1491,18 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
-+interix3*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-+
- irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
-@@ -1414,29 +1546,26 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-- libsuff=
-- if test "x$LINUX_64_MODE" = x64; then
-- # Some platforms are per default 64-bit, so there's no /lib64
-- if test -d /lib64; then
-- libsuff=64
-- fi
-- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
-- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-
-+ # Append ld.so.conf contents to the search path
-+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ fi
-+
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
-@@ -1446,6 +1575,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -1455,7 +1596,7 @@
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
- else
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
- fi
-@@ -1483,8 +1624,13 @@
-
- openbsd*)
- version_type=sunos
-+ sys_lib_dlsearch_path_spec="/usr/lib"
- need_lib_prefix=no
-- need_version=no
-+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+ case $host_os in
-+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+ *) need_version=no ;;
-+ esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
-@@ -1504,7 +1650,7 @@
-
- os2*)
- libname_spec='$name'
-- shrext=".dll"
-+ shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
-@@ -1522,13 +1668,6 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
--sco3.2v5*)
-- version_type=osf
-- soname_spec='${libname}${release}${shared_ext}$major'
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- shlibpath_var=LD_LIBRARY_PATH
-- ;;
--
- solaris*)
- version_type=linux
- need_lib_prefix=no
-@@ -1554,7 +1693,7 @@
- need_version=yes
- ;;
-
--sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+sysv4 | sysv4.3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
-@@ -1587,6 +1726,29 @@
- fi
- ;;
-
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+ version_type=freebsd-elf
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ hardcode_into_libs=yes
-+ if test "$with_gnu_ld" = yes; then
-+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+ shlibpath_overrides_runpath=no
-+ else
-+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+ shlibpath_overrides_runpath=yes
-+ case $host_os in
-+ sco3.2v5*)
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+ ;;
-+ esac
-+ fi
-+ sys_lib_dlsearch_path_spec='/usr/lib'
-+ ;;
-+
- uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -1600,6 +1762,11 @@
- esac
- AC_MSG_RESULT([$dynamic_linker])
- test "$dynamic_linker" = no && can_build_shared=no
-+
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
- ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
-
-@@ -1624,6 +1791,9 @@
- AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
- fi
- fi
-+ if test -z "$LTCFLAGS"; then
-+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-+ fi
-
- # Extract list of available tagged configurations in $ofile.
- # Note that this assumes the entire list is on one line.
-@@ -1650,7 +1820,9 @@
-
- case $tagname in
- CXX)
-- if test -n "$CXX" && test "X$CXX" != "Xno"; then
-+ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+ (test "X$CXX" != "Xg++"))) ; then
- AC_LIBTOOL_LANG_CXX_CONFIG
- else
- tagname=""
-@@ -1712,7 +1884,7 @@
-
- # AC_LIBTOOL_WIN32_DLL
- # --------------------
--# declare package support for building win32 dll's
-+# declare package support for building win32 DLLs
- AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
- [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
- ])# AC_LIBTOOL_WIN32_DLL
-@@ -1750,7 +1922,7 @@
-
- # AC_DISABLE_SHARED
- # -----------------
--#- set the default shared flag to --disable-shared
-+# set the default shared flag to --disable-shared
- AC_DEFUN([AC_DISABLE_SHARED],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
- AC_ENABLE_SHARED(no)
-@@ -1886,7 +2058,7 @@
- if test -n "$file_magic_test_file"; then
- case $deplibs_check_method in
- "file_magic "*)
-- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- $EGREP "$file_magic_regex" > /dev/null; then
-@@ -1996,7 +2168,7 @@
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
- # Check to see if the program is GNU ld. I'd rather use --version,
-- # but apparently some GNU ld's only accept -v.
-+ # but apparently some variants of GNU ld only accept -v.
- # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-@@ -2028,7 +2200,7 @@
- AC_DEFUN([AC_PROG_LD_GNU],
- [AC_REQUIRE([AC_PROG_EGREP])dnl
- AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
--[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
- lt_cv_prog_gnu_ld=yes
-@@ -2055,6 +2227,15 @@
- *) reload_flag=" $reload_flag" ;;
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+ darwin*)
-+ if test "$GCC" = yes; then
-+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-+ else
-+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+ fi
-+ ;;
-+esac
- ])# AC_PROG_LD_RELOAD_FLAG
-
-
-@@ -2088,44 +2269,36 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--bsdi4*)
-+bsdi[[45]]*)
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
- lt_cv_file_magic_cmd='/usr/bin/file -L'
- lt_cv_file_magic_test_file=/shlib/libc.so
- ;;
-
- cygwin*)
-- lt_cv_deplibs_check_method=pass_all
-+ # func_win32_libid is a shell function defined in ltmain.sh
-+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+ lt_cv_file_magic_cmd='func_win32_libid'
- ;;
--
-+
- mingw* | pw32*)
-- # win32_libid is a shell function defined in ltmain.sh
-- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-- lt_cv_file_magic_cmd='win32_libid'
-+ # Base MSYS/MinGW do not provide the 'file' command needed by
-+ # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+ lt_cv_file_magic_cmd='$OBJDUMP -f'
- ;;
-
- darwin* | rhapsody*)
-- # this will be overwritten by pass_all, but leave it in just in case
-- lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-- lt_cv_file_magic_cmd='/usr/bin/file -L'
-- case "$host_os" in
-- rhapsody* | darwin1.[[012]])
-- lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
-- ;;
-- *) # Darwin 1.3 on
-- lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-- ;;
-- esac
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--freebsd*)
-+freebsd* | dragonfly*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- case $host_cpu in
- i*86 )
- # Not sure whether the presence of OpenBSD here was a mistake.
- # Let's accept both of them until this is cleared up.
-- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
-+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- ;;
-@@ -2141,7 +2314,7 @@
-
- hpux10.20* | hpux11*)
- lt_cv_file_magic_cmd=/usr/bin/file
-- case "$host_cpu" in
-+ case $host_cpu in
- ia64*)
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -2157,43 +2330,27 @@
- esac
- ;;
-
-+interix3*)
-+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-+ ;;
-+
- irix5* | irix6* | nonstopux*)
-- case $host_os in
-- irix5* | nonstopux*)
-- # this will be overridden with pass_all, but let us keep it just in case
-- lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-- ;;
-- *)
-- case $LD in
-- *-32|*"-32 ") libmagic=32-bit;;
-- *-n32|*"-n32 ") libmagic=N32;;
-- *-64|*"-64 ") libmagic=64-bit;;
-- *) libmagic=never-match;;
-- esac
-- # this will be overridden with pass_all, but let us keep it just in case
-- lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
-- ;;
-+ case $LD in
-+ *-32|*"-32 ") libmagic=32-bit;;
-+ *-n32|*"-n32 ") libmagic=N32;;
-+ *-64|*"-64 ") libmagic=64-bit;;
-+ *) libmagic=never-match;;
- esac
-- lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
- lt_cv_deplibs_check_method=pass_all
- ;;
-
- # This must be Linux ELF.
--linux*)
-- case $host_cpu in
-- alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
-- lt_cv_deplibs_check_method=pass_all ;;
-- # the debian people say, arm and glibc 2.3.1 works for them with pass_all
-- arm* )
-- lt_cv_deplibs_check_method=pass_all ;;
-- *)
-- # glibc up to 2.1.1 does not perform some relocations on ARM
-- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
-- esac
-- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-+linux* | k*bsd*-gnu)
-+ lt_cv_deplibs_check_method=pass_all
- ;;
-
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- else
-@@ -2212,32 +2369,22 @@
- ;;
-
- openbsd*)
-- lt_cv_file_magic_cmd=/usr/bin/file
-- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
- else
-- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- fi
- ;;
-
- osf3* | osf4* | osf5*)
-- # this will be overridden with pass_all, but let us keep it just in case
-- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-- lt_cv_file_magic_test_file=/shlib/libc.so
-- lt_cv_deplibs_check_method=pass_all
-- ;;
--
--sco3.2v5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
- solaris*)
- lt_cv_deplibs_check_method=pass_all
-- lt_cv_file_magic_test_file=/lib/libc.so
- ;;
-
--sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+sysv4 | sysv4.3*)
- case $host_vendor in
- motorola)
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-@@ -2258,10 +2405,13 @@
- siemens)
- lt_cv_deplibs_check_method=pass_all
- ;;
-+ pc)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
- esac
- ;;
-
--sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- lt_cv_deplibs_check_method=pass_all
- ;;
- esac
-@@ -2281,36 +2431,43 @@
- # Let the user override the test.
- lt_cv_path_NM="$NM"
- else
-- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-- IFS="$lt_save_ifs"
-- test -z "$ac_dir" && ac_dir=.
-- tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-- # Check to see if the nm accepts a BSD-compat flag.
-- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-- # nm: unknown option "B" ignored
-- # Tru64's nm complains that /dev/null is an invalid object file
-- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-- */dev/null* | *'Invalid file or object type'*)
-- lt_cv_path_NM="$tmp_nm -B"
-- break
-- ;;
-- *)
-- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-- */dev/null*)
-- lt_cv_path_NM="$tmp_nm -p"
-+ lt_nm_to_check="${ac_tool_prefix}nm"
-+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-+ lt_nm_to_check="$lt_nm_to_check nm"
-+ fi
-+ for lt_tmp_nm in $lt_nm_to_check; do
-+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-+ IFS="$lt_save_ifs"
-+ test -z "$ac_dir" && ac_dir=.
-+ tmp_nm="$ac_dir/$lt_tmp_nm"
-+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-+ # Check to see if the nm accepts a BSD-compat flag.
-+ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-+ # nm: unknown option "B" ignored
-+ # Tru64's nm complains that /dev/null is an invalid object file
-+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-+ */dev/null* | *'Invalid file or object type'*)
-+ lt_cv_path_NM="$tmp_nm -B"
- break
- ;;
- *)
-- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-- continue # so that we can try to find one that supports BSD flags
-+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-+ */dev/null*)
-+ lt_cv_path_NM="$tmp_nm -p"
-+ break
-+ ;;
-+ *)
-+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-+ continue # so that we can try to find one that supports BSD flags
-+ ;;
-+ esac
- ;;
- esac
-- esac
-- fi
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
- done
-- IFS="$lt_save_ifs"
- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
- fi])
- NM="$lt_cv_path_NM"
-@@ -2342,13 +2499,13 @@
- # -----------------------------------
- # sets LIBLTDL to the link flags for the libltdl convenience library and
- # LTDLINCL to the include flags for the libltdl header and adds
--# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL
--# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
--# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will
--# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
--# '${top_srcdir}/' (note the single quotes!). If your package is not
--# flat and you're not using automake, define top_builddir and
--# top_srcdir appropriately in the Makefiles.
-+# --enable-ltdl-convenience to the configure arguments. Note that
-+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
-+# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
-+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
-+# (note the single quotes!). If your package is not flat and you're not
-+# using automake, define top_builddir and top_srcdir appropriately in
-+# the Makefiles.
- AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
- case $enable_ltdl_convenience in
-@@ -2367,13 +2524,13 @@
- # -----------------------------------
- # sets LIBLTDL to the link flags for the libltdl installable library and
- # LTDLINCL to the include flags for the libltdl header and adds
--# --enable-ltdl-install to the configure arguments. Note that LIBLTDL
--# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
--# DIRECTORY is not provided and an installed libltdl is not found, it is
--# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/'
--# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
--# quotes!). If your package is not flat and you're not using automake,
--# define top_builddir and top_srcdir appropriately in the Makefiles.
-+# --enable-ltdl-install to the configure arguments. Note that
-+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
-+# and an installed libltdl is not found, it is assumed to be `libltdl'.
-+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
-+# '${top_srcdir}/' (note the single quotes!). If your package is not
-+# flat and you're not using automake, define top_builddir and top_srcdir
-+# appropriately in the Makefiles.
- # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
- AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-@@ -2411,10 +2568,21 @@
- # ---------------
- AC_DEFUN([_LT_AC_LANG_CXX],
- [AC_REQUIRE([AC_PROG_CXX])
--AC_REQUIRE([AC_PROG_CXXCPP])
-+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
- _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
- ])# _LT_AC_LANG_CXX
-
-+# _LT_AC_PROG_CXXCPP
-+# ------------------
-+AC_DEFUN([_LT_AC_PROG_CXXCPP],
-+[
-+AC_REQUIRE([AC_PROG_CXX])
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+ (test "X$CXX" != "Xg++"))) ; then
-+ AC_PROG_CXXCPP
-+fi
-+])# _LT_AC_PROG_CXXCPP
-
- # AC_LIBTOOL_F77
- # --------------
-@@ -2454,7 +2622,7 @@
-
-
- # AC_LIBTOOL_RC
--# --------------
-+# -------------
- # enable support for Windows resource files
- AC_DEFUN([AC_LIBTOOL_RC],
- [AC_REQUIRE([LT_AC_PROG_RC])
-@@ -2487,36 +2655,9 @@
-
- _LT_AC_SYS_COMPILER
-
--#
--# Check for any special shared library compilation flags.
--#
--_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
--if test "$GCC" = no; then
-- case $host_os in
-- sco3.2v5*)
-- _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
-- ;;
-- esac
--fi
--if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
-- AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
-- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then :
-- else
-- AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
-- _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-- fi
--fi
--
--
--#
--# Check to make sure the static flag actually works.
--#
--AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
-- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-- $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
-- [],
-- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
--
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-
- ## CAVEAT EMPTOR:
- ## There is no encapsulation within the following macros, do not change
-@@ -2530,9 +2671,9 @@
- AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
- AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
- AC_LIBTOOL_SYS_LIB_STRIP
--AC_LIBTOOL_DLOPEN_SELF($1)
-+AC_LIBTOOL_DLOPEN_SELF
-
--# Report which librarie types wil actually be built
-+# Report which library types will actually be built
- AC_MSG_CHECKING([if libtool supports shared libraries])
- AC_MSG_RESULT([$can_build_shared])
-
-@@ -2541,7 +2682,7 @@
-
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
-+case $host_os in
- aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
-@@ -2550,37 +2691,11 @@
- fi
- ;;
-
--aix4*)
-+aix4* | aix5*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
-- ;;
-- darwin* | rhapsody*)
-- if test "$GCC" = yes; then
-- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-- case "$host_os" in
-- rhapsody* | darwin1.[[012]])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-- ;;
-- *) # Darwin 1.3 on
-- test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-- ;;
-- esac
-- output_verbose_link_cmd='echo'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=no
-- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-- else
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- fi
-- ;;
-+ ;;
- esac
- AC_MSG_RESULT([$enable_shared])
-
-@@ -2605,7 +2720,7 @@
- AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
- [AC_LANG_PUSH(C++)
- AC_REQUIRE([AC_PROG_CXX])
--AC_REQUIRE([AC_PROG_CXXCPP])
-+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -2617,6 +2732,7 @@
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(hardcode_automatic, $1)=no
- _LT_AC_TAGVAR(module_cmds, $1)=
- _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -2634,7 +2750,7 @@
- _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-
- # Source file extension for C++ test sources.
--ac_ext=cc
-+ac_ext=cpp
-
- # Object file extension for compiled C++ test sources.
- objext=o
-@@ -2644,11 +2760,15 @@
- lt_simple_compile_test_code="int some_variable = 0;\n"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
-+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
-
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC=$CC
- lt_save_LD=$LD
-@@ -2659,18 +2779,18 @@
- if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
- else
-- unset lt_cv_prog_gnu_ld
-+ $as_unset lt_cv_prog_gnu_ld
- fi
- if test -n "${lt_cv_path_LDCXX+set}"; then
- lt_cv_path_LD=$lt_cv_path_LDCXX
- else
-- unset lt_cv_path_LD
-+ $as_unset lt_cv_path_LD
- fi
- test -z "${LDCXX+set}" || LD=$LDCXX
- CC=${CXX-"c++"}
- compiler=$CC
- _LT_AC_TAGVAR(compiler, $1)=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+_LT_CC_BASENAME([$compiler])
-
- # We don't want -fno-exception wen compiling C++ code, so set the
- # no_builtin_flag separately
-@@ -2745,8 +2865,23 @@
- exp_sym_flag='-Bexport'
- no_entry_flag=""
- else
-- # KDE requires run time linking. Make it the default.
-- aix_use_runtimelinking=yes
-+ aix_use_runtimelinking=no
-+
-+ # Test if we are trying to use run time linking or normal
-+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+ # need to do runtime linking.
-+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-+ for ld_flag in $LDFLAGS; do
-+ case $ld_flag in
-+ *-brtl*)
-+ aix_use_runtimelinking=yes
-+ break
-+ ;;
-+ esac
-+ done
-+ ;;
-+ esac
-+
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
-@@ -2763,7 +2898,7 @@
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
- if test "$GXX" = yes; then
-- case $host_os in aix4.[012]|aix4.[012].*)
-+ case $host_os in aix4.[[012]]|aix4.[[012]].*)
- # We only want to do this on AIX 4.2 and lower, the check
- # below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
-@@ -2782,8 +2917,12 @@
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
- fi
-+ ;;
- esac
- shared_flag='-shared'
-+ if test "$aix_use_runtimelinking" = yes; then
-+ shared_flag="$shared_flag "'${wl}-G'
-+ fi
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
-@@ -2792,15 +2931,16 @@
- shared_flag='-G'
- else
- if test "$aix_use_runtimelinking" = yes; then
-- shared_flag='-qmkshrobj ${wl}-G'
-+ shared_flag='${wl}-G'
- else
-- shared_flag='-qmkshrobj'
-+ shared_flag='${wl}-bM:SRE'
- fi
- fi
- fi
-
-- # Let the compiler handle the export list.
-- _LT_AC_TAGVAR(always_export_symbols, $1)=no
-+ # It seems that -bexpall does not export symbols beginning with
-+ # underscore (_), so it is better to generate a list of symbols to export.
-+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
- # Warning - without using the other runtime loading flags (-brtl),
- # -berok will link without error, but may produce a broken library.
-@@ -2809,13 +2949,12 @@
- _LT_AC_SYS_LIBPATH_AIX
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an empty executable.
- _LT_AC_SYS_LIBPATH_AIX
-@@ -2824,16 +2963,26 @@
- # -berok will link without error, but may produce a broken library.
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-- # -bexpall does not export symbols beginning with underscore (_)
-- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
- # Exported symbols can be pulled into shared objects from archives
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-- # This is similar to how AIX traditionally builds it's shared libraries.
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+ # This is similar to how AIX traditionally builds its shared libraries.
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
-+
-+ beos*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+ # support --undefined. This deserves some investigation. FIXME
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ else
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
- chorus*)
- case $cc_basename in
- *)
-@@ -2847,12 +2996,12 @@
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -2861,59 +3010,81 @@
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
-- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-+ darwin* | rhapsody*)
-+ case $host_os in
-+ rhapsody* | darwin1.[[012]])
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-+ ;;
-+ *) # Darwin 1.3 on
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[[012]])
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ ;;
-+ 10.*)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-+ ;;
-+ esac
-+ fi
-+ ;;
-+ esac
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-- darwin* | rhapsody*)
-- if test "$GXX" = yes; then
-- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-- case "$host_os" in
-- rhapsody* | darwin1.[[012]])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-- ;;
-- *) # Darwin 1.3 on
-- test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-- ;;
-- esac
-- lt_int_apple_cc_single_mod=no
-- output_verbose_link_cmd='echo'
-- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-- lt_int_apple_cc_single_mod=yes
-- fi
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- fi
-- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- else
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- fi
-- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=no
-- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-- else
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- fi
-- ;;
-+ if test "$GXX" = yes ; then
-+ lt_int_apple_cc_single_mod=no
-+ output_verbose_link_cmd='echo'
-+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-+ lt_int_apple_cc_single_mod=yes
-+ fi
-+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ else
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ fi
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ else
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ fi
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ else
-+ case $cc_basename in
-+ xlc*)
-+ output_verbose_link_cmd='echo'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ fi
-+ ;;
-
- dgux*)
- case $cc_basename in
-- ec++)
-+ ec++*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-- ghcx)
-+ ghcx*)
- # Green Hills C++ Compiler
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -2924,14 +3095,14 @@
- ;;
- esac
- ;;
-- freebsd[12]*)
-+ freebsd[[12]]*)
- # C++ shared libraries reported to be fairly broken before switch to ELF
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- freebsd-elf*)
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- ;;
-- freebsd*)
-+ freebsd* | dragonfly*)
- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
- # conventions
- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -2948,11 +3119,11 @@
- # location of the library.
-
- case $cc_basename in
-- CC)
-+ CC*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-- aCC)
-+ aCC*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
-@@ -2962,7 +3133,7 @@
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
-- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- if test "$GXX" = yes; then
-@@ -2976,33 +3147,22 @@
- ;;
- hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
-- case "$host_cpu" in
-- hppa*64*)
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ case $host_cpu in
-+ hppa*64*|ia64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-- ;;
-- ia64*)
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- ;;
- *)
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- ;;
- esac
- fi
-- case "$host_cpu" in
-- hppa*64*)
-- _LT_AC_TAGVAR(hardcode_direct, $1)=no
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- ;;
-- ia64*)
-+ case $host_cpu in
-+ hppa*64*|ia64*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-- # but as the default
-- # location of the library.
- ;;
- *)
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -3013,14 +3173,17 @@
- esac
-
- case $cc_basename in
-- CC)
-+ CC*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-- aCC)
-- case "$host_cpu" in
-- hppa*64*|ia64*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-+ aCC*)
-+ case $host_cpu in
-+ hppa*64*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ ;;
-+ ia64*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-@@ -3039,9 +3202,12 @@
- *)
- if test "$GXX" = yes; then
- if test $with_gnu_ld = no; then
-- case "$host_cpu" in
-- ia64*|hppa*64*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-+ case $host_cpu in
-+ hppa*64*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ ;;
-+ ia64*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-@@ -3055,11 +3221,25 @@
- ;;
- esac
- ;;
-+ interix3*)
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-+ # Instead, shared libraries are loaded at an image base (0x10000000 by
-+ # default) and relocated if they conflict, which is a slow very memory
-+ # consuming and fragmenting process. To avoid this, we pick a random,
-+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+ ;;
- irix5* | irix6*)
- case $cc_basename in
-- CC)
-+ CC*)
- # SGI C++
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
- # Archives containing C++ object files must be created using
- # "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -3070,7 +3250,7 @@
- *)
- if test "$GXX" = yes; then
- if test "$with_gnu_ld" = no; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
- fi
-@@ -3081,9 +3261,9 @@
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-- linux*)
-+ linux* | k*bsd*-gnu)
- case $cc_basename in
-- KCC)
-+ KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-
- # KCC will only create a shared library if the output file
-@@ -3108,17 +3288,41 @@
- # "CC -Bstatic", where "CC" is the KAI C++ compiler.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
- ;;
-- icpc)
-+ icpc*)
- # Intel C++
- with_gnu_ld=yes
-+ # version 8.0 and above of icpc choke on multiply defined symbols
-+ # if we add $predep_objects and $postdep_objects, however 7.1 and
-+ # earlier do not add the objects themselves.
-+ case `$CC -V 2>&1` in
-+ *"Version 7."*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ ;;
-+ *) # Version 8.0 or newer
-+ tmp_idyn=
-+ case $host_cpu in
-+ ia64*) tmp_idyn=' -i_dynamic';;
-+ esac
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ ;;
-+ esac
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- ;;
-- cxx)
-+ pgCC*)
-+ # Portland Group C++ compiler
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ ;;
-+ cxx*)
- # Compaq C++
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-@@ -3149,7 +3353,7 @@
- ;;
- mvs*)
- case $cc_basename in
-- cxx)
-+ cxx*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-@@ -3159,7 +3363,7 @@
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- wlarc=
-@@ -3170,9 +3374,25 @@
- # Workaround some broken pre-1.5 toolchains
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
- ;;
-+ openbsd2*)
-+ # C++ shared libraries are fairly broken
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ openbsd*)
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ fi
-+ output_verbose_link_cmd='echo'
-+ ;;
- osf3*)
- case $cc_basename in
-- KCC)
-+ KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-
- # KCC will only create a shared library if the output file
-@@ -3188,14 +3408,14 @@
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-
- ;;
-- RCC)
-+ RCC*)
- # Rational C++ 2.4.1
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-- cxx)
-+ cxx*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3213,7 +3433,7 @@
- *)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3232,7 +3452,7 @@
- ;;
- osf4* | osf5*)
- case $cc_basename in
-- KCC)
-+ KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-
- # KCC will only create a shared library if the output file
-@@ -3247,17 +3467,17 @@
- # the KAI C++ compiler.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
- ;;
-- RCC)
-+ RCC*)
- # Rational C++ 2.4.1
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-- cxx)
-+ cxx*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- echo "-hidden">> $lib.exp~
-- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
-+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
- $rm $lib.exp'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -3276,7 +3496,7 @@
- *)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3297,27 +3517,14 @@
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-- sco*)
-- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-- case $cc_basename in
-- CC)
-- # FIXME: insert proper C++ library support
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- ;;
-- *)
-- # FIXME: insert proper C++ library support
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- ;;
-- esac
-- ;;
- sunos4*)
- case $cc_basename in
-- CC)
-+ CC*)
- # Sun C++ 4.x
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-- lcc)
-+ lcc*)
- # Lucid
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3330,36 +3537,33 @@
- ;;
- solaris*)
- case $cc_basename in
-- CC)
-+ CC*)
- # Sun C++ 4.2, 5.x and Centerline C++
-+ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- case $host_os in
-- solaris2.[0-5] | solaris2.[0-5].*) ;;
-+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *)
- # The C++ compiler is used as linker so we must use $wl
- # flag to pass the commands to the underlying system
-- # linker.
-+ # linker. We must also pass each convience library through
-+ # to the system linker between allextract/defaultextract.
-+ # The C++ compiler will combine linker options so we
-+ # cannot just pass the convience library names through
-+ # without $wl.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
- ;;
- esac
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-- # Commands to make compiler produce verbose output that lists
-- # what "hidden" libraries, object files and flags are used when
-- # linking a shared library.
-- #
-- # There doesn't appear to be a way to prevent this compiler from
-- # explicitly linking system object files so we need to strip them
-- # from the output so that they don't get included in the library
-- # dependencies.
-- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ output_verbose_link_cmd='echo'
-
- # Archives containing C++ object files must be created using
- # "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -3367,7 +3571,7 @@
- # in the archive.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
- ;;
-- gcx)
-+ gcx*)
- # Green Hills C++ Compiler
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-@@ -3405,12 +3609,63 @@
- ;;
- esac
- ;;
-- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ runpath_var='LD_RUN_PATH'
-+
-+ case $cc_basename in
-+ CC*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ esac
-+ ;;
-+ sysv5* | sco3.2v5* | sco5v6*)
-+ # Note: We can NOT use -z defs as we might desire, because we do not
-+ # link with -lc, and that would cause any symbols used from libc to
-+ # always be unresolved, which means just about no library would
-+ # ever link correctly. If we're not using GNU ld we use -z text
-+ # though, which does catch some bad symbols but isn't as heavy-handed
-+ # as -z defs.
-+ # For security reasons, it is highly recommended that you always
-+ # use absolute paths for naming shared libraries, and exclude the
-+ # DT_RUNPATH tag from executables and libraries. But doing so
-+ # requires that you compile everything twice, which is a pain.
-+ # So that behaviour is only enabled if SCOABSPATH is set to a
-+ # non-empty value in the environment. Most likely only useful for
-+ # creating official distributions of packages.
-+ # This is a hack until libtool officially supports absolute path
-+ # names for shared libraries.
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-+ runpath_var='LD_RUN_PATH'
-+
-+ case $cc_basename in
-+ CC*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ esac
- ;;
- tandem*)
- case $cc_basename in
-- NCC)
-+ NCC*)
- # NonStop-UX NCC 3.20
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3447,8 +3702,6 @@
- AC_LIBTOOL_PROG_LD_SHLIBS($1)
- AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
- AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--AC_LIBTOOL_SYS_LIB_STRIP
--AC_LIBTOOL_DLOPEN_SELF($1)
-
- AC_LIBTOOL_CONFIG($1)
-
-@@ -3466,7 +3719,7 @@
- ])# AC_LIBTOOL_LANG_CXX_CONFIG
-
- # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
--# ------------------------
-+# ------------------------------------
- # Figure out "hidden" library dependencies from verbose
- # compiler output when linking a shared library.
- # Parse the compiler output and extract the necessary
-@@ -3520,7 +3773,7 @@
- # The `*' in the case matches for architectures that use `case' in
- # $output_verbose_cmd can trigger glob expansion during the loop
- # eval without this substitution.
-- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-
- for p in `eval $output_verbose_link_cmd`; do
- case $p in
-@@ -3560,7 +3813,7 @@
- fi
- ;;
-
-- *.$objext|*.$libext)
-+ *.$objext)
- # This assumes that the test object file only shows up
- # once in the compiler output.
- if test "$p" = "conftest.$objext"; then
-@@ -3596,13 +3849,37 @@
-
- $rm -f confest.$objext
-
-+# PORTME: override above test on systems where it is broken
-+ifelse([$1],[CXX],
-+[case $host_os in
-+interix3*)
-+ # Interix 3.5 installs completely hosed .la files for C++, so rather than
-+ # hack all around it, let's just trust "g++" to DTRT.
-+ _LT_AC_TAGVAR(predep_objects,$1)=
-+ _LT_AC_TAGVAR(postdep_objects,$1)=
-+ _LT_AC_TAGVAR(postdeps,$1)=
-+ ;;
-+
-+solaris*)
-+ case $cc_basename in
-+ CC*)
-+ # Adding this requires a known-good setup of shared libraries for
-+ # Sun compiler versions before 5.6, else PIC objects from an old
-+ # archive will be linked into the output, leading to subtle bugs.
-+ _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
-+ ;;
-+ esac
-+ ;;
-+esac
-+])
-+
- case " $_LT_AC_TAGVAR(postdeps, $1) " in
- *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
- esac
- ])# AC_LIBTOOL_POSTDEP_PREDEP
-
- # AC_LIBTOOL_LANG_F77_CONFIG
--# ------------------------
-+# --------------------------
- # Ensure that the configuration vars for the C compiler are
- # suitably defined. Those variables are subsequently used by
- # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -3646,12 +3923,16 @@
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
-
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${F77-"f77"}
- compiler=$CC
- _LT_AC_TAGVAR(compiler, $1)=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+_LT_CC_BASENAME([$compiler])
-
- AC_MSG_CHECKING([if libtool supports shared libraries])
- AC_MSG_RESULT([$can_build_shared])
-@@ -3661,7 +3942,7 @@
-
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
-+case $host_os in
- aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
-@@ -3669,8 +3950,10 @@
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
--aix4*)
-- test "$enable_shared" = yes && enable_static=no
-+aix4* | aix5*)
-+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+ test "$enable_shared" = yes && enable_static=no
-+ fi
- ;;
- esac
- AC_MSG_RESULT([$enable_shared])
-@@ -3680,8 +3963,6 @@
- test "$enable_shared" = yes || enable_static=yes
- AC_MSG_RESULT([$enable_static])
-
--test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
--
- _LT_AC_TAGVAR(GCC, $1)="$G77"
- _LT_AC_TAGVAR(LD, $1)="$LD"
-
-@@ -3691,8 +3972,6 @@
- AC_LIBTOOL_PROG_LD_SHLIBS($1)
- AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
- AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--AC_LIBTOOL_SYS_LIB_STRIP
--
-
- AC_LIBTOOL_CONFIG($1)
-
-@@ -3721,20 +4000,27 @@
- lt_simple_compile_test_code="class foo {}\n"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
-
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${GCJ-"gcj"}
- compiler=$CC
- _LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
-
- # GCJ did not exist at the time GCC didn't implicitly link libc in.
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-
-+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+
- ## CAVEAT EMPTOR:
- ## There is no encapsulation within the following macros, do not change
- ## the running order or otherwise move them around unless you know exactly
-@@ -3746,8 +4032,6 @@
- AC_LIBTOOL_PROG_LD_SHLIBS($1)
- AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
- AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--AC_LIBTOOL_SYS_LIB_STRIP
--AC_LIBTOOL_DLOPEN_SELF($1)
-
- AC_LIBTOOL_CONFIG($1)
-
-@@ -3757,7 +4041,7 @@
-
-
- # AC_LIBTOOL_LANG_RC_CONFIG
--# --------------------------
-+# -------------------------
- # Ensure that the configuration vars for the Windows resource compiler are
- # suitably defined. Those variables are subsequently used by
- # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -3781,11 +4065,16 @@
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
-
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- CC=${RC-"windres"}
- compiler=$CC
- _LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
- AC_LIBTOOL_CONFIG($1)
-@@ -3811,11 +4100,12 @@
- # without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
-- fi
-+ fi
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
-- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-+ SED SHELL STRIP \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
- deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -3865,7 +4155,7 @@
- _LT_AC_TAGVAR(archive_cmds, $1) | \
- _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
- _LT_AC_TAGVAR(module_cmds, $1) | \
-- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
- _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
- extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -3920,7 +4210,7 @@
- #
- # 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
-@@ -3931,11 +4221,11 @@
- SED=$lt_SED
-
- # Sed that helps us avoid accidentally triggering echo(1) options like -n.
--Xsed="$SED -e s/^X//"
-+Xsed="$SED -e 1s/^X//"
-
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
- # The names of the tagged configurations supported by this script.
- available_tags=
-@@ -3966,6 +4256,12 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
-+
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
-@@ -3977,6 +4273,9 @@
- # A C compiler.
- LTCC=$lt_LTCC
-
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
-+
- # A language-specific compiler.
- CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-
-@@ -3996,7 +4295,7 @@
- NM=$lt_NM
-
- # A symbol stripping program
--STRIP=$STRIP
-+STRIP=$lt_STRIP
-
- # Used to examine libraries when file_magic_cmd begins "file"
- MAGIC_CMD=$MAGIC_CMD
-@@ -4027,7 +4326,7 @@
- libext="$libext"
-
- # Shared library suffix (normally ".so").
--shrext='$shrext'
-+shrext_cmds='$shrext_cmds'
-
- # Executable file suffix (normally "").
- exeext="$exeext"
-@@ -4042,7 +4341,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-
--# Must we lock files when doing compilation ?
-+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
-
- # Do we need the lib prefix for modules?
-@@ -4271,7 +4570,10 @@
- # If there is no Makefile yet, we rely on a make rule to execute
- # `config.status --recheck' to rerun these tests and create the
- # libtool script then.
-- test -f Makefile && make "$ltmain"
-+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+ if test -f "$ltmain_in"; then
-+ test -f Makefile && make "$ltmain"
-+ fi
- fi
- ])# AC_LIBTOOL_CONFIG
-
-@@ -4313,9 +4615,6 @@
- # Regexp to match symbols that can be accessed directly from C.
- sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
--# Transform the above into a raw symbol and a C symbol.
--symxfrm='\1 \2\3 \3'
--
- # Transform an extracted symbol line into a proper C declaration
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-@@ -4337,14 +4636,30 @@
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
- ;;
-+linux* | k*bsd*-gnu)
-+ if test "$host_cpu" = ia64; then
-+ symcode='[[ABCDGIRSTW]]'
-+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
-+ fi
-+ ;;
- irix* | nonstopux*)
- symcode='[[BCDEGRST]]'
- ;;
- osf*)
- symcode='[[BCDEGQRST]]'
- ;;
--solaris* | sysv5*)
-- symcode='[[BDT]]'
-+solaris*)
-+ symcode='[[BDRT]]'
-+ ;;
-+sco3.2v5*)
-+ symcode='[[DT]]'
-+ ;;
-+sysv4.2uw2*)
-+ symcode='[[DT]]'
-+ ;;
-+sysv5* | sco5v6* | unixware* | OpenUNIX*)
-+ symcode='[[ABDT]]'
- ;;
- sysv4)
- symcode='[[DFNSTU]]'
-@@ -4362,14 +4677,17 @@
- # If we're using GNU nm, then use its standard symbol codes.
- case `$NM -V 2>&1` in
- *GNU* | *'with BFD'*)
-- symcode='[[ABCDGISTW]]' ;;
-+ symcode='[[ABCDGIRSTW]]' ;;
- esac
-
- # Try without a prefix undercore, then with it.
- for ac_symprfx in "" "_"; do
-
-+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+ symxfrm="\\1 $ac_symprfx\\2 \\2"
-+
- # Write the raw and C identifiers.
-- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-
- # Check to see that the pipe works correctly.
- pipe_works=no
-@@ -4525,6 +4843,10 @@
- # DJGPP does not support shared libraries at all
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- ;;
-+ interix3*)
-+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+ # Instead, we relocate shared libraries at runtime.
-+ ;;
- sysv4*MP*)
- if test -d /usr/nec; then
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -4533,7 +4855,7 @@
- hpux*)
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
-- case "$host_cpu" in
-+ case $host_cpu in
- hppa*64*|ia64*)
- ;;
- *)
-@@ -4558,18 +4880,28 @@
- ;;
- chorus*)
- case $cc_basename in
-- cxch68)
-+ cxch68*)
- # Green Hills C++ Compiler
- # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
- ;;
- esac
- ;;
-+ darwin*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ case $cc_basename in
-+ xlc*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ ;;
-+ esac
-+ ;;
- dgux*)
- case $cc_basename in
-- ec++)
-+ ec++*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- ;;
-- ghcx)
-+ ghcx*)
- # Green Hills C++ Compiler
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- ;;
-@@ -4577,22 +4909,22 @@
- ;;
- esac
- ;;
-- freebsd*)
-+ freebsd* | dragonfly*)
- # FreeBSD uses GNU C++
- ;;
- hpux9* | hpux10* | hpux11*)
- case $cc_basename in
-- CC)
-+ CC*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- if test "$host_cpu" != ia64; then
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
- fi
- ;;
-- aCC)
-+ aCC*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-- case "$host_cpu" in
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+ case $host_cpu in
- hppa*64*|ia64*)
- # +Z the default
- ;;
-@@ -4605,9 +4937,13 @@
- ;;
- esac
- ;;
-+ interix*)
-+ # This is c89, which is MS Visual C++ (no shared libs)
-+ # Anyone wants to do a port?
-+ ;;
- irix5* | irix6* | nonstopux*)
- case $cc_basename in
-- CC)
-+ CC*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- # CC pic flag -KPIC is the default.
-@@ -4616,20 +4952,26 @@
- ;;
- esac
- ;;
-- linux*)
-+ linux* | k*bsd*-gnu)
- case $cc_basename in
-- KCC)
-+ KCC*)
- # KAI C++ Compiler
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
-- icpc)
-+ icpc* | ecpc*)
- # Intel C++
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-- ;;
-- cxx)
-+ ;;
-+ pgCC*)
-+ # Portland Group C++ compiler.
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+ cxx*)
- # Compaq C++
- # Make sure the PIC flag is empty. It appears that all Alpha
- # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -4646,25 +4988,25 @@
- ;;
- mvs*)
- case $cc_basename in
-- cxx)
-+ cxx*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
- ;;
- *)
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- ;;
- osf3* | osf4* | osf5*)
- case $cc_basename in
-- KCC)
-+ KCC*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- ;;
-- RCC)
-+ RCC*)
- # Rational C++ 2.4.1
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- ;;
-- cxx)
-+ cxx*)
- # Digital/Compaq C++
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # Make sure the PIC flag is empty. It appears that all Alpha
-@@ -4678,24 +5020,15 @@
- ;;
- psos*)
- ;;
-- sco*)
-- case $cc_basename in
-- CC)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-- ;;
-- *)
-- ;;
-- esac
-- ;;
- solaris*)
- case $cc_basename in
-- CC)
-+ CC*)
- # Sun C++ 4.2, 5.x and Centerline C++
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- ;;
-- gcx)
-+ gcx*)
- # Green Hills C++ Compiler
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- ;;
-@@ -4705,12 +5038,12 @@
- ;;
- sunos4*)
- case $cc_basename in
-- CC)
-+ CC*)
- # Sun C++ 4.x
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-- lcc)
-+ lcc*)
- # Lucid
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- ;;
-@@ -4720,7 +5053,7 @@
- ;;
- tandem*)
- case $cc_basename in
-- NCC)
-+ NCC*)
- # NonStop-UX NCC 3.20
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- ;;
-@@ -4728,7 +5061,14 @@
- ;;
- esac
- ;;
-- unixware*)
-+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+ case $cc_basename in
-+ CC*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+ esac
- ;;
- vxworks*)
- ;;
-@@ -4775,6 +5115,11 @@
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
-
-+ interix3*)
-+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+ # Instead, we relocate shared libraries at runtime.
-+ ;;
-+
- msdosdjgpp*)
- # Just because we use GCC doesn't mean we suddenly get shared libraries
- # on systems that don't support them.
-@@ -4791,7 +5136,7 @@
- hpux*)
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
-- case "$host_cpu" in
-+ case $host_cpu in
- hppa*64*|ia64*)
- # +Z the default
- ;;
-@@ -4817,6 +5162,16 @@
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
- fi
- ;;
-+ darwin*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ case $cc_basename in
-+ xlc*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ ;;
-+ esac
-+ ;;
-
- mingw* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
-@@ -4828,7 +5183,7 @@
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
-- case "$host_cpu" in
-+ case $host_cpu in
- hppa*64*|ia64*)
- # +Z the default
- ;;
-@@ -4851,13 +5206,20 @@
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
-- linux*)
-- case $CC in
-+ linux* | k*bsd*-gnu)
-+ case $cc_basename in
- icc* | ecc*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
-+ pgcc* | pgf77* | pgf90* | pgf95*)
-+ # Portland Group compilers (*not* the Pentium gcc compiler,
-+ # which looks to be a dead project)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
- ccc*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # All Alpha code is PIC.
-@@ -4872,15 +5234,15 @@
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
-- sco3.2v5*)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
-- ;;
--
- solaris*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ case $cc_basename in
-+ f77* | f90* | f95*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-+ *)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-+ esac
- ;;
-
- sunos4*)
-@@ -4889,7 +5251,7 @@
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
-- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+ sysv4 | sysv4.2uw2* | sysv4.3*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4902,6 +5264,17 @@
- fi
- ;;
-
-+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+
-+ unicos*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+ ;;
-+
- uts4*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4929,7 +5302,7 @@
- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
- fi
--case "$host_os" in
-+case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *djgpp*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -4938,6 +5311,16 @@
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
- ;;
- esac
-+
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
-+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-+ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-+ $lt_tmp_static_flag,
-+ [],
-+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
- ])
-
-
-@@ -4962,7 +5345,10 @@
- _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
- ;;
- cygwin* | mingw*)
-- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ ;;
-+ linux* | k*bsd*-gnu)
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
- ;;
- *)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -4988,7 +5374,7 @@
- _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
- _LT_AC_TAGVAR(hardcode_automatic, $1)=no
- _LT_AC_TAGVAR(module_cmds, $1)=
-- _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- # include_expsyms should be a list of space-separated symbols to be *always*
-@@ -5005,7 +5391,8 @@
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
- extract_expsyms_cmds=
--
-+ # Just being paranoid about ensuring that cc_basename is set.
-+ _LT_CC_BASENAME([$compiler])
- case $host_os in
- cygwin* | mingw* | pw32*)
- # FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -5015,6 +5402,10 @@
- with_gnu_ld=no
- fi
- ;;
-+ interix*)
-+ # we just hope/assume this is gcc and not c89 (= MSVC++)
-+ with_gnu_ld=yes
-+ ;;
- openbsd*)
- with_gnu_ld=no
- ;;
-@@ -5025,6 +5416,27 @@
- # If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
-
-+ # Set some defaults for GNU ld with shared library support. These
-+ # are reset later if shared libraries are not supported. Putting them
-+ # here allows them to be overridden if necessary.
-+ runpath_var=LD_RUN_PATH
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+ # ancient GNU ld didn't support --whole-archive et. al.
-+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ else
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+ fi
-+ supports_anon_versioning=no
-+ case `$LD -v 2>/dev/null` in
-+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+ *\ 2.11.*) ;; # other 2.11 versions
-+ *) supports_anon_versioning=yes ;;
-+ esac
-+
- # See if GNU ld supports shared libraries.
- case $host_os in
- aix3* | aix4* | aix5*)
-@@ -5072,13 +5484,13 @@
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -5087,13 +5499,60 @@
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
-- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
-- ld_shlibs=no
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
-- netbsd*)
-+ interix3*)
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-+ # Instead, shared libraries are loaded at an image base (0x10000000 by
-+ # default) and relocated if they conflict, which is a slow very memory
-+ # consuming and fragmenting process. To avoid this, we pick a random,
-+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+ ;;
-+
-+ linux* | k*bsd*-gnu)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ tmp_addflag=
-+ case $cc_basename,$host_cpu in
-+ pgcc*) # Portland Group C compiler
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_addflag=' $pic_flag'
-+ ;;
-+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_addflag=' $pic_flag -Mnomain' ;;
-+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
-+ tmp_addflag=' -i_dynamic' ;;
-+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
-+ tmp_addflag=' -i_dynamic -nofor_main' ;;
-+ ifc* | ifort*) # Intel Fortran compiler
-+ tmp_addflag=' -nofor_main' ;;
-+ esac
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+ if test $supports_anon_versioning = yes; then
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+ $echo "local: *; };" >> $output_objdir/$libname.ver~
-+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ fi
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+ else
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -5103,7 +5562,7 @@
- fi
- ;;
-
-- solaris* | sysv5*)
-+ solaris*)
- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- cat <<EOF 1>&2
-@@ -5124,6 +5583,33 @@
- fi
- ;;
-
-+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-+ case `$LD -v 2>&1` in
-+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ cat <<_LT_EOF 1>&2
-+
-+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-+*** reliably create shared libraries on SCO systems. Therefore, libtool
-+*** is disabling shared libraries support. We urge you to upgrade GNU
-+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+_LT_EOF
-+ ;;
-+ *)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-+ else
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+ esac
-+ ;;
-+
- sunos4*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- wlarc=
-@@ -5141,16 +5627,11 @@
- ;;
- esac
-
-- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
-- runpath_var=LD_RUN_PATH
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-- # ancient GNU ld didn't support --whole-archive et. al.
-- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-- else
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-- fi
-+ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
-+ runpath_var=
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
- fi
- else
- # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -5162,7 +5643,7 @@
- # Note: this linker hardcodes the directories in LIBPATH if there
- # are no directories specified by -L.
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-- if test "$GCC" = yes && test -z "$link_static_flag"; then
-+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
- # Neither direct hardcoding nor static linking is supported with a
- # broken collect2.
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -5184,9 +5665,21 @@
- else
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
- fi
-+ aix_use_runtimelinking=no
-+
-+ # Test if we are trying to use run time linking or normal
-+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+ # need to do runtime linking.
-+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-+ for ld_flag in $LDFLAGS; do
-+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-+ aix_use_runtimelinking=yes
-+ break
-+ fi
-+ done
-+ ;;
-+ esac
-
-- # KDE requires run time linking. Make it the default.
-- aix_use_runtimelinking=yes
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
-@@ -5203,7 +5696,7 @@
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
- if test "$GCC" = yes; then
-- case $host_os in aix4.[012]|aix4.[012].*)
-+ case $host_os in aix4.[[012]]|aix4.[[012]].*)
- # We only want to do this on AIX 4.2 and lower, the check
- # below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
-@@ -5222,8 +5715,12 @@
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
- fi
-+ ;;
- esac
- shared_flag='-shared'
-+ if test "$aix_use_runtimelinking" = yes; then
-+ shared_flag="$shared_flag "'${wl}-G'
-+ fi
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
-@@ -5231,30 +5728,30 @@
- # chokes on -Wl,-G. The following line is correct:
- shared_flag='-G'
- else
-- if test "$aix_use_runtimelinking" = yes; then
-- shared_flag='-qmkshrobj ${wl}-G'
-+ if test "$aix_use_runtimelinking" = yes; then
-+ shared_flag='${wl}-G'
- else
-- shared_flag='-qmkshrobj'
-- fi
-+ shared_flag='${wl}-bM:SRE'
-+ fi
- fi
- fi
-
-- # Let the compiler handle the export list.
-- _LT_AC_TAGVAR(always_export_symbols, $1)=no
-+ # It seems that -bexpall does not export symbols beginning with
-+ # underscore (_), so it is better to generate a list of symbols to export.
-+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
- # Warning - without using the other runtime loading flags (-brtl),
- # -berok will link without error, but may produce a broken library.
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
- # Determine the default libpath from the value encoded in an empty executable.
-- _LT_AC_SYS_LIBPATH_AIX
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ _LT_AC_SYS_LIBPATH_AIX
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an empty executable.
- _LT_AC_SYS_LIBPATH_AIX
-@@ -5263,13 +5760,11 @@
- # -berok will link without error, but may produce a broken library.
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-- # -bexpall does not export symbols beginning with underscore (_)
-- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
- # Exported symbols can be pulled into shared objects from archives
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-- # This is similar to how AIX traditionally builds it's shared libraries.
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+ # This is similar to how AIX traditionally builds its shared libraries.
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
-@@ -5282,7 +5777,7 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-
-- bsdi4*)
-+ bsdi[[45]]*)
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
- ;;
-
-@@ -5292,58 +5787,69 @@
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
-- shrext=".dll"
-+ shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
- # FIXME: Should let the user specify the lib program.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
-- fix_srcfile_path='`cygpath -w "$srcfile"`'
-+ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- ;;
-
- darwin* | rhapsody*)
-- if test "$GXX" = yes ; then
-- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-- case "$host_os" in
-- rhapsody* | darwin1.[[012]])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-- ;;
-- *) # Darwin 1.3 on
-- test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-- ;;
-+ case $host_os in
-+ rhapsody* | darwin1.[[012]])
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-+ ;;
-+ *) # Darwin 1.3 on
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[[012]])
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ ;;
-+ 10.*)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-+ ;;
-+ esac
-+ fi
-+ ;;
- esac
-- lt_int_apple_cc_single_mod=no
-- output_verbose_link_cmd='echo'
-- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-- lt_int_apple_cc_single_mod=yes
-- fi
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- fi
-- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- else
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- fi
-- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-- else
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- fi
-+ if test "$GCC" = yes ; then
-+ output_verbose_link_cmd='echo'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ else
-+ case $cc_basename in
-+ xlc*)
-+ output_verbose_link_cmd='echo'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ fi
- ;;
-
- dgux*)
-@@ -5376,7 +5882,7 @@
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd*)
-+ freebsd* | dragonfly*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -5399,47 +5905,62 @@
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- ;;
-
-- hpux10* | hpux11*)
-+ hpux10*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-- case "$host_cpu" in
-- hppa*64*|ia64*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+ fi
-+ if test "$with_gnu_ld" = no; then
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+ fi
-+ ;;
-+
-+ hpux11*)
-+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+ case $host_cpu in
-+ hppa*64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
-+ ia64*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- else
-- case "$host_cpu" in
-- hppa*64*|ia64*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ case $host_cpu in
-+ hppa*64*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ ia64*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- fi
- if test "$with_gnu_ld" = no; then
-- case "$host_cpu" in
-- hppa*64*)
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ case $host_cpu in
-+ hppa*64*|ia64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-- ia64*)
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=no
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--
-- # hardcode_minus_L: Not really in the search PATH,
-- # but as the default location of the library.
-- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-- ;;
- *)
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-@@ -5463,7 +5984,7 @@
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -5487,6 +6008,7 @@
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- else
-@@ -5532,7 +6054,7 @@
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
- # Both c and cxx compiler support -rpath directly
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -5540,21 +6062,15 @@
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-
-- sco3.2v5*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-- runpath_var=LD_RUN_PATH
-- hardcode_runpath_var=yes
-- ;;
--
- solaris*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
- if test "$GCC" = yes; then
-+ wlarc='${wl}'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
- else
-+ wlarc=''
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -5563,8 +6079,18 @@
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-+ *)
-+ # The compiler driver will combine linker options so we
-+ # cannot just pass the convience library names through
-+ # without $wl, iff we do not link with $LD.
-+ # Luckily, gcc supports the same syntax we need for Sun Studio.
-+ # Supported since Solaris 2.6 (maybe 2.5.1?)
-+ case $wlarc in
-+ '')
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-+ *)
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ esac ;;
- esac
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-@@ -5621,36 +6147,45 @@
- fi
- ;;
-
-- sysv4.2uw2*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- hardcode_runpath_var=yes
-- runpath_var=LD_RUN_PATH
-- ;;
-+ runpath_var='LD_RUN_PATH'
-
-- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
-- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
- if test "$GCC" = yes; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
-- runpath_var='LD_RUN_PATH'
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
-- sysv5*)
-- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-- # $CC -shared without GNU ld will not create a library from C++
-- # object files and a static libstdc++, better avoid it by now
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+ sysv5* | sco3.2v5* | sco5v6*)
-+ # Note: We can NOT use -z defs as we might desire, because we do not
-+ # link with -lc, and that would cause any symbols used from libc to
-+ # always be unresolved, which means just about no library would
-+ # ever link correctly. If we're not using GNU ld we use -z text
-+ # though, which does catch some bad symbols but isn't as heavy-handed
-+ # as -z defs.
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
- runpath_var='LD_RUN_PATH'
-+
-+ if test "$GCC" = yes; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ fi
- ;;
-
- uts4*)
-@@ -5668,11 +6203,6 @@
- AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
- test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
--variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
--if test "$GCC" = yes; then
-- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
--fi
--
- #
- # Do we need to explicitly link libc?
- #
-@@ -5693,13 +6223,14 @@
- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
- $rm conftest*
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--
-+
- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-+ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
- compiler_flags=-v
- linker_flags=-v
- verstring=
-@@ -5827,7 +6358,7 @@
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
- # along with /bin/sed that truncates output.
- for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-- test ! -f $lt_ac_sed && break
-+ test ! -f $lt_ac_sed && continue
- cat /dev/null > conftest.in
- lt_ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
---- a/admin/ltmain.sh 2004-06-11 14:04:39.000000000 +0200
-+++ b/admin/ltmain.sh 2006-03-21 19:11:17.000000000 +0100
-@@ -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, 2003
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
- # Free Software Foundation, Inc.
- # Originally by Gordon Matzigkeit <gord@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.5a
--TIMESTAMP=" (1.1240 2003/06/26 06:55:19)"
--
- default_mode=
- help="Try \`$progname --help' for more information."
- magic="%%%MAGIC variable%%%"
-@@ -70,14 +88,15 @@
- Xsed="${SED}"' -e 1s/^X//'
- sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
- # test EBCDIC or ASCII
--case `echo A|tr A '\301'` in
-- A) # EBCDIC based system
-- SP2NL="tr '\100' '\n'"
-- NL2SP="tr '\r\n' '\100\100'"
-+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'
- ;;
-- *) # Assume ASCII based system
-- SP2NL="tr '\040' '\012'"
-- NL2SP="tr '\015\012' '\040\040'"
-+ *) # EBCDIC based system
-+ SP2NL='tr \100 \n'
-+ NL2SP='tr \r\n \100\100'
- ;;
- esac
-
-@@ -94,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
-+ exit $EXIT_FAILURE
- fi
-
- # Global variables.
-@@ -111,6 +132,8 @@
- show="$echo"
- show_help=
- execute_dlfiles=
-+duplicate_deps=no
-+preserve_args=
- lo2o="s/\\.lo\$/.${objext}/"
- o2lo="s/\\.${objext}\$/.lo/"
-
-@@ -118,10 +141,51 @@
- # 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.
--win32_libid () {
-+func_win32_libid ()
-+{
- win32_libid_type="unknown"
- win32_fileres=`file -L $1 2>/dev/null`
- case $win32_fileres in
-@@ -130,17 +194,16 @@
- ;;
- *ar\ archive*) # could be an import, or static
- if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-- grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-+ $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 /{x;/import/!{s/^/import/;h;p;};x;};}'`
-- if test "X$win32_nmres" = "Ximport" ; then
-- win32_libid_type="x86 archive import"
-- else
-- win32_libid_type="x86 archive static"
-- fi
-+ $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*)
-+ *DLL*)
- win32_libid_type="x86 DLL"
- ;;
- *executable*) # but shell scripts are "executable" too...
-@@ -154,9 +217,181 @@
- $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
- do
-@@ -176,12 +411,13 @@
- ;;
- 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 1
-+ exit $EXIT_FAILURE
- ;;
- esac
-
-@@ -191,10 +427,10 @@
- # not specially marked.
- ;;
- *)
-- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
-+ 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' < $0`"
-+ 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
-@@ -220,24 +456,25 @@
- --version)
- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
- $echo
-- $echo "Copyright (C) 2003 Free Software Foundation, Inc."
-+ $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 0
-+ exit $?
- ;;
-
- --config)
-- ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $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" < "$0"
-+ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
- done
-- exit 0
-+ exit $?
- ;;
-
- --debug)
- $echo "$progname: enabling shell trace mode"
- set -x
-+ preserve_args="$preserve_args $arg"
- ;;
-
- --dry-run | -n)
-@@ -256,7 +493,7 @@
- else
- $echo "disable static libraries"
- fi
-- exit 0
-+ exit $?
- ;;
-
- --finish) mode="finish" ;;
-@@ -268,13 +505,19 @@
-
- --quiet | --silent)
- show=:
-+ preserve_args="$preserve_args $arg"
- ;;
-
-- --tag) prevopt="--tag" prev=tag ;;
-+ --tag)
-+ prevopt="--tag"
-+ prev=tag
-+ preserve_args="$preserve_args --tag"
-+ ;;
- --tag=*)
- set tag "$optarg" ${1+"$@"}
- shift
- prev=tag
-+ preserve_args="$preserve_args --tag"
- ;;
-
- -dlopen)
-@@ -285,7 +528,7 @@
- -*)
- $echo "$modename: unrecognized option \`$arg'" 1>&2
- $echo "$help" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- ;;
-
- *)
-@@ -298,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.
-@@ -311,7 +566,7 @@
- # 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
-+ $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
- case $nonopt in
- *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
- mode=link
-@@ -354,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.
-@@ -369,13 +624,15 @@
- # Get the compilation command and the source file.
- base_compile=
- srcfile="$nonopt" # always keep a non-empty value in "srcfile"
-+ suppress_opt=yes
- suppress_output=
- arg_mode=normal
- libobj=
-+ later=
-
- for arg
- do
-- case "$arg_mode" in
-+ case $arg_mode in
- arg )
- # do not "continue". Instead, add this to base_compile
- lastarg="$arg"
-@@ -394,24 +651,19 @@
- -o)
- if test -n "$libobj" ; then
- $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
- arg_mode=target
- continue
- ;;
-
-- -static)
-- build_old_libs=yes
-- continue
-- ;;
--
-- -prefer-pic)
-- pic_mode=yes
-+ -static | -prefer-pic | -prefer-non-pic)
-+ later="$later $arg"
- continue
- ;;
-
-- -prefer-non-pic)
-- pic_mode=no
-+ -no-suppress)
-+ suppress_opt=no
- continue
- ;;
-
-@@ -424,7 +676,7 @@
- args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
- lastarg=
- save_ifs="$IFS"; IFS=','
-- for arg in $args; do
-+ for arg in $args; do
- IFS="$save_ifs"
-
- # Double-quote args containing other shell metacharacters.
-@@ -462,7 +714,10 @@
- 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.
-+ # 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\""
- ;;
-@@ -474,11 +729,11 @@
- case $arg_mode in
- arg)
- $echo "$modename: you must specify an argument for -Xcompile"
-- exit 1
-+ exit $EXIT_FAILURE
- ;;
- target)
- $echo "$modename: you must specify a target with \`-o'" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- ;;
- *)
- # Get the name of the library object.
-@@ -511,51 +766,39 @@
- *.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
-
-- # 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.
-- if test -n "$available_tags" && test -z "$tagname"; then
-- case $base_compile 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` "*) ;;
-- # 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$" < "$0" > /dev/null; then
-- # Evaluate the configuration.
-- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-- case "$base_compile " in
-- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-- # 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 1
--# else
--# $echo "$modename: using $tagname tagged configuration"
-- fi
-+ 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
-- fi
-+ 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
-@@ -568,7 +811,7 @@
- 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.
-@@ -579,7 +822,7 @@
- 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
-@@ -598,7 +841,7 @@
- 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
-@@ -608,7 +851,7 @@
- # Lock this critical section if it is needed
- # We use this script file to make the link, it avoids creating a new file
- if test "$need_locks" = yes; then
-- 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
-@@ -626,14 +869,19 @@
- 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"
-
-@@ -655,18 +903,18 @@
- fbsd_hideous_sh_bug=$base_compile
-
- if test "$pic_mode" != no; then
-- command="$base_compile $srcfile $pic_flag"
-+ command="$base_compile $qsrcfile $pic_flag"
- else
- # Don't build PIC code
-- command="$base_compile $srcfile"
-+ command="$base_compile $qsrcfile"
- fi
-
- if test ! -d "${xdir}$objdir"; then
- $show "$mkdir ${xdir}$objdir"
- $run $mkdir ${xdir}$objdir
-- status=$?
-- if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
-- exit $status
-+ exit_status=$?
-+ if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
-+ exit $exit_status
- fi
- fi
-
-@@ -681,7 +929,7 @@
- if $run eval "$command"; then :
- else
- test -n "$output_obj" && $run $rm $removelist
-- exit 1
-+ exit $EXIT_FAILURE
- fi
-
- if test "$need_locks" = warn &&
-@@ -701,7 +949,7 @@
- compiler."
-
- $run $rm $removelist
-- exit 1
-+ exit $EXIT_FAILURE
- fi
-
- # Just move the object if needed, then go on to compile the next one
-@@ -722,7 +970,9 @@
- EOF
-
- # Allow error messages only from the first compilation.
-- suppress_output=' >/dev/null 2>&1'
-+ 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.
-@@ -736,9 +986,9 @@
- 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
-- command="$base_compile $srcfile $pic_flag"
-+ command="$base_compile $qsrcfile $pic_flag"
- fi
- if test "$compiler_c_o" = yes; then
- command="$command -o $obj"
-@@ -751,7 +1001,7 @@
- if $run eval "$command"; then :
- else
- $run $rm $removelist
-- exit 1
-+ exit $EXIT_FAILURE
- fi
-
- if test "$need_locks" = warn &&
-@@ -771,7 +1021,7 @@
- compiler."
-
- $run $rm $removelist
-- exit 1
-+ exit $EXIT_FAILURE
- fi
-
- # Just move the object if needed
-@@ -809,7 +1059,7 @@
- $run $rm "$lockfile"
- fi
-
-- exit 0
-+ exit $EXIT_SUCCESS
- ;;
-
- # libtool link mode
-@@ -835,7 +1085,7 @@
- ;;
- esac
- libtool_args="$nonopt"
-- base_compile="$nonopt"
-+ base_compile="$nonopt $@"
- compile_command="$nonopt"
- finalize_command="$nonopt"
-
-@@ -847,7 +1097,6 @@
- old_convenience=
- deplibs=
- old_deplibs=
-- add_flags=
- compiler_flags=
- linker_flags=
- dllsearchpath=
-@@ -868,6 +1117,8 @@
- 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=
-@@ -881,6 +1132,8 @@
- vinfo=
- vinfo_number=no
-
-+ func_infer_tag $base_compile
-+
- # We need to know -static, to get the right output filenames.
- for arg
- do
-@@ -893,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
-@@ -912,7 +1166,6 @@
- # Go through the arguments, transforming them on the way.
- while test "$#" -gt 0; do
- arg="$1"
-- base_compile="$base_compile $arg"
- shift
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
-@@ -976,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
-@@ -991,6 +1244,11 @@
- prev=
- continue
- ;;
-+ precious_regex)
-+ precious_files_regex="$arg"
-+ prev=
-+ continue
-+ ;;
- release)
- release="-$arg"
- prev=
-@@ -1023,7 +1281,7 @@
- test "$pic_object" = none && \
- test "$non_pic_object" = none; then
- $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
-
- # Extract subdirectory from the argument.
-@@ -1071,12 +1329,17 @@
- 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 1
-+ exit $EXIT_FAILURE
- else
- # Dry-run case.
-
-@@ -1097,7 +1360,7 @@
- done
- else
- $echo "$modename: link input file \`$save_arg' does not exist"
-- exit 1
-+ exit $EXIT_FAILURE
- fi
- arg=$save_arg
- prev=
-@@ -1109,7 +1372,7 @@
- [\\/]* | [A-Za-z]:[\\/]*) ;;
- *)
- $echo "$modename: only absolute run-paths are allowed" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- ;;
- esac
- if test "$prev" = rpath; then
-@@ -1149,6 +1412,18 @@
- 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=
-@@ -1197,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
-@@ -1207,6 +1482,18 @@
- 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
-@@ -1233,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"
- ;;
-@@ -1247,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
-@@ -1259,18 +1552,15 @@
- -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
- ;;
-- *-*-freebsd*-gnu*)
-- # prevent being parsed by the freebsd regexp below
-- ;;
-- *-*-mingw* | *-*-os2*)
-+ *-*-os2*)
- # These systems don't actually have a C library (as such)
- test "X$arg" = "X-lc" && continue
- ;;
-- *-*-openbsd* | *-*-freebsd*)
-+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- # Do not include libc due to us having libc/libc_r.
- test "X$arg" = "X-lc" && continue
- ;;
-@@ -1278,13 +1568,19 @@
- # 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
-- *-*-freebsd*-gnu*)
-- # prevent being parsed by the freebsd regexp below
-- ;;
-- *-*-openbsd*)
-+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- # Do not include libc_r directly, use -pthread flag.
- continue
- ;;
-@@ -1294,18 +1590,41 @@
- 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
- ;;
-
-- # gcc -m* arguments should be passed to the linker via $compiler_flags
-- # in order to pass architecture information to the linker
-- # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo
-- # but this is not reliable with gcc because gcc may use -mfoo to
-- # select a different linker, different libraries, etc, while
-- # -Wl,-mfoo simply passes -mfoo to the linker.
-- -m*)
-+ # -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"`
-@@ -1316,9 +1635,7 @@
- esac
- compile_command="$compile_command $arg"
- finalize_command="$finalize_command $arg"
-- if test "$with_gcc" = "yes" ; then
-- compiler_flags="$compiler_flags $arg"
-- fi
-+ compiler_flags="$compiler_flags $arg"
- continue
- ;;
-
-@@ -1358,6 +1675,11 @@
-
- -o) prev=output ;;
-
-+ -precious-files-regex)
-+ prev=precious_regex
-+ continue
-+ ;;
-+
- -release)
- prev=release
- continue
-@@ -1380,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
-@@ -1476,7 +1798,6 @@
- arg="\"$arg\""
- ;;
- esac
-- add_flags="$add_flags $arg"
- ;;
-
- *.$objext)
-@@ -1504,7 +1825,7 @@
- test "$pic_object" = none && \
- test "$non_pic_object" = none; then
- $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
-
- # Extract subdirectory from the argument.
-@@ -1552,12 +1873,17 @@
- 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 1
-+ exit $EXIT_FAILURE
- else
- # Dry-run case.
-
-@@ -1611,7 +1937,6 @@
- arg="\"$arg\""
- ;;
- esac
-- add_flags="$add_flags $arg"
- ;;
- esac # arg
-
-@@ -1625,48 +1950,7 @@
- if test -n "$prev"; then
- $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
- $echo "$help" 1>&2
-- exit 1
-- fi
--
-- # 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 link
-- # command doesn't match the default compiler.
-- if test -n "$available_tags" && test -z "$tagname"; then
-- case $base_compile 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` "*) ;;
-- # 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$" < "$0" > /dev/null; then
-- # Evaluate the configuration.
-- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-- case $base_compile in
-- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-- # The compiler in $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 1
--# else
--# $echo "$modename: using $tagname tagged configuration"
-- fi
-- ;;
-- esac
-+ exit $EXIT_FAILURE
- fi
-
- if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-@@ -1699,9 +1983,9 @@
- 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
-
-@@ -1710,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 ;;
-@@ -1720,7 +2004,7 @@
-
- case $host in
- *cygwin* | *mingw* | *pw32*)
-- # don't eliminate duplcations in $postdeps and $predeps
-+ # don't eliminate duplications in $postdeps and $predeps
- duplicate_compiler_generated_deps=yes
- ;;
- *)
-@@ -1764,7 +2048,6 @@
- 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"
-@@ -1773,7 +2056,7 @@
- *.la) ;;
- *)
- $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- ;;
- esac
- done
-@@ -1799,7 +2082,10 @@
- case $pass in
- 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
-@@ -1811,18 +2097,23 @@
- lib=
- found=no
- case $deplib in
-+ -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
-+ continue
-+ ;;
- -l*)
- if test "$linkmode" != lib && test "$linkmode" != prog; then
- $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
- continue
- fi
-- if test "$pass" = conv && test "$allow_undefined" = yes; then
-- deplibs="$deplib $deplibs"
-- continue
-- fi
- name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-- for search_ext in .la $shrext .so .a; do
-+ for search_ext in .la $std_shrext .so .a; do
- # Search the libtool library
- lib="$searchdir/lib${name}${search_ext}"
- if test -f "$lib"; then
-@@ -1898,11 +2189,11 @@
- fi
- 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" 1>&2
-@@ -1930,7 +2221,22 @@
- fi
- case $linkmode in
- lib)
-- if test "$deplibs_check_method" != pass_all; then
-+ 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"
-@@ -1980,15 +2286,15 @@
- esac # case $deplib
- 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 | 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%/[^/]*$%%'`
-@@ -2004,6 +2310,8 @@
- # it will not redefine variables installed, or shouldnotlink
- installed=yes
- shouldnotlink=no
-+ avoidtemprpath=
-+
-
- # Read the .la file
- case $lib in
-@@ -2021,33 +2329,32 @@
- if test "$pass" = conv; then
- # Only check for convenience libraries
- deplibs="$lib $deplibs"
-- tmp_libs=
-- for deplib in $dependency_libs; do
-- #echo "Adding $deplib to \$deplibs"
-- deplibs="$deplib $deplibs"
-- if test "X$duplicate_deps" = "Xyes" ; then
-- case "$tmp_libs " in
-- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-- esac
-- fi
-- tmp_libs="$tmp_libs $deplib"
-- done
- if test -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"
- old_convenience="$old_convenience $ladir/$objdir/$old_library"
-+ tmp_libs=
-+ for deplib in $dependency_libs; do
-+ deplibs="$deplib $deplibs"
-+ 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
- $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
-@@ -2055,16 +2362,18 @@
- 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 -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. We also need to preload any
- # dependent libraries so libltdl's deplib preloader doesn't
-@@ -2101,11 +2410,19 @@
- 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//'`
-
-@@ -2113,7 +2430,7 @@
- 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).
-@@ -2140,7 +2457,7 @@
- continue
- fi
-
--
-+
- if test "$linkmode" = prog && test "$pass" != link; then
- newlib_search_path="$newlib_search_path $ladir"
- deplibs="$lib $deplibs"
-@@ -2178,12 +2495,12 @@
- 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"; then
-+ 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 $dir" ;;
-+ *) temp_rpath="$temp_rpath $absdir" ;;
- esac
- fi
-
-@@ -2220,24 +2537,29 @@
- 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 "$prefer_static_libs" = no || test -z "$old_library"; }; then
-+ { 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
-+
-+ # 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
-+ $echo "*** $linklib is not portable!"
-+ fi
- if test "$linkmode" = lib &&
- test "$hardcode_into_libs" = yes; then
- # Hardcode the library path.
-@@ -2295,9 +2617,10 @@
- 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
-@@ -2308,9 +2631,10 @@
- if test -f "$output_objdir/$newlib"; then :; else
- $show "generating import library for \`$soname'"
- save_ifs="$IFS"; IFS='~'
-- eval cmds=\"$old_archive_from_expsyms_cmds\"
-+ cmds=$old_archive_from_expsyms_cmds
- for cmd in $cmds; do
- IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd" || exit $?
- done
-@@ -2331,11 +2655,15 @@
- if test "$hardcode_direct" = no; then
- add="$dir/$linklib"
- case $host in
-- *-*-sco3.2v5* ) add_dir="-L$dir" ;;
-+ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-+ *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-+ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-+ *-*-unixware7*) add_dir="-L$dir" ;;
- *-*-darwin* )
-- # if the lib is a module then we can not link against it, someone
-- # is ignoring the new warnings I added
-- if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
-+ # if the lib is a module then we can not link against
-+ # it, someone is ignoring the new warnings I added
-+ if /usr/bin/file -L $add 2> /dev/null |
-+ $EGREP ": [^:]* bundle" >/dev/null ; then
- $echo "** Warning, lib $linklib is a module, not a shared library"
- if test -z "$old_library" ; then
- $echo
-@@ -2343,7 +2671,7 @@
- $echo "** The link will probably fail, sorry"
- else
- add="$dir/$old_library"
-- fi
-+ fi
- fi
- esac
- elif test "$hardcode_minus_L" = no; then
-@@ -2366,9 +2694,9 @@
- add_dir="-L$dir"
- # Try looking first in the location we're being installed to.
- if test -n "$inst_prefix_dir"; then
-- case "$libdir" in
-+ case $libdir in
- [\\/]*)
-- add_dir="-L$inst_prefix_dir$libdir $add_dir"
-+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
- ;;
- esac
- fi
-@@ -2385,7 +2713,7 @@
-
- if test "$lib_linked" != yes; then
- $echo "$modename: configuration error: unsupported hardcode properties"
-- exit 1
-+ exit $EXIT_FAILURE
- fi
-
- if test -n "$add_shlibpath"; then
-@@ -2428,7 +2756,8 @@
- esac
- add="-l$name"
- elif test "$hardcode_automatic" = yes; then
-- if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
-+ if test -n "$inst_prefix_dir" &&
-+ test -f "$inst_prefix_dir$libdir/$linklib" ; then
- add="$inst_prefix_dir$libdir/$linklib"
- else
- add="$libdir/$linklib"
-@@ -2438,9 +2767,9 @@
- add_dir="-L$libdir"
- # Try looking first in the location we're being installed to.
- if test -n "$inst_prefix_dir"; then
-- case "$libdir" in
-+ case $libdir in
- [\\/]*)
-- add_dir="-L$inst_prefix_dir$libdir $add_dir"
-+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
- ;;
- esac
- fi
-@@ -2499,17 +2828,16 @@
- fi
- fi
- else
-- convenience="$convenience $dir/$old_library"
-- old_convenience="$old_convenience $dir/$old_library"
- deplibs="$dir/$old_library $deplibs"
- link_static=yes
- fi
- fi # link shared/static library?
-
- if test "$linkmode" = lib; then
-- #if test -n "$dependency_libs" &&
-- # { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
-- # test "$link_static" = yes; }; then
-+ if test -n "$dependency_libs" &&
-+ { test "$hardcode_into_libs" != yes ||
-+ test "$build_old_libs" = yes ||
-+ test "$link_static" = yes; }; then
- # Extract -R from dependency_libs
- temp_deplibs=
- for libdir in $dependency_libs; do
-@@ -2523,7 +2851,7 @@
- esac
- done
- dependency_libs="$temp_deplibs"
-- #fi
-+ fi
-
- newlib_search_path="$newlib_search_path $absdir"
- # Link against this library
-@@ -2565,20 +2893,18 @@
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -z "$libdir"; then
- $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
- if test "$absdir" != "$libdir"; then
-- # Sure, some shells/systems don't implement the -ef.
-- # Those will have to live with the warning.
-- test "$absdir" -ef "$libdir" > /dev/null 2>&1 ||
-- $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+ $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
- fi
- path="$absdir"
- fi
- depdepl=
- case $host in
- *-*-darwin*)
-- # we do not want to link against static libs, but need to link against shared
-+ # we do not want to link against static libs,
-+ # but need to link against shared
- eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
- if test -n "$deplibrary_names" ; then
- for tmp in $deplibrary_names ; do
-@@ -2586,46 +2912,45 @@
- done
- if test -f "$path/$depdepl" ; then
- depdepl="$path/$depdepl"
-- fi
-+ fi
- # do not add paths which are already there
- case " $newlib_search_path " in
- *" $path "*) ;;
- *) newlib_search_path="$newlib_search_path $path";;
- esac
-- path=""
- fi
-+ path=""
- ;;
- *)
-- path="-L$path"
-- ;;
-- esac
--
-+ path="-L$path"
-+ ;;
-+ esac
- ;;
-- -l*)
-+ -l*)
- case $host in
- *-*-darwin*)
-- # Again, we only want to link against shared libraries
-- eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-- for tmp in $newlib_search_path ; do
-- if test -f "$tmp/lib$tmp_libs.dylib" ; then
-- eval depdepl="$tmp/lib$tmp_libs.dylib"
-- break
-- fi
-- done
-- path=""
-+ # Again, we only want to link against shared libraries
-+ eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-+ for tmp in $newlib_search_path ; do
-+ if test -f "$tmp/lib$tmp_libs.dylib" ; then
-+ eval depdepl="$tmp/lib$tmp_libs.dylib"
-+ break
-+ fi
-+ done
-+ path=""
- ;;
- *) continue ;;
-- esac
-+ esac
- ;;
- *) continue ;;
- esac
- case " $deplibs " in
-- *" $depdepl "*) ;;
-- *) deplibs="$deplibs $depdepl" ;;
-- esac
-- case " $deplibs " in
- *" $path "*) ;;
-- *) deplibs="$deplibs $path" ;;
-+ *) deplibs="$path $deplibs" ;;
-+ esac
-+ case " $deplibs " in
-+ *" $depdepl "*) ;;
-+ *) deplibs="$depdepl $deplibs" ;;
- esac
- done
- fi # link_all_deplibs != no
-@@ -2712,7 +3037,8 @@
- eval $var=\"$tmp_libs\"
- done # for var
- fi
-- # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
-+ # Last step: remove runtime libs from dependency_libs
-+ # (they stay in deplibs)
- tmp_libs=
- for i in $dependency_libs ; do
- case " $predeps $postdeps $compiler_lib_search_path " in
-@@ -2772,19 +3098,19 @@
- case $outputname in
- lib*)
- name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-- eval shared_ext=\"$shrext\"
-+ eval shared_ext=\"$shrext_cmds\"
- eval libname=\"$libname_spec\"
- ;;
- *)
- if test "$module" = no; then
- $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
- $echo "$help" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
- if test "$need_lib_prefix" != no; then
- # Add the "lib" prefix for modules if required
- name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-- eval shared_ext=\"$shrext\"
-+ eval shared_ext=\"$shrext_cmds\"
- eval libname=\"$libname_spec\"
- else
- libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-@@ -2795,7 +3121,7 @@
- if test -n "$objs"; then
- if test "$deplibs_check_method" != pass_all; then
- $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-- exit 1
-+ exit $EXIT_FAILURE
- else
- $echo
- $echo "*** Warning: Linking the shared library $output against the non-libtool"
-@@ -2843,13 +3169,13 @@
- if test -n "$8"; then
- $echo "$modename: too many parameters to \`-version-info'" 1>&2
- $echo "$help" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
-
- # convert absolute version numbers to libtool ages
- # this retains compatibility with .la files and attempts
- # to make the code below a bit more comprehensible
--
-+
- case $vinfo_number in
- yes)
- number_major="$2"
-@@ -2878,6 +3204,11 @@
- age="$number_minor"
- revision="$number_minor"
- ;;
-+ *)
-+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
-+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
-+ exit $EXIT_FAILURE
-+ ;;
- esac
- ;;
- no)
-@@ -2889,36 +3220,36 @@
-
- # Check that each of the things are valid numbers.
- case $current in
-- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- *)
-- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-+ $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- ;;
- esac
-
- case $revision in
-- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- *)
-- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-+ $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- ;;
- esac
-
- case $age in
-- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- *)
-- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-+ $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- ;;
- esac
-
- if test "$age" -gt "$current"; then
- $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
-
- # Calculate the version variables.
-@@ -2935,7 +3266,7 @@
- versuffix="$major.$age.$revision"
- # Darwin ld doesn't like 0 for these options...
- minor_current=`expr $current + 1`
-- verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+ verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
- ;;
-
- freebsd-aout)
-@@ -3007,7 +3338,7 @@
- *)
- $echo "$modename: unknown library version type \`$version_type'" 1>&2
- $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- ;;
- esac
-
-@@ -3061,6 +3392,12 @@
- *.$objext)
- ;;
- $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-+ if test "X$precious_files_regex" != "X"; then
-+ if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-+ then
-+ continue
-+ fi
-+ fi
- removelist="$removelist $p"
- ;;
- *) ;;
-@@ -3082,9 +3419,9 @@
-
- # Eliminate all temporary directories.
- for path in $notinst_path; do
-- lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-- deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-- dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
-+ lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-+ deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-+ dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
- done
-
- if test -n "$xrpath"; then
-@@ -3097,7 +3434,7 @@
- *) finalize_rpath="$finalize_rpath $libdir" ;;
- esac
- done
-- if true || test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-+ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
- dependency_libs="$temp_xrpath $dependency_libs"
- fi
- fi
-@@ -3135,15 +3472,14 @@
- *-*-netbsd*)
- # Don't link with libc until the a.out ld.so is fixed.
- ;;
-- *-*-freebsd*-gnu*)
-- # Prevent $arg from being parsed by the freebsd regexp below.
-- if test "$build_libtool_need_lc" = "yes"; then
-- deplibs="$deplibs -lc"
-- fi
-- ;;
-- *-*-openbsd* | *-*-freebsd*)
-+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- # Do not include libc due to us having libc/libc_r.
-- test "X$arg" = "X-lc" && continue
-+ ;;
-+ *-*-sco3.2v5* | *-*-sco5v6*)
-+ # Causes problems with __ctype
-+ ;;
-+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-+ # Compiler inserts libc in the correct place for threads to work
- ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
-@@ -3187,11 +3523,11 @@
- int main() { return 0; }
- EOF
- $rm conftest
-- $LTCC -o conftest conftest.c $deplibs
-+ $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
- if test "$?" -eq 0 ; then
- ldd_output=`ldd conftest`
- for i in $deplibs; do
-- name="`expr $i : '-l\(.*\)'`"
-+ name=`expr $i : '-l\(.*\)'`
- # If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" -ne "0"; then
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3228,11 +3564,11 @@
- # Error occurred in the first compile. Let's try to salvage
- # the situation: Compile a separate program for each library.
- for i in $deplibs; do
-- name="`expr $i : '-l\(.*\)'`"
-+ name=`expr $i : '-l\(.*\)'`
- # If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" != "0"; then
- $rm conftest
-- $LTCC -o conftest conftest.c $i
-+ $LTCC $LTCFLAGS -o conftest conftest.c $i
- # Did it work?
- if test "$?" -eq 0 ; then
- ldd_output=`ldd conftest`
-@@ -3280,7 +3616,7 @@
- set dummy $deplibs_check_method
- file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
- for a_deplib in $deplibs; do
-- name="`expr $a_deplib : '-l\(.*\)'`"
-+ name=`expr $a_deplib : '-l\(.*\)'`
- # If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" != "0"; then
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3349,7 +3685,7 @@
- set dummy $deplibs_check_method
- match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
- for a_deplib in $deplibs; do
-- name="`expr $a_deplib : '-l\(.*\)'`"
-+ name=`expr $a_deplib : '-l\(.*\)'`
- # If $name is empty we are operating on a -L argument.
- if test -n "$name" && test "$name" != "0"; then
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3479,6 +3815,35 @@
- deplibs=$newdeplibs
- fi
-
-+
-+ # move library search paths that coincide with paths to not yet
-+ # installed libraries to the beginning of the library search list
-+ new_libs=
-+ for path in $notinst_path; do
-+ case " $new_libs " in
-+ *" -L$path/$objdir "*) ;;
-+ *)
-+ case " $deplibs " in
-+ *" -L$path/$objdir "*)
-+ new_libs="$new_libs -L$path/$objdir" ;;
-+ esac
-+ ;;
-+ esac
-+ done
-+ for deplib in $deplibs; do
-+ case $deplib in
-+ -L*)
-+ case " $new_libs " in
-+ *" $deplib "*) ;;
-+ *) new_libs="$new_libs $deplib" ;;
-+ esac
-+ ;;
-+ *) new_libs="$new_libs $deplib" ;;
-+ esac
-+ done
-+ deplibs="$new_libs"
-+
-+
- # All the library-specific variables (install_libdir is set above).
- library_names=
- old_library=
-@@ -3491,7 +3856,7 @@
- hardcode_libdirs=
- dep_rpath=
- rpath="$finalize_rpath"
-- test "$mode" != relink && test "$fast_install" = no && rpath="$compile_rpath$rpath"
-+ test "$mode" != relink && rpath="$compile_rpath$rpath"
- for libdir in $rpath; do
- if test -n "$hardcode_libdir_flag_spec"; then
- if test -n "$hardcode_libdir_separator"; then
-@@ -3546,7 +3911,7 @@
- fi
-
- # Get the real and link names of the library.
-- eval shared_ext=\"$shrext\"
-+ eval shared_ext=\"$shrext_cmds\"
- eval library_names=\"$library_names_spec\"
- set dummy $library_names
- realname="$2"
-@@ -3562,6 +3927,7 @@
- fi
-
- lib="$output_objdir/$realname"
-+ linknames=
- for link
- do
- linknames="$linknames $link"
-@@ -3576,10 +3942,11 @@
- $show "generating symbol list for \`$libname.la'"
- export_symbols="$output_objdir/$libname.exp"
- $run $rm $export_symbols
-- eval cmds=\"$export_symbols_cmds\"
-+ cmds=$export_symbols_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
- if len=`expr "X$cmd" : ".*"` &&
- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- $show "$cmd"
-@@ -3589,6 +3956,9 @@
- # The command line is too long to execute in one step.
- $show "using reloadable object file for export list..."
- skipped_export=:
-+ # Break out early, otherwise skipped_export may be
-+ # set to false by a later but shorter cmd.
-+ break
- fi
- done
- IFS="$save_ifs"
-@@ -3609,12 +3979,12 @@
- for test_deplib in $deplibs; do
- case " $convenience " in
- *" $test_deplib "*) ;;
-- *)
-+ *)
- tmp_deplibs="$tmp_deplibs $test_deplib"
- ;;
- esac
- done
-- deplibs="$tmp_deplibs"
-+ deplibs="$tmp_deplibs"
-
- if test -n "$convenience"; then
- if test -n "$whole_archive_flag_spec"; then
-@@ -3622,67 +3992,13 @@
- eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
- else
- gentop="$output_objdir/${outputname}x"
-- $show "${rm}r $gentop"
-- $run ${rm}r "$gentop"
-- $show "$mkdir $gentop"
-- $run $mkdir "$gentop"
-- status=$?
-- if test "$status" -ne 0 && test ! -d "$gentop"; then
-- exit $status
-- fi
- generated="$generated $gentop"
-
-- for xlib in $convenience; do
-- # Extract the objects.
-- case $xlib in
-- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-- *) xabs=`pwd`"/$xlib" ;;
-- esac
-- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-- xdir="$gentop/$xlib"
--
-- $show "${rm}r $xdir"
-- $run ${rm}r "$xdir"
-- $show "$mkdir $xdir"
-- $run $mkdir "$xdir"
-- status=$?
-- if test "$status" -ne 0 && test ! -d "$xdir"; then
-- exit $status
-- fi
-- # We will extract separately just the conflicting names and we will no
-- # longer touch any unique names. It is faster to leave these extract
-- # automatically by $AR in one run.
-- $show "(cd $xdir && $AR x $xabs)"
-- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-- :
-- else
-- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-- $AR t "$xabs" | sort | uniq -cd | while read -r count name
-- do
-- i=1
-- while test "$i" -le "$count"
-- do
-- # Put our $i before any first dot (extension)
-- # Never overwrite any file
-- name_to="$name"
-- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-- do
-- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-- done
-- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-- i=`expr $i + 1`
-- done
-- done
-- fi
--
-- libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-- done
-+ func_extract_archives $gentop $convenience
-+ libobjs="$libobjs $func_extract_archives_result"
- fi
- fi
--
-+
- if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
- eval flag=\"$thread_safe_flag_spec\"
- linker_flags="$linker_flags $flag"
-@@ -3693,31 +4009,27 @@
- $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
- fi
-
-- # Add all flags from the command line. We here create a library,
-- # but those flags were only added to compile_command and
-- # finalize_command, which are only used when creating executables.
-- # So do it by hand here.
-- compiler_flags="$compiler_flags $add_flags"
-- # Only add it to commands which use CC, instead of LD, i.e.
-- # only to $compiler_flags
-- #linker_flags="$linker_flags $add_flags"
--
- # Do each of the archive commands.
- if test "$module" = yes && test -n "$module_cmds" ; then
- if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-- eval cmds=\"$module_expsym_cmds\"
-+ eval test_cmds=\"$module_expsym_cmds\"
-+ cmds=$module_expsym_cmds
- else
-- eval cmds=\"$module_cmds\"
-+ eval test_cmds=\"$module_cmds\"
-+ cmds=$module_cmds
- fi
- else
- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-- eval cmds=\"$archive_expsym_cmds\"
-+ eval test_cmds=\"$archive_expsym_cmds\"
-+ cmds=$archive_expsym_cmds
- else
-- eval cmds=\"$archive_cmds\"
-+ eval test_cmds=\"$archive_cmds\"
-+ cmds=$archive_cmds
- fi
- fi
-
-- if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
-+ if test "X$skipped_export" != "X:" &&
-+ len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- :
- else
-@@ -3736,6 +4048,7 @@
- save_libobjs=$libobjs
- fi
- save_output=$output
-+ output_la=`$echo "X$output" | $Xsed -e "$basename"`
-
- # Clear the reloadable object creation command queue and
- # initialize k to one.
-@@ -3745,13 +4058,13 @@
- delfiles=
- last_robj=
- k=1
-- output=$output_objdir/$save_output-${k}.$objext
-+ output=$output_objdir/$output_la-${k}.$objext
- # Loop over the list of objects to be linked.
- for obj in $save_libobjs
- do
- eval test_cmds=\"$reload_cmds $objlist $last_robj\"
- if test "X$objlist" = X ||
-- { len=`expr "X$test_cmds" : ".*"` &&
-+ { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
- test "$len" -le "$max_cmd_len"; }; then
- objlist="$objlist $obj"
- else
-@@ -3765,9 +4078,9 @@
- # the last one created.
- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
- fi
-- last_robj=$output_objdir/$save_output-${k}.$objext
-+ last_robj=$output_objdir/$output_la-${k}.$objext
- k=`expr $k + 1`
-- output=$output_objdir/$save_output-${k}.$objext
-+ output=$output_objdir/$output_la-${k}.$objext
- objlist=$obj
- len=1
- fi
-@@ -3787,13 +4100,13 @@
- eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
- fi
-
-- # Set up a command to remove the reloadale object files
-+ # Set up a command to remove the reloadable object files
- # after they are used.
- i=0
- while test "$i" -lt "$k"
- do
- i=`expr $i + 1`
-- delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
-+ delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
- done
-
- $echo "creating a temporary reloadable object file: $output"
-@@ -3818,28 +4131,54 @@
- # value of $libobjs for piecewise linking.
-
- # Do each of the archive commands.
-+ if test "$module" = yes && test -n "$module_cmds" ; then
-+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-+ cmds=$module_expsym_cmds
-+ else
-+ cmds=$module_cmds
-+ fi
-+ else
- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-- eval cmds=\"$archive_expsym_cmds\"
-+ cmds=$archive_expsym_cmds
- else
-- eval cmds=\"$archive_cmds\"
-+ cmds=$archive_cmds
-+ fi
- fi
-
- # Append the command to remove the reloadable object files
- # to the just-reset $cmds.
-- eval cmds=\"\$cmds~$rm $delfiles\"
-+ eval cmds=\"\$cmds~\$rm $delfiles\"
- fi
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
- $show "$cmd"
-- $run eval "$cmd" || exit $?
-+ $run eval "$cmd" || {
-+ lt_exit=$?
-+
-+ # Restore the uninstalled library and exit
-+ if test "$mode" = relink; then
-+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-+ fi
-+
-+ exit $lt_exit
-+ }
- done
- IFS="$save_ifs"
-
- # Restore the uninstalled library and exit
- if test "$mode" = relink; then
- $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-- exit 0
-+
-+ if test -n "$convenience"; then
-+ if test -z "$whole_archive_flag_spec"; then
-+ $show "${rm}r $gentop"
-+ $run ${rm}r "$gentop"
-+ fi
-+ fi
-+
-+ exit $EXIT_SUCCESS
- fi
-
- # Create links to the real library.
-@@ -3887,7 +4226,7 @@
- *.lo)
- if test -n "$objs$old_deplibs"; then
- $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
- libobj="$output"
- obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-@@ -3916,64 +4255,10 @@
- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
- else
- gentop="$output_objdir/${obj}x"
-- $show "${rm}r $gentop"
-- $run ${rm}r "$gentop"
-- $show "$mkdir $gentop"
-- $run $mkdir "$gentop"
-- status=$?
-- if test "$status" -ne 0 && test ! -d "$gentop"; then
-- exit $status
-- fi
- generated="$generated $gentop"
-
-- for xlib in $convenience; do
-- # Extract the objects.
-- case $xlib in
-- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-- *) xabs=`pwd`"/$xlib" ;;
-- esac
-- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-- xdir="$gentop/$xlib"
--
-- $show "${rm}r $xdir"
-- $run ${rm}r "$xdir"
-- $show "$mkdir $xdir"
-- $run $mkdir "$xdir"
-- status=$?
-- if test "$status" -ne 0 && test ! -d "$xdir"; then
-- exit $status
-- fi
-- # We will extract separately just the conflicting names and we will no
-- # longer touch any unique names. It is faster to leave these extract
-- # automatically by $AR in one run.
-- $show "(cd $xdir && $AR x $xabs)"
-- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-- :
-- else
-- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-- $AR t "$xabs" | sort | uniq -cd | while read -r count name
-- do
-- i=1
-- while test "$i" -le "$count"
-- do
-- # Put our $i before any first dot (extension)
-- # Never overwrite any file
-- name_to="$name"
-- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-- do
-- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-- done
-- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-- i=`expr $i + 1`
-- done
-- done
-- fi
--
-- reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-- done
-+ func_extract_archives $gentop $convenience
-+ reload_conv_objs="$reload_objs $func_extract_archives_result"
- fi
- fi
-
-@@ -3981,10 +4266,11 @@
- reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
- output="$obj"
-- eval cmds=\"$reload_cmds\"
-+ cmds=$reload_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd" || exit $?
- done
-@@ -3997,7 +4283,7 @@
- $run ${rm}r $gentop
- fi
-
-- exit 0
-+ exit $EXIT_SUCCESS
- fi
-
- if test "$build_libtool_libs" != yes; then
-@@ -4010,17 +4296,18 @@
- # accidentally link it into a program.
- # $show "echo timestamp > $libobj"
- # $run eval "echo timestamp > $libobj" || exit $?
-- exit 0
-+ exit $EXIT_SUCCESS
- fi
-
- if test -n "$pic_flag" || test "$pic_mode" != default; then
- # Only do commands if we really have different PIC objects.
- reload_objs="$libobjs $reload_conv_objs"
- output="$libobj"
-- eval cmds=\"$reload_cmds\"
-+ cmds=$reload_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd" || exit $?
- done
-@@ -4032,7 +4319,7 @@
- $run ${rm}r $gentop
- fi
-
-- exit 0
-+ exit $EXIT_SUCCESS
- ;;
-
- prog)
-@@ -4072,6 +4359,35 @@
- ;;
- esac
-
-+
-+ # move library search paths that coincide with paths to not yet
-+ # installed libraries to the beginning of the library search list
-+ new_libs=
-+ for path in $notinst_path; do
-+ case " $new_libs " in
-+ *" -L$path/$objdir "*) ;;
-+ *)
-+ case " $compile_deplibs " in
-+ *" -L$path/$objdir "*)
-+ new_libs="$new_libs -L$path/$objdir" ;;
-+ esac
-+ ;;
-+ esac
-+ done
-+ for deplib in $compile_deplibs; do
-+ case $deplib in
-+ -L*)
-+ case " $new_libs " in
-+ *" $deplib "*) ;;
-+ *) new_libs="$new_libs $deplib" ;;
-+ esac
-+ ;;
-+ *) new_libs="$new_libs $deplib" ;;
-+ esac
-+ done
-+ compile_deplibs="$new_libs"
-+
-+
- compile_command="$compile_command $compile_deplibs"
- finalize_command="$finalize_command $finalize_deplibs"
-
-@@ -4116,10 +4432,15 @@
- fi
- case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+ testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
- case :$dllsearchpath: in
- *":$libdir:"*) ;;
- *) dllsearchpath="$dllsearchpath:$libdir";;
- esac
-+ case :$dllsearchpath: in
-+ *":$testbindir:"*) ;;
-+ *) dllsearchpath="$dllsearchpath:$testbindir";;
-+ esac
- ;;
- esac
- done
-@@ -4233,13 +4554,25 @@
-
- # Prepare the list of exported symbols
- if test -z "$export_symbols"; then
-- export_symbols="$output_objdir/$output.exp"
-+ export_symbols="$output_objdir/$outputname.exp"
- $run $rm $export_symbols
-- $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-+ $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-+ case $host in
-+ *cygwin* | *mingw* )
-+ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-+ $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-+ ;;
-+ esac
- else
-- $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
-- $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
-+ $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-+ $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
- $run eval 'mv "$nlist"T "$nlist"'
-+ case $host in
-+ *cygwin* | *mingw* )
-+ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-+ $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-+ ;;
-+ esac
- fi
- fi
-
-@@ -4290,7 +4623,26 @@
- #endif
-
- /* The mapping between symbol names and symbols. */
-+"
-+
-+ case $host in
-+ *cygwin* | *mingw* )
-+ $echo >> "$output_objdir/$dlsyms" "\
-+/* DATA imports from DLLs on WIN32 can't be const, because
-+ runtime relocations are performed -- see ld's documentation
-+ on pseudo-relocs */
-+struct {
-+"
-+ ;;
-+ * )
-+ $echo >> "$output_objdir/$dlsyms" "\
- const struct {
-+"
-+ ;;
-+ esac
-+
-+
-+ $echo >> "$output_objdir/$dlsyms" "\
- const char *name;
- lt_ptr address;
- }
-@@ -4337,20 +4689,33 @@
- esac
-
- # Now compile the dynamic symbol file.
-- $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-- $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-+ $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-+ $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
- # Clean up the generated files.
- $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
- $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
- # Transform the symbol file into the correct name.
-- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+ case $host in
-+ *cygwin* | *mingw* )
-+ if test -f "$output_objdir/${outputname}.def" ; then
-+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-+ else
-+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+ fi
-+ ;;
-+ * )
-+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+ ;;
-+ esac
- ;;
- *)
- $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- ;;
- esac
- else
-@@ -4363,17 +4728,6 @@
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
- fi
-
-- # AIX runtime linking requires linking programs with -Wl,-brtl and libs with -Wl,-G
-- # Also add -bnolibpath to the beginning of the link line, to clear the hardcoded runpath.
-- # Otherwise, things like the -L path to libgcc.a are accidentally hardcoded by ld.
-- # This does not apply on AIX for ia64, which uses a SysV linker.
-- case "$host" in
-- ia64-*-aix5*) ;;
-- *-*-aix4* | *-*-aix5*)
-- compile_command=`$echo "X$compile_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"`
-- finalize_command=`$echo "X$finalize_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"` ;;
-- esac
--
- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
- # Replace the output file specification.
- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-@@ -4382,7 +4736,7 @@
- # We have no uninstalled library dependencies, so finalize right now.
- $show "$link_command"
- $run eval "$link_command"
-- status=$?
-+ exit_status=$?
-
- # Delete the generated files.
- if test -n "$dlsyms"; then
-@@ -4390,7 +4744,7 @@
- $run $rm "$output_objdir/${outputname}S.${objext}"
- fi
-
-- exit $status
-+ exit $exit_status
- fi
-
- if test -n "$shlibpath_var"; then
-@@ -4449,7 +4803,7 @@
- # Link the executable and exit
- $show "$link_command"
- $run eval "$link_command" || exit $?
-- exit 0
-+ exit $EXIT_SUCCESS
- fi
-
- if test "$hardcode_action" = relink; then
-@@ -4504,10 +4858,10 @@
- fi
-
- # Quote $echo for shipping.
-- if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
-- case $0 in
-- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
-- *) qecho="$SHELL `pwd`/$0 --fallback-echo";;
-+ if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
-+ case $progpath in
-+ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-+ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
- esac
- qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
- else
-@@ -4530,10 +4884,12 @@
- esac
- case $host in
- *cygwin* | *mingw* )
-- cwrappersource=`$echo ${objdir}/lt-${output}.c`
-- cwrapper=`$echo ${output}.exe`
-- $rm $cwrappersource $cwrapper
-- trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
-+ output_name=`basename $output`
-+ output_path=`dirname $output`
-+ cwrappersource="$output_path/$objdir/lt-$output_name.c"
-+ cwrapper="$output_path/$output_name.exe"
-+ $rm $cwrappersource $cwrapper
-+ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
- cat > $cwrappersource <<EOF
-
-@@ -4542,7 +4898,7 @@
-
- The $output program cannot be directly executed until all the libtool
- libraries that it depends on are installed.
--
-+
- This wrapper executable should never be moved out of the build directory.
- If it is, it will not operate correctly.
-
-@@ -4558,6 +4914,9 @@
- #include <malloc.h>
- #include <stdarg.h>
- #include <assert.h>
-+#include <string.h>
-+#include <ctype.h>
-+#include <sys/stat.h>
-
- #if defined(PATH_MAX)
- # define LT_PATHMAX PATH_MAX
-@@ -4568,15 +4927,19 @@
- #endif
-
- #ifndef DIR_SEPARATOR
--#define DIR_SEPARATOR '/'
-+# define DIR_SEPARATOR '/'
-+# define PATH_SEPARATOR ':'
- #endif
-
- #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
- defined (__OS2__)
--#define HAVE_DOS_BASED_FILE_SYSTEM
--#ifndef DIR_SEPARATOR_2
--#define DIR_SEPARATOR_2 '\\'
--#endif
-+# define HAVE_DOS_BASED_FILE_SYSTEM
-+# ifndef DIR_SEPARATOR_2
-+# define DIR_SEPARATOR_2 '\\'
-+# endif
-+# ifndef PATH_SEPARATOR_2
-+# define PATH_SEPARATOR_2 ';'
-+# endif
- #endif
-
- #ifndef DIR_SEPARATOR_2
-@@ -4586,17 +4949,32 @@
- (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
- #endif /* DIR_SEPARATOR_2 */
-
-+#ifndef PATH_SEPARATOR_2
-+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-+#else /* PATH_SEPARATOR_2 */
-+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-+#endif /* PATH_SEPARATOR_2 */
-+
- #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
- #define XFREE(stale) do { \
- if (stale) { free ((void *) stale); stale = 0; } \
- } while (0)
-
-+/* -DDEBUG is fairly common in CFLAGS. */
-+#undef DEBUG
-+#if defined DEBUGWRAPPER
-+# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
-+#else
-+# define DEBUG(format, ...)
-+#endif
-+
- const char *program_name = NULL;
-
- void * xmalloc (size_t num);
- char * xstrdup (const char *string);
--char * basename (const char *name);
--char * fnqualify(const char *path);
-+const char * base_name (const char *name);
-+char * find_executable(const char *wrapper);
-+int check_executable(const char *path);
- char * strendzap(char *str, const char *pat);
- void lt_fatal (const char *message, ...);
-
-@@ -4605,30 +4983,52 @@
- {
- char **newargz;
- int i;
--
-- program_name = (char *) xstrdup ((char *) basename (argv[0]));
-+
-+ program_name = (char *) xstrdup (base_name (argv[0]));
-+ DEBUG("(main) argv[0] : %s\n",argv[0]);
-+ DEBUG("(main) program_name : %s\n",program_name);
- newargz = XMALLOC(char *, argc+2);
- EOF
-
-- cat >> $cwrappersource <<EOF
-- newargz[0] = "$SHELL";
-+ cat >> $cwrappersource <<EOF
-+ newargz[0] = (char *) xstrdup("$SHELL");
- EOF
-
-- cat >> $cwrappersource <<"EOF"
-- newargz[1] = fnqualify(argv[0]);
-+ cat >> $cwrappersource <<"EOF"
-+ newargz[1] = find_executable(argv[0]);
-+ if (newargz[1] == NULL)
-+ lt_fatal("Couldn't find %s", argv[0]);
-+ DEBUG("(main) found exe at : %s\n",newargz[1]);
- /* we know the script has the same name, without the .exe */
- /* so make sure newargz[1] doesn't end in .exe */
-- strendzap(newargz[1],".exe");
-+ strendzap(newargz[1],".exe");
- for (i = 1; i < argc; i++)
- newargz[i+1] = xstrdup(argv[i]);
- newargz[argc+1] = NULL;
-+
-+ for (i=0; i<argc+1; i++)
-+ {
-+ DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]);
-+ ;
-+ }
-+
- EOF
-
-- cat >> $cwrappersource <<EOF
-+ case $host_os in
-+ mingw*)
-+ cat >> $cwrappersource <<EOF
-+ execv("$SHELL",(char const **)newargz);
-+EOF
-+ ;;
-+ *)
-+ cat >> $cwrappersource <<EOF
- execv("$SHELL",newargz);
- EOF
-+ ;;
-+ esac
-
-- cat >> $cwrappersource <<"EOF"
-+ cat >> $cwrappersource <<"EOF"
-+ return 127;
- }
-
- void *
-@@ -4641,59 +5041,159 @@
- return p;
- }
-
--char *
-+char *
- xstrdup (const char *string)
- {
- return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
- ;
- }
-
--char *
--basename (const char *name)
-+const char *
-+base_name (const char *name)
- {
- const char *base;
-
- #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
- /* Skip over the disk name in MSDOS pathnames. */
-- if (isalpha (name[0]) && name[1] == ':')
-+ if (isalpha ((unsigned char)name[0]) && name[1] == ':')
- name += 2;
- #endif
-
- for (base = name; *name; name++)
- if (IS_DIR_SEPARATOR (*name))
- base = name + 1;
-- return (char *) base;
-+ return base;
-+}
-+
-+int
-+check_executable(const char * path)
-+{
-+ struct stat st;
-+
-+ DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
-+ if ((!path) || (!*path))
-+ return 0;
-+
-+ if ((stat (path, &st) >= 0) &&
-+ (
-+ /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
-+#if defined (S_IXOTH)
-+ ((st.st_mode & S_IXOTH) == S_IXOTH) ||
-+#endif
-+#if defined (S_IXGRP)
-+ ((st.st_mode & S_IXGRP) == S_IXGRP) ||
-+#endif
-+ ((st.st_mode & S_IXUSR) == S_IXUSR))
-+ )
-+ return 1;
-+ else
-+ return 0;
- }
-
--char *
--fnqualify(const char *path)
-+/* Searches for the full path of the wrapper. Returns
-+ newly allocated full path name if found, NULL otherwise */
-+char *
-+find_executable (const char* wrapper)
- {
-- size_t size;
-- char *p;
-+ int has_slash = 0;
-+ const char* p;
-+ const char* p_next;
-+ /* static buffer for getcwd */
- char tmp[LT_PATHMAX + 1];
-+ int tmp_len;
-+ char* concat_name;
-
-- assert(path != NULL);
-+ DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
-
-- /* Is it qualified already? */
-+ if ((wrapper == NULL) || (*wrapper == '\0'))
-+ return NULL;
-+
-+ /* Absolute path? */
-+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-+ if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
-+ {
-+ concat_name = xstrdup (wrapper);
-+ if (check_executable(concat_name))
-+ return concat_name;
-+ XFREE(concat_name);
-+ }
-+ else
-+ {
-+#endif
-+ if (IS_DIR_SEPARATOR (wrapper[0]))
-+ {
-+ concat_name = xstrdup (wrapper);
-+ if (check_executable(concat_name))
-+ return concat_name;
-+ XFREE(concat_name);
-+ }
- #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-- if (isalpha (path[0]) && path[1] == ':')
-- return xstrdup (path);
-+ }
- #endif
-- if (IS_DIR_SEPARATOR (path[0]))
-- return xstrdup (path);
-
-- /* prepend the current directory */
-- /* doesn't handle '~' */
-+ for (p = wrapper; *p; p++)
-+ if (*p == '/')
-+ {
-+ has_slash = 1;
-+ break;
-+ }
-+ if (!has_slash)
-+ {
-+ /* no slashes; search PATH */
-+ const char* path = getenv ("PATH");
-+ if (path != NULL)
-+ {
-+ for (p = path; *p; p = p_next)
-+ {
-+ const char* q;
-+ size_t p_len;
-+ for (q = p; *q; q++)
-+ if (IS_PATH_SEPARATOR(*q))
-+ break;
-+ p_len = q - p;
-+ p_next = (*q == '\0' ? q : q + 1);
-+ if (p_len == 0)
-+ {
-+ /* empty path: current directory */
-+ if (getcwd (tmp, LT_PATHMAX) == NULL)
-+ lt_fatal ("getcwd failed");
-+ tmp_len = strlen(tmp);
-+ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-+ memcpy (concat_name, tmp, tmp_len);
-+ concat_name[tmp_len] = '/';
-+ strcpy (concat_name + tmp_len + 1, wrapper);
-+ }
-+ else
-+ {
-+ concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
-+ memcpy (concat_name, p, p_len);
-+ concat_name[p_len] = '/';
-+ strcpy (concat_name + p_len + 1, wrapper);
-+ }
-+ if (check_executable(concat_name))
-+ return concat_name;
-+ XFREE(concat_name);
-+ }
-+ }
-+ /* not found in PATH; assume curdir */
-+ }
-+ /* Relative path | not found in path: prepend cwd */
- if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal ("getcwd failed");
-- size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
-- p = XMALLOC(char, size);
-- sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
-- return p;
-+ tmp_len = strlen(tmp);
-+ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-+ memcpy (concat_name, tmp, tmp_len);
-+ concat_name[tmp_len] = '/';
-+ strcpy (concat_name + tmp_len + 1, wrapper);
-+
-+ if (check_executable(concat_name))
-+ return concat_name;
-+ XFREE(concat_name);
-+ return NULL;
- }
-
- char *
--strendzap(char *str, const char *pat)
-+strendzap(char *str, const char *pat)
- {
- size_t len, patlen;
-
-@@ -4713,7 +5213,7 @@
- }
-
- static void
--lt_error_core (int exit_status, const char * mode,
-+lt_error_core (int exit_status, const char * mode,
- const char * message, va_list ap)
- {
- fprintf (stderr, "%s: %s: ", program_name, mode);
-@@ -4733,16 +5233,16 @@
- va_end (ap);
- }
- EOF
-- # we should really use a build-platform specific compiler
-- # here, but OTOH, the wrappers (shell script and this C one)
-- # are only useful if you want to execute the "real" binary.
-- # Since the "real" binary is built for $host, then this
-- # wrapper might as well be built for $host, too.
-- $run $LTCC -s -o $cwrapper $cwrappersource
-- ;;
-- esac
-- $rm $output
-- trap "$rm $output; exit 1" 1 2 15
-+ # we should really use a build-platform specific compiler
-+ # here, but OTOH, the wrappers (shell script and this C one)
-+ # are only useful if you want to execute the "real" binary.
-+ # Since the "real" binary is built for $host, then this
-+ # wrapper might as well be built for $host, too.
-+ $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
-+ ;;
-+ esac
-+ $rm $output
-+ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
-
- $echo > $output "\
- #! $SHELL
-@@ -4763,7 +5263,7 @@
-
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
- relink_command=\"$relink_command\"
-
-@@ -4842,7 +5342,7 @@
- else
- $echo \"\$relink_command_output\" >&2
- $rm \"\$progdir/\$file\"
-- exit 1
-+ exit $EXIT_FAILURE
- fi
- fi
-
-@@ -4892,32 +5392,32 @@
- # Backslashes separate directories on plain windows
- *-*-mingw | *-*-os2*)
- $echo >> $output "\
-- exec \$progdir\\\\\$program \${1+\"\$@\"}
-+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
- "
- ;;
-
- *)
- $echo >> $output "\
-- exec \$progdir/\$program \${1+\"\$@\"}
-+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
- "
- ;;
- esac
- $echo >> $output "\
- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-- exit 1
-+ exit $EXIT_FAILURE
- fi
- else
- # The program doesn't exist.
-- \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
-+ \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
- \$echo \"This script is just a wrapper for \$program.\" 1>&2
- $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
- fi\
- "
- chmod +x $output
- fi
-- exit 0
-+ exit $EXIT_SUCCESS
- ;;
- esac
-
-@@ -4940,78 +5440,78 @@
-
- if test -n "$addlibs"; then
- gentop="$output_objdir/${outputname}x"
-- $show "${rm}r $gentop"
-- $run ${rm}r "$gentop"
-- $show "$mkdir $gentop"
-- $run $mkdir "$gentop"
-- status=$?
-- if test "$status" -ne 0 && test ! -d "$gentop"; then
-- exit $status
-- fi
- generated="$generated $gentop"
-
-- # Add in members from convenience archives.
-- for xlib in $addlibs; do
-- # Extract the objects.
-- case $xlib in
-- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-- *) xabs=`pwd`"/$xlib" ;;
-- esac
-- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-- xdir="$gentop/$xlib"
--
-- $show "${rm}r $xdir"
-- $run ${rm}r "$xdir"
-- $show "$mkdir $xdir"
-- $run $mkdir "$xdir"
-- status=$?
-- if test "$status" -ne 0 && test ! -d "$xdir"; then
-- exit $status
-- fi
-- # We will extract separately just the conflicting names and we will no
-- # longer touch any unique names. It is faster to leave these extract
-- # automatically by $AR in one run.
-- $show "(cd $xdir && $AR x $xabs)"
-- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-- :
-- else
-- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-- $AR t "$xabs" | sort | uniq -cd | while read -r count name
-- do
-- i=1
-- while test "$i" -le "$count"
-- do
-- # Put our $i before any first dot (extension)
-- # Never overwrite any file
-- name_to="$name"
-- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-- do
-- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-- done
-- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-- i=`expr $i + 1`
-- done
-- done
-- fi
--
-- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
-- done
-+ func_extract_archives $gentop $addlibs
-+ oldobjs="$oldobjs $func_extract_archives_result"
- fi
-
-- compiler_flags="$compiler_flags $add_flags"
--
- # Do each command in the archive commands.
- if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-- eval cmds=\"$old_archive_from_new_cmds\"
-+ cmds=$old_archive_from_new_cmds
- else
-+ # POSIX demands no paths to be encoded in archives. We have
-+ # to avoid creating archives with duplicate basenames if we
-+ # might have to extract them afterwards, e.g., when creating a
-+ # static archive out of a convenience library, or when linking
-+ # the entirety of a libtool archive into another (currently
-+ # not supported by libtool).
-+ if (for obj in $oldobjs
-+ do
-+ $echo "X$obj" | $Xsed -e 's%^.*/%%'
-+ done | sort | sort -uc >/dev/null 2>&1); then
-+ :
-+ else
-+ $echo "copying selected object files to avoid basename conflicts..."
-+
-+ if test -z "$gentop"; then
-+ gentop="$output_objdir/${outputname}x"
-+ generated="$generated $gentop"
-+
-+ $show "${rm}r $gentop"
-+ $run ${rm}r "$gentop"
-+ $show "$mkdir $gentop"
-+ $run $mkdir "$gentop"
-+ exit_status=$?
-+ if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
-+ exit $exit_status
-+ fi
-+ fi
-+
-+ save_oldobjs=$oldobjs
-+ oldobjs=
-+ counter=1
-+ for obj in $save_oldobjs
-+ do
-+ objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-+ case " $oldobjs " in
-+ " ") oldobjs=$obj ;;
-+ *[\ /]"$objbase "*)
-+ while :; do
-+ # Make sure we don't pick an alternate name that also
-+ # overlaps.
-+ newobj=lt$counter-$objbase
-+ counter=`expr $counter + 1`
-+ case " $oldobjs " in
-+ *[\ /]"$newobj "*) ;;
-+ *) if test ! -f "$gentop/$newobj"; then break; fi ;;
-+ esac
-+ done
-+ $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-+ $run ln "$obj" "$gentop/$newobj" ||
-+ $run cp "$obj" "$gentop/$newobj"
-+ oldobjs="$oldobjs $gentop/$newobj"
-+ ;;
-+ *) oldobjs="$oldobjs $obj" ;;
-+ esac
-+ done
-+ fi
-+
- eval cmds=\"$old_archive_cmds\"
-
- if len=`expr "X$cmds" : ".*"` &&
- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-- :
-+ cmds=$old_archive_cmds
- else
- # the command line is too long to link in one step, link in parts
- $echo "using piecewise archive linking..."
-@@ -5020,31 +5520,18 @@
- objlist=
- concat_cmds=
- save_oldobjs=$oldobjs
-- # GNU ar 2.10+ was changed to match POSIX; thus no paths are
-- # encoded into archives. This makes 'ar r' malfunction in
-- # this piecewise linking case whenever conflicting object
-- # names appear in distinct ar calls; check, warn and compensate.
-- if (for obj in $save_oldobjs
-- do
-- $echo "X$obj" | $Xsed -e 's%^.*/%%'
-- done | sort | sort -uc >/dev/null 2>&1); then
-- :
-- else
-- $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
-- $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
-- AR_FLAGS=cq
-- fi
-+
- # Is there a better way of finding the last object in the list?
- for obj in $save_oldobjs
- do
- last_oldobj=$obj
-- done
-+ done
- for obj in $save_oldobjs
- do
- oldobjs="$objlist $obj"
- objlist="$objlist $obj"
- eval test_cmds=\"$old_archive_cmds\"
-- if len=`expr "X$test_cmds" : ".*"` &&
-+ if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
- test "$len" -le "$max_cmd_len"; then
- :
- else
-@@ -5052,7 +5539,7 @@
- oldobjs=$objlist
- if test "$obj" = "$last_oldobj" ; then
- RANLIB=$save_RANLIB
-- fi
-+ fi
- test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
- objlist=
-@@ -5063,12 +5550,13 @@
- if test "X$oldobjs" = "X" ; then
- eval cmds=\"\$concat_cmds\"
- else
-- eval cmds=\"\$concat_cmds~$old_archive_cmds\"
-+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
- fi
- fi
- fi
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
-+ eval cmd=\"$cmd\"
- IFS="$save_ifs"
- $show "$cmd"
- $run eval "$cmd" || exit $?
-@@ -5100,11 +5588,13 @@
- fi
- done
- # Quote the link command for shipping.
-- relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
-+ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
- if test "$hardcode_automatic" = yes ; then
-- relink_command=
-- fi
-+ relink_command=
-+ fi
-+
-+
- # Only create the output if not a dry run.
- if test -z "$run"; then
- for installed in no yes; do
-@@ -5122,7 +5612,7 @@
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -z "$libdir"; then
- $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
- newdependency_libs="$newdependency_libs $libdir/$name"
- ;;
-@@ -5136,7 +5626,7 @@
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
- if test -z "$libdir"; then
- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
- newdlfiles="$newdlfiles $libdir/$name"
- done
-@@ -5147,11 +5637,30 @@
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
- if test -z "$libdir"; then
- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
- newdlprefiles="$newdlprefiles $libdir/$name"
- done
- dlprefiles="$newdlprefiles"
-+ else
-+ newdlfiles=
-+ for lib in $dlfiles; do
-+ case $lib in
-+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-+ *) abs=`pwd`"/$lib" ;;
-+ esac
-+ newdlfiles="$newdlfiles $abs"
-+ done
-+ dlfiles="$newdlfiles"
-+ newdlprefiles=
-+ for lib in $dlprefiles; do
-+ case $lib in
-+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-+ *) abs=`pwd`"/$lib" ;;
-+ esac
-+ newdlprefiles="$newdlprefiles $abs"
-+ done
-+ dlprefiles="$newdlprefiles"
- fi
- $rm $output
- # place dlname in correct position for cygwin
-@@ -5195,7 +5704,7 @@
-
- # Directory that this library needs to be installed in:
- libdir='$install_libdir'"
-- if test "$installed" = no && test "$need_relink" = yes && test "$fast_install" = no; then
-+ if test "$installed" = no && test "$need_relink" = yes; then
- $echo >> $output "\
- relink_command=\"$relink_command\""
- fi
-@@ -5208,7 +5717,7 @@
- $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
- ;;
- esac
-- exit 0
-+ exit $EXIT_SUCCESS
- ;;
-
- # libtool install mode
-@@ -5219,11 +5728,11 @@
- # install_prog (especially on Windows NT).
- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
- # Allow the use of GNU shtool's install command.
-- $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
-+ $echo "X$nonopt" | grep shtool > /dev/null; then
- # Aesthetically quote it.
- arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
- case $arg in
-- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
-+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
- esac
-@@ -5232,14 +5741,14 @@
- shift
- else
- install_prog=
-- arg="$nonopt"
-+ arg=$nonopt
- fi
-
- # The real first argument should be the name of the installation program.
- # Aesthetically quote it.
- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
- case $arg in
-- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
-+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
- esac
-@@ -5257,28 +5766,31 @@
- do
- if test -n "$dest"; then
- files="$files $dest"
-- dest="$arg"
-+ dest=$arg
- continue
- fi
-
- case $arg in
- -d) isdir=yes ;;
-- -f) prev="-f" ;;
-- -g) prev="-g" ;;
-- -m) prev="-m" ;;
-- -o) prev="-o" ;;
-+ -f)
-+ case " $install_prog " in
-+ *[\\\ /]cp\ *) ;;
-+ *) prev=$arg ;;
-+ esac
-+ ;;
-+ -g | -m | -o) prev=$arg ;;
- -s)
- stripme=" -s"
- continue
- ;;
-- -*) ;;
--
-+ -*)
-+ ;;
- *)
- # If the previous option needed an argument, then skip it.
- if test -n "$prev"; then
- prev=
- else
-- dest="$arg"
-+ dest=$arg
- continue
- fi
- ;;
-@@ -5287,7 +5799,7 @@
- # Aesthetically quote the argument.
- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
- case $arg in
-- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
-+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
- esac
-@@ -5297,13 +5809,13 @@
- if test -z "$install_prog"; then
- $echo "$modename: you must specify an install program" 1>&2
- $echo "$help" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
-
- if test -n "$prev"; then
- $echo "$modename: the \`$prev' option requires an argument" 1>&2
- $echo "$help" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
-
- if test -z "$files"; then
-@@ -5313,7 +5825,7 @@
- $echo "$modename: you must specify a destination" 1>&2
- fi
- $echo "$help" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
-
- # Strip any trailing slash from the destination.
-@@ -5334,7 +5846,7 @@
- if test "$#" -gt 2; then
- $echo "$modename: \`$dest' is not a directory" 1>&2
- $echo "$help" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
- fi
- case $destdir in
-@@ -5346,7 +5858,7 @@
- *)
- $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
- $echo "$help" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- ;;
- esac
- done
-@@ -5375,7 +5887,7 @@
- else
- $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
- $echo "$help" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
-
- library_names=
-@@ -5417,7 +5929,7 @@
- # but it's something to keep an eye on.
- if test "$inst_prefix_dir" = "$destdir"; then
- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
-
- if test -n "$inst_prefix_dir"; then
-@@ -5432,7 +5944,7 @@
- if $run eval "$relink_command"; then :
- else
- $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
- fi
-
-@@ -5456,23 +5968,36 @@
-
- if test "$#" -gt 0; then
- # Delete the old symlinks, and create new ones.
-+ # Try `ln -sf' first, because the `ln' binary might depend on
-+ # the symlink we replace! Solaris /bin/ln does not understand -f,
-+ # so we also need to try rm && ln -s.
- for linkname
- do
- if test "$linkname" != "$realname"; then
-- $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-- $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-+ $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-+ $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
- fi
- done
- fi
-
- # Do each command in the postinstall commands.
- lib="$destdir/$realname"
-- eval cmds=\"$postinstall_cmds\"
-+ cmds=$postinstall_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
- $show "$cmd"
-- $run eval "$cmd" || exit $?
-+ $run eval "$cmd" || {
-+ lt_exit=$?
-+
-+ # Restore the uninstalled library and exit
-+ if test "$mode" = relink; then
-+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-+ fi
-+
-+ exit $lt_exit
-+ }
- done
- IFS="$save_ifs"
- fi
-@@ -5510,7 +6035,7 @@
- *)
- $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
- $echo "$help" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- ;;
- esac
-
-@@ -5528,7 +6053,7 @@
- $show "$install_prog $staticobj $staticdest"
- $run eval "$install_prog \$staticobj \$staticdest" || exit $?
- fi
-- exit 0
-+ exit $EXIT_SUCCESS
- ;;
-
- *)
-@@ -5566,23 +6091,21 @@
- notinst_deplibs=
- relink_command=
-
-- # To insure that "foo" is sourced, and not "foo.exe",
-- # finese the cygwin/MSYS system by explicitly sourcing "foo."
-- # which disallows the automatic-append-.exe behavior.
-- case $build in
-- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-- *) wrapperdot=${wrapper} ;;
-- esac
-+ # Note that it is not necessary on cygwin/mingw to append a dot to
-+ # foo even if both foo and FILE.exe exist: automatic-append-.exe
-+ # behavior happens only for exec(3), not for open(2)! Also, sourcing
-+ # `FILE.' does not work on cygwin managed mounts.
-+ #
- # If there is no directory component, then add one.
-- case $file in
-- */* | *\\*) . ${wrapperdot} ;;
-- *) . ./${wrapperdot} ;;
-+ case $wrapper in
-+ */* | *\\*) . ${wrapper} ;;
-+ *) . ./${wrapper} ;;
- esac
-
- # Check the variables that should have been set.
- if test -z "$notinst_deplibs"; then
- $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
-
- finalize=yes
-@@ -5604,30 +6127,21 @@
- done
-
- relink_command=
-- # To insure that "foo" is sourced, and not "foo.exe",
-- # finese the cygwin/MSYS system by explicitly sourcing "foo."
-- # which disallows the automatic-append-.exe behavior.
-- case $build in
-- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-- *) wrapperdot=${wrapper} ;;
-- esac
-+ # Note that it is not necessary on cygwin/mingw to append a dot to
-+ # foo even if both foo and FILE.exe exist: automatic-append-.exe
-+ # behavior happens only for exec(3), not for open(2)! Also, sourcing
-+ # `FILE.' does not work on cygwin managed mounts.
-+ #
- # If there is no directory component, then add one.
-- case $file in
-- */* | *\\*) . ${wrapperdot} ;;
-- *) . ./${wrapperdot} ;;
-+ case $wrapper in
-+ */* | *\\*) . ${wrapper} ;;
-+ *) . ./${wrapper} ;;
- esac
-
- outputname=
- if test "$fast_install" = no && test -n "$relink_command"; then
- if test "$finalize" = yes && test -z "$run"; then
-- tmpdir="/tmp"
-- test -n "$TMPDIR" && tmpdir="$TMPDIR"
-- tmpdir="$tmpdir/libtool-$$"
-- if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
-- else
-- $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-- continue
-- fi
-+ tmpdir=`func_mktempdir`
- file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
- outputname="$tmpdir/$file"
- # Replace the output file specification.
-@@ -5651,7 +6165,7 @@
- fi
-
- # remove .exe since cygwin /usr/bin/install will append another
-- # one anyways
-+ # one anyway
- case $install_prog,$host in
- */usr/bin/install*,*cygwin*)
- case $file:$destfile in
-@@ -5683,16 +6197,17 @@
- $show "$install_prog $file $oldlib"
- $run eval "$install_prog \$file \$oldlib" || exit $?
-
-- if test -n "$stripme" && test -n "$striplib"; then
-+ if test -n "$stripme" && test -n "$old_striplib"; then
- $show "$old_striplib $oldlib"
- $run eval "$old_striplib $oldlib" || exit $?
- fi
-
- # Do each command in the postinstall commands.
-- eval cmds=\"$old_postinstall_cmds\"
-+ cmds=$old_postinstall_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd" || exit $?
- done
-@@ -5706,9 +6221,9 @@
- if test -n "$current_libdirs"; then
- # Maybe just do a dry run.
- test -n "$run" && current_libdirs=" -n$current_libdirs"
-- exec_cmd='$SHELL $0 --finish$current_libdirs'
-+ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
- else
-- exit 0
-+ exit $EXIT_SUCCESS
- fi
- ;;
-
-@@ -5727,10 +6242,11 @@
- for libdir in $libdirs; do
- if test -n "$finish_cmds"; then
- # Do each command in the finish commands.
-- eval cmds=\"$finish_cmds\"
-+ cmds=$finish_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd" || admincmds="$admincmds
- $cmd"
-@@ -5747,9 +6263,9 @@
- fi
-
- # Exit here if they wanted silent mode.
-- exit 0
-+ test "$show" = : && exit $EXIT_SUCCESS
-
-- $echo "----------------------------------------------------------------------"
-+ $echo "X----------------------------------------------------------------------" | $Xsed
- $echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- $echo " $libdir"
-@@ -5782,8 +6298,8 @@
- $echo
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-- $echo "----------------------------------------------------------------------"
-- exit 0
-+ $echo "X----------------------------------------------------------------------" | $Xsed
-+ exit $EXIT_SUCCESS
- ;;
-
- # libtool execute mode
-@@ -5795,7 +6311,7 @@
- if test -z "$cmd"; then
- $echo "$modename: you must specify a COMMAND" 1>&2
- $echo "$help"
-- exit 1
-+ exit $EXIT_FAILURE
- fi
-
- # Handle -dlopen flags immediately.
-@@ -5803,7 +6319,7 @@
- if test ! -f "$file"; then
- $echo "$modename: \`$file' is not a file" 1>&2
- $echo "$help" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
-
- dir=
-@@ -5814,7 +6330,7 @@
- else
- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
- $echo "$help" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
-
- # Read the libtool library.
-@@ -5841,7 +6357,7 @@
- dir="$dir/$objdir"
- else
- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
- ;;
-
-@@ -5921,7 +6437,7 @@
- $echo "export $shlibpath_var"
- fi
- $echo "$cmd$args"
-- exit 0
-+ exit $EXIT_SUCCESS
- fi
- ;;
-
-@@ -5949,7 +6465,7 @@
- if test -z "$rm"; then
- $echo "$modename: you must specify an RM program" 1>&2
- $echo "$help" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
-
- rmdirs=
-@@ -5999,15 +6515,24 @@
- rmfiles="$rmfiles $objdir/$n"
- done
- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-- test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-
-- if test "$mode" = uninstall; then
-+ case "$mode" in
-+ clean)
-+ case " $library_names " in
-+ # " " in the beginning catches empty $dlname
-+ *" $dlname "*) ;;
-+ *) rmfiles="$rmfiles $objdir/$dlname" ;;
-+ esac
-+ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-+ ;;
-+ uninstall)
- if test -n "$library_names"; then
- # Do each command in the postuninstall commands.
-- eval cmds=\"$postuninstall_cmds\"
-+ cmds=$postuninstall_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd"
- if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6019,10 +6544,11 @@
-
- if test -n "$old_library"; then
- # Do each command in the old_postuninstall commands.
-- eval cmds=\"$old_postuninstall_cmds\"
-+ cmds=$old_postuninstall_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd"
- if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6032,7 +6558,8 @@
- IFS="$save_ifs"
- fi
- # FIXME: should reinstall the best remaining shared library.
-- fi
-+ ;;
-+ esac
- fi
- ;;
-
-@@ -6061,7 +6588,7 @@
- if test "$mode" = clean ; then
- noexename=$name
- case $file in
-- *.exe)
-+ *.exe)
- file=`$echo $file|${SED} 's,.exe$,,'`
- noexename=`$echo $name|${SED} 's,.exe$,,'`
- # $file with .exe has already been added to rmfiles,
-@@ -6106,20 +6633,20 @@
- "")
- $echo "$modename: you must specify a MODE" 1>&2
- $echo "$generic_help" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- ;;
- esac
-
- if test -z "$exec_cmd"; then
- $echo "$modename: invalid operation mode \`$mode'" 1>&2
- $echo "$generic_help" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- fi
- fi # test -z "$show_help"
-
- if test -n "$exec_cmd"; then
- eval exec $exec_cmd
-- exit 1
-+ exit $EXIT_FAILURE
- fi
-
- # We need to display help for each of the modes.
-@@ -6155,7 +6682,7 @@
- a more detailed description of MODE.
-
- Report bugs to <bug-libtool@gnu.org>."
-- exit 0
-+ exit $EXIT_SUCCESS
- ;;
-
- clean)
-@@ -6267,6 +6794,8 @@
- -no-undefined declare that a library does not refer to external symbols
- -o OUTPUT-FILE create OUTPUT-FILE from the specified objects
- -objectlist FILE Use a list of object files found in FILE to specify objects
-+ -precious-files-regex REGEX
-+ don't remove output files matching REGEX
- -release RELEASE specify package release information
- -rpath LIBDIR the created library will eventually be installed in LIBDIR
- -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
-@@ -6308,14 +6837,14 @@
- *)
- $echo "$modename: invalid operation mode \`$mode'" 1>&2
- $echo "$help" 1>&2
-- exit 1
-+ exit $EXIT_FAILURE
- ;;
- esac
-
- $echo
- $echo "Try \`$modename --help' for more information about other modes."
-
--exit 0
-+exit $?
-
- # The TAGs below are defined such that we never get into a situation
- # in which we disable both kinds of libraries. Given conflicting
-@@ -6329,12 +6858,11 @@
- # configuration. But we'll never go from static-only to shared-only.
-
- # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
--build_libtool_libs=no
--build_old_libs=yes
-+disable_libs=shared
- # ### END LIBTOOL TAG CONFIG: disable-shared
-
- # ### BEGIN LIBTOOL TAG CONFIG: disable-static
--build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
-+disable_libs=static
- # ### END LIBTOOL TAG CONFIG: disable-static
-
- # Local Variables:
diff --git a/ubuntu/maverick/applications/kasablanca/debian/patches/05_pedantic-errors.diff b/ubuntu/maverick/applications/kasablanca/debian/patches/05_pedantic-errors.diff
deleted file mode 100644
index ce2883918..000000000
--- a/ubuntu/maverick/applications/kasablanca/debian/patches/05_pedantic-errors.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -2144,9 +2144,6 @@
- save_CXXFLAGS="$CXXFLAGS"
- kde_safe_LIBS="$LIBS"
- LIBS="$LIBS $X_EXTRA_LIBS"
--if test "$GXX" = "yes"; then
--CXXFLAGS="$CXXFLAGS -pedantic-errors"
--fi
- AC_TRY_COMPILE([
- $2
- ],
diff --git a/ubuntu/maverick/applications/kasablanca/debian/patches/10_desktop_file_update.diff b/ubuntu/maverick/applications/kasablanca/debian/patches/10_desktop_file_update.diff
deleted file mode 100644
index ccfe63a55..000000000
--- a/ubuntu/maverick/applications/kasablanca/debian/patches/10_desktop_file_update.diff
+++ /dev/null
@@ -1,146 +0,0 @@
-diff -Nur kasablanca-0.4.0.2/acinclude.m4 kasablanca-0.4.0.2.new/acinclude.m4
---- kasablanca-0.4.0.2/acinclude.m4 2005-01-31 14:54:38.000000000 +0100
-+++ kasablanca-0.4.0.2.new/acinclude.m4 2006-03-22 11:03:39.000000000 +0100
-@@ -420,7 +420,7 @@
- kde_htmldir='\${datadir}/doc/HTML'
- fi
- if test -z "$kde_appsdir"; then
-- kde_appsdir='\${datadir}/applnk'
-+ kde_appsdir='\${datadir}/applications'
- fi
- if test -z "$kde_icondir"; then
- kde_icondir='\${datadir}/icons'
-diff -Nur kasablanca-0.4.0.2/admin/acinclude.m4.in kasablanca-0.4.0.2.new/admin/acinclude.m4.in
---- kasablanca-0.4.0.2/admin/acinclude.m4.in 2006-03-22 11:00:42.000000000 +0100
-+++ kasablanca-0.4.0.2.new/admin/acinclude.m4.in 2006-03-22 11:03:55.000000000 +0100
-@@ -420,7 +420,7 @@
- kde_htmldir='\${datadir}/doc/HTML'
- fi
- if test -z "$kde_appsdir"; then
-- kde_appsdir='\${datadir}/applnk'
-+ kde_appsdir='\${datadir}/applications'
- fi
- if test -z "$kde_icondir"; then
- kde_icondir='\${datadir}/icons'
-diff -Nur kasablanca-0.4.0.2/configure kasablanca-0.4.0.2.new/configure
---- kasablanca-0.4.0.2/configure 2005-01-31 14:55:25.000000000 +0100
-+++ kasablanca-0.4.0.2.new/configure 2006-03-22 11:08:30.000000000 +0100
-@@ -29766,7 +29766,7 @@
- kde_htmldir='\${datadir}/doc/HTML'
- fi
- if test -z "$kde_appsdir"; then
-- kde_appsdir='\${datadir}/applnk'
-+ kde_appsdir='\${datadir}/applications'
- fi
- if test -z "$kde_icondir"; then
- kde_icondir='\${datadir}/icons'
-@@ -30069,7 +30069,7 @@
- kde_htmldir='\${datadir}/doc/HTML'
- fi
- if test -z "$kde_appsdir"; then
-- kde_appsdir='\${datadir}/applnk'
-+ kde_appsdir='\${datadir}/applications'
- fi
- if test -z "$kde_icondir"; then
- kde_icondir='\${datadir}/icons'
-diff -Nur kasablanca-0.4.0.2/src/Makefile.am kasablanca-0.4.0.2.new/src/Makefile.am
---- kasablanca-0.4.0.2/src/Makefile.am 2004-08-18 01:43:43.000000000 +0200
-+++ kasablanca-0.4.0.2.new/src/Makefile.am 2006-03-22 11:06:14.000000000 +0100
-@@ -25,7 +25,7 @@
- kasablanca_LDADD = -lssl $(LIB_KDEUI)
-
- # this is where the desktop file will go
--shelldesktopdir = $(kde_appsdir)/Utilities
-+shelldesktopdir = $(kde_appsdir)/kde
- shelldesktop_DATA = kasablanca.desktop
-
- # this is where the shell's XML-GUI resource file goes
-diff -Nur kasablanca-0.4.0.2/src/Makefile.in kasablanca-0.4.0.2.new/src/Makefile.in
---- kasablanca-0.4.0.2/src/Makefile.in 2005-01-31 15:02:13.000000000 +0100
-+++ kasablanca-0.4.0.2.new/src/Makefile.in 2006-03-22 11:06:49.000000000 +0100
-@@ -407,7 +407,7 @@
- kasablanca_LDADD = -lssl $(LIB_KDEUI)
-
- # this is where the desktop file will go
--shelldesktopdir = $(kde_appsdir)/Utilities
-+shelldesktopdir = $(kde_appsdir)/kde
- shelldesktop_DATA = kasablanca.desktop
-
- # this is where the shell's XML-GUI resource file goes
-diff -Nur kasablanca-0.4.0.2/src/kasablanca.desktop kasablanca-0.4.0.2.new/src/kasablanca.desktop
---- kasablanca-0.4.0.2/src/kasablanca.desktop 2004-03-22 19:58:39.000000000 +0100
-+++ kasablanca-0.4.0.2.new/src/kasablanca.desktop 2006-03-22 14:09:46.000000000 +0100
-@@ -1,26 +1,53 @@
- [Desktop Entry]
- Encoding=UTF-8
- Name=kasablanca
--Name[xx]=xxkasablancaxx
- Exec=kasablanca
- Icon=kasablanca
- Type=Application
--Comment=A simple KDE Application
--Comment[ca]=Una simple aplicació KDE
--Comment[da]=Et simpelt KDE program
--Comment[de]=Eine einfache KDE-Anwendung
--Comment[el]=Μια απλή εφαρμογή του KDE
--Comment[es]=Una aplicación de KDE sencilla
--Comment[et]=Lihtne KDE rakendus
--Comment[fr]=Une application simple pour KDE.
--Comment[hu]=Egyszerű KDE-alkalmazás
--Comment[it]=Una semplice applicazione KDE
--Comment[nl]=Een eenvoudige KDE-toepassing
--Comment[pt]=Uma aplicação KDE simples
--Comment[pt_BR]=Um simples Aplicativo do KDE
--Comment[ru]=Простое приложение KDE
--Comment[sl]=Preprost program za KDE
--Comment[sr]=Једноставан KDE програм
--Comment[sv]=Ett enkelt KDE-program
--Comment[xx]=xxA simple KDE Applicationxx
--Comment[zh_CN]=一个简单的KDE应用程序
-+Categories=Qt;KDE;Network
-+GenericName=FTP Client
-+GenericName[br]=Kliant FTP
-+GenericName[ca]=Client FTP
-+GenericName[cs]=FTP klient
-+GenericName[cy]=Dibynnydd FTP
-+GenericName[da]=FTP klient
-+GenericName[el]=Πελάτης FTP
-+GenericName[es]=Cliente FTP
-+GenericName[et]=FTP-klient
-+GenericName[fr]=Client FTP
-+GenericName[ga]=Cliant FTP
-+GenericName[it]=Client FTP
-+GenericName[nl]=FTP-cliënt
-+GenericName[pa]=FTP ਕਲਾਇਟ
-+GenericName[pt]=Cliente de FTP
-+GenericName[pt_BR]=Cliente de FTP
-+GenericName[ru]=Клиент FTP
-+GenericName[rw]=Umukiriya FTP
-+GenericName[sr]=FTP клијент
-+GenericName[sr@Latn]=FTP klijent
-+GenericName[sv]=FTP-klient
-+GenericName[xh]=Umxhasi we FTP
-+GenericName[zu]=Umthengi we FTP
-+Comment=FTP Client
-+Comment[br]=Kliant FTP
-+Comment[ca]=Client FTP
-+Comment[cs]=FTP klient
-+Comment[cy]=Dibynnydd FTP
-+Comment[da]=FTP klient
-+Comment[el]=Πελάτης FTP
-+Comment[es]=Cliente FTP
-+Comment[et]=FTP-klient
-+Comment[fr]=Client FTP
-+Comment[ga]=Cliant FTP
-+Comment[it]=Client FTP
-+Comment[nl]=FTP-cliënt
-+Comment[pa]=FTP ਕਲਾਇਟ
-+Comment[pt]=Cliente de FTP
-+Comment[pt_BR]=Cliente de FTP
-+Comment[ru]=Клиент FTP
-+Comment[rw]=Umukiriya FTP
-+Comment[sr]=FTP клијент
-+Comment[sr@Latn]=FTP klijent
-+Comment[sv]=FTP-klient
-+Comment[xh]=Umxhasi we FTP
-+Comment[zu]=Umthengi we FTP
diff --git a/ubuntu/maverick/applications/kasablanca/debian/rules b/ubuntu/maverick/applications/kasablanca/debian/rules
index 6a1fadfad..76e30e3f1 100755
--- a/ubuntu/maverick/applications/kasablanca/debian/rules
+++ b/ubuntu/maverick/applications/kasablanca/debian/rules
@@ -1,28 +1,40 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/kde.mk
+include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_INSTALL_MANPAGES_kasablanca-trinity := kasablanca.1
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-build-stamp:
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
dh_testdir
- /usr/bin/libtoolize -f
+ # Regenerate build system
+ ! [ -f /usr/share/libtool/ltmain.sh ] || \
+ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+ ! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+ cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
- cp -f /usr/share/misc/config.guess admin/config.guess
- cp -f /usr/share/misc/config.sub admin/config.sub
- $(MAKE) -f admin/Makefile.common
-
- QTDIR=/usr/share/tqt3 ./configure $(configkde) --disable-final
- $(MAKE)
- touch build-stamp
+ autoreconf --install && automake -f && \
+ $(MAKE) -f admin/Makefile.common && \
+ touch debian/stamp-bootstrap
build/kasablanca-trinity::
/usr/bin/docbook2x-man debian/kasablanca.xml
+binary-install/kasablanca-trinity::
+ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+
clean::
+ dh_testdir
rm -f kasablanca.1
-
+ rm -f debian/stamp-bootstrap
diff --git a/ubuntu/maverick/applications/kasablanca/debian/source.lintian-overrides b/ubuntu/maverick/applications/kasablanca/debian/source.lintian-overrides
index 7a9e61448..7349addb4 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/source.lintian-overrides
+++ b/ubuntu/maverick/applications/kasablanca/debian/source.lintian-overrides
@@ -1,2 +1,2 @@
# Upstream distributes it like this ATM but cleans it in next release
-kasablanca source: source-contains-CVS-dir admin/CVS
+kasablanca-trinity source: source-contains-CVS-dir admin/CVS
diff --git a/ubuntu/maverick/applications/kasablanca/debian/source/format b/ubuntu/maverick/applications/kasablanca/debian/source/format
new file mode 100644
index 000000000..89ae9db8f
--- /dev/null
+++ b/ubuntu/maverick/applications/kasablanca/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/ubuntu/maverick/applications/kasablanca/debian/source/options b/ubuntu/maverick/applications/kasablanca/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/maverick/applications/kasablanca/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*