<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[115361] trunk/dports/devel/gettext</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/115361">115361</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2013-12-31 14:46:15 -0800 (Tue, 31 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>gettext: Buildfix when autoconf is not installed</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelgettextPortfile">trunk/dports/devel/gettext/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelgettextfilesstdlibpatch">trunk/dports/devel/gettext/files/stdlib.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevelgettextfilesautoreconfpatch">trunk/dports/devel/gettext/files/autoreconf.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelgettextPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/gettext/Portfile (115360 => 115361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/gettext/Portfile 2013-12-31 22:14:49 UTC (rev 115360)
+++ trunk/dports/devel/gettext/Portfile 2013-12-31 22:46:15 UTC (rev 115361)
</span><span class="lines">@@ -24,17 +24,9 @@
</span><span class="cx"> checksums rmd160 c3b6a16a6b50e899b87d879db7363376b724c383 \
</span><span class="cx"> sha256 0d8f9a33531b77776b3dc473e7940019ca19bfca5b4c06db6e96065eeb07245d
</span><span class="cx">
</span><del>-# Generate newer libtool that passes -stdlib when linking dylibs.
-#
-# TODO: Fix this some other way, as requiring autoconf creates
-# a circular dependency:
-#
-# gettext > autoconf > perl5 > perl5.12 > gdbm > gettext
-#
-#use_autoreconf yes
-#autoreconf.args --force --verbose
-patchfiles autoreconf.patch
-patch.pre_args -p1
</del><ins>+# Update libtool to pass -stdlib when linking dylibs.
+# Note: unable to autoreconf due to dependency cycle
+patchfiles stdlib.patch
</ins><span class="cx">
</span><span class="cx"> # https://trac.macports.org/ticket/31167
</span><span class="cx"> compiler.blacklist-append {clang < 211.10.1}
</span></span></pre></div>
<a id="trunkdportsdevelgettextfilesautoreconfpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/gettext/files/autoreconf.patch (115360 => 115361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/gettext/files/autoreconf.patch 2013-12-31 22:14:49 UTC (rev 115360)
+++ trunk/dports/devel/gettext/files/autoreconf.patch 2013-12-31 22:46:15 UTC (rev 115361)
</span><span class="lines">@@ -1,28770 +0,0 @@
</span><del>-diff -Naurp gettext-0.18.3.1.orig/INSTALL gettext-0.18.3.1/INSTALL
---- gettext-0.18.3.1.orig/INSTALL 2012-12-09 17:59:06.000000000 -0800
-+++ gettext-0.18.3.1/INSTALL 2013-12-31 11:58:08.000000000 -0800
-@@ -1,223 +1,238 @@
--These are generic installation instructions.
-+Installation Instructions
-+*************************
-
--Prerequisites
--=============
-+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-+Inc.
-
-- This package depends on a few other packages. They are listed in
--the file ‘DEPENDENCIES’. It is recommended to install the listed
--packages before installing this package.
-+ Copying and distribution of this file, with or without modification,
-+are permitted in any medium without royalty provided the copyright
-+notice and this notice are preserved. This file is offered as-is,
-+without warranty of any kind.
-
- Basic Installation
- ==================
-
-- The ‘configure’ shell script attempts to guess correct values for
-+ Briefly, the shell command `./configure && make && make install'
-+should configure, build, and install this package. The following
-+more-detailed instructions are generic; see the `README' file for
-+instructions specific to this package. Some packages provide this
-+`INSTALL' file but do not implement all of the features documented
-+below. The lack of an optional feature in a given package is not
-+necessarily a bug. More recommendations for GNU packages can be found
-+in *note Makefile Conventions: (standards)Makefile Conventions.
-+
-+ The `configure' shell script attempts to guess correct values for
- various system-dependent variables used during compilation. It uses
--those values to create a ‘Makefile’ in each directory of the package.
--It may also create one or more ‘.h’ files containing system-dependent
--definitions. Finally, it creates a shell script ‘config.status’ that
--you can run in the future to recreate the current configuration, a file
--‘config.cache’ that saves the results of its tests to speed up
--reconfiguring, and a file ‘config.log’ containing compiler output
--(useful mainly for debugging ‘configure’).
-+those values to create a `Makefile' in each directory of the package.
-+It may also create one or more `.h' files containing system-dependent
-+definitions. Finally, it creates a shell script `config.status' that
-+you can run in the future to recreate the current configuration, and a
-+file `config.log' containing compiler output (useful mainly for
-+debugging `configure').
-+
-+ It can also use an optional file (typically called `config.cache'
-+and enabled with `--cache-file=config.cache' or simply `-C') that saves
-+the results of its tests to speed up reconfiguring. Caching is
-+disabled by default to prevent problems with accidental use of stale
-+cache files.
-
- If you need to do unusual things to compile the package, please try
--to figure out how ‘configure’ could check whether to do them, and mail
--diffs or instructions to the address given in the ‘README’ so they can
--be considered for the next release. If at some point ‘config.cache’
--contains results you don't want to keep, you may remove or edit it.
--
-- The file ‘configure.ac’ is used to create ‘configure’ by a program
--called ‘autoconf’. You only need ‘configure.ac’ if you want to change
--it or regenerate ‘configure’ using a newer version of ‘autoconf’.
--
--The simplest way to compile this package is:
--
-- 1. ‘cd’ to the directory containing the package's source code and type
-- ‘./configure’ to configure the package for your system. If you're
-- using ‘csh’ on an old version of System V, you might need to type
-- ‘sh ./configure’ instead to prevent ‘csh’ from trying to execute
-- ‘configure’ itself.
--
-- Running ‘configure’ takes awhile. While running, it prints some
-- messages telling which features it is checking for.
--
-- 2. Type ‘make’ to compile the package.
--
-- 3. Optionally, type ‘make check’ to run any self-tests that come with
-- the package.
--
-- 4. Type ‘make install’ to install the programs and any data files and
-- documentation.
--
-- 5. You can remove the program binaries and object files from the
-- source code directory by typing ‘make clean’. To also remove the
-- files that ‘configure’ created (so you can compile the package for
-- a different kind of computer), type ‘make distclean’. There is
-- also a ‘make maintainer-clean’ target, but that is intended mainly
-+to figure out how `configure' could check whether to do them, and mail
-+diffs or instructions to the address given in the `README' so they can
-+be considered for the next release. If you are using the cache, and at
-+some point `config.cache' contains results you don't want to keep, you
-+may remove or edit it.
-+
-+ The file `configure.ac' (or `configure.in') is used to create
-+`configure' by a program called `autoconf'. You need `configure.ac' if
-+you want to change it or regenerate `configure' using a newer version
-+of `autoconf'.
-+
-+ The simplest way to compile this package is:
-+
-+ 1. `cd' to the directory containing the package's source code and type
-+ `./configure' to configure the package for your system.
-+
-+ Running `configure' might take a while. While running, it prints
-+ some messages telling which features it is checking for.
-+
-+ 2. Type `make' to compile the package.
-+
-+ 3. Optionally, type `make check' to run any self-tests that come with
-+ the package, generally using the just-built uninstalled binaries.
-+
-+ 4. Type `make install' to install the programs and any data files and
-+ documentation. When installing into a prefix owned by root, it is
-+ recommended that the package be configured and built as a regular
-+ user, and only the `make install' phase executed with root
-+ privileges.
-+
-+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
-+ this time using the binaries in their final installed location.
-+ This target does not install anything. Running this target as a
-+ regular user, particularly if the prior `make install' required
-+ root privileges, verifies that the installation completed
-+ correctly.
-+
-+ 6. You can remove the program binaries and object files from the
-+ source code directory by typing `make clean'. To also remove the
-+ files that `configure' created (so you can compile the package for
-+ a different kind of computer), type `make distclean'. There is
-+ also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-+ 7. Often, you can also type `make uninstall' to remove the installed
-+ files again. In practice, not all packages have tested that
-+ uninstallation works correctly, even though it is required by the
-+ GNU Coding Standards.
-+
-+ 8. Some packages, particularly those that use Automake, provide `make
-+ distcheck', which can by used by developers to test that all other
-+ targets like `make install' and `make uninstall' work correctly.
-+ This target is generally not run by end users.
-+
- Compilers and Options
- =====================
-
- Some systems require unusual options for compilation or linking that
--the ‘configure’ script does not know about. You can give ‘configure’
--initial values for variables as arguments. You can do it like this:
-- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-+the `configure' script does not know about. Run `./configure --help'
-+for details on some of the pertinent environment variables.
-+
-+ You can give `configure' initial values for configuration parameters
-+by setting variables in the command line or in the environment. Here
-+is an example:
-+
-+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-+
-+ *Note Defining Variables::, for more details.
-
- Compiling For Multiple Architectures
- ====================================
-
- You can compile the package for more than one kind of computer at the
- same time, by placing the object files for each architecture in their
--own directory. To do this, you must use a version of ‘make’ that
--supports the ‘VPATH’ variable, such as GNU ‘make’. ‘cd’ to the
-+own directory. To do this, you can use GNU `make'. `cd' to the
- directory where you want the object files and executables to go and run
--the ‘configure’ script. ‘configure’ automatically checks for the
--source code in the directory that ‘configure’ is in and in ‘..’.
--
-- If you have to use a ‘make’ that does not supports the ‘VPATH’
--variable, you have to compile the package for one architecture at a time
--in the source code directory. After you have installed the package for
--one architecture, use ‘make distclean’ before reconfiguring for another
--architecture.
-+the `configure' script. `configure' automatically checks for the
-+source code in the directory that `configure' is in and in `..'. This
-+is known as a "VPATH" build.
-+
-+ With a non-GNU `make', it is safer to compile the package for one
-+architecture at a time in the source code directory. After you have
-+installed the package for one architecture, use `make distclean' before
-+reconfiguring for another architecture.
-
- On MacOS X 10.5 and later systems, you can create libraries and
- executables that work on multiple system types--known as "fat" or
--"universal" binaries--by specifying multiple '-arch' options to the
--compiler but only a single '-arch' option to the preprocessor. Like
-+"universal" binaries--by specifying multiple `-arch' options to the
-+compiler but only a single `-arch' option to the preprocessor. Like
- this:
-
- ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CPP="gcc -E" CXXCPP="g++ -E"
-
-- This is not guaranteed to produce working output in all cases. You
-+ This is not guaranteed to produce working output in all cases, you
- may have to build one architecture at a time and combine the results
--using the 'lipo' tool if you have problems.
-+using the `lipo' tool if you have problems.
-
- Installation Names
- ==================
-
-- By default, ‘make install’ will install the package's files in
--‘/usr/local/bin’, ‘/usr/local/man’, etc. You can specify an
--installation prefix other than ‘/usr/local’ by giving ‘configure’ the
--option ‘--prefix=PATH’.
-+ By default, `make install' installs the package's commands under
-+`/usr/local/bin', include files under `/usr/local/include', etc. You
-+can specify an installation prefix other than `/usr/local' by giving
-+`configure' the option `--prefix=PREFIX', where PREFIX must be an
-+absolute file name.
-
- You can specify separate installation prefixes for
- architecture-specific files and architecture-independent files. If you
--give ‘configure’ the option ‘--exec-prefix=PATH’, the package will use
--PATH as the prefix for installing programs and libraries.
--Documentation and other data files will still use the regular prefix.
-+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-+PREFIX as the prefix for installing programs and libraries.
-+Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
--options like ‘--bindir=PATH’ to specify different values for particular
--kinds of files. Run ‘configure --help’ for a list of the directories
--you can set and what kinds of files go in them.
--
-- If the package supports it, you can cause programs to be installed
--with an extra prefix or suffix on their names by giving ‘configure’ the
--option ‘--program-prefix=PREFIX’ or ‘--program-suffix=SUFFIX’.
--
--Enabling Relocatability
--=======================
--
-- It has been a pain for many users of GNU packages for a long time
--that packages are not relocatable. It means a user cannot copy a
--program, installed by another user on the same machine, to his home
--directory, and have it work correctly (including i18n). So many users
--need to go through ‘configure; make; make install’ with all its
--dependencies, options, and hurdles.
--
-- Red Hat, Debian, and similar package systems solve the "ease of
--installation" problem, but they hardwire path names, usually to ‘/usr’
--or ‘/usr/local’. This means that users need root privileges to install
--a binary package, and prevents installing two different versions of the
--same binary package.
--
-- A relocatable program can be moved or copied to a different location
--on the filesystem. It is possible to make symlinks to the installed
--and moved programs, and invoke them through the symlink. It is possible
--to do the same thing with a hard link _only_ if the hard link file is
--in the same directory as the real program.
--
-- To configure a program to be relocatable, add ‘--enable-relocatable’
--to the ‘configure’ command line.
--
-- On some OSes the executables remember the location of shared
--libraries and prefer them over any other search path. Therefore, such
--an executable will look for its shared libraries first in the original
--installation directory and only then in the current installation
--directory. Thus, for reliability, it is best to also give a ‘--prefix’
--option pointing to a directory that does not exist now and which never
--will be created, e.g. ‘--prefix=/nonexistent’. You may use
--‘DESTDIR=DEST-DIR’ on the ‘make’ command line to avoid installing into
--that directory.
--
-- We do not recommend using a prefix writable by unprivileged users
--(e.g. ‘/tmp/inst$$’) because such a directory can be recreated by an
--unprivileged user after the original directory has been removed. We
--also do not recommend prefixes that might be behind an automounter
--(e.g. ‘$HOME/inst$$’) because of the performance impact of directory
--searching.
--
-- Here's a sample installation run that takes into account all these
--recommendations:
--
-- ./configure --enable-relocatable --prefix=/nonexistent
-- make
-- make install DESTDIR=/tmp/inst$$
--
-- Installation with ‘--enable-relocatable’ will not work for setuid or
--setgid executables, because such executables search only system library
--paths for security reasons. Also, installation with
--‘--enable-relocatable’ might not work on OpenBSD, when the package
--contains shared libraries and libtool versions 1.5.xx are used.
--
-- The runtime penalty and size penalty are negligible on GNU/Linux
--(just one system call more when an executable is launched), and small on
--other systems (the wrapper program just sets an environment variable
--and executes the real program).
-+options like `--bindir=DIR' to specify different values for particular
-+kinds of files. Run `configure --help' for a list of the directories
-+you can set and what kinds of files go in them. In general, the
-+default for these options is expressed in terms of `${prefix}', so that
-+specifying just `--prefix' will affect all of the other directory
-+specifications that were not explicitly provided.
-+
-+ The most portable way to affect installation locations is to pass the
-+correct locations to `configure'; however, many packages provide one or
-+both of the following shortcuts of passing variable assignments to the
-+`make install' command line to change installation locations without
-+having to reconfigure or recompile.
-+
-+ The first method involves providing an override variable for each
-+affected directory. For example, `make install
-+prefix=/alternate/directory' will choose an alternate location for all
-+directory configuration variables that were expressed in terms of
-+`${prefix}'. Any directories that were specified during `configure',
-+but not in terms of `${prefix}', must each be overridden at install
-+time for the entire installation to be relocated. The approach of
-+makefile variable overrides for each directory variable is required by
-+the GNU Coding Standards, and ideally causes no recompilation.
-+However, some platforms have known limitations with the semantics of
-+shared libraries that end up requiring recompilation when using this
-+method, particularly noticeable in packages that use GNU Libtool.
-+
-+ The second method involves providing the `DESTDIR' variable. For
-+example, `make install DESTDIR=/alternate/directory' will prepend
-+`/alternate/directory' before all installation names. The approach of
-+`DESTDIR' overrides is not required by the GNU Coding Standards, and
-+does not work on platforms that have drive letters. On the other hand,
-+it does better at avoiding recompilation issues, and works well even
-+when some directory options were not specified in terms of `${prefix}'
-+at `configure' time.
-
- Optional Features
- =================
-
-- Some packages pay attention to ‘--enable-FEATURE’ options to
--‘configure’, where FEATURE indicates an optional part of the package.
--They may also pay attention to ‘--with-PACKAGE’ options, where PACKAGE
--is something like ‘gnu-as’ or ‘x’ (for the X Window System). The
--‘README’ should mention any ‘--enable-’ and ‘--with-’ options that the
-+ If the package supports it, you can cause programs to be installed
-+with an extra prefix or suffix on their names by giving `configure' the
-+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-+
-+ Some packages pay attention to `--enable-FEATURE' options to
-+`configure', where FEATURE indicates an optional part of the package.
-+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-+is something like `gnu-as' or `x' (for the X Window System). The
-+`README' should mention any `--enable-' and `--with-' options that the
- package recognizes.
-
-- For packages that use the X Window System, ‘configure’ can usually
-+ For packages that use the X Window System, `configure' can usually
- find the X include and library files automatically, but if it doesn't,
--you can use the ‘configure’ options ‘--x-includes=DIR’ and
--‘--x-libraries=DIR’ to specify their locations.
-+you can use the `configure' options `--x-includes=DIR' and
-+`--x-libraries=DIR' to specify their locations.
-
-- For packages that use the GNU libiconv library, you can use the
--‘configure’ option ‘--with-libiconv-prefix’ to specify the prefix you
--used while installing GNU libiconv. This option is not necessary if
--that other prefix is the same as the one now specified through --prefix.
--
-- For packages that use the GNU libintl library, you can use the
--‘configure’ option ‘--with-libintl-prefix’ to specify the prefix you
--used while installing GNU gettext-runtime. This option is not necessary if
--that other prefix is the same as the one now specified through --prefix.
-+ Some packages offer the ability to configure how verbose the
-+execution of `make' will be. For these packages, running `./configure
-+--enable-silent-rules' sets the default to minimal output, which can be
-+overridden with `make V=1'; while running `./configure
-+--disable-silent-rules' sets the default to verbose, which can be
-+overridden with `make V=0'.
-
--Particular Systems
-+Particular systems
- ==================
-
-- On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC
--is not installed, it is recommended to use the following options in order
--to use an ANSI C compiler:
-+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-+CC is not installed, it is recommended to use the following options in
-+order to use an ANSI C compiler:
-
- ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
- and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-+ HP-UX `make' updates targets which have the same time stamps as
-+their prerequisites, which makes it generally unusable when shipped
-+generated files such as `configure' are involved. Use GNU `make'
-+instead.
-+
- On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
--parse its ‘<wchar.h>’ header file. The option ‘-nodtk’ can be used as
-+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
- a workaround. If GNU CC is not installed, it is therefore recommended
- to try
-
-@@ -227,81 +242,129 @@ and if that doesn't work, try
-
- ./configure CC="cc -nodtk"
-
-- On AIX 3, the C include files by default don't define some necessary
--prototype declarations. If GNU CC is not installed, it is recommended to
--use the following options:
--
-- ./configure CC="xlc -D_ALL_SOURCE"
-+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
-+directory contains several dysfunctional programs; working variants of
-+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
-+in your `PATH', put it _after_ `/usr/bin'.
-
-- On Haiku, software installed for all users goes in /boot/common, not
--/usr/local. It is recommended to use the following options:
-+ On Haiku, software installed for all users goes in `/boot/common',
-+not `/usr/local'. It is recommended to use the following options:
-
- ./configure --prefix=/boot/common
-
-- On BeOS, user installed software goes in /boot/home/config, not
--/usr/local. It is recommended to use the following options:
--
-- ./configure --prefix=/boot/home/config
--
- Specifying the System Type
- ==========================
-
-- There may be some features ‘configure’ can not figure out
--automatically, but needs to determine by the type of host the package
--will run on. Usually ‘configure’ can figure that out, but if it prints
--a message saying it can not guess the host type, give it the
--‘--host=TYPE’ option. TYPE can either be a short name for the system
--type, such as ‘sun4’, or a canonical name with three fields:
-+ There may be some features `configure' cannot figure out
-+automatically, but needs to determine by the type of machine the package
-+will run on. Usually, assuming the package is built to be run on the
-+_same_ architectures, `configure' can figure that out, but if it prints
-+a message saying it cannot guess the machine type, give it the
-+`--build=TYPE' option. TYPE can either be a short name for the system
-+type, such as `sun4', or a canonical name which has the form:
-+
- CPU-COMPANY-SYSTEM
-
--See the file ‘config.sub’ for the possible values of each field. If
--‘config.sub’ isn't included in this package, then this package doesn't
--need to know the host type.
--
-- If you are building compiler tools for cross-compiling, you can also
--use the ‘--target=TYPE’ option to select the type of system they will
--produce code for and the ‘--build=TYPE’ option to select the type of
--system on which you are compiling the package.
-+where SYSTEM can have one of these forms:
-+
-+ OS
-+ KERNEL-OS
-+
-+ See the file `config.sub' for the possible values of each field. If
-+`config.sub' isn't included in this package, then this package doesn't
-+need to know the machine type.
-+
-+ If you are _building_ compiler tools for cross-compiling, you should
-+use the option `--target=TYPE' to select the type of system they will
-+produce code for.
-+
-+ If you want to _use_ a cross compiler, that generates code for a
-+platform different from the build platform, you should specify the
-+"host" platform (i.e., that on which the generated programs will
-+eventually be run) with `--host=TYPE'.
-
- Sharing Defaults
- ================
-
-- If you want to set default values for ‘configure’ scripts to share,
--you can create a site shell script called ‘config.site’ that gives
--default values for variables like ‘CC’, ‘cache_file’, and ‘prefix’.
--‘configure’ looks for ‘PREFIX/share/config.site’ if it exists, then
--‘PREFIX/etc/config.site’ if it exists. Or, you can set the
--‘CONFIG_SITE’ environment variable to the location of the site script.
--A warning: not all ‘configure’ scripts look for a site script.
-+ If you want to set default values for `configure' scripts to share,
-+you can create a site shell script called `config.site' that gives
-+default values for variables like `CC', `cache_file', and `prefix'.
-+`configure' looks for `PREFIX/share/config.site' if it exists, then
-+`PREFIX/etc/config.site' if it exists. Or, you can set the
-+`CONFIG_SITE' environment variable to the location of the site script.
-+A warning: not all `configure' scripts look for a site script.
-
--Operation Controls
-+Defining Variables
- ==================
-
-- ‘configure’ recognizes the following options to control how it
-+ Variables not defined in a site shell script can be set in the
-+environment passed to `configure'. However, some packages may run
-+configure again during the build, and the customized values of these
-+variables may be lost. In order to avoid this problem, you should set
-+them in the `configure' command line, using `VAR=value'. For example:
-+
-+ ./configure CC=/usr/local2/bin/gcc
-+
-+causes the specified `gcc' to be used as the C compiler (unless it is
-+overridden in the site shell script).
-+
-+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-+an Autoconf limitation. Until the limitation is lifted, you can use
-+this workaround:
-+
-+ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
-+
-+`configure' Invocation
-+======================
-+
-+ `configure' recognizes the following options to control how it
- operates.
-
--‘--cache-file=FILE’
-- Use and save the results of the tests in FILE instead of
-- ‘./config.cache’. Set FILE to ‘/dev/null’ to disable caching, for
-- debugging ‘configure’.
--
--‘--help’
-- Print a summary of the options to ‘configure’, and exit.
--
--‘--quiet’
--‘--silent’
--‘-q’
-+`--help'
-+`-h'
-+ Print a summary of all of the options to `configure', and exit.
-+
-+`--help=short'
-+`--help=recursive'
-+ Print a summary of the options unique to this package's
-+ `configure', and exit. The `short' variant lists options used
-+ only in the top level, while the `recursive' variant lists options
-+ also present in any nested packages.
-+
-+`--version'
-+`-V'
-+ Print the version of Autoconf used to generate the `configure'
-+ script, and exit.
-+
-+`--cache-file=FILE'
-+ Enable the cache: use and save the results of the tests in FILE,
-+ traditionally `config.cache'. FILE defaults to `/dev/null' to
-+ disable caching.
-+
-+`--config-cache'
-+`-C'
-+ Alias for `--cache-file=config.cache'.
-+
-+`--quiet'
-+`--silent'
-+`-q'
- Do not print messages saying which checks are being made. To
-- suppress all normal output, redirect it to ‘/dev/null’ (any error
-+ suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
--‘--srcdir=DIR’
-+`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
-- ‘configure’ can determine that directory automatically.
--
--‘--version’
-- Print the version of Autoconf used to generate the ‘configure’
-- script, and exit.
-+ `configure' can determine that directory automatically.
-
--‘configure’ also accepts some other, not widely useful, options.
-+`--prefix=DIR'
-+ Use DIR as the installation prefix. *note Installation Names::
-+ for more details, including other options available for fine-tuning
-+ the installation locations.
-+
-+`--no-create'
-+`-n'
-+ Run the configure checks, but stop before creating any output
-+ files.
-
-+`configure' also accepts some other, not widely useful, options. Run
-+`configure --help' for more details.
-diff -Naurp gettext-0.18.3.1.orig/Makefile.in gettext-0.18.3.1/Makefile.in
---- gettext-0.18.3.1.orig/Makefile.in 2013-08-15 09:34:36.000000000 -0700
-+++ gettext-0.18.3.1/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -541,10 +541,16 @@ dist-xz: distdir
- $(am__post_remove_distdir)
-
- dist-tarZ: distdir
-+ @echo WARNING: "Support for shar distribution archives is" \
-+ "deprecated." >&2
-+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__post_remove_distdir)
-
- dist-shar: distdir
-+ @echo WARNING: "Support for distribution archives compressed with" \
-+ "legacy program 'compress' is deprecated." >&2
-+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__post_remove_distdir)
-
-@@ -587,9 +593,10 @@ distcheck: dist
- && $(MAKE) $(AM_MAKEFLAGS) distcheck-hook \
- && am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
-- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+ && ../configure \
- $(AM_DISTCHECK_CONFIGURE_FLAGS) \
- $(DISTCHECK_CONFIGURE_FLAGS) \
-+ --srcdir=.. --prefix="$$dc_install_base" \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
- && $(MAKE) $(AM_MAKEFLAGS) check \
-diff -Naurp gettext-0.18.3.1.orig/aclocal.m4 gettext-0.18.3.1/aclocal.m4
---- gettext-0.18.3.1.orig/aclocal.m4 2013-08-15 09:34:31.000000000 -0700
-+++ gettext-0.18.3.1/aclocal.m4 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
-+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
-
- # Copyright (C) 1996-2013 Free Software Foundation, Inc.
-
-@@ -32,10 +32,10 @@ To do so, use the procedure documented b
- # generated from the m4 files accompanying Automake X.Y.
- # (This private macro should not be called outside this file.)
- AC_DEFUN([AM_AUTOMAKE_VERSION],
--[am__api_version='1.13'
-+[am__api_version='1.14'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.13.4], [],
-+m4_if([$1], [1.14.1], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.13.4])dnl
-+[AM_AUTOMAKE_VERSION([1.14.1])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-@@ -120,6 +120,12 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
- # This macro actually does too much. Some checks are only needed if
- # your package does certain things. But this isn't really a big deal.
-
-+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
-+m4_define([AC_PROG_CC],
-+m4_defn([AC_PROG_CC])
-+[_AM_PROG_CC_C_O
-+])
-+
- # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
- # AM_INIT_AUTOMAKE([OPTIONS])
- # -----------------------------------------------
-@@ -228,7 +234,48 @@ dnl macro is hooked onto _AC_COMPILER_EX
- AC_CONFIG_COMMANDS_PRE(dnl
- [m4_provide_if([_AM_COMPILER_EXEEXT],
- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
--])
-+
-+# POSIX will say in a future version that running "rm -f" with no argument
-+# is OK; and we want to be able to make that assumption in our Makefile
-+# recipes. So use an aggressive probe to check that the usage we want is
-+# actually supported "in the wild" to an acceptable degree.
-+# See automake bug#10828.
-+# To make any issue more visible, cause the running configure to be aborted
-+# by default if the 'rm' program in use doesn't match our expectations; the
-+# user can still override this though.
-+if rm -f && rm -fr && rm -rf; then : OK; else
-+ cat >&2 <<'END'
-+Oops!
-+
-+Your 'rm' program seems unable to run without file operands specified
-+on the command line, even when the '-f' option is present. This is contrary
-+to the behaviour of most rm programs out there, and not conforming with
-+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-+
-+Please tell bug-automake@gnu.org about your system, including the value
-+of your $PATH and any error possibly output before this message. This
-+can help us improve future automake versions.
-+
-+END
-+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-+ echo 'Configuration will proceed anyway, since you have set the' >&2
-+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-+ echo >&2
-+ else
-+ cat >&2 <<'END'
-+Aborting the configuration process, to ensure you take notice of the issue.
-+
-+You can download and install GNU coreutils to get an 'rm' implementation
-+that behaves properly: <http://www.gnu.org/software/coreutils/>.
-+
-+If you want to complete the configuration process using your problematic
-+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-+to "yes", and re-run configure.
-+
-+END
-+ AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
-+ fi
-+fi])
-
- dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
- dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-@@ -236,7 +283,6 @@ dnl mangled by Autoconf and run in a she
- m4_define([_AC_COMPILER_EXEEXT],
- m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
--
- # When config.status generates a header, we must update the stamp-h file.
- # This file resides in the same directory as the config header
- # that is generated. The stamp files are numbered to have different names.
-diff -Naurp gettext-0.18.3.1.orig/build-aux/config.guess gettext-0.18.3.1/build-aux/config.guess
---- gettext-0.18.3.1.orig/build-aux/config.guess 2013-08-15 09:26:24.000000000 -0700
-+++ gettext-0.18.3.1/build-aux/config.guess 2013-12-31 11:58:08.000000000 -0800
-@@ -2,7 +2,7 @@
- # Attempt to guess a canonical system name.
- # Copyright 1992-2013 Free Software Foundation, Inc.
-
--timestamp='2013-06-10'
-+timestamp='2013-11-29'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -1260,16 +1260,26 @@ EOF
- if test "$UNAME_PROCESSOR" = unknown ; then
- UNAME_PROCESSOR=powerpc
- fi
-- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-- grep IS_64BIT_ARCH >/dev/null
-- then
-- case $UNAME_PROCESSOR in
-- i386) UNAME_PROCESSOR=x86_64 ;;
-- powerpc) UNAME_PROCESSOR=powerpc64 ;;
-- esac
-+ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+ grep IS_64BIT_ARCH >/dev/null
-+ then
-+ case $UNAME_PROCESSOR in
-+ i386) UNAME_PROCESSOR=x86_64 ;;
-+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
-+ esac
-+ fi
- fi
-+ elif test "$UNAME_PROCESSOR" = i386 ; then
-+ # Avoid executing cc on OS X 10.9, as it ships with a stub
-+ # that puts up a graphical alert prompting to install
-+ # developer tools. Any system running Mac OS X 10.7 or
-+ # later (Darwin 11 and later) is required to have a 64-bit
-+ # processor. This is not true of the ARM version of Darwin
-+ # that Apple uses in portable devices.
-+ UNAME_PROCESSOR=x86_64
- fi
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- exit ;;
-diff -Naurp gettext-0.18.3.1.orig/build-aux/config.sub gettext-0.18.3.1/build-aux/config.sub
---- gettext-0.18.3.1.orig/build-aux/config.sub 2013-08-15 09:26:24.000000000 -0700
-+++ gettext-0.18.3.1/build-aux/config.sub 2013-12-31 11:58:08.000000000 -0800
-@@ -2,7 +2,7 @@
- # Configuration validation subroutine script.
- # Copyright 1992-2013 Free Software Foundation, Inc.
-
--timestamp='2013-04-24'
-+timestamp='2013-10-01'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -257,7 +257,7 @@ case $basic_machine in
- | avr | avr32 \
- | be32 | be64 \
- | bfin \
-- | c4x | clipper \
-+ | c4x | c8051 | clipper \
- | d10v | d30v | dlx | dsp16xx \
- | epiphany \
- | fido | fr30 | frv \
-@@ -265,6 +265,7 @@ case $basic_machine in
- | hexagon \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
-+ | k1om \
- | le32 | le64 \
- | lm32 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
-@@ -324,7 +325,7 @@ case $basic_machine in
- c6x)
- basic_machine=tic6x-unknown
- ;
-- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
-+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
- basic_machine=$basic_machine-unknown
- os=-none
- ;
-@@ -372,7 +373,7 @@ case $basic_machine in
- | be32-* | be64-* \
- | bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* \
-- | clipper-* | craynv-* | cydra-* \
-+ | c8051-* | clipper-* | craynv-* | cydra-* \
- | d10v-* | d30v-* | dlx-* \
- | elxsi-* \
- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-@@ -381,6 +382,7 @@ case $basic_machine in
- | hexagon-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
-+ | k1om-* \
- | le32-* | le64-* \
- | lm32-* \
- | m32c-* | m32r-* | m32rle-* \
-@@ -794,7 +796,7 @@ case $basic_machine in
- os=-mingw64
- ;
- mingw32)
-- basic_machine=i386-pc
-+ basic_machine=i686-pc
- os=-mingw32
- ;
- mingw32ce)
-@@ -830,7 +832,7 @@ case $basic_machine in
- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
- ;
- msys)
-- basic_machine=i386-pc
-+ basic_machine=i686-pc
- os=-msys
- ;
- mvs)
-@@ -1546,6 +1548,9 @@ case $basic_machine in
- c4x-* | tic4x-*)
- os=-coff
- ;
-+ c8051-*)
-+ os=-elf
-+ ;
- hexagon-*)
- os=-elf
- ;
-diff -Naurp gettext-0.18.3.1.orig/build-aux/ltmain.sh gettext-0.18.3.1/build-aux/ltmain.sh
---- gettext-0.18.3.1.orig/build-aux/ltmain.sh 2012-12-09 17:59:06.000000000 -0800
-+++ gettext-0.18.3.1/build-aux/ltmain.sh 2013-12-31 11:58:08.000000000 -0800
-@@ -5851,9 +5851,10 @@ func_mode_link ()
- # -tp=* Portland pgcc target processor selection
- # --sysroot=* for sysroot support
- # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-+ # -stdlib=* select c++ std lib with clang
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-stdlib=*)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"
-diff -Naurp gettext-0.18.3.1.orig/build-aux/missing gettext-0.18.3.1/build-aux/missing
---- gettext-0.18.3.1.orig/build-aux/missing 2013-08-15 09:26:29.000000000 -0700
-+++ gettext-0.18.3.1/build-aux/missing 2013-12-31 11:58:08.000000000 -0800
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # Common wrapper for a few potentially missing GNU programs.
-
--scriptversion=2012-06-26.16; # UTC
-+scriptversion=2013-10-28.13; # UTC
-
- # Copyright (C) 1996-2013 Free Software Foundation, Inc.
- # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-@@ -160,7 +160,7 @@ give_advice ()
- ;;
- autom4te*)
- echo "You might have modified some maintainer files that require"
-- echo "the 'automa4te' program to be rebuilt."
-+ echo "the 'autom4te' program to be rebuilt."
- program_details 'autom4te'
- ;;
- bison*|yacc*)
-diff -Naurp gettext-0.18.3.1.orig/build-aux/mkinstalldirs gettext-0.18.3.1/build-aux/mkinstalldirs
---- gettext-0.18.3.1.orig/build-aux/mkinstalldirs 2012-12-09 17:59:06.000000000 -0800
-+++ gettext-0.18.3.1/build-aux/mkinstalldirs 2013-12-31 11:58:08.000000000 -0800
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # mkinstalldirs --- make directory hierarchy
-
--scriptversion=2005-06-29.22
-+scriptversion=2009-04-28.21; # UTC
-
- # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
- # Created: 1993-05-16
-@@ -11,6 +11,9 @@ scriptversion=2005-06-29.22
- # bugs to <bug-automake@gnu.org> or send patches to
- # <automake-patches@gnu.org>.
-
-+nl='
-+'
-+IFS=" "" $nl"
- errstatus=0
- dirmode=
-
-@@ -78,9 +81,9 @@ case $dirmode in
- echo "mkdir -p -- $*"
- exec mkdir -p -- "$@"
- else
-- # On NextStep and OpenStep, the `mkdir' command does not
-+ # 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
-+ # directories to create, and then abort because '.' already
- # exists.
- test -d ./-p && rmdir ./-p
- test -d ./--version && rmdir ./--version
-@@ -154,5 +157,6 @@ exit $errstatus
- # eval: (add-hook 'write-file-hooks 'time-stamp)
- # time-stamp-start: "scriptversion="
- # time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-end: "$"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
- # End:
-diff -Naurp gettext-0.18.3.1.orig/build-aux/test-driver gettext-0.18.3.1/build-aux/test-driver
---- gettext-0.18.3.1.orig/build-aux/test-driver 2013-08-15 09:26:41.000000000 -0700
-+++ gettext-0.18.3.1/build-aux/test-driver 2013-12-31 11:58:08.000000000 -0800
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # test-driver - basic testsuite driver script.
-
--scriptversion=2012-06-27.10; # UTC
-+scriptversion=2013-07-13.22; # UTC
-
- # Copyright (C) 2011-2013 Free Software Foundation, Inc.
- #
-@@ -44,13 +44,12 @@ print_usage ()
- Usage:
- test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
- [--expect-failure={yes|no}] [--color-tests={yes|no}]
-- [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
-+ [--enable-hard-errors={yes|no}] [--]
-+ TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
- The '--test-name', '--log-file' and '--trs-file' options are mandatory.
- END
- }
-
--# TODO: better error handling in option parsing (in particular, ensure
--# TODO: $log_file, $trs_file and $test_name are defined).
- test_name= # Used for reporting.
- log_file= # Where to save the output of the test script.
- trs_file= # Where to save the metadata of the test run.
-@@ -69,10 +68,23 @@ while test $# -gt 0; do
- --enable-hard-errors) enable_hard_errors=$2; shift;;
- --) shift; break;;
- -*) usage_error "invalid option: '$1'";;
-+ *) break;;
- esac
- shift
- done
-
-+missing_opts=
-+test x"$test_name" = x && missing_opts="$missing_opts --test-name"
-+test x"$log_file" = x && missing_opts="$missing_opts --log-file"
-+test x"$trs_file" = x && missing_opts="$missing_opts --trs-file"
-+if test x"$missing_opts" != x; then
-+ usage_error "the following mandatory options are missing:$missing_opts"
-+fi
-+
-+if test $# -eq 0; then
-+ usage_error "missing argument"
-+fi
-+
- if test $color_tests = yes; then
- # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
- red='[0;31m' # Red.
-diff -Naurp gettext-0.18.3.1.orig/build-aux/texinfo.tex gettext-0.18.3.1/build-aux/texinfo.tex
---- gettext-0.18.3.1.orig/build-aux/texinfo.tex 2012-12-09 17:59:06.000000000 -0800
-+++ gettext-0.18.3.1/build-aux/texinfo.tex 2013-12-31 11:58:08.000000000 -0800
-@@ -1,13 +1,13 @@
- % texinfo.tex -- TeX macros to handle Texinfo files.
--%
-+%
- % Load plain if necessary, i.e., if running under initex.
- \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
- %
--\def\texinfoversion{2007-09-03.05}
-+\def\texinfoversion{2013-02-01.11}
- %
--% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 2007,
-+% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
- % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
--% 2007 Free Software Foundation, Inc.
-+% 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
- %
- % This texinfo.tex file is free software: you can redistribute it and/or
- % modify it under the terms of the GNU General Public License as
-@@ -24,13 +24,14 @@
- %
- % As a special exception, when this file is read by TeX when processing
- % a Texinfo source document, you may use the result without
--% restriction. (This has been our intent since Texinfo was invented.)
-+% restriction. This Exception is an additional permission under section 7
-+% of the GNU General Public License, version 3 ("GPLv3").
- %
- % Please try the latest version of texinfo.tex before submitting bug
- % reports; you can get the latest version from:
--% http://www.gnu.org/software/texinfo/ (the Texinfo home page), or
--% ftp://tug.org/tex/texinfo.tex
--% (and all CTAN mirrors, see http://www.ctan.org).
-+% http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or
-+% http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or
-+% http://www.gnu.org/software/texinfo/ (the Texinfo home page)
- % The texinfo.tex in any given distribution could well be out
- % of date, so if that's what you're using, please check.
- %
-@@ -65,7 +66,6 @@
- \everyjob{\message{[Texinfo version \texinfoversion]}%
- \catcode`+=\active \catcode`\_=\active}
-
--
- \chardef\other=12
-
- % We never want plain's \outer definition of \+ in Texinfo.
-@@ -93,10 +93,13 @@
- \let\ptexnewwrite\newwrite
- \let\ptexnoindent=\noindent
- \let\ptexplus=+
-+\let\ptexraggedright=\raggedright
- \let\ptexrbrace=\}
- \let\ptexslash=\/
- \let\ptexstar=\*
- \let\ptext=\t
-+\let\ptextop=\top
-+{\catcode`\'=\active \global\let\ptexquoteright'}% active in plain's math mode
-
- % If this character appears in an error message or help string, it
- % starts a new line in the output.
-@@ -114,10 +117,11 @@
- % Set up fixed words for English if not already set.
- \ifx\putwordAppendix\undefined \gdef\putwordAppendix{Appendix}\fi
- \ifx\putwordChapter\undefined \gdef\putwordChapter{Chapter}\fi
-+\ifx\putworderror\undefined \gdef\putworderror{error}\fi
- \ifx\putwordfile\undefined \gdef\putwordfile{file}\fi
- \ifx\putwordin\undefined \gdef\putwordin{in}\fi
--\ifx\putwordIndexIsEmpty\undefined \gdef\putwordIndexIsEmpty{(Index is empty)}\fi
--\ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi
-+\ifx\putwordIndexIsEmpty\undefined \gdef\putwordIndexIsEmpty{(Index is empty)}\fi
-+\ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi
- \ifx\putwordInfo\undefined \gdef\putwordInfo{Info}\fi
- \ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi
- \ifx\putwordMethodon\undefined \gdef\putwordMethodon{Method on}\fi
-@@ -156,15 +160,18 @@
- \def\spaceisspace{\catcode`\ =\spacecat}
-
- % sometimes characters are active, so we need control sequences.
-+\chardef\ampChar = `\&
- \chardef\colonChar = `\:
- \chardef\commaChar = `\,
- \chardef\dashChar = `\-
- \chardef\dotChar = `\.
- \chardef\exclamChar= `\!
-+\chardef\hashChar = `\#
- \chardef\lquoteChar= `\`
- \chardef\questChar = `\?
- \chardef\rquoteChar= `\'
- \chardef\semiChar = `\;
-+\chardef\slashChar = `\/
- \chardef\underChar = `\_
-
- % Ignore a token.
-@@ -195,36 +202,7 @@
- % that mark overfull boxes (in case you have decided
- % that the text looks ok even though it passes the margin).
- %
--\def\finalout{\overfullrule=0pt}
--
--% @| inserts a changebar to the left of the current line. It should
--% surround any changed text. This approach does *not* work if the
--% change spans more than two lines of output. To handle that, we would
--% have adopt a much more difficult approach (putting marks into the main
--% vertical list for the beginning and end of each change).
--%
--\def\|{%
-- % \vadjust can only be used in horizontal mode.
-- \leavevmode
-- %
-- % Append this vertical mode material after the current line in the output.
-- \vadjust{%
-- % We want to insert a rule with the height and depth of the current
-- % leading; that is exactly what \strutbox is supposed to record.
-- \vskip-\baselineskip
-- %
-- % \vadjust-items are inserted at the left edge of the type. So
-- % the \llap here moves out into the left-hand margin.
-- \llap{%
-- %
-- % For a thicker or thinner bar, change the `1pt'.
-- \vrule height\baselineskip width1pt
-- %
-- % This is the space between the bar and the text.
-- \hskip 12pt
-- }%
-- }%
--}
-+\def\finalout{\overfullrule=0pt }
-
- % Sometimes it is convenient to have everything in the transcript file
- % and nothing on the terminal. We don't just call \tracingall here,
-@@ -242,7 +220,7 @@
- \tracingmacros2
- \tracingrestores1
- \showboxbreadth\maxdimen \showboxdepth\maxdimen
-- \ifx\eTeXversion\undefined\else % etex gives us more logging
-+ \ifx\eTeXversion\thisisundefined\else % etex gives us more logging
- \tracingscantokens1
- \tracingifs1
- \tracinggroups1
-@@ -253,6 +231,13 @@
- \errorcontextlines16
- }%
-
-+% @errormsg{MSG}. Do the index-like expansions on MSG, but if things
-+% aren't perfect, it's not the end of the world, being an error message,
-+% after all.
-+%
-+\def\errormsg{\begingroup \indexnofonts \doerrormsg}
-+\def\doerrormsg#1{\errmessage{#1}}
-+
- % add check for \lastpenalty to plain's definitions. If the last thing
- % we did was a \nobreak, we don't want to insert more space.
- %
-@@ -263,7 +248,6 @@
- \def\bigbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\bigskipamount
- \removelastskip\penalty-200\bigskip\fi\fi}
-
--% For @cropmarks command.
- % Do @cropmarks to get crop marks.
- %
- \newif\ifcropmarks
-@@ -354,7 +338,7 @@
- % We don't want .vr (or whatever) entries like this:
- % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}}
- % "\acronym" won't work when it's read back in;
-- % it needs to be
-+ % it needs to be
- % {\code {{\tt \backslashcurfont }acronym}
- \shipout\vbox{%
- % Do this early so pdf references go to the beginning of the page.
-@@ -460,7 +444,7 @@
- \def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm}
- \def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
-
--% Each occurence of `\^^M' or `<space>\^^M' is replaced by a single space.
-+% Each occurrence of `\^^M' or `<space>\^^M' is replaced by a single space.
- %
- % \argremovec might leave us with trailing space, e.g.,
- % @end itemize @c foo
-@@ -485,7 +469,7 @@
- % to get _exactly_ the rest of the line, we had to prevent such situation.
- % We prepended an \empty token at the very beginning and we expand it now,
- % just before passing the control to \argtorun.
--% (Similarily, we have to think about #3 of \argcheckspacesY above: it is
-+% (Similarly, we have to think about #3 of \argcheckspacesY above: it is
- % either the null string, or it ends with \^^M---thus there is no danger
- % that a pair of braces would be stripped.
- %
-@@ -542,12 +526,12 @@
- % used to check whether the current environment is the one expected.
- %
- % Non-false conditionals (@iftex, @ifset) don't fit into this, so they
--% are not treated as enviroments; they don't open a group. (The
-+% are not treated as environments; they don't open a group. (The
- % implementation of @end takes care not to call \endgroup in this
- % special case.)
-
-
--% At runtime, environments start with this:
-+% At run-time, environments start with this:
- \def\startenvironment#1{\begingroup\def\thisenv{#1}}
- % initialize
- \let\thisenv\empty
-@@ -565,7 +549,7 @@
- \fi
- }
-
--% Evironment mismatch, #1 expected:
-+% Environment mismatch, #1 expected:
- \def\badenverr{%
- \errhelp = \EMsimple
- \errmessage{This command can appear only \inenvironment\temp,
-@@ -573,7 +557,7 @@
- }
- \def\inenvironment#1{%
- \ifx#1\empty
-- out of any environment%
-+ outside of any environment%
- \else
- in environment \expandafter\string#1%
- \fi
-@@ -585,7 +569,7 @@
- \parseargdef\end{%
- \if 1\csname iscond.#1\endcsname
- \else
-- % The general wording of \badenverr may not be ideal, but... --kasal, 06nov03
-+ % The general wording of \badenverr may not be ideal.
- \expandafter\checkenv\csname#1\endcsname
- \csname E#1\endcsname
- \endgroup
-@@ -595,85 +579,6 @@
- \newhelp\EMsimple{Press RETURN to continue.}
-
-
--%% Simple single-character @ commands
--
--% @@ prints an @
--% Kludge this until the fonts are right (grr).
--\def\@{{\tt\char64}}
--
--% This is turned off because it was never documented
--% and you can use @w{...} around a quote to suppress ligatures.
--%% Define @` and @' to be the same as ` and '
--%% but suppressing ligatures.
--%\def\`{{`}}
--%\def\'{{'}}
--
--% Used to generate quoted braces.
--\def\mylbrace {{\tt\char123}}
--\def\myrbrace {{\tt\char125}}
--\let\{=\mylbrace
--\let\}=\myrbrace
--\begingroup
-- % Definitions to produce \{ and \} commands for indices,
-- % and @{ and @} for the aux/toc files.
-- \catcode`\{ = \other \catcode`\} = \other
-- \catcode`\[ = 1 \catcode`\] = 2
-- \catcode`\! = 0 \catcode`\\ = \other
-- !gdef!lbracecmd[\{]%
-- !gdef!rbracecmd[\}]%
-- !gdef!lbraceatcmd[@{]%
-- !gdef!rbraceatcmd[@}]%
--!endgroup
--
--% @comma{} to avoid , parsing problems.
--\let\comma = ,
--
--% Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent
--% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H.
--\let\, = \c
--\let\dotaccent = \.
--\def\ringaccent#1{{\accent23 #1}}
--\let\tieaccent = \t
--\let\ubaraccent = \b
--\let\udotaccent = \d
--
--% Other special characters: @questiondown @exclamdown @ordf @ordm
--% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss.
--\def\questiondown{?`}
--\def\exclamdown{!`}
--\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}}
--\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}}
--
--% Dotless i and dotless j, used for accents.
--\def\imacro{i}
--\def\jmacro{j}
--\def\dotless#1{%
-- \def\temp{#1}%
-- \ifx\temp\imacro \ptexi
-- \else\ifx\temp\jmacro \j
-- \else \errmessage{@dotless can be used only with i or j}%
-- \fi\fi
--}
--
--% The \TeX{} logo, as in plain, but resetting the spacing so that a
--% period following counts as ending a sentence. (Idea found in latex.)
--%
--\edef\TeX{\TeX \spacefactor=1000 }
--
--% @LaTeX{} logo. Not quite the same results as the definition in
--% latex.ltx, since we use a different font for the raised A; it's most
--% convenient for us to use an explicitly smaller font, rather than using
--% the \scriptstyle font (since we don't reset \scriptstyle and
--% \scriptscriptstyle).
--%
--\def\LaTeX{%
-- L\kern-.36em
-- {\setbox0=\hbox{T}%
-- \vbox to \ht0{\hbox{\selectfonts\lllsize A}\vss}}%
-- \kern-.15em
-- \TeX
--}
--
- % Be sure we're in horizontal mode when doing a tie, since we make space
- % equivalent to this in @example-like environments. Otherwise, a space
- % at the beginning of a line will start with \penalty -- and
-@@ -690,7 +595,7 @@
- \def\:{\spacefactor=1000 }
-
- % @* forces a line break.
--\def\*{\hfil\break\hbox{}\ignorespaces}
-+\def\*{\unskip\hfil\break\hbox{}\ignorespaces}
-
- % @/ allows a line break.
- \let\/=\allowbreak
-@@ -705,7 +610,7 @@
- \def\?{?\spacefactor=\endofsentencespacefactor\space}
-
- % @frenchspacing on|off says whether to put extra space after punctuation.
--%
-+%
- \def\onword{on}
- \def\offword{off}
- %
-@@ -715,7 +620,7 @@
- \else\ifx\temp\offword \plainnonfrenchspacing
- \else
- \errhelp = \EMsimple
-- \errmessage{Unknown @frenchspacing option `\temp', must be on/off}%
-+ \errmessage{Unknown @frenchspacing option `\temp', must be on|off}%
- \fi\fi
- }
-
-@@ -797,15 +702,6 @@ where each line of input produces a line
-
- \newdimen\mil \mil=0.001in
-
--% Old definition--didn't work.
--%\parseargdef\need{\par %
--%% This method tries to make TeX break the page naturally
--%% if the depth of the box does not fit.
--%{\baselineskip=0pt%
--%\vtop to #1\mil{\vfil}\kern -#1\mil\nobreak
--%\prevdepth=-1000pt
--%}}
--
- \parseargdef\need{%
- % Ensure vertical mode, so we don't make a big box in the middle of a
- % paragraph.
-@@ -869,7 +765,7 @@ where each line of input produces a line
-
- % @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current
- % paragraph. For more general purposes, use the \margin insertion
--% class. WHICH is `l' or `r'.
-+% class. WHICH is `l' or `r'. Not documented, written for gawk manual.
- %
- \newskip\inmarginspacing \inmarginspacing=1cm
- \def\strutdepth{\dp\strutbox}
-@@ -916,15 +812,51 @@ where each line of input produces a line
- \temp
- }
-
--% @include file insert text of that file as input.
-+% @| inserts a changebar to the left of the current line. It should
-+% surround any changed text. This approach does *not* work if the
-+% change spans more than two lines of output. To handle that, we would
-+% have adopt a much more difficult approach (putting marks into the main
-+% vertical list for the beginning and end of each change). This command
-+% is not documented, not supported, and doesn't work.
-+%
-+\def\|{%
-+ % \vadjust can only be used in horizontal mode.
-+ \leavevmode
-+ %
-+ % Append this vertical mode material after the current line in the output.
-+ \vadjust{%
-+ % We want to insert a rule with the height and depth of the current
-+ % leading; that is exactly what \strutbox is supposed to record.
-+ \vskip-\baselineskip
-+ %
-+ % \vadjust-items are inserted at the left edge of the type. So
-+ % the \llap here moves out into the left-hand margin.
-+ \llap{%
-+ %
-+ % For a thicker or thinner bar, change the `1pt'.
-+ \vrule height\baselineskip width1pt
-+ %
-+ % This is the space between the bar and the text.
-+ \hskip 12pt
-+ }%
-+ }%
-+}
-+
-+% @include FILE -- \input text of FILE.
- %
- \def\include{\parseargusing\filenamecatcodes\includezzz}
- \def\includezzz#1{%
- \pushthisfilestack
- \def\thisfile{#1}%
- {%
-- \makevalueexpandable
-- \def\temp{\input #1 }%
-+ \makevalueexpandable % we want to expand any @value in FILE.
-+ \turnoffactive % and allow special characters in the expansion
-+ \indexnofonts % Allow `@@' and other weird things in file names.
-+ \wlog{texinfo.tex: doing @include of #1^^J}%
-+ \edef\temp{\noexpand\input #1 }%
-+ %
-+ % This trickery is to read FILE outside of a group, in case it makes
-+ % definitions, etc.
- \expandafter
- }\temp
- \popthisfilestack
-@@ -939,6 +871,8 @@ where each line of input produces a line
- \catcode`>=\other
- \catcode`+=\other
- \catcode`-=\other
-+ \catcode`\`=\other
-+ \catcode`\'=\other
- }
-
- \def\pushthisfilestack{%
-@@ -954,7 +888,7 @@ where each line of input produces a line
- \def\popthisfilestack{\errthisfilestackempty}
- \def\errthisfilestackempty{\errmessage{Internal error:
- the stack of filenames is empty.}}
--
-+%
- \def\thisfile{}
-
- % @center line
-@@ -962,36 +896,46 @@ where each line of input produces a line
- %
- \parseargdef\center{%
- \ifhmode
-- \let\next\centerH
-+ \let\centersub\centerH
- \else
-- \let\next\centerV
-+ \let\centersub\centerV
- \fi
-- \next{\hfil \ignorespaces#1\unskip \hfil}%
-+ \centersub{\hfil \ignorespaces#1\unskip \hfil}%
-+ \let\centersub\relax % don't let the definition persist, just in case
- }
--\def\centerH#1{%
-- {%
-- \hfil\break
-- \advance\hsize by -\leftskip
-- \advance\hsize by -\rightskip
-- \line{#1}%
-- \break
-- }%
-+\def\centerH#1{{%
-+ \hfil\break
-+ \advance\hsize by -\leftskip
-+ \advance\hsize by -\rightskip
-+ \line{#1}%
-+ \break
-+}}
-+%
-+\newcount\centerpenalty
-+\def\centerV#1{%
-+ % The idea here is the same as in \startdefun, \cartouche, etc.: if
-+ % @center is the first thing after a section heading, we need to wipe
-+ % out the negative parskip inserted by \sectionheading, but still
-+ % prevent a page break here.
-+ \centerpenalty = \lastpenalty
-+ \ifnum\centerpenalty>10000 \vskip\parskip \fi
-+ \ifnum\centerpenalty>9999 \penalty\centerpenalty \fi
-+ \line{\kern\leftskip #1\kern\rightskip}%
- }
--\def\centerV#1{\line{\kern\leftskip #1\kern\rightskip}}
-
- % @sp n outputs n lines of vertical space
--
-+%
- \parseargdef\sp{\vskip #1\baselineskip}
-
- % @comment ...line which is ignored...
- % @c is the same as @comment
- % @ignore ... @end ignore is another way to write a comment
--
-+%
- \def\comment{\begingroup \catcode`\^^M=\other%
- \catcode`\@=\other \catcode`\{=\other \catcode`\}=\other%
- \commentxxx}
- {\catcode`\^^M=\other \gdef\commentxxx#1^^M{\endgroup}}
--
-+%
- \let\c=\comment
-
- % @paragraphindent NCHARS
-@@ -1084,95 +1028,6 @@ where each line of input produces a line
- }
-
-
--% @asis just yields its argument. Used with @table, for example.
--%
--\def\asis#1{#1}
--
--% @math outputs its argument in math mode.
--%
--% One complication: _ usually means subscripts, but it could also mean
--% an actual _ character, as in @math{@var{some_variable} + 1}. So make
--% _ active, and distinguish by seeing if the current family is \slfam,
--% which is what @var uses.
--{
-- \catcode`\_ = \active
-- \gdef\mathunderscore{%
-- \catcode`\_=\active
-- \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
-- }
--}
--% Another complication: we want \\ (and @\) to output a \ character.
--% FYI, plain.tex uses \\ as a temporary control sequence (why?), but
--% this is not advertised and we don't care. Texinfo does not
--% otherwise define @\.
--%
--% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\.
--\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi}
--%
--\def\math{%
-- \tex
-- \mathunderscore
-- \let\\ = \mathbackslash
-- \mathactive
-- $\finishmath
--}
--\def\finishmath#1{#1$\endgroup} % Close the group opened by \tex.
--
--% Some active characters (such as <) are spaced differently in math.
--% We have to reset their definitions in case the @math was an argument
--% to a command which sets the catcodes (such as @item or @section).
--%
--{
-- \catcode`^ = \active
-- \catcode`< = \active
-- \catcode`> = \active
-- \catcode`+ = \active
-- \gdef\mathactive{%
-- \let^ = \ptexhat
-- \let< = \ptexless
-- \let> = \ptexgtr
-- \let+ = \ptexplus
-- }
--}
--
--% @bullet and @minus need the same treatment as @math, just above.
--\def\bullet{$\ptexbullet$}
--\def\minus{$-$}
--
--% @dots{} outputs an ellipsis using the current font.
--% We do .5em per period so that it has the same spacing in the cm
--% typewriter fonts as three actual period characters; on the other hand,
--% in other typewriter fonts three periods are wider than 1.5em. So do
--% whichever is larger.
--%
--\def\dots{%
-- \leavevmode
-- \setbox0=\hbox{...}% get width of three periods
-- \ifdim\wd0 > 1.5em
-- \dimen0 = \wd0
-- \else
-- \dimen0 = 1.5em
-- \fi
-- \hbox to \dimen0{%
-- \hskip 0pt plus.25fil
-- .\hskip 0pt plus1fil
-- .\hskip 0pt plus1fil
-- .\hskip 0pt plus.5fil
-- }%
--}
--
--% @enddots{} is an end-of-sentence ellipsis.
--%
--\def\enddots{%
-- \dots
-- \spacefactor=\endofsentencespacefactor
--}
--
--% @comma{} is so commas can be inserted into text without messing up
--% Texinfo's parsing.
--%
--\let\comma = ,
--
- % @refill is a no-op.
- \let\refill=\relax
-
-@@ -1237,9 +1092,8 @@ where each line of input produces a line
- \newif\ifpdfmakepagedest
-
- % when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1
--% can be set). So we test for \relax and 0 as well as \undefined,
--% borrowed from ifpdf.sty.
--\ifx\pdfoutput\undefined
-+% can be set). So we test for \relax and 0 as well as being undefined.
-+\ifx\pdfoutput\thisisundefined
- \else
- \ifx\pdfoutput\relax
- \else
-@@ -1254,50 +1108,24 @@ where each line of input produces a line
- % for display in the outlines, and in other places. Thus, we have to
- % double any backslashes. Otherwise, a name like "\node" will be
- % interpreted as a newline (\n), followed by o, d, e. Not good.
--% http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html
--% (and related messages, the final outcome is that it is up to the TeX
--% user to double the backslashes and otherwise make the string valid, so
--% that's what we do).
--
--% double active backslashes.
- %
--{\catcode`\@=0 \catcode`\\=\active
-- @gdef@activebackslashdouble{%
-- @catcode`@\=@active
-- @let\=@doublebackslash}
--}
--
--% To handle parens, we must adopt a different approach, since parens are
--% not active characters. hyperref.dtx (which has the same problem as
--% us) handles it with this amazing macro to replace tokens, with minor
--% changes for Texinfo. It is included here under the GPL by permission
--% from the author, Heiko Oberdiek.
--%
--% #1 is the tokens to replace.
--% #2 is the replacement.
--% #3 is the control sequence with the string.
--%
--\def\HyPsdSubst#1#2#3{%
-- \def\HyPsdReplace##1#1##2\END{%
-- ##1%
-- \ifx\\##2\\%
-- \else
-- #2%
-- \HyReturnAfterFi{%
-- \HyPsdReplace##2\END
-- }%
-- \fi
-- }%
-- \xdef#3{\expandafter\HyPsdReplace#3#1\END}%
--}
--\long\def\HyReturnAfterFi#1\fi{\fi#1}
--
--% #1 is a control sequence in which to do the replacements.
--\def\backslashparens#1{%
-- \xdef#1{#1}% redefine it as its expansion; the definition is simply
-- % \lastnode when called from \setref -> \pdfmkdest.
-- \HyPsdSubst{(}{\realbackslash(}{#1}%
-- \HyPsdSubst{)}{\realbackslash)}{#1}%
-+% See http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html and
-+% related messages. The final outcome is that it is up to the TeX user
-+% to double the backslashes and otherwise make the string valid, so
-+% that's what we do. pdftex 1.30.0 (ca.2005) introduced a primitive to
-+% do this reliably, so we use it.
-+
-+% #1 is a control sequence in which to do the replacements,
-+% which we \xdef.
-+\def\txiescapepdf#1{%
-+ \ifx\pdfescapestring\thisisundefined
-+ % No primitive available; should we give a warning or log?
-+ % Many times it won't matter.
-+ \else
-+ % The expandable \pdfescapestring primitive escapes parentheses,
-+ % backslashes, and other special chars.
-+ \xdef#1{\pdfescapestring{#1}}%
-+ \fi
- }
-
- \newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images
-@@ -1307,11 +1135,17 @@ output) for that.)}
-
- \ifpdf
- %
-- % Color manipulation macros based on pdfcolor.tex.
-- \def\cmykDarkRed{0.28 1 1 0.35}
-- \def\cmykBlack{0 0 0 1}
-+ % Color manipulation macros based on pdfcolor.tex,
-+ % except using rgb instead of cmyk; the latter is said to render as a
-+ % very dark gray on-screen and a very dark halftone in print, instead
-+ % of actual black.
-+ \def\rgbDarkRed{0.50 0.09 0.12}
-+ \def\rgbBlack{0 0 0}
-+ %
-+ % k sets the color for filling (usual text, etc.);
-+ % K sets the color for stroking (thin rules, e.g., normal _'s).
-+ \def\pdfsetcolor#1{\pdfliteral{#1 rg #1 RG}}
- %
-- \def\pdfsetcolor#1{\pdfliteral{#1 k}}
- % Set color, and create a mark which defines \thiscolor accordingly,
- % so that \makeheadline knows which color to restore.
- \def\setcolor#1{%
-@@ -1320,7 +1154,7 @@ output) for that.)}
- \pdfsetcolor{#1}%
- }
- %
-- \def\maincolor{\cmykBlack}
-+ \def\maincolor{\rgbBlack}
- \pdfsetcolor{\maincolor}
- \edef\thiscolor{\maincolor}
- \def\lastcolordefs{}
-@@ -1350,42 +1184,47 @@ output) for that.)}
- %
- % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
- \def\dopdfimage#1#2#3{%
-- \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
-- \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
-+ \def\pdfimagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
-+ \def\pdfimageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
- %
-- % pdftex (and the PDF format) support .png, .jpg, .pdf (among
-- % others). Let's try in that order.
-+ % pdftex (and the PDF format) support .pdf, .png, .jpg (among
-+ % others). Let's try in that order, PDF first since if
-+ % someone has a scalable image, presumably better to use that than a
-+ % bitmap.
- \let\pdfimgext=\empty
- \begingroup
-- \openin 1 #1.png \ifeof 1
-- \openin 1 #1.jpg \ifeof 1
-- \openin 1 #1.jpeg \ifeof 1
-- \openin 1 #1.JPG \ifeof 1
-- \openin 1 #1.pdf \ifeof 1
-- \errhelp = \nopdfimagehelp
-- \errmessage{Could not find image file #1 for pdf}%
-- \else \gdef\pdfimgext{pdf}%
-+ \openin 1 #1.pdf \ifeof 1
-+ \openin 1 #1.PDF \ifeof 1
-+ \openin 1 #1.png \ifeof 1
-+ \openin 1 #1.jpg \ifeof 1
-+ \openin 1 #1.jpeg \ifeof 1
-+ \openin 1 #1.JPG \ifeof 1
-+ \errhelp = \nopdfimagehelp
-+ \errmessage{Could not find image file #1 for pdf}%
-+ \else \gdef\pdfimgext{JPG}%
-+ \fi
-+ \else \gdef\pdfimgext{jpeg}%
- \fi
-- \else \gdef\pdfimgext{JPG}%
-+ \else \gdef\pdfimgext{jpg}%
- \fi
-- \else \gdef\pdfimgext{jpeg}%
-+ \else \gdef\pdfimgext{png}%
- \fi
-- \else \gdef\pdfimgext{jpg}%
-+ \else \gdef\pdfimgext{PDF}%
- \fi
-- \else \gdef\pdfimgext{png}%
-+ \else \gdef\pdfimgext{pdf}%
- \fi
- \closein 1
- \endgroup
- %
-- % without \immediate, pdftex seg faults when the same image is
-+ % without \immediate, ancient pdftex seg faults when the same image is
- % included twice. (Version 3.14159-pre-1.0-unofficial-20010704.)
- \ifnum\pdftexversion < 14
- \immediate\pdfimage
- \else
- \immediate\pdfximage
- \fi
-- \ifdim \wd0 >0pt width \imagewidth \fi
-- \ifdim \wd2 >0pt height \imageheight \fi
-+ \ifdim \wd0 >0pt width \pdfimagewidth \fi
-+ \ifdim \wd2 >0pt height \pdfimageheight \fi
- \ifnum\pdftexversion<13
- #1.\pdfimgext
- \else
-@@ -1400,10 +1239,9 @@ output) for that.)}
- % such as \, aren't expanded when present in a section title.
- \indexnofonts
- \turnoffactive
-- \activebackslashdouble
- \makevalueexpandable
- \def\pdfdestname{#1}%
-- \backslashparens\pdfdestname
-+ \txiescapepdf\pdfdestname
- \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
- }}
- %
-@@ -1412,8 +1250,8 @@ output) for that.)}
- %
- % by default, use a color that is dark enough to print on paper as
- % nearly black, but still distinguishable for online viewing.
-- \def\urlcolor{\cmykDarkRed}
-- \def\linkcolor{\cmykDarkRed}
-+ \def\urlcolor{\rgbDarkRed}
-+ \def\linkcolor{\rgbDarkRed}
- \def\endlink{\setcolor{\maincolor}\pdfendlink}
- %
- % Adding outlines to PDF; macros for calculating structure of outlines
-@@ -1435,29 +1273,24 @@ output) for that.)}
- % page number. We could generate a destination for the section
- % text in the case where a section has no node, but it doesn't
- % seem worth the trouble, since most documents are normally structured.
-- \def\pdfoutlinedest{#3}%
-+ \edef\pdfoutlinedest{#3}%
- \ifx\pdfoutlinedest\empty
- \def\pdfoutlinedest{#4}%
- \else
-- % Doubled backslashes in the name.
-- {\activebackslashdouble \xdef\pdfoutlinedest{#3}%
-- \backslashparens\pdfoutlinedest}%
-+ \txiescapepdf\pdfoutlinedest
- \fi
- %
-- % Also double the backslashes in the display string.
-- {\activebackslashdouble \xdef\pdfoutlinetext{#1}%
-- \backslashparens\pdfoutlinetext}%
-+ % Also escape PDF chars in the display string.
-+ \edef\pdfoutlinetext{#1}%
-+ \txiescapepdf\pdfoutlinetext
- %
- \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
- }
- %
- \def\pdfmakeoutlines{%
- \begingroup
-- % Thanh's hack / proper braces in bookmarks
-- \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace
-- \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace
-- %
- % Read toc silently, to get counts of subentries for \pdfoutline.
-+ \def\partentry##1##2##3##4{}% ignore parts in the outlines
- \def\numchapentry##1##2##3##4{%
- \def\thischapnum{##2}%
- \def\thissecnum{0}%
-@@ -1511,25 +1344,41 @@ output) for that.)}
- % Latin 2 (0xea) gets translated to a | character. Info from
- % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100.
- %
-- % xx to do this right, we have to translate 8-bit characters to
-- % their "best" equivalent, based on the @documentencoding. Right
-- % now, I guess we'll just let the pdf reader have its way.
-+ % TODO this right, we have to translate 8-bit characters to
-+ % their "best" equivalent, based on the @documentencoding. Too
-+ % much work for too little return. Just use the ASCII equivalents
-+ % we use for the index sort strings.
-+ %
- \indexnofonts
- \setupdatafile
-+ % We can have normal brace characters in the PDF outlines, unlike
-+ % Texinfo index files. So set that up.
-+ \def\{{\lbracecharliteral}%
-+ \def\}{\rbracecharliteral}%
- \catcode`\\=\active \otherbackslash
- \input \tocreadfilename
- \endgroup
- }
-+ {\catcode`[=1 \catcode`]=2
-+ \catcode`{=\other \catcode`}=\other
-+ \gdef\lbracecharliteral[{]%
-+ \gdef\rbracecharliteral[}]%
-+ ]
- %
- \def\skipspaces#1{\def\PP{#1}\def\D{|}%
- \ifx\PP\D\let\nextsp\relax
- \else\let\nextsp\skipspaces
-- \ifx\p\space\else\addtokens{\filename}{\PP}%
-- \advance\filenamelength by 1
-- \fi
-+ \addtokens{\filename}{\PP}%
-+ \advance\filenamelength by 1
- \fi
- \nextsp}
-- \def\getfilename#1{\filenamelength=0\expandafter\skipspaces#1|\relax}
-+ \def\getfilename#1{%
-+ \filenamelength=0
-+ % If we don't expand the argument now, \skipspaces will get
-+ % snagged on things like "@value{foo}".
-+ \edef\temp{#1}%
-+ \expandafter\skipspaces\temp|\relax
-+ }
- \ifnum\pdftexversion < 14
- \let \startlink \pdfannotlink
- \else
-@@ -1542,11 +1391,15 @@ output) for that.)}
- % tried to figure out what each command should do in the context
- % of @url. for now, just make @/ a no-op, that's the only one
- % people have actually reported a problem with.
-- %
-+ %
- \normalturnoffactive
- \def\@{@}%
- \let\/=\empty
- \makevalueexpandable
-+ % do we want to go so far as to use \indexnofonts instead of just
-+ % special-casing \var here?
-+ \def\var##1{##1}%
-+ %
- \leavevmode\setcolor{\urlcolor}%
- \startlink attr{/Border [0 0 0]}%
- user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
-@@ -1577,6 +1430,7 @@ output) for that.)}
- \setcolor{\linkcolor}#1\endlink}
- \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
- \else
-+ % non-pdf mode
- \let\pdfmkdest = \gobble
- \let\pdfurl = \gobble
- \let\endlink = \relax
-@@ -1607,6 +1461,10 @@ output) for that.)}
- \def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf}
- \def\tt{\fam=\ttfam \setfontstyle{tt}}
-
-+% Unfortunately, we have to override this for titles and the like, since
-+% in those cases "rm" is bold. Sigh.
-+\def\rmisbold{\rm\def\curfontstyle{bf}}
-+
- % Texinfo sort of supports the sans serif font style, which plain TeX does not.
- % So we set up a \sf.
- \newfam\sffam
-@@ -1617,9 +1475,6 @@ output) for that.)}
- \def\ttsl{\setfontstyle{ttsl}}
-
-
--% Default leading.
--\newdimen\textleading \textleading = 13.2pt
--
- % Set the baselineskip to #1, and the lineskip and strut size
- % correspondingly. There is no deep meaning behind these magic numbers
- % used as factors; they just match (closely enough) what Knuth defined.
-@@ -1631,6 +1486,7 @@ output) for that.)}
- % can get a sort of poor man's double spacing by redefining this.
- \def\baselinefactor{1}
- %
-+\newdimen\textleading
- \def\setleading#1{%
- \dimen0 = #1\relax
- \normalbaselineskip = \baselinefactor\dimen0
-@@ -1642,11 +1498,17 @@ output) for that.)}
- }%
- }
-
--%
- % PDF CMaps. See also LaTeX's t1.cmap.
- %
--% \cmapOT1
--\ifpdf
-+% do nothing with this by default.
-+\expandafter\let\csname cmapOT1\endcsname\gobble
-+\expandafter\let\csname cmapOT1IT\endcsname\gobble
-+\expandafter\let\csname cmapOT1TT\endcsname\gobble
-+
-+% if we are producing pdf, and we have \pdffontattr, then define cmaps.
-+% (\pdffontattr was introduced many years ago, but people still run
-+% older pdftex's; it's easy to conditionalize, so we do.)
-+\ifpdf \ifx\pdffontattr\thisisundefined \else
- \begingroup
- \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
- \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
-@@ -1894,35 +1756,37 @@ end
- \expandafter\edef\csname cmapOT1TT\endcsname#1{%
- \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
- }%
--\else
-- \expandafter\let\csname cmapOT1\endcsname\gobble
-- \expandafter\let\csname cmapOT1IT\endcsname\gobble
-- \expandafter\let\csname cmapOT1TT\endcsname\gobble
--\fi
-+\fi\fi
-
-
--% Set the font macro #1 to the font named #2, adding on the
--% specified font prefix (normally `cm').
-+% Set the font macro #1 to the font named \fontprefix#2.
- % #3 is the font's design size, #4 is a scale factor, #5 is the CMap
--% encoding (currently only OT1, OT1IT and OT1TT are allowed, pass
--% empty to omit).
-+% encoding (only OT1, OT1IT and OT1TT are allowed, or empty to omit).
-+% Example:
-+% #1 = \textrm
-+% #2 = \rmshape
-+% #3 = 10
-+% #4 = \mainmagstep
-+% #5 = OT1
-+%
- \def\setfont#1#2#3#4#5{%
- \font#1=\fontprefix#2#3 scaled #4
- \csname cmap#5\endcsname#1%
- }
- % This is what gets called when #5 of \setfont is empty.
- \let\cmap\gobble
--
-+%
-+% (end of cmaps)
-
- % Use cm as the default font prefix.
- % To specify the font prefix, you must define \fontprefix
- % before you read in texinfo.tex.
--\ifx\fontprefix\undefined
-+\ifx\fontprefix\thisisundefined
- \def\fontprefix{cm}
- \fi
- % Support font families that don't use the same naming scheme as CM.
- \def\rmshape{r}
--\def\rmbshape{bx} %where the normal face is bold
-+\def\rmbshape{bx} % where the normal face is bold
- \def\bfshape{b}
- \def\bxshape{bx}
- \def\ttshape{tt}
-@@ -1937,9 +1801,8 @@ end
- \def\scshape{csc}
- \def\scbshape{csc}
-
--% Definitions for a main text size of 11pt. This is the default in
--% Texinfo.
--%
-+% Definitions for a main text size of 11pt. (The default in Texinfo.)
-+%
- \def\definetextfontsizexi{%
- % Text fonts (11.2pt, magstep1).
- \def\textnominalsize{11pt}
-@@ -2002,8 +1865,6 @@ end
- \setfont\titlesc\scbshape{10}{\magstep4}{OT1}
- \font\titlei=cmmi12 scaled \magstep3
- \font\titlesy=cmsy10 scaled \magstep4
--\def\authorrm{\secrm}
--\def\authortt{\sectt}
- \def\titleecsize{2074}
-
- % Chapter (and unnumbered) fonts (17.28pt).
-@@ -2062,17 +1923,17 @@ end
- \font\reducedsy=cmsy10
- \def\reducedecsize{1000}
-
--% reset the current fonts
--\textfonts
-+\textleading = 13.2pt % line spacing for 11pt CM
-+\textfonts % reset the current fonts
- \rm
--} % end of 11pt text font size definitions
-+} % end of 11pt text font size definitions, \definetextfontsizexi
-
-
- % Definitions to make the main text be 10pt Computer Modern, with
- % section, chapter, etc., sizes following suit. This is for the GNU
- % Press printing of the Emacs 22 manual. Maybe other manuals in the
- % future. Used with @smallbook, which sets the leading to 12pt.
--%
-+%
- \def\definetextfontsizex{%
- % Text fonts (10pt).
- \def\textnominalsize{10pt}
-@@ -2135,8 +1996,6 @@ end
- \setfont\titlesc\scbshape{10}{\magstep4}{OT1}
- \font\titlei=cmmi12 scaled \magstep3
- \font\titlesy=cmsy10 scaled \magstep4
--\def\authorrm{\secrm}
--\def\authortt{\sectt}
- \def\titleecsize{2074}
-
- % Chapter fonts (14.4pt).
-@@ -2163,7 +2022,7 @@ end
- \setfont\secsf\sfbshape{12}{1000}{OT1}
- \let\secbf\secrm
- \setfont\secsc\scbshape{10}{\magstep1}{OT1}
--\font\seci=cmmi12
-+\font\seci=cmmi12
- \font\secsy=cmsy10 scaled \magstep1
- \def\sececsize{1200}
-
-@@ -2195,29 +2054,28 @@ end
- \font\reducedsy=cmsy9
- \def\reducedecsize{0900}
-
--% reduce space between paragraphs
--\divide\parskip by 2
--
--% reset the current fonts
--\textfonts
-+\divide\parskip by 2 % reduce space between paragraphs
-+\textleading = 12pt % line spacing for 10pt CM
-+\textfonts % reset the current fonts
- \rm
--} % end of 10pt text font size definitions
-+} % end of 10pt text font size definitions, \definetextfontsizex
-
-
- % We provide the user-level command
- % @fonttextsize 10
- % (or 11) to redefine the text font size. pt is assumed.
--%
--\def\xword{10}
-+%
- \def\xiword{11}
-+\def\xword{10}
-+\def\xwordpt{10pt}
- %
- \parseargdef\fonttextsize{%
- \def\textsizearg{#1}%
-- \wlog{doing @fonttextsize \textsizearg}%
-+ %\wlog{doing @fonttextsize \textsizearg}%
- %
- % Set \globaldefs so that documents can use this inside @tex, since
- % makeinfo 4.8 does not support it, but we need it nonetheless.
-- %
-+ %
- \begingroup \globaldefs=1
- \ifx\textsizearg\xword \definetextfontsizex
- \else \ifx\textsizearg\xiword \definetextfontsizexi
-@@ -2267,8 +2125,8 @@ end
- \let\tenttsl=\titlettsl
- \def\curfontsize{title}%
- \def\lsize{chap}\def\lllsize{subsec}%
-- \resetmathfonts \setleading{25pt}}
--\def\titlefont#1{{\titlefonts\rm #1}}
-+ \resetmathfonts \setleading{27pt}}
-+\def\titlefont#1{{\titlefonts\rmisbold #1}}
- \def\chapfonts{%
- \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
- \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc
-@@ -2319,8 +2177,18 @@ end
- \def\lsize{smaller}\def\lllsize{smaller}%
- \resetmathfonts \setleading{9.5pt}}
-
--% Set the fonts to use with the @small... environments.
--\let\smallexamplefonts = \smallfonts
-+% Fonts for short table of contents.
-+\setfont\shortcontrm\rmshape{12}{1000}{OT1}
-+\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12
-+\setfont\shortcontsl\slshape{12}{1000}{OT1}
-+\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
-+
-+% Define these just so they can be easily changed for other fonts.
-+\def\angleleft{$\langle$}
-+\def\angleright{$\rangle$}
-+
-+% Set the fonts to use with the @small... environments.
-+\let\smallexamplefonts = \smallfonts
-
- % About \smallexamplefonts. If we use \smallfonts (9pt), @smallexample
- % can fit this many characters:
-@@ -2332,53 +2200,213 @@ end
- %
- % By the way, for comparison, here's what fits with @example (10pt):
- % 8.5x11=71 smallbook=60 a4=75 a5=58
--%
--% I wish the USA used A4 paper.
- % --karl, 24jan03.
-
--
- % Set up the default fonts, so we can use them for creating boxes.
- %
- \definetextfontsizexi
-
--% Define these so they can be easily changed for other fonts.
--\def\angleleft{$\langle$}
--\def\angleright{$\rangle$}
-+
-+\message{markup,}
-+
-+% Check if we are currently using a typewriter font. Since all the
-+% Computer Modern typewriter fonts have zero interword stretch (and
-+% shrink), and it is reasonable to expect all typewriter fonts to have
-+% this property, we can check that font parameter.
-+%
-+\def\ifmonospace{\ifdim\fontdimen3\font=0pt }
-+
-+% Markup style infrastructure. \defmarkupstylesetup\INITMACRO will
-+% define and register \INITMACRO to be called on markup style changes.
-+% \INITMACRO can check \currentmarkupstyle for the innermost
-+% style and the set of \ifmarkupSTYLE switches for all styles
-+% currently in effect.
-+\newif\ifmarkupvar
-+\newif\ifmarkupsamp
-+\newif\ifmarkupkey
-+%\newif\ifmarkupfile % @file == @samp.
-+%\newif\ifmarkupoption % @option == @samp.
-+\newif\ifmarkupcode
-+\newif\ifmarkupkbd
-+%\newif\ifmarkupenv % @env == @code.
-+%\newif\ifmarkupcommand % @command == @code.
-+\newif\ifmarkuptex % @tex (and part of @math, for now).
-+\newif\ifmarkupexample
-+\newif\ifmarkupverb
-+\newif\ifmarkupverbatim
-+
-+\let\currentmarkupstyle\empty
-+
-+\def\setupmarkupstyle#1{%
-+ \csname markup#1true\endcsname
-+ \def\currentmarkupstyle{#1}%
-+ \markupstylesetup
-+}
-+
-+\let\markupstylesetup\empty
-+
-+\def\defmarkupstylesetup#1{%
-+ \expandafter\def\expandafter\markupstylesetup
-+ \expandafter{\markupstylesetup #1}%
-+ \def#1%
-+}
-+
-+% Markup style setup for left and right quotes.
-+\defmarkupstylesetup\markupsetuplq{%
-+ \expandafter\let\expandafter \temp
-+ \csname markupsetuplq\currentmarkupstyle\endcsname
-+ \ifx\temp\relax \markupsetuplqdefault \else \temp \fi
-+}
-+
-+\defmarkupstylesetup\markupsetuprq{%
-+ \expandafter\let\expandafter \temp
-+ \csname markupsetuprq\currentmarkupstyle\endcsname
-+ \ifx\temp\relax \markupsetuprqdefault \else \temp \fi
-+}
-+
-+{
-+\catcode`\'=\active
-+\catcode`\`=\active
-+
-+\gdef\markupsetuplqdefault{\let`\lq}
-+\gdef\markupsetuprqdefault{\let'\rq}
-+
-+\gdef\markupsetcodequoteleft{\let`\codequoteleft}
-+\gdef\markupsetcodequoteright{\let'\codequoteright}
-+}
-+
-+\let\markupsetuplqcode \markupsetcodequoteleft
-+\let\markupsetuprqcode \markupsetcodequoteright
-+%
-+\let\markupsetuplqexample \markupsetcodequoteleft
-+\let\markupsetuprqexample \markupsetcodequoteright
-+%
-+\let\markupsetuplqkbd \markupsetcodequoteleft
-+\let\markupsetuprqkbd \markupsetcodequoteright
-+%
-+\let\markupsetuplqsamp \markupsetcodequoteleft
-+\let\markupsetuprqsamp \markupsetcodequoteright
-+%
-+\let\markupsetuplqverb \markupsetcodequoteleft
-+\let\markupsetuprqverb \markupsetcodequoteright
-+%
-+\let\markupsetuplqverbatim \markupsetcodequoteleft
-+\let\markupsetuprqverbatim \markupsetcodequoteright
-+
-+% Allow an option to not use regular directed right quote/apostrophe
-+% (char 0x27), but instead the undirected quote from cmtt (char 0x0d).
-+% The undirected quote is ugly, so don't make it the default, but it
-+% works for pasting with more pdf viewers (at least evince), the
-+% lilypond developers report. xpdf does work with the regular 0x27.
-+%
-+\def\codequoteright{%
-+ \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
-+ \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
-+ '%
-+ \else \char'15 \fi
-+ \else \char'15 \fi
-+}
-+%
-+% and a similar option for the left quote char vs. a grave accent.
-+% Modern fonts display ASCII 0x60 as a grave accent, so some people like
-+% the code environments to do likewise.
-+%
-+\def\codequoteleft{%
-+ \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
-+ \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
-+ % [Knuth] pp. 380,381,391
-+ % \relax disables Spanish ligatures ?` and !` of \tt font.
-+ \relax`%
-+ \else \char'22 \fi
-+ \else \char'22 \fi
-+}
-+
-+% Commands to set the quote options.
-+%
-+\parseargdef\codequoteundirected{%
-+ \def\temp{#1}%
-+ \ifx\temp\onword
-+ \expandafter\let\csname SETtxicodequoteundirected\endcsname
-+ = t%
-+ \else\ifx\temp\offword
-+ \expandafter\let\csname SETtxicodequoteundirected\endcsname
-+ = \relax
-+ \else
-+ \errhelp = \EMsimple
-+ \errmessage{Unknown @codequoteundirected value `\temp', must be on|off}%
-+ \fi\fi
-+}
-+%
-+\parseargdef\codequotebacktick{%
-+ \def\temp{#1}%
-+ \ifx\temp\onword
-+ \expandafter\let\csname SETtxicodequotebacktick\endcsname
-+ = t%
-+ \else\ifx\temp\offword
-+ \expandafter\let\csname SETtxicodequotebacktick\endcsname
-+ = \relax
-+ \else
-+ \errhelp = \EMsimple
-+ \errmessage{Unknown @codequotebacktick value `\temp', must be on|off}%
-+ \fi\fi
-+}
-+
-+% [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font.
-+\def\noligaturesquoteleft{\relax\lq}
-
- % Count depth in font-changes, for error checks
- \newcount\fontdepth \fontdepth=0
-
--% Fonts for short table of contents.
--\setfont\shortcontrm\rmshape{12}{1000}{OT1}
--\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12
--\setfont\shortcontsl\slshape{12}{1000}{OT1}
--\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
-+% Font commands.
-+
-+% #1 is the font command (\sl or \it), #2 is the text to slant.
-+% If we are in a monospaced environment, however, 1) always use \ttsl,
-+% and 2) do not add an italic correction.
-+\def\dosmartslant#1#2{%
-+ \ifusingtt
-+ {{\ttsl #2}\let\next=\relax}%
-+ {\def\next{{#1#2}\futurelet\next\smartitaliccorrection}}%
-+ \next
-+}
-+\def\smartslanted{\dosmartslant\sl}
-+\def\smartitalic{\dosmartslant\it}
-
--%% Add scribe-like font environments, plus @l for inline lisp (usually sans
--%% serif) and @ii for TeX italic
-+% Output an italic correction unless \next (presumed to be the following
-+% character) is such as not to need one.
-+\def\smartitaliccorrection{%
-+ \ifx\next,%
-+ \else\ifx\next-%
-+ \else\ifx\next.%
-+ \else\ptexslash
-+ \fi\fi\fi
-+ \aftersmartic
-+}
-
--% \smartitalic{ARG} outputs arg in italics, followed by an italic correction
--% unless the following character is such as not to need one.
--\def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else
-- \ptexslash\fi\fi\fi}
--\def\smartslanted#1{{\ifusingtt\ttsl\sl #1}\futurelet\next\smartitalicx}
--\def\smartitalic#1{{\ifusingtt\ttsl\it #1}\futurelet\next\smartitalicx}
--
--% like \smartslanted except unconditionally uses \ttsl.
--% @var is set to this for defun arguments.
--\def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx}
-+% Unconditional use \ttsl, and no ic. @var is set to this for defuns.
-+\def\ttslanted#1{{\ttsl #1}}
-
--% like \smartslanted except unconditionally use \sl. We never want
-+% @cite is like \smartslanted except unconditionally use \sl. We never want
- % ttsl for book titles, do we?
--\def\cite#1{{\sl #1}\futurelet\next\smartitalicx}
-+\def\cite#1{{\sl #1}\futurelet\next\smartitaliccorrection}
-+
-+\def\aftersmartic{}
-+\def\var#1{%
-+ \let\saveaftersmartic = \aftersmartic
-+ \def\aftersmartic{\null\let\aftersmartic=\saveaftersmartic}%
-+ \smartslanted{#1}%
-+}
-
- \let\i=\smartitalic
- \let\slanted=\smartslanted
--\let\var=\smartslanted
- \let\dfn=\smartslanted
- \let\emph=\smartitalic
-
--% @b, explicit bold.
-+% Explicit font changes: @r, @sc, undocumented @ii.
-+\def\r#1{{\rm #1}} % roman font
-+\def\sc#1{{\smallcaps#1}} % smallcaps font
-+\def\ii#1{{\it #1}} % italic font
-+
-+% @b, explicit bold. Also @strong.
- \def\b#1{{\bf #1}}
- \let\strong=\b
-
-@@ -2410,30 +2438,21 @@ end
- \catcode`@=\other
- \def\endofsentencespacefactor{3000}% default
-
-+% @t, explicit typewriter.
- \def\t#1{%
- {\tt \rawbackslash \plainfrenchspacing #1}%
- \null
- }
--\def\samp#1{`\tclose{#1}'\null}
--\setfont\keyrm\rmshape{8}{1000}{OT1}
--\font\keysy=cmsy9
--\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
-- \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
-- \vbox{\hrule\kern-0.4pt
-- \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
-- \kern-0.4pt\hrule}%
-- \kern-.06em\raise0.4pt\hbox{\angleright}}}}
--\def\key #1{{\nohyphenation \uppercase{#1}}\null}
--% The old definition, with no lozenge:
--%\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
--\def\ctrl #1{{\tt \rawbackslash \hat}#1}
-
--% @file, @option are the same as @samp.
--\let\file=\samp
--\let\option=\samp
-+% @samp.
-+\def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}}
-+
-+% @indicateurl is \samp, that is, with quotes.
-+\let\indicateurl=\samp
-
--% @code is a modification of @t,
--% which makes spaces the same size as normal in the surrounding text.
-+% @code (and similar) prints in typewriter, but with spaces the same
-+% size as normal in the surrounding text, without hyphenation, etc.
-+% This is a subroutine for that.
- \def\tclose#1{%
- {%
- % Change normal interword space to be same as for the current font.
-@@ -2452,13 +2471,13 @@ end
- \plainfrenchspacing
- #1%
- }%
-- \null
-+ \null % reset spacefactor to 1000
- }
-
- % We *must* turn on hyphenation at `-' and `_' in @code.
- % Otherwise, it is too hard to avoid overfull hboxes
- % in the Emacs manual, the Library manual, etc.
--
-+%
- % Unfortunately, TeX uses one parameter (\hyphenchar) to control
- % both hyphenation at - and hyphenation within words.
- % We must therefore turn them both off (\tclose does that)
-@@ -2467,24 +2486,26 @@ end
- {
- \catcode`\-=\active \catcode`\_=\active
- \catcode`\'=\active \catcode`\`=\active
-+ \global\let'=\rq \global\let`=\lq % default definitions
- %
- \global\def\code{\begingroup
-- \catcode\rquoteChar=\active \catcode\lquoteChar=\active
-- \let'\codequoteright \let`\codequoteleft
-- %
-+ \setupmarkupstyle{code}%
-+ % The following should really be moved into \setupmarkupstyle handlers.
- \catcode\dashChar=\active \catcode\underChar=\active
- \ifallowcodebreaks
- \let-\codedash
- \let_\codeunder
- \else
-- \let-\realdash
-+ \let-\normaldash
- \let_\realunder
- \fi
- \codex
- }
- }
-
--\def\realdash{-}
-+\def\codex #1{\tclose{#1}\endgroup}
-+
-+\def\normaldash{-}
- \def\codedash{-\discretionary{}{}{}}
- \def\codeunder{%
- % this is all so @math{@code{var_name}+1} can work. In math mode, _
-@@ -2497,13 +2518,12 @@ end
- \discretionary{}{}{}}%
- {\_}%
- }
--\def\codex #1{\tclose{#1}\endgroup}
-
- % An additional complication: the above will allow breaks after, e.g.,
--% each of the four underscores in __typeof__. This is undesirable in
--% some manuals, especially if they don't have long identifiers in
--% general. @allowcodebreaks provides a way to control this.
--%
-+% each of the four underscores in __typeof__. This is bad.
-+% @allowcodebreaks provides a document-level way to turn breaking at -
-+% and _ on and off.
-+%
- \newif\ifallowcodebreaks \allowcodebreakstrue
-
- \def\keywordtrue{true}
-@@ -2517,55 +2537,25 @@ end
- \allowcodebreaksfalse
- \else
- \errhelp = \EMsimple
-- \errmessage{Unknown @allowcodebreaks option `\txiarg'}%
-+ \errmessage{Unknown @allowcodebreaks option `\txiarg', must be true|false}%
- \fi\fi
- }
-
--% @kbd is like @code, except that if the argument is just one @key command,
--% then @kbd has no effect.
--
--% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
--% `example' (@kbd uses ttsl only inside of @example and friends),
--% or `code' (@kbd uses normal tty font always).
--\parseargdef\kbdinputstyle{%
-- \def\txiarg{#1}%
-- \ifx\txiarg\worddistinct
-- \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
-- \else\ifx\txiarg\wordexample
-- \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
-- \else\ifx\txiarg\wordcode
-- \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
-- \else
-- \errhelp = \EMsimple
-- \errmessage{Unknown @kbdinputstyle option `\txiarg'}%
-- \fi\fi\fi
--}
--\def\worddistinct{distinct}
--\def\wordexample{example}
--\def\wordcode{code}
--
--% Default is `distinct.'
--\kbdinputstyle distinct
--
--\def\xkey{\key}
--\def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}%
--\ifx\one\xkey\ifx\threex\three \key{#2}%
--\else{\tclose{\kbdfont\look}}\fi
--\else{\tclose{\kbdfont\look}}\fi}
--
--% For @indicateurl, @env, @command quotes seem unnecessary, so use \code.
--\let\indicateurl=\code
--\let\env=\code
-+% For @command, @env, @file, @option quotes seem unnecessary,
-+% so use \code rather than \samp.
- \let\command=\code
-+\let\env=\code
-+\let\file=\code
-+\let\option=\code
-
- % @uref (abbreviation for `urlref') takes an optional (comma-separated)
- % second argument specifying the text to display and an optional third
- % arg as text to display instead of (rather than in addition to) the url
--% itself. First (mandatory) arg is the url. Perhaps eventually put in
--% a hypertex \special here.
--%
--\def\uref#1{\douref #1,,,\finish}
--\def\douref#1,#2,#3,#4\finish{\begingroup
-+% itself. First (mandatory) arg is the url.
-+% (This \urefnobreak definition isn't used now, leaving it for a while
-+% for comparison.)
-+\def\urefnobreak#1{\dourefnobreak #1,,,\finish}
-+\def\dourefnobreak#1,#2,#3,#4\finish{\begingroup
- \unsepspaces
- \pdfurl{#1}%
- \setbox0 = \hbox{\ignorespaces #3}%
-@@ -2586,6 +2576,103 @@ end
- \endlink
- \endgroup}
-
-+% This \urefbreak definition is the active one.
-+\def\urefbreak{\begingroup \urefcatcodes \dourefbreak}
-+\let\uref=\urefbreak
-+\def\dourefbreak#1{\urefbreakfinish #1,,,\finish}
-+\def\urefbreakfinish#1,#2,#3,#4\finish{% doesn't work in @example
-+ \unsepspaces
-+ \pdfurl{#1}%
-+ \setbox0 = \hbox{\ignorespaces #3}%
-+ \ifdim\wd0 > 0pt
-+ \unhbox0 % third arg given, show only that
-+ \else
-+ \setbox0 = \hbox{\ignorespaces #2}%
-+ \ifdim\wd0 > 0pt
-+ \ifpdf
-+ \unhbox0 % PDF: 2nd arg given, show only it
-+ \else
-+ \unhbox0\ (\urefcode{#1})% DVI: 2nd arg given, show both it and url
-+ \fi
-+ \else
-+ \urefcode{#1}% only url given, so show it
-+ \fi
-+ \fi
-+ \endlink
-+\endgroup}
-+
-+% Allow line breaks around only a few characters (only).
-+\def\urefcatcodes{%
-+ \catcode\ampChar=\active \catcode\dotChar=\active
-+ \catcode\hashChar=\active \catcode\questChar=\active
-+ \catcode\slashChar=\active
-+}
-+{
-+ \urefcatcodes
-+ %
-+ \global\def\urefcode{\begingroup
-+ \setupmarkupstyle{code}%
-+ \urefcatcodes
-+ \let&\urefcodeamp
-+ \let.\urefcodedot
-+ \let#\urefcodehash
-+ \let?\urefcodequest
-+ \let/\urefcodeslash
-+ \codex
-+ }
-+ %
-+ % By default, they are just regular characters.
-+ \global\def&{\normalamp}
-+ \global\def.{\normaldot}
-+ \global\def#{\normalhash}
-+ \global\def?{\normalquest}
-+ \global\def/{\normalslash}
-+}
-+
-+% we put a little stretch before and after the breakable chars, to help
-+% line breaking of long url's. The unequal skips make look better in
-+% cmtt at least, especially for dots.
-+\def\urefprestretch{\urefprebreak \hskip0pt plus.13em }
-+\def\urefpoststretch{\urefpostbreak \hskip0pt plus.1em }
-+%
-+\def\urefcodeamp{\urefprestretch \&\urefpoststretch}
-+\def\urefcodedot{\urefprestretch .\urefpoststretch}
-+\def\urefcodehash{\urefprestretch \#\urefpoststretch}
-+\def\urefcodequest{\urefprestretch ?\urefpoststretch}
-+\def\urefcodeslash{\futurelet\next\urefcodeslashfinish}
-+{
-+ \catcode`\/=\active
-+ \global\def\urefcodeslashfinish{%
-+ \urefprestretch \slashChar
-+ % Allow line break only after the final / in a sequence of
-+ % slashes, to avoid line break between the slashes in http://.
-+ \ifx\next/\else \urefpoststretch \fi
-+ }
-+}
-+
-+% One more complication: by default we'll break after the special
-+% characters, but some people like to break before the special chars, so
-+% allow that. Also allow no breaking at all, for manual control.
-+%
-+\parseargdef\urefbreakstyle{%
-+ \def\txiarg{#1}%
-+ \ifx\txiarg\wordnone
-+ \def\urefprebreak{\nobreak}\def\urefpostbreak{\nobreak}
-+ \else\ifx\txiarg\wordbefore
-+ \def\urefprebreak{\allowbreak}\def\urefpostbreak{\nobreak}
-+ \else\ifx\txiarg\wordafter
-+ \def\urefprebreak{\nobreak}\def\urefpostbreak{\allowbreak}
-+ \else
-+ \errhelp = \EMsimple
-+ \errmessage{Unknown @urefbreakstyle setting `\txiarg'}%
-+ \fi\fi\fi
-+}
-+\def\wordafter{after}
-+\def\wordbefore{before}
-+\def\wordnone{none}
-+
-+\urefbreakstyle after
-+
- % @url synonym for @uref, since that's how everyone uses it.
- %
- \let\url=\uref
-@@ -2607,55 +2694,353 @@ end
- \let\email=\uref
- \fi
-
--% Check if we are currently using a typewriter font. Since all the
--% Computer Modern typewriter fonts have zero interword stretch (and
--% shrink), and it is reasonable to expect all typewriter fonts to have
--% this property, we can check that font parameter.
--%
--\def\ifmonospace{\ifdim\fontdimen3\font=0pt }
-+% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
-+% `example' (@kbd uses ttsl only inside of @example and friends),
-+% or `code' (@kbd uses normal tty font always).
-+\parseargdef\kbdinputstyle{%
-+ \def\txiarg{#1}%
-+ \ifx\txiarg\worddistinct
-+ \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
-+ \else\ifx\txiarg\wordexample
-+ \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
-+ \else\ifx\txiarg\wordcode
-+ \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
-+ \else
-+ \errhelp = \EMsimple
-+ \errmessage{Unknown @kbdinputstyle setting `\txiarg'}%
-+ \fi\fi\fi
-+}
-+\def\worddistinct{distinct}
-+\def\wordexample{example}
-+\def\wordcode{code}
-+
-+% Default is `distinct'.
-+\kbdinputstyle distinct
-+
-+% @kbd is like @code, except that if the argument is just one @key command,
-+% then @kbd has no effect.
-+\def\kbd#1{{\def\look{#1}\expandafter\kbdsub\look??\par}}
-+
-+\def\xkey{\key}
-+\def\kbdsub#1#2#3\par{%
-+ \def\one{#1}\def\three{#3}\def\threex{??}%
-+ \ifx\one\xkey\ifx\threex\three \key{#2}%
-+ \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
-+ \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
-+}
-+
-+% definition of @key that produces a lozenge. Doesn't adjust to text size.
-+%\setfont\keyrm\rmshape{8}{1000}{OT1}
-+%\font\keysy=cmsy9
-+%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
-+% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
-+% \vbox{\hrule\kern-0.4pt
-+% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
-+% \kern-0.4pt\hrule}%
-+% \kern-.06em\raise0.4pt\hbox{\angleright}}}}
-+
-+% definition of @key with no lozenge. If the current font is already
-+% monospace, don't change it; that way, we respect @kbdinputstyle. But
-+% if it isn't monospace, then use \tt.
-+%
-+\def\key#1{{\setupmarkupstyle{key}%
-+ \nohyphenation
-+ \ifmonospace\else\tt\fi
-+ #1}\null}
-+
-+% @clicksequence{File @click{} Open ...}
-+\def\clicksequence#1{\begingroup #1\endgroup}
-+
-+% @clickstyle @arrow (by default)
-+\parseargdef\clickstyle{\def\click{#1}}
-+\def\click{\arrow}
-
- % Typeset a dimension, e.g., `in' or `pt'. The only reason for the
- % argument is to make the input look right: @dmn{pt} instead of @dmn{}pt.
- %
- \def\dmn#1{\thinspace #1}
-
--\def\kbd#1{\def\look{#1}\expandafter\kbdfoo\look??\par}
--
- % @l was never documented to mean ``switch to the Lisp font'',
- % and it is not used as such in any manual I can find. We need it for
- % Polish suppressed-l. --karl, 22sep96.
- %\def\l#1{{\li #1}\null}
-
--% Explicit font changes: @r, @sc, undocumented @ii.
--\def\r#1{{\rm #1}} % roman font
--\def\sc#1{{\smallcaps#1}} % smallcaps font
--\def\ii#1{{\it #1}} % italic font
-+% @acronym for "FBI", "NATO", and the like.
-+% We print this one point size smaller, since it's intended for
-+% all-uppercase.
-+%
-+\def\acronym#1{\doacronym #1,,\finish}
-+\def\doacronym#1,#2,#3\finish{%
-+ {\selectfonts\lsize #1}%
-+ \def\temp{#2}%
-+ \ifx\temp\empty \else
-+ \space ({\unsepspaces \ignorespaces \temp \unskip})%
-+ \fi
-+ \null % reset \spacefactor=1000
-+}
-+
-+% @abbr for "Comput. J." and the like.
-+% No font change, but don't do end-of-sentence spacing.
-+%
-+\def\abbr#1{\doabbr #1,,\finish}
-+\def\doabbr#1,#2,#3\finish{%
-+ {\plainfrenchspacing #1}%
-+ \def\temp{#2}%
-+ \ifx\temp\empty \else
-+ \space ({\unsepspaces \ignorespaces \temp \unskip})%
-+ \fi
-+ \null % reset \spacefactor=1000
-+}
-+
-+% @asis just yields its argument. Used with @table, for example.
-+%
-+\def\asis#1{#1}
-+
-+% @math outputs its argument in math mode.
-+%
-+% One complication: _ usually means subscripts, but it could also mean
-+% an actual _ character, as in @math{@var{some_variable} + 1}. So make
-+% _ active, and distinguish by seeing if the current family is \slfam,
-+% which is what @var uses.
-+{
-+ \catcode`\_ = \active
-+ \gdef\mathunderscore{%
-+ \catcode`\_=\active
-+ \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
-+ }
-+}
-+% Another complication: we want \\ (and @\) to output a math (or tt) \.
-+% FYI, plain.tex uses \\ as a temporary control sequence (for no
-+% particular reason), but this is not advertised and we don't care.
-+%
-+% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\.
-+\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi}
-+%
-+\def\math{%
-+ \tex
-+ \mathunderscore
-+ \let\\ = \mathbackslash
-+ \mathactive
-+ % make the texinfo accent commands work in math mode
-+ \let\"=\ddot
-+ \let\'=\acute
-+ \let\==\bar
-+ \let\^=\hat
-+ \let\`=\grave
-+ \let\u=\breve
-+ \let\v=\check
-+ \let\~=\tilde
-+ \let\dotaccent=\dot
-+ $\finishmath
-+}
-+\def\finishmath#1{#1$\endgroup} % Close the group opened by \tex.
-+
-+% Some active characters (such as <) are spaced differently in math.
-+% We have to reset their definitions in case the @math was an argument
-+% to a command which sets the catcodes (such as @item or @section).
-+%
-+{
-+ \catcode`^ = \active
-+ \catcode`< = \active
-+ \catcode`> = \active
-+ \catcode`+ = \active
-+ \catcode`' = \active
-+ \gdef\mathactive{%
-+ \let^ = \ptexhat
-+ \let< = \ptexless
-+ \let> = \ptexgtr
-+ \let+ = \ptexplus
-+ \let' = \ptexquoteright
-+ }
-+}
-+
-+% ctrl is no longer a Texinfo command, but leave this definition for fun.
-+\def\ctrl #1{{\tt \rawbackslash \hat}#1}
-+
-+% @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}.
-+% Ignore unless FMTNAME == tex; then it is like @iftex and @tex,
-+% except specified as a normal braced arg, so no newlines to worry about.
-+%
-+\def\outfmtnametex{tex}
-+%
-+\long\def\inlinefmt#1{\doinlinefmt #1,\finish}
-+\long\def\doinlinefmt#1,#2,\finish{%
-+ \def\inlinefmtname{#1}%
-+ \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi
-+}
-+% For raw, must switch into @tex before parsing the argument, to avoid
-+% setting catcodes prematurely. Doing it this way means that, for
-+% example, @inlineraw{html, foo{bar} gets a parse error instead of being
-+% ignored. But this isn't important because if people want a literal
-+% *right* brace they would have to use a command anyway, so they may as
-+% well use a command to get a left brace too. We could re-use the
-+% delimiter character idea from \verb, but it seems like overkill.
-+%
-+\long\def\inlineraw{\tex \doinlineraw}
-+\long\def\doinlineraw#1{\doinlinerawtwo #1,\finish}
-+\def\doinlinerawtwo#1,#2,\finish{%
-+ \def\inlinerawname{#1}%
-+ \ifx\inlinerawname\outfmtnametex \ignorespaces #2\fi
-+ \endgroup % close group opened by \tex.
-+}
-+
-+
-+\message{glyphs,}
-+% and logos.
-+
-+% @@ prints an @, as does @atchar{}.
-+\def\@{\char64 }
-+\let\atchar=\@
-+
-+% @{ @} @lbracechar{} @rbracechar{} all generate brace characters.
-+% Unless we're in typewriter, use \ecfont because the CM text fonts do
-+% not have braces, and we don't want to switch into math.
-+\def\mylbrace{{\ifmonospace\else\ecfont\fi \char123}}
-+\def\myrbrace{{\ifmonospace\else\ecfont\fi \char125}}
-+\let\{=\mylbrace \let\lbracechar=\{
-+\let\}=\myrbrace \let\rbracechar=\}
-+\begingroup
-+ % Definitions to produce \{ and \} commands for indices,
-+ % and @{ and @} for the aux/toc files.
-+ \catcode`\{ = \other \catcode`\} = \other
-+ \catcode`\[ = 1 \catcode`\] = 2
-+ \catcode`\! = 0 \catcode`\\ = \other
-+ !gdef!lbracecmd[\{]%
-+ !gdef!rbracecmd[\}]%
-+ !gdef!lbraceatcmd[@{]%
-+ !gdef!rbraceatcmd[@}]%
-+!endgroup
-+
-+% @comma{} to avoid , parsing problems.
-+\let\comma = ,
-+
-+% Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent
-+% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H.
-+\let\, = \ptexc
-+\let\dotaccent = \ptexdot
-+\def\ringaccent#1{{\accent23 #1}}
-+\let\tieaccent = \ptext
-+\let\ubaraccent = \ptexb
-+\let\udotaccent = \d
-+
-+% Other special characters: @questiondown @exclamdown @ordf @ordm
-+% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss.
-+\def\questiondown{?`}
-+\def\exclamdown{!`}
-+\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}}
-+\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}}
-+
-+% Dotless i and dotless j, used for accents.
-+\def\imacro{i}
-+\def\jmacro{j}
-+\def\dotless#1{%
-+ \def\temp{#1}%
-+ \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi
-+ \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi
-+ \else \errmessage{@dotless can be used only with i or j}%
-+ \fi\fi
-+}
-+
-+% The \TeX{} logo, as in plain, but resetting the spacing so that a
-+% period following counts as ending a sentence. (Idea found in latex.)
-+%
-+\edef\TeX{\TeX \spacefactor=1000 }
-+
-+% @LaTeX{} logo. Not quite the same results as the definition in
-+% latex.ltx, since we use a different font for the raised A; it's most
-+% convenient for us to use an explicitly smaller font, rather than using
-+% the \scriptstyle font (since we don't reset \scriptstyle and
-+% \scriptscriptstyle).
-+%
-+\def\LaTeX{%
-+ L\kern-.36em
-+ {\setbox0=\hbox{T}%
-+ \vbox to \ht0{\hbox{%
-+ \ifx\textnominalsize\xwordpt
-+ % for 10pt running text, \lllsize (8pt) is too small for the A in LaTeX.
-+ % Revert to plain's \scriptsize, which is 7pt.
-+ \count255=\the\fam $\fam\count255 \scriptstyle A$%
-+ \else
-+ % For 11pt, we can use our lllsize.
-+ \selectfonts\lllsize A%
-+ \fi
-+ }%
-+ \vss
-+ }}%
-+ \kern-.15em
-+ \TeX
-+}
-+
-+% Some math mode symbols.
-+\def\bullet{$\ptexbullet$}
-+\def\geq{\ifmmode \ge\else $\ge$\fi}
-+\def\leq{\ifmmode \le\else $\le$\fi}
-+\def\minus{\ifmmode -\else $-$\fi}
-
--% @acronym for "FBI", "NATO", and the like.
--% We print this one point size smaller, since it's intended for
--% all-uppercase.
--%
--\def\acronym#1{\doacronym #1,,\finish}
--\def\doacronym#1,#2,#3\finish{%
-- {\selectfonts\lsize #1}%
-- \def\temp{#2}%
-- \ifx\temp\empty \else
-- \space ({\unsepspaces \ignorespaces \temp \unskip})%
-+% @dots{} outputs an ellipsis using the current font.
-+% We do .5em per period so that it has the same spacing in the cm
-+% typewriter fonts as three actual period characters; on the other hand,
-+% in other typewriter fonts three periods are wider than 1.5em. So do
-+% whichever is larger.
-+%
-+\def\dots{%
-+ \leavevmode
-+ \setbox0=\hbox{...}% get width of three periods
-+ \ifdim\wd0 > 1.5em
-+ \dimen0 = \wd0
-+ \else
-+ \dimen0 = 1.5em
- \fi
-+ \hbox to \dimen0{%
-+ \hskip 0pt plus.25fil
-+ .\hskip 0pt plus1fil
-+ .\hskip 0pt plus1fil
-+ .\hskip 0pt plus.5fil
-+ }%
- }
-
--% @abbr for "Comput. J." and the like.
--% No font change, but don't do end-of-sentence spacing.
--%
--\def\abbr#1{\doabbr #1,,\finish}
--\def\doabbr#1,#2,#3\finish{%
-- {\plainfrenchspacing #1}%
-- \def\temp{#2}%
-- \ifx\temp\empty \else
-- \space ({\unsepspaces \ignorespaces \temp \unskip})%
-- \fi
-+% @enddots{} is an end-of-sentence ellipsis.
-+%
-+\def\enddots{%
-+ \dots
-+ \spacefactor=\endofsentencespacefactor
- }
-
-+% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
-+%
-+% Since these characters are used in examples, they should be an even number of
-+% \tt widths. Each \tt character is 1en, so two makes it 1em.
-+%
-+\def\point{$\star$}
-+\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}}
-+\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
-+\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}}
-+\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
-+\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}}
-+
-+% The @error{} command.
-+% Adapted from the TeXbook's \boxit.
-+%
-+\newbox\errorbox
-+%
-+{\tentt \global\dimen0 = 3em}% Width of the box.
-+\dimen2 = .55pt % Thickness of rules
-+% The text. (`r' is open on the right, `e' somewhat less so on the left.)
-+\setbox0 = \hbox{\kern-.75pt \reducedsf \putworderror\kern-1.5pt}
-+%
-+\setbox\errorbox=\hbox to \dimen0{\hfil
-+ \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
-+ \advance\hsize by -2\dimen2 % Rules.
-+ \vbox{%
-+ \hrule height\dimen2
-+ \hbox{\vrule width\dimen2 \kern3pt % Space to left of text.
-+ \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
-+ \kern3pt\vrule width\dimen2}% Space to right.
-+ \hrule height\dimen2}
-+ \hfil}
-+%
-+\def\error{\leavevmode\lower.7ex\copy\errorbox}
-+
- % @pounds{} is a sterling sign, which Knuth put in the CM italic font.
- %
- \def\pounds{{\it\$}}
-@@ -2665,52 +3050,59 @@ end
- % Theiling, which support regular, slanted, bold and bold slanted (and
- % "outlined" (blackboard board, sort of) versions, which we don't need).
- % It is available from http://www.ctan.org/tex-archive/fonts/eurosym.
--%
-+%
- % Although only regular is the truly official Euro symbol, we ignore
- % that. The Euro is designed to be slightly taller than the regular
- % font height.
--%
-+%
- % feymr - regular
- % feymo - slanted
- % feybr - bold
- % feybo - bold slanted
--%
-+%
- % There is no good (free) typewriter version, to my knowledge.
- % A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide.
- % Hmm.
--%
-+%
- % Also doesn't work in math. Do we need to do math with euro symbols?
- % Hope not.
--%
--%
-+%
-+%
- \def\euro{{\eurofont e}}
- \def\eurofont{%
- % We set the font at each command, rather than predefining it in
- % \textfonts and the other font-switching commands, so that
- % installations which never need the symbol don't have to have the
- % font installed.
-- %
-+ %
- % There is only one designed size (nominal 10pt), so we always scale
- % that to the current nominal size.
-- %
-+ %
- % By the way, simply using "at 1em" works for cmr10 and the like, but
- % does not work for cmbx10 and other extended/shrunken fonts.
-- %
-+ %
- \def\eurosize{\csname\curfontsize nominalsize\endcsname}%
- %
-- \ifx\curfontstyle\bfstylename
-+ \ifx\curfontstyle\bfstylename
- % bold:
- \font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize
-- \else
-+ \else
- % regular:
- \font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize
- \fi
- \thiseurofont
- }
-
--% Hacks for glyphs from the EC fonts similar to \euro. We don't
--% use \let for the aliases, because sometimes we redefine the original
--% macro, and the alias should reflect the redefinition.
-+% Glyphs from the EC fonts. We don't use \let for the aliases, because
-+% sometimes we redefine the original macro, and the alias should reflect
-+% the redefinition.
-+%
-+% Use LaTeX names for the Icelandic letters.
-+\def\DH{{\ecfont \char"D0}} % Eth
-+\def\dh{{\ecfont \char"F0}} % eth
-+\def\TH{{\ecfont \char"DE}} % Thorn
-+\def\th{{\ecfont \char"FE}} % thorn
-+%
- \def\guillemetleft{{\ecfont \char"13}}
- \def\guillemotleft{\guillemetleft}
- \def\guillemetright{{\ecfont \char"14}}
-@@ -2720,19 +3112,52 @@ end
- \def\quotedblbase{{\ecfont \char"12}}
- \def\quotesinglbase{{\ecfont \char"0D}}
- %
-+% This positioning is not perfect (see the ogonek LaTeX package), but
-+% we have the precomposed glyphs for the most common cases. We put the
-+% tests to use those glyphs in the single \ogonek macro so we have fewer
-+% dummy definitions to worry about for index entries, etc.
-+%
-+% ogonek is also used with other letters in Lithuanian (IOU), but using
-+% the precomposed glyphs for those is not so easy since they aren't in
-+% the same EC font.
-+\def\ogonek#1{{%
-+ \def\temp{#1}%
-+ \ifx\temp\macrocharA\Aogonek
-+ \else\ifx\temp\macrochara\aogonek
-+ \else\ifx\temp\macrocharE\Eogonek
-+ \else\ifx\temp\macrochare\eogonek
-+ \else
-+ \ecfont \setbox0=\hbox{#1}%
-+ \ifdim\ht0=1ex\accent"0C #1%
-+ \else\ooalign{\unhbox0\crcr\hidewidth\char"0C \hidewidth}%
-+ \fi
-+ \fi\fi\fi\fi
-+ }%
-+}
-+\def\Aogonek{{\ecfont \char"81}}\def\macrocharA{A}
-+\def\aogonek{{\ecfont \char"A1}}\def\macrochara{a}
-+\def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E}
-+\def\eogonek{{\ecfont \char"A6}}\def\macrochare{e}
-+%
-+% Use the ec* fonts (cm-super in outline format) for non-CM glyphs.
- \def\ecfont{%
-- % We can't distinguish serif/sanserif and italic/slanted, but this
-+ % We can't distinguish serif/sans and italic/slanted, but this
- % is used for crude hacks anyway (like adding French and German
- % quotes to documents typeset with CM, where we lose kerning), so
- % hopefully nobody will notice/care.
- \edef\ecsize{\csname\curfontsize ecsize\endcsname}%
- \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}%
-- \ifx\curfontstyle\bfstylename
-- % bold:
-- \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize
-- \else
-- % regular:
-- \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize
-+ \ifmonospace
-+ % typewriter:
-+ \font\thisecfont = ectt\ecsize \space at \nominalsize
-+ \else
-+ \ifx\curfontstyle\bfstylename
-+ % bold:
-+ \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize
-+ \else
-+ % regular:
-+ \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize
-+ \fi
- \fi
- \thisecfont
- }
-@@ -2754,8 +3179,8 @@ end
- % Laurent Siebenmann reports \Orb undefined with:
- % Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38
- % so we'll define it if necessary.
--%
--\ifx\Orb\undefined
-+%
-+\ifx\Orb\thisisundefined
- \def\Orb{\mathhexbox20D}
- \fi
-
-@@ -2765,6 +3190,7 @@ end
- \chardef\quoteleft=`\`
- \chardef\quoteright=`\'
-
-+
- \message{page headings,}
-
- \newskip\titlepagetopglue \titlepagetopglue = 1.5in
-@@ -2782,8 +3208,9 @@ end
- \newif\ifsetshortcontentsaftertitlepage
- \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue
-
--\parseargdef\shorttitlepage{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}%
-- \endgroup\page\hbox{}\page}
-+\parseargdef\shorttitlepage{%
-+ \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}%
-+ \endgroup\page\hbox{}\page}
-
- \envdef\titlepage{%
- % Open one extra group, as we want to close it in the middle of \Etitlepage.
-@@ -2843,17 +3270,28 @@ end
- \finishedtitlepagetrue
- }
-
--%%% Macros to be used within @titlepage:
-+% Settings used for typesetting titles: no hyphenation, no indentation,
-+% don't worry much about spacing, ragged right. This should be used
-+% inside a \vbox, and fonts need to be set appropriately first. Because
-+% it is always used for titles, nothing else, we call \rmisbold. \par
-+% should be specified before the end of the \vbox, since a vbox is a group.
-+%
-+\def\raggedtitlesettings{%
-+ \rmisbold
-+ \hyphenpenalty=10000
-+ \parindent=0pt
-+ \tolerance=5000
-+ \ptexraggedright
-+}
-+
-+% Macros to be used within @titlepage:
-
- \let\subtitlerm=\tenrm
- \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}
-
--\def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines
-- \let\tt=\authortt}
--
- \parseargdef\title{%
- \checkenv\titlepage
-- \leftline{\titlefonts\rm #1}
-+ \vbox{\titlefonts \raggedtitlesettings #1\par}%
- % print a rule at the page bottom also.
- \finishedtitlepagefalse
- \vskip4pt \hrule height 4pt width \hsize \vskip4pt
-@@ -2874,12 +3312,12 @@ end
- \else
- \checkenv\titlepage
- \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi
-- {\authorfont \leftline{#1}}%
-+ {\secfonts\rmisbold \leftline{#1}}%
- \fi
- }
-
-
--%%% Set up page headings and footings.
-+% Set up page headings and footings.
-
- \let\thispage=\folio
-
-@@ -2973,10 +3411,14 @@ end
-
- \def\headings #1 {\csname HEADINGS#1\endcsname}
-
--\def\HEADINGSoff{%
--\global\evenheadline={\hfil} \global\evenfootline={\hfil}
--\global\oddheadline={\hfil} \global\oddfootline={\hfil}}
--\HEADINGSoff
-+\def\headingsoff{% non-global headings elimination
-+ \evenheadline={\hfil}\evenfootline={\hfil}%
-+ \oddheadline={\hfil}\oddfootline={\hfil}%
-+}
-+
-+\def\HEADINGSoff{{\globaldefs=1 \headingsoff}} % global setting
-+\HEADINGSoff % it's the default
-+
- % When we turn headings on, set the page number to 1.
- % For double-sided printing, put current file name in lower left corner,
- % chapter name on inside top of right hand pages, document
-@@ -3027,7 +3469,7 @@ end
- % This produces Day Month Year style of output.
- % Only define if not already defined, in case a txi-??.tex file has set
- % up a different format (e.g., txi-cs.tex does this).
--\ifx\today\undefined
-+\ifx\today\thisisundefined
- \def\today{%
- \number\day\space
- \ifcase\month
-@@ -3088,7 +3530,7 @@ end
- \begingroup
- \advance\leftskip by-\tableindent
- \advance\hsize by\tableindent
-- \advance\rightskip by0pt plus1fil
-+ \advance\rightskip by0pt plus1fil\relax
- \leavevmode\unhbox0\par
- \endgroup
- %
-@@ -3102,7 +3544,7 @@ end
- % cause the example and the item to crash together. So we use this
- % bizarre value of 10001 as a signal to \aboveenvbreak to insert
- % \parskip glue after all. Section titles are handled this way also.
-- %
-+ %
- \penalty 10001
- \endgroup
- \itemxneedsnegativevskipfalse
-@@ -3196,9 +3638,18 @@ end
- \parindent=0pt
- \parskip=\smallskipamount
- \ifdim\parskip=0pt \parskip=2pt \fi
-+ %
-+ % Try typesetting the item mark that if the document erroneously says
-+ % something like @itemize @samp (intending @table), there's an error
-+ % right away at the @itemize. It's not the best error message in the
-+ % world, but it's better than leaving it to the @item. This means if
-+ % the user wants an empty mark, they have to say @w{} not just @w.
- \def\itemcontents{#1}%
-+ \setbox0 = \hbox{\itemcontents}%
-+ %
- % @itemize with no arg is equivalent to @itemize @bullet.
- \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi
-+ %
- \let\item=\itemizeitem
- }
-
-@@ -3219,6 +3670,7 @@ end
- \ifnum\lastpenalty<10000 \parskip=0in \fi
- \noindent
- \hbox to 0pt{\hss \itemcontents \kern\itemmargin}%
-+ %
- \vadjust{\penalty 1200}}% not good to break after first line of item.
- \flushcr
- }
-@@ -3440,12 +3892,19 @@ end
- %
- % @headitem starts a heading row, which we typeset in bold.
- % Assignments have to be global since we are inside the implicit group
--% of an alignment entry. Note that \everycr resets \everytab.
--\def\headitem{\checkenv\multitable \crcr \global\everytab={\bf}\the\everytab}%
-+% of an alignment entry. \everycr resets \everytab so we don't have to
-+% undo it ourselves.
-+\def\headitemfont{\b}% for people to use in the template row; not changeable
-+\def\headitem{%
-+ \checkenv\multitable
-+ \crcr
-+ \global\everytab={\bf}% can't use \headitemfont since the parsing differs
-+ \the\everytab % for the first item
-+}%
- %
- % A \tab used to include \hskip1sp. But then the space in a template
- % line is not enough. That is bad. So let's go back to just `&' until
--% we encounter the problem it was intended to solve again.
-+% we again encounter the problem the 1sp was intended to solve.
- % --karl, nathan@acm.org, 20apr99.
- \def\tab{\checkenv\multitable &\the\everytab}%
-
-@@ -3557,18 +4016,18 @@ end
- \setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
- \global\advance\multitablelinespace by-\ht0
- \fi
--%% Test to see if parskip is larger than space between lines of
--%% table. If not, do nothing.
--%% If so, set to same dimension as multitablelinespace.
-+% Test to see if parskip is larger than space between lines of
-+% table. If not, do nothing.
-+% If so, set to same dimension as multitablelinespace.
- \ifdim\multitableparskip>\multitablelinespace
- \global\multitableparskip=\multitablelinespace
--\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
-- %% than skip between lines in the table.
-+\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller
-+ % than skip between lines in the table.
- \fi%
- \ifdim\multitableparskip=0pt
- \global\multitableparskip=\multitablelinespace
--\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
-- %% than skip between lines in the table.
-+\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller
-+ % than skip between lines in the table.
- \fi}
-
-
-@@ -3729,7 +4188,7 @@ end
- % ..., but we might end up with active ones in the argument if
- % we're called from @code, as @code{@value{foo-bar_}}, though.
- % So \let them to their normal equivalents.
-- \let-\realdash \let_\normalunderscore
-+ \let-\normaldash \let_\normalunderscore
- }
- }
-
-@@ -3769,7 +4228,7 @@ end
- }
- \def\ifsetfail{\doignore{ifset}}
-
--% @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been
-+% @ifclear VAR ... @end executes the `...' iff VAR has never been
- % defined with @set, or has been undefined with @clear.
- %
- % The `\else' inside the `\doifset' parameter is a trick to reuse the
-@@ -3780,6 +4239,35 @@ end
- \def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}}
- \def\ifclearfail{\doignore{ifclear}}
-
-+% @ifcommandisdefined CMD ... @end executes the `...' if CMD (written
-+% without the @) is in fact defined. We can only feasibly check at the
-+% TeX level, so something like `mathcode' is going to considered
-+% defined even though it is not a Texinfo command.
-+%
-+\makecond{ifcommanddefined}
-+\def\ifcommanddefined{\parsearg{\doifcmddefined{\let\next=\ifcmddefinedfail}}}
-+%
-+\def\doifcmddefined#1#2{{%
-+ \makevalueexpandable
-+ \let\next=\empty
-+ \expandafter\ifx\csname #2\endcsname\relax
-+ #1% If not defined, \let\next as above.
-+ \fi
-+ \expandafter
-+ }\next
-+}
-+\def\ifcmddefinedfail{\doignore{ifcommanddefined}}
-+
-+% @ifcommandnotdefined CMD ... handled similar to @ifclear above.
-+\makecond{ifcommandnotdefined}
-+\def\ifcommandnotdefined{%
-+ \parsearg{\doifcmddefined{\else \let\next=\ifcmdnotdefinedfail}}}
-+\def\ifcmdnotdefinedfail{\doignore{ifcommandnotdefined}}
-+
-+% Set the `txicommandconditionals' variable, so documents have a way to
-+% test if the @ifcommand...defined conditionals are available.
-+\set txicommandconditionals
-+
- % @dircategory CATEGORY -- specify a category of the dir file
- % which this file should belong to. Ignore this in TeX.
- \let\dircategory=\comment
-@@ -3844,11 +4332,11 @@ end
- \def\dosynindex#1#2#3{%
- % Only do \closeout if we haven't already done it, else we'll end up
- % closing the target index.
-- \expandafter \ifx\csname donesynindex#2\endcsname \undefined
-+ \expandafter \ifx\csname donesynindex#2\endcsname \relax
- % The \closeout helps reduce unnecessary open files; the limit on the
- % Acorn RISC OS is a mere 16 files.
- \expandafter\closeout\csname#2indfile\endcsname
-- \expandafter\let\csname\donesynindex#2\endcsname = 1
-+ \expandafter\let\csname donesynindex#2\endcsname = 1
- \fi
- % redefine \fooindfile:
- \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname
-@@ -3883,11 +4371,14 @@ end
- \def\@{@}% change to @@ when we switch to @ as escape char in index files.
- \def\ {\realbackslash\space }%
- %
-- % Need these in case \tex is in effect and \{ is a \delimiter again.
-- % But can't use \lbracecmd and \rbracecmd because texindex assumes
-- % braces and backslashes are used only as delimiters.
-- \let\{ = \mylbrace
-- \let\} = \myrbrace
-+ % Need these unexpandable (because we define \tt as a dummy)
-+ % definitions when @{ or @} appear in index entry text. Also, more
-+ % complicated, when \tex is in effect and \{ is a \delimiter again.
-+ % We can't use \lbracecmd and \rbracecmd because texindex assumes
-+ % braces and backslashes are used only as delimiters. Perhaps we
-+ % should define @lbrace and @rbrace commands a la @comma.
-+ \def\{{{\tt\char123}}%
-+ \def\}{{\tt\char125}}%
- %
- % I don't entirely understand this, but when an index entry is
- % generated from a macro call, the \endinput which \scanmacro inserts
-@@ -3898,7 +4389,7 @@ end
- % processing continues to some further point. On the other hand, it
- % seems \endinput does not hurt in the printed index arg, since that
- % is still getting written without apparent harm.
-- %
-+ %
- % Sample source (mac-idx3.tex, reported by Graham Percival to
- % help-texinfo, 22may06):
- % @macro funindex {WORD}
-@@ -3906,12 +4397,12 @@ end
- % @end macro
- % ...
- % @funindex commtest
-- %
-+ %
- % The above is not enough to reproduce the bug, but it gives the flavor.
-- %
-+ %
- % Sample whatsit resulting:
- % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}}
-- %
-+ %
- % So:
- \let\endinput = \empty
- %
-@@ -3940,7 +4431,7 @@ end
- \def\commondummies{%
- %
- % \definedummyword defines \#1 as \string\#1\space, thus effectively
-- % preventing its expansion. This is used only for control% words,
-+ % preventing its expansion. This is used only for control words,
- % not control letters, because the \space would be incorrect for
- % control characters, but is needed to separate the control word
- % from whatever follows.
-@@ -3959,23 +4450,28 @@ end
- \commondummiesnofonts
- %
- \definedummyletter\_%
-+ \definedummyletter\-%
- %
- % Non-English letters.
- \definedummyword\AA
- \definedummyword\AE
-+ \definedummyword\DH
- \definedummyword\L
-- \definedummyword\OE
- \definedummyword\O
-+ \definedummyword\OE
-+ \definedummyword\TH
- \definedummyword\aa
- \definedummyword\ae
-+ \definedummyword\dh
-+ \definedummyword\exclamdown
- \definedummyword\l
-- \definedummyword\oe
- \definedummyword\o
-- \definedummyword\ss
-- \definedummyword\exclamdown
-- \definedummyword\questiondown
-+ \definedummyword\oe
- \definedummyword\ordf
- \definedummyword\ordm
-+ \definedummyword\questiondown
-+ \definedummyword\ss
-+ \definedummyword\th
- %
- % Although these internal commands shouldn't show up, sometimes they do.
- \definedummyword\bf
-@@ -3991,21 +4487,27 @@ end
- \definedummyword\TeX
- %
- % Assorted special characters.
-+ \definedummyword\arrow
- \definedummyword\bullet
- \definedummyword\comma
- \definedummyword\copyright
- \definedummyword\registeredsymbol
- \definedummyword\dots
- \definedummyword\enddots
-+ \definedummyword\entrybreak
- \definedummyword\equiv
- \definedummyword\error
- \definedummyword\euro
-+ \definedummyword\expansion
-+ \definedummyword\geq
- \definedummyword\guillemetleft
- \definedummyword\guillemetright
- \definedummyword\guilsinglleft
- \definedummyword\guilsinglright
-- \definedummyword\expansion
-+ \definedummyword\lbracechar
-+ \definedummyword\leq
- \definedummyword\minus
-+ \definedummyword\ogonek
- \definedummyword\pounds
- \definedummyword\point
- \definedummyword\print
-@@ -4015,6 +4517,7 @@ end
- \definedummyword\quoteleft
- \definedummyword\quoteright
- \definedummyword\quotesinglbase
-+ \definedummyword\rbracechar
- \definedummyword\result
- \definedummyword\textdegree
- %
-@@ -4049,6 +4552,7 @@ end
- \definedummyword\v
- \definedummyword\H
- \definedummyword\dotaccent
-+ \definedummyword\ogonek
- \definedummyword\ringaccent
- \definedummyword\tieaccent
- \definedummyword\ubaraccent
-@@ -4059,18 +4563,27 @@ end
- \definedummyword\b
- \definedummyword\i
- \definedummyword\r
-+ \definedummyword\sansserif
- \definedummyword\sc
-+ \definedummyword\slanted
- \definedummyword\t
- %
- % Commands that take arguments.
-+ \definedummyword\abbr
- \definedummyword\acronym
-+ \definedummyword\anchor
- \definedummyword\cite
- \definedummyword\code
- \definedummyword\command
- \definedummyword\dfn
-+ \definedummyword\dmn
-+ \definedummyword\email
- \definedummyword\emph
- \definedummyword\env
- \definedummyword\file
-+ \definedummyword\image
-+ \definedummyword\indicateurl
-+ \definedummyword\inforef
- \definedummyword\kbd
- \definedummyword\key
- \definedummyword\math
-@@ -4098,7 +4611,7 @@ end
- \def\definedummyaccent##1{\let##1\asis}%
- % We can just ignore other control letters.
- \def\definedummyletter##1{\let##1\empty}%
-- % Hopefully, all control words can become @asis.
-+ % All control words become @asis by default; overrides below.
- \let\definedummyword\definedummyaccent
- %
- \commondummiesnofonts
-@@ -4110,48 +4623,63 @@ end
- %
- \def\ { }%
- \def\@{@}%
-- % how to handle braces?
- \def\_{\normalunderscore}%
-+ \def\-{}% @- shouldn't affect sorting
-+ %
-+ % Unfortunately, texindex is not prepared to handle braces in the
-+ % content at all. So for index sorting, we map @{ and @} to strings
-+ % starting with |, since that ASCII character is between ASCII { and }.
-+ \def\{{|a}%
-+ \def\lbracechar{|a}%
-+ %
-+ \def\}{|b}%
-+ \def\rbracechar{|b}%
- %
- % Non-English letters.
- \def\AA{AA}%
- \def\AE{AE}%
-+ \def\DH{DZZ}%
- \def\L{L}%
- \def\OE{OE}%
- \def\O{O}%
-+ \def\TH{ZZZ}%
- \def\aa{aa}%
- \def\ae{ae}%
-+ \def\dh{dzz}%
-+ \def\exclamdown{!}%
- \def\l{l}%
- \def\oe{oe}%
-- \def\o{o}%
-- \def\ss{ss}%
-- \def\exclamdown{!}%
-- \def\questiondown{?}%
- \def\ordf{a}%
- \def\ordm{o}%
-+ \def\o{o}%
-+ \def\questiondown{?}%
-+ \def\ss{ss}%
-+ \def\th{zzz}%
- %
- \def\LaTeX{LaTeX}%
- \def\TeX{TeX}%
- %
- % Assorted special characters.
- % (The following {} will end up in the sort string, but that's ok.)
-+ \def\arrow{->}%
- \def\bullet{bullet}%
- \def\comma{,}%
- \def\copyright{copyright}%
-- \def\registeredsymbol{R}%
- \def\dots{...}%
- \def\enddots{...}%
- \def\equiv{==}%
- \def\error{error}%
- \def\euro{euro}%
-+ \def\expansion{==>}%
-+ \def\geq{>=}%
- \def\guillemetleft{<<}%
- \def\guillemetright{>>}%
- \def\guilsinglleft{<}%
- \def\guilsinglright{>}%
-- \def\expansion{==>}%
-+ \def\leq{<=}%
- \def\minus{-}%
-- \def\pounds{pounds}%
- \def\point{.}%
-+ \def\pounds{pounds}%
- \def\print{-|}%
- \def\quotedblbase{"}%
- \def\quotedblleft{"}%
-@@ -4159,22 +4687,31 @@ end
- \def\quoteleft{`}%
- \def\quoteright{'}%
- \def\quotesinglbase{,}%
-+ \def\registeredsymbol{R}%
- \def\result{=>}%
-- \def\textdegree{degrees}%
-+ \def\textdegree{o}%
-+ %
-+ \expandafter\ifx\csname SETtxiindexlquoteignore\endcsname\relax
-+ \else \indexlquoteignore \fi
- %
- % We need to get rid of all macros, leaving only the arguments (if present).
- % Of course this is not nearly correct, but it is the best we can do for now.
- % makeinfo does not expand macros in the argument to @deffn, which ends up
- % writing an index entry, and texindex isn't prepared for an index sort entry
- % that starts with \.
-- %
-+ %
- % Since macro invocations are followed by braces, we can just redefine them
- % to take a single TeX argument. The case of a macro invocation that
- % goes to end-of-line is not handled.
-- %
-+ %
- \macrolist
- }
-
-+% Undocumented (for FSFS 2nd ed.): @set txiindexlquoteignore makes us
-+% ignore left quotes in the sort term.
-+{\catcode`\`=\active
-+ \gdef\indexlquoteignore{\let`=\empty}}
-+
- \let\indexbackslash=0 %overridden during \printindex.
- \let\SETmarginindex=\relax % put index entries in margin (undocumented)?
-
-@@ -4272,10 +4809,9 @@ end
- %
- % ..., ready, GO:
- %
--\def\safewhatsit#1{%
--\ifhmode
-+\def\safewhatsit#1{\ifhmode
- #1%
--\else
-+ \else
- % \lastskip and \lastpenalty cannot both be nonzero simultaneously.
- \whatsitskip = \lastskip
- \edef\lastskipmacro{\the\lastskip}%
-@@ -4299,7 +4835,6 @@ end
- % to re-insert the same penalty (values >10000 are used for various
- % signals); since we just inserted a non-discardable item, any
- % following glue (such as a \parskip) would be a breakpoint. For example:
-- %
- % @deffn deffn-whatever
- % @vindex index-whatever
- % Description.
-@@ -4312,8 +4847,7 @@ end
- % (the whatsit from the \write), so we must insert a \nobreak.
- \nobreak\vskip\whatsitskip
- \fi
--\fi
--}
-+\fi}
-
- % The index entry written in the file actually looks like
- % \entry {sortstring}{page}{topic}
-@@ -4429,10 +4963,9 @@ end
- %
- % A straightforward implementation would start like this:
- % \def\entry#1#2{...
--% But this frozes the catcodes in the argument, and can cause problems to
-+% But this freezes the catcodes in the argument, and can cause problems to
- % @code, which sets - active. This problem was fixed by a kludge---
- % ``-'' was active throughout whole index, but this isn't really right.
--%
- % The right solution is to prevent \entry from swallowing the whole text.
- % --kasal, 21nov03
- \def\entry{%
-@@ -4469,10 +5002,17 @@ end
- % columns.
- \vskip 0pt plus1pt
- %
-+ % When reading the text of entry, convert explicit line breaks
-+ % from @* into spaces. The user might give these in long section
-+ % titles, for instance.
-+ \def\*{\unskip\space\ignorespaces}%
-+ \def\entrybreak{\hfil\break}%
-+ %
- % Swallow the left brace of the text (first parameter):
- \afterassignment\doentry
- \let\temp =
- }
-+\def\entrybreak{\unskip\space\ignorespaces}%
- \def\doentry{%
- \bgroup % Instead of the swallowed brace.
- \noindent
-@@ -4705,7 +5245,22 @@ end
- \message{sectioning,}
- % Chapters, sections, etc.
-
--% \unnumberedno is an oxymoron, of course. But we count the unnumbered
-+% Let's start with @part.
-+\outer\parseargdef\part{\partzzz{#1}}
-+\def\partzzz#1{%
-+ \chapoddpage
-+ \null
-+ \vskip.3\vsize % move it down on the page a bit
-+ \begingroup
-+ \noindent \titlefonts\rmisbold #1\par % the text
-+ \let\lastnode=\empty % no node to associate with
-+ \writetocentry{part}{#1}{}% but put it in the toc
-+ \headingsoff % no headline or footline on the part page
-+ \chapoddpage
-+ \endgroup
-+}
-+
-+% \unnumberedno is an oxymoron. But we count the unnumbered
- % sections so that we can refer to them unambiguously in the pdf
- % outlines by their "section number". We avoid collisions with chapter
- % numbers by starting them at 10000. (If a document ever has 10000
-@@ -4784,8 +5339,8 @@ end
- \chardef\maxseclevel = 3
- %
- % A numbered section within an unnumbered changes to unnumbered too.
--% To achive this, remember the "biggest" unnum. sec. we are currently in:
--\chardef\unmlevel = \maxseclevel
-+% To achieve this, remember the "biggest" unnum. sec. we are currently in:
-+\chardef\unnlevel = \maxseclevel
- %
- % Trace whether the current chapter is an appendix or not:
- % \chapheadtype is "N" or "A", unnumbered chapters are ignored.
-@@ -4810,8 +5365,8 @@ end
- % The heading type:
- \def\headtype{#1}%
- \if \headtype U%
-- \ifnum \absseclevel < \unmlevel
-- \chardef\unmlevel = \absseclevel
-+ \ifnum \absseclevel < \unnlevel
-+ \chardef\unnlevel = \absseclevel
- \fi
- \else
- % Check for appendix sections:
-@@ -4823,10 +5378,10 @@ end
- \fi\fi
- \fi
- % Check for numbered within unnumbered:
-- \ifnum \absseclevel > \unmlevel
-+ \ifnum \absseclevel > \unnlevel
- \def\headtype{U}%
- \else
-- \chardef\unmlevel = 3
-+ \chardef\unnlevel = 3
- \fi
- \fi
- % Now print the heading:
-@@ -4880,7 +5435,9 @@ end
- \gdef\chaplevelprefix{\the\chapno.}%
- \resetallfloatnos
- %
-- \message{\putwordChapter\space \the\chapno}%
-+ % \putwordChapter can contain complex things in translations.
-+ \toks0=\expandafter{\putwordChapter}%
-+ \message{\the\toks0 \space \the\chapno}%
- %
- % Write the actual heading.
- \chapmacro{#1}{Ynumbered}{\the\chapno}%
-@@ -4891,15 +5448,17 @@ end
- \global\let\subsubsection = \numberedsubsubsec
- }
-
--\outer\parseargdef\appendix{\apphead0{#1}} % normally apphead0 calls appendixzzz
-+\outer\parseargdef\appendix{\apphead0{#1}} % normally calls appendixzzz
-+%
- \def\appendixzzz#1{%
- \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
- \global\advance\appendixno by 1
- \gdef\chaplevelprefix{\appendixletter.}%
- \resetallfloatnos
- %
-- \def\appendixnum{\putwordAppendix\space \appendixletter}%
-- \message{\appendixnum}%
-+ % \putwordAppendix can contain complex things in translations.
-+ \toks0=\expandafter{\putwordAppendix}%
-+ \message{\the\toks0 \space \appendixletter}%
- %
- \chapmacro{#1}{Yappendix}{\appendixletter}%
- %
-@@ -4908,7 +5467,8 @@ end
- \global\let\subsubsection = \appendixsubsubsec
- }
-
--\outer\parseargdef\unnumbered{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz
-+% normally unnmhead0 calls unnumberedzzz:
-+\outer\parseargdef\unnumbered{\unnmhead0{#1}}
- \def\unnumberedzzz#1{%
- \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
- \global\advance\unnumberedno by 1
-@@ -4952,40 +5512,47 @@ end
- \let\top\unnumbered
-
- % Sections.
-+%
- \outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz
- \def\seczzz#1{%
- \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1
- \sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}%
- }
-
--\outer\parseargdef\appendixsection{\apphead1{#1}} % normally calls appendixsectionzzz
-+% normally calls appendixsectionzzz:
-+\outer\parseargdef\appendixsection{\apphead1{#1}}
- \def\appendixsectionzzz#1{%
- \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1
- \sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}%
- }
- \let\appendixsec\appendixsection
-
--\outer\parseargdef\unnumberedsec{\unnmhead1{#1}} % normally calls unnumberedseczzz
-+% normally calls unnumberedseczzz:
-+\outer\parseargdef\unnumberedsec{\unnmhead1{#1}}
- \def\unnumberedseczzz#1{%
- \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1
- \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}%
- }
-
- % Subsections.
--\outer\parseargdef\numberedsubsec{\numhead2{#1}} % normally calls numberedsubseczzz
-+%
-+% normally calls numberedsubseczzz:
-+\outer\parseargdef\numberedsubsec{\numhead2{#1}}
- \def\numberedsubseczzz#1{%
- \global\subsubsecno=0 \global\advance\subsecno by 1
- \sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}%
- }
-
--\outer\parseargdef\appendixsubsec{\apphead2{#1}} % normally calls appendixsubseczzz
-+% normally calls appendixsubseczzz:
-+\outer\parseargdef\appendixsubsec{\apphead2{#1}}
- \def\appendixsubseczzz#1{%
- \global\subsubsecno=0 \global\advance\subsecno by 1
- \sectionheading{#1}{subsec}{Yappendix}%
- {\appendixletter.\the\secno.\the\subsecno}%
- }
-
--\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} %normally calls unnumberedsubseczzz
-+% normally calls unnumberedsubseczzz:
-+\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}}
- \def\unnumberedsubseczzz#1{%
- \global\subsubsecno=0 \global\advance\subsecno by 1
- \sectionheading{#1}{subsec}{Ynothing}%
-@@ -4993,21 +5560,25 @@ end
- }
-
- % Subsubsections.
--\outer\parseargdef\numberedsubsubsec{\numhead3{#1}} % normally numberedsubsubseczzz
-+%
-+% normally numberedsubsubseczzz:
-+\outer\parseargdef\numberedsubsubsec{\numhead3{#1}}
- \def\numberedsubsubseczzz#1{%
- \global\advance\subsubsecno by 1
- \sectionheading{#1}{subsubsec}{Ynumbered}%
- {\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno}%
- }
-
--\outer\parseargdef\appendixsubsubsec{\apphead3{#1}} % normally appendixsubsubseczzz
-+% normally appendixsubsubseczzz:
-+\outer\parseargdef\appendixsubsubsec{\apphead3{#1}}
- \def\appendixsubsubseczzz#1{%
- \global\advance\subsubsecno by 1
- \sectionheading{#1}{subsubsec}{Yappendix}%
- {\appendixletter.\the\secno.\the\subsecno.\the\subsubsecno}%
- }
-
--\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} %normally unnumberedsubsubseczzz
-+% normally unnumberedsubsubseczzz:
-+\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}}
- \def\unnumberedsubsubseczzz#1{%
- \global\advance\subsubsecno by 1
- \sectionheading{#1}{subsubsec}{Ynothing}%
-@@ -5023,15 +5594,6 @@ end
-
- % Define @majorheading, @heading and @subheading
-
--% NOTE on use of \vbox for chapter headings, section headings, and such:
--% 1) We use \vbox rather than the earlier \line to permit
--% overlong headings to fold.
--% 2) \hyphenpenalty is set to 10000 because hyphenation in a
--% heading is obnoxious; this forbids it.
--% 3) Likewise, headings look best if no \parindent is used, and
--% if justification is not attempted. Hence \raggedright.
--
--
- \def\majorheading{%
- {\advance\chapheadingskip by 10pt \chapbreak }%
- \parsearg\chapheadingzzz
-@@ -5039,10 +5601,8 @@ end
-
- \def\chapheading{\chapbreak \parsearg\chapheadingzzz}
- \def\chapheadingzzz#1{%
-- {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-- \parindent=0pt\raggedright
-- \rm #1\hfill}}%
-- \bigskip \par\penalty 200\relax
-+ \vbox{\chapfonts \raggedtitlesettings #1\par}%
-+ \nobreak\bigskip \nobreak
- \suppressfirstparagraphindent
- }
-
-@@ -5058,14 +5618,13 @@ end
- % (including whitespace, linebreaking, etc. around it),
- % given all the information in convenient, parsed form.
-
--%%% Args are the skip and penalty (usually negative)
-+% Args are the skip and penalty (usually negative)
- \def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi}
-
--%%% Define plain chapter starts, and page on/off switching for it
- % Parameter controlling skip before chapter headings (if needed)
--
- \newskip\chapheadingskip
-
-+% Define plain chapter starts, and page on/off switching for it.
- \def\chapbreak{\dobreak \chapheadingskip {-4000}}
- \def\chappager{\par\vfill\supereject}
- % Because \domark is called before \chapoddpage, the filler page will
-@@ -5075,9 +5634,8 @@ end
- \chappager
- \ifodd\pageno \else
- \begingroup
-- \evenheadline={\hfil}\evenfootline={\hfil}%
-- \oddheadline={\hfil}\oddfootline={\hfil}%
-- \hbox to 0pt{}%
-+ \headingsoff
-+ \null
- \chappager
- \endgroup
- \fi
-@@ -5133,7 +5691,10 @@ end
- \xdef\lastchapterdefs{%
- \gdef\noexpand\thischaptername{\the\toks0}%
- \gdef\noexpand\thischapternum{\appendixletter}%
-- \gdef\noexpand\thischapter{\putwordAppendix{} \noexpand\thischapternum:
-+ % \noexpand\putwordAppendix avoids expanding indigestible
-+ % commands in some of the translations.
-+ \gdef\noexpand\thischapter{\noexpand\putwordAppendix{}
-+ \noexpand\thischapternum:
- \noexpand\thischaptername}%
- }%
- \else
-@@ -5141,7 +5702,10 @@ end
- \xdef\lastchapterdefs{%
- \gdef\noexpand\thischaptername{\the\toks0}%
- \gdef\noexpand\thischapternum{\the\chapno}%
-- \gdef\noexpand\thischapter{\putwordChapter{} \noexpand\thischapternum:
-+ % \noexpand\putwordChapter avoids expanding indigestible
-+ % commands in some of the translations.
-+ \gdef\noexpand\thischapter{\noexpand\putwordChapter{}
-+ \noexpand\thischapternum:
- \noexpand\thischaptername}%
- }%
- \fi\fi\fi
-@@ -5160,7 +5724,7 @@ end
- \domark
- %
- {%
-- \chapfonts \rm
-+ \chapfonts \rmisbold
- %
- % Have to define \lastsection before calling \donoderef, because the
- % xref code eventually uses it. On the other hand, it has to be called
-@@ -5197,8 +5761,7 @@ end
- %
- % Typeset the actual heading.
- \nobreak % Avoid page breaks at the interline glue.
-- \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
-- \hangindent=\wd0 \centerparametersmaybe
-+ \vbox{\raggedtitlesettings \hangindent=\wd0 \centerparametersmaybe
- \unhbox0 #1\par}%
- }%
- \nobreak\bigskip % no page break after a chapter title
-@@ -5220,18 +5783,18 @@ end
- \def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
- %
- \def\unnchfopen #1{%
--\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-- \parindent=0pt\raggedright
-- \rm #1\hfill}}\bigskip \par\nobreak
-+ \chapoddpage
-+ \vbox{\chapfonts \raggedtitlesettings #1\par}%
-+ \nobreak\bigskip\nobreak
- }
- \def\chfopen #1#2{\chapoddpage {\chapfonts
- \vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
- \par\penalty 5000 %
- }
- \def\centerchfopen #1{%
--\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-- \parindent=0pt
-- \hfill {\rm #1}\hfill}}\bigskip \par\nobreak
-+ \chapoddpage
-+ \vbox{\chapfonts \raggedtitlesettings \hfill #1\hfill}%
-+ \nobreak\bigskip \nobreak
- }
- \def\CHAPFopen{%
- \global\let\chapmacro=\chfopen
-@@ -5263,8 +5826,10 @@ end
- %
- \def\sectionheading#1#2#3#4{%
- {%
-+ \checkenv{}% should not be in an environment.
-+ %
- % Switch to the right set of fonts.
-- \csname #2fonts\endcsname \rm
-+ \csname #2fonts\endcsname \rmisbold
- %
- \def\sectionlevel{#2}%
- \def\temptype{#3}%
-@@ -5284,7 +5849,10 @@ end
- \xdef\lastsectiondefs{%
- \gdef\noexpand\thissectionname{\the\toks0}%
- \gdef\noexpand\thissectionnum{#4}%
-- \gdef\noexpand\thissection{\putwordSection{} \noexpand\thissectionnum:
-+ % \noexpand\putwordSection avoids expanding indigestible
-+ % commands in some of the translations.
-+ \gdef\noexpand\thissection{\noexpand\putwordSection{}
-+ \noexpand\thissectionnum:
- \noexpand\thissectionname}%
- }%
- \fi
-@@ -5294,12 +5862,20 @@ end
- \xdef\lastsectiondefs{%
- \gdef\noexpand\thissectionname{\the\toks0}%
- \gdef\noexpand\thissectionnum{#4}%
-- \gdef\noexpand\thissection{\putwordSection{} \noexpand\thissectionnum:
-+ % \noexpand\putwordSection avoids expanding indigestible
-+ % commands in some of the translations.
-+ \gdef\noexpand\thissection{\noexpand\putwordSection{}
-+ \noexpand\thissectionnum:
- \noexpand\thissectionname}%
- }%
- \fi
- \fi\fi\fi
- %
-+ % Go into vertical mode. Usually we'll already be there, but we
-+ % don't want the following whatsit to end up in a preceding paragraph
-+ % if the document didn't happen to have a blank line.
-+ \par
-+ %
- % Output the mark. Pass it through \safewhatsit, to take care of
- % the preceding space.
- \safewhatsit\domark
-@@ -5349,7 +5925,7 @@ end
- \nobreak
- %
- % Output the actual section heading.
-- \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
-+ \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright
- \hangindent=\wd0 % zero if no section number
- \unhbox0 #1}%
- }%
-@@ -5363,15 +5939,15 @@ end
- %
- % We'll almost certainly start a paragraph next, so don't let that
- % glue accumulate. (Not a breakpoint because it's preceded by a
-- % discardable item.)
-+ % discardable item.) However, when a paragraph is not started next
-+ % (\startdefun, \cartouche, \center, etc.), this needs to be wiped out
-+ % or the negative glue will cause weirdly wrong output, typically
-+ % obscuring the section heading with something else.
- \vskip-\parskip
-- %
-- % This is purely so the last item on the list is a known \penalty >
-- % 10000. This is so \startdefun can avoid allowing breakpoints after
-- % section headings. Otherwise, it would insert a valid breakpoint between:
-- %
-- % @section sec-whatever
-- % @deffn def-whatever
-+ %
-+ % This is so the last item on the main vertical list is a known
-+ % \penalty > 10000, so \startdefun, etc., can recognize the situation
-+ % and do the needful.
- \penalty 10001
- }
-
-@@ -5427,7 +6003,7 @@ end
- % These characters do not print properly in the Computer Modern roman
- % fonts, so we must take special care. This is more or less redundant
- % with the Texinfo input format setup at the end of this file.
--%
-+%
- \def\activecatcodes{%
- \catcode`\"=\active
- \catcode`\$=\active
-@@ -5477,7 +6053,7 @@ end
-
- % redefined for the two-volume lispref. We always output on
- % \jobname.toc even if this is redefined.
--%
-+%
- \def\tocreadfilename{\jobname.toc}
-
- % Normal (long) toc.
-@@ -5503,6 +6079,7 @@ end
- \def\summarycontents{%
- \startcontents{\putwordShortTOC}%
- %
-+ \let\partentry = \shortpartentry
- \let\numchapentry = \shortchapentry
- \let\appentry = \shortchapentry
- \let\unnchapentry = \shortunnchapentry
-@@ -5558,6 +6135,19 @@ end
- % The last argument is the page number.
- % The arguments in between are the chapter number, section number, ...
-
-+% Parts, in the main contents. Replace the part number, which doesn't
-+% exist, with an empty box. Let's hope all the numbers have the same width.
-+% Also ignore the page number, which is conventionally not printed.
-+\def\numeralbox{\setbox0=\hbox{8}\hbox to \wd0{\hfil}}
-+\def\partentry#1#2#3#4{\dochapentry{\numeralbox\labelspace#1}{}}
-+%
-+% Parts, in the short toc.
-+\def\shortpartentry#1#2#3#4{%
-+ \penalty-300
-+ \vskip.5\baselineskip plus.15\baselineskip minus.1\baselineskip
-+ \shortchapentry{{\bf #1}}{\numeralbox}{}{}%
-+}
-+
- % Chapters, in the main contents.
- \def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}}
- %
-@@ -5643,49 +6233,16 @@ end
- \def\subsecentryfonts{\textfonts}
- \def\subsubsecentryfonts{\textfonts}
-
--
--\message{environments,}
--% @foo ... @end foo.
--
--% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
--%
--% Since these characters are used in examples, it should be an even number of
--% \tt widths. Each \tt character is 1en, so two makes it 1em.
--%
--\def\point{$\star$}
--\def\result{\leavevmode\raise.15ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
--\def\expansion{\leavevmode\raise.1ex\hbox to 1em{\hfil$\mapsto$\hfil}}
--\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
--\def\equiv{\leavevmode\lower.1ex\hbox to 1em{\hfil$\ptexequiv$\hfil}}
--
--% The @error{} command.
--% Adapted from the TeXbook's \boxit.
--%
--\newbox\errorbox
--%
--{\tentt \global\dimen0 = 3em}% Width of the box.
--\dimen2 = .55pt % Thickness of rules
--% The text. (`r' is open on the right, `e' somewhat less so on the left.)
--\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
--%
--\setbox\errorbox=\hbox to \dimen0{\hfil
-- \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
-- \advance\hsize by -2\dimen2 % Rules.
-- \vbox{%
-- \hrule height\dimen2
-- \hbox{\vrule width\dimen2 \kern3pt % Space to left of text.
-- \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
-- \kern3pt\vrule width\dimen2}% Space to right.
-- \hrule height\dimen2}
-- \hfil}
--%
--\def\error{\leavevmode\lower.7ex\copy\errorbox}
--
--% @tex ... @end tex escapes into raw Tex temporarily.
-+
-+\message{environments,}
-+% @foo ... @end foo.
-+
-+% @tex ... @end tex escapes into raw TeX temporarily.
- % One exception: @ is still an escape character, so that @end tex works.
--% But \@ or @@ will get a plain tex @ character.
-+% But \@ or @@ will get a plain @ character.
-
- \envdef\tex{%
-+ \setupmarkupstyle{tex}%
- \catcode `\\=0 \catcode `\{=1 \catcode `\}=2
- \catcode `\$=3 \catcode `\&=4 \catcode `\#=6
- \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie
-@@ -5695,8 +6252,14 @@ end
- \catcode `\|=\other
- \catcode `\<=\other
- \catcode `\>=\other
-+ \catcode`\`=\other
-+ \catcode`\'=\other
- \escapechar=`\\
- %
-+ % ' is active in math mode (mathcode"8000). So reset it, and all our
-+ % other math active characters (just in case), to plain's definitions.
-+ \mathactive
-+ %
- \let\b=\ptexb
- \let\bullet=\ptexbullet
- \let\c=\ptexc
-@@ -5714,6 +6277,7 @@ end
- \let\/=\ptexslash
- \let\*=\ptexstar
- \let\t=\ptext
-+ \expandafter \let\csname top\endcsname=\ptextop % outer
- \let\frenchspacing=\plainfrenchspacing
- %
- \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%
-@@ -5799,6 +6363,12 @@ end
- \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
- % Flag to tell @lisp, etc., not to narrow margin.
- \let\nonarrowing = t%
-+ %
-+ % If this cartouche directly follows a sectioning command, we need the
-+ % \parskip glue (backspaced over by default) or the cartouche can
-+ % collide with the section heading.
-+ \ifnum\lastpenalty>10000 \vskip\parskip \penalty\lastpenalty \fi
-+ %
- \vbox\bgroup
- \baselineskip=0pt\parskip=0pt\lineskip=0pt
- \carttop
-@@ -5812,7 +6382,7 @@ end
- \lineskip=\normlskip
- \parskip=\normpskip
- \vskip -\parskip
-- \comment % For explanation, see the end of \def\group.
-+ \comment % For explanation, see the end of def\group.
- }
- \def\Ecartouche{%
- \ifhmode\par\fi
-@@ -5829,6 +6399,7 @@ end
-
- % This macro is called at the beginning of all the @example variants,
- % inside a group.
-+\newdimen\nonfillparindent
- \def\nonfillstart{%
- \aboveenvbreak
- \hfuzz = 12pt % Don't be fussy
-@@ -5836,7 +6407,12 @@ end
- \let\par = \lisppar % don't ignore blank lines
- \obeylines % each line of input is a line of output
- \parskip = 0pt
-+ % Turn off paragraph indentation but redefine \indent to emulate
-+ % the normal \indent.
-+ \nonfillparindent=\parindent
- \parindent = 0pt
-+ \let\indent\nonfillindent
-+ %
- \emergencystretch = 0pt % don't try to avoid overfull boxes
- \ifx\nonarrowing\relax
- \advance \leftskip by \lispnarrowing
-@@ -5847,6 +6423,24 @@ end
- \let\exdent=\nofillexdent
- }
-
-+\begingroup
-+\obeyspaces
-+% We want to swallow spaces (but not other tokens) after the fake
-+% @indent in our nonfill-environments, where spaces are normally
-+% active and set to @tie, resulting in them not being ignored after
-+% @indent.
-+\gdef\nonfillindent{\futurelet\temp\nonfillindentcheck}%
-+\gdef\nonfillindentcheck{%
-+\ifx\temp %
-+\expandafter\nonfillindentgobble%
-+\else%
-+\leavevmode\nonfillindentbox%
-+\fi%
-+}%
-+\endgroup
-+\def\nonfillindentgobble#1{\nonfillindent}
-+\def\nonfillindentbox{\hbox to \nonfillparindent{\hss}}
-+
- % If you want all examples etc. small: @set dispenvsize small.
- % If you want even small examples the full size: @set dispenvsize nosmall.
- % This affects the following displayed environments:
-@@ -5874,41 +6468,42 @@ end
- }
-
- % We often define two environments, @foo and @smallfoo.
--% Let's do it by one command:
--\def\makedispenv #1#2{
-- \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}
-- \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}
-+% Let's do it in one command. #1 is the env name, #2 the definition.
-+\def\makedispenvdef#1#2{%
-+ \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}%
-+ \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}%
- \expandafter\let\csname E#1\endcsname \afterenvbreak
- \expandafter\let\csname Esmall#1\endcsname \afterenvbreak
- }
-
--% Define two synonyms:
--\def\maketwodispenvs #1#2#3{
-- \makedispenv{#1}{#3}
-- \makedispenv{#2}{#3}
-+% Define two environment synonyms (#1 and #2) for an environment.
-+\def\maketwodispenvdef#1#2#3{%
-+ \makedispenvdef{#1}{#3}%
-+ \makedispenvdef{#2}{#3}%
- }
--
--% @lisp: indented, narrowed, typewriter font; @example: same as @lisp.
-+%
-+% @lisp: indented, narrowed, typewriter font;
-+% @example: same as @lisp.
- %
- % @smallexample and @smalllisp: use smaller fonts.
- % Originally contributed by Pavel@xerox.
- %
--\maketwodispenvs {lisp}{example}{%
-+\maketwodispenvdef{lisp}{example}{%
- \nonfillstart
-- \tt\quoteexpand
-+ \tt\setupmarkupstyle{example}%
- \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
-- \gobble % eat return
-+ \gobble % eat return
- }
- % @display/@smalldisplay: same as @lisp except keep current font.
- %
--\makedispenv {display}{%
-+\makedispenvdef{display}{%
- \nonfillstart
- \gobble
- }
-
- % @format/@smallformat: same as @display except don't narrow margins.
- %
--\makedispenv{format}{%
-+\makedispenvdef{format}{%
- \let\nonarrowing = t%
- \nonfillstart
- \gobble
-@@ -5927,28 +6522,47 @@ end
- \envdef\flushright{%
- \let\nonarrowing = t%
- \nonfillstart
-- \advance\leftskip by 0pt plus 1fill
-+ \advance\leftskip by 0pt plus 1fill\relax
- \gobble
- }
- \let\Eflushright = \afterenvbreak
-
-
-+% @raggedright does more-or-less normal line breaking but no right
-+% justification. From plain.tex.
-+\envdef\raggedright{%
-+ \rightskip0pt plus2em \spaceskip.3333em \xspaceskip.5em\relax
-+}
-+\let\Eraggedright\par
-+
-+\envdef\raggedleft{%
-+ \parindent=0pt \leftskip0pt plus2em
-+ \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt
-+ \hbadness=10000 % Last line will usually be underfull, so turn off
-+ % badness reporting.
-+}
-+\let\Eraggedleft\par
-+
-+\envdef\raggedcenter{%
-+ \parindent=0pt \rightskip0pt plus1em \leftskip0pt plus1em
-+ \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt
-+ \hbadness=10000 % Last line will usually be underfull, so turn off
-+ % badness reporting.
-+}
-+\let\Eraggedcenter\par
-+
-+
- % @quotation does normal linebreaking (hence we can't use \nonfillstart)
- % and narrows the margins. We keep \parskip nonzero in general, since
- % we're doing normal filling. So, when using \aboveenvbreak and
- % \afterenvbreak, temporarily make \parskip 0.
- %
--\envdef\quotation{%
-- {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
-- \parindent=0pt
-- %
-- % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
-+\makedispenvdef{quotation}{\quotationstart}
-+%
-+\def\quotationstart{%
-+ \indentedblockstart % same as \indentedblock, but increase right margin too.
- \ifx\nonarrowing\relax
-- \advance\leftskip by \lispnarrowing
- \advance\rightskip by \lispnarrowing
-- \exdentamount = \lispnarrowing
-- \else
-- \let\nonarrowing = \relax
- \fi
- \parsearg\quotationlabel
- }
-@@ -5958,12 +6572,13 @@ end
- %
- \def\Equotation{%
- \par
-- \ifx\quotationauthor\undefined\else
-+ \ifx\quotationauthor\thisisundefined\else
- % indent a bit.
- \leftline{\kern 2\leftskip \sl ---\quotationauthor}%
- \fi
- {\parskip=0pt \afterenvbreak}%
- }
-+\def\Esmallquotation{\Equotation}
-
- % If we're given an argument, typeset it in bold with a colon after.
- \def\quotationlabel#1{%
-@@ -5973,6 +6588,32 @@ end
- \fi
- }
-
-+% @indentedblock is like @quotation, but indents only on the left and
-+% has no optional argument.
-+%
-+\makedispenvdef{indentedblock}{\indentedblockstart}
-+%
-+\def\indentedblockstart{%
-+ {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
-+ \parindent=0pt
-+ %
-+ % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
-+ \ifx\nonarrowing\relax
-+ \advance\leftskip by \lispnarrowing
-+ \exdentamount = \lispnarrowing
-+ \else
-+ \let\nonarrowing = \relax
-+ \fi
-+}
-+
-+% Keep a nonzero parskip for the environment, since we're doing normal filling.
-+%
-+\def\Eindentedblock{%
-+ \par
-+ {\parskip=0pt \afterenvbreak}%
-+}
-+\def\Esmallindentedblock{\Eindentedblock}
-+
-
- % LaTeX-like @verbatim...@end verbatim and @verb{<char>...<char>}
- % If we want to allow any <char> as delimiter,
-@@ -5988,18 +6629,16 @@ end
- \do\ \do\\\do\{\do\}\do\$\do\&%
- \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~%
- \do\<\do\>\do\|\do\@\do+\do\"%
-+ % Don't do the quotes -- if we do, @set txicodequoteundirected and
-+ % @set txicodequotebacktick will not have effect on @verb and
-+ % @verbatim, and ?` and !` ligatures won't get disabled.
-+ %\do\`\do\'%
- }
- %
- % [Knuth] p. 380
- \def\uncatcodespecials{%
- \def\do##1{\catcode`##1=\other}\dospecials}
- %
--% [Knuth] pp. 380,381,391
--% Disable Spanish ligatures ?` and !` of \tt font
--\begingroup
-- \catcode`\`=\active\gdef`{\relax\lq}
--\endgroup
--%
- % Setup for the @verb command.
- %
- % Eight spaces for a tab
-@@ -6011,7 +6650,7 @@ end
- \def\setupverb{%
- \tt % easiest (and conventionally used) font for verbatim
- \def\par{\leavevmode\endgraf}%
-- \catcode`\`=\active
-+ \setupmarkupstyle{verb}%
- \tabeightspaces
- % Respect line breaks,
- % print special symbols as themselves, and
-@@ -6022,73 +6661,46 @@ end
-
- % Setup for the @verbatim environment
- %
--% Real tab expansion
-+% Real tab expansion.
- \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
- %
--\def\starttabbox{\setbox0=\hbox\bgroup}
--
--% Allow an option to not replace quotes with a regular directed right
--% quote/apostrophe (char 0x27), but instead use the undirected quote
--% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it
--% the default, but it works for pasting with more pdf viewers (at least
--% evince), the lilypond developers report. xpdf does work with the
--% regular 0x27.
--%
--\def\codequoteright{%
-- \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
-- \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
-- '%
-- \else \char'15 \fi
-- \else \char'15 \fi
--}
--%
--% and a similar option for the left quote char vs. a grave accent.
--% Modern fonts display ASCII 0x60 as a grave accent, so some people like
--% the code environments to do likewise.
--%
--\def\codequoteleft{%
-- \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
-- \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
-- `%
-- \else \char'22 \fi
-- \else \char'22 \fi
--}
-+% We typeset each line of the verbatim in an \hbox, so we can handle
-+% tabs. The \global is in case the verbatim line starts with an accent,
-+% or some other command that starts with a begin-group. Otherwise, the
-+% entire \verbbox would disappear at the corresponding end-group, before
-+% it is typeset. Meanwhile, we can't have nested verbatim commands
-+% (can we?), so the \global won't be overwriting itself.
-+\newbox\verbbox
-+\def\starttabbox{\global\setbox\verbbox=\hbox\bgroup}
- %
- \begingroup
- \catcode`\^^I=\active
- \gdef\tabexpand{%
- \catcode`\^^I=\active
- \def^^I{\leavevmode\egroup
-- \dimen0=\wd0 % the width so far, or since the previous tab
-- \divide\dimen0 by\tabw
-- \multiply\dimen0 by\tabw % compute previous multiple of \tabw
-- \advance\dimen0 by\tabw % advance to next multiple of \tabw
-- \wd0=\dimen0 \box0 \starttabbox
-+ \dimen\verbbox=\wd\verbbox % the width so far, or since the previous tab
-+ \divide\dimen\verbbox by\tabw
-+ \multiply\dimen\verbbox by\tabw % compute previous multiple of \tabw
-+ \advance\dimen\verbbox by\tabw % advance to next multiple of \tabw
-+ \wd\verbbox=\dimen\verbbox \box\verbbox \starttabbox
- }%
- }
-- \catcode`\'=\active
-- \gdef\rquoteexpand{\catcode\rquoteChar=\active \def'{\codequoteright}}%
-- %
-- \catcode`\`=\active
-- \gdef\lquoteexpand{\catcode\lquoteChar=\active \def`{\codequoteleft}}%
-- %
-- \gdef\quoteexpand{\rquoteexpand \lquoteexpand}%
- \endgroup
-
- % start the verbatim environment.
- \def\setupverbatim{%
- \let\nonarrowing = t%
- \nonfillstart
-- % Easiest (and conventionally used) font for verbatim
-- \tt
-- \def\par{\leavevmode\egroup\box0\endgraf}%
-- \catcode`\`=\active
-+ \tt % easiest (and conventionally used) font for verbatim
-+ % The \leavevmode here is for blank lines. Otherwise, we would
-+ % never \starttabox and the \egroup would end verbatim mode.
-+ \def\par{\leavevmode\egroup\box\verbbox\endgraf}%
- \tabexpand
-- \quoteexpand
-+ \setupmarkupstyle{verbatim}%
- % Respect line breaks,
- % print special symbols as themselves, and
-- % make each space count
-- % must do in this order:
-+ % make each space count.
-+ % Must do in this order:
- \obeylines \uncatcodespecials \sepspaces
- \everypar{\starttabbox}%
- }
-@@ -6144,6 +6756,8 @@ end
- {%
- \makevalueexpandable
- \setupverbatim
-+ \indexnofonts % Allow `@@' and other weird things in file names.
-+ \wlog{texinfo.tex: doing @verbatiminclude of #1^^J}%
- \input #1
- \afterenvbreak
- }%
-@@ -6193,7 +6807,7 @@ end
- % commands also insert a nobreak penalty, and we don't want to allow
- % a break between a section heading and a defun.
- %
-- % As a minor refinement, we avoid "club" headers by signalling
-+ % As a further refinement, we avoid "club" headers by signalling
- % with penalty of 10003 after the very first @deffn in the
- % sequence (see above), and penalty of 10002 after any following
- % @def command.
-@@ -6230,7 +6844,7 @@ end
- #1#2 \endheader
- % common ending:
- \interlinepenalty = 10000
-- \advance\rightskip by 0pt plus 1fil
-+ \advance\rightskip by 0pt plus 1fil\relax
- \endgraf
- \nobreak\vskip -\parskip
- \penalty\defunpenalty % signal to \startdefun and \dodefunx
-@@ -6243,7 +6857,7 @@ end
- \def\Edefun{\endgraf\medbreak}
-
- % \makedefun{deffn} creates \deffn, \deffnx and \Edeffn;
--% the only thing remainnig is to define \deffnheader.
-+% the only thing remaining is to define \deffnheader.
- %
- \def\makedefun#1{%
- \expandafter\let\csname E#1\endcsname = \Edefun
-@@ -6260,13 +6874,36 @@ end
- \def\domakedefun#1#2#3{%
- \envdef#1{%
- \startdefun
-+ \doingtypefnfalse % distinguish typed functions from all else
- \parseargusing\activeparens{\printdefunline#3}%
- }%
- \def#2{\dodefunx#1}%
- \def#3%
- }
-
--%%% Untyped functions:
-+\newif\ifdoingtypefn % doing typed function?
-+\newif\ifrettypeownline % typeset return type on its own line?
-+
-+% @deftypefnnewline on|off says whether the return type of typed functions
-+% are printed on their own line. This affects @deftypefn, @deftypefun,
-+% @deftypeop, and @deftypemethod.
-+%
-+\parseargdef\deftypefnnewline{%
-+ \def\temp{#1}%
-+ \ifx\temp\onword
-+ \expandafter\let\csname SETtxideftypefnnl\endcsname
-+ = \empty
-+ \else\ifx\temp\offword
-+ \expandafter\let\csname SETtxideftypefnnl\endcsname
-+ = \relax
-+ \else
-+ \errhelp = \EMsimple
-+ \errmessage{Unknown @txideftypefnnl value `\temp',
-+ must be on|off}%
-+ \fi\fi
-+}
-+
-+% Untyped functions:
-
- % @deffn category name args
- \makedefun{deffn}{\deffngeneral{}}
-@@ -6285,7 +6922,7 @@ end
- \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}%
- }
-
--%%% Typed functions:
-+% Typed functions:
-
- % @deftypefn category type name args
- \makedefun{deftypefn}{\deftypefngeneral{}}
-@@ -6300,10 +6937,11 @@ end
- %
- \def\deftypefngeneral#1#2 #3 #4 #5\endheader{%
- \dosubind{fn}{\code{#4}}{#1}%
-+ \doingtypefntrue
- \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
- }
-
--%%% Typed variables:
-+% Typed variables:
-
- % @deftypevr category type var args
- \makedefun{deftypevr}{\deftypecvgeneral{}}
-@@ -6321,7 +6959,7 @@ end
- \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
- }
-
--%%% Untyped variables:
-+% Untyped variables:
-
- % @defvr category var args
- \makedefun{defvr}#1 {\deftypevrheader{#1} {} }
-@@ -6332,7 +6970,8 @@ end
- % \defcvof {category of}class var args
- \def\defcvof#1#2 {\deftypecvof{#1}#2 {} }
-
--%%% Type:
-+% Types:
-+
- % @deftp category name args
- \makedefun{deftp}#1 #2 #3\endheader{%
- \doind{tp}{\code{#2}}%
-@@ -6360,25 +6999,49 @@ end
- % We are followed by (but not passed) the arguments, if any.
- %
- \def\defname#1#2#3{%
-+ \par
- % Get the values of \leftskip and \rightskip as they were outside the @def...
- \advance\leftskip by -\defbodyindent
- %
-- % How we'll format the type name. Putting it in brackets helps
-+ % Determine if we are typesetting the return type of a typed function
-+ % on a line by itself.
-+ \rettypeownlinefalse
-+ \ifdoingtypefn % doing a typed function specifically?
-+ % then check user option for putting return type on its own line:
-+ \expandafter\ifx\csname SETtxideftypefnnl\endcsname\relax \else
-+ \rettypeownlinetrue
-+ \fi
-+ \fi
-+ %
-+ % How we'll format the category name. Putting it in brackets helps
- % distinguish it from the body text that may end up on the next line
- % just below it.
- \def\temp{#1}%
- \setbox0=\hbox{\kern\deflastargmargin \ifx\temp\empty\else [\rm\temp]\fi}
- %
-- % Figure out line sizes for the paragraph shape.
-+ % Figure out line sizes for the paragraph shape. We'll always have at
-+ % least two.
-+ \tempnum = 2
-+ %
- % The first line needs space for \box0; but if \rightskip is nonzero,
- % we need only space for the part of \box0 which exceeds it:
- \dimen0=\hsize \advance\dimen0 by -\wd0 \advance\dimen0 by \rightskip
-+ %
-+ % If doing a return type on its own line, we'll have another line.
-+ \ifrettypeownline
-+ \advance\tempnum by 1
-+ \def\maybeshapeline{0in \hsize}%
-+ \else
-+ \def\maybeshapeline{}%
-+ \fi
-+ %
- % The continuations:
- \dimen2=\hsize \advance\dimen2 by -\defargsindent
-- % (plain.tex says that \dimen1 should be used only as global.)
-- \parshape 2 0in \dimen0 \defargsindent \dimen2
- %
-- % Put the type name to the right margin.
-+ % The final paragraph shape:
-+ \parshape \tempnum 0in \dimen0 \maybeshapeline \defargsindent \dimen2
-+ %
-+ % Put the category name at the right margin.
- \noindent
- \hbox to 0pt{%
- \hfil\box0 \kern-\hsize
-@@ -6400,8 +7063,16 @@ end
- % . this still does not fix the ?` and !` ligatures, but so far no
- % one has made identifiers using them :).
- \df \tt
-- \def\temp{#2}% return value type
-- \ifx\temp\empty\else \tclose{\temp} \fi
-+ \def\temp{#2}% text of the return type
-+ \ifx\temp\empty\else
-+ \tclose{\temp}% typeset the return type
-+ \ifrettypeownline
-+ % put return type on its own line; prohibit line break following:
-+ \hfil\vadjust{\nobreak}\break
-+ \else
-+ \space % type on same line, so just followed by a space
-+ \fi
-+ \fi % no return type
- #3% output function name
- }%
- {\rm\enskip}% hskip 0.5 em of \tenrm
-@@ -6421,8 +7092,11 @@ end
- \df \sl \hyphenchar\font=0
- %
- % On the other hand, if an argument has two dashes (for instance), we
-- % want a way to get ttsl. Let's try @var for that.
-- \let\var=\ttslanted
-+ % want a way to get ttsl. We used to recommend @var for that, so
-+ % leave the code in, but it's strange for @var to lead to typewriter.
-+ % Nowadays we recommend @code, since the difference between a ttsl hyphen
-+ % and a tt hyphen is pretty tiny. @code also disables ?` !`.
-+ \def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}%
- #1%
- \sl\hyphenchar\font=45
- }
-@@ -6519,7 +7193,7 @@ end
-
- % To do this right we need a feature of e-TeX, \scantokens,
- % which we arrange to emulate with a temporary file in ordinary TeX.
--\ifx\eTeXversion\undefined
-+\ifx\eTeXversion\thisisundefined
- \newwrite\macscribble
- \def\scantokens#1{%
- \toks0={#1}%
-@@ -6530,25 +7204,30 @@ end
- }
- \fi
-
--\def\scanmacro#1{%
-- \begingroup
-- \newlinechar`\^^M
-- \let\xeatspaces\eatspaces
-- % Undo catcode changes of \startcontents and \doprintindex
-- % When called from @insertcopying or (short)caption, we need active
-- % backslash to get it printed correctly. Previously, we had
-- % \catcode`\\=\other instead. We'll see whether a problem appears
-- % with macro expansion. --kasal, 19aug04
-- \catcode`\@=0 \catcode`\\=\active \escapechar=`\@
-- % ... and \example
-- \spaceisspace
-- %
-- % Append \endinput to make sure that TeX does not see the ending newline.
-- % I've verified that it is necessary both for e-TeX and for ordinary TeX
-- % --kasal, 29nov03
-- \scantokens{#1\endinput}%
-- \endgroup
--}
-+\def\scanmacro#1{\begingroup
-+ \newlinechar`\^^M
-+ \let\xeatspaces\eatspaces
-+ %
-+ % Undo catcode changes of \startcontents and \doprintindex
-+ % When called from @insertcopying or (short)caption, we need active
-+ % backslash to get it printed correctly. Previously, we had
-+ % \catcode`\\=\other instead. We'll see whether a problem appears
-+ % with macro expansion. --kasal, 19aug04
-+ \catcode`\@=0 \catcode`\\=\active \escapechar=`\@
-+ %
-+ % ... and for \example:
-+ \spaceisspace
-+ %
-+ % The \empty here causes a following catcode 5 newline to be eaten as
-+ % part of reading whitespace after a control sequence. It does not
-+ % eat a catcode 13 newline. There's no good way to handle the two
-+ % cases (untried: maybe e-TeX's \everyeof could help, though plain TeX
-+ % would then have different behavior). See the Macro Details node in
-+ % the manual for the workaround we recommend for macros and
-+ % line-oriented commands.
-+ %
-+ \scantokens{#1\empty}%
-+\endgroup}
-
- \def\scanexp#1{%
- \edef\temp{\noexpand\scanmacro{#1}}%
-@@ -6576,7 +7255,7 @@ end
- % This does \let #1 = #2, with \csnames; that is,
- % \let \csname#1\endcsname = \csname#2\endcsname
- % (except of course we have to play expansion games).
--%
-+%
- \def\cslet#1#2{%
- \expandafter\let
- \csname#1\expandafter\endcsname
-@@ -6602,17 +7281,18 @@ end
-
- % Macro bodies are absorbed as an argument in a context where
- % all characters are catcode 10, 11 or 12, except \ which is active
--% (as in normal texinfo). It is necessary to change the definition of \.
--
-+% (as in normal texinfo). It is necessary to change the definition of \
-+% to recognize macro arguments; this is the job of \mbodybackslash.
-+%
- % Non-ASCII encodings make 8-bit characters active, so un-activate
- % them to avoid their expansion. Must do this non-globally, to
- % confine the change to the current group.
--
-+%
- % It's necessary to have hard CRs when the macro is executed. This is
--% done by making ^^M (\endlinechar) catcode 12 when reading the macro
-+% done by making ^^M (\endlinechar) catcode 12 when reading the macro
- % body, and then making it the \newlinechar in \scanmacro.
--
--\def\scanctxt{%
-+%
-+\def\scanctxt{% used as subroutine
- \catcode`\"=\other
- \catcode`\+=\other
- \catcode`\<=\other
-@@ -6625,13 +7305,13 @@ end
- \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi
- }
-
--\def\scanargctxt{%
-+\def\scanargctxt{% used for copying and captions, not macros.
- \scanctxt
- \catcode`\\=\other
- \catcode`\^^M=\other
- }
-
--\def\macrobodyctxt{%
-+\def\macrobodyctxt{% used for @macro definitions
- \scanctxt
- \catcode`\{=\other
- \catcode`\}=\other
-@@ -6639,32 +7319,56 @@ end
- \usembodybackslash
- }
-
--\def\macroargctxt{%
-+\def\macroargctxt{% used when scanning invocations
- \scanctxt
-- \catcode`\\=\other
-+ \catcode`\\=0
- }
-+% why catcode 0 for \ in the above? To recognize \\ \{ \} as "escapes"
-+% for the single characters \ { }. Thus, we end up with the "commands"
-+% that would be written @\ @{ @} in a Texinfo document.
-+%
-+% We already have @{ and @}. For @\, we define it here, and only for
-+% this purpose, to produce a typewriter backslash (so, the @\ that we
-+% define for @math can't be used with @macro calls):
-+%
-+\def\\{\normalbackslash}%
-+%
-+% We would like to do this for \, too, since that is what makeinfo does.
-+% But it is not possible, because Texinfo already has a command @, for a
-+% cedilla accent. Documents must use @comma{} instead.
-+%
-+% \anythingelse will almost certainly be an error of some kind.
-+
-
- % \mbodybackslash is the definition of \ in @macro bodies.
- % It maps \foo\ => \csname macarg.foo\endcsname => #N
- % where N is the macro parameter number.
- % We define \csname macarg.\endcsname to be \realbackslash, so
- % \\ in macro replacement text gets you a backslash.
--
-+%
- {\catcode`@=0 @catcode`@\=@active
- @gdef@usembodybackslash{@let\=@mbodybackslash}
- @gdef@mbodybackslash#1\{@csname macarg.#1@endcsname}
- }
- \expandafter\def\csname macarg.\endcsname{\realbackslash}
-
-+\def\margbackslash#1{\char`\#1 }
-+
- \def\macro{\recursivefalse\parsearg\macroxxx}
- \def\rmacro{\recursivetrue\parsearg\macroxxx}
-
- \def\macroxxx#1{%
-- \getargs{#1}% now \macname is the macname and \argl the arglist
-+ \getargs{#1}% now \macname is the macname and \argl the arglist
- \ifx\argl\empty % no arguments
-- \paramno=0%
-+ \paramno=0\relax
- \else
- \expandafter\parsemargdef \argl;%
-+ \if\paramno>256\relax
-+ \ifx\eTeXversion\thisisundefined
-+ \errhelp = \EMsimple
-+ \errmessage{You need eTeX to compile a file with macros with more than 256 arguments}
-+ \fi
-+ \fi
- \fi
- \if1\csname ismacro.\the\macname\endcsname
- \message{Warning: redefining \the\macname}%
-@@ -6711,46 +7415,269 @@ end
- % an opening brace, and that opening brace is not consumed.
- \def\getargs#1{\getargsxxx#1{}}
- \def\getargsxxx#1#{\getmacname #1 \relax\getmacargs}
--\def\getmacname #1 #2\relax{\macname={#1}}
-+\def\getmacname#1 #2\relax{\macname={#1}}
- \def\getmacargs#1{\def\argl{#1}}
-
-+% For macro processing make @ a letter so that we can make Texinfo private macro names.
-+\edef\texiatcatcode{\the\catcode`\@}
-+\catcode `@=11\relax
-+
- % Parse the optional {params} list. Set up \paramno and \paramlist
--% so \defmacro knows what to do. Define \macarg.blah for each blah
--% in the params list, to be ##N where N is the position in that list.
-+% so \defmacro knows what to do. Define \macarg.BLAH for each BLAH
-+% in the params list to some hook where the argument si to be expanded. If
-+% there are less than 10 arguments that hook is to be replaced by ##N where N
-+% is the position in that list, that is to say the macro arguments are to be
-+% defined `a la TeX in the macro body.
-+%
- % That gets used by \mbodybackslash (above).
--
-+%
- % We need to get `macro parameter char #' into several definitions.
--% The technique used is stolen from LaTeX: let \hash be something
-+% The technique used is stolen from LaTeX: let \hash be something
- % unexpandable, insert that wherever you need a #, and then redefine
- % it to # just before using the token list produced.
- %
- % The same technique is used to protect \eatspaces till just before
- % the macro is used.
--
--\def\parsemargdef#1;{\paramno=0\def\paramlist{}%
-- \let\hash\relax\let\xeatspaces\relax\parsemargdefxxx#1,;,}
-+%
-+% If there are 10 or more arguments, a different technique is used, where the
-+% hook remains in the body, and when macro is to be expanded the body is
-+% processed again to replace the arguments.
-+%
-+% In that case, the hook is \the\toks N-1, and we simply set \toks N-1 to the
-+% argument N value and then \edef the body (nothing else will expand because of
-+% the catcode regime underwhich the body was input).
-+%
-+% If you compile with TeX (not eTeX), and you have macros with 10 or more
-+% arguments, you need that no macro has more than 256 arguments, otherwise an
-+% error is produced.
-+\def\parsemargdef#1;{%
-+ \paramno=0\def\paramlist{}%
-+ \let\hash\relax
-+ \let\xeatspaces\relax
-+ \parsemargdefxxx#1,;,%
-+ % In case that there are 10 or more arguments we parse again the arguments
-+ % list to set new definitions for the \macarg.BLAH macros corresponding to
-+ % each BLAH argument. It was anyhow needed to parse already once this list
-+ % in order to count the arguments, and as macros with at most 9 arguments
-+ % are by far more frequent than macro with 10 or more arguments, defining
-+ % twice the \macarg.BLAH macros does not cost too much processing power.
-+ \ifnum\paramno<10\relax\else
-+ \paramno0\relax
-+ \parsemmanyargdef@@#1,;,% 10 or more arguments
-+ \fi
-+}
- \def\parsemargdefxxx#1,{%
- \if#1;\let\next=\relax
- \else \let\next=\parsemargdefxxx
-- \advance\paramno by 1%
-+ \advance\paramno by 1
- \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
- {\xeatspaces{\hash\the\paramno}}%
- \edef\paramlist{\paramlist\hash\the\paramno,}%
- \fi\next}
-
-+\def\parsemmanyargdef@@#1,{%
-+ \if#1;\let\next=\relax
-+ \else
-+ \let\next=\parsemmanyargdef@@
-+ \edef\tempb{\eatspaces{#1}}%
-+ \expandafter\def\expandafter\tempa
-+ \expandafter{\csname macarg.\tempb\endcsname}%
-+ % Note that we need some extra \noexpand\noexpand, this is because we
-+ % don't want \the to be expanded in the \parsermacbody as it uses an
-+ % \xdef .
-+ \expandafter\edef\tempa
-+ {\noexpand\noexpand\noexpand\the\toks\the\paramno}%
-+ \advance\paramno by 1\relax
-+ \fi\next}
-+
- % These two commands read recursive and nonrecursive macro bodies.
- % (They're different since rec and nonrec macros end differently.)
-+%
-
-+\catcode `\@\texiatcatcode
- \long\def\parsemacbody#1@end macro%
- {\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
- \long\def\parsermacbody#1@end rmacro%
- {\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
-+\catcode `\@=11\relax
-+
-+\let\endargs@\relax
-+\let\nil@\relax
-+\def\nilm@{\nil@}%
-+\long\def\nillm@{\nil@}%
-+
-+% This macro is expanded during the Texinfo macro expansion, not during its
-+% definition. It gets all the arguments values and assigns them to macros
-+% macarg.ARGNAME
-+%
-+% #1 is the macro name
-+% #2 is the list of argument names
-+% #3 is the list of argument values
-+\def\getargvals@#1#2#3{%
-+ \def\macargdeflist@{}%
-+ \def\saveparamlist@{#2}% Need to keep a copy for parameter expansion.
-+ \def\paramlist{#2,\nil@}%
-+ \def\macroname{#1}%
-+ \begingroup
-+ \macroargctxt
-+ \def\argvaluelist{#3,\nil@}%
-+ \def\@tempa{#3}%
-+ \ifx\@tempa\empty
-+ \setemptyargvalues@
-+ \else
-+ \getargvals@@
-+ \fi
-+}
-+
-+%
-+\def\getargvals@@{%
-+ \ifx\paramlist\nilm@
-+ % Some sanity check needed here that \argvaluelist is also empty.
-+ \ifx\argvaluelist\nillm@
-+ \else
-+ \errhelp = \EMsimple
-+ \errmessage{Too many arguments in macro `\macroname'!}%
-+ \fi
-+ \let\next\macargexpandinbody@
-+ \else
-+ \ifx\argvaluelist\nillm@
-+ % No more arguments values passed to macro. Set remaining named-arg
-+ % macros to empty.
-+ \let\next\setemptyargvalues@
-+ \else
-+ % pop current arg name into \@tempb
-+ \def\@tempa##1{\pop@{\@tempb}{\paramlist}##1\endargs@}%
-+ \expandafter\@tempa\expandafter{\paramlist}%
-+ % pop current argument value into \@tempc
-+ \def\@tempa##1{\longpop@{\@tempc}{\argvaluelist}##1\endargs@}%
-+ \expandafter\@tempa\expandafter{\argvaluelist}%
-+ % Here \@tempb is the current arg name and \@tempc is the current arg value.
-+ % First place the new argument macro definition into \@tempd
-+ \expandafter\macname\expandafter{\@tempc}%
-+ \expandafter\let\csname macarg.\@tempb\endcsname\relax
-+ \expandafter\def\expandafter\@tempe\expandafter{%
-+ \csname macarg.\@tempb\endcsname}%
-+ \edef\@tempd{\long\def\@tempe{\the\macname}}%
-+ \push@\@tempd\macargdeflist@
-+ \let\next\getargvals@@
-+ \fi
-+ \fi
-+ \next
-+}
-+
-+\def\push@#1#2{%
-+ \expandafter\expandafter\expandafter\def
-+ \expandafter\expandafter\expandafter#2%
-+ \expandafter\expandafter\expandafter{%
-+ \expandafter#1#2}%
-+}
-+
-+% Replace arguments by their values in the macro body, and place the result
-+% in macro \@tempa
-+\def\macvalstoargs@{%
-+ % To do this we use the property that token registers that are \the'ed
-+ % within an \edef expand only once. So we are going to place all argument
-+ % values into respective token registers.
-+ %
-+ % First we save the token context, and initialize argument numbering.
-+ \begingroup
-+ \paramno0\relax
-+ % Then, for each argument number #N, we place the corresponding argument
-+ % value into a new token list register \toks#N
-+ \expandafter\putargsintokens@\saveparamlist@,;,%
-+ % Then, we expand the body so that argument are replaced by their
-+ % values. The trick for values not to be expanded themselves is that they
-+ % are within tokens and that tokens expand only once in an \edef .
-+ \edef\@tempc{\csname mac.\macroname .body\endcsname}%
-+ % Now we restore the token stack pointer to free the token list registers
-+ % which we have used, but we make sure that expanded body is saved after
-+ % group.
-+ \expandafter
-+ \endgroup
-+ \expandafter\def\expandafter\@tempa\expandafter{\@tempc}%
-+ }
-+
-+\def\macargexpandinbody@{%
-+ %% Define the named-macro outside of this group and then close this group.
-+ \expandafter
-+ \endgroup
-+ \macargdeflist@
-+ % First the replace in body the macro arguments by their values, the result
-+ % is in \@tempa .
-+ \macvalstoargs@
-+ % Then we point at the \norecurse or \gobble (for recursive) macro value
-+ % with \@tempb .
-+ \expandafter\let\expandafter\@tempb\csname mac.\macroname .recurse\endcsname
-+ % Depending on whether it is recursive or not, we need some tailing
-+ % \egroup .
-+ \ifx\@tempb\gobble
-+ \let\@tempc\relax
-+ \else
-+ \let\@tempc\egroup
-+ \fi
-+ % And now we do the real job:
-+ \edef\@tempd{\noexpand\@tempb{\macroname}\noexpand\scanmacro{\@tempa}\@tempc}%
-+ \@tempd
-+}
-+
-+\def\putargsintokens@#1,{%
-+ \if#1;\let\next\relax
-+ \else
-+ \let\next\putargsintokens@
-+ % First we allocate the new token list register, and give it a temporary
-+ % alias \@tempb .
-+ \toksdef\@tempb\the\paramno
-+ % Then we place the argument value into that token list register.
-+ \expandafter\let\expandafter\@tempa\csname macarg.#1\endcsname
-+ \expandafter\@tempb\expandafter{\@tempa}%
-+ \advance\paramno by 1\relax
-+ \fi
-+ \next
-+}
-+
-+% Save the token stack pointer into macro #1
-+\def\texisavetoksstackpoint#1{\edef#1{\the\@cclvi}}
-+% Restore the token stack pointer from number in macro #1
-+\def\texirestoretoksstackpoint#1{\expandafter\mathchardef\expandafter\@cclvi#1\relax}
-+% newtoks that can be used non \outer .
-+\def\texinonouternewtoks{\alloc@ 5\toks \toksdef \@cclvi}
-+
-+% Tailing missing arguments are set to empty
-+\def\setemptyargvalues@{%
-+ \ifx\paramlist\nilm@
-+ \let\next\macargexpandinbody@
-+ \else
-+ \expandafter\setemptyargvaluesparser@\paramlist\endargs@
-+ \let\next\setemptyargvalues@
-+ \fi
-+ \next
-+}
-+
-+\def\setemptyargvaluesparser@#1,#2\endargs@{%
-+ \expandafter\def\expandafter\@tempa\expandafter{%
-+ \expandafter\def\csname macarg.#1\endcsname{}}%
-+ \push@\@tempa\macargdeflist@
-+ \def\paramlist{#2}%
-+}
-+
-+% #1 is the element target macro
-+% #2 is the list macro
-+% #3,#4\endargs@ is the list value
-+\def\pop@#1#2#3,#4\endargs@{%
-+ \def#1{#3}%
-+ \def#2{#4}%
-+}
-+\long\def\longpop@#1#2#3,#4\endargs@{%
-+ \long\def#1{#3}%
-+ \long\def#2{#4}%
-+}
-
--% This defines the macro itself. There are six cases: recursive and
--% nonrecursive macros of zero, one, and many arguments.
-+% This defines a Texinfo @macro. There are eight cases: recursive and
-+% nonrecursive macros of zero, one, up to nine, and many arguments.
- % Much magic with \expandafter here.
- % \xdef is used so that macro definitions will survive the file
- % they're defined in; @include reads the file inside a group.
-+%
- \def\defmacro{%
- \let\hash=##% convert placeholders to macro parameter chars
- \ifrecursive
-@@ -6765,17 +7692,25 @@ end
- \expandafter\noexpand\csname\the\macname xxx\endcsname}%
- \expandafter\xdef\csname\the\macname xxx\endcsname##1{%
- \egroup\noexpand\scanmacro{\temp}}%
-- \else % many
-- \expandafter\xdef\csname\the\macname\endcsname{%
-- \bgroup\noexpand\macroargctxt
-- \noexpand\csname\the\macname xx\endcsname}%
-- \expandafter\xdef\csname\the\macname xx\endcsname##1{%
-- \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
-- \expandafter\expandafter
-- \expandafter\xdef
-- \expandafter\expandafter
-- \csname\the\macname xxx\endcsname
-- \paramlist{\egroup\noexpand\scanmacro{\temp}}%
-+ \else
-+ \ifnum\paramno<10\relax % at most 9
-+ \expandafter\xdef\csname\the\macname\endcsname{%
-+ \bgroup\noexpand\macroargctxt
-+ \noexpand\csname\the\macname xx\endcsname}%
-+ \expandafter\xdef\csname\the\macname xx\endcsname##1{%
-+ \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
-+ \expandafter\expandafter
-+ \expandafter\xdef
-+ \expandafter\expandafter
-+ \csname\the\macname xxx\endcsname
-+ \paramlist{\egroup\noexpand\scanmacro{\temp}}%
-+ \else % 10 or more
-+ \expandafter\xdef\csname\the\macname\endcsname{%
-+ \noexpand\getargvals@{\the\macname}{\argl}%
-+ }%
-+ \global\expandafter\let\csname mac.\the\macname .body\endcsname\temp
-+ \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\gobble
-+ \fi
- \fi
- \else
- \ifcase\paramno
-@@ -6792,29 +7727,40 @@ end
- \egroup
- \noexpand\norecurse{\the\macname}%
- \noexpand\scanmacro{\temp}\egroup}%
-- \else % many
-- \expandafter\xdef\csname\the\macname\endcsname{%
-- \bgroup\noexpand\macroargctxt
-- \expandafter\noexpand\csname\the\macname xx\endcsname}%
-- \expandafter\xdef\csname\the\macname xx\endcsname##1{%
-- \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
-- \expandafter\expandafter
-- \expandafter\xdef
-- \expandafter\expandafter
-- \csname\the\macname xxx\endcsname
-- \paramlist{%
-- \egroup
-- \noexpand\norecurse{\the\macname}%
-- \noexpand\scanmacro{\temp}\egroup}%
-+ \else % at most 9
-+ \ifnum\paramno<10\relax
-+ \expandafter\xdef\csname\the\macname\endcsname{%
-+ \bgroup\noexpand\macroargctxt
-+ \expandafter\noexpand\csname\the\macname xx\endcsname}%
-+ \expandafter\xdef\csname\the\macname xx\endcsname##1{%
-+ \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
-+ \expandafter\expandafter
-+ \expandafter\xdef
-+ \expandafter\expandafter
-+ \csname\the\macname xxx\endcsname
-+ \paramlist{%
-+ \egroup
-+ \noexpand\norecurse{\the\macname}%
-+ \noexpand\scanmacro{\temp}\egroup}%
-+ \else % 10 or more:
-+ \expandafter\xdef\csname\the\macname\endcsname{%
-+ \noexpand\getargvals@{\the\macname}{\argl}%
-+ }%
-+ \global\expandafter\let\csname mac.\the\macname .body\endcsname\temp
-+ \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\norecurse
-+ \fi
- \fi
- \fi}
-
-+\catcode `\@\texiatcatcode\relax
-+
- \def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}}
-
- % \braceorline decides whether the next nonwhitespace character is a
- % {. If so it reads up to the closing }, if not, it reads the whole
- % line. Whatever was read is then fed to the next control sequence
--% as an argument (by \parsebrace or \parsearg)
-+% as an argument (by \parsebrace or \parsearg).
-+%
- \def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
- \def\braceorlinexxx{%
- \ifx\nchar\bgroup\else
-@@ -6824,7 +7770,8 @@ end
-
- % @alias.
- % We need some trickery to remove the optional spaces around the equal
--% sign. Just make them active and then expand them all to nothing.
-+% sign. Make them active and then expand them all to nothing.
-+%
- \def\alias{\parseargusing\obeyspaces\aliasxxx}
- \def\aliasxxx #1{\aliasyyy#1\relax}
- \def\aliasyyy #1=#2\relax{%
-@@ -6845,7 +7792,8 @@ end
-
- % @inforef is relatively simple.
- \def\inforef #1{\inforefzzz #1,,,,**}
--\def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
-+\def\inforefzzz #1,#2,#3,#4**{%
-+ \putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
- node \samp{\ignorespaces#1{}}}
-
- % @node's only job in TeX is to define \lastnode, which is used in
-@@ -6906,11 +7854,32 @@ end
- \toks0 = \expandafter{\lastsection}%
- \immediate \writexrdef{title}{\the\toks0 }%
- \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc.
-- \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, during \shipout
-+ \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, at \shipout
- }%
- \fi
- }
-
-+% @xrefautosectiontitle on|off says whether @section(ing) names are used
-+% automatically in xrefs, if the third arg is not explicitly specified.
-+% This was provided as a "secret" @set xref-automatic-section-title
-+% variable, now it's official.
-+%
-+\parseargdef\xrefautomaticsectiontitle{%
-+ \def\temp{#1}%
-+ \ifx\temp\onword
-+ \expandafter\let\csname SETxref-automatic-section-title\endcsname
-+ = \empty
-+ \else\ifx\temp\offword
-+ \expandafter\let\csname SETxref-automatic-section-title\endcsname
-+ = \relax
-+ \else
-+ \errhelp = \EMsimple
-+ \errmessage{Unknown @xrefautomaticsectiontitle value `\temp',
-+ must be on|off}%
-+ \fi\fi
-+}
-+
-+%
- % @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is
- % the node name, #2 the name of the Info cross-reference, #3 the printed
- % node name, #4 the name of the Info file, #5 the name of the printed
-@@ -6919,26 +7888,41 @@ end
- \def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]}
- \def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
- \def\ref#1{\xrefX[#1,,,,,,,]}
-+%
-+\newbox\toprefbox
-+\newbox\printedrefnamebox
-+\newbox\infofilenamebox
-+\newbox\printedmanualbox
-+%
- \def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
- \unsepspaces
-- \def\printedmanual{\ignorespaces #5}%
-+ %
-+ % Get args without leading/trailing spaces.
- \def\printedrefname{\ignorespaces #3}%
-- \setbox1=\hbox{\printedmanual\unskip}%
-- \setbox0=\hbox{\printedrefname\unskip}%
-- \ifdim \wd0 = 0pt
-+ \setbox\printedrefnamebox = \hbox{\printedrefname\unskip}%
-+ %
-+ \def\infofilename{\ignorespaces #4}%
-+ \setbox\infofilenamebox = \hbox{\infofilename\unskip}%
-+ %
-+ \def\printedmanual{\ignorespaces #5}%
-+ \setbox\printedmanualbox = \hbox{\printedmanual\unskip}%
-+ %
-+ % If the printed reference name (arg #3) was not explicitly given in
-+ % the @xref, figure out what we want to use.
-+ \ifdim \wd\printedrefnamebox = 0pt
- % No printed node name was explicitly given.
-- \expandafter\ifx\csname SETxref-automatic-section-title\endcsname\relax
-- % Use the node name inside the square brackets.
-+ \expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax
-+ % Not auto section-title: use node name inside the square brackets.
- \def\printedrefname{\ignorespaces #1}%
- \else
-- % Use the actual chapter/section title appear inside
-- % the square brackets. Use the real section title if we have it.
-- \ifdim \wd1 > 0pt
-- % It is in another manual, so we don't have it.
-+ % Auto section-title: use chapter/section title inside
-+ % the square brackets if we have it.
-+ \ifdim \wd\printedmanualbox > 0pt
-+ % It is in another manual, so we don't have it; use node name.
- \def\printedrefname{\ignorespaces #1}%
- \else
- \ifhavexrefs
-- % We know the real title if we have the xref values.
-+ % We (should) know the real title if we have the xref values.
- \def\printedrefname{\refx{#1-title}{}}%
- \else
- % Otherwise just copy the Info node name.
-@@ -6950,20 +7934,29 @@ end
- %
- % Make link in pdf output.
- \ifpdf
-- \leavevmode
-- \getfilename{#4}%
- {\indexnofonts
- \turnoffactive
-- % See comments at \activebackslashdouble.
-- {\activebackslashdouble \xdef\pdfxrefdest{#1}%
-- \backslashparens\pdfxrefdest}%
-+ \makevalueexpandable
-+ % This expands tokens, so do it after making catcode changes, so _
-+ % etc. don't get their TeX definitions. This ignores all spaces in
-+ % #4, including (wrongly) those in the middle of the filename.
-+ \getfilename{#4}%
-+ %
-+ % This (wrongly) does not take account of leading or trailing
-+ % spaces in #1, which should be ignored.
-+ \edef\pdfxrefdest{#1}%
-+ \ifx\pdfxrefdest\empty
-+ \def\pdfxrefdest{Top}% no empty targets
-+ \else
-+ \txiescapepdf\pdfxrefdest % escape PDF special chars
-+ \fi
- %
-+ \leavevmode
-+ \startlink attr{/Border [0 0 0]}%
- \ifnum\filenamelength>0
-- \startlink attr{/Border [0 0 0]}%
-- goto file{\the\filename.pdf} name{\pdfxrefdest}%
-+ goto file{\the\filename.pdf} name{\pdfxrefdest}%
- \else
-- \startlink attr{/Border [0 0 0]}%
-- goto name{\pdfmkpgn{\pdfxrefdest}}%
-+ goto name{\pdfmkpgn{\pdfxrefdest}}%
- \fi
- }%
- \setcolor{\linkcolor}%
-@@ -6983,29 +7976,42 @@ end
- \iffloat\Xthisreftitle
- % If the user specified the print name (third arg) to the ref,
- % print it instead of our usual "Figure 1.2".
-- \ifdim\wd0 = 0pt
-+ \ifdim\wd\printedrefnamebox = 0pt
- \refx{#1-snt}{}%
- \else
- \printedrefname
- \fi
- %
-- % if the user also gave the printed manual name (fifth arg), append
-+ % If the user also gave the printed manual name (fifth arg), append
- % "in MANUALNAME".
-- \ifdim \wd1 > 0pt
-+ \ifdim \wd\printedmanualbox > 0pt
- \space \putwordin{} \cite{\printedmanual}%
- \fi
- \else
- % node/anchor (non-float) references.
-+ %
-+ % If we use \unhbox to print the node names, TeX does not insert
-+ % empty discretionaries after hyphens, which means that it will not
-+ % find a line break at a hyphen in a node names. Since some manuals
-+ % are best written with fairly long node names, containing hyphens,
-+ % this is a loss. Therefore, we give the text of the node name
-+ % again, so it is as if TeX is seeing it for the first time.
-+ %
-+ \ifdim \wd\printedmanualbox > 0pt
-+ % Cross-manual reference with a printed manual name.
-+ %
-+ \crossmanualxref{\cite{\printedmanual\unskip}}%
-+ %
-+ \else\ifdim \wd\infofilenamebox > 0pt
-+ % Cross-manual reference with only an info filename (arg 4), no
-+ % printed manual name (arg 5). This is essentially the same as
-+ % the case above; we output the filename, since we have nothing else.
-+ %
-+ \crossmanualxref{\code{\infofilename\unskip}}%
- %
-- % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
-- % insert empty discretionaries after hyphens, which means that it will
-- % not find a line break at a hyphen in a node names. Since some manuals
-- % are best written with fairly long node names, containing hyphens, this
-- % is a loss. Therefore, we give the text of the node name again, so it
-- % is as if TeX is seeing it for the first time.
-- \ifdim \wd1 > 0pt
-- \putwordSection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
- \else
-+ % Reference within this manual.
-+ %
- % _ (for example) has to be the character _ for the purposes of the
- % control sequence corresponding to the node, but it has to expand
- % into the usual \leavevmode...\vrule stuff for purposes of
-@@ -7017,7 +8023,7 @@ end
- \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
- \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
- }%
-- % output the `[mynode]' via a macro so it can be overridden.
-+ % output the `[mynode]' via the macro below so it can be overridden.
- \xrefprintnodename\printedrefname
- %
- % But we always want a comma and a space:
-@@ -7025,11 +8031,37 @@ end
- %
- % output the `page 3'.
- \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
-- \fi
-+ \fi\fi
- \fi
- \endlink
- \endgroup}
-
-+% Output a cross-manual xref to #1. Used just above (twice).
-+%
-+% Only include the text "Section ``foo'' in" if the foo is neither
-+% missing or Top. Thus, @xref{,,,foo,The Foo Manual} outputs simply
-+% "see The Foo Manual", the idea being to refer to the whole manual.
-+%
-+% But, this being TeX, we can't easily compare our node name against the
-+% string "Top" while ignoring the possible spaces before and after in
-+% the input. By adding the arbitrary 7sp below, we make it much less
-+% likely that a real node name would have the same width as "Top" (e.g.,
-+% in a monospaced font). Hopefully it will never happen in practice.
-+%
-+% For the same basic reason, we retypeset the "Top" at every
-+% reference, since the current font is indeterminate.
-+%
-+\def\crossmanualxref#1{%
-+ \setbox\toprefbox = \hbox{Top\kern7sp}%
-+ \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
-+ \ifdim \wd2 > 7sp % nonempty?
-+ \ifdim \wd2 = \wd\toprefbox \else % same as Top?
-+ \putwordSection{} ``\printedrefname'' \putwordin{}\space
-+ \fi
-+ \fi
-+ #1%
-+}
-+
- % This macro is called from \xrefX for the `[nodename]' part of xref
- % output. It's a separate macro only so it can be changed more easily,
- % since square brackets don't work well in some documents. Particularly
-@@ -7080,7 +8112,8 @@ end
- \angleleft un\-de\-fined\angleright
- \iflinks
- \ifhavexrefs
-- \message{\linenumber Undefined cross reference `#1'.}%
-+ {\toks0 = {#1}% avoid expansion of possibly-complex value
-+ \message{\linenumber Undefined cross reference `\the\toks0'.}}%
- \else
- \ifwarnedxrefs\else
- \global\warnedxrefstrue
-@@ -7244,7 +8277,7 @@ end
- % space to prevent strange expansion errors.)
- \def\supereject{\par\penalty -20000\footnoteno =0 }
-
--% @footnotestyle is meaningful for info output only.
-+% @footnotestyle is meaningful for Info output only.
- \let\footnotestyle=\comment
-
- {\catcode `\@=11
-@@ -7307,6 +8340,8 @@ end
- % expands into a box, it must come within the paragraph, lest it
- % provide a place where TeX can split the footnote.
- \footstrut
-+ %
-+ % Invoke rest of plain TeX footnote routine.
- \futurelet\next\fo@t
- }
- }%end \catcode `\@=11
-@@ -7314,7 +8349,7 @@ end
- % In case a @footnote appears in a vbox, save the footnote text and create
- % the real \insert just after the vbox finished. Otherwise, the insertion
- % would be lost.
--% Similarily, if a @footnote appears inside an alignment, save the footnote
-+% Similarly, if a @footnote appears inside an alignment, save the footnote
- % text to a box and make the \insert when a row of the table is finished.
- % And the same can be done for other insert classes. --kasal, 16nov03.
-
-@@ -7394,7 +8429,7 @@ end
- it from ftp://tug.org/tex/epsf.tex.}
- %
- \def\image#1{%
-- \ifx\epsfbox\undefined
-+ \ifx\epsfbox\thisisundefined
- \ifwarnednoepsf \else
- \errhelp = \noepsfhelp
- \errmessage{epsf.tex not found, images will be ignored}%
-@@ -7410,7 +8445,7 @@ end
- % #2 is (optional) width, #3 is (optional) height.
- % #4 is (ignored optional) html alt text.
- % #5 is (ignored optional) extension.
--% #6 is just the usual extra ignored arg for parsing this stuff.
-+% #6 is just the usual extra ignored arg for parsing stuff.
- \newif\ifimagevmode
- \def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup
- \catcode`\^^M = 5 % in case we're inside an example
-@@ -7418,15 +8453,30 @@ end
- % If the image is by itself, center it.
- \ifvmode
- \imagevmodetrue
-- \nobreak\bigskip
-+ \else \ifx\centersub\centerV
-+ % for @center @image, we need a vbox so we can have our vertical space
-+ \imagevmodetrue
-+ \vbox\bgroup % vbox has better behavior than vtop herev
-+ \fi\fi
-+ %
-+ \ifimagevmode
-+ \nobreak\medskip
- % Usually we'll have text after the image which will insert
- % \parskip glue, so insert it here too to equalize the space
- % above and below.
- \nobreak\vskip\parskip
- \nobreak
-- \line\bgroup
- \fi
- %
-+ % Leave vertical mode so that indentation from an enclosing
-+ % environment such as @quotation is respected.
-+ % However, if we're at the top level, we don't want the
-+ % normal paragraph indentation.
-+ % On the other hand, if we are in the case of @center @image, we don't
-+ % want to start a paragraph, which will create a hsize-width box and
-+ % eradicate the centering.
-+ \ifx\centersub\centerV\else \noindent \fi
-+ %
- % Output the image.
- \ifpdf
- \dopdfimage{#1}{#2}{#3}%
-@@ -7437,7 +8487,10 @@ end
- \epsfbox{#1.eps}%
- \fi
- %
-- \ifimagevmode \egroup \bigbreak \fi % space after the image
-+ \ifimagevmode
-+ \medskip % space after a standalone image
-+ \fi
-+ \ifx\centersub\centerV \egroup \fi
- \endgroup}
-
-
-@@ -7709,10 +8762,9 @@ end
-
- \message{localization,}
-
--% @documentlanguage is usually given very early, just after
--% @setfilename. If done too late, it may not override everything
--% properly. Single argument is the language (de) or locale (de_DE)
--% abbreviation. It would be nice if we could set up a hyphenation file.
-+% For single-language documents, @documentlanguage is usually given very
-+% early, just after @documentencoding. Single argument is the language
-+% (de) or locale (de_DE) abbreviation.
- %
- {
- \catcode`\_ = \active
-@@ -7725,31 +8777,60 @@ end
- \ifeof 1
- \documentlanguagetrywithoutunderscore{#1_\finish}%
- \else
-+ \globaldefs = 1 % everything in the txi-LL files needs to persist
- \input txi-#1.tex
- \fi
- \closein 1
-- \endgroup
-+ \endgroup % end raw TeX
- \endgroup}
--}
- %
- % If they passed de_DE, and txi-de_DE.tex doesn't exist,
- % try txi-de.tex.
--%
--\def\documentlanguagetrywithoutunderscore#1_#2\finish{%
-+%
-+\gdef\documentlanguagetrywithoutunderscore#1_#2\finish{%
- \openin 1 txi-#1.tex
- \ifeof 1
- \errhelp = \nolanghelp
- \errmessage{Cannot read language file txi-#1.tex}%
- \else
-+ \globaldefs = 1 % everything in the txi-LL files needs to persist
- \input txi-#1.tex
- \fi
- \closein 1
- }
-+}% end of special _ catcode
- %
- \newhelp\nolanghelp{The given language definition file cannot be found or
--is empty. Maybe you need to install it? In the current directory
--should work if nowhere else does.}
-+is empty. Maybe you need to install it? Putting it in the current
-+directory should work if nowhere else does.}
-+
-+% This macro is called from txi-??.tex files; the first argument is the
-+% \language name to set (without the "\lang@" prefix), the second and
-+% third args are \{left,right}hyphenmin.
-+%
-+% The language names to pass are determined when the format is built.
-+% See the etex.log file created at that time, e.g.,
-+% /usr/local/texlive/2008/texmf-var/web2c/pdftex/etex.log.
-+%
-+% With TeX Live 2008, etex now includes hyphenation patterns for all
-+% available languages. This means we can support hyphenation in
-+% Texinfo, at least to some extent. (This still doesn't solve the
-+% accented characters problem.)
-+%
-+\catcode`@=11
-+\def\txisetlanguage#1#2#3{%
-+ % do not set the language if the name is undefined in the current TeX.
-+ \expandafter\ifx\csname lang@#1\endcsname \relax
-+ \message{no patterns for #1}%
-+ \else
-+ \global\language = \csname lang@#1\endcsname
-+ \fi
-+ % but there is no harm in adjusting the hyphenmin values regardless.
-+ \global\lefthyphenmin = #2\relax
-+ \global\righthyphenmin = #3\relax
-+}
-
-+% Helpers for encodings.
- % Set the catcode of characters 128 through 255 to the specified number.
- %
- \def\setnonasciicharscatcode#1{%
-@@ -7790,7 +8871,7 @@ should work if nowhere else does.}
- \setnonasciicharscatcode\active
- \lattwochardefs
- %
-- \else \ifx \declaredencoding \latone
-+ \else \ifx \declaredencoding \latone
- \setnonasciicharscatcode\active
- \latonechardefs
- %
-@@ -7802,7 +8883,7 @@ should work if nowhere else does.}
- \setnonasciicharscatcode\active
- \utfeightchardefs
- %
-- \else
-+ \else
- \message{Unknown document encoding #1, ignoring.}%
- %
- \fi % utfeight
-@@ -7814,7 +8895,7 @@ should work if nowhere else does.}
-
- % A message to be logged when using a character that isn't available
- % the default font encoding (OT1).
--%
-+%
- \def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}}
-
- % Take account of \c (plain) vs. \, (Texinfo) difference.
-@@ -7827,21 +8908,21 @@ should work if nowhere else does.}
- %
- % Latin1 (ISO-8859-1) character definitions.
- \def\latonechardefs{%
-- \gdef^^a0{~}
-+ \gdef^^a0{\tie}
- \gdef^^a1{\exclamdown}
-- \gdef^^a2{\missingcharmsg{CENT SIGN}}
-+ \gdef^^a2{\missingcharmsg{CENT SIGN}}
- \gdef^^a3{{\pounds}}
- \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
- \gdef^^a5{\missingcharmsg{YEN SIGN}}
-- \gdef^^a6{\missingcharmsg{BROKEN BAR}}
-+ \gdef^^a6{\missingcharmsg{BROKEN BAR}}
- \gdef^^a7{\S}
-- \gdef^^a8{\"{}}
-- \gdef^^a9{\copyright}
-+ \gdef^^a8{\"{}}
-+ \gdef^^a9{\copyright}
- \gdef^^aa{\ordf}
-- \gdef^^ab{\missingcharmsg{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}}
-+ \gdef^^ab{\guillemetleft}
- \gdef^^ac{$\lnot$}
-- \gdef^^ad{\-}
-- \gdef^^ae{\registeredsymbol}
-+ \gdef^^ad{\-}
-+ \gdef^^ae{\registeredsymbol}
- \gdef^^af{\={}}
- %
- \gdef^^b0{\textdegree}
-@@ -7857,7 +8938,7 @@ should work if nowhere else does.}
- \gdef^^b9{$^1$}
- \gdef^^ba{\ordm}
- %
-- \gdef^^bb{\missingcharmsg{RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK}}
-+ \gdef^^bb{\guillemetright}
- \gdef^^bc{$1\over4$}
- \gdef^^bd{$1\over2$}
- \gdef^^be{$3\over4$}
-@@ -7868,7 +8949,7 @@ should work if nowhere else does.}
- \gdef^^c2{\^A}
- \gdef^^c3{\~A}
- \gdef^^c4{\"A}
-- \gdef^^c5{\ringaccent A}
-+ \gdef^^c5{\ringaccent A}
- \gdef^^c6{\AE}
- \gdef^^c7{\cedilla C}
- \gdef^^c8{\`E}
-@@ -7880,7 +8961,7 @@ should work if nowhere else does.}
- \gdef^^ce{\^I}
- \gdef^^cf{\"I}
- %
-- \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER ETH}}
-+ \gdef^^d0{\DH}
- \gdef^^d1{\~N}
- \gdef^^d2{\`O}
- \gdef^^d3{\'O}
-@@ -7894,7 +8975,7 @@ should work if nowhere else does.}
- \gdef^^db{\^U}
- \gdef^^dc{\"U}
- \gdef^^dd{\'Y}
-- \gdef^^de{\missingcharmsg{LATIN CAPITAL LETTER THORN}}
-+ \gdef^^de{\TH}
- \gdef^^df{\ss}
- %
- \gdef^^e0{\`a}
-@@ -7914,7 +8995,7 @@ should work if nowhere else does.}
- \gdef^^ee{\^{\dotless i}}
- \gdef^^ef{\"{\dotless i}}
- %
-- \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER ETH}}
-+ \gdef^^f0{\dh}
- \gdef^^f1{\~n}
- \gdef^^f2{\`o}
- \gdef^^f3{\'o}
-@@ -7928,7 +9009,7 @@ should work if nowhere else does.}
- \gdef^^fb{\^u}
- \gdef^^fc{\"u}
- \gdef^^fd{\'y}
-- \gdef^^fe{\missingcharmsg{LATIN SMALL LETTER THORN}}
-+ \gdef^^fe{\th}
- \gdef^^ff{\"y}
- }
-
-@@ -7949,8 +9030,8 @@ should work if nowhere else does.}
-
- % Latin2 (ISO-8859-2) character definitions.
- \def\lattwochardefs{%
-- \gdef^^a0{~}
-- \gdef^^a1{\missingcharmsg{LATIN CAPITAL LETTER A WITH OGONEK}}
-+ \gdef^^a0{\tie}
-+ \gdef^^a1{\ogonek{A}}
- \gdef^^a2{\u{}}
- \gdef^^a3{\L}
- \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
-@@ -7967,8 +9048,8 @@ should work if nowhere else does.}
- \gdef^^af{\dotaccent Z}
- %
- \gdef^^b0{\textdegree}
-- \gdef^^b1{\missingcharmsg{LATIN SMALL LETTER A WITH OGONEK}}
-- \gdef^^b2{\missingcharmsg{OGONEK}}
-+ \gdef^^b1{\ogonek{a}}
-+ \gdef^^b2{\ogonek{ }}
- \gdef^^b3{\l}
- \gdef^^b4{\'{}}
- \gdef^^b5{\v l}
-@@ -7993,14 +9074,14 @@ should work if nowhere else does.}
- \gdef^^c7{\cedilla C}
- \gdef^^c8{\v C}
- \gdef^^c9{\'E}
-- \gdef^^ca{\missingcharmsg{LATIN CAPITAL LETTER E WITH OGONEK}}
-+ \gdef^^ca{\ogonek{E}}
- \gdef^^cb{\"E}
- \gdef^^cc{\v E}
- \gdef^^cd{\'I}
- \gdef^^ce{\^I}
- \gdef^^cf{\v D}
- %
-- \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER D WITH STROKE}}
-+ \gdef^^d0{\DH}
- \gdef^^d1{\'N}
- \gdef^^d2{\v N}
- \gdef^^d3{\'O}
-@@ -8009,7 +9090,7 @@ should work if nowhere else does.}
- \gdef^^d6{\"O}
- \gdef^^d7{$\times$}
- \gdef^^d8{\v R}
-- \gdef^^d9{\ringaccent U}
-+ \gdef^^d9{\ringaccent U}
- \gdef^^da{\'U}
- \gdef^^db{\H U}
- \gdef^^dc{\"U}
-@@ -8027,14 +9108,14 @@ should work if nowhere else does.}
- \gdef^^e7{\cedilla c}
- \gdef^^e8{\v c}
- \gdef^^e9{\'e}
-- \gdef^^ea{\missingcharmsg{LATIN SMALL LETTER E WITH OGONEK}}
-+ \gdef^^ea{\ogonek{e}}
- \gdef^^eb{\"e}
- \gdef^^ec{\v e}
-- \gdef^^ed{\'\i}
-- \gdef^^ee{\^\i}
-+ \gdef^^ed{\'{\dotless{i}}}
-+ \gdef^^ee{\^{\dotless{i}}}
- \gdef^^ef{\v d}
- %
-- \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER D WITH STROKE}}
-+ \gdef^^f0{\dh}
- \gdef^^f1{\'n}
- \gdef^^f2{\v n}
- \gdef^^f3{\'o}
-@@ -8053,11 +9134,11 @@ should work if nowhere else does.}
- }
-
- % UTF-8 character definitions.
--%
-+%
- % This code to support UTF-8 is based on LaTeX's utf8.def, with some
- % changes for Texinfo conventions. It is included here under the GPL by
- % permission from Frank Mittelbach and the LaTeX team.
--%
-+%
- \newcount\countUTFx
- \newcount\countUTFy
- \newcount\countUTFz
-@@ -8122,7 +9203,7 @@ should work if nowhere else does.}
-
- \gdef\DeclareUnicodeCharacter#1#2{%
- \countUTFz = "#1\relax
-- \wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}%
-+ %\wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}%
- \begingroup
- \parseXMLCharref
- \def\UTFviiiTwoOctets##1##2{%
-@@ -8207,6 +9288,7 @@ should work if nowhere else does.}
- \DeclareUnicodeCharacter{00CE}{\^I}
- \DeclareUnicodeCharacter{00CF}{\"I}
-
-+ \DeclareUnicodeCharacter{00D0}{\DH}
- \DeclareUnicodeCharacter{00D1}{\~N}
- \DeclareUnicodeCharacter{00D2}{\`O}
- \DeclareUnicodeCharacter{00D3}{\'O}
-@@ -8219,6 +9301,7 @@ should work if nowhere else does.}
- \DeclareUnicodeCharacter{00DB}{\^U}
- \DeclareUnicodeCharacter{00DC}{\"U}
- \DeclareUnicodeCharacter{00DD}{\'Y}
-+ \DeclareUnicodeCharacter{00DE}{\TH}
- \DeclareUnicodeCharacter{00DF}{\ss}
-
- \DeclareUnicodeCharacter{00E0}{\`a}
-@@ -8238,6 +9321,7 @@ should work if nowhere else does.}
- \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}
- \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}
-
-+ \DeclareUnicodeCharacter{00F0}{\dh}
- \DeclareUnicodeCharacter{00F1}{\~n}
- \DeclareUnicodeCharacter{00F2}{\`o}
- \DeclareUnicodeCharacter{00F3}{\'o}
-@@ -8250,16 +9334,21 @@ should work if nowhere else does.}
- \DeclareUnicodeCharacter{00FB}{\^u}
- \DeclareUnicodeCharacter{00FC}{\"u}
- \DeclareUnicodeCharacter{00FD}{\'y}
-+ \DeclareUnicodeCharacter{00FE}{\th}
- \DeclareUnicodeCharacter{00FF}{\"y}
-
- \DeclareUnicodeCharacter{0100}{\=A}
- \DeclareUnicodeCharacter{0101}{\=a}
- \DeclareUnicodeCharacter{0102}{\u{A}}
- \DeclareUnicodeCharacter{0103}{\u{a}}
-+ \DeclareUnicodeCharacter{0104}{\ogonek{A}}
-+ \DeclareUnicodeCharacter{0105}{\ogonek{a}}
- \DeclareUnicodeCharacter{0106}{\'C}
- \DeclareUnicodeCharacter{0107}{\'c}
- \DeclareUnicodeCharacter{0108}{\^C}
- \DeclareUnicodeCharacter{0109}{\^c}
-+ \DeclareUnicodeCharacter{0118}{\ogonek{E}}
-+ \DeclareUnicodeCharacter{0119}{\ogonek{e}}
- \DeclareUnicodeCharacter{010A}{\dotaccent{C}}
- \DeclareUnicodeCharacter{010B}{\dotaccent{c}}
- \DeclareUnicodeCharacter{010C}{\v{C}}
-@@ -8407,6 +9496,8 @@ should work if nowhere else does.}
- \DeclareUnicodeCharacter{0233}{\=y}
- \DeclareUnicodeCharacter{0237}{\dotless{j}}
-
-+ \DeclareUnicodeCharacter{02DB}{\ogonek{ }}
-+
- \DeclareUnicodeCharacter{1E02}{\dotaccent{B}}
- \DeclareUnicodeCharacter{1E03}{\dotaccent{b}}
- \DeclareUnicodeCharacter{1E04}{\udotaccent{B}}
-@@ -8580,8 +9671,8 @@ should work if nowhere else does.}
- % Prevent underfull vbox error messages.
- \vbadness = 10000
-
--% Don't be so finicky about underfull hboxes, either.
--\hbadness = 2000
-+% Don't be very finicky about underfull hboxes, either.
-+\hbadness = 6666
-
- % Following George Bush, get rid of widows and orphans.
- \widowpenalty=10000
-@@ -8788,25 +9879,21 @@ should work if nowhere else does.}
-
- \message{and turning on texinfo input format.}
-
-+\def^^L{\par} % remove \outer, so ^L can appear in an @comment
-+
-+% DEL is a comment character, in case @c does not suffice.
-+\catcode`\^^? = 14
-+
- % Define macros to output various characters with catcode for normal text.
--\catcode`\"=\other
--\catcode`\~=\other
--\catcode`\^=\other
--\catcode`\_=\other
--\catcode`\|=\other
--\catcode`\<=\other
--\catcode`\>=\other
--\catcode`\+=\other
--\catcode`\$=\other
--\def\normaldoublequote{"}
--\def\normaltilde{~}
--\def\normalcaret{^}
--\def\normalunderscore{_}
--\def\normalverticalbar{|}
--\def\normalless{<}
--\def\normalgreater{>}
--\def\normalplus{+}
--\def\normaldollar{$}%$ font-lock fix
-+\catcode`\"=\other \def\normaldoublequote{"}
-+\catcode`\$=\other \def\normaldollar{$}%$ font-lock fix
-+\catcode`\+=\other \def\normalplus{+}
-+\catcode`\<=\other \def\normalless{<}
-+\catcode`\>=\other \def\normalgreater{>}
-+\catcode`\^=\other \def\normalcaret{^}
-+\catcode`\_=\other \def\normalunderscore{_}
-+\catcode`\|=\other \def\normalverticalbar{|}
-+\catcode`\~=\other \def\normaltilde{~}
-
- % This macro is used to make a character print one way in \tt
- % (where it can probably be output as-is), and another way in other fonts,
-@@ -8884,32 +9971,48 @@ should work if nowhere else does.}
-
- % In texinfo, backslash is an active character; it prints the backslash
- % in fixed width font.
--\catcode`\\=\active
--@def@normalbackslash{{@tt@backslashcurfont}}
-+\catcode`\\=\active % @ for escape char from now on.
-+
-+% The story here is that in math mode, the \char of \backslashcurfont
-+% ends up printing the roman \ from the math symbol font (because \char
-+% in math mode uses the \mathcode, and plain.tex sets
-+% \mathcode`\\="026E). It seems better for @backslashchar{} to always
-+% print a typewriter backslash, hence we use an explicit \mathchar,
-+% which is the decimal equivalent of "715c (class 7, e.g., use \fam;
-+% ignored family value; char position "5C). We can't use " for the
-+% usual hex value because it has already been made active.
-+@def@normalbackslash{{@tt @ifmmode @mathchar29020 @else @backslashcurfont @fi}}
-+@let@backslashchar = @normalbackslash % @backslashchar{} is for user documents.
-+
- % On startup, @fixbackslash assigns:
- % @let \ = @normalbackslash
--
- % \rawbackslash defines an active \ to do \backslashcurfont.
- % \otherbackslash defines an active \ to be a literal `\' character with
--% catcode other.
-+% catcode other. We switch back and forth between these.
- @gdef@rawbackslash{@let\=@backslashcurfont}
- @gdef@otherbackslash{@let\=@realbackslash}
-
- % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
--% the literal character `\'.
--%
--@def@normalturnoffactive{%
-- @let\=@normalbackslash
-- @let"=@normaldoublequote
-- @let~=@normaltilde
-- @let^=@normalcaret
-- @let_=@normalunderscore
-- @let|=@normalverticalbar
-- @let<=@normalless
-- @let>=@normalgreater
-- @let+=@normalplus
-- @let$=@normaldollar %$ font-lock fix
-- @unsepspaces
-+% the literal character `\'. Also revert - to its normal character, in
-+% case the active - from code has slipped in.
-+%
-+{@catcode`- = @active
-+ @gdef@normalturnoffactive{%
-+ @let-=@normaldash
-+ @let"=@normaldoublequote
-+ @let$=@normaldollar %$ font-lock fix
-+ @let+=@normalplus
-+ @let<=@normalless
-+ @let>=@normalgreater
-+ @let\=@normalbackslash
-+ @let^=@normalcaret
-+ @let_=@normalunderscore
-+ @let|=@normalverticalbar
-+ @let~=@normaltilde
-+ @markupsetuplqdefault
-+ @markupsetuprqdefault
-+ @unsepspaces
-+ }
- }
-
- % Make _ and + \other characters, temporarily.
-@@ -8938,11 +10041,28 @@ should work if nowhere else does.}
- % Say @foo, not \foo, in error messages.
- @escapechar = `@@
-
--% These look ok in all fonts, so just make them not special.
--@catcode`@& = @other
--@catcode`@# = @other
--@catcode`@% = @other
-+% These (along with & and #) are made active for url-breaking, so need
-+% active definitions as the normal characters.
-+@def@normaldot{.}
-+@def@normalquest{?}
-+@def@normalslash{/}
-
-+% These look ok in all fonts, so just make them not special.
-+% @hashchar{} gets its own user-level command, because of #line.
-+@catcode`@& = @other @def@normalamp{&}
-+@catcode`@# = @other @def@normalhash{#}
-+@catcode`@% = @other @def@normalpercent{%}
-+
-+@let @hashchar = @normalhash
-+
-+@c Finally, make ` and ' active, so that txicodequoteundirected and
-+@c txicodequotebacktick work right in, e.g., @w{@code{`foo'}}. If we
-+@c don't make ` and ' active, @code will not get them as active chars.
-+@c Do this last of all since we use ` in the previous @catcode assignments.
-+@catcode`@'=@active
-+@catcode`@`=@active
-+@markupsetuplqdefault
-+@markupsetuprqdefault
-
- @c Local variables:
- @c eval: (add-hook 'write-file-hooks 'time-stamp)
-diff -Naurp gettext-0.18.3.1.orig/build-aux/ylwrap gettext-0.18.3.1/build-aux/ylwrap
---- gettext-0.18.3.1.orig/build-aux/ylwrap 2013-08-15 09:31:16.000000000 -0700
-+++ gettext-0.18.3.1/build-aux/ylwrap 2013-12-31 11:58:08.000000000 -0800
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # ylwrap - wrapper for lex/yacc invocations.
-
--scriptversion=2012-12-21.17; # UTC
-+scriptversion=2013-01-12.17; # UTC
-
- # Copyright (C) 1996-2013 Free Software Foundation, Inc.
- #
-@@ -40,7 +40,7 @@ get_dirname ()
- # guard FILE
- # ----------
- # The CPP macro used to guard inclusion of FILE.
--guard()
-+guard ()
- {
- printf '%s\n' "$1" \
- | sed \
-@@ -96,17 +96,17 @@ esac
-
-
- # The input.
--input="$1"
-+input=$1
- shift
- # We'll later need for a correct munging of "#line" directives.
- input_sub_rx=`get_dirname "$input" | quote_for_sed`
--case "$input" in
-+case $input in
- [\\/]* | ?:[\\/]*)
- # Absolute path; do nothing.
- ;;
- *)
- # Relative path. Make it absolute.
-- input="`pwd`/$input"
-+ input=`pwd`/$input
- ;;
- esac
- input_rx=`get_dirname "$input" | quote_for_sed`
-@@ -132,8 +132,8 @@ sed_fix_filenames=
- # guard in its implementation file.
- sed_fix_header_guards=
-
--while test "$#" -ne 0; do
-- if test "$1" = "--"; then
-+while test $# -ne 0; do
-+ if test x"$1" = x"--"; then
- shift
- break
- fi
-@@ -153,16 +153,14 @@ while test "$#" -ne 0; do
- done
-
- # The program to run.
--prog="$1"
-+prog=$1
- shift
- # Make any relative path in $prog absolute.
--case "$prog" in
-+case $prog in
- [\\/]* | ?:[\\/]*) ;;
-- *[\\/]*) prog="`pwd`/$prog" ;;
-+ *[\\/]*) prog=`pwd`/$prog ;;
- esac
-
--# FIXME: add hostname here for parallel makes that run commands on
--# other machines. But that might take us over the 14-char limit.
- dirname=ylwrap$$
- do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret'
- trap "ret=129; $do_exit" 1
-@@ -188,7 +186,7 @@ if test $ret -eq 0; then
- # otherwise prepend '../'.
- case $to in
- [\\/]* | ?:[\\/]*) target=$to;;
-- *) target="../$to";;
-+ *) target=../$to;;
- esac
-
- # Do not overwrite unchanged header files to avoid useless
-@@ -197,7 +195,7 @@ if test $ret -eq 0; then
- # output of all other files to a temporary file so we can
- # compare them to existing versions.
- if test $from != $parser; then
-- realtarget="$target"
-+ realtarget=$target
- target=tmp-`printf '%s\n' "$target" | sed 's|.*[\\/]||g'`
- fi
-
-diff -Naurp gettext-0.18.3.1.orig/configure gettext-0.18.3.1/configure
---- gettext-0.18.3.1.orig/configure 2013-08-15 09:34:34.000000000 -0700
-+++ gettext-0.18.3.1/configure 2013-12-31 11:58:08.000000000 -0800
-@@ -1930,7 +1930,7 @@ ac_configure="$SHELL $ac_aux_dir/configu
-
-
-
--am__api_version='1.13'
-+am__api_version='1.14'
-
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
-@@ -2460,6 +2460,47 @@ am__tar='$${TAR-tar} chof - "$$tardir"'
-
-
-
-+# POSIX will say in a future version that running "rm -f" with no argument
-+# is OK; and we want to be able to make that assumption in our Makefile
-+# recipes. So use an aggressive probe to check that the usage we want is
-+# actually supported "in the wild" to an acceptable degree.
-+# See automake bug#10828.
-+# To make any issue more visible, cause the running configure to be aborted
-+# by default if the 'rm' program in use doesn't match our expectations; the
-+# user can still override this though.
-+if rm -f && rm -fr && rm -rf; then : OK; else
-+ cat >&2 <<'END'
-+Oops!
-+
-+Your 'rm' program seems unable to run without file operands specified
-+on the command line, even when the '-f' option is present. This is contrary
-+to the behaviour of most rm programs out there, and not conforming with
-+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-+
-+Please tell bug-automake@gnu.org about your system, including the value
-+of your $PATH and any error possibly output before this message. This
-+can help us improve future automake versions.
-+
-+END
-+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-+ echo 'Configuration will proceed anyway, since you have set the' >&2
-+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-+ echo >&2
-+ else
-+ cat >&2 <<'END'
-+Aborting the configuration process, to ensure you take notice of the issue.
-+
-+You can download and install GNU coreutils to get an 'rm' implementation
-+that behaves properly: <http://www.gnu.org/software/coreutils/>.
-+
-+If you want to complete the configuration process using your problematic
-+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-+to "yes", and re-run configure.
-+
-+END
-+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-+ fi
-+fi
- PACKAGE=gettext
-
- VERSION=$VERSION_NUMBER
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/INSTALL gettext-0.18.3.1/gettext-runtime/INSTALL
---- gettext-0.18.3.1.orig/gettext-runtime/INSTALL 2012-12-09 17:59:06.000000000 -0800
-+++ gettext-0.18.3.1/gettext-runtime/INSTALL 2013-12-31 11:58:08.000000000 -0800
-@@ -1,223 +1,238 @@
--These are generic installation instructions.
-+Installation Instructions
-+*************************
-
--Prerequisites
--=============
-+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-+Inc.
-
-- This package depends on a few other packages. They are listed in
--the file ‘DEPENDENCIES’. It is recommended to install the listed
--packages before installing this package.
-+ Copying and distribution of this file, with or without modification,
-+are permitted in any medium without royalty provided the copyright
-+notice and this notice are preserved. This file is offered as-is,
-+without warranty of any kind.
-
- Basic Installation
- ==================
-
-- The ‘configure’ shell script attempts to guess correct values for
-+ Briefly, the shell command `./configure && make && make install'
-+should configure, build, and install this package. The following
-+more-detailed instructions are generic; see the `README' file for
-+instructions specific to this package. Some packages provide this
-+`INSTALL' file but do not implement all of the features documented
-+below. The lack of an optional feature in a given package is not
-+necessarily a bug. More recommendations for GNU packages can be found
-+in *note Makefile Conventions: (standards)Makefile Conventions.
-+
-+ The `configure' shell script attempts to guess correct values for
- various system-dependent variables used during compilation. It uses
--those values to create a ‘Makefile’ in each directory of the package.
--It may also create one or more ‘.h’ files containing system-dependent
--definitions. Finally, it creates a shell script ‘config.status’ that
--you can run in the future to recreate the current configuration, a file
--‘config.cache’ that saves the results of its tests to speed up
--reconfiguring, and a file ‘config.log’ containing compiler output
--(useful mainly for debugging ‘configure’).
-+those values to create a `Makefile' in each directory of the package.
-+It may also create one or more `.h' files containing system-dependent
-+definitions. Finally, it creates a shell script `config.status' that
-+you can run in the future to recreate the current configuration, and a
-+file `config.log' containing compiler output (useful mainly for
-+debugging `configure').
-+
-+ It can also use an optional file (typically called `config.cache'
-+and enabled with `--cache-file=config.cache' or simply `-C') that saves
-+the results of its tests to speed up reconfiguring. Caching is
-+disabled by default to prevent problems with accidental use of stale
-+cache files.
-
- If you need to do unusual things to compile the package, please try
--to figure out how ‘configure’ could check whether to do them, and mail
--diffs or instructions to the address given in the ‘README’ so they can
--be considered for the next release. If at some point ‘config.cache’
--contains results you don't want to keep, you may remove or edit it.
--
-- The file ‘configure.ac’ is used to create ‘configure’ by a program
--called ‘autoconf’. You only need ‘configure.ac’ if you want to change
--it or regenerate ‘configure’ using a newer version of ‘autoconf’.
--
--The simplest way to compile this package is:
--
-- 1. ‘cd’ to the directory containing the package's source code and type
-- ‘./configure’ to configure the package for your system. If you're
-- using ‘csh’ on an old version of System V, you might need to type
-- ‘sh ./configure’ instead to prevent ‘csh’ from trying to execute
-- ‘configure’ itself.
--
-- Running ‘configure’ takes awhile. While running, it prints some
-- messages telling which features it is checking for.
--
-- 2. Type ‘make’ to compile the package.
--
-- 3. Optionally, type ‘make check’ to run any self-tests that come with
-- the package.
--
-- 4. Type ‘make install’ to install the programs and any data files and
-- documentation.
--
-- 5. You can remove the program binaries and object files from the
-- source code directory by typing ‘make clean’. To also remove the
-- files that ‘configure’ created (so you can compile the package for
-- a different kind of computer), type ‘make distclean’. There is
-- also a ‘make maintainer-clean’ target, but that is intended mainly
-+to figure out how `configure' could check whether to do them, and mail
-+diffs or instructions to the address given in the `README' so they can
-+be considered for the next release. If you are using the cache, and at
-+some point `config.cache' contains results you don't want to keep, you
-+may remove or edit it.
-+
-+ The file `configure.ac' (or `configure.in') is used to create
-+`configure' by a program called `autoconf'. You need `configure.ac' if
-+you want to change it or regenerate `configure' using a newer version
-+of `autoconf'.
-+
-+ The simplest way to compile this package is:
-+
-+ 1. `cd' to the directory containing the package's source code and type
-+ `./configure' to configure the package for your system.
-+
-+ Running `configure' might take a while. While running, it prints
-+ some messages telling which features it is checking for.
-+
-+ 2. Type `make' to compile the package.
-+
-+ 3. Optionally, type `make check' to run any self-tests that come with
-+ the package, generally using the just-built uninstalled binaries.
-+
-+ 4. Type `make install' to install the programs and any data files and
-+ documentation. When installing into a prefix owned by root, it is
-+ recommended that the package be configured and built as a regular
-+ user, and only the `make install' phase executed with root
-+ privileges.
-+
-+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
-+ this time using the binaries in their final installed location.
-+ This target does not install anything. Running this target as a
-+ regular user, particularly if the prior `make install' required
-+ root privileges, verifies that the installation completed
-+ correctly.
-+
-+ 6. You can remove the program binaries and object files from the
-+ source code directory by typing `make clean'. To also remove the
-+ files that `configure' created (so you can compile the package for
-+ a different kind of computer), type `make distclean'. There is
-+ also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-+ 7. Often, you can also type `make uninstall' to remove the installed
-+ files again. In practice, not all packages have tested that
-+ uninstallation works correctly, even though it is required by the
-+ GNU Coding Standards.
-+
-+ 8. Some packages, particularly those that use Automake, provide `make
-+ distcheck', which can by used by developers to test that all other
-+ targets like `make install' and `make uninstall' work correctly.
-+ This target is generally not run by end users.
-+
- Compilers and Options
- =====================
-
- Some systems require unusual options for compilation or linking that
--the ‘configure’ script does not know about. You can give ‘configure’
--initial values for variables as arguments. You can do it like this:
-- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-+the `configure' script does not know about. Run `./configure --help'
-+for details on some of the pertinent environment variables.
-+
-+ You can give `configure' initial values for configuration parameters
-+by setting variables in the command line or in the environment. Here
-+is an example:
-+
-+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-+
-+ *Note Defining Variables::, for more details.
-
- Compiling For Multiple Architectures
- ====================================
-
- You can compile the package for more than one kind of computer at the
- same time, by placing the object files for each architecture in their
--own directory. To do this, you must use a version of ‘make’ that
--supports the ‘VPATH’ variable, such as GNU ‘make’. ‘cd’ to the
-+own directory. To do this, you can use GNU `make'. `cd' to the
- directory where you want the object files and executables to go and run
--the ‘configure’ script. ‘configure’ automatically checks for the
--source code in the directory that ‘configure’ is in and in ‘..’.
--
-- If you have to use a ‘make’ that does not supports the ‘VPATH’
--variable, you have to compile the package for one architecture at a time
--in the source code directory. After you have installed the package for
--one architecture, use ‘make distclean’ before reconfiguring for another
--architecture.
-+the `configure' script. `configure' automatically checks for the
-+source code in the directory that `configure' is in and in `..'. This
-+is known as a "VPATH" build.
-+
-+ With a non-GNU `make', it is safer to compile the package for one
-+architecture at a time in the source code directory. After you have
-+installed the package for one architecture, use `make distclean' before
-+reconfiguring for another architecture.
-
- On MacOS X 10.5 and later systems, you can create libraries and
- executables that work on multiple system types--known as "fat" or
--"universal" binaries--by specifying multiple '-arch' options to the
--compiler but only a single '-arch' option to the preprocessor. Like
-+"universal" binaries--by specifying multiple `-arch' options to the
-+compiler but only a single `-arch' option to the preprocessor. Like
- this:
-
- ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CPP="gcc -E" CXXCPP="g++ -E"
-
-- This is not guaranteed to produce working output in all cases. You
-+ This is not guaranteed to produce working output in all cases, you
- may have to build one architecture at a time and combine the results
--using the 'lipo' tool if you have problems.
-+using the `lipo' tool if you have problems.
-
- Installation Names
- ==================
-
-- By default, ‘make install’ will install the package's files in
--‘/usr/local/bin’, ‘/usr/local/man’, etc. You can specify an
--installation prefix other than ‘/usr/local’ by giving ‘configure’ the
--option ‘--prefix=PATH’.
-+ By default, `make install' installs the package's commands under
-+`/usr/local/bin', include files under `/usr/local/include', etc. You
-+can specify an installation prefix other than `/usr/local' by giving
-+`configure' the option `--prefix=PREFIX', where PREFIX must be an
-+absolute file name.
-
- You can specify separate installation prefixes for
- architecture-specific files and architecture-independent files. If you
--give ‘configure’ the option ‘--exec-prefix=PATH’, the package will use
--PATH as the prefix for installing programs and libraries.
--Documentation and other data files will still use the regular prefix.
-+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-+PREFIX as the prefix for installing programs and libraries.
-+Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
--options like ‘--bindir=PATH’ to specify different values for particular
--kinds of files. Run ‘configure --help’ for a list of the directories
--you can set and what kinds of files go in them.
--
-- If the package supports it, you can cause programs to be installed
--with an extra prefix or suffix on their names by giving ‘configure’ the
--option ‘--program-prefix=PREFIX’ or ‘--program-suffix=SUFFIX’.
--
--Enabling Relocatability
--=======================
--
-- It has been a pain for many users of GNU packages for a long time
--that packages are not relocatable. It means a user cannot copy a
--program, installed by another user on the same machine, to his home
--directory, and have it work correctly (including i18n). So many users
--need to go through ‘configure; make; make install’ with all its
--dependencies, options, and hurdles.
--
-- Red Hat, Debian, and similar package systems solve the "ease of
--installation" problem, but they hardwire path names, usually to ‘/usr’
--or ‘/usr/local’. This means that users need root privileges to install
--a binary package, and prevents installing two different versions of the
--same binary package.
--
-- A relocatable program can be moved or copied to a different location
--on the filesystem. It is possible to make symlinks to the installed
--and moved programs, and invoke them through the symlink. It is possible
--to do the same thing with a hard link _only_ if the hard link file is
--in the same directory as the real program.
--
-- To configure a program to be relocatable, add ‘--enable-relocatable’
--to the ‘configure’ command line.
--
-- On some OSes the executables remember the location of shared
--libraries and prefer them over any other search path. Therefore, such
--an executable will look for its shared libraries first in the original
--installation directory and only then in the current installation
--directory. Thus, for reliability, it is best to also give a ‘--prefix’
--option pointing to a directory that does not exist now and which never
--will be created, e.g. ‘--prefix=/nonexistent’. You may use
--‘DESTDIR=DEST-DIR’ on the ‘make’ command line to avoid installing into
--that directory.
--
-- We do not recommend using a prefix writable by unprivileged users
--(e.g. ‘/tmp/inst$$’) because such a directory can be recreated by an
--unprivileged user after the original directory has been removed. We
--also do not recommend prefixes that might be behind an automounter
--(e.g. ‘$HOME/inst$$’) because of the performance impact of directory
--searching.
--
-- Here's a sample installation run that takes into account all these
--recommendations:
--
-- ./configure --enable-relocatable --prefix=/nonexistent
-- make
-- make install DESTDIR=/tmp/inst$$
--
-- Installation with ‘--enable-relocatable’ will not work for setuid or
--setgid executables, because such executables search only system library
--paths for security reasons. Also, installation with
--‘--enable-relocatable’ might not work on OpenBSD, when the package
--contains shared libraries and libtool versions 1.5.xx are used.
--
-- The runtime penalty and size penalty are negligible on GNU/Linux
--(just one system call more when an executable is launched), and small on
--other systems (the wrapper program just sets an environment variable
--and executes the real program).
-+options like `--bindir=DIR' to specify different values for particular
-+kinds of files. Run `configure --help' for a list of the directories
-+you can set and what kinds of files go in them. In general, the
-+default for these options is expressed in terms of `${prefix}', so that
-+specifying just `--prefix' will affect all of the other directory
-+specifications that were not explicitly provided.
-+
-+ The most portable way to affect installation locations is to pass the
-+correct locations to `configure'; however, many packages provide one or
-+both of the following shortcuts of passing variable assignments to the
-+`make install' command line to change installation locations without
-+having to reconfigure or recompile.
-+
-+ The first method involves providing an override variable for each
-+affected directory. For example, `make install
-+prefix=/alternate/directory' will choose an alternate location for all
-+directory configuration variables that were expressed in terms of
-+`${prefix}'. Any directories that were specified during `configure',
-+but not in terms of `${prefix}', must each be overridden at install
-+time for the entire installation to be relocated. The approach of
-+makefile variable overrides for each directory variable is required by
-+the GNU Coding Standards, and ideally causes no recompilation.
-+However, some platforms have known limitations with the semantics of
-+shared libraries that end up requiring recompilation when using this
-+method, particularly noticeable in packages that use GNU Libtool.
-+
-+ The second method involves providing the `DESTDIR' variable. For
-+example, `make install DESTDIR=/alternate/directory' will prepend
-+`/alternate/directory' before all installation names. The approach of
-+`DESTDIR' overrides is not required by the GNU Coding Standards, and
-+does not work on platforms that have drive letters. On the other hand,
-+it does better at avoiding recompilation issues, and works well even
-+when some directory options were not specified in terms of `${prefix}'
-+at `configure' time.
-
- Optional Features
- =================
-
-- Some packages pay attention to ‘--enable-FEATURE’ options to
--‘configure’, where FEATURE indicates an optional part of the package.
--They may also pay attention to ‘--with-PACKAGE’ options, where PACKAGE
--is something like ‘gnu-as’ or ‘x’ (for the X Window System). The
--‘README’ should mention any ‘--enable-’ and ‘--with-’ options that the
-+ If the package supports it, you can cause programs to be installed
-+with an extra prefix or suffix on their names by giving `configure' the
-+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-+
-+ Some packages pay attention to `--enable-FEATURE' options to
-+`configure', where FEATURE indicates an optional part of the package.
-+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-+is something like `gnu-as' or `x' (for the X Window System). The
-+`README' should mention any `--enable-' and `--with-' options that the
- package recognizes.
-
-- For packages that use the X Window System, ‘configure’ can usually
-+ For packages that use the X Window System, `configure' can usually
- find the X include and library files automatically, but if it doesn't,
--you can use the ‘configure’ options ‘--x-includes=DIR’ and
--‘--x-libraries=DIR’ to specify their locations.
-+you can use the `configure' options `--x-includes=DIR' and
-+`--x-libraries=DIR' to specify their locations.
-
-- For packages that use the GNU libiconv library, you can use the
--‘configure’ option ‘--with-libiconv-prefix’ to specify the prefix you
--used while installing GNU libiconv. This option is not necessary if
--that other prefix is the same as the one now specified through --prefix.
--
-- For packages that use the GNU libintl library, you can use the
--‘configure’ option ‘--with-libintl-prefix’ to specify the prefix you
--used while installing GNU gettext-runtime. This option is not necessary if
--that other prefix is the same as the one now specified through --prefix.
-+ Some packages offer the ability to configure how verbose the
-+execution of `make' will be. For these packages, running `./configure
-+--enable-silent-rules' sets the default to minimal output, which can be
-+overridden with `make V=1'; while running `./configure
-+--disable-silent-rules' sets the default to verbose, which can be
-+overridden with `make V=0'.
-
--Particular Systems
-+Particular systems
- ==================
-
-- On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC
--is not installed, it is recommended to use the following options in order
--to use an ANSI C compiler:
-+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-+CC is not installed, it is recommended to use the following options in
-+order to use an ANSI C compiler:
-
- ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
- and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-+ HP-UX `make' updates targets which have the same time stamps as
-+their prerequisites, which makes it generally unusable when shipped
-+generated files such as `configure' are involved. Use GNU `make'
-+instead.
-+
- On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
--parse its ‘<wchar.h>’ header file. The option ‘-nodtk’ can be used as
-+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
- a workaround. If GNU CC is not installed, it is therefore recommended
- to try
-
-@@ -227,81 +242,129 @@ and if that doesn't work, try
-
- ./configure CC="cc -nodtk"
-
-- On AIX 3, the C include files by default don't define some necessary
--prototype declarations. If GNU CC is not installed, it is recommended to
--use the following options:
--
-- ./configure CC="xlc -D_ALL_SOURCE"
-+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
-+directory contains several dysfunctional programs; working variants of
-+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
-+in your `PATH', put it _after_ `/usr/bin'.
-
-- On Haiku, software installed for all users goes in /boot/common, not
--/usr/local. It is recommended to use the following options:
-+ On Haiku, software installed for all users goes in `/boot/common',
-+not `/usr/local'. It is recommended to use the following options:
-
- ./configure --prefix=/boot/common
-
-- On BeOS, user installed software goes in /boot/home/config, not
--/usr/local. It is recommended to use the following options:
--
-- ./configure --prefix=/boot/home/config
--
- Specifying the System Type
- ==========================
-
-- There may be some features ‘configure’ can not figure out
--automatically, but needs to determine by the type of host the package
--will run on. Usually ‘configure’ can figure that out, but if it prints
--a message saying it can not guess the host type, give it the
--‘--host=TYPE’ option. TYPE can either be a short name for the system
--type, such as ‘sun4’, or a canonical name with three fields:
-+ There may be some features `configure' cannot figure out
-+automatically, but needs to determine by the type of machine the package
-+will run on. Usually, assuming the package is built to be run on the
-+_same_ architectures, `configure' can figure that out, but if it prints
-+a message saying it cannot guess the machine type, give it the
-+`--build=TYPE' option. TYPE can either be a short name for the system
-+type, such as `sun4', or a canonical name which has the form:
-+
- CPU-COMPANY-SYSTEM
-
--See the file ‘config.sub’ for the possible values of each field. If
--‘config.sub’ isn't included in this package, then this package doesn't
--need to know the host type.
--
-- If you are building compiler tools for cross-compiling, you can also
--use the ‘--target=TYPE’ option to select the type of system they will
--produce code for and the ‘--build=TYPE’ option to select the type of
--system on which you are compiling the package.
-+where SYSTEM can have one of these forms:
-+
-+ OS
-+ KERNEL-OS
-+
-+ See the file `config.sub' for the possible values of each field. If
-+`config.sub' isn't included in this package, then this package doesn't
-+need to know the machine type.
-+
-+ If you are _building_ compiler tools for cross-compiling, you should
-+use the option `--target=TYPE' to select the type of system they will
-+produce code for.
-+
-+ If you want to _use_ a cross compiler, that generates code for a
-+platform different from the build platform, you should specify the
-+"host" platform (i.e., that on which the generated programs will
-+eventually be run) with `--host=TYPE'.
-
- Sharing Defaults
- ================
-
-- If you want to set default values for ‘configure’ scripts to share,
--you can create a site shell script called ‘config.site’ that gives
--default values for variables like ‘CC’, ‘cache_file’, and ‘prefix’.
--‘configure’ looks for ‘PREFIX/share/config.site’ if it exists, then
--‘PREFIX/etc/config.site’ if it exists. Or, you can set the
--‘CONFIG_SITE’ environment variable to the location of the site script.
--A warning: not all ‘configure’ scripts look for a site script.
-+ If you want to set default values for `configure' scripts to share,
-+you can create a site shell script called `config.site' that gives
-+default values for variables like `CC', `cache_file', and `prefix'.
-+`configure' looks for `PREFIX/share/config.site' if it exists, then
-+`PREFIX/etc/config.site' if it exists. Or, you can set the
-+`CONFIG_SITE' environment variable to the location of the site script.
-+A warning: not all `configure' scripts look for a site script.
-
--Operation Controls
-+Defining Variables
- ==================
-
-- ‘configure’ recognizes the following options to control how it
-+ Variables not defined in a site shell script can be set in the
-+environment passed to `configure'. However, some packages may run
-+configure again during the build, and the customized values of these
-+variables may be lost. In order to avoid this problem, you should set
-+them in the `configure' command line, using `VAR=value'. For example:
-+
-+ ./configure CC=/usr/local2/bin/gcc
-+
-+causes the specified `gcc' to be used as the C compiler (unless it is
-+overridden in the site shell script).
-+
-+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-+an Autoconf limitation. Until the limitation is lifted, you can use
-+this workaround:
-+
-+ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
-+
-+`configure' Invocation
-+======================
-+
-+ `configure' recognizes the following options to control how it
- operates.
-
--‘--cache-file=FILE’
-- Use and save the results of the tests in FILE instead of
-- ‘./config.cache’. Set FILE to ‘/dev/null’ to disable caching, for
-- debugging ‘configure’.
--
--‘--help’
-- Print a summary of the options to ‘configure’, and exit.
--
--‘--quiet’
--‘--silent’
--‘-q’
-+`--help'
-+`-h'
-+ Print a summary of all of the options to `configure', and exit.
-+
-+`--help=short'
-+`--help=recursive'
-+ Print a summary of the options unique to this package's
-+ `configure', and exit. The `short' variant lists options used
-+ only in the top level, while the `recursive' variant lists options
-+ also present in any nested packages.
-+
-+`--version'
-+`-V'
-+ Print the version of Autoconf used to generate the `configure'
-+ script, and exit.
-+
-+`--cache-file=FILE'
-+ Enable the cache: use and save the results of the tests in FILE,
-+ traditionally `config.cache'. FILE defaults to `/dev/null' to
-+ disable caching.
-+
-+`--config-cache'
-+`-C'
-+ Alias for `--cache-file=config.cache'.
-+
-+`--quiet'
-+`--silent'
-+`-q'
- Do not print messages saying which checks are being made. To
-- suppress all normal output, redirect it to ‘/dev/null’ (any error
-+ suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
--‘--srcdir=DIR’
-+`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
-- ‘configure’ can determine that directory automatically.
--
--‘--version’
-- Print the version of Autoconf used to generate the ‘configure’
-- script, and exit.
-+ `configure' can determine that directory automatically.
-
--‘configure’ also accepts some other, not widely useful, options.
-+`--prefix=DIR'
-+ Use DIR as the installation prefix. *note Installation Names::
-+ for more details, including other options available for fine-tuning
-+ the installation locations.
-+
-+`--no-create'
-+`-n'
-+ Run the configure checks, but stop before creating any output
-+ files.
-
-+`configure' also accepts some other, not widely useful, options. Run
-+`configure --help' for more details.
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/Makefile.in gettext-0.18.3.1/gettext-runtime/Makefile.in
---- gettext-0.18.3.1.orig/gettext-runtime/Makefile.in 2013-08-15 09:26:40.000000000 -0700
-+++ gettext-0.18.3.1/gettext-runtime/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -87,9 +87,11 @@ DIST_COMMON = INSTALL NEWS README AUTHOR
- $(top_srcdir)/intl/Makefile.in ABOUT-NLS COPYING \
- ../build-aux/compile ../build-aux/config.guess \
- ../build-aux/config.rpath ../build-aux/config.sub \
-- ../build-aux/install-sh ../build-aux/missing \
-+ ../build-aux/depcomp ../build-aux/install-sh \
-+ ../build-aux/mdate-sh ../build-aux/missing \
- ../build-aux/mkinstalldirs ../build-aux/texinfo.tex \
-- ../build-aux/ltmain.sh $(top_srcdir)/../build-aux/compile \
-+ ../build-aux/ylwrap ../build-aux/ltmain.sh \
-+ $(top_srcdir)/../build-aux/compile \
- $(top_srcdir)/../build-aux/config.guess \
- $(top_srcdir)/../build-aux/config.rpath \
- $(top_srcdir)/../build-aux/config.sub \
-@@ -183,11 +185,6 @@ am__aclocal_m4_deps = $(top_srcdir)/gnul
- $(top_srcdir)/gnulib-m4/wcwidth.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
-@@ -195,14 +192,16 @@ am__aclocal_m4_deps = $(top_srcdir)/gnul
- $(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
-- $(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
-- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-- $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
-- $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-- $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-- $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
-- $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \
-+ $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
-+ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
-+ $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
-+ $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
-+ $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-@@ -1260,8 +1259,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- $(am__aclocal_m4_deps):
-
- config.h: stamp-h1
-- @if test ! -f $@; then rm -f stamp-h1; else :; fi
-- @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
-+ @test -f $@ || rm -f stamp-h1
-+ @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
-
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
-@@ -1497,10 +1496,16 @@ dist-xz: distdir
- $(am__post_remove_distdir)
-
- dist-tarZ: distdir
-+ @echo WARNING: "Support for shar distribution archives is" \
-+ "deprecated." >&2
-+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__post_remove_distdir)
-
- dist-shar: distdir
-+ @echo WARNING: "Support for distribution archives compressed with" \
-+ "legacy program 'compress' is deprecated." >&2
-+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__post_remove_distdir)
-
-@@ -1542,10 +1547,11 @@ distcheck: dist
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
-- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+ && ../configure \
- --with-included-gettext \
- $(AM_DISTCHECK_CONFIGURE_FLAGS) \
- $(DISTCHECK_CONFIGURE_FLAGS) \
-+ --srcdir=.. --prefix="$$dc_install_base" \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
- && $(MAKE) $(AM_MAKEFLAGS) check \
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/aclocal.m4 gettext-0.18.3.1/gettext-runtime/aclocal.m4
---- gettext-0.18.3.1.orig/gettext-runtime/aclocal.m4 2013-08-15 09:26:36.000000000 -0700
-+++ gettext-0.18.3.1/gettext-runtime/aclocal.m4 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
-+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
-
- # Copyright (C) 1996-2013 Free Software Foundation, Inc.
-
-@@ -32,10 +32,10 @@ To do so, use the procedure documented b
- # generated from the m4 files accompanying Automake X.Y.
- # (This private macro should not be called outside this file.)
- AC_DEFUN([AM_AUTOMAKE_VERSION],
--[am__api_version='1.13'
-+[am__api_version='1.14'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.13.4], [],
-+m4_if([$1], [1.14.1], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.13.4])dnl
-+[AM_AUTOMAKE_VERSION([1.14.1])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-@@ -418,6 +418,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
- # This macro actually does too much. Some checks are only needed if
- # your package does certain things. But this isn't really a big deal.
-
-+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
-+m4_define([AC_PROG_CC],
-+m4_defn([AC_PROG_CC])
-+[_AM_PROG_CC_C_O
-+])
-+
- # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
- # AM_INIT_AUTOMAKE([OPTIONS])
- # -----------------------------------------------
-@@ -526,7 +532,48 @@ dnl macro is hooked onto _AC_COMPILER_EX
- AC_CONFIG_COMMANDS_PRE(dnl
- [m4_provide_if([_AM_COMPILER_EXEEXT],
- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
--])
-+
-+# POSIX will say in a future version that running "rm -f" with no argument
-+# is OK; and we want to be able to make that assumption in our Makefile
-+# recipes. So use an aggressive probe to check that the usage we want is
-+# actually supported "in the wild" to an acceptable degree.
-+# See automake bug#10828.
-+# To make any issue more visible, cause the running configure to be aborted
-+# by default if the 'rm' program in use doesn't match our expectations; the
-+# user can still override this though.
-+if rm -f && rm -fr && rm -rf; then : OK; else
-+ cat >&2 <<'END'
-+Oops!
-+
-+Your 'rm' program seems unable to run without file operands specified
-+on the command line, even when the '-f' option is present. This is contrary
-+to the behaviour of most rm programs out there, and not conforming with
-+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-+
-+Please tell bug-automake@gnu.org about your system, including the value
-+of your $PATH and any error possibly output before this message. This
-+can help us improve future automake versions.
-+
-+END
-+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-+ echo 'Configuration will proceed anyway, since you have set the' >&2
-+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-+ echo >&2
-+ else
-+ cat >&2 <<'END'
-+Aborting the configuration process, to ensure you take notice of the issue.
-+
-+You can download and install GNU coreutils to get an 'rm' implementation
-+that behaves properly: <http://www.gnu.org/software/coreutils/>.
-+
-+If you want to complete the configuration process using your problematic
-+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-+to "yes", and re-run configure.
-+
-+END
-+ AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
-+ fi
-+fi])
-
- dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
- dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-@@ -534,7 +581,6 @@ dnl mangled by Autoconf and run in a she
- m4_define([_AC_COMPILER_EXEEXT],
- m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
--
- # When config.status generates a header, we must update the stamp-h file.
- # This file resides in the same directory as the config header
- # that is generated. The stamp files are numbered to have different names.
-@@ -646,38 +692,6 @@ AC_MSG_RESULT([$_am_result])
- rm -f confinc confmf
- ])
-
--# Copyright (C) 1999-2013 Free Software Foundation, Inc.
--#
--# 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.
--
--# AM_PROG_CC_C_O
--# --------------
--# Like AC_PROG_CC_C_O, but changed for automake.
--AC_DEFUN([AM_PROG_CC_C_O],
--[AC_REQUIRE([AC_PROG_CC_C_O])dnl
--AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--AC_REQUIRE_AUX_FILE([compile])dnl
--# FIXME: we rely on the cache variable name because
--# there is no other way.
--set dummy $CC
--am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
--eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
--if test "$am_t" != yes; then
-- # Losing compiler, so override with the script.
-- # FIXME: It is wrong to rewrite CC.
-- # But if we don't then we get into trouble of one sort or another.
-- # A longer-term fix would be to have automake use am__CC in this case,
-- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-- CC="$am_aux_dir/compile $CC"
--fi
--dnl Make sure AC_PROG_CC is never called again, or it will override our
--dnl setting of CC.
--m4_define([AC_PROG_CC],
-- [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
--])
--
- # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
- # Copyright (C) 1997-2013 Free Software Foundation, Inc.
-@@ -748,6 +762,70 @@ AC_DEFUN([_AM_SET_OPTIONS],
- AC_DEFUN([_AM_IF_OPTION],
- [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-+#
-+# 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.
-+
-+# _AM_PROG_CC_C_O
-+# ---------------
-+# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
-+# to automatically call this.
-+AC_DEFUN([_AM_PROG_CC_C_O],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+AC_REQUIRE_AUX_FILE([compile])dnl
-+AC_LANG_PUSH([C])dnl
-+AC_CACHE_CHECK(
-+ [whether $CC understands -c and -o together],
-+ [am_cv_prog_cc_c_o],
-+ [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-+ # Make sure it works both with $CC and with simple cc.
-+ # Following AC_PROG_CC_C_O, we do the test twice because some
-+ # compilers refuse to overwrite an existing .o file with -o,
-+ # though they will create one.
-+ am_cv_prog_cc_c_o=yes
-+ for am_i in 1 2; do
-+ if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
-+ && test -f conftest2.$ac_objext; then
-+ : OK
-+ else
-+ am_cv_prog_cc_c_o=no
-+ break
-+ fi
-+ done
-+ rm -f core conftest*
-+ unset am_i])
-+if test "$am_cv_prog_cc_c_o" != yes; then
-+ # Losing compiler, so override with the script.
-+ # FIXME: It is wrong to rewrite CC.
-+ # But if we don't then we get into trouble of one sort or another.
-+ # A longer-term fix would be to have automake use am__CC in this case,
-+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-+ CC="$am_aux_dir/compile $CC"
-+fi
-+AC_LANG_POP([C])])
-+
-+# For backward compatibility.
-+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-+
-+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
-+#
-+# 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.
-+
-+# AM_RUN_LOG(COMMAND)
-+# -------------------
-+# Run COMMAND, save the exit status in ac_status, and log it.
-+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-+AC_DEFUN([AM_RUN_LOG],
-+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+ (exit $ac_status); }])
-+
- # Check to make sure that the build environment is sane. -*- Autoconf -*-
-
- # Copyright (C) 1996-2013 Free Software Foundation, Inc.
-@@ -1155,11 +1233,6 @@ m4_include([gnulib-m4/wctype_h.m4])
- m4_include([gnulib-m4/wcwidth.m4])
- m4_include([../m4/fixautomake.m4])
- m4_include([../m4/init-package-version.m4])
--m4_include([../m4/libtool.m4])
--m4_include([../m4/ltoptions.m4])
--m4_include([../m4/ltsugar.m4])
--m4_include([../m4/ltversion.m4])
--m4_include([../m4/lt~obsolete.m4])
- m4_include([../m4/woe32-dll.m4])
- m4_include([m4/codeset.m4])
- m4_include([m4/fcntl-o.m4])
-@@ -1174,8 +1247,13 @@ m4_include([m4/intmax.m4])
- m4_include([m4/inttypes-pri.m4])
- m4_include([m4/inttypes_h.m4])
- m4_include([m4/lcmessage.m4])
-+m4_include([m4/libtool.m4])
- m4_include([m4/lock.m4])
- m4_include([m4/longlong.m4])
-+m4_include([m4/ltoptions.m4])
-+m4_include([m4/ltsugar.m4])
-+m4_include([m4/ltversion.m4])
-+m4_include([m4/lt~obsolete.m4])
- m4_include([m4/nls.m4])
- m4_include([m4/po.m4])
- m4_include([m4/printf-posix.m4])
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/config.h.in gettext-0.18.3.1/gettext-runtime/config.h.in
---- gettext-0.18.3.1.orig/gettext-runtime/config.h.in 2013-08-15 09:26:38.000000000 -0700
-+++ gettext-0.18.3.1/gettext-runtime/config.h.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1165,9 +1165,6 @@
- /* Define if the mbrtowc function returns a wrong return value. */
- #undef MBRTOWC_RETVAL_BUG
-
--/* Define to 1 if your C compiler doesn't accept -c and -o together. */
--#undef NO_MINUS_C_MINUS_O
--
- /* Name of package */
- #undef PACKAGE
-
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/configure gettext-0.18.3.1/gettext-runtime/configure
---- gettext-0.18.3.1.orig/gettext-runtime/configure 2013-08-15 09:26:38.000000000 -0700
-+++ gettext-0.18.3.1/gettext-runtime/configure 2013-12-31 11:58:08.000000000 -0800
-@@ -3381,7 +3381,7 @@ ac_configure="$SHELL $ac_aux_dir/configu
-
-
-
--am__api_version='1.13'
-+am__api_version='1.14'
-
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
-@@ -3911,6 +3911,47 @@ am__tar='$${TAR-tar} chof - "$$tardir"'
-
-
-
-+# POSIX will say in a future version that running "rm -f" with no argument
-+# is OK; and we want to be able to make that assumption in our Makefile
-+# recipes. So use an aggressive probe to check that the usage we want is
-+# actually supported "in the wild" to an acceptable degree.
-+# See automake bug#10828.
-+# To make any issue more visible, cause the running configure to be aborted
-+# by default if the 'rm' program in use doesn't match our expectations; the
-+# user can still override this though.
-+if rm -f && rm -fr && rm -rf; then : OK; else
-+ cat >&2 <<'END'
-+Oops!
-+
-+Your 'rm' program seems unable to run without file operands specified
-+on the command line, even when the '-f' option is present. This is contrary
-+to the behaviour of most rm programs out there, and not conforming with
-+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-+
-+Please tell bug-automake@gnu.org about your system, including the value
-+of your $PATH and any error possibly output before this message. This
-+can help us improve future automake versions.
-+
-+END
-+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-+ echo 'Configuration will proceed anyway, since you have set the' >&2
-+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-+ echo >&2
-+ else
-+ cat >&2 <<'END'
-+Aborting the configuration process, to ensure you take notice of the issue.
-+
-+You can download and install GNU coreutils to get an 'rm' implementation
-+that behaves properly: <http://www.gnu.org/software/coreutils/>.
-+
-+If you want to complete the configuration process using your problematic
-+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-+to "yes", and re-run configure.
-+
-+END
-+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-+ fi
-+fi
- PACKAGE=gettext-runtime
-
- VERSION=$VERSION_NUMBER
-@@ -4721,6 +4762,65 @@ ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-+if ${am_cv_prog_cc_c_o+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+ # Make sure it works both with $CC and with simple cc.
-+ # Following AC_PROG_CC_C_O, we do the test twice because some
-+ # compilers refuse to overwrite an existing .o file with -o,
-+ # though they will create one.
-+ am_cv_prog_cc_c_o=yes
-+ for am_i in 1 2; do
-+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
-+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } \
-+ && test -f conftest2.$ac_objext; then
-+ : OK
-+ else
-+ am_cv_prog_cc_c_o=no
-+ break
-+ fi
-+ done
-+ rm -f core conftest*
-+ unset am_i
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-+$as_echo "$am_cv_prog_cc_c_o" >&6; }
-+if test "$am_cv_prog_cc_c_o" != yes; then
-+ # Losing compiler, so override with the script.
-+ # FIXME: It is wrong to rewrite CC.
-+ # But if we don't then we get into trouble of one sort or another.
-+ # A longer-term fix would be to have automake use am__CC in this case,
-+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-+ CC="$am_aux_dir/compile $CC"
-+fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
- DEPDIR="${am__leading_dot}deps"
-
- ac_config_commands="$ac_config_commands depfiles"
-@@ -5325,23 +5425,23 @@ EOF
- if $JAVAC --version 2>/dev/null | sed -e 1q | grep gcj > /dev/null; then
- if $JAVAC --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^4\.[012]/d' | grep '^[4-9]' >/dev/null; then
- rm -f conftest.class
-- if { echo "$as_me:5328: $JAVAC -d . conftest.java" >&5
-+ if { echo "$as_me:5428: $JAVAC -d . conftest.java" >&5
- $JAVAC -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:5335: $JAVAC -fsource=$source_version -d . conftest.java" >&5
-+ if { echo "$as_me:5435: $JAVAC -fsource=$source_version -d . conftest.java" >&5
- $JAVAC -fsource="$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:5340: $JAVAC -d . conftestfail.java" >&5
-+ && { echo "$as_me:5440: $JAVAC -d . conftestfail.java" >&5
- $JAVAC -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:5344: $JAVAC -fsource=$source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:5444: $JAVAC -fsource=$source_version -d . conftestfail.java" >&5
- $JAVAC -fsource="$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="$JAVAC -fsource=$source_version"
-@@ -5355,7 +5455,7 @@ EOF
- else
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:5358: $JAVAC -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
-+ if { echo "$as_me:5458: $JAVAC -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
- $JAVAC -fsource="$source_version" -ftarget="$target_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
-@@ -5368,7 +5468,7 @@ EOF
- else
- if test "$target_version" = 1.4 && test "$source_version" = 1.4; then
- rm -f conftest.class
-- if { echo "$as_me:5371: $JAVAC -d . conftest.java" >&5
-+ if { echo "$as_me:5471: $JAVAC -d . conftest.java" >&5
- $JAVAC -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -5380,7 +5480,7 @@ EOF
- if test "$target_version" = 1.4 && test "$source_version" = 1.3; then
- javac_works=
- rm -f conftest.class
-- if { echo "$as_me:5383: $JAVAC -d . conftest.java" >&5
-+ if { echo "$as_me:5483: $JAVAC -d . conftest.java" >&5
- $JAVAC -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -5388,7 +5488,7 @@ EOF
- fi
- javac_noassert_works=
- rm -f conftest.class
-- if { echo "$as_me:5391: $JAVAC -fno-assert -d . conftest.java" >&5
-+ if { echo "$as_me:5491: $JAVAC -fno-assert -d . conftest.java" >&5
- $JAVAC -fno-assert -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -5396,11 +5496,11 @@ EOF
- fi
- if test -n "$javac_works" && test -n "$javac_noassert_works"; then
- rm -f conftestfail.class
-- if { echo "$as_me:5399: $JAVAC -d . conftestfail.java" >&5
-+ if { echo "$as_me:5499: $JAVAC -d . conftestfail.java" >&5
- $JAVAC -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:5403: $JAVAC -fno-assert -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:5503: $JAVAC -fno-assert -d . conftestfail.java" >&5
- $JAVAC -fno-assert -d . conftestfail.java >&5 2>&1
- }; then
- javac_works=
-@@ -5422,23 +5522,23 @@ EOF
- fi
- else
- rm -f conftest.class
-- if { echo "$as_me:5425: $JAVAC -d . conftest.java" >&5
-+ if { echo "$as_me:5525: $JAVAC -d . conftest.java" >&5
- $JAVAC -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:5432: $JAVAC -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:5532: $JAVAC -source $source_version -d . conftest.java" >&5
- $JAVAC -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:5437: $JAVAC -d . conftestfail.java" >&5
-+ && { echo "$as_me:5537: $JAVAC -d . conftestfail.java" >&5
- $JAVAC -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:5441: $JAVAC -source $source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:5541: $JAVAC -source $source_version -d . conftestfail.java" >&5
- $JAVAC -source "$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="$JAVAC -source $source_version"
-@@ -5451,23 +5551,23 @@ EOF
- fi
- else
- rm -f conftest.class
-- if { echo "$as_me:5454: $JAVAC -target $target_version -d . conftest.java" >&5
-+ if { echo "$as_me:5554: $JAVAC -target $target_version -d . conftest.java" >&5
- $JAVAC -target "$target_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:5461: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:5561: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
- $JAVAC -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:5466: $JAVAC -target $target_version -d . conftestfail.java" >&5
-+ && { echo "$as_me:5566: $JAVAC -target $target_version -d . conftestfail.java" >&5
- $JAVAC -target "$target_version" -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:5470: $JAVAC -target $target_version -source $source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:5570: $JAVAC -target $target_version -source $source_version -d . conftestfail.java" >&5
- $JAVAC -target "$target_version" -source "$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="$JAVAC -target $target_version -source $source_version"
-@@ -5480,7 +5580,7 @@ EOF
- fi
- else
- rm -f conftest.class
-- if { echo "$as_me:5483: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:5583: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
- $JAVAC -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
-@@ -5598,28 +5698,28 @@ fi
-
- if test -z "$HAVE_JAVACOMP" && test -n "$HAVE_GCJ_IN_PATH"; then
- if gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^3\.[01]/d' | grep '^[3-9]' >/dev/null; then
-- if { echo "$as_me:5601: gcj -C -d . conftestlib.java" >&5
-+ if { echo "$as_me:5701: gcj -C -d . conftestlib.java" >&5
- gcj -C -d . conftestlib.java >&5 2>&1
- }; then
- if gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^4\.[012]/d' | grep '^[4-9]' >/dev/null; then
- rm -f conftest.class
-- if { echo "$as_me:5606: gcj -C -d . conftest.java" >&5
-+ if { echo "$as_me:5706: gcj -C -d . conftest.java" >&5
- gcj -C -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:5613: gcj -C -fsource=$source_version -d . conftest.java" >&5
-+ if { echo "$as_me:5713: gcj -C -fsource=$source_version -d . conftest.java" >&5
- gcj -C -fsource="$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:5618: gcj -C -d . conftestfail.java" >&5
-+ && { echo "$as_me:5718: gcj -C -d . conftestfail.java" >&5
- gcj -C -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:5622: gcj -C -fsource=$source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:5722: gcj -C -fsource=$source_version -d . conftestfail.java" >&5
- gcj -C -fsource="$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="gcj -C -fsource=$source_version"
-@@ -5633,7 +5733,7 @@ fi
- else
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:5636: gcj -C -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
-+ if { echo "$as_me:5736: gcj -C -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
- gcj -C -fsource="$source_version" -ftarget="$target_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
-@@ -5646,7 +5746,7 @@ fi
- else
- if test "$target_version" = 1.4 && test "$source_version" = 1.4; then
- rm -f conftest.class
-- if { echo "$as_me:5649: gcj -C -d . conftest.java" >&5
-+ if { echo "$as_me:5749: gcj -C -d . conftest.java" >&5
- gcj -C -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -5657,7 +5757,7 @@ fi
- else
- if test "$target_version" = 1.4 && test "$source_version" = 1.3; then
- rm -f conftest.class
-- if { echo "$as_me:5660: gcj -C -fno-assert -d . conftest.java" >&5
-+ if { echo "$as_me:5760: gcj -C -fno-assert -d . conftest.java" >&5
- gcj -C -fno-assert -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -5666,7 +5766,7 @@ fi
- HAVE_JAVACOMP=1
- else
- rm -f conftest.class
-- if { echo "$as_me:5669: gcj -C -d . conftest.java" >&5
-+ if { echo "$as_me:5769: gcj -C -d . conftest.java" >&5
- gcj -C -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -5685,23 +5785,23 @@ fi
- if { javac -version >/dev/null 2>/dev/null || test $? -le 2; } \
- && ( if javac -help 2>&1 >/dev/null | grep at.dms.kjc.Main >/dev/null && javac -help 2>/dev/null | grep 'released.*2000' >/dev/null ; then exit 1; else exit 0; fi ); then
- rm -f conftest.class
-- if { echo "$as_me:5688: javac -d . conftest.java" >&5
-+ if { echo "$as_me:5788: javac -d . conftest.java" >&5
- javac -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:5695: javac -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:5795: javac -source $source_version -d . conftest.java" >&5
- javac -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:5700: javac -d . conftestfail.java" >&5
-+ && { echo "$as_me:5800: javac -d . conftestfail.java" >&5
- javac -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:5704: javac -source $source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:5804: javac -source $source_version -d . conftestfail.java" >&5
- javac -source "$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="javac -source $source_version"
-@@ -5714,23 +5814,23 @@ fi
- fi
- else
- rm -f conftest.class
-- if { echo "$as_me:5717: javac -target $target_version -d . conftest.java" >&5
-+ if { echo "$as_me:5817: javac -target $target_version -d . conftest.java" >&5
- javac -target "$target_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:5724: javac -target $target_version -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:5824: javac -target $target_version -source $source_version -d . conftest.java" >&5
- javac -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:5729: javac -target $target_version -d . conftestfail.java" >&5
-+ && { echo "$as_me:5829: javac -target $target_version -d . conftestfail.java" >&5
- javac -target "$target_version" -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:5733: javac -target $target_version -source $source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:5833: javac -target $target_version -source $source_version -d . conftestfail.java" >&5
- javac -target "$target_version" -source "$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="javac -target $target_version -source $source_version"
-@@ -5743,7 +5843,7 @@ fi
- fi
- else
- rm -f conftest.class
-- if { echo "$as_me:5746: javac -target $target_version -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:5846: javac -target $target_version -source $source_version -d . conftest.java" >&5
- javac -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
-@@ -6340,131 +6440,6 @@ fi
- fi
-
-
--if test "x$CC" != xcc; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
--$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
--else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
--$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
--fi
--set dummy $CC; ac_cc=`$as_echo "$2" |
-- sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
--if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--# Make sure it works both with $CC and with simple cc.
--# We do the test twice because some compilers refuse to overwrite an
--# existing .o file with -o, though they will create one.
--ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--rm -f conftest2.*
--if { { case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; } &&
-- test -f conftest2.$ac_objext && { { case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; };
--then
-- eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-- if test "x$CC" != xcc; then
-- # Test first that cc exists at all.
-- if { ac_try='cc -c conftest.$ac_ext >&5'
-- { { case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; }; then
-- ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-- rm -f conftest2.*
-- if { { case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; } &&
-- test -f conftest2.$ac_objext && { { case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; };
-- then
-- # cc works too.
-- :
-- else
-- # cc exists but doesn't like -o.
-- eval ac_cv_prog_cc_${ac_cc}_c_o=no
-- fi
-- fi
-- fi
--else
-- eval ac_cv_prog_cc_${ac_cc}_c_o=no
--fi
--rm -f core conftest*
--
--fi
--if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
--
--fi
--
--# FIXME: we rely on the cache variable name because
--# there is no other way.
--set dummy $CC
--am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
--eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
--if test "$am_t" != yes; then
-- # Losing compiler, so override with the script.
-- # FIXME: It is wrong to rewrite CC.
-- # But if we don't then we get into trouble of one sort or another.
-- # A longer-term fix would be to have automake use am__CC in this case,
-- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-- CC="$am_aux_dir/compile $CC"
--fi
--
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
- $as_echo_n "checking for ANSI C header files... " >&6; }
-@@ -7509,10 +7484,7 @@ else
- lt_cv_path_NM="$NM"
- else
- lt_nm_to_check="${ac_tool_prefix}nm"
-- if test -n "$ac_tool_prefix" \
-- && { test "$build" = "$host" \
-- || { test "$build_os" = cygwin && test "$host_os" = mingw32; }; \
-- }; then
-+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
- lt_nm_to_check="$lt_nm_to_check nm"
- fi
- for lt_tmp_nm in $lt_nm_to_check; do
-@@ -10670,7 +10642,7 @@ fi
- LIBTOOL_DEPS="$ltmain"
-
- # Always use our own libtool.
--LIBTOOL="${CONFIG_SHELL-$SHELL} "'$(top_builddir)/libtool'
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/doc/Makefile.in gettext-0.18.3.1/gettext-runtime/doc/Makefile.in
---- gettext-0.18.3.1.orig/gettext-runtime/doc/Makefile.in 2013-08-15 09:26:40.000000000 -0700
-+++ gettext-0.18.3.1/gettext-runtime/doc/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -166,11 +166,6 @@ am__aclocal_m4_deps = $(top_srcdir)/gnul
- $(top_srcdir)/gnulib-m4/wcwidth.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
-@@ -178,14 +173,16 @@ am__aclocal_m4_deps = $(top_srcdir)/gnul
- $(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
-- $(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
-- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-- $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
-- $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-- $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-- $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
-- $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \
-+ $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
-+ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
-+ $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
-+ $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
-+ $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/gnulib-lib/Makefile.in gettext-0.18.3.1/gettext-runtime/gnulib-lib/Makefile.in
---- gettext-0.18.3.1.orig/gettext-runtime/gnulib-lib/Makefile.in 2013-08-15 09:26:40.000000000 -0700
-+++ gettext-0.18.3.1/gettext-runtime/gnulib-lib/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -198,11 +198,6 @@ am__aclocal_m4_deps = $(top_srcdir)/gnul
- $(top_srcdir)/gnulib-m4/wcwidth.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
-@@ -210,14 +205,16 @@ am__aclocal_m4_deps = $(top_srcdir)/gnul
- $(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
-- $(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
-- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-- $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
-- $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-- $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-- $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
-- $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \
-+ $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
-+ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
-+ $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
-+ $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
-+ $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/intl-csharp/Makefile.in gettext-0.18.3.1/gettext-runtime/intl-csharp/Makefile.in
---- gettext-0.18.3.1.orig/gettext-runtime/intl-csharp/Makefile.in 2013-08-15 09:26:41.000000000 -0700
-+++ gettext-0.18.3.1/gettext-runtime/intl-csharp/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -166,11 +166,6 @@ am__aclocal_m4_deps = $(top_srcdir)/gnul
- $(top_srcdir)/gnulib-m4/wcwidth.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
-@@ -178,14 +173,16 @@ am__aclocal_m4_deps = $(top_srcdir)/gnul
- $(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
-- $(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
-- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-- $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
-- $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-- $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-- $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
-- $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \
-+ $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
-+ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
-+ $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
-+ $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
-+ $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/intl-java/Makefile.in gettext-0.18.3.1/gettext-runtime/intl-java/Makefile.in
---- gettext-0.18.3.1.orig/gettext-runtime/intl-java/Makefile.in 2013-08-15 09:26:41.000000000 -0700
-+++ gettext-0.18.3.1/gettext-runtime/intl-java/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -166,11 +166,6 @@ am__aclocal_m4_deps = $(top_srcdir)/gnul
- $(top_srcdir)/gnulib-m4/wcwidth.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
-@@ -178,14 +173,16 @@ am__aclocal_m4_deps = $(top_srcdir)/gnul
- $(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
-- $(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
-- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-- $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
-- $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-- $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-- $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
-- $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \
-+ $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
-+ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
-+ $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
-+ $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
-+ $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/libasprintf/INSTALL gettext-0.18.3.1/gettext-runtime/libasprintf/INSTALL
---- gettext-0.18.3.1.orig/gettext-runtime/libasprintf/INSTALL 2012-12-09 17:59:06.000000000 -0800
-+++ gettext-0.18.3.1/gettext-runtime/libasprintf/INSTALL 2013-12-31 11:58:08.000000000 -0800
-@@ -1,223 +1,238 @@
--These are generic installation instructions.
-+Installation Instructions
-+*************************
-
--Prerequisites
--=============
-+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-+Inc.
-
-- This package depends on a few other packages. They are listed in
--the file ‘DEPENDENCIES’. It is recommended to install the listed
--packages before installing this package.
-+ Copying and distribution of this file, with or without modification,
-+are permitted in any medium without royalty provided the copyright
-+notice and this notice are preserved. This file is offered as-is,
-+without warranty of any kind.
-
- Basic Installation
- ==================
-
-- The ‘configure’ shell script attempts to guess correct values for
-+ Briefly, the shell command `./configure && make && make install'
-+should configure, build, and install this package. The following
-+more-detailed instructions are generic; see the `README' file for
-+instructions specific to this package. Some packages provide this
-+`INSTALL' file but do not implement all of the features documented
-+below. The lack of an optional feature in a given package is not
-+necessarily a bug. More recommendations for GNU packages can be found
-+in *note Makefile Conventions: (standards)Makefile Conventions.
-+
-+ The `configure' shell script attempts to guess correct values for
- various system-dependent variables used during compilation. It uses
--those values to create a ‘Makefile’ in each directory of the package.
--It may also create one or more ‘.h’ files containing system-dependent
--definitions. Finally, it creates a shell script ‘config.status’ that
--you can run in the future to recreate the current configuration, a file
--‘config.cache’ that saves the results of its tests to speed up
--reconfiguring, and a file ‘config.log’ containing compiler output
--(useful mainly for debugging ‘configure’).
-+those values to create a `Makefile' in each directory of the package.
-+It may also create one or more `.h' files containing system-dependent
-+definitions. Finally, it creates a shell script `config.status' that
-+you can run in the future to recreate the current configuration, and a
-+file `config.log' containing compiler output (useful mainly for
-+debugging `configure').
-+
-+ It can also use an optional file (typically called `config.cache'
-+and enabled with `--cache-file=config.cache' or simply `-C') that saves
-+the results of its tests to speed up reconfiguring. Caching is
-+disabled by default to prevent problems with accidental use of stale
-+cache files.
-
- If you need to do unusual things to compile the package, please try
--to figure out how ‘configure’ could check whether to do them, and mail
--diffs or instructions to the address given in the ‘README’ so they can
--be considered for the next release. If at some point ‘config.cache’
--contains results you don't want to keep, you may remove or edit it.
--
-- The file ‘configure.ac’ is used to create ‘configure’ by a program
--called ‘autoconf’. You only need ‘configure.ac’ if you want to change
--it or regenerate ‘configure’ using a newer version of ‘autoconf’.
--
--The simplest way to compile this package is:
--
-- 1. ‘cd’ to the directory containing the package's source code and type
-- ‘./configure’ to configure the package for your system. If you're
-- using ‘csh’ on an old version of System V, you might need to type
-- ‘sh ./configure’ instead to prevent ‘csh’ from trying to execute
-- ‘configure’ itself.
--
-- Running ‘configure’ takes awhile. While running, it prints some
-- messages telling which features it is checking for.
--
-- 2. Type ‘make’ to compile the package.
--
-- 3. Optionally, type ‘make check’ to run any self-tests that come with
-- the package.
--
-- 4. Type ‘make install’ to install the programs and any data files and
-- documentation.
--
-- 5. You can remove the program binaries and object files from the
-- source code directory by typing ‘make clean’. To also remove the
-- files that ‘configure’ created (so you can compile the package for
-- a different kind of computer), type ‘make distclean’. There is
-- also a ‘make maintainer-clean’ target, but that is intended mainly
-+to figure out how `configure' could check whether to do them, and mail
-+diffs or instructions to the address given in the `README' so they can
-+be considered for the next release. If you are using the cache, and at
-+some point `config.cache' contains results you don't want to keep, you
-+may remove or edit it.
-+
-+ The file `configure.ac' (or `configure.in') is used to create
-+`configure' by a program called `autoconf'. You need `configure.ac' if
-+you want to change it or regenerate `configure' using a newer version
-+of `autoconf'.
-+
-+ The simplest way to compile this package is:
-+
-+ 1. `cd' to the directory containing the package's source code and type
-+ `./configure' to configure the package for your system.
-+
-+ Running `configure' might take a while. While running, it prints
-+ some messages telling which features it is checking for.
-+
-+ 2. Type `make' to compile the package.
-+
-+ 3. Optionally, type `make check' to run any self-tests that come with
-+ the package, generally using the just-built uninstalled binaries.
-+
-+ 4. Type `make install' to install the programs and any data files and
-+ documentation. When installing into a prefix owned by root, it is
-+ recommended that the package be configured and built as a regular
-+ user, and only the `make install' phase executed with root
-+ privileges.
-+
-+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
-+ this time using the binaries in their final installed location.
-+ This target does not install anything. Running this target as a
-+ regular user, particularly if the prior `make install' required
-+ root privileges, verifies that the installation completed
-+ correctly.
-+
-+ 6. You can remove the program binaries and object files from the
-+ source code directory by typing `make clean'. To also remove the
-+ files that `configure' created (so you can compile the package for
-+ a different kind of computer), type `make distclean'. There is
-+ also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-+ 7. Often, you can also type `make uninstall' to remove the installed
-+ files again. In practice, not all packages have tested that
-+ uninstallation works correctly, even though it is required by the
-+ GNU Coding Standards.
-+
-+ 8. Some packages, particularly those that use Automake, provide `make
-+ distcheck', which can by used by developers to test that all other
-+ targets like `make install' and `make uninstall' work correctly.
-+ This target is generally not run by end users.
-+
- Compilers and Options
- =====================
-
- Some systems require unusual options for compilation or linking that
--the ‘configure’ script does not know about. You can give ‘configure’
--initial values for variables as arguments. You can do it like this:
-- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-+the `configure' script does not know about. Run `./configure --help'
-+for details on some of the pertinent environment variables.
-+
-+ You can give `configure' initial values for configuration parameters
-+by setting variables in the command line or in the environment. Here
-+is an example:
-+
-+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-+
-+ *Note Defining Variables::, for more details.
-
- Compiling For Multiple Architectures
- ====================================
-
- You can compile the package for more than one kind of computer at the
- same time, by placing the object files for each architecture in their
--own directory. To do this, you must use a version of ‘make’ that
--supports the ‘VPATH’ variable, such as GNU ‘make’. ‘cd’ to the
-+own directory. To do this, you can use GNU `make'. `cd' to the
- directory where you want the object files and executables to go and run
--the ‘configure’ script. ‘configure’ automatically checks for the
--source code in the directory that ‘configure’ is in and in ‘..’.
--
-- If you have to use a ‘make’ that does not supports the ‘VPATH’
--variable, you have to compile the package for one architecture at a time
--in the source code directory. After you have installed the package for
--one architecture, use ‘make distclean’ before reconfiguring for another
--architecture.
-+the `configure' script. `configure' automatically checks for the
-+source code in the directory that `configure' is in and in `..'. This
-+is known as a "VPATH" build.
-+
-+ With a non-GNU `make', it is safer to compile the package for one
-+architecture at a time in the source code directory. After you have
-+installed the package for one architecture, use `make distclean' before
-+reconfiguring for another architecture.
-
- On MacOS X 10.5 and later systems, you can create libraries and
- executables that work on multiple system types--known as "fat" or
--"universal" binaries--by specifying multiple '-arch' options to the
--compiler but only a single '-arch' option to the preprocessor. Like
-+"universal" binaries--by specifying multiple `-arch' options to the
-+compiler but only a single `-arch' option to the preprocessor. Like
- this:
-
- ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CPP="gcc -E" CXXCPP="g++ -E"
-
-- This is not guaranteed to produce working output in all cases. You
-+ This is not guaranteed to produce working output in all cases, you
- may have to build one architecture at a time and combine the results
--using the 'lipo' tool if you have problems.
-+using the `lipo' tool if you have problems.
-
- Installation Names
- ==================
-
-- By default, ‘make install’ will install the package's files in
--‘/usr/local/bin’, ‘/usr/local/man’, etc. You can specify an
--installation prefix other than ‘/usr/local’ by giving ‘configure’ the
--option ‘--prefix=PATH’.
-+ By default, `make install' installs the package's commands under
-+`/usr/local/bin', include files under `/usr/local/include', etc. You
-+can specify an installation prefix other than `/usr/local' by giving
-+`configure' the option `--prefix=PREFIX', where PREFIX must be an
-+absolute file name.
-
- You can specify separate installation prefixes for
- architecture-specific files and architecture-independent files. If you
--give ‘configure’ the option ‘--exec-prefix=PATH’, the package will use
--PATH as the prefix for installing programs and libraries.
--Documentation and other data files will still use the regular prefix.
-+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-+PREFIX as the prefix for installing programs and libraries.
-+Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
--options like ‘--bindir=PATH’ to specify different values for particular
--kinds of files. Run ‘configure --help’ for a list of the directories
--you can set and what kinds of files go in them.
--
-- If the package supports it, you can cause programs to be installed
--with an extra prefix or suffix on their names by giving ‘configure’ the
--option ‘--program-prefix=PREFIX’ or ‘--program-suffix=SUFFIX’.
--
--Enabling Relocatability
--=======================
--
-- It has been a pain for many users of GNU packages for a long time
--that packages are not relocatable. It means a user cannot copy a
--program, installed by another user on the same machine, to his home
--directory, and have it work correctly (including i18n). So many users
--need to go through ‘configure; make; make install’ with all its
--dependencies, options, and hurdles.
--
-- Red Hat, Debian, and similar package systems solve the "ease of
--installation" problem, but they hardwire path names, usually to ‘/usr’
--or ‘/usr/local’. This means that users need root privileges to install
--a binary package, and prevents installing two different versions of the
--same binary package.
--
-- A relocatable program can be moved or copied to a different location
--on the filesystem. It is possible to make symlinks to the installed
--and moved programs, and invoke them through the symlink. It is possible
--to do the same thing with a hard link _only_ if the hard link file is
--in the same directory as the real program.
--
-- To configure a program to be relocatable, add ‘--enable-relocatable’
--to the ‘configure’ command line.
--
-- On some OSes the executables remember the location of shared
--libraries and prefer them over any other search path. Therefore, such
--an executable will look for its shared libraries first in the original
--installation directory and only then in the current installation
--directory. Thus, for reliability, it is best to also give a ‘--prefix’
--option pointing to a directory that does not exist now and which never
--will be created, e.g. ‘--prefix=/nonexistent’. You may use
--‘DESTDIR=DEST-DIR’ on the ‘make’ command line to avoid installing into
--that directory.
--
-- We do not recommend using a prefix writable by unprivileged users
--(e.g. ‘/tmp/inst$$’) because such a directory can be recreated by an
--unprivileged user after the original directory has been removed. We
--also do not recommend prefixes that might be behind an automounter
--(e.g. ‘$HOME/inst$$’) because of the performance impact of directory
--searching.
--
-- Here's a sample installation run that takes into account all these
--recommendations:
--
-- ./configure --enable-relocatable --prefix=/nonexistent
-- make
-- make install DESTDIR=/tmp/inst$$
--
-- Installation with ‘--enable-relocatable’ will not work for setuid or
--setgid executables, because such executables search only system library
--paths for security reasons. Also, installation with
--‘--enable-relocatable’ might not work on OpenBSD, when the package
--contains shared libraries and libtool versions 1.5.xx are used.
--
-- The runtime penalty and size penalty are negligible on GNU/Linux
--(just one system call more when an executable is launched), and small on
--other systems (the wrapper program just sets an environment variable
--and executes the real program).
-+options like `--bindir=DIR' to specify different values for particular
-+kinds of files. Run `configure --help' for a list of the directories
-+you can set and what kinds of files go in them. In general, the
-+default for these options is expressed in terms of `${prefix}', so that
-+specifying just `--prefix' will affect all of the other directory
-+specifications that were not explicitly provided.
-+
-+ The most portable way to affect installation locations is to pass the
-+correct locations to `configure'; however, many packages provide one or
-+both of the following shortcuts of passing variable assignments to the
-+`make install' command line to change installation locations without
-+having to reconfigure or recompile.
-+
-+ The first method involves providing an override variable for each
-+affected directory. For example, `make install
-+prefix=/alternate/directory' will choose an alternate location for all
-+directory configuration variables that were expressed in terms of
-+`${prefix}'. Any directories that were specified during `configure',
-+but not in terms of `${prefix}', must each be overridden at install
-+time for the entire installation to be relocated. The approach of
-+makefile variable overrides for each directory variable is required by
-+the GNU Coding Standards, and ideally causes no recompilation.
-+However, some platforms have known limitations with the semantics of
-+shared libraries that end up requiring recompilation when using this
-+method, particularly noticeable in packages that use GNU Libtool.
-+
-+ The second method involves providing the `DESTDIR' variable. For
-+example, `make install DESTDIR=/alternate/directory' will prepend
-+`/alternate/directory' before all installation names. The approach of
-+`DESTDIR' overrides is not required by the GNU Coding Standards, and
-+does not work on platforms that have drive letters. On the other hand,
-+it does better at avoiding recompilation issues, and works well even
-+when some directory options were not specified in terms of `${prefix}'
-+at `configure' time.
-
- Optional Features
- =================
-
-- Some packages pay attention to ‘--enable-FEATURE’ options to
--‘configure’, where FEATURE indicates an optional part of the package.
--They may also pay attention to ‘--with-PACKAGE’ options, where PACKAGE
--is something like ‘gnu-as’ or ‘x’ (for the X Window System). The
--‘README’ should mention any ‘--enable-’ and ‘--with-’ options that the
-+ If the package supports it, you can cause programs to be installed
-+with an extra prefix or suffix on their names by giving `configure' the
-+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-+
-+ Some packages pay attention to `--enable-FEATURE' options to
-+`configure', where FEATURE indicates an optional part of the package.
-+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-+is something like `gnu-as' or `x' (for the X Window System). The
-+`README' should mention any `--enable-' and `--with-' options that the
- package recognizes.
-
-- For packages that use the X Window System, ‘configure’ can usually
-+ For packages that use the X Window System, `configure' can usually
- find the X include and library files automatically, but if it doesn't,
--you can use the ‘configure’ options ‘--x-includes=DIR’ and
--‘--x-libraries=DIR’ to specify their locations.
-+you can use the `configure' options `--x-includes=DIR' and
-+`--x-libraries=DIR' to specify their locations.
-
-- For packages that use the GNU libiconv library, you can use the
--‘configure’ option ‘--with-libiconv-prefix’ to specify the prefix you
--used while installing GNU libiconv. This option is not necessary if
--that other prefix is the same as the one now specified through --prefix.
--
-- For packages that use the GNU libintl library, you can use the
--‘configure’ option ‘--with-libintl-prefix’ to specify the prefix you
--used while installing GNU gettext-runtime. This option is not necessary if
--that other prefix is the same as the one now specified through --prefix.
-+ Some packages offer the ability to configure how verbose the
-+execution of `make' will be. For these packages, running `./configure
-+--enable-silent-rules' sets the default to minimal output, which can be
-+overridden with `make V=1'; while running `./configure
-+--disable-silent-rules' sets the default to verbose, which can be
-+overridden with `make V=0'.
-
--Particular Systems
-+Particular systems
- ==================
-
-- On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC
--is not installed, it is recommended to use the following options in order
--to use an ANSI C compiler:
-+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-+CC is not installed, it is recommended to use the following options in
-+order to use an ANSI C compiler:
-
- ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
- and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-+ HP-UX `make' updates targets which have the same time stamps as
-+their prerequisites, which makes it generally unusable when shipped
-+generated files such as `configure' are involved. Use GNU `make'
-+instead.
-+
- On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
--parse its ‘<wchar.h>’ header file. The option ‘-nodtk’ can be used as
-+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
- a workaround. If GNU CC is not installed, it is therefore recommended
- to try
-
-@@ -227,81 +242,129 @@ and if that doesn't work, try
-
- ./configure CC="cc -nodtk"
-
-- On AIX 3, the C include files by default don't define some necessary
--prototype declarations. If GNU CC is not installed, it is recommended to
--use the following options:
--
-- ./configure CC="xlc -D_ALL_SOURCE"
-+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
-+directory contains several dysfunctional programs; working variants of
-+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
-+in your `PATH', put it _after_ `/usr/bin'.
-
-- On Haiku, software installed for all users goes in /boot/common, not
--/usr/local. It is recommended to use the following options:
-+ On Haiku, software installed for all users goes in `/boot/common',
-+not `/usr/local'. It is recommended to use the following options:
-
- ./configure --prefix=/boot/common
-
-- On BeOS, user installed software goes in /boot/home/config, not
--/usr/local. It is recommended to use the following options:
--
-- ./configure --prefix=/boot/home/config
--
- Specifying the System Type
- ==========================
-
-- There may be some features ‘configure’ can not figure out
--automatically, but needs to determine by the type of host the package
--will run on. Usually ‘configure’ can figure that out, but if it prints
--a message saying it can not guess the host type, give it the
--‘--host=TYPE’ option. TYPE can either be a short name for the system
--type, such as ‘sun4’, or a canonical name with three fields:
-+ There may be some features `configure' cannot figure out
-+automatically, but needs to determine by the type of machine the package
-+will run on. Usually, assuming the package is built to be run on the
-+_same_ architectures, `configure' can figure that out, but if it prints
-+a message saying it cannot guess the machine type, give it the
-+`--build=TYPE' option. TYPE can either be a short name for the system
-+type, such as `sun4', or a canonical name which has the form:
-+
- CPU-COMPANY-SYSTEM
-
--See the file ‘config.sub’ for the possible values of each field. If
--‘config.sub’ isn't included in this package, then this package doesn't
--need to know the host type.
--
-- If you are building compiler tools for cross-compiling, you can also
--use the ‘--target=TYPE’ option to select the type of system they will
--produce code for and the ‘--build=TYPE’ option to select the type of
--system on which you are compiling the package.
-+where SYSTEM can have one of these forms:
-+
-+ OS
-+ KERNEL-OS
-+
-+ See the file `config.sub' for the possible values of each field. If
-+`config.sub' isn't included in this package, then this package doesn't
-+need to know the machine type.
-+
-+ If you are _building_ compiler tools for cross-compiling, you should
-+use the option `--target=TYPE' to select the type of system they will
-+produce code for.
-+
-+ If you want to _use_ a cross compiler, that generates code for a
-+platform different from the build platform, you should specify the
-+"host" platform (i.e., that on which the generated programs will
-+eventually be run) with `--host=TYPE'.
-
- Sharing Defaults
- ================
-
-- If you want to set default values for ‘configure’ scripts to share,
--you can create a site shell script called ‘config.site’ that gives
--default values for variables like ‘CC’, ‘cache_file’, and ‘prefix’.
--‘configure’ looks for ‘PREFIX/share/config.site’ if it exists, then
--‘PREFIX/etc/config.site’ if it exists. Or, you can set the
--‘CONFIG_SITE’ environment variable to the location of the site script.
--A warning: not all ‘configure’ scripts look for a site script.
-+ If you want to set default values for `configure' scripts to share,
-+you can create a site shell script called `config.site' that gives
-+default values for variables like `CC', `cache_file', and `prefix'.
-+`configure' looks for `PREFIX/share/config.site' if it exists, then
-+`PREFIX/etc/config.site' if it exists. Or, you can set the
-+`CONFIG_SITE' environment variable to the location of the site script.
-+A warning: not all `configure' scripts look for a site script.
-
--Operation Controls
-+Defining Variables
- ==================
-
-- ‘configure’ recognizes the following options to control how it
-+ Variables not defined in a site shell script can be set in the
-+environment passed to `configure'. However, some packages may run
-+configure again during the build, and the customized values of these
-+variables may be lost. In order to avoid this problem, you should set
-+them in the `configure' command line, using `VAR=value'. For example:
-+
-+ ./configure CC=/usr/local2/bin/gcc
-+
-+causes the specified `gcc' to be used as the C compiler (unless it is
-+overridden in the site shell script).
-+
-+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-+an Autoconf limitation. Until the limitation is lifted, you can use
-+this workaround:
-+
-+ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
-+
-+`configure' Invocation
-+======================
-+
-+ `configure' recognizes the following options to control how it
- operates.
-
--‘--cache-file=FILE’
-- Use and save the results of the tests in FILE instead of
-- ‘./config.cache’. Set FILE to ‘/dev/null’ to disable caching, for
-- debugging ‘configure’.
--
--‘--help’
-- Print a summary of the options to ‘configure’, and exit.
--
--‘--quiet’
--‘--silent’
--‘-q’
-+`--help'
-+`-h'
-+ Print a summary of all of the options to `configure', and exit.
-+
-+`--help=short'
-+`--help=recursive'
-+ Print a summary of the options unique to this package's
-+ `configure', and exit. The `short' variant lists options used
-+ only in the top level, while the `recursive' variant lists options
-+ also present in any nested packages.
-+
-+`--version'
-+`-V'
-+ Print the version of Autoconf used to generate the `configure'
-+ script, and exit.
-+
-+`--cache-file=FILE'
-+ Enable the cache: use and save the results of the tests in FILE,
-+ traditionally `config.cache'. FILE defaults to `/dev/null' to
-+ disable caching.
-+
-+`--config-cache'
-+`-C'
-+ Alias for `--cache-file=config.cache'.
-+
-+`--quiet'
-+`--silent'
-+`-q'
- Do not print messages saying which checks are being made. To
-- suppress all normal output, redirect it to ‘/dev/null’ (any error
-+ suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
--‘--srcdir=DIR’
-+`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
-- ‘configure’ can determine that directory automatically.
--
--‘--version’
-- Print the version of Autoconf used to generate the ‘configure’
-- script, and exit.
-+ `configure' can determine that directory automatically.
-
--‘configure’ also accepts some other, not widely useful, options.
-+`--prefix=DIR'
-+ Use DIR as the installation prefix. *note Installation Names::
-+ for more details, including other options available for fine-tuning
-+ the installation locations.
-+
-+`--no-create'
-+`-n'
-+ Run the configure checks, but stop before creating any output
-+ files.
-
-+`configure' also accepts some other, not widely useful, options. Run
-+`configure --help' for more details.
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/libasprintf/Makefile.in gettext-0.18.3.1/gettext-runtime/libasprintf/Makefile.in
---- gettext-0.18.3.1.orig/gettext-runtime/libasprintf/Makefile.in 2013-08-15 09:26:30.000000000 -0700
-+++ gettext-0.18.3.1/gettext-runtime/libasprintf/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -108,11 +108,14 @@ DIST_COMMON = $(srcdir)/Makefile.gnulib
- $(srcdir)/config.h.in \
- $(top_srcdir)/../../build-aux/mkinstalldirs alloca.c \
- $(top_srcdir)/../../build-aux/texinfo.tex $(include_HEADERS) \
-- COPYING COPYING.LIB ../../build-aux/config.guess \
-- ../../build-aux/config.rpath ../../build-aux/config.sub \
-- ../../build-aux/install-sh ../../build-aux/missing \
-- ../../build-aux/mkinstalldirs ../../build-aux/texinfo.tex \
-+ COPYING COPYING.LIB ../../build-aux/compile \
-+ ../../build-aux/config.guess ../../build-aux/config.rpath \
-+ ../../build-aux/config.sub ../../build-aux/depcomp \
-+ ../../build-aux/install-sh ../../build-aux/mdate-sh \
-+ ../../build-aux/missing ../../build-aux/mkinstalldirs \
-+ ../../build-aux/texinfo.tex ../../build-aux/ylwrap \
- ../../build-aux/ltmain.sh \
-+ $(top_srcdir)/../../build-aux/compile \
- $(top_srcdir)/../../build-aux/config.guess \
- $(top_srcdir)/../../build-aux/config.sub \
- $(top_srcdir)/../../build-aux/install-sh \
-@@ -583,8 +586,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- $(am__aclocal_m4_deps):
-
- config.h: stamp-h1
-- @if test ! -f $@; then rm -f stamp-h1; else :; fi
-- @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
-+ @test -f $@ || rm -f stamp-h1
-+ @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
-
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
-@@ -653,10 +656,10 @@ distclean-compile:
- -rm -f *.tab.c
-
- .c.o:
-- $(AM_V_CC)$(COMPILE) -c $<
-+ $(AM_V_CC)$(COMPILE) -c -o $@ $<
-
- .c.obj:
-- $(AM_V_CC)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+ $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .c.lo:
- $(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
-@@ -718,13 +721,9 @@ distclean-libtool:
- $(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
- -o $(@:.html=.htp) $<; \
- then \
-- rm -rf $@; \
-- if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-- mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
-+ rm -rf $@ && mv $(@:.html=.htp) $@; \
- else \
-- if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-- rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
-- exit 1; \
-+ rm -rf $(@:.html=.htp); exit 1; \
- fi
- $(srcdir)/autosprintf.info: autosprintf.texi
- autosprintf.dvi: autosprintf.texi
-@@ -963,10 +962,16 @@ dist-xz: distdir
- $(am__post_remove_distdir)
-
- dist-tarZ: distdir
-+ @echo WARNING: "Support for shar distribution archives is" \
-+ "deprecated." >&2
-+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__post_remove_distdir)
-
- dist-shar: distdir
-+ @echo WARNING: "Support for distribution archives compressed with" \
-+ "legacy program 'compress' is deprecated." >&2
-+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__post_remove_distdir)
-
-@@ -1008,9 +1013,10 @@ distcheck: dist
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
-- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+ && ../configure \
- $(AM_DISTCHECK_CONFIGURE_FLAGS) \
- $(DISTCHECK_CONFIGURE_FLAGS) \
-+ --srcdir=.. --prefix="$$dc_install_base" \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
- && $(MAKE) $(AM_MAKEFLAGS) check \
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/libasprintf/aclocal.m4 gettext-0.18.3.1/gettext-runtime/libasprintf/aclocal.m4
---- gettext-0.18.3.1.orig/gettext-runtime/libasprintf/aclocal.m4 2013-08-15 09:26:27.000000000 -0700
-+++ gettext-0.18.3.1/gettext-runtime/libasprintf/aclocal.m4 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
-+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
-
- # Copyright (C) 1996-2013 Free Software Foundation, Inc.
-
-@@ -32,10 +32,10 @@ To do so, use the procedure documented b
- # generated from the m4 files accompanying Automake X.Y.
- # (This private macro should not be called outside this file.)
- AC_DEFUN([AM_AUTOMAKE_VERSION],
--[am__api_version='1.13'
-+[am__api_version='1.14'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.13.4], [],
-+m4_if([$1], [1.14.1], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.13.4])dnl
-+[AM_AUTOMAKE_VERSION([1.14.1])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-@@ -418,6 +418,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
- # This macro actually does too much. Some checks are only needed if
- # your package does certain things. But this isn't really a big deal.
-
-+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
-+m4_define([AC_PROG_CC],
-+m4_defn([AC_PROG_CC])
-+[_AM_PROG_CC_C_O
-+])
-+
- # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
- # AM_INIT_AUTOMAKE([OPTIONS])
- # -----------------------------------------------
-@@ -526,7 +532,48 @@ dnl macro is hooked onto _AC_COMPILER_EX
- AC_CONFIG_COMMANDS_PRE(dnl
- [m4_provide_if([_AM_COMPILER_EXEEXT],
- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
--])
-+
-+# POSIX will say in a future version that running "rm -f" with no argument
-+# is OK; and we want to be able to make that assumption in our Makefile
-+# recipes. So use an aggressive probe to check that the usage we want is
-+# actually supported "in the wild" to an acceptable degree.
-+# See automake bug#10828.
-+# To make any issue more visible, cause the running configure to be aborted
-+# by default if the 'rm' program in use doesn't match our expectations; the
-+# user can still override this though.
-+if rm -f && rm -fr && rm -rf; then : OK; else
-+ cat >&2 <<'END'
-+Oops!
-+
-+Your 'rm' program seems unable to run without file operands specified
-+on the command line, even when the '-f' option is present. This is contrary
-+to the behaviour of most rm programs out there, and not conforming with
-+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-+
-+Please tell bug-automake@gnu.org about your system, including the value
-+of your $PATH and any error possibly output before this message. This
-+can help us improve future automake versions.
-+
-+END
-+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-+ echo 'Configuration will proceed anyway, since you have set the' >&2
-+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-+ echo >&2
-+ else
-+ cat >&2 <<'END'
-+Aborting the configuration process, to ensure you take notice of the issue.
-+
-+You can download and install GNU coreutils to get an 'rm' implementation
-+that behaves properly: <http://www.gnu.org/software/coreutils/>.
-+
-+If you want to complete the configuration process using your problematic
-+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-+to "yes", and re-run configure.
-+
-+END
-+ AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
-+ fi
-+fi])
-
- dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
- dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-@@ -534,7 +581,6 @@ dnl mangled by Autoconf and run in a she
- m4_define([_AC_COMPILER_EXEEXT],
- m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
--
- # When config.status generates a header, we must update the stamp-h file.
- # This file resides in the same directory as the config header
- # that is generated. The stamp files are numbered to have different names.
-@@ -716,6 +762,70 @@ AC_DEFUN([_AM_SET_OPTIONS],
- AC_DEFUN([_AM_IF_OPTION],
- [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-+#
-+# 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.
-+
-+# _AM_PROG_CC_C_O
-+# ---------------
-+# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
-+# to automatically call this.
-+AC_DEFUN([_AM_PROG_CC_C_O],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+AC_REQUIRE_AUX_FILE([compile])dnl
-+AC_LANG_PUSH([C])dnl
-+AC_CACHE_CHECK(
-+ [whether $CC understands -c and -o together],
-+ [am_cv_prog_cc_c_o],
-+ [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-+ # Make sure it works both with $CC and with simple cc.
-+ # Following AC_PROG_CC_C_O, we do the test twice because some
-+ # compilers refuse to overwrite an existing .o file with -o,
-+ # though they will create one.
-+ am_cv_prog_cc_c_o=yes
-+ for am_i in 1 2; do
-+ if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
-+ && test -f conftest2.$ac_objext; then
-+ : OK
-+ else
-+ am_cv_prog_cc_c_o=no
-+ break
-+ fi
-+ done
-+ rm -f core conftest*
-+ unset am_i])
-+if test "$am_cv_prog_cc_c_o" != yes; then
-+ # Losing compiler, so override with the script.
-+ # FIXME: It is wrong to rewrite CC.
-+ # But if we don't then we get into trouble of one sort or another.
-+ # A longer-term fix would be to have automake use am__CC in this case,
-+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-+ CC="$am_aux_dir/compile $CC"
-+fi
-+AC_LANG_POP([C])])
-+
-+# For backward compatibility.
-+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-+
-+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
-+#
-+# 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.
-+
-+# AM_RUN_LOG(COMMAND)
-+# -------------------
-+# Run COMMAND, save the exit status in ac_status, and log it.
-+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-+AC_DEFUN([AM_RUN_LOG],
-+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+ (exit $ac_status); }])
-+
- # Check to make sure that the build environment is sane. -*- Autoconf -*-
-
- # Copyright (C) 1996-2013 Free Software Foundation, Inc.
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/libasprintf/configure gettext-0.18.3.1/gettext-runtime/libasprintf/configure
---- gettext-0.18.3.1.orig/gettext-runtime/libasprintf/configure 2013-08-15 09:26:28.000000000 -0700
-+++ gettext-0.18.3.1/gettext-runtime/libasprintf/configure 2013-12-31 11:58:08.000000000 -0800
-@@ -2679,7 +2679,7 @@ ac_config_sub="$SHELL $ac_aux_dir/config
- ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-
-
--am__api_version='1.13'
-+am__api_version='1.14'
-
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
-@@ -3216,6 +3216,47 @@ am__tar='$${TAR-tar} chof - "$$tardir"'
-
-
-
-+# POSIX will say in a future version that running "rm -f" with no argument
-+# is OK; and we want to be able to make that assumption in our Makefile
-+# recipes. So use an aggressive probe to check that the usage we want is
-+# actually supported "in the wild" to an acceptable degree.
-+# See automake bug#10828.
-+# To make any issue more visible, cause the running configure to be aborted
-+# by default if the 'rm' program in use doesn't match our expectations; the
-+# user can still override this though.
-+if rm -f && rm -fr && rm -rf; then : OK; else
-+ cat >&2 <<'END'
-+Oops!
-+
-+Your 'rm' program seems unable to run without file operands specified
-+on the command line, even when the '-f' option is present. This is contrary
-+to the behaviour of most rm programs out there, and not conforming with
-+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-+
-+Please tell bug-automake@gnu.org about your system, including the value
-+of your $PATH and any error possibly output before this message. This
-+can help us improve future automake versions.
-+
-+END
-+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-+ echo 'Configuration will proceed anyway, since you have set the' >&2
-+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-+ echo >&2
-+ else
-+ cat >&2 <<'END'
-+Aborting the configuration process, to ensure you take notice of the issue.
-+
-+You can download and install GNU coreutils to get an 'rm' implementation
-+that behaves properly: <http://www.gnu.org/software/coreutils/>.
-+
-+If you want to complete the configuration process using your problematic
-+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-+to "yes", and re-run configure.
-+
-+END
-+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-+ fi
-+fi
- ac_config_headers="$ac_config_headers config.h"
-
-
-@@ -4007,6 +4048,65 @@ ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-+if ${am_cv_prog_cc_c_o+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+ # Make sure it works both with $CC and with simple cc.
-+ # Following AC_PROG_CC_C_O, we do the test twice because some
-+ # compilers refuse to overwrite an existing .o file with -o,
-+ # though they will create one.
-+ am_cv_prog_cc_c_o=yes
-+ for am_i in 1 2; do
-+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
-+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } \
-+ && test -f conftest2.$ac_objext; then
-+ : OK
-+ else
-+ am_cv_prog_cc_c_o=no
-+ break
-+ fi
-+ done
-+ rm -f core conftest*
-+ unset am_i
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-+$as_echo "$am_cv_prog_cc_c_o" >&6; }
-+if test "$am_cv_prog_cc_c_o" != yes; then
-+ # Losing compiler, so override with the script.
-+ # FIXME: It is wrong to rewrite CC.
-+ # But if we don't then we get into trouble of one sort or another.
-+ # A longer-term fix would be to have automake use am__CC in this case,
-+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-+ CC="$am_aux_dir/compile $CC"
-+fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
- DEPDIR="${am__leading_dot}deps"
-
- ac_config_commands="$ac_config_commands depfiles"
-@@ -5605,10 +5705,7 @@ else
- lt_cv_path_NM="$NM"
- else
- lt_nm_to_check="${ac_tool_prefix}nm"
-- if test -n "$ac_tool_prefix" \
-- && { test "$build" = "$host" \
-- || { test "$build_os" = cygwin && test "$host_os" = mingw32; }; \
-- }; then
-+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
- lt_nm_to_check="$lt_nm_to_check nm"
- fi
- for lt_tmp_nm in $lt_nm_to_check; do
-@@ -8906,7 +9003,7 @@ fi
- LIBTOOL_DEPS="$ltmain"
-
- # Always use our own libtool.
--LIBTOOL="${CONFIG_SHELL-$SHELL} "'$(top_builddir)/libtool'
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/m4/Makefile.in gettext-0.18.3.1/gettext-runtime/m4/Makefile.in
---- gettext-0.18.3.1.orig/gettext-runtime/m4/Makefile.in 2013-08-15 09:26:41.000000000 -0700
-+++ gettext-0.18.3.1/gettext-runtime/m4/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -166,11 +166,6 @@ am__aclocal_m4_deps = $(top_srcdir)/gnul
- $(top_srcdir)/gnulib-m4/wcwidth.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
-@@ -178,14 +173,16 @@ am__aclocal_m4_deps = $(top_srcdir)/gnul
- $(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
-- $(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
-- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-- $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
-- $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-- $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-- $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
-- $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \
-+ $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
-+ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
-+ $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
-+ $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
-+ $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/m4/libtool.m4 gettext-0.18.3.1/gettext-runtime/m4/libtool.m4
---- gettext-0.18.3.1.orig/gettext-runtime/m4/libtool.m4 1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.18.3.1/gettext-runtime/m4/libtool.m4 2013-12-31 11:58:08.000000000 -0800
-@@ -0,0 +1,7982 @@
-+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-+#
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-+# Foundation, Inc.
-+# Written by Gordon Matzigkeit, 1996
-+#
-+# 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.
-+
-+m4_define([_LT_COPYING], [dnl
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-+# Foundation, Inc.
-+# Written by Gordon Matzigkeit, 1996
-+#
-+# This file is part of GNU Libtool.
-+#
-+# GNU Libtool 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.
-+#
-+# As a special exception to the GNU General Public License,
-+# if you distribute this file as part of a program or library that
-+# is built using GNU Libtool, you may include this file under the
-+# same distribution terms that you use for the rest of that program.
-+#
-+# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy
-+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-+# obtained by writing to the Free Software Foundation, Inc.,
-+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+])
-+
-+# serial 57 LT_INIT
-+
-+
-+# LT_PREREQ(VERSION)
-+# ------------------
-+# Complain and exit if this libtool version is less that VERSION.
-+m4_defun([LT_PREREQ],
-+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-+ [m4_default([$3],
-+ [m4_fatal([Libtool version $1 or higher is required],
-+ 63)])],
-+ [$2])])
-+
-+
-+# _LT_CHECK_BUILDDIR
-+# ------------------
-+# Complain if the absolute build directory name contains unusual characters
-+m4_defun([_LT_CHECK_BUILDDIR],
-+[case `pwd` in
-+ *\ * | *\ *)
-+ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-+esac
-+])
-+
-+
-+# LT_INIT([OPTIONS])
-+# ------------------
-+AC_DEFUN([LT_INIT],
-+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-+AC_BEFORE([$0], [LT_LANG])dnl
-+AC_BEFORE([$0], [LT_OUTPUT])dnl
-+AC_BEFORE([$0], [LTDL_INIT])dnl
-+m4_require([_LT_CHECK_BUILDDIR])dnl
-+
-+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-+dnl unless we require an AC_DEFUNed macro:
-+AC_REQUIRE([LTOPTIONS_VERSION])dnl
-+AC_REQUIRE([LTSUGAR_VERSION])dnl
-+AC_REQUIRE([LTVERSION_VERSION])dnl
-+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-+m4_require([_LT_PROG_LTMAIN])dnl
-+
-+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-+
-+dnl Parse OPTIONS
-+_LT_SET_OPTIONS([$0], [$1])
-+
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ltmain"
-+
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+AC_SUBST(LIBTOOL)dnl
-+
-+_LT_SETUP
-+
-+# Only expand once:
-+m4_define([LT_INIT])
-+])# LT_INIT
-+
-+# Old names:
-+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-+
-+
-+# _LT_CC_BASENAME(CC)
-+# -------------------
-+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
-+m4_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 "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-+])
-+
-+
-+# _LT_FILEUTILS_DEFAULTS
-+# ----------------------
-+# It is okay to use these file commands and assume they have been set
-+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-+m4_defun([_LT_FILEUTILS_DEFAULTS],
-+[: ${CP="cp -f"}
-+: ${MV="mv -f"}
-+: ${RM="rm -f"}
-+])# _LT_FILEUTILS_DEFAULTS
-+
-+
-+# _LT_SETUP
-+# ---------
-+m4_defun([_LT_SETUP],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-+
-+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
-+dnl
-+_LT_DECL([], [host_alias], [0], [The host system])dnl
-+_LT_DECL([], [host], [0])dnl
-+_LT_DECL([], [host_os], [0])dnl
-+dnl
-+_LT_DECL([], [build_alias], [0], [The build system])dnl
-+_LT_DECL([], [build], [0])dnl
-+_LT_DECL([], [build_os], [0])dnl
-+dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([LT_PATH_LD])dnl
-+AC_REQUIRE([LT_PATH_NM])dnl
-+dnl
-+AC_REQUIRE([AC_PROG_LN_S])dnl
-+test -z "$LN_S" && LN_S="ln -s"
-+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-+dnl
-+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-+dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
-+m4_require([_LT_CMD_RELOAD])dnl
-+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
-+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-+m4_require([_LT_WITH_SYSROOT])dnl
-+
-+_LT_CONFIG_LIBTOOL_INIT([
-+# See if we are running on zsh, and set the options which allow our
-+# commands through without removal of \ escapes INIT.
-+if test -n "\${ZSH_VERSION+set}" ; then
-+ setopt NO_GLOB_SUBST
-+fi
-+])
-+if test -n "${ZSH_VERSION+set}" ; then
-+ setopt NO_GLOB_SUBST
-+fi
-+
-+_LT_CHECK_OBJDIR
-+
-+m4_require([_LT_TAG_COMPILER])dnl
-+
-+case $host_os in
-+aix3*)
-+ # AIX sometimes has problems with the GCC collect2 program. For some
-+ # reason, if we set the COLLECT_NAMES environment variable, the problems
-+ # vanish in a puff of smoke.
-+ if test "X${COLLECT_NAMES+set}" != Xset; then
-+ COLLECT_NAMES=
-+ export COLLECT_NAMES
-+ fi
-+ ;;
-+esac
-+
-+# Global variables:
-+ofile=libtool
-+can_build_shared=yes
-+
-+# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
-+
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
-+
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
-+
-+# Set sane defaults for various variables
-+test -z "$CC" && CC=cc
-+test -z "$LTCC" && LTCC=$CC
-+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-+test -z "$LD" && LD=ld
-+test -z "$ac_objext" && ac_objext=o
-+
-+_LT_CC_BASENAME([$compiler])
-+
-+# Only perform the check for file, if the check method requires it
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+case $deplibs_check_method in
-+file_magic*)
-+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+ _LT_PATH_MAGIC
-+ fi
-+ ;;
-+esac
-+
-+# Use C for the default configuration in the libtool script
-+LT_SUPPORTED_TAG([CC])
-+_LT_LANG_C_CONFIG
-+_LT_LANG_DEFAULT_CONFIG
-+_LT_CONFIG_COMMANDS
-+])# _LT_SETUP
-+
-+
-+# _LT_PREPARE_SED_QUOTE_VARS
-+# --------------------------
-+# Define a few sed substitution that help us do robust quoting.
-+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-+[# Backslashify metacharacters that are still active within
-+# double-quoted strings.
-+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Sed substitution to delay expansion of an escaped single quote.
-+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-+
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
-+])
-+
-+# _LT_PROG_LTMAIN
-+# ---------------
-+# Note that this code is called both from `configure', and `config.status'
-+# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
-+# `config.status' has no value for ac_aux_dir unless we are using Automake,
-+# so we pass a copy along to make sure it has a sensible value anyway.
-+m4_defun([_LT_PROG_LTMAIN],
-+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-+ltmain="$ac_aux_dir/ltmain.sh"
-+])# _LT_PROG_LTMAIN
-+
-+
-+## ------------------------------------- ##
-+## Accumulate code for creating libtool. ##
-+## ------------------------------------- ##
-+
-+# So that we can recreate a full libtool script including additional
-+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-+# in macros and then make a single call at the end using the `libtool'
-+# label.
-+
-+
-+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-+# ----------------------------------------
-+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-+m4_define([_LT_CONFIG_LIBTOOL_INIT],
-+[m4_ifval([$1],
-+ [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-+ [$1
-+])])])
-+
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-+
-+
-+# _LT_CONFIG_LIBTOOL([COMMANDS])
-+# ------------------------------
-+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-+m4_define([_LT_CONFIG_LIBTOOL],
-+[m4_ifval([$1],
-+ [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-+ [$1
-+])])])
-+
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-+
-+
-+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-+# -----------------------------------------------------
-+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-+[_LT_CONFIG_LIBTOOL([$1])
-+_LT_CONFIG_LIBTOOL_INIT([$2])
-+])
-+
-+
-+# _LT_FORMAT_COMMENT([COMMENT])
-+# -----------------------------
-+# Add leading comment marks to the start of each line, and a trailing
-+# full-stop to the whole comment if one is not present already.
-+m4_define([_LT_FORMAT_COMMENT],
-+[m4_ifval([$1], [
-+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-+ [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-+)])
-+
-+
-+
-+## ------------------------ ##
-+## FIXME: Eliminate VARNAME ##
-+## ------------------------ ##
-+
-+
-+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-+# -------------------------------------------------------------------
-+# CONFIGNAME is the name given to the value in the libtool script.
-+# VARNAME is the (base) name used in the configure script.
-+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-+# VARNAME. Any other value will be used directly.
-+m4_define([_LT_DECL],
-+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-+ [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-+ [m4_ifval([$1], [$1], [$2])])
-+ lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-+ m4_ifval([$4],
-+ [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-+ lt_dict_add_subkey([lt_decl_dict], [$2],
-+ [tagged?], [m4_ifval([$5], [yes], [no])])])
-+])
-+
-+
-+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-+# --------------------------------------------------------
-+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-+
-+
-+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-+# ------------------------------------------------
-+m4_define([lt_decl_tag_varnames],
-+[_lt_decl_filter([tagged?], [yes], $@)])
-+
-+
-+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-+# ---------------------------------------------------------
-+m4_define([_lt_decl_filter],
-+[m4_case([$#],
-+ [0], [m4_fatal([$0: too few arguments: $#])],
-+ [1], [m4_fatal([$0: too few arguments: $#: $1])],
-+ [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-+ [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-+ [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-+])
-+
-+
-+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-+# --------------------------------------------------
-+m4_define([lt_decl_quote_varnames],
-+[_lt_decl_filter([value], [1], $@)])
-+
-+
-+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-+# ---------------------------------------------------
-+m4_define([lt_decl_dquote_varnames],
-+[_lt_decl_filter([value], [2], $@)])
-+
-+
-+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-+# ---------------------------------------------------
-+m4_define([lt_decl_varnames_tagged],
-+[m4_assert([$# <= 2])dnl
-+_$0(m4_quote(m4_default([$1], [[, ]])),
-+ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-+ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-+m4_define([_lt_decl_varnames_tagged],
-+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-+
-+
-+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-+# ------------------------------------------------
-+m4_define([lt_decl_all_varnames],
-+[_$0(m4_quote(m4_default([$1], [[, ]])),
-+ m4_if([$2], [],
-+ m4_quote(lt_decl_varnames),
-+ m4_quote(m4_shift($@))))[]dnl
-+])
-+m4_define([_lt_decl_all_varnames],
-+[lt_join($@, lt_decl_varnames_tagged([$1],
-+ lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-+])
-+
-+
-+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-+# ------------------------------------
-+# Quote a variable value, and forward it to `config.status' so that its
-+# declaration there will have the same value as in `configure'. VARNAME
-+# must have a single quote delimited value for this to work.
-+m4_define([_LT_CONFIG_STATUS_DECLARE],
-+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
-+
-+
-+# _LT_CONFIG_STATUS_DECLARATIONS
-+# ------------------------------
-+# We delimit libtool config variables with single quotes, so when
-+# we write them to config.status, we have to be sure to quote all
-+# embedded single quotes properly. In configure, this macro expands
-+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-+#
-+# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
-+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-+ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-+
-+
-+# _LT_LIBTOOL_TAGS
-+# ----------------
-+# Output comment and list of tags supported by the script
-+m4_defun([_LT_LIBTOOL_TAGS],
-+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-+available_tags="_LT_TAGS"dnl
-+])
-+
-+
-+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-+# -----------------------------------
-+# Extract the dictionary values for VARNAME (optionally with TAG) and
-+# expand to a commented shell variable setting:
-+#
-+# # Some comment about what VAR is for.
-+# visible_name=$lt_internal_name
-+m4_define([_LT_LIBTOOL_DECLARE],
-+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-+ [description])))[]dnl
-+m4_pushdef([_libtool_name],
-+ m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-+ [0], [_libtool_name=[$]$1],
-+ [1], [_libtool_name=$lt_[]$1],
-+ [2], [_libtool_name=$lt_[]$1],
-+ [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-+])
-+
-+
-+# _LT_LIBTOOL_CONFIG_VARS
-+# -----------------------
-+# Produce commented declarations of non-tagged libtool config variables
-+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-+# script. Tagged libtool config variables (even for the LIBTOOL CONFIG
-+# section) are produced by _LT_LIBTOOL_TAG_VARS.
-+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-+[m4_foreach([_lt_var],
-+ m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-+
-+
-+# _LT_LIBTOOL_TAG_VARS(TAG)
-+# -------------------------
-+m4_define([_LT_LIBTOOL_TAG_VARS],
-+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-+
-+
-+# _LT_TAGVAR(VARNAME, [TAGNAME])
-+# ------------------------------
-+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-+
-+
-+# _LT_CONFIG_COMMANDS
-+# -------------------
-+# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
-+# variables for single and double quote escaping we saved from calls
-+# to _LT_DECL, we can put quote escaped variables declarations
-+# into `config.status', and then the shell code to quote escape them in
-+# for loops in `config.status'. Finally, any additional code accumulated
-+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-+m4_defun([_LT_CONFIG_COMMANDS],
-+[AC_PROVIDE_IFELSE([LT_OUTPUT],
-+ dnl If the libtool generation code has been placed in $CONFIG_LT,
-+ dnl instead of duplicating it all over again into config.status,
-+ dnl then we will have config.status run $CONFIG_LT later, so it
-+ dnl needs to know what name is stored there:
-+ [AC_CONFIG_COMMANDS([libtool],
-+ [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-+ dnl If the libtool generation code is destined for config.status,
-+ dnl expand the accumulated commands and init code now:
-+ [AC_CONFIG_COMMANDS([libtool],
-+ [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-+])#_LT_CONFIG_COMMANDS
-+
-+
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-+[
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+sed_quote_subst='$sed_quote_subst'
-+double_quote_subst='$double_quote_subst'
-+delay_variable_subst='$delay_variable_subst'
-+_LT_CONFIG_STATUS_DECLARATIONS
-+LTCC='$LTCC'
-+LTCFLAGS='$LTCFLAGS'
-+compiler='$compiler_DEFAULT'
-+
-+# A function that is used when there is no print builtin or printf.
-+func_fallback_echo ()
-+{
-+ eval 'cat <<_LTECHO_EOF
-+\$[]1
-+_LTECHO_EOF'
-+}
-+
-+# Quote evaled strings.
-+for var in lt_decl_all_varnames([[ \
-+]], lt_decl_quote_varnames); do
-+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-+ *[[\\\\\\\`\\"\\\$]]*)
-+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-+ ;;
-+ *)
-+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-+ ;;
-+ esac
-+done
-+
-+# Double-quote double-evaled strings.
-+for var in lt_decl_all_varnames([[ \
-+]], lt_decl_dquote_varnames); do
-+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-+ *[[\\\\\\\`\\"\\\$]]*)
-+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-+ ;;
-+ *)
-+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-+ ;;
-+ esac
-+done
-+
-+_LT_OUTPUT_LIBTOOL_INIT
-+])
-+
-+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-+# ------------------------------------
-+# Generate a child script FILE with all initialization necessary to
-+# reuse the environment learned by the parent script, and make the
-+# file executable. If COMMENT is supplied, it is inserted after the
-+# `#!' sequence but before initialization text begins. After this
-+# macro, additional text can be appended to FILE to form the body of
-+# the child script. The macro ends with non-zero status if the
-+# file could not be fully written (such as if the disk is full).
-+m4_ifdef([AS_INIT_GENERATED],
-+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-+[m4_defun([_LT_GENERATED_FILE_INIT],
-+[m4_require([AS_PREPARE])]dnl
-+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-+[lt_write_fail=0
-+cat >$1 <<_ASEOF || lt_write_fail=1
-+#! $SHELL
-+# Generated by $as_me.
-+$2
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+export SHELL
-+_ASEOF
-+cat >>$1 <<\_ASEOF || lt_write_fail=1
-+AS_SHELL_SANITIZE
-+_AS_PREPARE
-+exec AS_MESSAGE_FD>&1
-+_ASEOF
-+test $lt_write_fail = 0 && chmod +x $1[]dnl
-+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
-+
-+# LT_OUTPUT
-+# ---------
-+# This macro allows early generation of the libtool script (before
-+# AC_OUTPUT is called), incase it is used in configure for compilation
-+# tests.
-+AC_DEFUN([LT_OUTPUT],
-+[: ${CONFIG_LT=./config.lt}
-+AC_MSG_NOTICE([creating $CONFIG_LT])
-+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-+[# Run this file to recreate a libtool stub with the current configuration.])
-+
-+cat >>"$CONFIG_LT" <<\_LTEOF
-+lt_cl_silent=false
-+exec AS_MESSAGE_LOG_FD>>config.log
-+{
-+ echo
-+ AS_BOX([Running $as_me.])
-+} >&AS_MESSAGE_LOG_FD
-+
-+lt_cl_help="\
-+\`$as_me' creates a local libtool stub from the current configuration,
-+for use in further configure time tests before the real libtool is
-+generated.
-+
-+Usage: $[0] [[OPTIONS]]
-+
-+ -h, --help print this help, then exit
-+ -V, --version print version number, then exit
-+ -q, --quiet do not print progress messages
-+ -d, --debug don't remove temporary files
-+
-+Report bugs to <bug-libtool@gnu.org>."
-+
-+lt_cl_version="\
-+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-+configured by $[0], generated by m4_PACKAGE_STRING.
-+
-+Copyright (C) 2011 Free Software Foundation, Inc.
-+This config.lt script is free software; the Free Software Foundation
-+gives unlimited permision to copy, distribute and modify it."
-+
-+while test $[#] != 0
-+do
-+ case $[1] in
-+ --version | --v* | -V )
-+ echo "$lt_cl_version"; exit 0 ;;
-+ --help | --h* | -h )
-+ echo "$lt_cl_help"; exit 0 ;;
-+ --debug | --d* | -d )
-+ debug=: ;;
-+ --quiet | --q* | --silent | --s* | -q )
-+ lt_cl_silent=: ;;
-+
-+ -*) AC_MSG_ERROR([unrecognized option: $[1]
-+Try \`$[0] --help' for more information.]) ;;
-+
-+ *) AC_MSG_ERROR([unrecognized argument: $[1]
-+Try \`$[0] --help' for more information.]) ;;
-+ esac
-+ shift
-+done
-+
-+if $lt_cl_silent; then
-+ exec AS_MESSAGE_FD>/dev/null
-+fi
-+_LTEOF
-+
-+cat >>"$CONFIG_LT" <<_LTEOF
-+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-+_LTEOF
-+
-+cat >>"$CONFIG_LT" <<\_LTEOF
-+AC_MSG_NOTICE([creating $ofile])
-+_LT_OUTPUT_LIBTOOL_COMMANDS
-+AS_EXIT(0)
-+_LTEOF
-+chmod +x "$CONFIG_LT"
-+
-+# configure is writing to config.log, but config.lt does its own redirection,
-+# appending to config.log, which fails on DOS, as config.log is still kept
-+# open by configure. Here we exec the FD to /dev/null, effectively closing
-+# config.log, so it can be properly (re)opened and appended to by config.lt.
-+lt_cl_success=:
-+test "$silent" = yes &&
-+ lt_config_lt_args="$lt_config_lt_args --quiet"
-+exec AS_MESSAGE_LOG_FD>/dev/null
-+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-+exec AS_MESSAGE_LOG_FD>>config.log
-+$lt_cl_success || AS_EXIT(1)
-+])# LT_OUTPUT
-+
-+
-+# _LT_CONFIG(TAG)
-+# ---------------
-+# If TAG is the built-in tag, create an initial libtool script with a
-+# default configuration from the untagged config vars. Otherwise add code
-+# to config.status for appending the configuration named by TAG from the
-+# matching tagged config vars.
-+m4_defun([_LT_CONFIG],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+_LT_CONFIG_SAVE_COMMANDS([
-+ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-+ m4_if(_LT_TAG, [C], [
-+ # 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
-+
-+ cfgfile="${ofile}T"
-+ trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-+ $RM "$cfgfile"
-+
-+ cat <<_LT_EOF >> "$cfgfile"
-+#! $SHELL
-+
-+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+_LT_COPYING
-+_LT_LIBTOOL_TAGS
-+
-+# ### BEGIN LIBTOOL CONFIG
-+_LT_LIBTOOL_CONFIG_VARS
-+_LT_LIBTOOL_TAG_VARS
-+# ### END LIBTOOL CONFIG
-+
-+_LT_EOF
-+
-+ case $host_os in
-+ aix3*)
-+ cat <<\_LT_EOF >> "$cfgfile"
-+# AIX sometimes has problems with the GCC collect2 program. For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+ COLLECT_NAMES=
-+ export COLLECT_NAMES
-+fi
-+_LT_EOF
-+ ;;
-+ esac
-+
-+ _LT_PROG_LTMAIN
-+
-+ # We use sed instead of cat because bash on DJGPP gets confused if
-+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
-+ # text mode, it properly converts lines to CR/LF. This bash problem
-+ # is reportedly fixed, but why not run on old versions too?
-+ sed '$q' "$ltmain" >> "$cfgfile" \
-+ || (rm -f "$cfgfile"; exit 1)
-+
-+ _LT_PROG_REPLACE_SHELLFNS
-+
-+ mv -f "$cfgfile" "$ofile" ||
-+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-+ chmod +x "$ofile"
-+],
-+[cat <<_LT_EOF >> "$ofile"
-+
-+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-+dnl in a comment (ie after a #).
-+# ### BEGIN LIBTOOL TAG CONFIG: $1
-+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-+# ### END LIBTOOL TAG CONFIG: $1
-+_LT_EOF
-+])dnl /m4_if
-+],
-+[m4_if([$1], [], [
-+ PACKAGE='$PACKAGE'
-+ VERSION='$VERSION'
-+ TIMESTAMP='$TIMESTAMP'
-+ RM='$RM'
-+ ofile='$ofile'], [])
-+])dnl /_LT_CONFIG_SAVE_COMMANDS
-+])# _LT_CONFIG
-+
-+
-+# LT_SUPPORTED_TAG(TAG)
-+# ---------------------
-+# Trace this macro to discover what tags are supported by the libtool
-+# --tag option, using:
-+# autoconf --trace 'LT_SUPPORTED_TAG:$1'
-+AC_DEFUN([LT_SUPPORTED_TAG], [])
-+
-+
-+# C support is built-in for now
-+m4_define([_LT_LANG_C_enabled], [])
-+m4_define([_LT_TAGS], [])
-+
-+
-+# LT_LANG(LANG)
-+# -------------
-+# Enable libtool support for the given language if not already enabled.
-+AC_DEFUN([LT_LANG],
-+[AC_BEFORE([$0], [LT_OUTPUT])dnl
-+m4_case([$1],
-+ [C], [_LT_LANG(C)],
-+ [C++], [_LT_LANG(CXX)],
-+ [Go], [_LT_LANG(GO)],
-+ [Java], [_LT_LANG(GCJ)],
-+ [Fortran 77], [_LT_LANG(F77)],
-+ [Fortran], [_LT_LANG(FC)],
-+ [Windows Resource], [_LT_LANG(RC)],
-+ [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-+ [_LT_LANG($1)],
-+ [m4_fatal([$0: unsupported language: "$1"])])])dnl
-+])# LT_LANG
-+
-+
-+# _LT_LANG(LANGNAME)
-+# ------------------
-+m4_defun([_LT_LANG],
-+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-+ [LT_SUPPORTED_TAG([$1])dnl
-+ m4_append([_LT_TAGS], [$1 ])dnl
-+ m4_define([_LT_LANG_]$1[_enabled], [])dnl
-+ _LT_LANG_$1_CONFIG($1)])dnl
-+])# _LT_LANG
-+
-+
-+m4_ifndef([AC_PROG_GO], [
-+############################################################
-+# NOTE: This macro has been submitted for inclusion into #
-+# GNU Autoconf as AC_PROG_GO. When it is available in #
-+# a released version of Autoconf we should remove this #
-+# macro and use it instead. #
-+############################################################
-+m4_defun([AC_PROG_GO],
-+[AC_LANG_PUSH(Go)dnl
-+AC_ARG_VAR([GOC], [Go compiler command])dnl
-+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
-+_AC_ARG_VAR_LDFLAGS()dnl
-+AC_CHECK_TOOL(GOC, gccgo)
-+if test -z "$GOC"; then
-+ if test -n "$ac_tool_prefix"; then
-+ AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
-+ fi
-+fi
-+if test -z "$GOC"; then
-+ AC_CHECK_PROG(GOC, gccgo, gccgo, false)
-+fi
-+])#m4_defun
-+])#m4_ifndef
-+
-+
-+# _LT_LANG_DEFAULT_CONFIG
-+# -----------------------
-+m4_defun([_LT_LANG_DEFAULT_CONFIG],
-+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+ [LT_LANG(CXX)],
-+ [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-+
-+AC_PROVIDE_IFELSE([AC_PROG_F77],
-+ [LT_LANG(F77)],
-+ [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-+
-+AC_PROVIDE_IFELSE([AC_PROG_FC],
-+ [LT_LANG(FC)],
-+ [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-+
-+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-+dnl pulling things in needlessly.
-+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-+ [LT_LANG(GCJ)],
-+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-+ [LT_LANG(GCJ)],
-+ [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-+ [LT_LANG(GCJ)],
-+ [m4_ifdef([AC_PROG_GCJ],
-+ [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-+ m4_ifdef([A][M_PROG_GCJ],
-+ [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-+ m4_ifdef([LT_PROG_GCJ],
-+ [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-+
-+AC_PROVIDE_IFELSE([AC_PROG_GO],
-+ [LT_LANG(GO)],
-+ [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
-+
-+AC_PROVIDE_IFELSE([LT_PROG_RC],
-+ [LT_LANG(RC)],
-+ [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-+])# _LT_LANG_DEFAULT_CONFIG
-+
-+# Obsolete macros:
-+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
-+
-+
-+# _LT_TAG_COMPILER
-+# ----------------
-+m4_defun([_LT_TAG_COMPILER],
-+[AC_REQUIRE([AC_PROG_CC])dnl
-+
-+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-+
-+# 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_TAG_COMPILER
-+
-+
-+# _LT_COMPILER_BOILERPLATE
-+# ------------------------
-+# Check for compiler boilerplate output or warnings with
-+# the simple compiler test code.
-+m4_defun([_LT_COMPILER_BOILERPLATE],
-+[m4_require([_LT_DECL_SED])dnl
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$RM conftest*
-+])# _LT_COMPILER_BOILERPLATE
-+
-+
-+# _LT_LINKER_BOILERPLATE
-+# ----------------------
-+# Check for linker boilerplate output or warnings with
-+# the simple link test code.
-+m4_defun([_LT_LINKER_BOILERPLATE],
-+[m4_require([_LT_DECL_SED])dnl
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$RM -r conftest*
-+])# _LT_LINKER_BOILERPLATE
-+
-+# _LT_REQUIRED_DARWIN_CHECKS
-+# -------------------------
-+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-+ case $host_os in
-+ rhapsody* | darwin*)
-+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-+ AC_CHECK_TOOL([LIPO], [lipo], [:])
-+ AC_CHECK_TOOL([OTOOL], [otool], [:])
-+ AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-+ _LT_DECL([], [DSYMUTIL], [1],
-+ [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-+ _LT_DECL([], [NMEDIT], [1],
-+ [Tool to change global to local symbols on Mac OS X])
-+ _LT_DECL([], [LIPO], [1],
-+ [Tool to manipulate fat objects and archives on Mac OS X])
-+ _LT_DECL([], [OTOOL], [1],
-+ [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-+ _LT_DECL([], [OTOOL64], [1],
-+ [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-+
-+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-+ [lt_cv_apple_cc_single_mod=no
-+ if test -z "${LT_MULTI_MODULE}"; then
-+ # By default we will add the -single_module flag. You can override
-+ # by either setting the environment variable LT_MULTI_MODULE
-+ # non-empty at configure time, or by adding -multi_module to the
-+ # link flags.
-+ rm -rf libconftest.dylib*
-+ echo "int foo(void){return 1;}" > conftest.c
-+ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-+ _lt_result=$?
-+ # If there is a non-empty error log, and "single_module"
-+ # appears in it, assume the flag caused a linker warning
-+ if test -s conftest.err && $GREP single_module conftest.err; then
-+ cat conftest.err >&AS_MESSAGE_LOG_FD
-+ # Otherwise, if the output was created with a 0 exit code from
-+ # the compiler, it worked.
-+ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
-+ lt_cv_apple_cc_single_mod=yes
-+ else
-+ cat conftest.err >&AS_MESSAGE_LOG_FD
-+ fi
-+ rm -rf libconftest.dylib*
-+ rm -f conftest.*
-+ fi])
-+
-+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-+ [lt_cv_ld_exported_symbols_list],
-+ [lt_cv_ld_exported_symbols_list=no
-+ save_LDFLAGS=$LDFLAGS
-+ echo "_main" > conftest.sym
-+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-+ [lt_cv_ld_exported_symbols_list=yes],
-+ [lt_cv_ld_exported_symbols_list=no])
-+ LDFLAGS="$save_LDFLAGS"
-+ ])
-+
-+ AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
-+ [lt_cv_ld_force_load=no
-+ cat > conftest.c << _LT_EOF
-+int forced_loaded() { return 2;}
-+_LT_EOF
-+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
-+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-+ echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-+ $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
-+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
-+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
-+ cat > conftest.c << _LT_EOF
-+int main() { return 0;}
-+_LT_EOF
-+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
-+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-+ _lt_result=$?
-+ if test -s conftest.err && $GREP force_load conftest.err; then
-+ cat conftest.err >&AS_MESSAGE_LOG_FD
-+ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
-+ lt_cv_ld_force_load=yes
-+ else
-+ cat conftest.err >&AS_MESSAGE_LOG_FD
-+ fi
-+ rm -f conftest.err libconftest.a conftest conftest.c
-+ rm -rf conftest.dSYM
-+ ])
-+ case $host_os in
-+ rhapsody* | darwin1.[[012]])
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+ darwin1.*)
-+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+ darwin*) # darwin 5.x on
-+ # if running on 10.5 or later, the deployment target defaults
-+ # to the OS version, if on x86, and 10.4, the deployment
-+ # target defaults to 10.4. Don't you love it?
-+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+ 10.[[012]]*)
-+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+ 10.*)
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+ esac
-+ ;;
-+ esac
-+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-+ _lt_dar_single_mod='$single_module'
-+ fi
-+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-+ else
-+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ fi
-+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-+ _lt_dsymutil='~$DSYMUTIL $lib || :'
-+ else
-+ _lt_dsymutil=
-+ fi
-+ ;;
-+ esac
-+])
-+
-+
-+# _LT_DARWIN_LINKER_FEATURES([TAG])
-+# ---------------------------------
-+# Checks for linker and compiler features on darwin
-+m4_defun([_LT_DARWIN_LINKER_FEATURES],
-+[
-+ m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_TAGVAR(hardcode_direct, $1)=no
-+ _LT_TAGVAR(hardcode_automatic, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+ if test "$lt_cv_ld_force_load" = "yes"; then
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-+ m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
-+ [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
-+ else
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-+ fi
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-+ case $cc_basename in
-+ ifort*) _lt_dar_can_shared=yes ;;
-+ *) _lt_dar_can_shared=$GCC ;;
-+ esac
-+ if test "$_lt_dar_can_shared" = "yes"; then
-+ output_verbose_link_cmd=func_echo_all
-+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-+ m4_if([$1], [CXX],
-+[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-+ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-+ fi
-+],[])
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+])
-+
-+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
-+# ----------------------------------
-+# Links a minimal program and checks the executable
-+# for the system default hardcoded library path. In most cases,
-+# this is /usr/lib:/lib, but when the MPI compilers are used
-+# the location of the communication and MPI libs are included too.
-+# If we don't find anything, use the default library path according
-+# to the aix ld manual.
-+# Store the results from the different compilers for each TAGNAME.
-+# Allow to override them for all tags through lt_cv_aix_libpath.
-+m4_defun([_LT_SYS_MODULE_PATH_AIX],
-+[m4_require([_LT_DECL_SED])dnl
-+if test "${lt_cv_aix_libpath+set}" = set; then
-+ aix_libpath=$lt_cv_aix_libpath
-+else
-+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
-+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
-+ lt_aix_libpath_sed='[
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\([^ ]*\) *$/\1/
-+ p
-+ }
-+ }]'
-+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+ # Check for a 64-bit object if we didn't find anything.
-+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+ fi],[])
-+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
-+ fi
-+ ])
-+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
-+fi
-+])# _LT_SYS_MODULE_PATH_AIX
-+
-+
-+# _LT_SHELL_INIT(ARG)
-+# -------------------
-+m4_define([_LT_SHELL_INIT],
-+[m4_divert_text([M4SH-INIT], [$1
-+])])# _LT_SHELL_INIT
-+
-+
-+
-+# _LT_PROG_ECHO_BACKSLASH
-+# -----------------------
-+# Find how we can fake an echo command that does not interpret backslash.
-+# In particular, with Autoconf 2.60 or later we add some code to the start
-+# of the generated configure script which will find a shell with a builtin
-+# printf (which we can use as an echo command).
-+m4_defun([_LT_PROG_ECHO_BACKSLASH],
-+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-+
-+AC_MSG_CHECKING([how to print strings])
-+# Test print first, because it will be a builtin if present.
-+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-+ ECHO='print -r --'
-+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-+ ECHO='printf %s\n'
-+else
-+ # Use this function as a fallback that always works.
-+ func_fallback_echo ()
-+ {
-+ eval 'cat <<_LTECHO_EOF
-+$[]1
-+_LTECHO_EOF'
-+ }
-+ ECHO='func_fallback_echo'
-+fi
-+
-+# func_echo_all arg...
-+# Invoke $ECHO with all args, space-separated.
-+func_echo_all ()
-+{
-+ $ECHO "$*"
-+}
-+
-+case "$ECHO" in
-+ printf*) AC_MSG_RESULT([printf]) ;;
-+ print*) AC_MSG_RESULT([print -r]) ;;
-+ *) AC_MSG_RESULT([cat]) ;;
-+esac
-+
-+m4_ifdef([_AS_DETECT_SUGGESTED],
-+[_AS_DETECT_SUGGESTED([
-+ test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
-+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-+ PATH=/empty FPATH=/empty; export PATH FPATH
-+ test "X`printf %s $ECHO`" = "X$ECHO" \
-+ || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
-+
-+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
-+])# _LT_PROG_ECHO_BACKSLASH
-+
-+
-+# _LT_WITH_SYSROOT
-+# ----------------
-+AC_DEFUN([_LT_WITH_SYSROOT],
-+[AC_MSG_CHECKING([for sysroot])
-+AC_ARG_WITH([sysroot],
-+[ --with-sysroot[=DIR] Search for dependent libraries within DIR
-+ (or the compiler's sysroot if not specified).],
-+[], [with_sysroot=no])
-+
-+dnl lt_sysroot will always be passed unquoted. We quote it here
-+dnl in case the user passed a directory name.
-+lt_sysroot=
-+case ${with_sysroot} in #(
-+ yes)
-+ if test "$GCC" = yes; then
-+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-+ fi
-+ ;; #(
-+ /*)
-+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-+ ;; #(
-+ no|'')
-+ ;; #(
-+ *)
-+ AC_MSG_RESULT([${with_sysroot}])
-+ AC_MSG_ERROR([The sysroot must be an absolute path.])
-+ ;;
-+esac
-+
-+ AC_MSG_RESULT([${lt_sysroot:-no}])
-+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-+[dependent libraries, and in which our libraries should be installed.])])
-+
-+# _LT_ENABLE_LOCK
-+# ---------------
-+m4_defun([_LT_ENABLE_LOCK],
-+[AC_ARG_ENABLE([libtool-lock],
-+ [AS_HELP_STRING([--disable-libtool-lock],
-+ [avoid locking (might break parallel builds)])])
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+# Some flags need to be propagated to the compiler or linker for good
-+# libtool support.
-+case $host in
-+ia64-*-hpux*)
-+ # 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.$ac_objext` in
-+ *ELF-32*)
-+ HPUX_IA64_MODE="32"
-+ ;
-+ *ELF-64*)
-+ HPUX_IA64_MODE="64"
-+ ;
-+ esac
-+ fi
-+ rm -rf conftest*
-+ ;;
-+*-*-irix6*)
-+ # Find out which ABI we are using.
-+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
-+ if AC_TRY_EVAL(ac_compile); then
-+ if test "$lt_cv_prog_gnu_ld" = yes; then
-+ case `/usr/bin/file conftest.$ac_objext` in
-+ *32-bit*)
-+ LD="${LD-ld} -melf32bsmip"
-+ ;;
-+ *N32*)
-+ LD="${LD-ld} -melf32bmipn32"
-+ ;;
-+ *64-bit*)
-+ LD="${LD-ld} -melf64bmip"
-+ ;
-+ esac
-+ else
-+ case `/usr/bin/file conftest.$ac_objext` in
-+ *32-bit*)
-+ LD="${LD-ld} -32"
-+ ;;
-+ *N32*)
-+ LD="${LD-ld} -n32"
-+ ;;
-+ *64-bit*)
-+ LD="${LD-ld} -64"
-+ ;;
-+ esac
-+ fi
-+ fi
-+ rm -rf conftest*
-+ ;;
-+
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-+ # Find out which ABI we are using.
-+ echo 'int i;' > conftest.$ac_ext
-+ if AC_TRY_EVAL(ac_compile); then
-+ case `/usr/bin/file conftest.o` in
-+ *32-bit*)
-+ case $host in
-+ x86_64-*kfreebsd*-gnu)
-+ LD="${LD-ld} -m elf_i386_fbsd"
-+ ;;
-+ x86_64-*linux*)
-+ LD="${LD-ld} -m elf_i386"
-+ ;;
-+ ppc64-*linux*|powerpc64-*linux*)
-+ LD="${LD-ld} -m elf32ppclinux"
-+ ;;
-+ s390x-*linux*)
-+ LD="${LD-ld} -m elf_s390"
-+ ;;
-+ sparc64-*linux*)
-+ LD="${LD-ld} -m elf32_sparc"
-+ ;;
-+ esac
-+ ;
-+ *64-bit*)
-+ case $host in
-+ x86_64-*kfreebsd*-gnu)
-+ LD="${LD-ld} -m elf_x86_64_fbsd"
-+ ;;
-+ x86_64-*linux*)
-+ LD="${LD-ld} -m elf_x86_64"
-+ ;;
-+ ppc*-*linux*|powerpc*-*linux*)
-+ LD="${LD-ld} -m elf64ppc"
-+ ;;
-+ s390*-*linux*|s390*-*tpf*)
-+ LD="${LD-ld} -m elf64_s390"
-+ ;;
-+ sparc*-*linux*)
-+ LD="${LD-ld} -m elf64_sparc"
-+ ;;
-+ esac
-+ ;
-+ esac
-+ fi
-+ rm -rf conftest*
-+ ;;
-+
-+*-*-sco3.2v5*)
-+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+ SAVE_CFLAGS="$CFLAGS"
-+ CFLAGS="$CFLAGS -belf"
-+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-+ [AC_LANG_PUSH(C)
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-+ AC_LANG_POP])
-+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+ CFLAGS="$SAVE_CFLAGS"
-+ fi
-+ ;;
-+*-*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*)
-+ case $host in
-+ i?86-*-solaris*)
-+ LD="${LD-ld} -m elf_x86_64"
-+ ;;
-+ sparc*-*-solaris*)
-+ LD="${LD-ld} -m elf64_sparc"
-+ ;;
-+ esac
-+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
-+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-+ LD="${LD-ld}_sol2"
-+ fi
-+ ;;
-+ *)
-+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-+ LD="${LD-ld} -64"
-+ fi
-+ ;
-+ esac
-+ ;;
-+ esac
-+ fi
-+ rm -rf conftest*
-+ ;;
-+esac
-+
-+need_locks="$enable_libtool_lock"
-+])# _LT_ENABLE_LOCK
-+
-+
-+# _LT_PROG_AR
-+# -----------
-+m4_defun([_LT_PROG_AR],
-+[AC_CHECK_TOOLS(AR, [ar], false)
-+: ${AR=ar}
-+: ${AR_FLAGS=cru}
-+_LT_DECL([], [AR], [1], [The archiver])
-+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
-+
-+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
-+ [lt_cv_ar_at_file=no
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
-+ [echo conftest.$ac_objext > conftest.lst
-+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
-+ AC_TRY_EVAL([lt_ar_try])
-+ if test "$ac_status" -eq 0; then
-+ # Ensure the archiver fails upon bogus file names.
-+ rm -f conftest.$ac_objext libconftest.a
-+ AC_TRY_EVAL([lt_ar_try])
-+ if test "$ac_status" -ne 0; then
-+ lt_cv_ar_at_file=@
-+ fi
-+ fi
-+ rm -f conftest.* libconftest.a
-+ ])
-+ ])
-+
-+if test "x$lt_cv_ar_at_file" = xno; then
-+ archiver_list_spec=
-+else
-+ archiver_list_spec=$lt_cv_ar_at_file
-+fi
-+_LT_DECL([], [archiver_list_spec], [1],
-+ [How to feed a file listing to the archiver])
-+])# _LT_PROG_AR
-+
-+
-+# _LT_CMD_OLD_ARCHIVE
-+# -------------------
-+m4_defun([_LT_CMD_OLD_ARCHIVE],
-+[_LT_PROG_AR
-+
-+AC_CHECK_TOOL(STRIP, strip, :)
-+test -z "$STRIP" && STRIP=:
-+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-+
-+AC_CHECK_TOOL(RANLIB, ranlib, :)
-+test -z "$RANLIB" && RANLIB=:
-+_LT_DECL([], [RANLIB], [1],
-+ [Commands used to install an old-style archive])
-+
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
-+
-+if test -n "$RANLIB"; then
-+ case $host_os in
-+ openbsd*)
-+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-+ ;;
-+ *)
-+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-+ ;;
-+ esac
-+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-+fi
-+
-+case $host_os in
-+ darwin*)
-+ lock_old_archive_extraction=yes ;;
-+ *)
-+ lock_old_archive_extraction=no ;;
-+esac
-+_LT_DECL([], [old_postinstall_cmds], [2])
-+_LT_DECL([], [old_postuninstall_cmds], [2])
-+_LT_TAGDECL([], [old_archive_cmds], [2],
-+ [Commands used to build an old-style archive])
-+_LT_DECL([], [lock_old_archive_extraction], [0],
-+ [Whether to use a lock for old archive extraction])
-+])# _LT_CMD_OLD_ARCHIVE
-+
-+
-+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-+# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-+# ----------------------------------------------------------------
-+# Check whether the given compiler option works
-+AC_DEFUN([_LT_COMPILER_OPTION],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_SED])dnl
-+AC_CACHE_CHECK([$1], [$2],
-+ [$2=no
-+ m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ lt_compiler_flag="$3"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # 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}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&AS_MESSAGE_LOG_FD
-+ echo "$as_me:$LINENO: \$? = $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 other than the usual output.
-+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/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
-+ $RM conftest*
-+])
-+
-+if test x"[$]$2" = xyes; then
-+ m4_if([$5], , :, [$5])
-+else
-+ m4_if([$6], , :, [$6])
-+fi
-+])# _LT_COMPILER_OPTION
-+
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-+
-+
-+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-+# [ACTION-SUCCESS], [ACTION-FAILURE])
-+# ----------------------------------------------------
-+# Check whether the given linker option works
-+AC_DEFUN([_LT_LINKER_OPTION],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_SED])dnl
-+AC_CACHE_CHECK([$1], [$2],
-+ [$2=no
-+ save_LDFLAGS="$LDFLAGS"
-+ LDFLAGS="$LDFLAGS $3"
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
-+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+ # The linker can only warn and ignore the option if not recognized
-+ # So say no if there are warnings
-+ if test -s conftest.err; then
-+ # Append any errors to the config.log.
-+ cat conftest.err 1>&AS_MESSAGE_LOG_FD
-+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/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
-+ fi
-+ $RM -r conftest*
-+ LDFLAGS="$save_LDFLAGS"
-+])
-+
-+if test x"[$]$2" = xyes; then
-+ m4_if([$4], , :, [$4])
-+else
-+ m4_if([$5], , :, [$5])
-+fi
-+])# _LT_LINKER_OPTION
-+
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-+
-+
-+# LT_CMD_MAX_LEN
-+#---------------
-+AC_DEFUN([LT_CMD_MAX_LEN],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+# find the maximum length of command line arguments
-+AC_MSG_CHECKING([the maximum length of command line arguments])
-+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-+ i=0
-+ teststring="ABCD"
-+
-+ case $build_os in
-+ msdosdjgpp*)
-+ # On DJGPP, this test can blow up pretty badly due to problems in libc
-+ # (any single argument exceeding 2000 bytes causes a buffer overrun
-+ # during glob expansion). Even if it were fixed, the result of this
-+ # check would be larger than it should be.
-+ lt_cv_sys_max_cmd_len=12288; # 12K is about right
-+ ;;
-+
-+ gnu*)
-+ # Under GNU Hurd, this test is not required because there is
-+ # no limit to the length of command line arguments.
-+ # Libtool will interpret -1 as no limit whatsoever
-+ lt_cv_sys_max_cmd_len=-1;
-+ ;;
-+
-+ cygwin* | mingw* | cegcc*)
-+ # On Win9x/ME, this test blows up -- it succeeds, but takes
-+ # about 5 minutes as the teststring grows exponentially.
-+ # Worse, since 9x/ME are not pre-emptively multitasking,
-+ # you end up with a "frozen" computer, even though with patience
-+ # the test eventually succeeds (with a max line length of 256k).
-+ # Instead, let's just punt: use the minimum linelength reported by
-+ # all of the supported platforms: 8192 (on NT/2K/XP).
-+ lt_cv_sys_max_cmd_len=8192;
-+ ;;
-+
-+ mint*)
-+ # On MiNT this can take a long time and run out of memory.
-+ 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
-+ ;;
-+
-+ os2*)
-+ # The test takes a long time on OS/2.
-+ lt_cv_sys_max_cmd_len=8192
-+ ;;
-+
-+ 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
-+ ;;
-+ *)
-+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-+ if test -n "$lt_cv_sys_max_cmd_len"; then
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+ else
-+ # Make teststring a little bigger before we do anything with it.
-+ # a 1K string should be a reasonable start.
-+ for i in 1 2 3 4 5 6 7 8 ; do
-+ teststring=$teststring$teststring
-+ done
-+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+ # 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"`env echo "$teststring$teststring" 2>/dev/null` \
-+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-+ test $i != 17 # 1/2 MB should be enough
-+ do
-+ i=`expr $i + 1`
-+ teststring=$teststring$teststring
-+ done
-+ # Only check the string length outside the loop.
-+ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-+ teststring=
-+ # Add a significant safety factor because C++ compilers can tack on
-+ # massive amounts of additional arguments before passing them to the
-+ # linker. It appears as though 1/2 is a usable value.
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ fi
-+ ;;
-+ esac
-+])
-+if test -n $lt_cv_sys_max_cmd_len ; then
-+ AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-+else
-+ AC_MSG_RESULT(none)
-+fi
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+_LT_DECL([], [max_cmd_len], [0],
-+ [What is the maximum length of a command?])
-+])# LT_CMD_MAX_LEN
-+
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-+
-+
-+# _LT_HEADER_DLFCN
-+# ----------------
-+m4_defun([_LT_HEADER_DLFCN],
-+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-+])# _LT_HEADER_DLFCN
-+
-+
-+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-+# ----------------------------------------------------------------
-+m4_defun([_LT_TRY_DLOPEN_SELF],
-+[m4_require([_LT_HEADER_DLFCN])dnl
-+if test "$cross_compiling" = yes; then :
-+ [$4]
-+else
-+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+ lt_status=$lt_dlunknown
-+ cat > conftest.$ac_ext <<_LT_EOF
-+[#line $LINENO "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+# define LT_DLGLOBAL RTLD_GLOBAL
-+#else
-+# ifdef DL_GLOBAL
-+# define LT_DLGLOBAL DL_GLOBAL
-+# else
-+# define LT_DLGLOBAL 0
-+# endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+ find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+# ifdef RTLD_LAZY
-+# define LT_DLLAZY_OR_NOW RTLD_LAZY
-+# else
-+# ifdef DL_LAZY
-+# define LT_DLLAZY_OR_NOW DL_LAZY
-+# else
-+# ifdef RTLD_NOW
-+# define LT_DLLAZY_OR_NOW RTLD_NOW
-+# else
-+# ifdef DL_NOW
-+# define LT_DLLAZY_OR_NOW DL_NOW
-+# else
-+# define LT_DLLAZY_OR_NOW 0
-+# endif
-+# endif
-+# endif
-+# endif
-+#endif
-+
-+/* When -fvisbility=hidden is used, assume the code has been annotated
-+ correspondingly for the symbols needed. */
-+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-+int fnord () __attribute__((visibility("default")));
-+#endif
-+
-+int fnord () { return 42; }
-+int main ()
-+{
-+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+ int status = $lt_dlunknown;
-+
-+ if (self)
-+ {
-+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-+ else
-+ {
-+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+ else puts (dlerror ());
-+ }
-+ /* dlclose (self); */
-+ }
-+ else
-+ puts (dlerror ());
-+
-+ return status;
-+}]
-+_LT_EOF
-+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-+ (./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_dlunknown|x*) $3 ;;
-+ esac
-+ else :
-+ # compilation failed
-+ $3
-+ fi
-+fi
-+rm -fr conftest*
-+])# _LT_TRY_DLOPEN_SELF
-+
-+
-+# LT_SYS_DLOPEN_SELF
-+# ------------------
-+AC_DEFUN([LT_SYS_DLOPEN_SELF],
-+[m4_require([_LT_HEADER_DLFCN])dnl
-+if test "x$enable_dlopen" != xyes; then
-+ enable_dlopen=unknown
-+ enable_dlopen_self=unknown
-+ enable_dlopen_self_static=unknown
-+else
-+ lt_cv_dlopen=no
-+ lt_cv_dlopen_libs=
-+
-+ case $host_os in
-+ beos*)
-+ lt_cv_dlopen="load_add_on"
-+ lt_cv_dlopen_libs=
-+ lt_cv_dlopen_self=yes
-+ ;;
-+
-+ mingw* | pw32* | cegcc*)
-+ lt_cv_dlopen="LoadLibrary"
-+ lt_cv_dlopen_libs=
-+ ;;
-+
-+ cygwin*)
-+ lt_cv_dlopen="dlopen"
-+ lt_cv_dlopen_libs=
-+ ;;
-+
-+ darwin*)
-+ # if libdl is installed we need to link against it
-+ AC_CHECK_LIB([dl], [dlopen],
-+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-+ lt_cv_dlopen="dyld"
-+ lt_cv_dlopen_libs=
-+ lt_cv_dlopen_self=yes
-+ ])
-+ ;;
-+
-+ *)
-+ AC_CHECK_FUNC([shl_load],
-+ [lt_cv_dlopen="shl_load"],
-+ [AC_CHECK_LIB([dld], [shl_load],
-+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-+ [AC_CHECK_FUNC([dlopen],
-+ [lt_cv_dlopen="dlopen"],
-+ [AC_CHECK_LIB([dl], [dlopen],
-+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-+ [AC_CHECK_LIB([svld], [dlopen],
-+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-+ [AC_CHECK_LIB([dld], [dld_link],
-+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-+ ])
-+ ])
-+ ])
-+ ])
-+ ])
-+ ;;
-+ esac
-+
-+ if test "x$lt_cv_dlopen" != xno; then
-+ enable_dlopen=yes
-+ else
-+ enable_dlopen=no
-+ fi
-+
-+ case $lt_cv_dlopen in
-+ dlopen)
-+ save_CPPFLAGS="$CPPFLAGS"
-+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+
-+ save_LDFLAGS="$LDFLAGS"
-+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+
-+ save_LIBS="$LIBS"
-+ LIBS="$lt_cv_dlopen_libs $LIBS"
-+
-+ AC_CACHE_CHECK([whether a program can dlopen itself],
-+ lt_cv_dlopen_self, [dnl
-+ _LT_TRY_DLOPEN_SELF(
-+ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-+ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-+ ])
-+
-+ if test "x$lt_cv_dlopen_self" = xyes; then
-+ 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_TRY_DLOPEN_SELF(
-+ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-+ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
-+ ])
-+ fi
-+
-+ CPPFLAGS="$save_CPPFLAGS"
-+ LDFLAGS="$save_LDFLAGS"
-+ LIBS="$save_LIBS"
-+ ;;
-+ esac
-+
-+ case $lt_cv_dlopen_self in
-+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+ *) enable_dlopen_self=unknown ;;
-+ esac
-+
-+ case $lt_cv_dlopen_self_static in
-+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+ *) enable_dlopen_self_static=unknown ;;
-+ esac
-+fi
-+_LT_DECL([dlopen_support], [enable_dlopen], [0],
-+ [Whether dlopen is supported])
-+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-+ [Whether dlopen of programs is supported])
-+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-+ [Whether dlopen of statically linked programs is supported])
-+])# LT_SYS_DLOPEN_SELF
-+
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-+
-+
-+# _LT_COMPILER_C_O([TAGNAME])
-+# ---------------------------
-+# Check to see if options -c and -o are simultaneously supported by compiler.
-+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-+m4_defun([_LT_COMPILER_C_O],
-+[m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_TAG_COMPILER])dnl
-+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-+ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-+ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-+ $RM -r conftest 2>/dev/null
-+ mkdir conftest
-+ cd conftest
-+ mkdir out
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+ lt_compiler_flag="-o out/conftest2.$ac_objext"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (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}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&AS_MESSAGE_LOG_FD
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+ then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings
-+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/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_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+ fi
-+ fi
-+ 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 ..
-+ $RM -r conftest
-+ $RM conftest*
-+])
-+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-+ [Does compiler simultaneously support -c and -o options?])
-+])# _LT_COMPILER_C_O
-+
-+
-+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-+# ----------------------------------
-+# Check to see if we can do hard links to lock some files if needed
-+m4_defun([_LT_COMPILER_FILE_LOCKS],
-+[m4_require([_LT_ENABLE_LOCK])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+_LT_COMPILER_C_O([$1])
-+
-+hard_links="nottested"
-+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-+ # do not overwrite the value of need_locks provided by the user
-+ AC_MSG_CHECKING([if we can lock with hard links])
-+ hard_links=yes
-+ $RM conftest*
-+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+ touch conftest.a
-+ ln conftest.a conftest.b 2>&5 || hard_links=no
-+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+ AC_MSG_RESULT([$hard_links])
-+ if test "$hard_links" = no; then
-+ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-+ need_locks=warn
-+ fi
-+else
-+ need_locks=no
-+fi
-+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-+])# _LT_COMPILER_FILE_LOCKS
-+
-+
-+# _LT_CHECK_OBJDIR
-+# ----------------
-+m4_defun([_LT_CHECK_OBJDIR],
-+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-+[rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+ lt_cv_objdir=.libs
-+else
-+ # MS-DOS does not allow filenames that begin with a dot.
-+ lt_cv_objdir=_libs
-+fi
-+rmdir .libs 2>/dev/null])
-+objdir=$lt_cv_objdir
-+_LT_DECL([], [objdir], [0],
-+ [The name of the directory that contains temporary libtool files])dnl
-+m4_pattern_allow([LT_OBJDIR])dnl
-+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-+ [Define to the sub-directory in which libtool stores uninstalled libraries.])
-+])# _LT_CHECK_OBJDIR
-+
-+
-+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-+# --------------------------------------
-+# Check hardcoding attributes.
-+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-+[AC_MSG_CHECKING([how to hardcode library paths into programs])
-+_LT_TAGVAR(hardcode_action, $1)=
-+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-+ test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-+ test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-+
-+ # We can hardcode non-existent directories.
-+ if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
-+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+ # have to relink, otherwise we might link with an installed library
-+ # when we should be linking with a yet-to-be-installed one
-+ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-+ test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-+ # Linking always hardcodes the temporary library directory.
-+ _LT_TAGVAR(hardcode_action, $1)=relink
-+ else
-+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+ _LT_TAGVAR(hardcode_action, $1)=immediate
-+ fi
-+else
-+ # We cannot hardcode anything, or else we can only hardcode existing
-+ # directories.
-+ _LT_TAGVAR(hardcode_action, $1)=unsupported
-+fi
-+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-+
-+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-+ test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
-+ # Fast installation is not supported
-+ enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+ test "$enable_shared" = no; then
-+ # Fast installation is not necessary
-+ enable_fast_install=needless
-+fi
-+_LT_TAGDECL([], [hardcode_action], [0],
-+ [How to hardcode a shared library path into an executable])
-+])# _LT_LINKER_HARDCODE_LIBPATH
-+
-+
-+# _LT_CMD_STRIPLIB
-+# ----------------
-+m4_defun([_LT_CMD_STRIPLIB],
-+[m4_require([_LT_DECL_EGREP])
-+striplib=
-+old_striplib=
-+AC_MSG_CHECKING([whether stripping libraries is possible])
-+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+ AC_MSG_RESULT([yes])
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-+ case $host_os in
-+ darwin*)
-+ if test -n "$STRIP" ; then
-+ striplib="$STRIP -x"
-+ old_striplib="$STRIP -S"
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_RESULT([no])
-+ fi
-+ ;;
-+ *)
-+ AC_MSG_RESULT([no])
-+ ;;
-+ esac
-+fi
-+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-+_LT_DECL([], [striplib], [1])
-+])# _LT_CMD_STRIPLIB
-+
-+
-+# _LT_SYS_DYNAMIC_LINKER([TAG])
-+# -----------------------------
-+# PORTME Fill in your ld.so characteristics
-+m4_defun([_LT_SYS_DYNAMIC_LINKER],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_OBJDUMP])dnl
-+m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-+AC_MSG_CHECKING([dynamic linker characteristics])
-+m4_if([$1],
-+ [], [
-+if test "$GCC" = yes; then
-+ case $host_os in
-+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-+ *) lt_awk_arg="/^libraries:/" ;;
-+ esac
-+ case $host_os in
-+ mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
-+ *) lt_sed_strip_eq="s,=/,/,g" ;;
-+ esac
-+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-+ case $lt_search_path_spec in
-+ *\;*)
-+ # 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.
-+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-+ ;;
-+ *)
-+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-+ ;;
-+ esac
-+ # Ok, now we have the path, separated by spaces, we can step through it
-+ # and add multilib dir if necessary.
-+ lt_tmp_lt_search_path_spec=
-+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-+ for lt_sys_path in $lt_search_path_spec; do
-+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-+ else
-+ test -d "$lt_sys_path" && \
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-+ fi
-+ done
-+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-+BEGIN {RS=" "; FS="/|\n";} {
-+ lt_foo="";
-+ lt_count=0;
-+ for (lt_i = NF; lt_i > 0; lt_i--) {
-+ if ($lt_i != "" && $lt_i != ".") {
-+ if ($lt_i == "..") {
-+ lt_count++;
-+ } else {
-+ if (lt_count == 0) {
-+ lt_foo="/" $lt_i lt_foo;
-+ } else {
-+ lt_count--;
-+ }
-+ }
-+ }
-+ }
-+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-+}'`
-+ # AWK program above erroneously prepends '/' to C:/dos/paths
-+ # for these hosts.
-+ case $host_os in
-+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-+ $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
-+ esac
-+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-+else
-+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi])
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-+
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-+
-+case $host_os in
-+aix3*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+ shlibpath_var=LIBPATH
-+
-+ # AIX 3 has no versioning support, so we append a major version to the name.
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-+
-+aix[[4-9]]*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ need_lib_prefix=no
-+ need_version=no
-+ hardcode_into_libs=yes
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 supports IA64
-+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ else
-+ # With GCC up to 2.95.x, collect2 would create an import file
-+ # for dependence libraries. The import file would start with
-+ # the line `#! .'. This would cause the generated library to
-+ # depend on `.', always an invalid library. This was fixed in
-+ # development snapshots of GCC prior to 3.0.
-+ case $host_os in
-+ aix4 | aix4.[[01]] | aix4.[[01]].*)
-+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+ echo ' yes '
-+ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-+ :
-+ else
-+ can_build_shared=no
-+ fi
-+ ;;
-+ esac
-+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+ # soname into executable. Probably we can add versioning support to
-+ # collect2, so additional links can be useful in future.
-+ if test "$aix_use_runtimelinking" = yes; then
-+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+ # instead of lib<name>.a to let people know that these are not
-+ # typical AIX shared libraries.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ else
-+ # We preserve .a as extension for shared libraries through AIX4.2
-+ # and later when we are not doing run time linking.
-+ library_names_spec='${libname}${release}.a $libname.a'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ fi
-+ shlibpath_var=LIBPATH
-+ fi
-+ ;;
-+
-+amigaos*)
-+ case $host_cpu in
-+ powerpc)
-+ # Since July 2007 AmigaOS4 officially supports .so libraries.
-+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ ;;
-+ m68k)
-+ 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=`func_echo_all "$lib" | $SED '\''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'
-+ ;;
-+ esac
-+ ;;
-+
-+beos*)
-+ library_names_spec='${libname}${shared_ext}'
-+ dynamic_linker="$host_os ld.so"
-+ shlibpath_var=LIBRARY_PATH
-+ ;;
-+
-+bsdi[[45]]*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ 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 $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+ # the default ld.so.conf also contains /usr/contrib/lib and
-+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+ # libtool to hard-code these into programs
-+ ;;
-+
-+cygwin* | mingw* | pw32* | cegcc*)
-+ version_type=windows
-+ shrext_cmds=".dll"
-+ need_version=no
-+ need_lib_prefix=no
-+
-+ case $GCC,$cc_basename in
-+ yes,*)
-+ # gcc
-+ library_names_spec='$libname.dll.a'
-+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+ postinstall_cmds='base_file=`basename \${file}`~
-+ 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~
-+ chmod a+x \$dldir/$dlname~
-+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-+ fi'
-+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+ dlpath=$dir/\$dldll~
-+ $RM \$dlpath'
-+ shlibpath_overrides_runpath=yes
-+
-+ case $host_os in
-+ cygwin*)
-+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+m4_if([$1], [],[
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
-+ ;;
-+ mingw* | cegcc*)
-+ # MinGW DLLs use traditional 'lib' prefix
-+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+ ;;
-+ 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}'
-+ ;;
-+ esac
-+ dynamic_linker='Win32 ld.exe'
-+ ;;
-+
-+ *,cl*)
-+ # Native MSVC
-+ libname_spec='$name'
-+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+ library_names_spec='${libname}.dll.lib'
-+
-+ case $build_os in
-+ mingw*)
-+ sys_lib_search_path_spec=
-+ lt_save_ifs=$IFS
-+ IFS=';'
-+ for lt_path in $LIB
-+ do
-+ IFS=$lt_save_ifs
-+ # Let DOS variable expansion print the short 8.3 style file name.
-+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-+ done
-+ IFS=$lt_save_ifs
-+ # Convert to MSYS style.
-+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
-+ ;;
-+ cygwin*)
-+ # Convert to unix form, then to dos form, then back to unix form
-+ # but this time dos style (no spaces!) so that the unix form looks
-+ # like /cygdrive/c/PROGRA~1:/cygdr...
-+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ ;;
-+ *)
-+ sys_lib_search_path_spec="$LIB"
-+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-+ # It is most probably a Windows format PATH.
-+ 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
-+ # FIXME: find the short name or the path components, as spaces are
-+ # common. (e.g. "Program Files" -> "PROGRA~1")
-+ ;;
-+ esac
-+
-+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+ postinstall_cmds='base_file=`basename \${file}`~
-+ 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'
-+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+ dlpath=$dir/\$dldll~
-+ $RM \$dlpath'
-+ shlibpath_overrides_runpath=yes
-+ dynamic_linker='Win32 link.exe'
-+ ;;
-+
-+ *)
-+ # Assume MSVC wrapper
-+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+ dynamic_linker='Win32 ld.exe'
-+ ;;
-+ esac
-+ # FIXME: first we should search . and the directory the executable is in
-+ shlibpath_var=PATH
-+ ;;
-+
-+darwin* | rhapsody*)
-+ dynamic_linker="$host_os dyld"
-+ version_type=darwin
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+ soname_spec='${libname}${release}${major}$shared_ext'
-+ shlibpath_overrides_runpath=yes
-+ shlibpath_var=DYLD_LIBRARY_PATH
-+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+m4_if([$1], [],[
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+ ;;
-+
-+dgux*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ 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
-+ ;;
-+
-+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[[23]].*) objformat=aout ;;
-+ *) objformat=elf ;;
-+ esac
-+ fi
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ need_version=no
-+ need_lib_prefix=no
-+ ;;
-+ freebsd-*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+ need_version=yes
-+ ;;
-+ esac
-+ shlibpath_var=LD_LIBRARY_PATH
-+ case $host_os in
-+ freebsd2.*)
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+ freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+ 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
-+ ;;
-+ *) # from 4.6 on, and DragonFly
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+ esac
-+ ;;
-+
-+gnu*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ 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
-+ ;;
-+
-+haiku*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ need_lib_prefix=no
-+ need_version=no
-+ dynamic_linker="$host_os runtime_loader"
-+ 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=LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-+ hardcode_into_libs=yes
-+ ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+ # Give a soname corresponding to the major version so that dld.sl refuses to
-+ # link against other versions.
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ case $host_cpu in
-+ ia64*)
-+ shrext_cmds='.so'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.so"
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ if test "X$HPUX_IA64_MODE" = X32; then
-+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+ else
-+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+ fi
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ hppa*64*)
-+ shrext_cmds='.sl'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ *)
-+ shrext_cmds='.sl'
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=SHLIB_PATH
-+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-+ esac
-+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-+ postinstall_cmds='chmod 555 $lib'
-+ # or fails outright, so override atomically:
-+ install_override_mode=555
-+ ;;
-+
-+interix[[3-9]]*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ 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 ;;
-+ *)
-+ if test "$lt_cv_prog_gnu_ld" = yes; then
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ else
-+ version_type=irix
-+ fi ;;
-+ esac
-+ need_lib_prefix=no
-+ need_version=no
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ case $host_os in
-+ irix5* | nonstopux*)
-+ libsuff= shlibsuff=
-+ ;;
-+ *)
-+ case $LD in # libtool.m4 will add one of these switches to LD
-+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+ libsuff= shlibsuff= libmagic=32-bit;;
-+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+ libsuff=32 shlibsuff=N32 libmagic=N32;;
-+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+ *) libsuff= shlibsuff= libmagic=never-match;;
-+ esac
-+ ;;
-+ esac
-+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+ hardcode_into_libs=yes
-+ ;;
-+
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+ dynamic_linker=no
-+ ;;
-+
-+# This must be glibc/ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ 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'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+
-+ # Some binutils ld are patched to set DT_RUNPATH
-+ AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
-+ [lt_cv_shlibpath_overrides_runpath=no
-+ save_LDFLAGS=$LDFLAGS
-+ save_libdir=$libdir
-+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-+ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-+ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-+ [lt_cv_shlibpath_overrides_runpath=yes])])
-+ LDFLAGS=$save_LDFLAGS
-+ libdir=$save_libdir
-+ ])
-+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-+
-+ # 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>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;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,
-+ # most powerpc-linux boxes support dynamic linking these days and
-+ # people can always --disable-shared, the test was removed, and we
-+ # assume the GNU/Linux dynamic linker is in use.
-+ dynamic_linker='GNU/Linux ld.so'
-+ ;;
-+
-+netbsd*)
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ 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}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='NetBSD ld.elf_so'
-+ fi
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+
-+newsos6)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+
-+*nto* | *qnx*)
-+ version_type=qnx
-+ 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='ldqnx.so'
-+ ;;
-+
-+openbsd*)
-+ version_type=sunos
-+ sys_lib_dlsearch_path_spec="/usr/lib"
-+ need_lib_prefix=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
-+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ case $host_os in
-+ openbsd2.[[89]] | openbsd2.[[89]].*)
-+ shlibpath_overrides_runpath=no
-+ ;
-+ *)
-+ shlibpath_overrides_runpath=yes
-+ ;
-+ esac
-+ else
-+ shlibpath_overrides_runpath=yes
-+ fi
-+ ;;
-+
-+os2*)
-+ libname_spec='$name'
-+ shrext_cmds=".dll"
-+ need_lib_prefix=no
-+ library_names_spec='$libname${shared_ext} $libname.a'
-+ dynamic_linker='OS/2 ld.exe'
-+ shlibpath_var=LIBPATH
-+ ;;
-+
-+osf3* | osf4* | osf5*)
-+ version_type=osf
-+ need_lib_prefix=no
-+ need_version=no
-+ 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
-+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+ ;;
-+
-+rdos*)
-+ dynamic_linker=no
-+ ;;
-+
-+solaris*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ 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=yes
-+ hardcode_into_libs=yes
-+ # ldd complains unless libraries are executable
-+ postinstall_cmds='chmod +x $lib'
-+ ;;
-+
-+sunos4*)
-+ version_type=sunos
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ if test "$with_gnu_ld" = yes; then
-+ need_lib_prefix=no
-+ fi
-+ need_version=yes
-+ ;;
-+
-+sysv4 | sysv4.3*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ 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
-+ case $host_vendor in
-+ sni)
-+ shlibpath_overrides_runpath=no
-+ need_lib_prefix=no
-+ runpath_var=LD_RUN_PATH
-+ ;;
-+ siemens)
-+ need_lib_prefix=no
-+ ;;
-+ motorola)
-+ need_lib_prefix=no
-+ need_version=no
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+ ;;
-+ esac
-+ ;;
-+
-+sysv4*MP*)
-+ if test -d /usr/nec ;then
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+ soname_spec='$libname${shared_ext}.$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ 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
-+ shlibpath_overrides_runpath=yes
-+ 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'
-+ else
-+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+ 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'
-+ ;;
-+
-+tpf*)
-+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-+
-+uts4*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ 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
-+ ;;
-+
-+*)
-+ dynamic_linker=no
-+ ;;
-+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
-+
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+fi
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+fi
-+
-+_LT_DECL([], [variables_saved_for_relink], [1],
-+ [Variables whose values should be saved in libtool wrapper scripts and
-+ restored at link time])
-+_LT_DECL([], [need_lib_prefix], [0],
-+ [Do we need the "lib" prefix for modules?])
-+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-+_LT_DECL([], [version_type], [0], [Library versioning type])
-+_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable])
-+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-+_LT_DECL([], [shlibpath_overrides_runpath], [0],
-+ [Is shlibpath searched before the hard-coded library search path?])
-+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-+_LT_DECL([], [library_names_spec], [1],
-+ [[List of archive names. First name is the real one, the rest are links.
-+ The last name is the one that the linker finds with -lNAME]])
-+_LT_DECL([], [soname_spec], [1],
-+ [[The coded name of the library, if different from the real name]])
-+_LT_DECL([], [install_override_mode], [1],
-+ [Permission mode override for installation of shared libraries])
-+_LT_DECL([], [postinstall_cmds], [2],
-+ [Command to use after installation of a shared archive])
-+_LT_DECL([], [postuninstall_cmds], [2],
-+ [Command to use after uninstallation of a shared archive])
-+_LT_DECL([], [finish_cmds], [2],
-+ [Commands used to finish a libtool library installation in a directory])
-+_LT_DECL([], [finish_eval], [1],
-+ [[As "finish_cmds", except a single script fragment to be evaled but
-+ not shown]])
-+_LT_DECL([], [hardcode_into_libs], [0],
-+ [Whether we should hardcode library paths into libraries])
-+_LT_DECL([], [sys_lib_search_path_spec], [2],
-+ [Compile-time system search path for libraries])
-+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-+ [Run-time system search path for libraries])
-+])# _LT_SYS_DYNAMIC_LINKER
-+
-+
-+# _LT_PATH_TOOL_PREFIX(TOOL)
-+# --------------------------
-+# find a file program which can recognize shared library
-+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-+[m4_require([_LT_DECL_EGREP])dnl
-+AC_MSG_CHECKING([for $1])
-+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-+[case $MAGIC_CMD in
-+[[\\/*] | ?:[\\/]*])
-+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+ ;;
-+*)
-+ lt_save_MAGIC_CMD="$MAGIC_CMD"
-+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+dnl $ac_dummy forces splitting on constant user-supplied paths.
-+dnl POSIX.2 word splitting is done only on the output of word expansions,
-+dnl not every word. This closes a longstanding sh security hole.
-+ ac_dummy="m4_if([$2], , $PATH, [$2])"
-+ for ac_dir in $ac_dummy; do
-+ IFS="$lt_save_ifs"
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$1; then
-+ lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-+ if test -n "$file_magic_test_file"; then
-+ case $deplibs_check_method in
-+ "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
-+ :
-+ else
-+ cat <<_LT_EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such. This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem. Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
-+
-+_LT_EOF
-+ fi ;;
-+ esac
-+ fi
-+ break
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ MAGIC_CMD="$lt_save_MAGIC_CMD"
-+ ;;
-+esac])
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+ AC_MSG_RESULT($MAGIC_CMD)
-+else
-+ AC_MSG_RESULT(no)
-+fi
-+_LT_DECL([], [MAGIC_CMD], [0],
-+ [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-+])# _LT_PATH_TOOL_PREFIX
-+
-+# Old name:
-+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-+
-+
-+# _LT_PATH_MAGIC
-+# --------------
-+# find a file program which can recognize a shared library
-+m4_defun([_LT_PATH_MAGIC],
-+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+ if test -n "$ac_tool_prefix"; then
-+ _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-+ else
-+ MAGIC_CMD=:
-+ fi
-+fi
-+])# _LT_PATH_MAGIC
-+
-+
-+# LT_PATH_LD
-+# ----------
-+# find the pathname to the GNU or non-GNU linker
-+AC_DEFUN([LT_PATH_LD],
-+[AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
-+
-+AC_ARG_WITH([gnu-ld],
-+ [AS_HELP_STRING([--with-gnu-ld],
-+ [assume the C compiler uses GNU ld @<:@default=no@:>@])],
-+ [test "$withval" = no || with_gnu_ld=yes],
-+ [with_gnu_ld=no])dnl
-+
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+ # Check if gcc -print-prog-name=ld gives a path.
-+ AC_MSG_CHECKING([for ld used by $CC])
-+ case $host in
-+ *-*-mingw*)
-+ # gcc leaves a trailing carriage return which upsets mingw
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+ *)
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+ esac
-+ case $ac_prog in
-+ # Accept absolute paths.
-+ [[\\/]]* | ?:[[\\/]]*)
-+ re_direlt='/[[^/]][[^/]]*/\.\./'
-+ # Canonicalize the pathname of ld
-+ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-+ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-+ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-+ done
-+ test -z "$LD" && LD="$ac_prog"
-+ ;;
-+ "")
-+ # If it fails, then pretend we aren't using GCC.
-+ ac_prog=ld
-+ ;;
-+ *)
-+ # If it is relative, then search for the first ld in PATH.
-+ with_gnu_ld=unknown
-+ ;;
-+ esac
-+elif test "$with_gnu_ld" = yes; then
-+ AC_MSG_CHECKING([for GNU ld])
-+else
-+ AC_MSG_CHECKING([for non-GNU ld])
-+fi
-+AC_CACHE_VAL(lt_cv_path_LD,
-+[if test -z "$LD"; then
-+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+ for ac_dir in $PATH; do
-+ IFS="$lt_save_ifs"
-+ test -z "$ac_dir" && ac_dir=.
-+ 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 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'*)
-+ test "$with_gnu_ld" != no && break
-+ ;
-+ *)
-+ test "$with_gnu_ld" != yes && break
-+ ;
-+ esac
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+else
-+ lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi])
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+ AC_MSG_RESULT($LD)
-+else
-+ AC_MSG_RESULT(no)
-+fi
-+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-+_LT_PATH_LD_GNU
-+AC_SUBST([LD])
-+
-+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-+])# LT_PATH_LD
-+
-+# Old names:
-+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_PROG_LD], [])
-+dnl AC_DEFUN([AC_PROG_LD], [])
-+
-+
-+# _LT_PATH_LD_GNU
-+#- --------------
-+m4_defun([_LT_PATH_LD_GNU],
-+[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 lds only accept -v.
-+case `$LD -v 2>&1 </dev/null` in
-+*GNU* | *'with BFD'*)
-+ lt_cv_prog_gnu_ld=yes
-+ ;;
-+*)
-+ lt_cv_prog_gnu_ld=no
-+ ;;
-+esac])
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+])# _LT_PATH_LD_GNU
-+
-+
-+# _LT_CMD_RELOAD
-+# --------------
-+# find reload flag for linker
-+# -- PORTME Some linkers may need a different reload flag.
-+m4_defun([_LT_CMD_RELOAD],
-+[AC_CACHE_CHECK([for $LD option to reload object files],
-+ lt_cv_ld_reload_flag,
-+ [lt_cv_ld_reload_flag='-r'])
-+reload_flag=$lt_cv_ld_reload_flag
-+case $reload_flag in
-+"" | " "*) ;;
-+*) reload_flag=" $reload_flag" ;;
-+esac
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+ cygwin* | mingw* | pw32* | cegcc*)
-+ if test "$GCC" != yes; then
-+ reload_cmds=false
-+ fi
-+ ;;
-+ 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
-+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-+_LT_TAGDECL([], [reload_cmds], [2])dnl
-+])# _LT_CMD_RELOAD
-+
-+
-+# _LT_CHECK_MAGIC_METHOD
-+# ----------------------
-+# how to check for library dependencies
-+# -- PORTME fill in with the dynamic library characteristics
-+m4_defun([_LT_CHECK_MAGIC_METHOD],
-+[m4_require([_LT_DECL_EGREP])
-+m4_require([_LT_DECL_OBJDUMP])
-+AC_CACHE_CHECK([how to recognize dependent libraries],
-+lt_cv_deplibs_check_method,
-+[lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given extended regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+
-+case $host_os in
-+aix[[4-9]]*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+beos*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+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*)
-+ # 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*)
-+ # Base MSYS/MinGW do not provide the 'file' command needed by
-+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
-+ # unless we find 'file', for example because we are cross-compiling.
-+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
-+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+ lt_cv_file_magic_cmd='func_win32_libid'
-+ else
-+ # Keep this pattern in sync with the one in func_win32_libid.
-+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-+ lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ fi
-+ ;;
-+
-+cegcc*)
-+ # use the weaker test based on 'objdump'. See mingw*.
-+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-+ lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ ;;
-+
-+darwin* | rhapsody*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+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|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.*`
-+ ;;
-+ esac
-+ else
-+ lt_cv_deplibs_check_method=pass_all
-+ fi
-+ ;;
-+
-+gnu*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+haiku*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+hpux10.20* | hpux11*)
-+ lt_cv_file_magic_cmd=/usr/bin/file
-+ 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
-+ ;;
-+ hppa*64*)
-+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
-+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-+ ;;
-+ *)
-+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
-+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+ ;;
-+ esac
-+ ;;
-+
-+interix[[3-9]]*)
-+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-+ ;;
-+
-+irix5* | irix6* | nonstopux*)
-+ case $LD in
-+ *-32|*"-32 ") libmagic=32-bit;;
-+ *-n32|*"-n32 ") libmagic=N32;;
-+ *-64|*"-64 ") libmagic=64-bit;;
-+ *) libmagic=never-match;;
-+ esac
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+# This must be glibc/ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+netbsd*)
-+ 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
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-+ fi
-+ ;;
-+
-+newos6*)
-+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-+ lt_cv_file_magic_cmd=/usr/bin/file
-+ lt_cv_file_magic_test_file=/usr/lib/libnls.so
-+ ;;
-+
-+*nto* | *qnx*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+openbsd*)
-+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-+ else
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-+ fi
-+ ;;
-+
-+osf3* | osf4* | osf5*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+rdos*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+solaris*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+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]]'
-+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-+ ;;
-+ ncr)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+ sequent)
-+ lt_cv_file_magic_cmd='/bin/file'
-+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-+ ;;
-+ sni)
-+ lt_cv_file_magic_cmd='/bin/file'
-+ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-+ lt_cv_file_magic_test_file=/lib/libc.so
-+ ;;
-+ siemens)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+ pc)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+ esac
-+ ;;
-+
-+tpf*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+esac
-+])
-+
-+file_magic_glob=
-+want_nocaseglob=no
-+if test "$build" = "$host"; then
-+ case $host_os in
-+ mingw* | pw32*)
-+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-+ want_nocaseglob=yes
-+ else
-+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
-+ fi
-+ ;;
-+ esac
-+fi
-+
-+file_magic_cmd=$lt_cv_file_magic_cmd
-+deplibs_check_method=$lt_cv_deplibs_check_method
-+test -z "$deplibs_check_method" && deplibs_check_method=unknown
-+
-+_LT_DECL([], [deplibs_check_method], [1],
-+ [Method to check whether dependent libraries are shared objects])
-+_LT_DECL([], [file_magic_cmd], [1],
-+ [Command to use when deplibs_check_method = "file_magic"])
-+_LT_DECL([], [file_magic_glob], [1],
-+ [How to find potential files when deplibs_check_method = "file_magic"])
-+_LT_DECL([], [want_nocaseglob], [1],
-+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
-+])# _LT_CHECK_MAGIC_METHOD
-+
-+
-+# LT_PATH_NM
-+# ----------
-+# find the pathname to a BSD- or MS-compatible name lister
-+AC_DEFUN([LT_PATH_NM],
-+[AC_REQUIRE([AC_PROG_CC])dnl
-+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-+[if test -n "$NM"; then
-+ # Let the user override the test.
-+ lt_cv_path_NM="$NM"
-+else
-+ 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
-+ ;;
-+ *)
-+ 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
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ done
-+ : ${lt_cv_path_NM=no}
-+fi])
-+if test "$lt_cv_path_NM" != "no"; then
-+ NM="$lt_cv_path_NM"
-+else
-+ # Didn't find any BSD compatible name lister, look for dumpbin.
-+ if test -n "$DUMPBIN"; then :
-+ # Let the user override the test.
-+ else
-+ AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
-+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-+ *COFF*)
-+ DUMPBIN="$DUMPBIN -symbols"
-+ ;;
-+ *)
-+ DUMPBIN=:
-+ ;;
-+ esac
-+ fi
-+ AC_SUBST([DUMPBIN])
-+ if test "$DUMPBIN" != ":"; then
-+ NM="$DUMPBIN"
-+ fi
-+fi
-+test -z "$NM" && NM=nm
-+AC_SUBST([NM])
-+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-+
-+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-+ [lt_cv_nm_interface="BSD nm"
-+ echo "int some_variable = 0;" > conftest.$ac_ext
-+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-+ (eval "$ac_compile" 2>conftest.err)
-+ cat conftest.err >&AS_MESSAGE_LOG_FD
-+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-+ cat conftest.err >&AS_MESSAGE_LOG_FD
-+ (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
-+ cat conftest.out >&AS_MESSAGE_LOG_FD
-+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-+ lt_cv_nm_interface="MS dumpbin"
-+ fi
-+ rm -f conftest*])
-+])# LT_PATH_NM
-+
-+# Old names:
-+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_PROG_NM], [])
-+dnl AC_DEFUN([AC_PROG_NM], [])
-+
-+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-+# --------------------------------
-+# how to determine the name of the shared library
-+# associated with a specific link library.
-+# -- PORTME fill in with the dynamic library characteristics
-+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
-+[m4_require([_LT_DECL_EGREP])
-+m4_require([_LT_DECL_OBJDUMP])
-+m4_require([_LT_DECL_DLLTOOL])
-+AC_CACHE_CHECK([how to associate runtime and link libraries],
-+lt_cv_sharedlib_from_linklib_cmd,
-+[lt_cv_sharedlib_from_linklib_cmd='unknown'
-+
-+case $host_os in
-+cygwin* | mingw* | pw32* | cegcc*)
-+ # two different shell functions defined in ltmain.sh
-+ # decide which to use based on capabilities of $DLLTOOL
-+ case `$DLLTOOL --help 2>&1` in
-+ *--identify-strict*)
-+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-+ ;;
-+ *)
-+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-+ ;;
-+ esac
-+ ;;
-+*)
-+ # fallback: assume linklib IS sharedlib
-+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-+ ;;
-+esac
-+])
-+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-+
-+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
-+ [Command to associate shared and link libraries])
-+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-+
-+
-+# _LT_PATH_MANIFEST_TOOL
-+# ----------------------
-+# locate the manifest tool
-+m4_defun([_LT_PATH_MANIFEST_TOOL],
-+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
-+ [lt_cv_path_mainfest_tool=no
-+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
-+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-+ cat conftest.err >&AS_MESSAGE_LOG_FD
-+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-+ lt_cv_path_mainfest_tool=yes
-+ fi
-+ rm -f conftest*])
-+if test "x$lt_cv_path_mainfest_tool" != xyes; then
-+ MANIFEST_TOOL=:
-+fi
-+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
-+])# _LT_PATH_MANIFEST_TOOL
-+
-+
-+# LT_LIB_M
-+# --------
-+# check for math library
-+AC_DEFUN([LT_LIB_M],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+LIBM=
-+case $host in
-+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-+ # These system don't have libm, or don't need it
-+ ;;
-+*-ncr-sysv4.3*)
-+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-+ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-+ ;;
-+*)
-+ AC_CHECK_LIB(m, cos, LIBM="-lm")
-+ ;;
-+esac
-+AC_SUBST([LIBM])
-+])# LT_LIB_M
-+
-+# Old name:
-+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_CHECK_LIBM], [])
-+
-+
-+# _LT_COMPILER_NO_RTTI([TAGNAME])
-+# -------------------------------
-+m4_defun([_LT_COMPILER_NO_RTTI],
-+[m4_require([_LT_TAG_COMPILER])dnl
-+
-+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-+
-+if test "$GCC" = yes; then
-+ case $cc_basename in
-+ nvcc*)
-+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
-+ esac
-+
-+ _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-+ lt_cv_prog_compiler_rtti_exceptions,
-+ [-fno-rtti -fno-exceptions], [],
-+ [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-+fi
-+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-+ [Compiler flag to turn off builtin functions])
-+])# _LT_COMPILER_NO_RTTI
-+
-+
-+# _LT_CMD_GLOBAL_SYMBOLS
-+# ----------------------
-+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_PROG_AWK])dnl
-+AC_REQUIRE([LT_PATH_NM])dnl
-+AC_REQUIRE([LT_PATH_LD])dnl
-+m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_TAG_COMPILER])dnl
-+
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-+[
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix. What could be older than Ultrix?!! ;)]
-+
-+# Character class describing NM global symbol codes.
-+symcode='[[BCDEGRST]]'
-+
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-+
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+ symcode='[[BCDT]]'
-+ ;;
-+cygwin* | mingw* | pw32* | cegcc*)
-+ symcode='[[ABCDGISTW]]'
-+ ;;
-+hpux*)
-+ if test "$host_cpu" = ia64; then
-+ symcode='[[ABCDEGRST]]'
-+ fi
-+ ;;
-+irix* | nonstopux*)
-+ symcode='[[BCDEGRST]]'
-+ ;;
-+osf*)
-+ symcode='[[BCDEGQRST]]'
-+ ;;
-+solaris*)
-+ symcode='[[BDRT]]'
-+ ;;
-+sco3.2v5*)
-+ symcode='[[DT]]'
-+ ;;
-+sysv4.2uw2*)
-+ symcode='[[DT]]'
-+ ;;
-+sysv5* | sco5v6* | unixware* | OpenUNIX*)
-+ symcode='[[ABDT]]'
-+ ;;
-+sysv4)
-+ symcode='[[DFNSTU]]'
-+ ;;
-+esac
-+
-+# If we're using GNU nm, then use its standard symbol codes.
-+case `$NM -V 2>&1` in
-+*GNU* | *'with BFD'*)
-+ symcode='[[ABCDGIRSTW]]' ;;
-+esac
-+
-+# Transform an extracted symbol line into a proper C declaration.
-+# Some systems (esp. on ia64) link data and code symbols differently,
-+# so use this general approach.
-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
-+
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $build_os in
-+mingw*)
-+ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+ ;;
-+esac
-+
-+# Try without a prefix underscore, 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.
-+ if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-+ # Fake it for dumpbin and say T for any non-static function
-+ # and D for any global variable.
-+ # Also find C++ and __fastcall symbols from MSVC++,
-+ # which start with @ or ?.
-+ lt_cv_sys_global_symbol_pipe="$AWK ['"\
-+" {last_section=section; section=\$ 3};"\
-+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-+" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-+" \$ 0!~/External *\|/{next};"\
-+" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-+" {if(hide[section]) next};"\
-+" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-+" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-+" s[1]~/^[@?]/{print s[1], s[1]; next};"\
-+" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-+" ' prfx=^$ac_symprfx]"
-+ else
-+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-+ fi
-+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-+
-+ # Check to see that the pipe works correctly.
-+ pipe_works=no
-+
-+ rm -f conftest*
-+ cat > conftest.$ac_ext <<_LT_EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(void);
-+void nm_test_func(void){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+_LT_EOF
-+
-+ if AC_TRY_EVAL(ac_compile); then
-+ # Now try to grab the symbols.
-+ nlist=conftest.nm
-+ if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
-+ # Try sorting and uniquifying the output.
-+ if sort "$nlist" | uniq > "$nlist"T; then
-+ mv -f "$nlist"T "$nlist"
-+ else
-+ rm -f "$nlist"T
-+ fi
-+
-+ # Make sure that we snagged all the symbols we need.
-+ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-+ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-+ cat <<_LT_EOF > conftest.$ac_ext
-+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-+/* DATA imports from DLLs on WIN32 con't be const, because runtime
-+ relocations are performed -- see ld's documentation on pseudo-relocs. */
-+# define LT@&t@_DLSYM_CONST
-+#elif defined(__osf__)
-+/* This system does not cope well with relocations in const data. */
-+# define LT@&t@_DLSYM_CONST
-+#else
-+# define LT@&t@_DLSYM_CONST const
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+_LT_EOF
-+ # Now generate the symbol file.
-+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-+
-+ cat <<_LT_EOF >> conftest.$ac_ext
-+
-+/* The mapping between symbol names and symbols. */
-+LT@&t@_DLSYM_CONST struct {
-+ const char *name;
-+ void *address;
-+}
-+lt__PROGRAM__LTX_preloaded_symbols[[]] =
-+{
-+ { "@PROGRAM@", (void *) 0 },
-+_LT_EOF
-+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-+ cat <<\_LT_EOF >> conftest.$ac_ext
-+ {0, (void *) 0}
-+};
-+
-+/* This works around a problem in FreeBSD linker */
-+#ifdef FREEBSD_WORKAROUND
-+static const void *lt_preloaded_setup() {
-+ return lt__PROGRAM__LTX_preloaded_symbols;
-+}
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+_LT_EOF
-+ # Now try linking the two files.
-+ mv conftest.$ac_objext conftstm.$ac_objext
-+ lt_globsym_save_LIBS=$LIBS
-+ lt_globsym_save_CFLAGS=$CFLAGS
-+ LIBS="conftstm.$ac_objext"
-+ CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-+ pipe_works=yes
-+ fi
-+ LIBS=$lt_globsym_save_LIBS
-+ CFLAGS=$lt_globsym_save_CFLAGS
-+ else
-+ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-+ fi
-+ else
-+ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-+ fi
-+ else
-+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-+ fi
-+ else
-+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-+ cat conftest.$ac_ext >&5
-+ fi
-+ rm -rf conftest* conftst*
-+
-+ # Do not use the global_symbol_pipe unless it works.
-+ if test "$pipe_works" = yes; then
-+ break
-+ else
-+ lt_cv_sys_global_symbol_pipe=
-+ fi
-+done
-+])
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+ lt_cv_sys_global_symbol_to_cdecl=
-+fi
-+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-+ AC_MSG_RESULT(failed)
-+else
-+ AC_MSG_RESULT(ok)
-+fi
-+
-+# Response file support.
-+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-+ nm_file_list_spec='@'
-+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
-+ nm_file_list_spec='@'
-+fi
-+
-+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-+ [Take the output of nm and produce a listing of raw symbols and C names])
-+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-+ [Transform the output of nm in a proper C declaration])
-+_LT_DECL([global_symbol_to_c_name_address],
-+ [lt_cv_sys_global_symbol_to_c_name_address], [1],
-+ [Transform the output of nm in a C name address pair])
-+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-+ [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-+ [Transform the output of nm in a C name address pair when lib prefix is needed])
-+_LT_DECL([], [nm_file_list_spec], [1],
-+ [Specify filename containing input files for $NM])
-+]) # _LT_CMD_GLOBAL_SYMBOLS
-+
-+
-+# _LT_COMPILER_PIC([TAGNAME])
-+# ---------------------------
-+m4_defun([_LT_COMPILER_PIC],
-+[m4_require([_LT_TAG_COMPILER])dnl
-+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+_LT_TAGVAR(lt_prog_compiler_static, $1)=
-+
-+m4_if([$1], [CXX], [
-+ # C++ specific cases for pic, static, wl, etc.
-+ if test "$GXX" = yes; then
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+
-+ case $host_os in
-+ aix*)
-+ # All AIX code is PIC.
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ fi
-+ ;;
-+
-+ amigaos*)
-+ case $host_cpu in
-+ powerpc)
-+ # see comment about AmigaOS4 .so support
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;;
-+ m68k)
-+ # FIXME: we need at least 68020 code to build shared libraries, but
-+ # adding the `-m68020' flag to GCC prevents building anything better,
-+ # like `-m68040'.
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-+ ;;
-+ esac
-+ ;;
-+
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ # PIC is the default for these OSes.
-+ ;;
-+ mingw* | cygwin* | os2* | pw32* | cegcc*)
-+ # This hack is so that the source file can tell whether it is being
-+ # built for inclusion in a dll (and should export symbols for example).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
-+ m4_if([$1], [GCJ], [],
-+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-+ ;;
-+ darwin* | rhapsody*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-+ ;;
-+ *djgpp*)
-+ # DJGPP does not support shared libraries at all
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+ ;;
-+ haiku*)
-+ # PIC is the default for Haiku.
-+ # The "-static" flag exists, but is broken.
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
-+ ;;
-+ interix[[3-9]]*)
-+ # 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_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-+ fi
-+ ;;
-+ hpux*)
-+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
-+ # sets the default TLS model and affects inlining.
-+ case $host_cpu in
-+ hppa*64*)
-+ ;
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;
-+ esac
-+ ;;
-+ *qnx* | *nto*)
-+ # QNX uses GNU C++, but need to define -shared option too, otherwise
-+ # it will coredump.
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-+ ;;
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;;
-+ esac
-+ else
-+ case $host_os in
-+ aix[[4-9]]*)
-+ # All AIX code is PIC.
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ else
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-+ fi
-+ ;
-+ chorus*)
-+ case $cc_basename in
-+ cxch68*)
-+ # Green Hills C++ Compiler
-+ # _LT_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
-+ ;
-+ mingw* | cygwin* | os2* | pw32* | cegcc*)
-+ # This hack is so that the source file can tell whether it is being
-+ # built for inclusion in a dll (and should export symbols for example).
-+ m4_if([$1], [GCJ], [],
-+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-+ ;
-+ dgux*)
-+ case $cc_basename in
-+ ec++*)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ ;;
-+ ghcx*)
-+ # Green Hills C++ Compiler
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;
-+ freebsd* | dragonfly*)
-+ # FreeBSD uses GNU C++
-+ ;
-+ hpux9* | hpux10* | hpux11*)
-+ case $cc_basename in
-+ CC*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+ if test "$host_cpu" != ia64; then
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+ fi
-+ ;;
-+ aCC*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+ case $host_cpu in
-+ hppa*64*|ia64*)
-+ # +Z the default
-+ ;;
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+ ;;
-+ esac
-+ ;;
-+ *)
-+ ;;
-+ 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*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ # CC pic flag -KPIC is the default.
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+ case $cc_basename in
-+ KCC*)
-+ # KAI C++ Compiler
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;;
-+ ecpc* )
-+ # old Intel C++ for x86_64 which still supported -KPIC.
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ ;;
-+ icpc* )
-+ # Intel C++, used to be incompatible with GCC.
-+ # ICC 10 doesn't accept -KPIC any more.
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ ;;
-+ pgCC* | pgcpp*)
-+ # Portland Group C++ compiler
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+ _LT_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.
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+ xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
-+ # IBM XL 8.0, 9.0 on PPC and BlueGene
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-+ ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+ ;;
-+ esac
-+ ;;
-+ esac
-+ ;
-+ lynxos*)
-+ ;
-+ m88k*)
-+ ;
-+ mvs*)
-+ case $cc_basename in
-+ cxx*)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;
-+ netbsd*)
-+ ;
-+ *qnx* | *nto*)
-+ # QNX uses GNU C++, but need to define -shared option too, otherwise
-+ # it will coredump.
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-+ ;;
-+ osf3* | osf4* | osf5*)
-+ case $cc_basename in
-+ KCC*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-+ ;;
-+ RCC*)
-+ # Rational C++ 2.4.1
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+ ;;
-+ cxx*)
-+ # Digital/Compaq C++
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ # Make sure the PIC flag is empty. It appears that all Alpha
-+ # Linux and Compaq Tru64 Unix objects are PIC.
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;
-+ psos*)
-+ ;
-+ solaris*)
-+ case $cc_basename in
-+ CC* | sunCC*)
-+ # Sun C++ 4.2, 5.x and Centerline C++
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+ ;;
-+ gcx*)
-+ # Green Hills C++ Compiler
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;
-+ sunos4*)
-+ case $cc_basename in
-+ CC*)
-+ # Sun C++ 4.x
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+ lcc*)
-+ # Lucid
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;
-+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+ case $cc_basename in
-+ CC*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+ esac
-+ ;
-+ tandem*)
-+ case $cc_basename in
-+ NCC*)
-+ # NonStop-UX NCC 3.20
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;
-+ vxworks*)
-+ ;
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+ ;
-+ esac
-+ fi
-+],
-+[
-+ if test "$GCC" = yes; then
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+
-+ case $host_os in
-+ aix*)
-+ # All AIX code is PIC.
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ fi
-+ ;;
-+
-+ amigaos*)
-+ case $host_cpu in
-+ powerpc)
-+ # see comment about AmigaOS4 .so support
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;;
-+ m68k)
-+ # FIXME: we need at least 68020 code to build shared libraries, but
-+ # adding the `-m68020' flag to GCC prevents building anything better,
-+ # like `-m68040'.
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-+ ;;
-+ esac
-+ ;;
-+
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ # PIC is the default for these OSes.
-+ ;;
-+
-+ mingw* | cygwin* | pw32* | os2* | cegcc*)
-+ # This hack is so that the source file can tell whether it is being
-+ # built for inclusion in a dll (and should export symbols for example).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
-+ m4_if([$1], [GCJ], [],
-+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-+ ;;
-+
-+ darwin* | rhapsody*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-+ ;;
-+
-+ haiku*)
-+ # PIC is the default for Haiku.
-+ # The "-static" flag exists, but is broken.
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
-+ ;;
-+
-+ hpux*)
-+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
-+ # sets the default TLS model and affects inlining.
-+ case $host_cpu in
-+ hppa*64*)
-+ # +Z the default
-+ ;
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;
-+ esac
-+ ;;
-+
-+ interix[[3-9]]*)
-+ # 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.
-+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+ enable_shared=no
-+ ;;
-+
-+ *nto* | *qnx*)
-+ # QNX uses GNU C++, but need to define -shared option too, otherwise
-+ # it will coredump.
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-+ ;;
-+
-+ sysv4*MP*)
-+ if test -d /usr/nec; then
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-+ fi
-+ ;;
-+
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;;
-+ esac
-+
-+ case $cc_basename in
-+ nvcc*) # Cuda Compiler Driver 2.2
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-+ if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
-+ fi
-+ ;;
-+ esac
-+ else
-+ # PORTME Check for flag to pass linker flags through the system compiler.
-+ case $host_os in
-+ aix*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ else
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-+ fi
-+ ;;
-+
-+ mingw* | cygwin* | pw32* | os2* | cegcc*)
-+ # This hack is so that the source file can tell whether it is being
-+ # built for inclusion in a dll (and should export symbols for example).
-+ m4_if([$1], [GCJ], [],
-+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-+ ;;
-+
-+ hpux9* | hpux10* | hpux11*)
-+ _LT_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
-+ hppa*64*|ia64*)
-+ # +Z the default
-+ ;
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+ ;
-+ esac
-+ # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+ ;;
-+
-+ irix5* | irix6* | nonstopux*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ # PIC (with -KPIC) is the default.
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+ case $cc_basename in
-+ # old Intel for x86_64 which still supported -KPIC.
-+ ecc*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ ;;
-+ # icc used to be incompatible with GCC.
-+ # ICC 10 doesn't accept -KPIC any more.
-+ icc* | ifort*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ ;;
-+ # Lahey Fortran 8.1.
-+ lf95*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-+ ;
-+ nagfor*)
-+ # NAG Fortran compiler
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;
-+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-+ # Portland Group compilers (*not* the Pentium gcc compiler,
-+ # which looks to be a dead project)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+ ccc*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ # All Alpha code is PIC.
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+ xl* | bgxl* | bgf* | mpixl*)
-+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-+ ;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
-+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-+ ;;
-+ *Sun\ F* | *Sun*Fortran*)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+ ;;
-+ *Sun\ C*)
-+ # Sun C 5.9
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ ;;
-+ *Intel*\ [[CF]]*Compiler*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ ;;
-+ *Portland\ Group*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+ esac
-+ ;
-+ esac
-+ ;;
-+
-+ newsos6)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+
-+ *nto* | *qnx*)
-+ # QNX uses GNU C++, but need to define -shared option too, otherwise
-+ # it will coredump.
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-+ ;;
-+
-+ osf3* | osf4* | osf5*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ # All OSF/1 code is PIC.
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+
-+ rdos*)
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+
-+ solaris*)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ case $cc_basename in
-+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-+ esac
-+ ;;
-+
-+ sunos4*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+
-+ sysv4 | sysv4.2uw2* | sysv4.3*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+
-+ sysv4*MP*)
-+ if test -d /usr/nec ;then
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ fi
-+ ;;
-+
-+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+
-+ unicos*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+ ;;
-+
-+ uts4*)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+ ;;
-+ esac
-+ fi
-+])
-+case $host_os in
-+ # For platforms which do not support PIC, -DPIC is meaningless:
-+ *djgpp*)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+ ;;
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-+ ;;
-+esac
-+
-+AC_CACHE_CHECK([for $compiler option to produce PIC],
-+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
-+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
-+
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-+ _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-+ [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-+ [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-+ [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-+ "" | " "*) ;;
-+ *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-+ esac],
-+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-+fi
-+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-+ [Additional compiler flags for building library objects])
-+
-+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-+ [How to pass a linker flag through the compiler])
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-+ _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-+ $lt_tmp_static_flag,
-+ [],
-+ [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-+ [Compiler flag to prevent dynamic linking])
-+])# _LT_COMPILER_PIC
-+
-+
-+# _LT_LINKER_SHLIBS([TAGNAME])
-+# ----------------------------
-+# See if the linker supports building shared libraries.
-+m4_defun([_LT_LINKER_SHLIBS],
-+[AC_REQUIRE([LT_PATH_LD])dnl
-+AC_REQUIRE([LT_PATH_NM])dnl
-+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-+m4_require([_LT_TAG_COMPILER])dnl
-+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+m4_if([$1], [CXX], [
-+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-+ case $host_os in
-+ aix[[4-9]]*)
-+ # If we're using GNU nm, then we don't want the "-C" option.
-+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+ # Also, AIX nm treats weak defined symbols like other global defined
-+ # symbols, whereas GNU nm marks them as "W".
-+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+ else
-+ _LT_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
-+ ;;
-+ pw32*)
-+ _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-+ ;;
-+ cygwin* | mingw* | cegcc*)
-+ case $cc_basename in
-+ cl*)
-+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-+ ;;
-+ *)
-+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-+ ;;
-+ esac
-+ ;;
-+ *)
-+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+ ;;
-+ esac
-+], [
-+ runpath_var=
-+ _LT_TAGVAR(allow_undefined_flag, $1)=
-+ _LT_TAGVAR(always_export_symbols, $1)=no
-+ _LT_TAGVAR(archive_cmds, $1)=
-+ _LT_TAGVAR(archive_expsym_cmds, $1)=
-+ _LT_TAGVAR(compiler_needs_object, $1)=no
-+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+ _LT_TAGVAR(hardcode_automatic, $1)=no
-+ _LT_TAGVAR(hardcode_direct, $1)=no
-+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=
-+ _LT_TAGVAR(hardcode_minus_L, $1)=no
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+ _LT_TAGVAR(inherit_rpath, $1)=no
-+ _LT_TAGVAR(link_all_deplibs, $1)=unknown
-+ _LT_TAGVAR(module_cmds, $1)=
-+ _LT_TAGVAR(module_expsym_cmds, $1)=
-+ _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-+ _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-+ _LT_TAGVAR(thread_safe_flag_spec, $1)=
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+ # include_expsyms should be a list of space-separated symbols to be *always*
-+ # included in the symbol list
-+ _LT_TAGVAR(include_expsyms, $1)=
-+ # exclude_expsyms can be an extended regexp of symbols to exclude
-+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+ # as well as any symbol that contains `d'.
-+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+ # platforms (ab)use it in PIC code, but their linkers get confused if
-+ # the symbol is explicitly referenced. Since portable code cannot
-+ # rely on this symbol name, it's probably fine to never include it in
-+ # preloaded symbol tables.
-+ # Exclude shared library initialization/finalization symbols.
-+dnl Note also adjust exclude_expsyms for C++ above.
-+ extract_expsyms_cmds=
-+
-+ case $host_os in
-+ cygwin* | mingw* | pw32* | cegcc*)
-+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+ # When not using gcc, we currently assume that we are using
-+ # Microsoft Visual C++.
-+ if test "$GCC" != yes; then
-+ 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
-+ ;;
-+ esac
-+
-+ _LT_TAGVAR(ld_shlibs, $1)=yes
-+
-+ # On some targets, GNU ld is compatible enough with the native linker
-+ # that we're better off using the native interface for both.
-+ lt_use_gnu_ld_interface=no
-+ if test "$with_gnu_ld" = yes; then
-+ case $host_os in
-+ aix*)
-+ # The AIX port of GNU ld has always aspired to compatibility
-+ # with the native linker. However, as the warning in the GNU ld
-+ # block says, versions before 2.19.5* couldn't really create working
-+ # shared libraries, regardless of the interface used.
-+ case `$LD -v 2>&1` in
-+ *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-+ *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
-+ *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
-+ *)
-+ lt_use_gnu_ld_interface=yes
-+ ;;
-+ esac
-+ ;
-+ *)
-+ lt_use_gnu_ld_interface=yes
-+ ;
-+ esac
-+ fi
-+
-+ if test "$lt_use_gnu_ld_interface" = yes; then
-+ # 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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_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_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ else
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+ fi
-+ supports_anon_versioning=no
-+ case `$LD -v 2>&1` in
-+ *GNU\ gold*) supports_anon_versioning=yes ;;
-+ *\ [[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
-+ aix[[3-9]]*)
-+ # On AIX/PPC, the GNU linker is very broken
-+ if test "$host_cpu" != ia64; then
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ cat <<_LT_EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.19, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support. If you
-+*** really care for shared libraries, you may want to install binutils
-+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-+*** You will then need to restart the configuration process.
-+
-+_LT_EOF
-+ fi
-+ ;;
-+
-+ amigaos*)
-+ case $host_cpu in
-+ powerpc)
-+ # see comment about AmigaOS4 .so support
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)=''
-+ ;;
-+ m68k)
-+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+ ;;
-+ esac
-+ ;;
-+
-+ beos*)
-+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+ # support --undefined. This deserves some investigation. FIXME
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
-+ cygwin* | mingw* | pw32* | cegcc*)
-+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+ # as there is no search path for DLLs.
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ _LT_TAGVAR(always_export_symbols, $1)=no
-+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-+
-+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+ _LT_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_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+ cp $export_symbols $output_objdir/$soname.def;
-+ else
-+ 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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
-+ haiku*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+ ;;
-+
-+ interix[[3-9]]*)
-+ _LT_TAGVAR(hardcode_direct, $1)=no
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_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_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_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'
-+ ;;
-+
-+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-+ tmp_diet=no
-+ if test "$host_os" = linux-dietlibc; then
-+ case $cc_basename in
-+ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
-+ esac
-+ fi
-+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-+ && test "$tmp_diet" = no
-+ then
-+ tmp_addflag=' $pic_flag'
-+ tmp_sharedflag='-shared'
-+ case $cc_basename,$host_cpu in
-+ pgcc*) # Portland Group C compiler
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_addflag=' $pic_flag'
-+ ;;
-+ pgf77* | pgf90* | pgf95* | pgfortran*)
-+ # Portland Group f77 and f90 compilers
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$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' ;;
-+ lf95*) # Lahey Fortran 8.1
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+ tmp_sharedflag='--shared' ;;
-+ xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-+ tmp_sharedflag='-qmkshrobj'
-+ tmp_addflag= ;;
-+ nvcc*) # Cuda Compiler Driver 2.2
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+ _LT_TAGVAR(compiler_needs_object, $1)=yes
-+ ;;
-+ esac
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*) # Sun C 5.9
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+ _LT_TAGVAR(compiler_needs_object, $1)=yes
-+ tmp_sharedflag='-G' ;;
-+ *Sun\ F*) # Sun Fortran 8.3
-+ tmp_sharedflag='-G' ;;
-+ esac
-+ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+ if test "x$supports_anon_versioning" = xyes; then
-+ _LT_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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ fi
-+
-+ case $cc_basename in
-+ xlf* | bgf* | bgxlf* | mpixlf*)
-+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-+ if test "x$supports_anon_versioning" = xyes; then
-+ _LT_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~
-+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-+ fi
-+ ;;
-+ esac
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
-+ netbsd*)
-+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+ wlarc=
-+ else
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ fi
-+ ;;
-+
-+ solaris*)
-+ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ cat <<_LT_EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems. Therefore, libtool
-+*** is disabling shared libraries support. We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer. Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+_LT_EOF
-+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
-+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-+ case `$LD -v 2>&1` in
-+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-+ _LT_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
-+ ;
-+ *)
-+ # 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.
-+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;
-+ esac
-+ ;;
-+
-+ sunos4*)
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ wlarc=
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ *)
-+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+ esac
-+
-+ if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
-+ runpath_var=
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+ fi
-+ else
-+ # PORTME fill in a description of your system's linker (not GNU ld)
-+ case $host_os in
-+ aix3*)
-+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ _LT_TAGVAR(always_export_symbols, $1)=yes
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+ # Note: this linker hardcodes the directories in LIBPATH if there
-+ # are no directories specified by -L.
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-+ # Neither direct hardcoding nor static linking is supported with a
-+ # broken collect2.
-+ _LT_TAGVAR(hardcode_direct, $1)=unsupported
-+ fi
-+ ;;
-+
-+ aix[[4-9]]*)
-+ if test "$host_cpu" = ia64; then
-+ # On IA64, the linker does run time linking by default, so we don't
-+ # have to do anything special.
-+ aix_use_runtimelinking=no
-+ exp_sym_flag='-Bexport'
-+ no_entry_flag=""
-+ else
-+ # If we're using GNU nm, then we don't want the "-C" option.
-+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+ # Also, AIX nm treats weak defined symbols like other global
-+ # defined symbols, whereas GNU nm marks them as "W".
-+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+ else
-+ _LT_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]].*|aix[[5-9]]*)
-+ 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
-+
-+ exp_sym_flag='-bexport'
-+ no_entry_flag='-bnoentry'
-+ fi
-+
-+ # When large executables or shared objects are built, AIX ld can
-+ # have problems creating the table of contents. If linking a library
-+ # or program results in "error TOC overflow" add -mminimal-toc to
-+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
-+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+ _LT_TAGVAR(archive_cmds, $1)=''
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-+
-+ if test "$GCC" = yes; then
-+ 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`
-+ if test -f "$collect2name" &&
-+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-+ then
-+ # We have reworked collect2
-+ :
-+ else
-+ # We have old collect2
-+ _LT_TAGVAR(hardcode_direct, $1)=unsupported
-+ # It fails to find uninstalled libraries when the uninstalled
-+ # path is not listed in the libpath. Setting hardcode_minus_L
-+ # to unsupported forces relinking
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_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
-+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+ # chokes on -Wl,-G. The following line is correct:
-+ shared_flag='-G'
-+ else
-+ if test "$aix_use_runtimelinking" = yes; then
-+ shared_flag='${wl}-G'
-+ else
-+ shared_flag='${wl}-bM:SRE'
-+ fi
-+ fi
-+ fi
-+
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-+ # It seems that -bexpall does not export symbols beginning with
-+ # underscore (_), so it is better to generate a list of symbols to export.
-+ _LT_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_TAGVAR(allow_undefined_flag, $1)='-berok'
-+ # Determine the default libpath from the value encoded in an
-+ # empty executable.
-+ _LT_SYS_MODULE_PATH_AIX([$1])
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ _LT_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 func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ else
-+ if test "$host_cpu" = ia64; then
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-+ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-+ _LT_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_SYS_MODULE_PATH_AIX([$1])
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ # Warning - without using the other run time loading flags,
-+ # -berok will link without error, but may produce a broken library.
-+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+ if test "$with_gnu_ld" = yes; then
-+ # We only use this code for GNU lds that support --whole-archive.
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+ else
-+ # Exported symbols can be pulled into shared objects from archives
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-+ fi
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+ # This is similar to how AIX traditionally builds its shared libraries.
-+ _LT_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
-+ ;;
-+
-+ amigaos*)
-+ case $host_cpu in
-+ powerpc)
-+ # see comment about AmigaOS4 .so support
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)=''
-+ ;;
-+ m68k)
-+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+ ;;
-+ esac
-+ ;;
-+
-+ bsdi[[45]]*)
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-+ ;;
-+
-+ cygwin* | mingw* | pw32* | cegcc*)
-+ # When not using gcc, we currently assume that we are using
-+ # Microsoft Visual C++.
-+ # hardcode_libdir_flag_spec is actually meaningless, as there is
-+ # no search path for DLLs.
-+ case $cc_basename in
-+ cl*)
-+ # Native MSVC
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ _LT_TAGVAR(always_export_symbols, $1)=yes
-+ _LT_TAGVAR(file_list_spec, $1)='@'
-+ # Tell ltmain to make .lib files, not .a files.
-+ libext=lib
-+ # Tell ltmain to make .dll files, not .so files.
-+ shrext_cmds=".dll"
-+ # FIXME: Setting linknames here is a bad hack.
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-+ else
-+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-+ fi~
-+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-+ linknames='
-+ # The linker will not automatically build a static lib if we build a DLL.
-+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-+ _LT_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'
-+ # Don't use ranlib
-+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-+ lt_tool_outputfile="@TOOL_OUTPUT@"~
-+ case $lt_outputfile in
-+ *.exe|*.EXE) ;;
-+ *)
-+ lt_outputfile="$lt_outputfile.exe"
-+ lt_tool_outputfile="$lt_tool_outputfile.exe"
-+ ;;
-+ esac~
-+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-+ $RM "$lt_outputfile.manifest";
-+ fi'
-+ ;
-+ *)
-+ # Assume MSVC wrapper
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-+ _LT_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_cmds=".dll"
-+ # FIXME: Setting linknames here is a bad hack.
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-+ # The linker will automatically build a .lib file if we build a DLL.
-+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-+ # FIXME: Should let the user specify the lib program.
-+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+ ;
-+ esac
-+ ;;
-+
-+ darwin* | rhapsody*)
-+ _LT_DARWIN_LINKER_FEATURES($1)
-+ ;;
-+
-+ dgux*)
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+ # support. Future versions do this automatically, but an explicit c++rt0.o
-+ # does not break anything, and helps significantly (at the cost of a little
-+ # extra space).
-+ freebsd2.2*)
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+ freebsd2.*)
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+ freebsd* | dragonfly*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ hpux9*)
-+ if test "$GCC" = yes; then
-+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+ else
-+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+ fi
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ ;;
-+
-+ hpux10*)
-+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+ _LT_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_TAGVAR(hardcode_minus_L, $1)=yes
-+ fi
-+ ;;
-+
-+ hpux11*)
-+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-+ case $host_cpu in
-+ hppa*64*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ ia64*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ *)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ esac
-+ else
-+ case $host_cpu in
-+ hppa*64*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ ia64*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ *)
-+ m4_if($1, [], [
-+ # Older versions of the 11.00 compiler do not understand -b yet
-+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-+ _LT_LINKER_OPTION([if $CC understands -b],
-+ _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
-+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
-+ [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
-+ [_LT_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
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ case $host_cpu in
-+ hppa*64*|ia64*)
-+ _LT_TAGVAR(hardcode_direct, $1)=no
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+ *)
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+ _LT_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_TAGVAR(hardcode_minus_L, $1)=yes
-+ ;;
-+ esac
-+ fi
-+ ;;
-+
-+ irix5* | irix6* | nonstopux*)
-+ if test "$GCC" = yes; then
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ # Try to use the -exported_symbol ld option, if it does not
-+ # work, assume that -exports_file does not work either and
-+ # implicitly export all symbols.
-+ # This should be the same for all languages, so no per-tag cache variable.
-+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
-+ [lt_cv_irix_exported_symbol],
-+ [save_LDFLAGS="$LDFLAGS"
-+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-+ AC_LINK_IFELSE(
-+ [AC_LANG_SOURCE(
-+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
-+ [C++], [[int foo (void) { return 0; }]],
-+ [Fortran 77], [[
-+ subroutine foo
-+ end]],
-+ [Fortran], [[
-+ subroutine foo
-+ end]])])],
-+ [lt_cv_irix_exported_symbol=yes],
-+ [lt_cv_irix_exported_symbol=no])
-+ LDFLAGS="$save_LDFLAGS"])
-+ if test "$lt_cv_irix_exported_symbol" = yes; then
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-+ fi
-+ else
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-+ fi
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_TAGVAR(inherit_rpath, $1)=yes
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+ ;;
-+
-+ netbsd*)
-+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
-+ else
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
-+ fi
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ newsos6)
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ *nto* | *qnx*)
-+ ;;
-+
-+ openbsd*)
-+ if test -f /usr/libexec/ld.so; then
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ ;;
-+ *)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
-+ os2*)
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+ ;;
-+
-+ osf3*)
-+ if test "$GCC" = yes; then
-+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ else
-+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+ fi
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+ ;;
-+
-+ osf4* | osf5*) # as osf3* with the addition of -msym flag
-+ if test "$GCC" = yes; then
-+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ else
-+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_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_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+ fi
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+ ;;
-+
-+ solaris*)
-+ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-+ if test "$GCC" = yes; then
-+ wlarc='${wl}'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+ else
-+ case `$CC -V 2>&1` in
-+ *"Compilers 5.0"*)
-+ wlarc=''
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_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'
-+ ;;
-+ *)
-+ wlarc='${wl}'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_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} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+ ;;
-+ esac
-+ fi
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ case $host_os in
-+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+ *)
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'. GCC discards it without `$wl',
-+ # but is careful enough not to reorder.
-+ # Supported since Solaris 2.6 (maybe 2.5.1?)
-+ if test "$GCC" = yes; then
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ else
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-+ fi
-+ ;
-+ esac
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+ ;;
-+
-+ sunos4*)
-+ if test "x$host_vendor" = xsequent; then
-+ # Use $CC to link under sequent, because it throws in some extra .o
-+ # files that make .init and .fini sections work.
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+ fi
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ sysv4)
-+ case $host_vendor in
-+ sni)
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-+ ;
-+ siemens)
-+ ## LD is ld it makes a PLAMLIB
-+ ## CC just makes a GrossModule.
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-+ _LT_TAGVAR(hardcode_direct, $1)=no
-+ ;;
-+ motorola)
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-+ ;
-+ esac
-+ runpath_var='LD_RUN_PATH'
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ sysv4.3*)
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-+ ;;
-+
-+ sysv4*MP*)
-+ if test -d /usr/nec; then
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ runpath_var=LD_RUN_PATH
-+ hardcode_runpath_var=yes
-+ _LT_TAGVAR(ld_shlibs, $1)=yes
-+ fi
-+ ;;
-+
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ runpath_var='LD_RUN_PATH'
-+
-+ if test "$GCC" = yes; then
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ fi
-+ ;;
-+
-+ 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_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-+ runpath_var='LD_RUN_PATH'
-+
-+ if test "$GCC" = yes; then
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ fi
-+ ;;
-+
-+ uts4*)
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ *)
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+
-+ if test x$host_vendor = xsni; then
-+ case $host in
-+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-+ ;
-+ esac
-+ fi
-+ fi
-+])
-+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+
-+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-+
-+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-+_LT_DECL([], [extract_expsyms_cmds], [2],
-+ [The commands to extract the exported symbol list from a shared archive])
-+
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-+x|xyes)
-+ # Assume -lc should be added
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+
-+ if test "$enable_shared" = yes && test "$GCC" = yes; then
-+ case $_LT_TAGVAR(archive_cmds, $1) in
-+ *'~'*)
-+ # FIXME: we may have to deal with multi-command sequences.
-+ ;;
-+ '$CC '*)
-+ # Test whether the compiler implicitly links with -lc since on some
-+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+ # to ld, don't add -lc before -lgcc.
-+ AC_CACHE_CHECK([whether -lc should be explicitly linked in],
-+ [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
-+ [$RM conftest*
-+ echo "$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_TAGVAR(lt_prog_compiler_wl, $1)
-+ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-+ compiler_flags=-v
-+ linker_flags=-v
-+ verstring=
-+ output_objdir=.
-+ libname=conftest
-+ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-+ _LT_TAGVAR(allow_undefined_flag, $1)=
-+ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-+ then
-+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+ else
-+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+ fi
-+ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-+ else
-+ cat conftest.err 1>&5
-+ fi
-+ $RM conftest*
-+ ])
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
-+ ;;
-+ esac
-+ fi
-+ ;;
-+esac
-+
-+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-+ [Whether or not to add -lc for building shared libraries])
-+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-+ [enable_shared_with_static_runtimes], [0],
-+ [Whether or not to disallow shared libs when runtime libs are static])
-+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-+ [Compiler flag to allow reflexive dlopens])
-+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-+ [Compiler flag to generate shared objects directly from archives])
-+_LT_TAGDECL([], [compiler_needs_object], [1],
-+ [Whether the compiler copes with passing no objects directly])
-+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-+ [Create an old-style archive from a shared archive])
-+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-+ [Create a temporary old-style archive to link instead of a shared archive])
-+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-+_LT_TAGDECL([], [archive_expsym_cmds], [2])
-+_LT_TAGDECL([], [module_cmds], [2],
-+ [Commands used to build a loadable module if different from building
-+ a shared archive.])
-+_LT_TAGDECL([], [module_expsym_cmds], [2])
-+_LT_TAGDECL([], [with_gnu_ld], [1],
-+ [Whether we are building with GNU ld or not])
-+_LT_TAGDECL([], [allow_undefined_flag], [1],
-+ [Flag that allows shared libraries with undefined symbols to be built])
-+_LT_TAGDECL([], [no_undefined_flag], [1],
-+ [Flag that enforces no undefined symbols])
-+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-+ [Flag to hardcode $libdir into a binary during linking.
-+ This must work even if $libdir does not exist])
-+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-+ [Whether we need a single "-rpath" flag with a separated argument])
-+_LT_TAGDECL([], [hardcode_direct], [0],
-+ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-+ DIR into the resulting binary])
-+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-+ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-+ DIR into the resulting binary and the resulting library dependency is
-+ "absolute", i.e impossible to change by setting ${shlibpath_var} if the
-+ library is relocated])
-+_LT_TAGDECL([], [hardcode_minus_L], [0],
-+ [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-+ into the resulting binary])
-+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-+ [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-+ into the resulting binary])
-+_LT_TAGDECL([], [hardcode_automatic], [0],
-+ [Set to "yes" if building a shared library automatically hardcodes DIR
-+ into the library and all subsequent libraries and executables linked
-+ against it])
-+_LT_TAGDECL([], [inherit_rpath], [0],
-+ [Set to yes if linker adds runtime paths of dependent libraries
-+ to runtime path list])
-+_LT_TAGDECL([], [link_all_deplibs], [0],
-+ [Whether libtool must link a program against all its dependency libraries])
-+_LT_TAGDECL([], [always_export_symbols], [0],
-+ [Set to "yes" if exported symbols are required])
-+_LT_TAGDECL([], [export_symbols_cmds], [2],
-+ [The commands to list exported symbols])
-+_LT_TAGDECL([], [exclude_expsyms], [1],
-+ [Symbols that should not be listed in the preloaded symbols])
-+_LT_TAGDECL([], [include_expsyms], [1],
-+ [Symbols that must always be exported])
-+_LT_TAGDECL([], [prelink_cmds], [2],
-+ [Commands necessary for linking programs (against libraries) with templates])
-+_LT_TAGDECL([], [postlink_cmds], [2],
-+ [Commands necessary for finishing linking programs])
-+_LT_TAGDECL([], [file_list_spec], [1],
-+ [Specify filename containing input files])
-+dnl FIXME: Not yet implemented
-+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-+dnl [Compiler flag to generate thread safe objects])
-+])# _LT_LINKER_SHLIBS
-+
-+
-+# _LT_LANG_C_CONFIG([TAG])
-+# ------------------------
-+# Ensure that the configuration variables for a C compiler are suitably
-+# defined. These variables are subsequently used by _LT_CONFIG to write
-+# the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_C_CONFIG],
-+[m4_require([_LT_DECL_EGREP])dnl
-+lt_save_CC="$CC"
-+AC_LANG_PUSH(C)
-+
-+# Source file extension for C test sources.
-+ac_ext=c
-+
-+# Object file extension for compiled C test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(){return(0);}'
-+
-+_LT_TAG_COMPILER
-+# Save the default compiler, since it gets overwritten when the other
-+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-+compiler_DEFAULT=$CC
-+
-+# 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
-+## the running order or otherwise move them around unless you know exactly
-+## what you are doing...
-+if test -n "$compiler"; then
-+ _LT_COMPILER_NO_RTTI($1)
-+ _LT_COMPILER_PIC($1)
-+ _LT_COMPILER_C_O($1)
-+ _LT_COMPILER_FILE_LOCKS($1)
-+ _LT_LINKER_SHLIBS($1)
-+ _LT_SYS_DYNAMIC_LINKER($1)
-+ _LT_LINKER_HARDCODE_LIBPATH($1)
-+ LT_SYS_DLOPEN_SELF
-+ _LT_CMD_STRIPLIB
-+
-+ # Report which library types will actually be built
-+ AC_MSG_CHECKING([if libtool supports shared libraries])
-+ AC_MSG_RESULT([$can_build_shared])
-+
-+ AC_MSG_CHECKING([whether to build shared libraries])
-+ test "$can_build_shared" = "no" && enable_shared=no
-+
-+ # On AIX, shared libraries and static libraries use the same namespace, and
-+ # are all built from PIC.
-+ case $host_os in
-+ aix3*)
-+ test "$enable_shared" = yes && enable_static=no
-+ if test -n "$RANLIB"; then
-+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+ postinstall_cmds='$RANLIB $lib'
-+ fi
-+ ;;
-+
-+ aix[[4-9]]*)
-+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+ test "$enable_shared" = yes && enable_static=no
-+ fi
-+ ;;
-+ esac
-+ AC_MSG_RESULT([$enable_shared])
-+
-+ AC_MSG_CHECKING([whether to build static libraries])
-+ # Make sure either enable_shared or enable_static is yes.
-+ test "$enable_shared" = yes || enable_static=yes
-+ AC_MSG_RESULT([$enable_static])
-+
-+ _LT_CONFIG($1)
-+fi
-+AC_LANG_POP
-+CC="$lt_save_CC"
-+])# _LT_LANG_C_CONFIG
-+
-+
-+# _LT_LANG_CXX_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for a C++ compiler are suitably
-+# defined. These variables are subsequently used by _LT_CONFIG to write
-+# the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_CXX_CONFIG],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-+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
-+else
-+ _lt_caught_CXX_error=yes
-+fi
-+
-+AC_LANG_PUSH(C++)
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_TAGVAR(allow_undefined_flag, $1)=
-+_LT_TAGVAR(always_export_symbols, $1)=no
-+_LT_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_TAGVAR(compiler_needs_object, $1)=no
-+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_direct, $1)=no
-+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+_LT_TAGVAR(hardcode_automatic, $1)=no
-+_LT_TAGVAR(inherit_rpath, $1)=no
-+_LT_TAGVAR(module_cmds, $1)=
-+_LT_TAGVAR(module_expsym_cmds, $1)=
-+_LT_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(reload_flag, $1)=$reload_flag
-+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-+_LT_TAGVAR(no_undefined_flag, $1)=
-+_LT_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
-+# Source file extension for C++ test sources.
-+ac_ext=cpp
-+
-+# Object file extension for compiled C++ test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# No sense in running all these tests if we already determined that
-+# the CXX compiler isn't working. Some variables (like enable_shared)
-+# are currently assumed to apply to all compilers on this platform,
-+# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_caught_CXX_error" != yes; then
-+ # Code to be used in simple compile tests
-+ lt_simple_compile_test_code="int some_variable = 0;"
-+
-+ # Code to be used in simple link tests
-+ lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-+
-+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+ _LT_TAG_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_CFLAGS=$CFLAGS
-+ lt_save_LD=$LD
-+ lt_save_GCC=$GCC
-+ GCC=$GXX
-+ lt_save_with_gnu_ld=$with_gnu_ld
-+ lt_save_path_LD=$lt_cv_path_LD
-+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-+ else
-+ $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
-+ $as_unset lt_cv_path_LD
-+ fi
-+ test -z "${LDCXX+set}" || LD=$LDCXX
-+ CC=${CXX-"c++"}
-+ CFLAGS=$CXXFLAGS
-+ compiler=$CC
-+ _LT_TAGVAR(compiler, $1)=$CC
-+ _LT_CC_BASENAME([$compiler])
-+
-+ if test -n "$compiler"; then
-+ # We don't want -fno-exception when compiling C++ code, so set the
-+ # no_builtin_flag separately
-+ if test "$GXX" = yes; then
-+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-+ else
-+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-+ fi
-+
-+ if test "$GXX" = yes; then
-+ # Set up default GNU C++ configuration
-+
-+ LT_PATH_LD
-+
-+ # Check if GNU C++ uses GNU ld as the underlying linker, since the
-+ # archiving commands below assume that GNU ld is being used.
-+ if test "$with_gnu_ld" = yes; then
-+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+
-+ # If archive_cmds runs LD, not CC, wlarc should be empty
-+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-+ # investigate it a little bit more. (MM)
-+ wlarc='${wl}'
-+
-+ # ancient GNU ld didn't support --whole-archive et. al.
-+ if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-+ $GREP 'no-whole-archive' > /dev/null; then
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ else
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+ fi
-+ else
-+ with_gnu_ld=no
-+ wlarc=
-+
-+ # A generic and very simple default shared library creation
-+ # command for GNU C++ for the case where it uses the native
-+ # linker, instead of GNU ld. If possible, this setting should
-+ # overridden to take advantage of the native linker features on
-+ # the platform it is being used on.
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+ fi
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-+
-+ else
-+ GXX=no
-+ with_gnu_ld=no
-+ wlarc=
-+ fi
-+
-+ # PORTME: fill in a description of your system's C++ link characteristics
-+ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+ _LT_TAGVAR(ld_shlibs, $1)=yes
-+ case $host_os in
-+ aix3*)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ aix[[4-9]]*)
-+ if test "$host_cpu" = ia64; then
-+ # On IA64, the linker does run time linking by default, so we don't
-+ # have to do anything special.
-+ aix_use_runtimelinking=no
-+ exp_sym_flag='-Bexport'
-+ no_entry_flag=""
-+ else
-+ 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]].*|aix[[5-9]]*)
-+ 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
-+
-+ # When large executables or shared objects are built, AIX ld can
-+ # have problems creating the table of contents. If linking a library
-+ # or program results in "error TOC overflow" add -mminimal-toc to
-+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
-+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+ _LT_TAGVAR(archive_cmds, $1)=''
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-+
-+ if test "$GXX" = yes; then
-+ 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`
-+ if test -f "$collect2name" &&
-+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-+ then
-+ # We have reworked collect2
-+ :
-+ else
-+ # We have old collect2
-+ _LT_TAGVAR(hardcode_direct, $1)=unsupported
-+ # It fails to find uninstalled libraries when the uninstalled
-+ # path is not listed in the libpath. Setting hardcode_minus_L
-+ # to unsupported forces relinking
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_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
-+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+ # chokes on -Wl,-G. The following line is correct:
-+ shared_flag='-G'
-+ else
-+ if test "$aix_use_runtimelinking" = yes; then
-+ shared_flag='${wl}-G'
-+ else
-+ shared_flag='${wl}-bM:SRE'
-+ fi
-+ fi
-+ fi
-+
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-+ # It seems that -bexpall does not export symbols beginning with
-+ # underscore (_), so it is better to generate a list of symbols to
-+ # export.
-+ _LT_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_TAGVAR(allow_undefined_flag, $1)='-berok'
-+ # Determine the default libpath from the value encoded in an empty
-+ # executable.
-+ _LT_SYS_MODULE_PATH_AIX([$1])
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+
-+ _LT_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 func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ else
-+ if test "$host_cpu" = ia64; then
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-+ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-+ _LT_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_SYS_MODULE_PATH_AIX([$1])
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ # Warning - without using the other run time loading flags,
-+ # -berok will link without error, but may produce a broken library.
-+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+ if test "$with_gnu_ld" = yes; then
-+ # We only use this code for GNU lds that support --whole-archive.
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+ else
-+ # Exported symbols can be pulled into shared objects from archives
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-+ fi
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+ # This is similar to how AIX traditionally builds its shared
-+ # libraries.
-+ _LT_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_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+ # support --undefined. This deserves some investigation. FIXME
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;
-+
-+ chorus*)
-+ case $cc_basename in
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ ;;
-+
-+ cygwin* | mingw* | pw32* | cegcc*)
-+ case $GXX,$cc_basename in
-+ ,cl* | no,cl*)
-+ # Native MSVC
-+ # hardcode_libdir_flag_spec is actually meaningless, as there is
-+ # no search path for DLLs.
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ _LT_TAGVAR(always_export_symbols, $1)=yes
-+ _LT_TAGVAR(file_list_spec, $1)='@'
-+ # Tell ltmain to make .lib files, not .a files.
-+ libext=lib
-+ # Tell ltmain to make .dll files, not .so files.
-+ shrext_cmds=".dll"
-+ # FIXME: Setting linknames here is a bad hack.
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-+ else
-+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-+ fi~
-+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-+ linknames='
-+ # The linker will not automatically build a static lib if we build a DLL.
-+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+ # Don't use ranlib
-+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-+ lt_tool_outputfile="@TOOL_OUTPUT@"~
-+ case $lt_outputfile in
-+ *.exe|*.EXE) ;;
-+ *)
-+ lt_outputfile="$lt_outputfile.exe"
-+ lt_tool_outputfile="$lt_tool_outputfile.exe"
-+ ;
-+ esac~
-+ func_to_tool_file "$lt_outputfile"~
-+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-+ $RM "$lt_outputfile.manifest";
-+ fi'
-+ ;;
-+ *)
-+ # g++
-+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+ # as there is no search path for DLLs.
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ _LT_TAGVAR(always_export_symbols, $1)=no
-+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+
-+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+ _LT_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_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+ cp $export_symbols $output_objdir/$soname.def;
-+ else
-+ 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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+ esac
-+ ;
-+ darwin* | rhapsody*)
-+ _LT_DARWIN_LINKER_FEATURES($1)
-+ ;
-+
-+ dgux*)
-+ case $cc_basename in
-+ ec++*)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ ghcx*)
-+ # Green Hills C++ Compiler
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ ;;
-+
-+ freebsd2.*)
-+ # C++ shared libraries reported to be fairly broken before
-+ # switch to ELF
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+
-+ freebsd-elf*)
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+ ;;
-+
-+ freebsd* | dragonfly*)
-+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-+ # conventions
-+ _LT_TAGVAR(ld_shlibs, $1)=yes
-+ ;;
-+
-+ gnu*)
-+ ;;
-+
-+ haiku*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+ ;;
-+
-+ hpux9*)
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-+ # but as the default
-+ # location of the library.
-+
-+ case $cc_basename in
-+ CC*)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ aCC*)
-+ _LT_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
-+ # 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 -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; func_echo_all "$list"'
-+ ;;
-+ *)
-+ if test "$GXX" = yes; then
-+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${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'
-+ else
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+ esac
-+ ;;
-+
-+ hpux10*|hpux11*)
-+ if test $with_gnu_ld = no; then
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ case $host_cpu in
-+ hppa*64*|ia64*)
-+ ;;
-+ *)
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ ;;
-+ esac
-+ fi
-+ case $host_cpu in
-+ hppa*64*|ia64*)
-+ _LT_TAGVAR(hardcode_direct, $1)=no
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+ *)
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-+ # but as the default
-+ # location of the library.
-+ ;;
-+ esac
-+
-+ case $cc_basename in
-+ CC*)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ aCC*)
-+ case $host_cpu in
-+ hppa*64*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ ;;
-+ ia64*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ ;;
-+ *)
-+ _LT_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'
-+ ;;
-+ esac
-+ # 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 -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; func_echo_all "$list"'
-+ ;;
-+ *)
-+ if test "$GXX" = yes; then
-+ if test $with_gnu_ld = no; then
-+ case $host_cpu in
-+ hppa*64*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ ;;
-+ ia64*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ ;;
-+ *)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ ;;
-+ esac
-+ fi
-+ else
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+ esac
-+ ;;
-+
-+ interix[[3-9]]*)
-+ _LT_TAGVAR(hardcode_direct, $1)=no
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_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_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_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*)
-+ # SGI C++
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-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
-+ # necessary to make sure instantiated templates are included
-+ # in the archive.
-+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-+ ;;
-+ *)
-+ if test "$GXX" = yes; then
-+ if test "$with_gnu_ld" = no; then
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ else
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
-+ fi
-+ fi
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+ ;;
-+ esac
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_TAGVAR(inherit_rpath, $1)=yes
-+ ;;
-+
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+ case $cc_basename in
-+ KCC*)
-+ # Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+ # KCC will only create a shared library if the output file
-+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
-+ # to its proper name (with version) after linking.
-+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-+ # 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 $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-+
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-+ ;;
-+ icpc* | ecpc* )
-+ # 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_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_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_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_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_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+ ;;
-+ pgCC* | pgcpp*)
-+ # Portland Group C++ compiler
-+ case `$CC -V` in
-+ *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
-+ _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-+ rm -rf $tpldir~
-+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-+ _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-+ rm -rf $tpldir~
-+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-+ $RANLIB $oldlib'
-+ _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-+ rm -rf $tpldir~
-+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-+ rm -rf $tpldir~
-+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+ ;;
-+ *) # Version 6 and above use weak symbols
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+ _LT_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'
-+ ;;
-+ esac
-+
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+ ;;
-+ cxx*)
-+ # Compaq C++
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_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'
-+
-+ runpath_var=LD_RUN_PATH
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ # 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 -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
-+ ;;
-+ xl* | mpixl* | bgxl*)
-+ # IBM XL 8.0 on PPC, with GNU ld
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ if test "x$supports_anon_versioning" = xyes; then
-+ _LT_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 -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ fi
-+ ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+ _LT_TAGVAR(compiler_needs_object, $1)=yes
-+
-+ # Not sure whether something based on
-+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-+ # would be better.
-+ output_verbose_link_cmd='func_echo_all'
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
-+ # necessary to make sure instantiated templates are included
-+ # in the archive.
-+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-+ ;;
-+ esac
-+ ;;
-+ esac
-+ ;
-+
-+ lynxos*)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;
-+
-+ m88k*)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;
-+
-+ mvs*)
-+ case $cc_basename in
-+ cxx*)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ ;
-+
-+ netbsd*)
-+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-+ wlarc=
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ fi
-+ # 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::"'
-+ ;
-+
-+ *nto* | *qnx*)
-+ _LT_TAGVAR(ld_shlibs, $1)=yes
-+ ;
-+
-+ openbsd2*)
-+ # C++ shared libraries are fairly broken
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;
-+
-+ openbsd*)
-+ if test -f /usr/libexec/ld.so; then
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+ _LT_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_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_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ fi
-+ output_verbose_link_cmd=func_echo_all
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;
-+
-+ osf3* | osf4* | osf5*)
-+ case $cc_basename in
-+ KCC*)
-+ # Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+ # KCC will only create a shared library if the output file
-+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
-+ # to its proper name (with version) after linking.
-+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ # Archives containing C++ object files must be created using
-+ # the KAI C++ compiler.
-+ case $host in
-+ osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-+ *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-+ esac
-+ ;;
-+ RCC*)
-+ # Rational C++ 2.4.1
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ cxx*)
-+ case $host in
-+ osf3*)
-+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ ;
-+ *)
-+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+ _LT_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 ${output_objdir}/so_locations -o $lib~
-+ $RM $lib.exp'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+ ;
-+ esac
-+
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ # 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 -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-+ ;;
-+ *)
-+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+ case $host in
-+ osf3*)
-+ _LT_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" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ ;;
-+ *)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ ;;
-+ esac
-+
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-+
-+ else
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+ esac
-+ ;;
-+
-+ psos*)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+
-+ sunos4*)
-+ case $cc_basename in
-+ CC*)
-+ # Sun C++ 4.x
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ lcc*)
-+ # Lucid
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ ;;
-+
-+ solaris*)
-+ case $cc_basename in
-+ CC* | sunCC*)
-+ # Sun C++ 4.2, 5.x and Centerline C++
-+ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-+ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ _LT_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} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ case $host_os in
-+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+ *)
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'.
-+ # Supported since Solaris 2.6 (maybe 2.5.1?)
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-+ ;;
-+ esac
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+
-+ output_verbose_link_cmd='func_echo_all'
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
-+ # necessary to make sure instantiated templates are included
-+ # in the archive.
-+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-+ ;;
-+ gcx*)
-+ # Green Hills C++ Compiler
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+
-+ # The C++ compiler must be used to create the archive.
-+ _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-+ ;;
-+ *)
-+ # GNU C++ compiler with Solaris linker
-+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-+ if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-+ else
-+ # g++ 2.7 appears to require `-G' NOT `-shared' on this
-+ # platform.
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-+ fi
-+
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-+ case $host_os in
-+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+ *)
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ ;;
-+ esac
-+ fi
-+ ;;
-+ esac
-+ ;;
-+
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ runpath_var='LD_RUN_PATH'
-+
-+ case $cc_basename in
-+ CC*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ *)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_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.
-+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-+ runpath_var='LD_RUN_PATH'
-+
-+ case $cc_basename in
-+ CC*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
-+ '"$_LT_TAGVAR(old_archive_cmds, $1)"
-+ _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
-+ '"$_LT_TAGVAR(reload_cmds, $1)"
-+ ;;
-+ *)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ esac
-+ ;;
-+
-+ tandem*)
-+ case $cc_basename in
-+ NCC*)
-+ # NonStop-UX NCC 3.20
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ ;;
-+
-+ vxworks*)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+
-+ AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-+ test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+
-+ _LT_TAGVAR(GCC, $1)="$GXX"
-+ _LT_TAGVAR(LD, $1)="$LD"
-+
-+ ## 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
-+ ## what you are doing...
-+ _LT_SYS_HIDDEN_LIBDEPS($1)
-+ _LT_COMPILER_PIC($1)
-+ _LT_COMPILER_C_O($1)
-+ _LT_COMPILER_FILE_LOCKS($1)
-+ _LT_LINKER_SHLIBS($1)
-+ _LT_SYS_DYNAMIC_LINKER($1)
-+ _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+ _LT_CONFIG($1)
-+ fi # test -n "$compiler"
-+
-+ CC=$lt_save_CC
-+ CFLAGS=$lt_save_CFLAGS
-+ LDCXX=$LD
-+ LD=$lt_save_LD
-+ GCC=$lt_save_GCC
-+ with_gnu_ld=$lt_save_with_gnu_ld
-+ lt_cv_path_LDCXX=$lt_cv_path_LD
-+ lt_cv_path_LD=$lt_save_path_LD
-+ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-+ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-+fi # test "$_lt_caught_CXX_error" != yes
-+
-+AC_LANG_POP
-+])# _LT_LANG_CXX_CONFIG
-+
-+
-+# _LT_FUNC_STRIPNAME_CNF
-+# ----------------------
-+# func_stripname_cnf prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+#
-+# This function is identical to the (non-XSI) version of func_stripname,
-+# except this one can be used by m4 code that may be executed by configure,
-+# rather than the libtool script.
-+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
-+AC_REQUIRE([_LT_DECL_SED])
-+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
-+func_stripname_cnf ()
-+{
-+ case ${2} in
-+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-+ esac
-+} # func_stripname_cnf
-+])# _LT_FUNC_STRIPNAME_CNF
-+
-+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-+# ---------------------------------
-+# Figure out "hidden" library dependencies from verbose
-+# compiler output when linking a shared library.
-+# Parse the compiler output and extract the necessary
-+# objects, libraries and library flags.
-+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
-+# Dependencies to place before and after the object being linked:
-+_LT_TAGVAR(predep_objects, $1)=
-+_LT_TAGVAR(postdep_objects, $1)=
-+_LT_TAGVAR(predeps, $1)=
-+_LT_TAGVAR(postdeps, $1)=
-+_LT_TAGVAR(compiler_lib_search_path, $1)=
-+
-+dnl we can't use the lt_simple_compile_test_code here,
-+dnl because it contains code intended for an executable,
-+dnl not a library. It's possible we should let each
-+dnl tag define a new lt_????_link_test_code variable,
-+dnl but it's only used here...
-+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-+int a;
-+void foo (void) { a = 0; }
-+_LT_EOF
-+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-+class Foo
-+{
-+public:
-+ Foo (void) { a = 0; }
-+private:
-+ int a;
-+};
-+_LT_EOF
-+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-+ subroutine foo
-+ implicit none
-+ integer*4 a
-+ a=0
-+ return
-+ end
-+_LT_EOF
-+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-+ subroutine foo
-+ implicit none
-+ integer a
-+ a=0
-+ return
-+ end
-+_LT_EOF
-+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-+public class foo {
-+ private int a;
-+ public void bar (void) {
-+ a = 0;
-+ }
-+};
-+_LT_EOF
-+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
-+package foo
-+func foo() {
-+}
-+_LT_EOF
-+])
-+
-+_lt_libdeps_save_CFLAGS=$CFLAGS
-+case "$CC $CFLAGS " in #(
-+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-+esac
-+
-+dnl Parse the compiler output and extract the necessary
-+dnl objects, libraries and library flags.
-+if AC_TRY_EVAL(ac_compile); then
-+ # Parse the compiler output and extract the necessary
-+ # objects, libraries and library flags.
-+
-+ # Sentinel used to keep track of whether or not we are before
-+ # the conftest object file.
-+ pre_test_object_deps_done=no
-+
-+ for p in `eval "$output_verbose_link_cmd"`; do
-+ case ${prev}${p} in
-+
-+ -L* | -R* | -l*)
-+ # Some compilers place space between "-{L,R}" and the path.
-+ # Remove the space.
-+ if test $p = "-L" ||
-+ test $p = "-R"; then
-+ prev=$p
-+ continue
-+ fi
-+
-+ # Expand the sysroot to ease extracting the directories later.
-+ if test -z "$prev"; then
-+ case $p in
-+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-+ esac
-+ fi
-+ case $p in
-+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-+ esac
-+ if test "$pre_test_object_deps_done" = no; then
-+ case ${prev} in
-+ -L | -R)
-+ # Internal compiler library paths should come after those
-+ # provided the user. The postdeps already come after the
-+ # user supplied libs so there is no need to process them.
-+ if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-+ _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-+ else
-+ _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-+ fi
-+ ;;
-+ # The "-l" case would never come before the object being
-+ # linked, so don't bother handling this case.
-+ esac
-+ else
-+ if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-+ _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-+ else
-+ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-+ fi
-+ fi
-+ prev=
-+ ;;
-+
-+ *.lto.$objext) ;; # Ignore GCC LTO objects
-+ *.$objext)
-+ # This assumes that the test object file only shows up
-+ # once in the compiler output.
-+ if test "$p" = "conftest.$objext"; then
-+ pre_test_object_deps_done=yes
-+ continue
-+ fi
-+
-+ if test "$pre_test_object_deps_done" = no; then
-+ if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-+ _LT_TAGVAR(predep_objects, $1)="$p"
-+ else
-+ _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-+ fi
-+ else
-+ if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-+ _LT_TAGVAR(postdep_objects, $1)="$p"
-+ else
-+ _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-+ fi
-+ fi
-+ ;;
-+
-+ *) ;; # Ignore the rest.
-+
-+ esac
-+ done
-+
-+ # Clean up.
-+ rm -f a.out a.exe
-+else
-+ echo "libtool.m4: error: problem compiling $1 test program"
-+fi
-+
-+$RM -f confest.$objext
-+CFLAGS=$_lt_libdeps_save_CFLAGS
-+
-+# PORTME: override above test on systems where it is broken
-+m4_if([$1], [CXX],
-+[case $host_os in
-+interix[[3-9]]*)
-+ # Interix 3.5 installs completely hosed .la files for C++, so rather than
-+ # hack all around it, let's just trust "g++" to DTRT.
-+ _LT_TAGVAR(predep_objects,$1)=
-+ _LT_TAGVAR(postdep_objects,$1)=
-+ _LT_TAGVAR(postdeps,$1)=
-+ ;;
-+
-+linux*)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-+
-+ if test "$solaris_use_stlport4" != yes; then
-+ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+ fi
-+ ;;
-+ esac
-+ ;;
-+
-+solaris*)
-+ case $cc_basename in
-+ CC* | sunCC*)
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-+
-+ # Adding this requires a known-good setup of shared libraries for
-+ # Sun compiler versions before 5.6, else PIC objects from an old
-+ # archive will be linked into the output, leading to subtle bugs.
-+ if test "$solaris_use_stlport4" != yes; then
-+ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+ fi
-+ ;;
-+ esac
-+ ;;
-+esac
-+])
-+
-+case " $_LT_TAGVAR(postdeps, $1) " in
-+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-+esac
-+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
-+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-+fi
-+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-+ [The directories searched by this compiler when creating a shared library])
-+_LT_TAGDECL([], [predep_objects], [1],
-+ [Dependencies to place before and after the objects being linked to
-+ create a shared library])
-+_LT_TAGDECL([], [postdep_objects], [1])
-+_LT_TAGDECL([], [predeps], [1])
-+_LT_TAGDECL([], [postdeps], [1])
-+_LT_TAGDECL([], [compiler_lib_search_path], [1],
-+ [The library search path used internally by the compiler when linking
-+ a shared library])
-+])# _LT_SYS_HIDDEN_LIBDEPS
-+
-+
-+# _LT_LANG_F77_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for a Fortran 77 compiler are
-+# suitably defined. These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_F77_CONFIG],
-+[AC_LANG_PUSH(Fortran 77)
-+if test -z "$F77" || test "X$F77" = "Xno"; then
-+ _lt_disable_F77=yes
-+fi
-+
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_TAGVAR(allow_undefined_flag, $1)=
-+_LT_TAGVAR(always_export_symbols, $1)=no
-+_LT_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_direct, $1)=no
-+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_TAGVAR(hardcode_automatic, $1)=no
-+_LT_TAGVAR(inherit_rpath, $1)=no
-+_LT_TAGVAR(module_cmds, $1)=
-+_LT_TAGVAR(module_expsym_cmds, $1)=
-+_LT_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(reload_flag, $1)=$reload_flag
-+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-+_LT_TAGVAR(no_undefined_flag, $1)=
-+_LT_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
-+# Source file extension for f77 test sources.
-+ac_ext=f
-+
-+# Object file extension for compiled f77 test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# No sense in running all these tests if we already determined that
-+# the F77 compiler isn't working. Some variables (like enable_shared)
-+# are currently assumed to apply to all compilers on this platform,
-+# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_disable_F77" != yes; then
-+ # Code to be used in simple compile tests
-+ lt_simple_compile_test_code="\
-+ subroutine t
-+ return
-+ end
-+"
-+
-+ # Code to be used in simple link tests
-+ lt_simple_link_test_code="\
-+ program t
-+ end
-+"
-+
-+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+ _LT_TAG_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_GCC=$GCC
-+ lt_save_CFLAGS=$CFLAGS
-+ CC=${F77-"f77"}
-+ CFLAGS=$FFLAGS
-+ compiler=$CC
-+ _LT_TAGVAR(compiler, $1)=$CC
-+ _LT_CC_BASENAME([$compiler])
-+ GCC=$G77
-+ if test -n "$compiler"; then
-+ AC_MSG_CHECKING([if libtool supports shared libraries])
-+ AC_MSG_RESULT([$can_build_shared])
-+
-+ AC_MSG_CHECKING([whether to build shared libraries])
-+ test "$can_build_shared" = "no" && enable_shared=no
-+
-+ # On AIX, shared libraries and static libraries use the same namespace, and
-+ # are all built from PIC.
-+ case $host_os in
-+ aix3*)
-+ test "$enable_shared" = yes && enable_static=no
-+ if test -n "$RANLIB"; then
-+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+ postinstall_cmds='$RANLIB $lib'
-+ fi
-+ ;;
-+ aix[[4-9]]*)
-+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+ test "$enable_shared" = yes && enable_static=no
-+ fi
-+ ;;
-+ esac
-+ AC_MSG_RESULT([$enable_shared])
-+
-+ AC_MSG_CHECKING([whether to build static libraries])
-+ # Make sure either enable_shared or enable_static is yes.
-+ test "$enable_shared" = yes || enable_static=yes
-+ AC_MSG_RESULT([$enable_static])
-+
-+ _LT_TAGVAR(GCC, $1)="$G77"
-+ _LT_TAGVAR(LD, $1)="$LD"
-+
-+ ## 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
-+ ## what you are doing...
-+ _LT_COMPILER_PIC($1)
-+ _LT_COMPILER_C_O($1)
-+ _LT_COMPILER_FILE_LOCKS($1)
-+ _LT_LINKER_SHLIBS($1)
-+ _LT_SYS_DYNAMIC_LINKER($1)
-+ _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+ _LT_CONFIG($1)
-+ fi # test -n "$compiler"
-+
-+ GCC=$lt_save_GCC
-+ CC="$lt_save_CC"
-+ CFLAGS="$lt_save_CFLAGS"
-+fi # test "$_lt_disable_F77" != yes
-+
-+AC_LANG_POP
-+])# _LT_LANG_F77_CONFIG
-+
-+
-+# _LT_LANG_FC_CONFIG([TAG])
-+# -------------------------
-+# Ensure that the configuration variables for a Fortran compiler are
-+# suitably defined. These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_FC_CONFIG],
-+[AC_LANG_PUSH(Fortran)
-+
-+if test -z "$FC" || test "X$FC" = "Xno"; then
-+ _lt_disable_FC=yes
-+fi
-+
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_TAGVAR(allow_undefined_flag, $1)=
-+_LT_TAGVAR(always_export_symbols, $1)=no
-+_LT_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_direct, $1)=no
-+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_TAGVAR(hardcode_automatic, $1)=no
-+_LT_TAGVAR(inherit_rpath, $1)=no
-+_LT_TAGVAR(module_cmds, $1)=
-+_LT_TAGVAR(module_expsym_cmds, $1)=
-+_LT_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(reload_flag, $1)=$reload_flag
-+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-+_LT_TAGVAR(no_undefined_flag, $1)=
-+_LT_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
-+# Source file extension for fc test sources.
-+ac_ext=${ac_fc_srcext-f}
-+
-+# Object file extension for compiled fc test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# No sense in running all these tests if we already determined that
-+# the FC compiler isn't working. Some variables (like enable_shared)
-+# are currently assumed to apply to all compilers on this platform,
-+# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_disable_FC" != yes; then
-+ # Code to be used in simple compile tests
-+ lt_simple_compile_test_code="\
-+ subroutine t
-+ return
-+ end
-+"
-+
-+ # Code to be used in simple link tests
-+ lt_simple_link_test_code="\
-+ program t
-+ end
-+"
-+
-+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+ _LT_TAG_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_GCC=$GCC
-+ lt_save_CFLAGS=$CFLAGS
-+ CC=${FC-"f95"}
-+ CFLAGS=$FCFLAGS
-+ compiler=$CC
-+ GCC=$ac_cv_fc_compiler_gnu
-+
-+ _LT_TAGVAR(compiler, $1)=$CC
-+ _LT_CC_BASENAME([$compiler])
-+
-+ if test -n "$compiler"; then
-+ AC_MSG_CHECKING([if libtool supports shared libraries])
-+ AC_MSG_RESULT([$can_build_shared])
-+
-+ AC_MSG_CHECKING([whether to build shared libraries])
-+ test "$can_build_shared" = "no" && enable_shared=no
-+
-+ # On AIX, shared libraries and static libraries use the same namespace, and
-+ # are all built from PIC.
-+ case $host_os in
-+ aix3*)
-+ test "$enable_shared" = yes && enable_static=no
-+ if test -n "$RANLIB"; then
-+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+ postinstall_cmds='$RANLIB $lib'
-+ fi
-+ ;;
-+ aix[[4-9]]*)
-+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+ test "$enable_shared" = yes && enable_static=no
-+ fi
-+ ;;
-+ esac
-+ AC_MSG_RESULT([$enable_shared])
-+
-+ AC_MSG_CHECKING([whether to build static libraries])
-+ # Make sure either enable_shared or enable_static is yes.
-+ test "$enable_shared" = yes || enable_static=yes
-+ AC_MSG_RESULT([$enable_static])
-+
-+ _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-+ _LT_TAGVAR(LD, $1)="$LD"
-+
-+ ## 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
-+ ## what you are doing...
-+ _LT_SYS_HIDDEN_LIBDEPS($1)
-+ _LT_COMPILER_PIC($1)
-+ _LT_COMPILER_C_O($1)
-+ _LT_COMPILER_FILE_LOCKS($1)
-+ _LT_LINKER_SHLIBS($1)
-+ _LT_SYS_DYNAMIC_LINKER($1)
-+ _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+ _LT_CONFIG($1)
-+ fi # test -n "$compiler"
-+
-+ GCC=$lt_save_GCC
-+ CC=$lt_save_CC
-+ CFLAGS=$lt_save_CFLAGS
-+fi # test "$_lt_disable_FC" != yes
-+
-+AC_LANG_POP
-+])# _LT_LANG_FC_CONFIG
-+
-+
-+# _LT_LANG_GCJ_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for the GNU Java Compiler compiler
-+# are suitably defined. These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_GCJ_CONFIG],
-+[AC_REQUIRE([LT_PROG_GCJ])dnl
-+AC_LANG_SAVE
-+
-+# Source file extension for Java test sources.
-+ac_ext=java
-+
-+# Object file extension for compiled Java test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="class foo {}"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_TAG_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_CFLAGS=$CFLAGS
-+lt_save_GCC=$GCC
-+GCC=yes
-+CC=${GCJ-"gcj"}
-+CFLAGS=$GCJFLAGS
-+compiler=$CC
-+_LT_TAGVAR(compiler, $1)=$CC
-+_LT_TAGVAR(LD, $1)="$LD"
-+_LT_CC_BASENAME([$compiler])
-+
-+# GCJ did not exist at the time GCC didn't implicitly link libc in.
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(reload_flag, $1)=$reload_flag
-+_LT_TAGVAR(reload_cmds, $1)=$reload_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
-+## what you are doing...
-+if test -n "$compiler"; then
-+ _LT_COMPILER_NO_RTTI($1)
-+ _LT_COMPILER_PIC($1)
-+ _LT_COMPILER_C_O($1)
-+ _LT_COMPILER_FILE_LOCKS($1)
-+ _LT_LINKER_SHLIBS($1)
-+ _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+ _LT_CONFIG($1)
-+fi
-+
-+AC_LANG_RESTORE
-+
-+GCC=$lt_save_GCC
-+CC=$lt_save_CC
-+CFLAGS=$lt_save_CFLAGS
-+])# _LT_LANG_GCJ_CONFIG
-+
-+
-+# _LT_LANG_GO_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for the GNU Go compiler
-+# are suitably defined. These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_GO_CONFIG],
-+[AC_REQUIRE([LT_PROG_GO])dnl
-+AC_LANG_SAVE
-+
-+# Source file extension for Go test sources.
-+ac_ext=go
-+
-+# Object file extension for compiled Go test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="package main; func main() { }"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='package main; func main() { }'
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_TAG_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_CFLAGS=$CFLAGS
-+lt_save_GCC=$GCC
-+GCC=yes
-+CC=${GOC-"gccgo"}
-+CFLAGS=$GOFLAGS
-+compiler=$CC
-+_LT_TAGVAR(compiler, $1)=$CC
-+_LT_TAGVAR(LD, $1)="$LD"
-+_LT_CC_BASENAME([$compiler])
-+
-+# Go did not exist at the time GCC didn't implicitly link libc in.
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(reload_flag, $1)=$reload_flag
-+_LT_TAGVAR(reload_cmds, $1)=$reload_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
-+## what you are doing...
-+if test -n "$compiler"; then
-+ _LT_COMPILER_NO_RTTI($1)
-+ _LT_COMPILER_PIC($1)
-+ _LT_COMPILER_C_O($1)
-+ _LT_COMPILER_FILE_LOCKS($1)
-+ _LT_LINKER_SHLIBS($1)
-+ _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+ _LT_CONFIG($1)
-+fi
-+
-+AC_LANG_RESTORE
-+
-+GCC=$lt_save_GCC
-+CC=$lt_save_CC
-+CFLAGS=$lt_save_CFLAGS
-+])# _LT_LANG_GO_CONFIG
-+
-+
-+# _LT_LANG_RC_CONFIG([TAG])
-+# -------------------------
-+# Ensure that the configuration variables for the Windows resource compiler
-+# are suitably defined. These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_RC_CONFIG],
-+[AC_REQUIRE([LT_PROG_RC])dnl
-+AC_LANG_SAVE
-+
-+# Source file extension for RC test sources.
-+ac_ext=rc
-+
-+# Object file extension for compiled RC test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code="$lt_simple_compile_test_code"
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_TAG_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_CFLAGS=$CFLAGS
-+lt_save_GCC=$GCC
-+GCC=
-+CC=${RC-"windres"}
-+CFLAGS=
-+compiler=$CC
-+_LT_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
-+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+
-+if test -n "$compiler"; then
-+ :
-+ _LT_CONFIG($1)
-+fi
-+
-+GCC=$lt_save_GCC
-+AC_LANG_RESTORE
-+CC=$lt_save_CC
-+CFLAGS=$lt_save_CFLAGS
-+])# _LT_LANG_RC_CONFIG
-+
-+
-+# LT_PROG_GCJ
-+# -----------
-+AC_DEFUN([LT_PROG_GCJ],
-+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-+ [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-+ [AC_CHECK_TOOL(GCJ, gcj,)
-+ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-+ AC_SUBST(GCJFLAGS)])])[]dnl
-+])
-+
-+# Old name:
-+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-+
-+
-+# LT_PROG_GO
-+# ----------
-+AC_DEFUN([LT_PROG_GO],
-+[AC_CHECK_TOOL(GOC, gccgo,)
-+])
-+
-+
-+# LT_PROG_RC
-+# ----------
-+AC_DEFUN([LT_PROG_RC],
-+[AC_CHECK_TOOL(RC, windres,)
-+])
-+
-+# Old name:
-+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([LT_AC_PROG_RC], [])
-+
-+
-+# _LT_DECL_EGREP
-+# --------------
-+# If we don't have a new enough Autoconf to choose the best grep
-+# available, choose the one first in the user's PATH.
-+m4_defun([_LT_DECL_EGREP],
-+[AC_REQUIRE([AC_PROG_EGREP])dnl
-+AC_REQUIRE([AC_PROG_FGREP])dnl
-+test -z "$GREP" && GREP=grep
-+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-+_LT_DECL([], [EGREP], [1], [An ERE matcher])
-+_LT_DECL([], [FGREP], [1], [A literal string matcher])
-+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-+AC_SUBST([GREP])
-+])
-+
-+
-+# _LT_DECL_OBJDUMP
-+# --------------
-+# If we don't have a new enough Autoconf to choose the best objdump
-+# available, choose the one first in the user's PATH.
-+m4_defun([_LT_DECL_OBJDUMP],
-+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-+AC_SUBST([OBJDUMP])
-+])
-+
-+# _LT_DECL_DLLTOOL
-+# ----------------
-+# Ensure DLLTOOL variable is set.
-+m4_defun([_LT_DECL_DLLTOOL],
-+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
-+AC_SUBST([DLLTOOL])
-+])
-+
-+# _LT_DECL_SED
-+# ------------
-+# Check for a fully-functional sed program, that truncates
-+# as few characters as possible. Prefer GNU sed if found.
-+m4_defun([_LT_DECL_SED],
-+[AC_PROG_SED
-+test -z "$SED" && SED=sed
-+Xsed="$SED -e 1s/^X//"
-+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-+ [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-+])# _LT_DECL_SED
-+
-+m4_ifndef([AC_PROG_SED], [
-+############################################################
-+# NOTE: This macro has been submitted for inclusion into #
-+# GNU Autoconf as AC_PROG_SED. When it is available in #
-+# a released version of Autoconf we should remove this #
-+# macro and use it instead. #
-+############################################################
-+
-+m4_defun([AC_PROG_SED],
-+[AC_MSG_CHECKING([for a sed that does not truncate output])
-+AC_CACHE_VAL(lt_cv_path_SED,
-+[# Loop through the user's path and test for sed and gsed.
-+# Then use that list of sed's as ones to test for truncation.
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for lt_ac_prog in sed gsed; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-+ fi
-+ done
-+ done
-+done
-+IFS=$as_save_IFS
-+lt_ac_max=0
-+lt_ac_count=0
-+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-+# 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 && continue
-+ cat /dev/null > conftest.in
-+ lt_ac_count=0
-+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-+ # Check for GNU sed and select it if it is found.
-+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-+ lt_cv_path_SED=$lt_ac_sed
-+ break
-+ fi
-+ while true; do
-+ cat conftest.in conftest.in >conftest.tmp
-+ mv conftest.tmp conftest.in
-+ cp conftest.in conftest.nl
-+ echo >>conftest.nl
-+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-+ cmp -s conftest.out conftest.nl || break
-+ # 10000 chars as input seems more than enough
-+ test $lt_ac_count -gt 10 && break
-+ lt_ac_count=`expr $lt_ac_count + 1`
-+ if test $lt_ac_count -gt $lt_ac_max; then
-+ lt_ac_max=$lt_ac_count
-+ lt_cv_path_SED=$lt_ac_sed
-+ fi
-+ done
-+done
-+])
-+SED=$lt_cv_path_SED
-+AC_SUBST([SED])
-+AC_MSG_RESULT([$SED])
-+])#AC_PROG_SED
-+])#m4_ifndef
-+
-+# Old name:
-+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([LT_AC_PROG_SED], [])
-+
-+
-+# _LT_CHECK_SHELL_FEATURES
-+# ------------------------
-+# Find out whether the shell is Bourne or XSI compatible,
-+# or has some other useful features.
-+m4_defun([_LT_CHECK_SHELL_FEATURES],
-+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-+# Try some XSI features
-+xsi_shell=no
-+( _lt_dummy="a/b/c"
-+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-+ = c,a/b,b/c, \
-+ && eval 'test $(( 1 + 1 )) -eq 2 \
-+ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-+ && xsi_shell=yes
-+AC_MSG_RESULT([$xsi_shell])
-+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-+
-+AC_MSG_CHECKING([whether the shell understands "+="])
-+lt_shell_append=no
-+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-+ >/dev/null 2>&1 \
-+ && lt_shell_append=yes
-+AC_MSG_RESULT([$lt_shell_append])
-+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-+
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+ lt_unset=unset
-+else
-+ lt_unset=false
-+fi
-+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-+
-+# test EBCDIC or ASCII
-+case `echo X|tr X '\101'` in
-+ A) # ASCII based system
-+ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-+ lt_SP2NL='tr \040 \012'
-+ lt_NL2SP='tr \015\012 \040\040'
-+ ;;
-+ *) # EBCDIC based system
-+ lt_SP2NL='tr \100 \n'
-+ lt_NL2SP='tr \r\n \100\100'
-+ ;;
-+esac
-+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-+])# _LT_CHECK_SHELL_FEATURES
-+
-+
-+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-+# ------------------------------------------------------
-+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-+m4_defun([_LT_PROG_FUNCTION_REPLACE],
-+[dnl {
-+sed -e '/^$1 ()$/,/^} # $1 /c\
-+$1 ()\
-+{\
-+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
-+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
-+ && mv -f "$cfgfile.tmp" "$cfgfile" \
-+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+])
-+
-+
-+# _LT_PROG_REPLACE_SHELLFNS
-+# -------------------------
-+# Replace existing portable implementations of several shell functions with
-+# equivalent extended shell implementations where those features are available..
-+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-+[if test x"$xsi_shell" = xyes; then
-+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
-+ case ${1} in
-+ */*) func_dirname_result="${1%/*}${2}" ;;
-+ * ) func_dirname_result="${3}" ;;
-+ esac])
-+
-+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
-+ func_basename_result="${1##*/}"])
-+
-+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
-+ case ${1} in
-+ */*) func_dirname_result="${1%/*}${2}" ;;
-+ * ) func_dirname_result="${3}" ;;
-+ esac
-+ func_basename_result="${1##*/}"])
-+
-+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
-+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-+ # positional parameters, so assign one to ordinary parameter first.
-+ func_stripname_result=${3}
-+ func_stripname_result=${func_stripname_result#"${1}"}
-+ func_stripname_result=${func_stripname_result%"${2}"}])
-+
-+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
-+ func_split_long_opt_name=${1%%=*}
-+ func_split_long_opt_arg=${1#*=}])
-+
-+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
-+ func_split_short_opt_arg=${1#??}
-+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-+
-+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
-+ case ${1} in
-+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-+ *) func_lo2o_result=${1} ;;
-+ esac])
-+
-+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
-+
-+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
-+
-+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
-+fi
-+
-+if test x"$lt_shell_append" = xyes; then
-+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
-+
-+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
-+ func_quote_for_eval "${2}"
-+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
-+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-+
-+ # Save a `func_append' function call where possible by direct use of '+='
-+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-+ && mv -f "$cfgfile.tmp" "$cfgfile" \
-+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+ test 0 -eq $? || _lt_function_replace_fail=:
-+else
-+ # Save a `func_append' function call even when '+=' is not available
-+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-+ && mv -f "$cfgfile.tmp" "$cfgfile" \
-+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+ test 0 -eq $? || _lt_function_replace_fail=:
-+fi
-+
-+if test x"$_lt_function_replace_fail" = x":"; then
-+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-+fi
-+])
-+
-+# _LT_PATH_CONVERSION_FUNCTIONS
-+# -----------------------------
-+# Determine which file name conversion functions should be used by
-+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
-+# for certain cross-compile configurations and native mingw.
-+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+AC_MSG_CHECKING([how to convert $build file names to $host format])
-+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-+[case $host in
-+ *-*-mingw* )
-+ case $build in
-+ *-*-mingw* ) # actually msys
-+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-+ ;;
-+ *-*-cygwin* )
-+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-+ ;;
-+ * ) # otherwise, assume *nix
-+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-+ ;;
-+ esac
-+ ;;
-+ *-*-cygwin* )
-+ case $build in
-+ *-*-mingw* ) # actually msys
-+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-+ ;;
-+ *-*-cygwin* )
-+ lt_cv_to_host_file_cmd=func_convert_file_noop
-+ ;;
-+ * ) # otherwise, assume *nix
-+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-+ ;;
-+ esac
-+ ;;
-+ * ) # unhandled hosts (and "normal" native builds)
-+ lt_cv_to_host_file_cmd=func_convert_file_noop
-+ ;;
-+esac
-+])
-+to_host_file_cmd=$lt_cv_to_host_file_cmd
-+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
-+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
-+ [0], [convert $build file names to $host format])dnl
-+
-+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
-+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-+[#assume ordinary cross tools, or native build.
-+lt_cv_to_tool_file_cmd=func_convert_file_noop
-+case $host in
-+ *-*-mingw* )
-+ case $build in
-+ *-*-mingw* ) # actually msys
-+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-+ ;;
-+ esac
-+ ;;
-+esac
-+])
-+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
-+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
-+ [0], [convert $build files to toolchain format])dnl
-+])# _LT_PATH_CONVERSION_FUNCTIONS
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/m4/ltoptions.m4 gettext-0.18.3.1/gettext-runtime/m4/ltoptions.m4
---- gettext-0.18.3.1.orig/gettext-runtime/m4/ltoptions.m4 1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.18.3.1/gettext-runtime/m4/ltoptions.m4 2013-12-31 11:58:08.000000000 -0800
-@@ -0,0 +1,384 @@
-+# Helper functions for option handling. -*- Autoconf -*-
-+#
-+# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-+# Inc.
-+# Written by Gary V. Vaughan, 2004
-+#
-+# 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 7 ltoptions.m4
-+
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-+
-+
-+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-+# ------------------------------------------
-+m4_define([_LT_MANGLE_OPTION],
-+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-+
-+
-+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-+# ---------------------------------------
-+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-+# matching handler defined, dispatch to it. Other OPTION-NAMEs are
-+# saved as a flag.
-+m4_define([_LT_SET_OPTION],
-+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-+ _LT_MANGLE_DEFUN([$1], [$2]),
-+ [m4_warning([Unknown $1 option `$2'])])[]dnl
-+])
-+
-+
-+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-+# ------------------------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+m4_define([_LT_IF_OPTION],
-+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-+
-+
-+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-+# -------------------------------------------------------
-+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-+# are set.
-+m4_define([_LT_UNLESS_OPTIONS],
-+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-+ [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-+ [m4_define([$0_found])])])[]dnl
-+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-+])[]dnl
-+])
-+
-+
-+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-+# ----------------------------------------
-+# OPTION-LIST is a space-separated list of Libtool options associated
-+# with MACRO-NAME. If any OPTION has a matching handler declared with
-+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-+# the unknown option and exit.
-+m4_defun([_LT_SET_OPTIONS],
-+[# Set options
-+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-+ [_LT_SET_OPTION([$1], _LT_Option)])
-+
-+m4_if([$1],[LT_INIT],[
-+ dnl
-+ dnl Simply set some default values (i.e off) if boolean options were not
-+ dnl specified:
-+ _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-+ ])
-+ _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-+ ])
-+ dnl
-+ dnl If no reference was made to various pairs of opposing options, then
-+ dnl we run the default mode handler for the pair. For example, if neither
-+ dnl `shared' nor `disable-shared' was passed, we enable building of shared
-+ dnl archives by default:
-+ _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-+ _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-+ _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-+ _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-+ [_LT_ENABLE_FAST_INSTALL])
-+ ])
-+])# _LT_SET_OPTIONS
-+
-+
-+## --------------------------------- ##
-+## Macros to handle LT_INIT options. ##
-+## --------------------------------- ##
-+
-+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-+# -----------------------------------------
-+m4_define([_LT_MANGLE_DEFUN],
-+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-+
-+
-+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-+# -----------------------------------------------
-+m4_define([LT_OPTION_DEFINE],
-+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-+])# LT_OPTION_DEFINE
-+
-+
-+# dlopen
-+# ------
-+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-+])
-+
-+AU_DEFUN([AC_LIBTOOL_DLOPEN],
-+[_LT_SET_OPTION([LT_INIT], [dlopen])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `dlopen' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-+
-+
-+# win32-dll
-+# ---------
-+# Declare package support for building win32 dll's.
-+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-+[enable_win32_dll=yes
-+
-+case $host in
-+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-+ AC_CHECK_TOOL(AS, as, false)
-+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+ ;;
-+esac
-+
-+test -z "$AS" && AS=as
-+_LT_DECL([], [AS], [1], [Assembler program])dnl
-+
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
-+
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
-+])# win32-dll
-+
-+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+_LT_SET_OPTION([LT_INIT], [win32-dll])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `win32-dll' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-+
-+
-+# _LT_ENABLE_SHARED([DEFAULT])
-+# ----------------------------
-+# implement the --enable-shared flag, and supports the `shared' and
-+# `disable-shared' LT_INIT options.
-+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_SHARED],
-+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([shared],
-+ [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-+ [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-+ [p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_shared=yes ;;
-+ no) enable_shared=no ;;
-+ *)
-+ enable_shared=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_shared=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-+
-+ _LT_DECL([build_libtool_libs], [enable_shared], [0],
-+ [Whether or not to build shared libraries])
-+])# _LT_ENABLE_SHARED
-+
-+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-+
-+# Old names:
-+AC_DEFUN([AC_ENABLE_SHARED],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-+])
-+
-+AC_DEFUN([AC_DISABLE_SHARED],
-+[_LT_SET_OPTION([LT_INIT], [disable-shared])
-+])
-+
-+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-+
-+
-+
-+# _LT_ENABLE_STATIC([DEFAULT])
-+# ----------------------------
-+# implement the --enable-static flag, and support the `static' and
-+# `disable-static' LT_INIT options.
-+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_STATIC],
-+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([static],
-+ [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-+ [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-+ [p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_static=yes ;;
-+ no) enable_static=no ;;
-+ *)
-+ enable_static=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_static=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-+
-+ _LT_DECL([build_old_libs], [enable_static], [0],
-+ [Whether or not to build static libraries])
-+])# _LT_ENABLE_STATIC
-+
-+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-+
-+# Old names:
-+AC_DEFUN([AC_ENABLE_STATIC],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-+])
-+
-+AC_DEFUN([AC_DISABLE_STATIC],
-+[_LT_SET_OPTION([LT_INIT], [disable-static])
-+])
-+
-+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-+
-+
-+
-+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-+# ----------------------------------
-+# implement the --enable-fast-install flag, and support the `fast-install'
-+# and `disable-fast-install' LT_INIT options.
-+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_FAST_INSTALL],
-+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([fast-install],
-+ [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-+ [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-+ [p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_fast_install=yes ;;
-+ no) enable_fast_install=no ;;
-+ *)
-+ enable_fast_install=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_fast_install=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-+
-+_LT_DECL([fast_install], [enable_fast_install], [0],
-+ [Whether or not to optimize for fast installation])dnl
-+])# _LT_ENABLE_FAST_INSTALL
-+
-+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-+
-+# Old names:
-+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-+the `fast-install' option into LT_INIT's first parameter.])
-+])
-+
-+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-+the `disable-fast-install' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-+
-+
-+# _LT_WITH_PIC([MODE])
-+# --------------------
-+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-+# LT_INIT options.
-+# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
-+m4_define([_LT_WITH_PIC],
-+[AC_ARG_WITH([pic],
-+ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
-+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-+ [lt_p=${PACKAGE-default}
-+ case $withval in
-+ yes|no) pic_mode=$withval ;;
-+ *)
-+ pic_mode=default
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for lt_pkg in $withval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$lt_pkg" = "X$lt_p"; then
-+ pic_mode=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [pic_mode=default])
-+
-+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-+
-+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-+])# _LT_WITH_PIC
-+
-+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-+
-+# Old name:
-+AU_DEFUN([AC_LIBTOOL_PICMODE],
-+[_LT_SET_OPTION([LT_INIT], [pic-only])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `pic-only' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-+
-+## ----------------- ##
-+## LTDL_INIT Options ##
-+## ----------------- ##
-+
-+m4_define([_LTDL_MODE], [])
-+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-+ [m4_define([_LTDL_MODE], [nonrecursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-+ [m4_define([_LTDL_MODE], [recursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-+ [m4_define([_LTDL_MODE], [subproject])])
-+
-+m4_define([_LTDL_TYPE], [])
-+LT_OPTION_DEFINE([LTDL_INIT], [installable],
-+ [m4_define([_LTDL_TYPE], [installable])])
-+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-+ [m4_define([_LTDL_TYPE], [convenience])])
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/m4/ltsugar.m4 gettext-0.18.3.1/gettext-runtime/m4/ltsugar.m4
---- gettext-0.18.3.1.orig/gettext-runtime/m4/ltsugar.m4 1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.18.3.1/gettext-runtime/m4/ltsugar.m4 2013-12-31 11:58:08.000000000 -0800
-@@ -0,0 +1,123 @@
-+# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
-+#
-+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-+# Written by Gary V. Vaughan, 2004
-+#
-+# 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 6 ltsugar.m4
-+
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-+
-+
-+# lt_join(SEP, ARG1, [ARG2...])
-+# -----------------------------
-+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-+# associated separator.
-+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-+# versions in m4sugar had bugs.
-+m4_define([lt_join],
-+[m4_if([$#], [1], [],
-+ [$#], [2], [[$2]],
-+ [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-+m4_define([_lt_join],
-+[m4_if([$#$2], [2], [],
-+ [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-+
-+
-+# lt_car(LIST)
-+# lt_cdr(LIST)
-+# ------------
-+# Manipulate m4 lists.
-+# These macros are necessary as long as will still need to support
-+# Autoconf-2.59 which quotes differently.
-+m4_define([lt_car], [[$1]])
-+m4_define([lt_cdr],
-+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-+ [$#], 1, [],
-+ [m4_dquote(m4_shift($@))])])
-+m4_define([lt_unquote], $1)
-+
-+
-+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-+# ------------------------------------------
-+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-+# Note that neither SEPARATOR nor STRING are expanded; they are appended
-+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-+# than defined and empty).
-+#
-+# This macro is needed until we can rely on Autoconf 2.62, since earlier
-+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-+m4_define([lt_append],
-+[m4_define([$1],
-+ m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-+
-+
-+
-+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-+# ----------------------------------------------------------
-+# Produce a SEP delimited list of all paired combinations of elements of
-+# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
-+# has the form PREFIXmINFIXSUFFIXn.
-+# Needed until we can rely on m4_combine added in Autoconf 2.62.
-+m4_define([lt_combine],
-+[m4_if(m4_eval([$# > 3]), [1],
-+ [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-+[[m4_foreach([_Lt_prefix], [$2],
-+ [m4_foreach([_Lt_suffix],
-+ ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-+ [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-+
-+
-+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-+# -----------------------------------------------------------------------
-+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-+m4_define([lt_if_append_uniq],
-+[m4_ifdef([$1],
-+ [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-+ [lt_append([$1], [$2], [$3])$4],
-+ [$5])],
-+ [lt_append([$1], [$2], [$3])$4])])
-+
-+
-+# lt_dict_add(DICT, KEY, VALUE)
-+# -----------------------------
-+m4_define([lt_dict_add],
-+[m4_define([$1($2)], [$3])])
-+
-+
-+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-+# --------------------------------------------
-+m4_define([lt_dict_add_subkey],
-+[m4_define([$1($2:$3)], [$4])])
-+
-+
-+# lt_dict_fetch(DICT, KEY, [SUBKEY])
-+# ----------------------------------
-+m4_define([lt_dict_fetch],
-+[m4_ifval([$3],
-+ m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-+ m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-+
-+
-+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-+# -----------------------------------------------------------------
-+m4_define([lt_if_dict_fetch],
-+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-+ [$5],
-+ [$6])])
-+
-+
-+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-+# --------------------------------------------------------------
-+m4_define([lt_dict_filter],
-+[m4_if([$5], [], [],
-+ [lt_join(m4_quote(m4_default([$4], [[, ]])),
-+ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-+ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-+])
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/m4/ltversion.m4 gettext-0.18.3.1/gettext-runtime/m4/ltversion.m4
---- gettext-0.18.3.1.orig/gettext-runtime/m4/ltversion.m4 1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.18.3.1/gettext-runtime/m4/ltversion.m4 2013-12-31 11:58:08.000000000 -0800
-@@ -0,0 +1,23 @@
-+# ltversion.m4 -- version numbers -*- Autoconf -*-
-+#
-+# Copyright (C) 2004 Free Software Foundation, Inc.
-+# Written by Scott James Remnant, 2004
-+#
-+# 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.
-+
-+# @configure_input@
-+
-+# serial 3337 ltversion.m4
-+# This file is part of GNU Libtool
-+
-+m4_define([LT_PACKAGE_VERSION], [2.4.2])
-+m4_define([LT_PACKAGE_REVISION], [1.3337])
-+
-+AC_DEFUN([LTVERSION_VERSION],
-+[macro_version='2.4.2'
-+macro_revision='1.3337'
-+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-+_LT_DECL(, macro_revision, 0)
-+])
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/m4/lt~obsolete.m4 gettext-0.18.3.1/gettext-runtime/m4/lt~obsolete.m4
---- gettext-0.18.3.1.orig/gettext-runtime/m4/lt~obsolete.m4 1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.18.3.1/gettext-runtime/m4/lt~obsolete.m4 2013-12-31 11:58:08.000000000 -0800
-@@ -0,0 +1,98 @@
-+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
-+#
-+# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
-+# Written by Scott James Remnant, 2004.
-+#
-+# 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 5 lt~obsolete.m4
-+
-+# These exist entirely to fool aclocal when bootstrapping libtool.
-+#
-+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-+# which have later been changed to m4_define as they aren't part of the
-+# exported API, or moved to Autoconf or Automake where they belong.
-+#
-+# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN
-+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-+# using a macro with the same name in our local m4/libtool.m4 it'll
-+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-+# and doesn't know about Autoconf macros at all.)
-+#
-+# So we provide this file, which has a silly filename so it's always
-+# included after everything else. This provides aclocal with the
-+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-+# because those macros already exist, or will be overwritten later.
-+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
-+#
-+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-+# Yes, that means every name once taken will need to remain here until
-+# we give up compatibility with versions before 1.7, at which point
-+# we need to keep only those names which we still refer to.
-+
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-+
-+m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])])
-+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-+m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])])
-+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-+m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])])
-+m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])])
-+m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-+m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])])
-+m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])])
-+m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])])
-+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-+m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-+m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])])
-+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-+m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])])
-+m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])])
-+m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-+m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-+m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])])
-+m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])])
-+m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])])
-+m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-+m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-+m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])])
-+m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])])
-+m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-+m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])])
-+m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-+m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
-+m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
-+m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
-+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
-+m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-+m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-+m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-+m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
-+m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
-+m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/man/Makefile.in gettext-0.18.3.1/gettext-runtime/man/Makefile.in
---- gettext-0.18.3.1.orig/gettext-runtime/man/Makefile.in 2013-08-15 09:26:41.000000000 -0700
-+++ gettext-0.18.3.1/gettext-runtime/man/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -167,11 +167,6 @@ am__aclocal_m4_deps = $(top_srcdir)/gnul
- $(top_srcdir)/gnulib-m4/wcwidth.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
-@@ -179,14 +174,16 @@ am__aclocal_m4_deps = $(top_srcdir)/gnul
- $(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
-- $(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
-- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-- $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
-- $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-- $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-- $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
-- $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \
-+ $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
-+ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
-+ $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
-+ $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
-+ $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/src/Makefile.in gettext-0.18.3.1/gettext-runtime/src/Makefile.in
---- gettext-0.18.3.1.orig/gettext-runtime/src/Makefile.in 2013-08-15 09:26:41.000000000 -0700
-+++ gettext-0.18.3.1/gettext-runtime/src/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -171,11 +171,6 @@ am__aclocal_m4_deps = $(top_srcdir)/gnul
- $(top_srcdir)/gnulib-m4/wcwidth.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
-@@ -183,14 +178,16 @@ am__aclocal_m4_deps = $(top_srcdir)/gnul
- $(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
-- $(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
-- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-- $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
-- $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-- $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-- $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
-- $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \
-+ $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
-+ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
-+ $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
-+ $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
-+ $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
-@@ -1384,10 +1381,10 @@ distclean-compile:
- -rm -f *.tab.c
-
- .c.o:
-- $(AM_V_CC)$(COMPILE) -c $<
-+ $(AM_V_CC)$(COMPILE) -c -o $@ $<
-
- .c.obj:
-- $(AM_V_CC)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+ $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .c.lo:
- $(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
-diff -Naurp gettext-0.18.3.1.orig/gettext-runtime/tests/Makefile.in gettext-0.18.3.1/gettext-runtime/tests/Makefile.in
---- gettext-0.18.3.1.orig/gettext-runtime/tests/Makefile.in 2013-08-15 09:26:41.000000000 -0700
-+++ gettext-0.18.3.1/gettext-runtime/tests/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -170,11 +170,6 @@ am__aclocal_m4_deps = $(top_srcdir)/gnul
- $(top_srcdir)/gnulib-m4/wcwidth.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
-@@ -182,14 +177,16 @@ am__aclocal_m4_deps = $(top_srcdir)/gnul
- $(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
- $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
-- $(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
-- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-- $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
-- $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-- $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-- $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
-- $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \
-+ $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
-+ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
-+ $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
-+ $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
-+ $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
-@@ -1393,10 +1390,10 @@ distclean-compile:
- -rm -f *.tab.c
-
- .c.o:
-- $(AM_V_CC)$(COMPILE) -c $<
-+ $(AM_V_CC)$(COMPILE) -c -o $@ $<
-
- .c.obj:
-- $(AM_V_CC)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+ $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .c.lo:
- $(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/INSTALL gettext-0.18.3.1/gettext-tools/INSTALL
---- gettext-0.18.3.1.orig/gettext-tools/INSTALL 2012-12-09 17:59:06.000000000 -0800
-+++ gettext-0.18.3.1/gettext-tools/INSTALL 2013-12-31 11:58:08.000000000 -0800
-@@ -1,223 +1,238 @@
--These are generic installation instructions.
-+Installation Instructions
-+*************************
-
--Prerequisites
--=============
-+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-+Inc.
-
-- This package depends on a few other packages. They are listed in
--the file ‘DEPENDENCIES’. It is recommended to install the listed
--packages before installing this package.
-+ Copying and distribution of this file, with or without modification,
-+are permitted in any medium without royalty provided the copyright
-+notice and this notice are preserved. This file is offered as-is,
-+without warranty of any kind.
-
- Basic Installation
- ==================
-
-- The ‘configure’ shell script attempts to guess correct values for
-+ Briefly, the shell command `./configure && make && make install'
-+should configure, build, and install this package. The following
-+more-detailed instructions are generic; see the `README' file for
-+instructions specific to this package. Some packages provide this
-+`INSTALL' file but do not implement all of the features documented
-+below. The lack of an optional feature in a given package is not
-+necessarily a bug. More recommendations for GNU packages can be found
-+in *note Makefile Conventions: (standards)Makefile Conventions.
-+
-+ The `configure' shell script attempts to guess correct values for
- various system-dependent variables used during compilation. It uses
--those values to create a ‘Makefile’ in each directory of the package.
--It may also create one or more ‘.h’ files containing system-dependent
--definitions. Finally, it creates a shell script ‘config.status’ that
--you can run in the future to recreate the current configuration, a file
--‘config.cache’ that saves the results of its tests to speed up
--reconfiguring, and a file ‘config.log’ containing compiler output
--(useful mainly for debugging ‘configure’).
-+those values to create a `Makefile' in each directory of the package.
-+It may also create one or more `.h' files containing system-dependent
-+definitions. Finally, it creates a shell script `config.status' that
-+you can run in the future to recreate the current configuration, and a
-+file `config.log' containing compiler output (useful mainly for
-+debugging `configure').
-+
-+ It can also use an optional file (typically called `config.cache'
-+and enabled with `--cache-file=config.cache' or simply `-C') that saves
-+the results of its tests to speed up reconfiguring. Caching is
-+disabled by default to prevent problems with accidental use of stale
-+cache files.
-
- If you need to do unusual things to compile the package, please try
--to figure out how ‘configure’ could check whether to do them, and mail
--diffs or instructions to the address given in the ‘README’ so they can
--be considered for the next release. If at some point ‘config.cache’
--contains results you don't want to keep, you may remove or edit it.
--
-- The file ‘configure.ac’ is used to create ‘configure’ by a program
--called ‘autoconf’. You only need ‘configure.ac’ if you want to change
--it or regenerate ‘configure’ using a newer version of ‘autoconf’.
--
--The simplest way to compile this package is:
--
-- 1. ‘cd’ to the directory containing the package's source code and type
-- ‘./configure’ to configure the package for your system. If you're
-- using ‘csh’ on an old version of System V, you might need to type
-- ‘sh ./configure’ instead to prevent ‘csh’ from trying to execute
-- ‘configure’ itself.
--
-- Running ‘configure’ takes awhile. While running, it prints some
-- messages telling which features it is checking for.
--
-- 2. Type ‘make’ to compile the package.
--
-- 3. Optionally, type ‘make check’ to run any self-tests that come with
-- the package.
--
-- 4. Type ‘make install’ to install the programs and any data files and
-- documentation.
--
-- 5. You can remove the program binaries and object files from the
-- source code directory by typing ‘make clean’. To also remove the
-- files that ‘configure’ created (so you can compile the package for
-- a different kind of computer), type ‘make distclean’. There is
-- also a ‘make maintainer-clean’ target, but that is intended mainly
-+to figure out how `configure' could check whether to do them, and mail
-+diffs or instructions to the address given in the `README' so they can
-+be considered for the next release. If you are using the cache, and at
-+some point `config.cache' contains results you don't want to keep, you
-+may remove or edit it.
-+
-+ The file `configure.ac' (or `configure.in') is used to create
-+`configure' by a program called `autoconf'. You need `configure.ac' if
-+you want to change it or regenerate `configure' using a newer version
-+of `autoconf'.
-+
-+ The simplest way to compile this package is:
-+
-+ 1. `cd' to the directory containing the package's source code and type
-+ `./configure' to configure the package for your system.
-+
-+ Running `configure' might take a while. While running, it prints
-+ some messages telling which features it is checking for.
-+
-+ 2. Type `make' to compile the package.
-+
-+ 3. Optionally, type `make check' to run any self-tests that come with
-+ the package, generally using the just-built uninstalled binaries.
-+
-+ 4. Type `make install' to install the programs and any data files and
-+ documentation. When installing into a prefix owned by root, it is
-+ recommended that the package be configured and built as a regular
-+ user, and only the `make install' phase executed with root
-+ privileges.
-+
-+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
-+ this time using the binaries in their final installed location.
-+ This target does not install anything. Running this target as a
-+ regular user, particularly if the prior `make install' required
-+ root privileges, verifies that the installation completed
-+ correctly.
-+
-+ 6. You can remove the program binaries and object files from the
-+ source code directory by typing `make clean'. To also remove the
-+ files that `configure' created (so you can compile the package for
-+ a different kind of computer), type `make distclean'. There is
-+ also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-+ 7. Often, you can also type `make uninstall' to remove the installed
-+ files again. In practice, not all packages have tested that
-+ uninstallation works correctly, even though it is required by the
-+ GNU Coding Standards.
-+
-+ 8. Some packages, particularly those that use Automake, provide `make
-+ distcheck', which can by used by developers to test that all other
-+ targets like `make install' and `make uninstall' work correctly.
-+ This target is generally not run by end users.
-+
- Compilers and Options
- =====================
-
- Some systems require unusual options for compilation or linking that
--the ‘configure’ script does not know about. You can give ‘configure’
--initial values for variables as arguments. You can do it like this:
-- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-+the `configure' script does not know about. Run `./configure --help'
-+for details on some of the pertinent environment variables.
-+
-+ You can give `configure' initial values for configuration parameters
-+by setting variables in the command line or in the environment. Here
-+is an example:
-+
-+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-+
-+ *Note Defining Variables::, for more details.
-
- Compiling For Multiple Architectures
- ====================================
-
- You can compile the package for more than one kind of computer at the
- same time, by placing the object files for each architecture in their
--own directory. To do this, you must use a version of ‘make’ that
--supports the ‘VPATH’ variable, such as GNU ‘make’. ‘cd’ to the
-+own directory. To do this, you can use GNU `make'. `cd' to the
- directory where you want the object files and executables to go and run
--the ‘configure’ script. ‘configure’ automatically checks for the
--source code in the directory that ‘configure’ is in and in ‘..’.
--
-- If you have to use a ‘make’ that does not supports the ‘VPATH’
--variable, you have to compile the package for one architecture at a time
--in the source code directory. After you have installed the package for
--one architecture, use ‘make distclean’ before reconfiguring for another
--architecture.
-+the `configure' script. `configure' automatically checks for the
-+source code in the directory that `configure' is in and in `..'. This
-+is known as a "VPATH" build.
-+
-+ With a non-GNU `make', it is safer to compile the package for one
-+architecture at a time in the source code directory. After you have
-+installed the package for one architecture, use `make distclean' before
-+reconfiguring for another architecture.
-
- On MacOS X 10.5 and later systems, you can create libraries and
- executables that work on multiple system types--known as "fat" or
--"universal" binaries--by specifying multiple '-arch' options to the
--compiler but only a single '-arch' option to the preprocessor. Like
-+"universal" binaries--by specifying multiple `-arch' options to the
-+compiler but only a single `-arch' option to the preprocessor. Like
- this:
-
- ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CPP="gcc -E" CXXCPP="g++ -E"
-
-- This is not guaranteed to produce working output in all cases. You
-+ This is not guaranteed to produce working output in all cases, you
- may have to build one architecture at a time and combine the results
--using the 'lipo' tool if you have problems.
-+using the `lipo' tool if you have problems.
-
- Installation Names
- ==================
-
-- By default, ‘make install’ will install the package's files in
--‘/usr/local/bin’, ‘/usr/local/man’, etc. You can specify an
--installation prefix other than ‘/usr/local’ by giving ‘configure’ the
--option ‘--prefix=PATH’.
-+ By default, `make install' installs the package's commands under
-+`/usr/local/bin', include files under `/usr/local/include', etc. You
-+can specify an installation prefix other than `/usr/local' by giving
-+`configure' the option `--prefix=PREFIX', where PREFIX must be an
-+absolute file name.
-
- You can specify separate installation prefixes for
- architecture-specific files and architecture-independent files. If you
--give ‘configure’ the option ‘--exec-prefix=PATH’, the package will use
--PATH as the prefix for installing programs and libraries.
--Documentation and other data files will still use the regular prefix.
-+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-+PREFIX as the prefix for installing programs and libraries.
-+Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
--options like ‘--bindir=PATH’ to specify different values for particular
--kinds of files. Run ‘configure --help’ for a list of the directories
--you can set and what kinds of files go in them.
--
-- If the package supports it, you can cause programs to be installed
--with an extra prefix or suffix on their names by giving ‘configure’ the
--option ‘--program-prefix=PREFIX’ or ‘--program-suffix=SUFFIX’.
--
--Enabling Relocatability
--=======================
--
-- It has been a pain for many users of GNU packages for a long time
--that packages are not relocatable. It means a user cannot copy a
--program, installed by another user on the same machine, to his home
--directory, and have it work correctly (including i18n). So many users
--need to go through ‘configure; make; make install’ with all its
--dependencies, options, and hurdles.
--
-- Red Hat, Debian, and similar package systems solve the "ease of
--installation" problem, but they hardwire path names, usually to ‘/usr’
--or ‘/usr/local’. This means that users need root privileges to install
--a binary package, and prevents installing two different versions of the
--same binary package.
--
-- A relocatable program can be moved or copied to a different location
--on the filesystem. It is possible to make symlinks to the installed
--and moved programs, and invoke them through the symlink. It is possible
--to do the same thing with a hard link _only_ if the hard link file is
--in the same directory as the real program.
--
-- To configure a program to be relocatable, add ‘--enable-relocatable’
--to the ‘configure’ command line.
--
-- On some OSes the executables remember the location of shared
--libraries and prefer them over any other search path. Therefore, such
--an executable will look for its shared libraries first in the original
--installation directory and only then in the current installation
--directory. Thus, for reliability, it is best to also give a ‘--prefix’
--option pointing to a directory that does not exist now and which never
--will be created, e.g. ‘--prefix=/nonexistent’. You may use
--‘DESTDIR=DEST-DIR’ on the ‘make’ command line to avoid installing into
--that directory.
--
-- We do not recommend using a prefix writable by unprivileged users
--(e.g. ‘/tmp/inst$$’) because such a directory can be recreated by an
--unprivileged user after the original directory has been removed. We
--also do not recommend prefixes that might be behind an automounter
--(e.g. ‘$HOME/inst$$’) because of the performance impact of directory
--searching.
--
-- Here's a sample installation run that takes into account all these
--recommendations:
--
-- ./configure --enable-relocatable --prefix=/nonexistent
-- make
-- make install DESTDIR=/tmp/inst$$
--
-- Installation with ‘--enable-relocatable’ will not work for setuid or
--setgid executables, because such executables search only system library
--paths for security reasons. Also, installation with
--‘--enable-relocatable’ might not work on OpenBSD, when the package
--contains shared libraries and libtool versions 1.5.xx are used.
--
-- The runtime penalty and size penalty are negligible on GNU/Linux
--(just one system call more when an executable is launched), and small on
--other systems (the wrapper program just sets an environment variable
--and executes the real program).
-+options like `--bindir=DIR' to specify different values for particular
-+kinds of files. Run `configure --help' for a list of the directories
-+you can set and what kinds of files go in them. In general, the
-+default for these options is expressed in terms of `${prefix}', so that
-+specifying just `--prefix' will affect all of the other directory
-+specifications that were not explicitly provided.
-+
-+ The most portable way to affect installation locations is to pass the
-+correct locations to `configure'; however, many packages provide one or
-+both of the following shortcuts of passing variable assignments to the
-+`make install' command line to change installation locations without
-+having to reconfigure or recompile.
-+
-+ The first method involves providing an override variable for each
-+affected directory. For example, `make install
-+prefix=/alternate/directory' will choose an alternate location for all
-+directory configuration variables that were expressed in terms of
-+`${prefix}'. Any directories that were specified during `configure',
-+but not in terms of `${prefix}', must each be overridden at install
-+time for the entire installation to be relocated. The approach of
-+makefile variable overrides for each directory variable is required by
-+the GNU Coding Standards, and ideally causes no recompilation.
-+However, some platforms have known limitations with the semantics of
-+shared libraries that end up requiring recompilation when using this
-+method, particularly noticeable in packages that use GNU Libtool.
-+
-+ The second method involves providing the `DESTDIR' variable. For
-+example, `make install DESTDIR=/alternate/directory' will prepend
-+`/alternate/directory' before all installation names. The approach of
-+`DESTDIR' overrides is not required by the GNU Coding Standards, and
-+does not work on platforms that have drive letters. On the other hand,
-+it does better at avoiding recompilation issues, and works well even
-+when some directory options were not specified in terms of `${prefix}'
-+at `configure' time.
-
- Optional Features
- =================
-
-- Some packages pay attention to ‘--enable-FEATURE’ options to
--‘configure’, where FEATURE indicates an optional part of the package.
--They may also pay attention to ‘--with-PACKAGE’ options, where PACKAGE
--is something like ‘gnu-as’ or ‘x’ (for the X Window System). The
--‘README’ should mention any ‘--enable-’ and ‘--with-’ options that the
-+ If the package supports it, you can cause programs to be installed
-+with an extra prefix or suffix on their names by giving `configure' the
-+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-+
-+ Some packages pay attention to `--enable-FEATURE' options to
-+`configure', where FEATURE indicates an optional part of the package.
-+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-+is something like `gnu-as' or `x' (for the X Window System). The
-+`README' should mention any `--enable-' and `--with-' options that the
- package recognizes.
-
-- For packages that use the X Window System, ‘configure’ can usually
-+ For packages that use the X Window System, `configure' can usually
- find the X include and library files automatically, but if it doesn't,
--you can use the ‘configure’ options ‘--x-includes=DIR’ and
--‘--x-libraries=DIR’ to specify their locations.
-+you can use the `configure' options `--x-includes=DIR' and
-+`--x-libraries=DIR' to specify their locations.
-
-- For packages that use the GNU libiconv library, you can use the
--‘configure’ option ‘--with-libiconv-prefix’ to specify the prefix you
--used while installing GNU libiconv. This option is not necessary if
--that other prefix is the same as the one now specified through --prefix.
--
-- For packages that use the GNU libintl library, you can use the
--‘configure’ option ‘--with-libintl-prefix’ to specify the prefix you
--used while installing GNU gettext-runtime. This option is not necessary if
--that other prefix is the same as the one now specified through --prefix.
-+ Some packages offer the ability to configure how verbose the
-+execution of `make' will be. For these packages, running `./configure
-+--enable-silent-rules' sets the default to minimal output, which can be
-+overridden with `make V=1'; while running `./configure
-+--disable-silent-rules' sets the default to verbose, which can be
-+overridden with `make V=0'.
-
--Particular Systems
-+Particular systems
- ==================
-
-- On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC
--is not installed, it is recommended to use the following options in order
--to use an ANSI C compiler:
-+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-+CC is not installed, it is recommended to use the following options in
-+order to use an ANSI C compiler:
-
- ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
- and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-+ HP-UX `make' updates targets which have the same time stamps as
-+their prerequisites, which makes it generally unusable when shipped
-+generated files such as `configure' are involved. Use GNU `make'
-+instead.
-+
- On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
--parse its ‘<wchar.h>’ header file. The option ‘-nodtk’ can be used as
-+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
- a workaround. If GNU CC is not installed, it is therefore recommended
- to try
-
-@@ -227,81 +242,129 @@ and if that doesn't work, try
-
- ./configure CC="cc -nodtk"
-
-- On AIX 3, the C include files by default don't define some necessary
--prototype declarations. If GNU CC is not installed, it is recommended to
--use the following options:
--
-- ./configure CC="xlc -D_ALL_SOURCE"
-+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
-+directory contains several dysfunctional programs; working variants of
-+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
-+in your `PATH', put it _after_ `/usr/bin'.
-
-- On Haiku, software installed for all users goes in /boot/common, not
--/usr/local. It is recommended to use the following options:
-+ On Haiku, software installed for all users goes in `/boot/common',
-+not `/usr/local'. It is recommended to use the following options:
-
- ./configure --prefix=/boot/common
-
-- On BeOS, user installed software goes in /boot/home/config, not
--/usr/local. It is recommended to use the following options:
--
-- ./configure --prefix=/boot/home/config
--
- Specifying the System Type
- ==========================
-
-- There may be some features ‘configure’ can not figure out
--automatically, but needs to determine by the type of host the package
--will run on. Usually ‘configure’ can figure that out, but if it prints
--a message saying it can not guess the host type, give it the
--‘--host=TYPE’ option. TYPE can either be a short name for the system
--type, such as ‘sun4’, or a canonical name with three fields:
-+ There may be some features `configure' cannot figure out
-+automatically, but needs to determine by the type of machine the package
-+will run on. Usually, assuming the package is built to be run on the
-+_same_ architectures, `configure' can figure that out, but if it prints
-+a message saying it cannot guess the machine type, give it the
-+`--build=TYPE' option. TYPE can either be a short name for the system
-+type, such as `sun4', or a canonical name which has the form:
-+
- CPU-COMPANY-SYSTEM
-
--See the file ‘config.sub’ for the possible values of each field. If
--‘config.sub’ isn't included in this package, then this package doesn't
--need to know the host type.
--
-- If you are building compiler tools for cross-compiling, you can also
--use the ‘--target=TYPE’ option to select the type of system they will
--produce code for and the ‘--build=TYPE’ option to select the type of
--system on which you are compiling the package.
-+where SYSTEM can have one of these forms:
-+
-+ OS
-+ KERNEL-OS
-+
-+ See the file `config.sub' for the possible values of each field. If
-+`config.sub' isn't included in this package, then this package doesn't
-+need to know the machine type.
-+
-+ If you are _building_ compiler tools for cross-compiling, you should
-+use the option `--target=TYPE' to select the type of system they will
-+produce code for.
-+
-+ If you want to _use_ a cross compiler, that generates code for a
-+platform different from the build platform, you should specify the
-+"host" platform (i.e., that on which the generated programs will
-+eventually be run) with `--host=TYPE'.
-
- Sharing Defaults
- ================
-
-- If you want to set default values for ‘configure’ scripts to share,
--you can create a site shell script called ‘config.site’ that gives
--default values for variables like ‘CC’, ‘cache_file’, and ‘prefix’.
--‘configure’ looks for ‘PREFIX/share/config.site’ if it exists, then
--‘PREFIX/etc/config.site’ if it exists. Or, you can set the
--‘CONFIG_SITE’ environment variable to the location of the site script.
--A warning: not all ‘configure’ scripts look for a site script.
-+ If you want to set default values for `configure' scripts to share,
-+you can create a site shell script called `config.site' that gives
-+default values for variables like `CC', `cache_file', and `prefix'.
-+`configure' looks for `PREFIX/share/config.site' if it exists, then
-+`PREFIX/etc/config.site' if it exists. Or, you can set the
-+`CONFIG_SITE' environment variable to the location of the site script.
-+A warning: not all `configure' scripts look for a site script.
-
--Operation Controls
-+Defining Variables
- ==================
-
-- ‘configure’ recognizes the following options to control how it
-+ Variables not defined in a site shell script can be set in the
-+environment passed to `configure'. However, some packages may run
-+configure again during the build, and the customized values of these
-+variables may be lost. In order to avoid this problem, you should set
-+them in the `configure' command line, using `VAR=value'. For example:
-+
-+ ./configure CC=/usr/local2/bin/gcc
-+
-+causes the specified `gcc' to be used as the C compiler (unless it is
-+overridden in the site shell script).
-+
-+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-+an Autoconf limitation. Until the limitation is lifted, you can use
-+this workaround:
-+
-+ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
-+
-+`configure' Invocation
-+======================
-+
-+ `configure' recognizes the following options to control how it
- operates.
-
--‘--cache-file=FILE’
-- Use and save the results of the tests in FILE instead of
-- ‘./config.cache’. Set FILE to ‘/dev/null’ to disable caching, for
-- debugging ‘configure’.
--
--‘--help’
-- Print a summary of the options to ‘configure’, and exit.
--
--‘--quiet’
--‘--silent’
--‘-q’
-+`--help'
-+`-h'
-+ Print a summary of all of the options to `configure', and exit.
-+
-+`--help=short'
-+`--help=recursive'
-+ Print a summary of the options unique to this package's
-+ `configure', and exit. The `short' variant lists options used
-+ only in the top level, while the `recursive' variant lists options
-+ also present in any nested packages.
-+
-+`--version'
-+`-V'
-+ Print the version of Autoconf used to generate the `configure'
-+ script, and exit.
-+
-+`--cache-file=FILE'
-+ Enable the cache: use and save the results of the tests in FILE,
-+ traditionally `config.cache'. FILE defaults to `/dev/null' to
-+ disable caching.
-+
-+`--config-cache'
-+`-C'
-+ Alias for `--cache-file=config.cache'.
-+
-+`--quiet'
-+`--silent'
-+`-q'
- Do not print messages saying which checks are being made. To
-- suppress all normal output, redirect it to ‘/dev/null’ (any error
-+ suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
--‘--srcdir=DIR’
-+`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
-- ‘configure’ can determine that directory automatically.
--
--‘--version’
-- Print the version of Autoconf used to generate the ‘configure’
-- script, and exit.
-+ `configure' can determine that directory automatically.
-
--‘configure’ also accepts some other, not widely useful, options.
-+`--prefix=DIR'
-+ Use DIR as the installation prefix. *note Installation Names::
-+ for more details, including other options available for fine-tuning
-+ the installation locations.
-+
-+`--no-create'
-+`-n'
-+ Run the configure checks, but stop before creating any output
-+ files.
-
-+`configure' also accepts some other, not widely useful, options. Run
-+`configure --help' for more details.
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/Makefile.in gettext-0.18.3.1/gettext-tools/Makefile.in
---- gettext-0.18.3.1.orig/gettext-tools/Makefile.in 2013-08-15 09:31:11.000000000 -0700
-+++ gettext-0.18.3.1/gettext-tools/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -90,9 +90,11 @@ DIST_COMMON = INSTALL NEWS README AUTHOR
- $(top_srcdir)/../gettext-runtime/intl/Makefile.in ABOUT-NLS \
- COPYING ../build-aux/compile ../build-aux/config.guess \
- ../build-aux/config.rpath ../build-aux/config.sub \
-- ../build-aux/install-sh ../build-aux/missing \
-+ ../build-aux/depcomp ../build-aux/install-sh \
-+ ../build-aux/mdate-sh ../build-aux/missing \
- ../build-aux/mkinstalldirs ../build-aux/texinfo.tex \
-- ../build-aux/ltmain.sh $(top_srcdir)/../build-aux/compile \
-+ ../build-aux/ylwrap ../build-aux/ltmain.sh \
-+ $(top_srcdir)/../build-aux/compile \
- $(top_srcdir)/../build-aux/config.guess \
- $(top_srcdir)/../build-aux/config.rpath \
- $(top_srcdir)/../build-aux/config.sub \
-@@ -306,11 +308,6 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/gnulib-m4/yield.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 \
- $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
- $(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
-@@ -340,8 +337,10 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \
- $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \
- $(top_srcdir)/m4/exported.m4 $(top_srcdir)/m4/hostname.m4 \
-- $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/siginfo.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/setlocale.m4 \
-+ $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-@@ -1612,8 +1611,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- $(am__aclocal_m4_deps):
-
- config.h: stamp-h1
-- @if test ! -f $@; then rm -f stamp-h1; else :; fi
-- @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
-+ @test -f $@ || rm -f stamp-h1
-+ @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
-
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
-@@ -1888,10 +1887,16 @@ dist-xz: distdir
- $(am__post_remove_distdir)
-
- dist-tarZ: distdir
-+ @echo WARNING: "Support for shar distribution archives is" \
-+ "deprecated." >&2
-+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__post_remove_distdir)
-
- dist-shar: distdir
-+ @echo WARNING: "Support for distribution archives compressed with" \
-+ "legacy program 'compress' is deprecated." >&2
-+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__post_remove_distdir)
-
-@@ -1933,10 +1938,11 @@ distcheck: dist
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
-- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+ && ../configure \
- --with-included-gettext \
- $(AM_DISTCHECK_CONFIGURE_FLAGS) \
- $(DISTCHECK_CONFIGURE_FLAGS) \
-+ --srcdir=.. --prefix="$$dc_install_base" \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
- && $(MAKE) $(AM_MAKEFLAGS) check \
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/aclocal.m4 gettext-0.18.3.1/gettext-tools/aclocal.m4
---- gettext-0.18.3.1.orig/gettext-tools/aclocal.m4 2013-08-15 09:31:04.000000000 -0700
-+++ gettext-0.18.3.1/gettext-tools/aclocal.m4 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
-+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
-
- # Copyright (C) 1996-2013 Free Software Foundation, Inc.
-
-@@ -32,10 +32,10 @@ To do so, use the procedure documented b
- # generated from the m4 files accompanying Automake X.Y.
- # (This private macro should not be called outside this file.)
- AC_DEFUN([AM_AUTOMAKE_VERSION],
--[am__api_version='1.13'
-+[am__api_version='1.14'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.13.4], [],
-+m4_if([$1], [1.14.1], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.13.4])dnl
-+[AM_AUTOMAKE_VERSION([1.14.1])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-@@ -418,6 +418,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
- # This macro actually does too much. Some checks are only needed if
- # your package does certain things. But this isn't really a big deal.
-
-+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
-+m4_define([AC_PROG_CC],
-+m4_defn([AC_PROG_CC])
-+[_AM_PROG_CC_C_O
-+])
-+
- # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
- # AM_INIT_AUTOMAKE([OPTIONS])
- # -----------------------------------------------
-@@ -526,7 +532,48 @@ dnl macro is hooked onto _AC_COMPILER_EX
- AC_CONFIG_COMMANDS_PRE(dnl
- [m4_provide_if([_AM_COMPILER_EXEEXT],
- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
--])
-+
-+# POSIX will say in a future version that running "rm -f" with no argument
-+# is OK; and we want to be able to make that assumption in our Makefile
-+# recipes. So use an aggressive probe to check that the usage we want is
-+# actually supported "in the wild" to an acceptable degree.
-+# See automake bug#10828.
-+# To make any issue more visible, cause the running configure to be aborted
-+# by default if the 'rm' program in use doesn't match our expectations; the
-+# user can still override this though.
-+if rm -f && rm -fr && rm -rf; then : OK; else
-+ cat >&2 <<'END'
-+Oops!
-+
-+Your 'rm' program seems unable to run without file operands specified
-+on the command line, even when the '-f' option is present. This is contrary
-+to the behaviour of most rm programs out there, and not conforming with
-+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-+
-+Please tell bug-automake@gnu.org about your system, including the value
-+of your $PATH and any error possibly output before this message. This
-+can help us improve future automake versions.
-+
-+END
-+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-+ echo 'Configuration will proceed anyway, since you have set the' >&2
-+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-+ echo >&2
-+ else
-+ cat >&2 <<'END'
-+Aborting the configuration process, to ensure you take notice of the issue.
-+
-+You can download and install GNU coreutils to get an 'rm' implementation
-+that behaves properly: <http://www.gnu.org/software/coreutils/>.
-+
-+If you want to complete the configuration process using your problematic
-+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-+to "yes", and re-run configure.
-+
-+END
-+ AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
-+ fi
-+fi])
-
- dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
- dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-@@ -534,7 +581,6 @@ dnl mangled by Autoconf and run in a she
- m4_define([_AC_COMPILER_EXEEXT],
- m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
--
- # When config.status generates a header, we must update the stamp-h file.
- # This file resides in the same directory as the config header
- # that is generated. The stamp files are numbered to have different names.
-@@ -693,38 +739,6 @@ AC_MSG_RESULT([$_am_result])
- rm -f confinc confmf
- ])
-
--# Copyright (C) 1999-2013 Free Software Foundation, Inc.
--#
--# 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.
--
--# AM_PROG_CC_C_O
--# --------------
--# Like AC_PROG_CC_C_O, but changed for automake.
--AC_DEFUN([AM_PROG_CC_C_O],
--[AC_REQUIRE([AC_PROG_CC_C_O])dnl
--AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--AC_REQUIRE_AUX_FILE([compile])dnl
--# FIXME: we rely on the cache variable name because
--# there is no other way.
--set dummy $CC
--am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
--eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
--if test "$am_t" != yes; then
-- # Losing compiler, so override with the script.
-- # FIXME: It is wrong to rewrite CC.
-- # But if we don't then we get into trouble of one sort or another.
-- # A longer-term fix would be to have automake use am__CC in this case,
-- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-- CC="$am_aux_dir/compile $CC"
--fi
--dnl Make sure AC_PROG_CC is never called again, or it will override our
--dnl setting of CC.
--m4_define([AC_PROG_CC],
-- [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
--])
--
- # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
- # Copyright (C) 1997-2013 Free Software Foundation, Inc.
-@@ -795,6 +809,70 @@ AC_DEFUN([_AM_SET_OPTIONS],
- AC_DEFUN([_AM_IF_OPTION],
- [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-+#
-+# 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.
-+
-+# _AM_PROG_CC_C_O
-+# ---------------
-+# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
-+# to automatically call this.
-+AC_DEFUN([_AM_PROG_CC_C_O],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+AC_REQUIRE_AUX_FILE([compile])dnl
-+AC_LANG_PUSH([C])dnl
-+AC_CACHE_CHECK(
-+ [whether $CC understands -c and -o together],
-+ [am_cv_prog_cc_c_o],
-+ [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-+ # Make sure it works both with $CC and with simple cc.
-+ # Following AC_PROG_CC_C_O, we do the test twice because some
-+ # compilers refuse to overwrite an existing .o file with -o,
-+ # though they will create one.
-+ am_cv_prog_cc_c_o=yes
-+ for am_i in 1 2; do
-+ if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
-+ && test -f conftest2.$ac_objext; then
-+ : OK
-+ else
-+ am_cv_prog_cc_c_o=no
-+ break
-+ fi
-+ done
-+ rm -f core conftest*
-+ unset am_i])
-+if test "$am_cv_prog_cc_c_o" != yes; then
-+ # Losing compiler, so override with the script.
-+ # FIXME: It is wrong to rewrite CC.
-+ # But if we don't then we get into trouble of one sort or another.
-+ # A longer-term fix would be to have automake use am__CC in this case,
-+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-+ CC="$am_aux_dir/compile $CC"
-+fi
-+AC_LANG_POP([C])])
-+
-+# For backward compatibility.
-+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-+
-+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
-+#
-+# 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.
-+
-+# AM_RUN_LOG(COMMAND)
-+# -------------------
-+# Run COMMAND, save the exit status in ac_status, and log it.
-+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-+AC_DEFUN([AM_RUN_LOG],
-+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+ (exit $ac_status); }])
-+
- # Check to make sure that the build environment is sane. -*- Autoconf -*-
-
- # Copyright (C) 1996-2013 Free Software Foundation, Inc.
-@@ -1322,11 +1400,6 @@ m4_include([gnulib-m4/xvasprintf.m4])
- m4_include([gnulib-m4/yield.m4])
- m4_include([../m4/fixautomake.m4])
- m4_include([../m4/init-package-version.m4])
--m4_include([../m4/libtool.m4])
--m4_include([../m4/ltoptions.m4])
--m4_include([../m4/ltsugar.m4])
--m4_include([../m4/ltversion.m4])
--m4_include([../m4/lt~obsolete.m4])
- m4_include([../m4/woe32-dll.m4])
- m4_include([../gettext-runtime/m4/codeset.m4])
- m4_include([../gettext-runtime/m4/fcntl-o.m4])
-@@ -1357,5 +1430,10 @@ m4_include([../gettext-runtime/m4/wint_t
- m4_include([../gettext-runtime/m4/xsize.m4])
- m4_include([m4/exported.m4])
- m4_include([m4/hostname.m4])
-+m4_include([m4/libtool.m4])
-+m4_include([m4/ltoptions.m4])
-+m4_include([m4/ltsugar.m4])
-+m4_include([m4/ltversion.m4])
-+m4_include([m4/lt~obsolete.m4])
- m4_include([m4/setlocale.m4])
- m4_include([m4/siginfo.m4])
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/config.h.in gettext-0.18.3.1/gettext-tools/config.h.in
---- gettext-0.18.3.1.orig/gettext-tools/config.h.in 2013-08-15 09:31:08.000000000 -0700
-+++ gettext-0.18.3.1/gettext-tools/config.h.in 2013-12-31 11:58:08.000000000 -0800
-@@ -2142,9 +2142,6 @@
- /* Define if the mbrtowc function returns a wrong return value. */
- #undef MBRTOWC_RETVAL_BUG
-
--/* Define to 1 if your C compiler doesn't accept -c and -o together. */
--#undef NO_MINUS_C_MINUS_O
--
- /* Define to 1 if open() fails to recognize a trailing slash. */
- #undef OPEN_TRAILING_SLASH_BUG
-
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/configure gettext-0.18.3.1/gettext-tools/configure
---- gettext-0.18.3.1.orig/gettext-tools/configure 2013-08-15 09:31:08.000000000 -0700
-+++ gettext-0.18.3.1/gettext-tools/configure 2013-12-31 11:58:08.000000000 -0800
-@@ -3921,7 +3921,7 @@ ac_configure="$SHELL $ac_aux_dir/configu
-
-
-
--am__api_version='1.13'
-+am__api_version='1.14'
-
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
-@@ -4451,6 +4451,47 @@ am__tar='$${TAR-tar} chof - "$$tardir"'
-
-
-
-+# POSIX will say in a future version that running "rm -f" with no argument
-+# is OK; and we want to be able to make that assumption in our Makefile
-+# recipes. So use an aggressive probe to check that the usage we want is
-+# actually supported "in the wild" to an acceptable degree.
-+# See automake bug#10828.
-+# To make any issue more visible, cause the running configure to be aborted
-+# by default if the 'rm' program in use doesn't match our expectations; the
-+# user can still override this though.
-+if rm -f && rm -fr && rm -rf; then : OK; else
-+ cat >&2 <<'END'
-+Oops!
-+
-+Your 'rm' program seems unable to run without file operands specified
-+on the command line, even when the '-f' option is present. This is contrary
-+to the behaviour of most rm programs out there, and not conforming with
-+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-+
-+Please tell bug-automake@gnu.org about your system, including the value
-+of your $PATH and any error possibly output before this message. This
-+can help us improve future automake versions.
-+
-+END
-+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-+ echo 'Configuration will proceed anyway, since you have set the' >&2
-+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-+ echo >&2
-+ else
-+ cat >&2 <<'END'
-+Aborting the configuration process, to ensure you take notice of the issue.
-+
-+You can download and install GNU coreutils to get an 'rm' implementation
-+that behaves properly: <http://www.gnu.org/software/coreutils/>.
-+
-+If you want to complete the configuration process using your problematic
-+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-+to "yes", and re-run configure.
-+
-+END
-+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-+ fi
-+fi
- PACKAGE=gettext-tools
-
- VERSION=$VERSION_NUMBER
-@@ -5261,6 +5302,65 @@ ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-+if ${am_cv_prog_cc_c_o+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+ # Make sure it works both with $CC and with simple cc.
-+ # Following AC_PROG_CC_C_O, we do the test twice because some
-+ # compilers refuse to overwrite an existing .o file with -o,
-+ # though they will create one.
-+ am_cv_prog_cc_c_o=yes
-+ for am_i in 1 2; do
-+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
-+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } \
-+ && test -f conftest2.$ac_objext; then
-+ : OK
-+ else
-+ am_cv_prog_cc_c_o=no
-+ break
-+ fi
-+ done
-+ rm -f core conftest*
-+ unset am_i
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-+$as_echo "$am_cv_prog_cc_c_o" >&6; }
-+if test "$am_cv_prog_cc_c_o" != yes; then
-+ # Losing compiler, so override with the script.
-+ # FIXME: It is wrong to rewrite CC.
-+ # But if we don't then we get into trouble of one sort or another.
-+ # A longer-term fix would be to have automake use am__CC in this case,
-+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-+ CC="$am_aux_dir/compile $CC"
-+fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
- DEPDIR="${am__leading_dot}deps"
-
- ac_config_commands="$ac_config_commands depfiles"
-@@ -6193,7 +6293,7 @@ EOF
- > conftestver.class
- target_version=`{
- unset JAVA_HOME
-- echo "$as_me:6196: CLASSPATH=.${CLASSPATH:+$CLASSPATH_SEPARATOR$CLASSPATH} $CONF_JAVA conftestver" >&5
-+ echo "$as_me:6296: CLASSPATH=.${CLASSPATH:+$CLASSPATH_SEPARATOR$CLASSPATH} $CONF_JAVA conftestver" >&5
- CLASSPATH=.${CLASSPATH:+$CLASSPATH_SEPARATOR$CLASSPATH} $CONF_JAVA conftestver 2>&5
- }`
- case "$target_version" in
-@@ -6261,23 +6361,23 @@ EOF
- if $JAVAC --version 2>/dev/null | sed -e 1q | grep gcj > /dev/null; then
- if $JAVAC --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^4\.[012]/d' | grep '^[4-9]' >/dev/null; then
- rm -f conftest.class
-- if { echo "$as_me:6264: $JAVAC -d . conftest.java" >&5
-+ if { echo "$as_me:6364: $JAVAC -d . conftest.java" >&5
- $JAVAC -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:6271: $JAVAC -fsource=$source_version -d . conftest.java" >&5
-+ if { echo "$as_me:6371: $JAVAC -fsource=$source_version -d . conftest.java" >&5
- $JAVAC -fsource="$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:6276: $JAVAC -d . conftestfail.java" >&5
-+ && { echo "$as_me:6376: $JAVAC -d . conftestfail.java" >&5
- $JAVAC -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:6280: $JAVAC -fsource=$source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:6380: $JAVAC -fsource=$source_version -d . conftestfail.java" >&5
- $JAVAC -fsource="$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="$JAVAC -fsource=$source_version"
-@@ -6291,7 +6391,7 @@ EOF
- else
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:6294: $JAVAC -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
-+ if { echo "$as_me:6394: $JAVAC -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
- $JAVAC -fsource="$source_version" -ftarget="$target_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
-@@ -6304,7 +6404,7 @@ EOF
- else
- if test "$target_version" = 1.4 && test "$source_version" = 1.4; then
- rm -f conftest.class
-- if { echo "$as_me:6307: $JAVAC -d . conftest.java" >&5
-+ if { echo "$as_me:6407: $JAVAC -d . conftest.java" >&5
- $JAVAC -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -6316,7 +6416,7 @@ EOF
- if test "$target_version" = 1.4 && test "$source_version" = 1.3; then
- javac_works=
- rm -f conftest.class
-- if { echo "$as_me:6319: $JAVAC -d . conftest.java" >&5
-+ if { echo "$as_me:6419: $JAVAC -d . conftest.java" >&5
- $JAVAC -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -6324,7 +6424,7 @@ EOF
- fi
- javac_noassert_works=
- rm -f conftest.class
-- if { echo "$as_me:6327: $JAVAC -fno-assert -d . conftest.java" >&5
-+ if { echo "$as_me:6427: $JAVAC -fno-assert -d . conftest.java" >&5
- $JAVAC -fno-assert -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -6332,11 +6432,11 @@ EOF
- fi
- if test -n "$javac_works" && test -n "$javac_noassert_works"; then
- rm -f conftestfail.class
-- if { echo "$as_me:6335: $JAVAC -d . conftestfail.java" >&5
-+ if { echo "$as_me:6435: $JAVAC -d . conftestfail.java" >&5
- $JAVAC -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:6339: $JAVAC -fno-assert -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:6439: $JAVAC -fno-assert -d . conftestfail.java" >&5
- $JAVAC -fno-assert -d . conftestfail.java >&5 2>&1
- }; then
- javac_works=
-@@ -6358,23 +6458,23 @@ EOF
- fi
- else
- rm -f conftest.class
-- if { echo "$as_me:6361: $JAVAC -d . conftest.java" >&5
-+ if { echo "$as_me:6461: $JAVAC -d . conftest.java" >&5
- $JAVAC -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:6368: $JAVAC -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:6468: $JAVAC -source $source_version -d . conftest.java" >&5
- $JAVAC -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:6373: $JAVAC -d . conftestfail.java" >&5
-+ && { echo "$as_me:6473: $JAVAC -d . conftestfail.java" >&5
- $JAVAC -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:6377: $JAVAC -source $source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:6477: $JAVAC -source $source_version -d . conftestfail.java" >&5
- $JAVAC -source "$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="$JAVAC -source $source_version"
-@@ -6387,23 +6487,23 @@ EOF
- fi
- else
- rm -f conftest.class
-- if { echo "$as_me:6390: $JAVAC -target $target_version -d . conftest.java" >&5
-+ if { echo "$as_me:6490: $JAVAC -target $target_version -d . conftest.java" >&5
- $JAVAC -target "$target_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:6397: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:6497: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
- $JAVAC -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:6402: $JAVAC -target $target_version -d . conftestfail.java" >&5
-+ && { echo "$as_me:6502: $JAVAC -target $target_version -d . conftestfail.java" >&5
- $JAVAC -target "$target_version" -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:6406: $JAVAC -target $target_version -source $source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:6506: $JAVAC -target $target_version -source $source_version -d . conftestfail.java" >&5
- $JAVAC -target "$target_version" -source "$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="$JAVAC -target $target_version -source $source_version"
-@@ -6416,7 +6516,7 @@ EOF
- fi
- else
- rm -f conftest.class
-- if { echo "$as_me:6419: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:6519: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
- $JAVAC -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
-@@ -6534,28 +6634,28 @@ fi
-
- if test -z "$HAVE_JAVACOMP" && test -n "$HAVE_GCJ_IN_PATH"; then
- if gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^3\.[01]/d' | grep '^[3-9]' >/dev/null; then
-- if { echo "$as_me:6537: gcj -C -d . conftestlib.java" >&5
-+ if { echo "$as_me:6637: gcj -C -d . conftestlib.java" >&5
- gcj -C -d . conftestlib.java >&5 2>&1
- }; then
- if gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^4\.[012]/d' | grep '^[4-9]' >/dev/null; then
- rm -f conftest.class
-- if { echo "$as_me:6542: gcj -C -d . conftest.java" >&5
-+ if { echo "$as_me:6642: gcj -C -d . conftest.java" >&5
- gcj -C -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:6549: gcj -C -fsource=$source_version -d . conftest.java" >&5
-+ if { echo "$as_me:6649: gcj -C -fsource=$source_version -d . conftest.java" >&5
- gcj -C -fsource="$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:6554: gcj -C -d . conftestfail.java" >&5
-+ && { echo "$as_me:6654: gcj -C -d . conftestfail.java" >&5
- gcj -C -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:6558: gcj -C -fsource=$source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:6658: gcj -C -fsource=$source_version -d . conftestfail.java" >&5
- gcj -C -fsource="$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="gcj -C -fsource=$source_version"
-@@ -6569,7 +6669,7 @@ fi
- else
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:6572: gcj -C -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
-+ if { echo "$as_me:6672: gcj -C -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
- gcj -C -fsource="$source_version" -ftarget="$target_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
-@@ -6582,7 +6682,7 @@ fi
- else
- if test "$target_version" = 1.4 && test "$source_version" = 1.4; then
- rm -f conftest.class
-- if { echo "$as_me:6585: gcj -C -d . conftest.java" >&5
-+ if { echo "$as_me:6685: gcj -C -d . conftest.java" >&5
- gcj -C -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -6593,7 +6693,7 @@ fi
- else
- if test "$target_version" = 1.4 && test "$source_version" = 1.3; then
- rm -f conftest.class
-- if { echo "$as_me:6596: gcj -C -fno-assert -d . conftest.java" >&5
-+ if { echo "$as_me:6696: gcj -C -fno-assert -d . conftest.java" >&5
- gcj -C -fno-assert -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -6602,7 +6702,7 @@ fi
- HAVE_JAVACOMP=1
- else
- rm -f conftest.class
-- if { echo "$as_me:6605: gcj -C -d . conftest.java" >&5
-+ if { echo "$as_me:6705: gcj -C -d . conftest.java" >&5
- gcj -C -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class; then
-@@ -6621,23 +6721,23 @@ fi
- if { javac -version >/dev/null 2>/dev/null || test $? -le 2; } \
- && ( if javac -help 2>&1 >/dev/null | grep at.dms.kjc.Main >/dev/null && javac -help 2>/dev/null | grep 'released.*2000' >/dev/null ; then exit 1; else exit 0; fi ); then
- rm -f conftest.class
-- if { echo "$as_me:6624: javac -d . conftest.java" >&5
-+ if { echo "$as_me:6724: javac -d . conftest.java" >&5
- javac -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:6631: javac -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:6731: javac -source $source_version -d . conftest.java" >&5
- javac -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:6636: javac -d . conftestfail.java" >&5
-+ && { echo "$as_me:6736: javac -d . conftestfail.java" >&5
- javac -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:6640: javac -source $source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:6740: javac -source $source_version -d . conftestfail.java" >&5
- javac -source "$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="javac -source $source_version"
-@@ -6650,23 +6750,23 @@ fi
- fi
- else
- rm -f conftest.class
-- if { echo "$as_me:6653: javac -target $target_version -d . conftest.java" >&5
-+ if { echo "$as_me:6753: javac -target $target_version -d . conftest.java" >&5
- javac -target "$target_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
- rm -f conftest.class
- rm -f conftestfail.class
-- if { echo "$as_me:6660: javac -target $target_version -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:6760: javac -target $target_version -source $source_version -d . conftest.java" >&5
- javac -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
- && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-- && { echo "$as_me:6665: javac -target $target_version -d . conftestfail.java" >&5
-+ && { echo "$as_me:6765: javac -target $target_version -d . conftestfail.java" >&5
- javac -target "$target_version" -d . conftestfail.java >&5 2>&1
- } \
- && test -f conftestfail.class \
-- && ! { echo "$as_me:6669: javac -target $target_version -source $source_version -d . conftestfail.java" >&5
-+ && ! { echo "$as_me:6769: javac -target $target_version -source $source_version -d . conftestfail.java" >&5
- javac -target "$target_version" -source "$source_version" -d . conftestfail.java >&5 2>&1
- }; then
- CONF_JAVAC="javac -target $target_version -source $source_version"
-@@ -6679,7 +6779,7 @@ fi
- fi
- else
- rm -f conftest.class
-- if { echo "$as_me:6682: javac -target $target_version -source $source_version -d . conftest.java" >&5
-+ if { echo "$as_me:6782: javac -target $target_version -source $source_version -d . conftest.java" >&5
- javac -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
- } \
- && test -f conftest.class \
-@@ -7469,131 +7569,6 @@ fi
- fi
-
-
--if test "x$CC" != xcc; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
--$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
--else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
--$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
--fi
--set dummy $CC; ac_cc=`$as_echo "$2" |
-- sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
--if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--# Make sure it works both with $CC and with simple cc.
--# We do the test twice because some compilers refuse to overwrite an
--# existing .o file with -o, though they will create one.
--ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--rm -f conftest2.*
--if { { case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; } &&
-- test -f conftest2.$ac_objext && { { case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; };
--then
-- eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-- if test "x$CC" != xcc; then
-- # Test first that cc exists at all.
-- if { ac_try='cc -c conftest.$ac_ext >&5'
-- { { case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; }; then
-- ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-- rm -f conftest2.*
-- if { { case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; } &&
-- test -f conftest2.$ac_objext && { { case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; };
-- then
-- # cc works too.
-- :
-- else
-- # cc exists but doesn't like -o.
-- eval ac_cv_prog_cc_${ac_cc}_c_o=no
-- fi
-- fi
-- fi
--else
-- eval ac_cv_prog_cc_${ac_cc}_c_o=no
--fi
--rm -f core conftest*
--
--fi
--if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
--
--fi
--
--# FIXME: we rely on the cache variable name because
--# there is no other way.
--set dummy $CC
--am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
--eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
--if test "$am_t" != yes; then
-- # Losing compiler, so override with the script.
-- # FIXME: It is wrong to rewrite CC.
-- # But if we don't then we get into trouble of one sort or another.
-- # A longer-term fix would be to have automake use am__CC in this case,
-- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-- CC="$am_aux_dir/compile $CC"
--fi
--
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
- $as_echo_n "checking for ANSI C header files... " >&6; }
-@@ -9520,10 +9495,7 @@ else
- lt_cv_path_NM="$NM"
- else
- lt_nm_to_check="${ac_tool_prefix}nm"
-- if test -n "$ac_tool_prefix" \
-- && { test "$build" = "$host" \
-- || { test "$build_os" = cygwin && test "$host_os" = mingw32; }; \
-- }; then
-+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
- lt_nm_to_check="$lt_nm_to_check nm"
- fi
- for lt_tmp_nm in $lt_nm_to_check; do
-@@ -12681,7 +12653,7 @@ fi
- LIBTOOL_DEPS="$ltmain"
-
- # Always use our own libtool.
--LIBTOOL="${CONFIG_SHELL-$SHELL} "'$(top_builddir)/libtool'
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-@@ -63327,10 +63299,7 @@ else
- lt_cv_path_NM="$NM"
- else
- lt_nm_to_check="${ac_tool_prefix}nm"
-- if test -n "$ac_tool_prefix" \
-- && { test "$build" = "$host" \
-- || { test "$build_os" = cygwin && test "$host_os" = mingw32; }; \
-- }; then
-+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
- lt_nm_to_check="$lt_nm_to_check nm"
- fi
- for lt_tmp_nm in $lt_nm_to_check; do
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/doc/Makefile.in gettext-0.18.3.1/gettext-tools/doc/Makefile.in
---- gettext-0.18.3.1.orig/gettext-tools/doc/Makefile.in 2013-08-15 09:31:12.000000000 -0700
-+++ gettext-0.18.3.1/gettext-tools/doc/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -290,11 +290,6 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/gnulib-m4/yield.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 \
- $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
- $(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
-@@ -324,8 +319,10 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \
- $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \
- $(top_srcdir)/m4/exported.m4 $(top_srcdir)/m4/hostname.m4 \
-- $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/siginfo.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/setlocale.m4 \
-+ $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
-@@ -1620,13 +1617,9 @@ clean-libtool:
- $(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
- -o $(@:.html=.htp) $<; \
- then \
-- rm -rf $@; \
-- if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-- mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
-+ rm -rf $@ && mv $(@:.html=.htp) $@; \
- else \
-- if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-- rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
-- exit 1; \
-+ rm -rf $(@:.html=.htp); exit 1; \
- fi
- $(srcdir)/gettext.info: gettext.texi $(srcdir)/version.texi $(gettext_TEXINFOS)
- gettext.dvi: gettext.texi $(srcdir)/version.texi $(gettext_TEXINFOS)
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/examples/Makefile.in gettext-0.18.3.1/gettext-tools/examples/Makefile.in
---- gettext-0.18.3.1.orig/gettext-tools/examples/Makefile.in 2013-08-15 09:27:38.000000000 -0700
-+++ gettext-0.18.3.1/gettext-tools/examples/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -83,9 +83,10 @@ DIST_COMMON = $(srcdir)/Makefile.in $(sr
- $(srcdir)/installpaths.in ChangeLog README \
- ../../build-aux/compile ../../build-aux/config.guess \
- ../../build-aux/config.rpath ../../build-aux/config.sub \
-- ../../build-aux/install-sh ../../build-aux/missing \
-+ ../../build-aux/depcomp ../../build-aux/install-sh \
-+ ../../build-aux/mdate-sh ../../build-aux/missing \
- ../../build-aux/mkinstalldirs ../../build-aux/texinfo.tex \
-- ../../build-aux/ltmain.sh \
-+ ../../build-aux/ylwrap ../../build-aux/ltmain.sh \
- $(top_srcdir)/../../build-aux/install-sh \
- $(top_srcdir)/../../build-aux/missing
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -978,10 +979,16 @@ dist-xz: distdir
- $(am__post_remove_distdir)
-
- dist-tarZ: distdir
-+ @echo WARNING: "Support for shar distribution archives is" \
-+ "deprecated." >&2
-+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__post_remove_distdir)
-
- dist-shar: distdir
-+ @echo WARNING: "Support for distribution archives compressed with" \
-+ "legacy program 'compress' is deprecated." >&2
-+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__post_remove_distdir)
-
-@@ -1023,9 +1030,10 @@ distcheck: dist
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
-- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+ && ../configure \
- $(AM_DISTCHECK_CONFIGURE_FLAGS) \
- $(DISTCHECK_CONFIGURE_FLAGS) \
-+ --srcdir=.. --prefix="$$dc_install_base" \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
- && $(MAKE) $(AM_MAKEFLAGS) check \
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/examples/aclocal.m4 gettext-0.18.3.1/gettext-tools/examples/aclocal.m4
---- gettext-0.18.3.1.orig/gettext-tools/examples/aclocal.m4 2013-08-15 09:27:37.000000000 -0700
-+++ gettext-0.18.3.1/gettext-tools/examples/aclocal.m4 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
-+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
-
- # Copyright (C) 1996-2013 Free Software Foundation, Inc.
-
-@@ -32,10 +32,10 @@ To do so, use the procedure documented b
- # generated from the m4 files accompanying Automake X.Y.
- # (This private macro should not be called outside this file.)
- AC_DEFUN([AM_AUTOMAKE_VERSION],
--[am__api_version='1.13'
-+[am__api_version='1.14'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.13.4], [],
-+m4_if([$1], [1.14.1], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.13.4])dnl
-+[AM_AUTOMAKE_VERSION([1.14.1])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-@@ -120,6 +120,12 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
- # This macro actually does too much. Some checks are only needed if
- # your package does certain things. But this isn't really a big deal.
-
-+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
-+m4_define([AC_PROG_CC],
-+m4_defn([AC_PROG_CC])
-+[_AM_PROG_CC_C_O
-+])
-+
- # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
- # AM_INIT_AUTOMAKE([OPTIONS])
- # -----------------------------------------------
-@@ -228,7 +234,48 @@ dnl macro is hooked onto _AC_COMPILER_EX
- AC_CONFIG_COMMANDS_PRE(dnl
- [m4_provide_if([_AM_COMPILER_EXEEXT],
- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
--])
-+
-+# POSIX will say in a future version that running "rm -f" with no argument
-+# is OK; and we want to be able to make that assumption in our Makefile
-+# recipes. So use an aggressive probe to check that the usage we want is
-+# actually supported "in the wild" to an acceptable degree.
-+# See automake bug#10828.
-+# To make any issue more visible, cause the running configure to be aborted
-+# by default if the 'rm' program in use doesn't match our expectations; the
-+# user can still override this though.
-+if rm -f && rm -fr && rm -rf; then : OK; else
-+ cat >&2 <<'END'
-+Oops!
-+
-+Your 'rm' program seems unable to run without file operands specified
-+on the command line, even when the '-f' option is present. This is contrary
-+to the behaviour of most rm programs out there, and not conforming with
-+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-+
-+Please tell bug-automake@gnu.org about your system, including the value
-+of your $PATH and any error possibly output before this message. This
-+can help us improve future automake versions.
-+
-+END
-+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-+ echo 'Configuration will proceed anyway, since you have set the' >&2
-+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-+ echo >&2
-+ else
-+ cat >&2 <<'END'
-+Aborting the configuration process, to ensure you take notice of the issue.
-+
-+You can download and install GNU coreutils to get an 'rm' implementation
-+that behaves properly: <http://www.gnu.org/software/coreutils/>.
-+
-+If you want to complete the configuration process using your problematic
-+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-+to "yes", and re-run configure.
-+
-+END
-+ AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
-+ fi
-+fi])
-
- dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
- dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-@@ -236,7 +283,6 @@ dnl mangled by Autoconf and run in a she
- m4_define([_AC_COMPILER_EXEEXT],
- m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
--
- # When config.status generates a header, we must update the stamp-h file.
- # This file resides in the same directory as the config header
- # that is generated. The stamp files are numbered to have different names.
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/examples/configure gettext-0.18.3.1/gettext-tools/examples/configure
---- gettext-0.18.3.1.orig/gettext-tools/examples/configure 2013-08-15 09:27:37.000000000 -0700
-+++ gettext-0.18.3.1/gettext-tools/examples/configure 2013-12-31 11:58:08.000000000 -0800
-@@ -1752,7 +1752,7 @@ ac_configure="$SHELL $ac_aux_dir/configu
-
-
-
--am__api_version='1.13'
-+am__api_version='1.14'
-
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
-@@ -2282,6 +2282,47 @@ am__tar='$${TAR-tar} chof - "$$tardir"'
-
-
-
-+# POSIX will say in a future version that running "rm -f" with no argument
-+# is OK; and we want to be able to make that assumption in our Makefile
-+# recipes. So use an aggressive probe to check that the usage we want is
-+# actually supported "in the wild" to an acceptable degree.
-+# See automake bug#10828.
-+# To make any issue more visible, cause the running configure to be aborted
-+# by default if the 'rm' program in use doesn't match our expectations; the
-+# user can still override this though.
-+if rm -f && rm -fr && rm -rf; then : OK; else
-+ cat >&2 <<'END'
-+Oops!
-+
-+Your 'rm' program seems unable to run without file operands specified
-+on the command line, even when the '-f' option is present. This is contrary
-+to the behaviour of most rm programs out there, and not conforming with
-+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-+
-+Please tell bug-automake@gnu.org about your system, including the value
-+of your $PATH and any error possibly output before this message. This
-+can help us improve future automake versions.
-+
-+END
-+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-+ echo 'Configuration will proceed anyway, since you have set the' >&2
-+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-+ echo >&2
-+ else
-+ cat >&2 <<'END'
-+Aborting the configuration process, to ensure you take notice of the issue.
-+
-+You can download and install GNU coreutils to get an 'rm' implementation
-+that behaves properly: <http://www.gnu.org/software/coreutils/>.
-+
-+If you want to complete the configuration process using your problematic
-+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-+to "yes", and re-run configure.
-+
-+END
-+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-+ fi
-+fi
- PACKAGE=gettext-examples
-
- VERSION=$VERSION_NUMBER
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/examples/po/Makefile.in gettext-0.18.3.1/gettext-tools/examples/po/Makefile.in
---- gettext-0.18.3.1.orig/gettext-tools/examples/po/Makefile.in 2013-08-15 09:27:38.000000000 -0700
-+++ gettext-0.18.3.1/gettext-tools/examples/po/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/gnulib-lib/Makefile.in gettext-0.18.3.1/gettext-tools/gnulib-lib/Makefile.in
---- gettext-0.18.3.1.orig/gettext-tools/gnulib-lib/Makefile.in 2013-08-15 09:31:13.000000000 -0700
-+++ gettext-0.18.3.1/gettext-tools/gnulib-lib/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -352,11 +352,6 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/gnulib-m4/yield.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 \
- $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
- $(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
-@@ -386,8 +381,10 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \
- $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \
- $(top_srcdir)/m4/exported.m4 $(top_srcdir)/m4/hostname.m4 \
-- $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/siginfo.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/setlocale.m4 \
-+ $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/gnulib-tests/Makefile.in gettext-0.18.3.1/gettext-tools/gnulib-tests/Makefile.in
---- gettext-0.18.3.1.orig/gettext-tools/gnulib-tests/Makefile.in 2013-08-15 09:31:13.000000000 -0700
-+++ gettext-0.18.3.1/gettext-tools/gnulib-tests/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -474,11 +474,6 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/gnulib-m4/yield.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 \
- $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
- $(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
-@@ -508,8 +503,10 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \
- $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \
- $(top_srcdir)/m4/exported.m4 $(top_srcdir)/m4/hostname.m4 \
-- $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/siginfo.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/setlocale.m4 \
-+ $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/libgettextpo/Makefile.in gettext-0.18.3.1/gettext-tools/libgettextpo/Makefile.in
---- gettext-0.18.3.1.orig/gettext-tools/libgettextpo/Makefile.in 2013-08-15 09:31:14.000000000 -0700
-+++ gettext-0.18.3.1/gettext-tools/libgettextpo/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -331,11 +331,6 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/gnulib-m4/yield.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 \
- $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
- $(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
-@@ -365,8 +360,10 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \
- $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \
- $(top_srcdir)/m4/exported.m4 $(top_srcdir)/m4/hostname.m4 \
-- $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/siginfo.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/setlocale.m4 \
-+ $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
-@@ -1961,10 +1958,10 @@ distclean-compile:
- -rm -f *.tab.c
-
- .c.o:
-- $(AM_V_CC)$(COMPILE) -c $<
-+ $(AM_V_CC)$(COMPILE) -c -o $@ $<
-
- .c.obj:
-- $(AM_V_CC)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+ $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .c.lo:
- $(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/libgrep/Makefile.in gettext-0.18.3.1/gettext-tools/libgrep/Makefile.in
---- gettext-0.18.3.1.orig/gettext-tools/libgrep/Makefile.in 2013-08-15 09:31:14.000000000 -0700
-+++ gettext-0.18.3.1/gettext-tools/libgrep/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -311,11 +311,6 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/gnulib-m4/yield.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 \
- $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
- $(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
-@@ -345,8 +340,10 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \
- $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \
- $(top_srcdir)/m4/exported.m4 $(top_srcdir)/m4/hostname.m4 \
-- $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/siginfo.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/setlocale.m4 \
-+ $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
-@@ -1583,10 +1580,10 @@ distclean-compile:
- -rm -f *.tab.c
-
- .c.o:
-- $(AM_V_CC)$(COMPILE) -c $<
-+ $(AM_V_CC)$(COMPILE) -c -o $@ $<
-
- .c.obj:
-- $(AM_V_CC)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+ $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .c.lo:
- $(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/m4/Makefile.in gettext-0.18.3.1/gettext-tools/m4/Makefile.in
---- gettext-0.18.3.1.orig/gettext-tools/m4/Makefile.in 2013-08-15 09:31:14.000000000 -0700
-+++ gettext-0.18.3.1/gettext-tools/m4/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -289,11 +289,6 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/gnulib-m4/yield.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 \
- $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
- $(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
-@@ -323,8 +318,10 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \
- $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \
- $(top_srcdir)/m4/exported.m4 $(top_srcdir)/m4/hostname.m4 \
-- $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/siginfo.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/setlocale.m4 \
-+ $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/m4/libtool.m4 gettext-0.18.3.1/gettext-tools/m4/libtool.m4
---- gettext-0.18.3.1.orig/gettext-tools/m4/libtool.m4 1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.18.3.1/gettext-tools/m4/libtool.m4 2013-12-31 11:58:08.000000000 -0800
-@@ -0,0 +1,7982 @@
-+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-+#
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-+# Foundation, Inc.
-+# Written by Gordon Matzigkeit, 1996
-+#
-+# 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.
-+
-+m4_define([_LT_COPYING], [dnl
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-+# Foundation, Inc.
-+# Written by Gordon Matzigkeit, 1996
-+#
-+# This file is part of GNU Libtool.
-+#
-+# GNU Libtool 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.
-+#
-+# As a special exception to the GNU General Public License,
-+# if you distribute this file as part of a program or library that
-+# is built using GNU Libtool, you may include this file under the
-+# same distribution terms that you use for the rest of that program.
-+#
-+# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy
-+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-+# obtained by writing to the Free Software Foundation, Inc.,
-+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+])
-+
-+# serial 57 LT_INIT
-+
-+
-+# LT_PREREQ(VERSION)
-+# ------------------
-+# Complain and exit if this libtool version is less that VERSION.
-+m4_defun([LT_PREREQ],
-+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-+ [m4_default([$3],
-+ [m4_fatal([Libtool version $1 or higher is required],
-+ 63)])],
-+ [$2])])
-+
-+
-+# _LT_CHECK_BUILDDIR
-+# ------------------
-+# Complain if the absolute build directory name contains unusual characters
-+m4_defun([_LT_CHECK_BUILDDIR],
-+[case `pwd` in
-+ *\ * | *\ *)
-+ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-+esac
-+])
-+
-+
-+# LT_INIT([OPTIONS])
-+# ------------------
-+AC_DEFUN([LT_INIT],
-+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-+AC_BEFORE([$0], [LT_LANG])dnl
-+AC_BEFORE([$0], [LT_OUTPUT])dnl
-+AC_BEFORE([$0], [LTDL_INIT])dnl
-+m4_require([_LT_CHECK_BUILDDIR])dnl
-+
-+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-+dnl unless we require an AC_DEFUNed macro:
-+AC_REQUIRE([LTOPTIONS_VERSION])dnl
-+AC_REQUIRE([LTSUGAR_VERSION])dnl
-+AC_REQUIRE([LTVERSION_VERSION])dnl
-+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-+m4_require([_LT_PROG_LTMAIN])dnl
-+
-+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-+
-+dnl Parse OPTIONS
-+_LT_SET_OPTIONS([$0], [$1])
-+
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ltmain"
-+
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+AC_SUBST(LIBTOOL)dnl
-+
-+_LT_SETUP
-+
-+# Only expand once:
-+m4_define([LT_INIT])
-+])# LT_INIT
-+
-+# Old names:
-+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-+
-+
-+# _LT_CC_BASENAME(CC)
-+# -------------------
-+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
-+m4_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 "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-+])
-+
-+
-+# _LT_FILEUTILS_DEFAULTS
-+# ----------------------
-+# It is okay to use these file commands and assume they have been set
-+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-+m4_defun([_LT_FILEUTILS_DEFAULTS],
-+[: ${CP="cp -f"}
-+: ${MV="mv -f"}
-+: ${RM="rm -f"}
-+])# _LT_FILEUTILS_DEFAULTS
-+
-+
-+# _LT_SETUP
-+# ---------
-+m4_defun([_LT_SETUP],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-+
-+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
-+dnl
-+_LT_DECL([], [host_alias], [0], [The host system])dnl
-+_LT_DECL([], [host], [0])dnl
-+_LT_DECL([], [host_os], [0])dnl
-+dnl
-+_LT_DECL([], [build_alias], [0], [The build system])dnl
-+_LT_DECL([], [build], [0])dnl
-+_LT_DECL([], [build_os], [0])dnl
-+dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([LT_PATH_LD])dnl
-+AC_REQUIRE([LT_PATH_NM])dnl
-+dnl
-+AC_REQUIRE([AC_PROG_LN_S])dnl
-+test -z "$LN_S" && LN_S="ln -s"
-+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-+dnl
-+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-+dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
-+m4_require([_LT_CMD_RELOAD])dnl
-+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
-+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-+m4_require([_LT_WITH_SYSROOT])dnl
-+
-+_LT_CONFIG_LIBTOOL_INIT([
-+# See if we are running on zsh, and set the options which allow our
-+# commands through without removal of \ escapes INIT.
-+if test -n "\${ZSH_VERSION+set}" ; then
-+ setopt NO_GLOB_SUBST
-+fi
-+])
-+if test -n "${ZSH_VERSION+set}" ; then
-+ setopt NO_GLOB_SUBST
-+fi
-+
-+_LT_CHECK_OBJDIR
-+
-+m4_require([_LT_TAG_COMPILER])dnl
-+
-+case $host_os in
-+aix3*)
-+ # AIX sometimes has problems with the GCC collect2 program. For some
-+ # reason, if we set the COLLECT_NAMES environment variable, the problems
-+ # vanish in a puff of smoke.
-+ if test "X${COLLECT_NAMES+set}" != Xset; then
-+ COLLECT_NAMES=
-+ export COLLECT_NAMES
-+ fi
-+ ;;
-+esac
-+
-+# Global variables:
-+ofile=libtool
-+can_build_shared=yes
-+
-+# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
-+
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
-+
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
-+
-+# Set sane defaults for various variables
-+test -z "$CC" && CC=cc
-+test -z "$LTCC" && LTCC=$CC
-+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-+test -z "$LD" && LD=ld
-+test -z "$ac_objext" && ac_objext=o
-+
-+_LT_CC_BASENAME([$compiler])
-+
-+# Only perform the check for file, if the check method requires it
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+case $deplibs_check_method in
-+file_magic*)
-+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+ _LT_PATH_MAGIC
-+ fi
-+ ;;
-+esac
-+
-+# Use C for the default configuration in the libtool script
-+LT_SUPPORTED_TAG([CC])
-+_LT_LANG_C_CONFIG
-+_LT_LANG_DEFAULT_CONFIG
-+_LT_CONFIG_COMMANDS
-+])# _LT_SETUP
-+
-+
-+# _LT_PREPARE_SED_QUOTE_VARS
-+# --------------------------
-+# Define a few sed substitution that help us do robust quoting.
-+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-+[# Backslashify metacharacters that are still active within
-+# double-quoted strings.
-+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Sed substitution to delay expansion of an escaped single quote.
-+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-+
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
-+])
-+
-+# _LT_PROG_LTMAIN
-+# ---------------
-+# Note that this code is called both from `configure', and `config.status'
-+# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
-+# `config.status' has no value for ac_aux_dir unless we are using Automake,
-+# so we pass a copy along to make sure it has a sensible value anyway.
-+m4_defun([_LT_PROG_LTMAIN],
-+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-+ltmain="$ac_aux_dir/ltmain.sh"
-+])# _LT_PROG_LTMAIN
-+
-+
-+## ------------------------------------- ##
-+## Accumulate code for creating libtool. ##
-+## ------------------------------------- ##
-+
-+# So that we can recreate a full libtool script including additional
-+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-+# in macros and then make a single call at the end using the `libtool'
-+# label.
-+
-+
-+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-+# ----------------------------------------
-+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-+m4_define([_LT_CONFIG_LIBTOOL_INIT],
-+[m4_ifval([$1],
-+ [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-+ [$1
-+])])])
-+
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-+
-+
-+# _LT_CONFIG_LIBTOOL([COMMANDS])
-+# ------------------------------
-+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-+m4_define([_LT_CONFIG_LIBTOOL],
-+[m4_ifval([$1],
-+ [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-+ [$1
-+])])])
-+
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-+
-+
-+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-+# -----------------------------------------------------
-+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-+[_LT_CONFIG_LIBTOOL([$1])
-+_LT_CONFIG_LIBTOOL_INIT([$2])
-+])
-+
-+
-+# _LT_FORMAT_COMMENT([COMMENT])
-+# -----------------------------
-+# Add leading comment marks to the start of each line, and a trailing
-+# full-stop to the whole comment if one is not present already.
-+m4_define([_LT_FORMAT_COMMENT],
-+[m4_ifval([$1], [
-+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-+ [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-+)])
-+
-+
-+
-+## ------------------------ ##
-+## FIXME: Eliminate VARNAME ##
-+## ------------------------ ##
-+
-+
-+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-+# -------------------------------------------------------------------
-+# CONFIGNAME is the name given to the value in the libtool script.
-+# VARNAME is the (base) name used in the configure script.
-+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-+# VARNAME. Any other value will be used directly.
-+m4_define([_LT_DECL],
-+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-+ [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-+ [m4_ifval([$1], [$1], [$2])])
-+ lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-+ m4_ifval([$4],
-+ [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-+ lt_dict_add_subkey([lt_decl_dict], [$2],
-+ [tagged?], [m4_ifval([$5], [yes], [no])])])
-+])
-+
-+
-+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-+# --------------------------------------------------------
-+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-+
-+
-+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-+# ------------------------------------------------
-+m4_define([lt_decl_tag_varnames],
-+[_lt_decl_filter([tagged?], [yes], $@)])
-+
-+
-+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-+# ---------------------------------------------------------
-+m4_define([_lt_decl_filter],
-+[m4_case([$#],
-+ [0], [m4_fatal([$0: too few arguments: $#])],
-+ [1], [m4_fatal([$0: too few arguments: $#: $1])],
-+ [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-+ [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-+ [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-+])
-+
-+
-+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-+# --------------------------------------------------
-+m4_define([lt_decl_quote_varnames],
-+[_lt_decl_filter([value], [1], $@)])
-+
-+
-+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-+# ---------------------------------------------------
-+m4_define([lt_decl_dquote_varnames],
-+[_lt_decl_filter([value], [2], $@)])
-+
-+
-+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-+# ---------------------------------------------------
-+m4_define([lt_decl_varnames_tagged],
-+[m4_assert([$# <= 2])dnl
-+_$0(m4_quote(m4_default([$1], [[, ]])),
-+ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-+ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-+m4_define([_lt_decl_varnames_tagged],
-+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-+
-+
-+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-+# ------------------------------------------------
-+m4_define([lt_decl_all_varnames],
-+[_$0(m4_quote(m4_default([$1], [[, ]])),
-+ m4_if([$2], [],
-+ m4_quote(lt_decl_varnames),
-+ m4_quote(m4_shift($@))))[]dnl
-+])
-+m4_define([_lt_decl_all_varnames],
-+[lt_join($@, lt_decl_varnames_tagged([$1],
-+ lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-+])
-+
-+
-+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-+# ------------------------------------
-+# Quote a variable value, and forward it to `config.status' so that its
-+# declaration there will have the same value as in `configure'. VARNAME
-+# must have a single quote delimited value for this to work.
-+m4_define([_LT_CONFIG_STATUS_DECLARE],
-+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
-+
-+
-+# _LT_CONFIG_STATUS_DECLARATIONS
-+# ------------------------------
-+# We delimit libtool config variables with single quotes, so when
-+# we write them to config.status, we have to be sure to quote all
-+# embedded single quotes properly. In configure, this macro expands
-+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-+#
-+# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
-+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-+ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-+
-+
-+# _LT_LIBTOOL_TAGS
-+# ----------------
-+# Output comment and list of tags supported by the script
-+m4_defun([_LT_LIBTOOL_TAGS],
-+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-+available_tags="_LT_TAGS"dnl
-+])
-+
-+
-+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-+# -----------------------------------
-+# Extract the dictionary values for VARNAME (optionally with TAG) and
-+# expand to a commented shell variable setting:
-+#
-+# # Some comment about what VAR is for.
-+# visible_name=$lt_internal_name
-+m4_define([_LT_LIBTOOL_DECLARE],
-+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-+ [description])))[]dnl
-+m4_pushdef([_libtool_name],
-+ m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-+ [0], [_libtool_name=[$]$1],
-+ [1], [_libtool_name=$lt_[]$1],
-+ [2], [_libtool_name=$lt_[]$1],
-+ [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-+])
-+
-+
-+# _LT_LIBTOOL_CONFIG_VARS
-+# -----------------------
-+# Produce commented declarations of non-tagged libtool config variables
-+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-+# script. Tagged libtool config variables (even for the LIBTOOL CONFIG
-+# section) are produced by _LT_LIBTOOL_TAG_VARS.
-+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-+[m4_foreach([_lt_var],
-+ m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-+
-+
-+# _LT_LIBTOOL_TAG_VARS(TAG)
-+# -------------------------
-+m4_define([_LT_LIBTOOL_TAG_VARS],
-+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-+
-+
-+# _LT_TAGVAR(VARNAME, [TAGNAME])
-+# ------------------------------
-+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-+
-+
-+# _LT_CONFIG_COMMANDS
-+# -------------------
-+# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
-+# variables for single and double quote escaping we saved from calls
-+# to _LT_DECL, we can put quote escaped variables declarations
-+# into `config.status', and then the shell code to quote escape them in
-+# for loops in `config.status'. Finally, any additional code accumulated
-+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-+m4_defun([_LT_CONFIG_COMMANDS],
-+[AC_PROVIDE_IFELSE([LT_OUTPUT],
-+ dnl If the libtool generation code has been placed in $CONFIG_LT,
-+ dnl instead of duplicating it all over again into config.status,
-+ dnl then we will have config.status run $CONFIG_LT later, so it
-+ dnl needs to know what name is stored there:
-+ [AC_CONFIG_COMMANDS([libtool],
-+ [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-+ dnl If the libtool generation code is destined for config.status,
-+ dnl expand the accumulated commands and init code now:
-+ [AC_CONFIG_COMMANDS([libtool],
-+ [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-+])#_LT_CONFIG_COMMANDS
-+
-+
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-+[
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+sed_quote_subst='$sed_quote_subst'
-+double_quote_subst='$double_quote_subst'
-+delay_variable_subst='$delay_variable_subst'
-+_LT_CONFIG_STATUS_DECLARATIONS
-+LTCC='$LTCC'
-+LTCFLAGS='$LTCFLAGS'
-+compiler='$compiler_DEFAULT'
-+
-+# A function that is used when there is no print builtin or printf.
-+func_fallback_echo ()
-+{
-+ eval 'cat <<_LTECHO_EOF
-+\$[]1
-+_LTECHO_EOF'
-+}
-+
-+# Quote evaled strings.
-+for var in lt_decl_all_varnames([[ \
-+]], lt_decl_quote_varnames); do
-+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-+ *[[\\\\\\\`\\"\\\$]]*)
-+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-+ ;;
-+ *)
-+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-+ ;;
-+ esac
-+done
-+
-+# Double-quote double-evaled strings.
-+for var in lt_decl_all_varnames([[ \
-+]], lt_decl_dquote_varnames); do
-+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-+ *[[\\\\\\\`\\"\\\$]]*)
-+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-+ ;;
-+ *)
-+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-+ ;;
-+ esac
-+done
-+
-+_LT_OUTPUT_LIBTOOL_INIT
-+])
-+
-+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-+# ------------------------------------
-+# Generate a child script FILE with all initialization necessary to
-+# reuse the environment learned by the parent script, and make the
-+# file executable. If COMMENT is supplied, it is inserted after the
-+# `#!' sequence but before initialization text begins. After this
-+# macro, additional text can be appended to FILE to form the body of
-+# the child script. The macro ends with non-zero status if the
-+# file could not be fully written (such as if the disk is full).
-+m4_ifdef([AS_INIT_GENERATED],
-+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-+[m4_defun([_LT_GENERATED_FILE_INIT],
-+[m4_require([AS_PREPARE])]dnl
-+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-+[lt_write_fail=0
-+cat >$1 <<_ASEOF || lt_write_fail=1
-+#! $SHELL
-+# Generated by $as_me.
-+$2
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+export SHELL
-+_ASEOF
-+cat >>$1 <<\_ASEOF || lt_write_fail=1
-+AS_SHELL_SANITIZE
-+_AS_PREPARE
-+exec AS_MESSAGE_FD>&1
-+_ASEOF
-+test $lt_write_fail = 0 && chmod +x $1[]dnl
-+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
-+
-+# LT_OUTPUT
-+# ---------
-+# This macro allows early generation of the libtool script (before
-+# AC_OUTPUT is called), incase it is used in configure for compilation
-+# tests.
-+AC_DEFUN([LT_OUTPUT],
-+[: ${CONFIG_LT=./config.lt}
-+AC_MSG_NOTICE([creating $CONFIG_LT])
-+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-+[# Run this file to recreate a libtool stub with the current configuration.])
-+
-+cat >>"$CONFIG_LT" <<\_LTEOF
-+lt_cl_silent=false
-+exec AS_MESSAGE_LOG_FD>>config.log
-+{
-+ echo
-+ AS_BOX([Running $as_me.])
-+} >&AS_MESSAGE_LOG_FD
-+
-+lt_cl_help="\
-+\`$as_me' creates a local libtool stub from the current configuration,
-+for use in further configure time tests before the real libtool is
-+generated.
-+
-+Usage: $[0] [[OPTIONS]]
-+
-+ -h, --help print this help, then exit
-+ -V, --version print version number, then exit
-+ -q, --quiet do not print progress messages
-+ -d, --debug don't remove temporary files
-+
-+Report bugs to <bug-libtool@gnu.org>."
-+
-+lt_cl_version="\
-+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-+configured by $[0], generated by m4_PACKAGE_STRING.
-+
-+Copyright (C) 2011 Free Software Foundation, Inc.
-+This config.lt script is free software; the Free Software Foundation
-+gives unlimited permision to copy, distribute and modify it."
-+
-+while test $[#] != 0
-+do
-+ case $[1] in
-+ --version | --v* | -V )
-+ echo "$lt_cl_version"; exit 0 ;;
-+ --help | --h* | -h )
-+ echo "$lt_cl_help"; exit 0 ;;
-+ --debug | --d* | -d )
-+ debug=: ;;
-+ --quiet | --q* | --silent | --s* | -q )
-+ lt_cl_silent=: ;;
-+
-+ -*) AC_MSG_ERROR([unrecognized option: $[1]
-+Try \`$[0] --help' for more information.]) ;;
-+
-+ *) AC_MSG_ERROR([unrecognized argument: $[1]
-+Try \`$[0] --help' for more information.]) ;;
-+ esac
-+ shift
-+done
-+
-+if $lt_cl_silent; then
-+ exec AS_MESSAGE_FD>/dev/null
-+fi
-+_LTEOF
-+
-+cat >>"$CONFIG_LT" <<_LTEOF
-+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-+_LTEOF
-+
-+cat >>"$CONFIG_LT" <<\_LTEOF
-+AC_MSG_NOTICE([creating $ofile])
-+_LT_OUTPUT_LIBTOOL_COMMANDS
-+AS_EXIT(0)
-+_LTEOF
-+chmod +x "$CONFIG_LT"
-+
-+# configure is writing to config.log, but config.lt does its own redirection,
-+# appending to config.log, which fails on DOS, as config.log is still kept
-+# open by configure. Here we exec the FD to /dev/null, effectively closing
-+# config.log, so it can be properly (re)opened and appended to by config.lt.
-+lt_cl_success=:
-+test "$silent" = yes &&
-+ lt_config_lt_args="$lt_config_lt_args --quiet"
-+exec AS_MESSAGE_LOG_FD>/dev/null
-+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-+exec AS_MESSAGE_LOG_FD>>config.log
-+$lt_cl_success || AS_EXIT(1)
-+])# LT_OUTPUT
-+
-+
-+# _LT_CONFIG(TAG)
-+# ---------------
-+# If TAG is the built-in tag, create an initial libtool script with a
-+# default configuration from the untagged config vars. Otherwise add code
-+# to config.status for appending the configuration named by TAG from the
-+# matching tagged config vars.
-+m4_defun([_LT_CONFIG],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+_LT_CONFIG_SAVE_COMMANDS([
-+ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-+ m4_if(_LT_TAG, [C], [
-+ # 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
-+
-+ cfgfile="${ofile}T"
-+ trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-+ $RM "$cfgfile"
-+
-+ cat <<_LT_EOF >> "$cfgfile"
-+#! $SHELL
-+
-+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+_LT_COPYING
-+_LT_LIBTOOL_TAGS
-+
-+# ### BEGIN LIBTOOL CONFIG
-+_LT_LIBTOOL_CONFIG_VARS
-+_LT_LIBTOOL_TAG_VARS
-+# ### END LIBTOOL CONFIG
-+
-+_LT_EOF
-+
-+ case $host_os in
-+ aix3*)
-+ cat <<\_LT_EOF >> "$cfgfile"
-+# AIX sometimes has problems with the GCC collect2 program. For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+ COLLECT_NAMES=
-+ export COLLECT_NAMES
-+fi
-+_LT_EOF
-+ ;;
-+ esac
-+
-+ _LT_PROG_LTMAIN
-+
-+ # We use sed instead of cat because bash on DJGPP gets confused if
-+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
-+ # text mode, it properly converts lines to CR/LF. This bash problem
-+ # is reportedly fixed, but why not run on old versions too?
-+ sed '$q' "$ltmain" >> "$cfgfile" \
-+ || (rm -f "$cfgfile"; exit 1)
-+
-+ _LT_PROG_REPLACE_SHELLFNS
-+
-+ mv -f "$cfgfile" "$ofile" ||
-+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-+ chmod +x "$ofile"
-+],
-+[cat <<_LT_EOF >> "$ofile"
-+
-+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-+dnl in a comment (ie after a #).
-+# ### BEGIN LIBTOOL TAG CONFIG: $1
-+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-+# ### END LIBTOOL TAG CONFIG: $1
-+_LT_EOF
-+])dnl /m4_if
-+],
-+[m4_if([$1], [], [
-+ PACKAGE='$PACKAGE'
-+ VERSION='$VERSION'
-+ TIMESTAMP='$TIMESTAMP'
-+ RM='$RM'
-+ ofile='$ofile'], [])
-+])dnl /_LT_CONFIG_SAVE_COMMANDS
-+])# _LT_CONFIG
-+
-+
-+# LT_SUPPORTED_TAG(TAG)
-+# ---------------------
-+# Trace this macro to discover what tags are supported by the libtool
-+# --tag option, using:
-+# autoconf --trace 'LT_SUPPORTED_TAG:$1'
-+AC_DEFUN([LT_SUPPORTED_TAG], [])
-+
-+
-+# C support is built-in for now
-+m4_define([_LT_LANG_C_enabled], [])
-+m4_define([_LT_TAGS], [])
-+
-+
-+# LT_LANG(LANG)
-+# -------------
-+# Enable libtool support for the given language if not already enabled.
-+AC_DEFUN([LT_LANG],
-+[AC_BEFORE([$0], [LT_OUTPUT])dnl
-+m4_case([$1],
-+ [C], [_LT_LANG(C)],
-+ [C++], [_LT_LANG(CXX)],
-+ [Go], [_LT_LANG(GO)],
-+ [Java], [_LT_LANG(GCJ)],
-+ [Fortran 77], [_LT_LANG(F77)],
-+ [Fortran], [_LT_LANG(FC)],
-+ [Windows Resource], [_LT_LANG(RC)],
-+ [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-+ [_LT_LANG($1)],
-+ [m4_fatal([$0: unsupported language: "$1"])])])dnl
-+])# LT_LANG
-+
-+
-+# _LT_LANG(LANGNAME)
-+# ------------------
-+m4_defun([_LT_LANG],
-+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-+ [LT_SUPPORTED_TAG([$1])dnl
-+ m4_append([_LT_TAGS], [$1 ])dnl
-+ m4_define([_LT_LANG_]$1[_enabled], [])dnl
-+ _LT_LANG_$1_CONFIG($1)])dnl
-+])# _LT_LANG
-+
-+
-+m4_ifndef([AC_PROG_GO], [
-+############################################################
-+# NOTE: This macro has been submitted for inclusion into #
-+# GNU Autoconf as AC_PROG_GO. When it is available in #
-+# a released version of Autoconf we should remove this #
-+# macro and use it instead. #
-+############################################################
-+m4_defun([AC_PROG_GO],
-+[AC_LANG_PUSH(Go)dnl
-+AC_ARG_VAR([GOC], [Go compiler command])dnl
-+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
-+_AC_ARG_VAR_LDFLAGS()dnl
-+AC_CHECK_TOOL(GOC, gccgo)
-+if test -z "$GOC"; then
-+ if test -n "$ac_tool_prefix"; then
-+ AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
-+ fi
-+fi
-+if test -z "$GOC"; then
-+ AC_CHECK_PROG(GOC, gccgo, gccgo, false)
-+fi
-+])#m4_defun
-+])#m4_ifndef
-+
-+
-+# _LT_LANG_DEFAULT_CONFIG
-+# -----------------------
-+m4_defun([_LT_LANG_DEFAULT_CONFIG],
-+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+ [LT_LANG(CXX)],
-+ [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-+
-+AC_PROVIDE_IFELSE([AC_PROG_F77],
-+ [LT_LANG(F77)],
-+ [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-+
-+AC_PROVIDE_IFELSE([AC_PROG_FC],
-+ [LT_LANG(FC)],
-+ [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-+
-+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-+dnl pulling things in needlessly.
-+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-+ [LT_LANG(GCJ)],
-+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-+ [LT_LANG(GCJ)],
-+ [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-+ [LT_LANG(GCJ)],
-+ [m4_ifdef([AC_PROG_GCJ],
-+ [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-+ m4_ifdef([A][M_PROG_GCJ],
-+ [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-+ m4_ifdef([LT_PROG_GCJ],
-+ [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-+
-+AC_PROVIDE_IFELSE([AC_PROG_GO],
-+ [LT_LANG(GO)],
-+ [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
-+
-+AC_PROVIDE_IFELSE([LT_PROG_RC],
-+ [LT_LANG(RC)],
-+ [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-+])# _LT_LANG_DEFAULT_CONFIG
-+
-+# Obsolete macros:
-+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
-+
-+
-+# _LT_TAG_COMPILER
-+# ----------------
-+m4_defun([_LT_TAG_COMPILER],
-+[AC_REQUIRE([AC_PROG_CC])dnl
-+
-+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-+
-+# 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_TAG_COMPILER
-+
-+
-+# _LT_COMPILER_BOILERPLATE
-+# ------------------------
-+# Check for compiler boilerplate output or warnings with
-+# the simple compiler test code.
-+m4_defun([_LT_COMPILER_BOILERPLATE],
-+[m4_require([_LT_DECL_SED])dnl
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$RM conftest*
-+])# _LT_COMPILER_BOILERPLATE
-+
-+
-+# _LT_LINKER_BOILERPLATE
-+# ----------------------
-+# Check for linker boilerplate output or warnings with
-+# the simple link test code.
-+m4_defun([_LT_LINKER_BOILERPLATE],
-+[m4_require([_LT_DECL_SED])dnl
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$RM -r conftest*
-+])# _LT_LINKER_BOILERPLATE
-+
-+# _LT_REQUIRED_DARWIN_CHECKS
-+# -------------------------
-+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-+ case $host_os in
-+ rhapsody* | darwin*)
-+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-+ AC_CHECK_TOOL([LIPO], [lipo], [:])
-+ AC_CHECK_TOOL([OTOOL], [otool], [:])
-+ AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-+ _LT_DECL([], [DSYMUTIL], [1],
-+ [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-+ _LT_DECL([], [NMEDIT], [1],
-+ [Tool to change global to local symbols on Mac OS X])
-+ _LT_DECL([], [LIPO], [1],
-+ [Tool to manipulate fat objects and archives on Mac OS X])
-+ _LT_DECL([], [OTOOL], [1],
-+ [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-+ _LT_DECL([], [OTOOL64], [1],
-+ [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-+
-+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-+ [lt_cv_apple_cc_single_mod=no
-+ if test -z "${LT_MULTI_MODULE}"; then
-+ # By default we will add the -single_module flag. You can override
-+ # by either setting the environment variable LT_MULTI_MODULE
-+ # non-empty at configure time, or by adding -multi_module to the
-+ # link flags.
-+ rm -rf libconftest.dylib*
-+ echo "int foo(void){return 1;}" > conftest.c
-+ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-+ _lt_result=$?
-+ # If there is a non-empty error log, and "single_module"
-+ # appears in it, assume the flag caused a linker warning
-+ if test -s conftest.err && $GREP single_module conftest.err; then
-+ cat conftest.err >&AS_MESSAGE_LOG_FD
-+ # Otherwise, if the output was created with a 0 exit code from
-+ # the compiler, it worked.
-+ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
-+ lt_cv_apple_cc_single_mod=yes
-+ else
-+ cat conftest.err >&AS_MESSAGE_LOG_FD
-+ fi
-+ rm -rf libconftest.dylib*
-+ rm -f conftest.*
-+ fi])
-+
-+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-+ [lt_cv_ld_exported_symbols_list],
-+ [lt_cv_ld_exported_symbols_list=no
-+ save_LDFLAGS=$LDFLAGS
-+ echo "_main" > conftest.sym
-+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-+ [lt_cv_ld_exported_symbols_list=yes],
-+ [lt_cv_ld_exported_symbols_list=no])
-+ LDFLAGS="$save_LDFLAGS"
-+ ])
-+
-+ AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
-+ [lt_cv_ld_force_load=no
-+ cat > conftest.c << _LT_EOF
-+int forced_loaded() { return 2;}
-+_LT_EOF
-+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
-+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-+ echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-+ $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
-+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
-+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
-+ cat > conftest.c << _LT_EOF
-+int main() { return 0;}
-+_LT_EOF
-+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
-+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-+ _lt_result=$?
-+ if test -s conftest.err && $GREP force_load conftest.err; then
-+ cat conftest.err >&AS_MESSAGE_LOG_FD
-+ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
-+ lt_cv_ld_force_load=yes
-+ else
-+ cat conftest.err >&AS_MESSAGE_LOG_FD
-+ fi
-+ rm -f conftest.err libconftest.a conftest conftest.c
-+ rm -rf conftest.dSYM
-+ ])
-+ case $host_os in
-+ rhapsody* | darwin1.[[012]])
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+ darwin1.*)
-+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+ darwin*) # darwin 5.x on
-+ # if running on 10.5 or later, the deployment target defaults
-+ # to the OS version, if on x86, and 10.4, the deployment
-+ # target defaults to 10.4. Don't you love it?
-+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+ 10.[[012]]*)
-+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+ 10.*)
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+ esac
-+ ;;
-+ esac
-+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-+ _lt_dar_single_mod='$single_module'
-+ fi
-+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-+ else
-+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ fi
-+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-+ _lt_dsymutil='~$DSYMUTIL $lib || :'
-+ else
-+ _lt_dsymutil=
-+ fi
-+ ;;
-+ esac
-+])
-+
-+
-+# _LT_DARWIN_LINKER_FEATURES([TAG])
-+# ---------------------------------
-+# Checks for linker and compiler features on darwin
-+m4_defun([_LT_DARWIN_LINKER_FEATURES],
-+[
-+ m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_TAGVAR(hardcode_direct, $1)=no
-+ _LT_TAGVAR(hardcode_automatic, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+ if test "$lt_cv_ld_force_load" = "yes"; then
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-+ m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
-+ [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
-+ else
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-+ fi
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-+ case $cc_basename in
-+ ifort*) _lt_dar_can_shared=yes ;;
-+ *) _lt_dar_can_shared=$GCC ;;
-+ esac
-+ if test "$_lt_dar_can_shared" = "yes"; then
-+ output_verbose_link_cmd=func_echo_all
-+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-+ m4_if([$1], [CXX],
-+[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-+ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-+ fi
-+],[])
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+])
-+
-+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
-+# ----------------------------------
-+# Links a minimal program and checks the executable
-+# for the system default hardcoded library path. In most cases,
-+# this is /usr/lib:/lib, but when the MPI compilers are used
-+# the location of the communication and MPI libs are included too.
-+# If we don't find anything, use the default library path according
-+# to the aix ld manual.
-+# Store the results from the different compilers for each TAGNAME.
-+# Allow to override them for all tags through lt_cv_aix_libpath.
-+m4_defun([_LT_SYS_MODULE_PATH_AIX],
-+[m4_require([_LT_DECL_SED])dnl
-+if test "${lt_cv_aix_libpath+set}" = set; then
-+ aix_libpath=$lt_cv_aix_libpath
-+else
-+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
-+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
-+ lt_aix_libpath_sed='[
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\([^ ]*\) *$/\1/
-+ p
-+ }
-+ }]'
-+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+ # Check for a 64-bit object if we didn't find anything.
-+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+ fi],[])
-+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
-+ fi
-+ ])
-+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
-+fi
-+])# _LT_SYS_MODULE_PATH_AIX
-+
-+
-+# _LT_SHELL_INIT(ARG)
-+# -------------------
-+m4_define([_LT_SHELL_INIT],
-+[m4_divert_text([M4SH-INIT], [$1
-+])])# _LT_SHELL_INIT
-+
-+
-+
-+# _LT_PROG_ECHO_BACKSLASH
-+# -----------------------
-+# Find how we can fake an echo command that does not interpret backslash.
-+# In particular, with Autoconf 2.60 or later we add some code to the start
-+# of the generated configure script which will find a shell with a builtin
-+# printf (which we can use as an echo command).
-+m4_defun([_LT_PROG_ECHO_BACKSLASH],
-+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-+
-+AC_MSG_CHECKING([how to print strings])
-+# Test print first, because it will be a builtin if present.
-+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-+ ECHO='print -r --'
-+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-+ ECHO='printf %s\n'
-+else
-+ # Use this function as a fallback that always works.
-+ func_fallback_echo ()
-+ {
-+ eval 'cat <<_LTECHO_EOF
-+$[]1
-+_LTECHO_EOF'
-+ }
-+ ECHO='func_fallback_echo'
-+fi
-+
-+# func_echo_all arg...
-+# Invoke $ECHO with all args, space-separated.
-+func_echo_all ()
-+{
-+ $ECHO "$*"
-+}
-+
-+case "$ECHO" in
-+ printf*) AC_MSG_RESULT([printf]) ;;
-+ print*) AC_MSG_RESULT([print -r]) ;;
-+ *) AC_MSG_RESULT([cat]) ;;
-+esac
-+
-+m4_ifdef([_AS_DETECT_SUGGESTED],
-+[_AS_DETECT_SUGGESTED([
-+ test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
-+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-+ PATH=/empty FPATH=/empty; export PATH FPATH
-+ test "X`printf %s $ECHO`" = "X$ECHO" \
-+ || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
-+
-+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
-+])# _LT_PROG_ECHO_BACKSLASH
-+
-+
-+# _LT_WITH_SYSROOT
-+# ----------------
-+AC_DEFUN([_LT_WITH_SYSROOT],
-+[AC_MSG_CHECKING([for sysroot])
-+AC_ARG_WITH([sysroot],
-+[ --with-sysroot[=DIR] Search for dependent libraries within DIR
-+ (or the compiler's sysroot if not specified).],
-+[], [with_sysroot=no])
-+
-+dnl lt_sysroot will always be passed unquoted. We quote it here
-+dnl in case the user passed a directory name.
-+lt_sysroot=
-+case ${with_sysroot} in #(
-+ yes)
-+ if test "$GCC" = yes; then
-+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-+ fi
-+ ;; #(
-+ /*)
-+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-+ ;; #(
-+ no|'')
-+ ;; #(
-+ *)
-+ AC_MSG_RESULT([${with_sysroot}])
-+ AC_MSG_ERROR([The sysroot must be an absolute path.])
-+ ;;
-+esac
-+
-+ AC_MSG_RESULT([${lt_sysroot:-no}])
-+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-+[dependent libraries, and in which our libraries should be installed.])])
-+
-+# _LT_ENABLE_LOCK
-+# ---------------
-+m4_defun([_LT_ENABLE_LOCK],
-+[AC_ARG_ENABLE([libtool-lock],
-+ [AS_HELP_STRING([--disable-libtool-lock],
-+ [avoid locking (might break parallel builds)])])
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+# Some flags need to be propagated to the compiler or linker for good
-+# libtool support.
-+case $host in
-+ia64-*-hpux*)
-+ # 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.$ac_objext` in
-+ *ELF-32*)
-+ HPUX_IA64_MODE="32"
-+ ;
-+ *ELF-64*)
-+ HPUX_IA64_MODE="64"
-+ ;
-+ esac
-+ fi
-+ rm -rf conftest*
-+ ;;
-+*-*-irix6*)
-+ # Find out which ABI we are using.
-+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
-+ if AC_TRY_EVAL(ac_compile); then
-+ if test "$lt_cv_prog_gnu_ld" = yes; then
-+ case `/usr/bin/file conftest.$ac_objext` in
-+ *32-bit*)
-+ LD="${LD-ld} -melf32bsmip"
-+ ;;
-+ *N32*)
-+ LD="${LD-ld} -melf32bmipn32"
-+ ;;
-+ *64-bit*)
-+ LD="${LD-ld} -melf64bmip"
-+ ;
-+ esac
-+ else
-+ case `/usr/bin/file conftest.$ac_objext` in
-+ *32-bit*)
-+ LD="${LD-ld} -32"
-+ ;;
-+ *N32*)
-+ LD="${LD-ld} -n32"
-+ ;;
-+ *64-bit*)
-+ LD="${LD-ld} -64"
-+ ;;
-+ esac
-+ fi
-+ fi
-+ rm -rf conftest*
-+ ;;
-+
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-+ # Find out which ABI we are using.
-+ echo 'int i;' > conftest.$ac_ext
-+ if AC_TRY_EVAL(ac_compile); then
-+ case `/usr/bin/file conftest.o` in
-+ *32-bit*)
-+ case $host in
-+ x86_64-*kfreebsd*-gnu)
-+ LD="${LD-ld} -m elf_i386_fbsd"
-+ ;;
-+ x86_64-*linux*)
-+ LD="${LD-ld} -m elf_i386"
-+ ;;
-+ ppc64-*linux*|powerpc64-*linux*)
-+ LD="${LD-ld} -m elf32ppclinux"
-+ ;;
-+ s390x-*linux*)
-+ LD="${LD-ld} -m elf_s390"
-+ ;;
-+ sparc64-*linux*)
-+ LD="${LD-ld} -m elf32_sparc"
-+ ;;
-+ esac
-+ ;
-+ *64-bit*)
-+ case $host in
-+ x86_64-*kfreebsd*-gnu)
-+ LD="${LD-ld} -m elf_x86_64_fbsd"
-+ ;;
-+ x86_64-*linux*)
-+ LD="${LD-ld} -m elf_x86_64"
-+ ;;
-+ ppc*-*linux*|powerpc*-*linux*)
-+ LD="${LD-ld} -m elf64ppc"
-+ ;;
-+ s390*-*linux*|s390*-*tpf*)
-+ LD="${LD-ld} -m elf64_s390"
-+ ;;
-+ sparc*-*linux*)
-+ LD="${LD-ld} -m elf64_sparc"
-+ ;;
-+ esac
-+ ;
-+ esac
-+ fi
-+ rm -rf conftest*
-+ ;;
-+
-+*-*-sco3.2v5*)
-+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+ SAVE_CFLAGS="$CFLAGS"
-+ CFLAGS="$CFLAGS -belf"
-+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-+ [AC_LANG_PUSH(C)
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-+ AC_LANG_POP])
-+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+ CFLAGS="$SAVE_CFLAGS"
-+ fi
-+ ;;
-+*-*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*)
-+ case $host in
-+ i?86-*-solaris*)
-+ LD="${LD-ld} -m elf_x86_64"
-+ ;;
-+ sparc*-*-solaris*)
-+ LD="${LD-ld} -m elf64_sparc"
-+ ;;
-+ esac
-+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
-+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-+ LD="${LD-ld}_sol2"
-+ fi
-+ ;;
-+ *)
-+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-+ LD="${LD-ld} -64"
-+ fi
-+ ;
-+ esac
-+ ;;
-+ esac
-+ fi
-+ rm -rf conftest*
-+ ;;
-+esac
-+
-+need_locks="$enable_libtool_lock"
-+])# _LT_ENABLE_LOCK
-+
-+
-+# _LT_PROG_AR
-+# -----------
-+m4_defun([_LT_PROG_AR],
-+[AC_CHECK_TOOLS(AR, [ar], false)
-+: ${AR=ar}
-+: ${AR_FLAGS=cru}
-+_LT_DECL([], [AR], [1], [The archiver])
-+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
-+
-+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
-+ [lt_cv_ar_at_file=no
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
-+ [echo conftest.$ac_objext > conftest.lst
-+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
-+ AC_TRY_EVAL([lt_ar_try])
-+ if test "$ac_status" -eq 0; then
-+ # Ensure the archiver fails upon bogus file names.
-+ rm -f conftest.$ac_objext libconftest.a
-+ AC_TRY_EVAL([lt_ar_try])
-+ if test "$ac_status" -ne 0; then
-+ lt_cv_ar_at_file=@
-+ fi
-+ fi
-+ rm -f conftest.* libconftest.a
-+ ])
-+ ])
-+
-+if test "x$lt_cv_ar_at_file" = xno; then
-+ archiver_list_spec=
-+else
-+ archiver_list_spec=$lt_cv_ar_at_file
-+fi
-+_LT_DECL([], [archiver_list_spec], [1],
-+ [How to feed a file listing to the archiver])
-+])# _LT_PROG_AR
-+
-+
-+# _LT_CMD_OLD_ARCHIVE
-+# -------------------
-+m4_defun([_LT_CMD_OLD_ARCHIVE],
-+[_LT_PROG_AR
-+
-+AC_CHECK_TOOL(STRIP, strip, :)
-+test -z "$STRIP" && STRIP=:
-+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-+
-+AC_CHECK_TOOL(RANLIB, ranlib, :)
-+test -z "$RANLIB" && RANLIB=:
-+_LT_DECL([], [RANLIB], [1],
-+ [Commands used to install an old-style archive])
-+
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
-+
-+if test -n "$RANLIB"; then
-+ case $host_os in
-+ openbsd*)
-+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-+ ;;
-+ *)
-+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-+ ;;
-+ esac
-+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-+fi
-+
-+case $host_os in
-+ darwin*)
-+ lock_old_archive_extraction=yes ;;
-+ *)
-+ lock_old_archive_extraction=no ;;
-+esac
-+_LT_DECL([], [old_postinstall_cmds], [2])
-+_LT_DECL([], [old_postuninstall_cmds], [2])
-+_LT_TAGDECL([], [old_archive_cmds], [2],
-+ [Commands used to build an old-style archive])
-+_LT_DECL([], [lock_old_archive_extraction], [0],
-+ [Whether to use a lock for old archive extraction])
-+])# _LT_CMD_OLD_ARCHIVE
-+
-+
-+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-+# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-+# ----------------------------------------------------------------
-+# Check whether the given compiler option works
-+AC_DEFUN([_LT_COMPILER_OPTION],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_SED])dnl
-+AC_CACHE_CHECK([$1], [$2],
-+ [$2=no
-+ m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ lt_compiler_flag="$3"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # 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}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&AS_MESSAGE_LOG_FD
-+ echo "$as_me:$LINENO: \$? = $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 other than the usual output.
-+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/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
-+ $RM conftest*
-+])
-+
-+if test x"[$]$2" = xyes; then
-+ m4_if([$5], , :, [$5])
-+else
-+ m4_if([$6], , :, [$6])
-+fi
-+])# _LT_COMPILER_OPTION
-+
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-+
-+
-+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-+# [ACTION-SUCCESS], [ACTION-FAILURE])
-+# ----------------------------------------------------
-+# Check whether the given linker option works
-+AC_DEFUN([_LT_LINKER_OPTION],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_SED])dnl
-+AC_CACHE_CHECK([$1], [$2],
-+ [$2=no
-+ save_LDFLAGS="$LDFLAGS"
-+ LDFLAGS="$LDFLAGS $3"
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
-+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+ # The linker can only warn and ignore the option if not recognized
-+ # So say no if there are warnings
-+ if test -s conftest.err; then
-+ # Append any errors to the config.log.
-+ cat conftest.err 1>&AS_MESSAGE_LOG_FD
-+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/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
-+ fi
-+ $RM -r conftest*
-+ LDFLAGS="$save_LDFLAGS"
-+])
-+
-+if test x"[$]$2" = xyes; then
-+ m4_if([$4], , :, [$4])
-+else
-+ m4_if([$5], , :, [$5])
-+fi
-+])# _LT_LINKER_OPTION
-+
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-+
-+
-+# LT_CMD_MAX_LEN
-+#---------------
-+AC_DEFUN([LT_CMD_MAX_LEN],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+# find the maximum length of command line arguments
-+AC_MSG_CHECKING([the maximum length of command line arguments])
-+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-+ i=0
-+ teststring="ABCD"
-+
-+ case $build_os in
-+ msdosdjgpp*)
-+ # On DJGPP, this test can blow up pretty badly due to problems in libc
-+ # (any single argument exceeding 2000 bytes causes a buffer overrun
-+ # during glob expansion). Even if it were fixed, the result of this
-+ # check would be larger than it should be.
-+ lt_cv_sys_max_cmd_len=12288; # 12K is about right
-+ ;;
-+
-+ gnu*)
-+ # Under GNU Hurd, this test is not required because there is
-+ # no limit to the length of command line arguments.
-+ # Libtool will interpret -1 as no limit whatsoever
-+ lt_cv_sys_max_cmd_len=-1;
-+ ;;
-+
-+ cygwin* | mingw* | cegcc*)
-+ # On Win9x/ME, this test blows up -- it succeeds, but takes
-+ # about 5 minutes as the teststring grows exponentially.
-+ # Worse, since 9x/ME are not pre-emptively multitasking,
-+ # you end up with a "frozen" computer, even though with patience
-+ # the test eventually succeeds (with a max line length of 256k).
-+ # Instead, let's just punt: use the minimum linelength reported by
-+ # all of the supported platforms: 8192 (on NT/2K/XP).
-+ lt_cv_sys_max_cmd_len=8192;
-+ ;;
-+
-+ mint*)
-+ # On MiNT this can take a long time and run out of memory.
-+ 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
-+ ;;
-+
-+ os2*)
-+ # The test takes a long time on OS/2.
-+ lt_cv_sys_max_cmd_len=8192
-+ ;;
-+
-+ 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
-+ ;;
-+ *)
-+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-+ if test -n "$lt_cv_sys_max_cmd_len"; then
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+ else
-+ # Make teststring a little bigger before we do anything with it.
-+ # a 1K string should be a reasonable start.
-+ for i in 1 2 3 4 5 6 7 8 ; do
-+ teststring=$teststring$teststring
-+ done
-+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+ # 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"`env echo "$teststring$teststring" 2>/dev/null` \
-+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-+ test $i != 17 # 1/2 MB should be enough
-+ do
-+ i=`expr $i + 1`
-+ teststring=$teststring$teststring
-+ done
-+ # Only check the string length outside the loop.
-+ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-+ teststring=
-+ # Add a significant safety factor because C++ compilers can tack on
-+ # massive amounts of additional arguments before passing them to the
-+ # linker. It appears as though 1/2 is a usable value.
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ fi
-+ ;;
-+ esac
-+])
-+if test -n $lt_cv_sys_max_cmd_len ; then
-+ AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-+else
-+ AC_MSG_RESULT(none)
-+fi
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+_LT_DECL([], [max_cmd_len], [0],
-+ [What is the maximum length of a command?])
-+])# LT_CMD_MAX_LEN
-+
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-+
-+
-+# _LT_HEADER_DLFCN
-+# ----------------
-+m4_defun([_LT_HEADER_DLFCN],
-+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-+])# _LT_HEADER_DLFCN
-+
-+
-+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-+# ----------------------------------------------------------------
-+m4_defun([_LT_TRY_DLOPEN_SELF],
-+[m4_require([_LT_HEADER_DLFCN])dnl
-+if test "$cross_compiling" = yes; then :
-+ [$4]
-+else
-+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+ lt_status=$lt_dlunknown
-+ cat > conftest.$ac_ext <<_LT_EOF
-+[#line $LINENO "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+# define LT_DLGLOBAL RTLD_GLOBAL
-+#else
-+# ifdef DL_GLOBAL
-+# define LT_DLGLOBAL DL_GLOBAL
-+# else
-+# define LT_DLGLOBAL 0
-+# endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+ find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+# ifdef RTLD_LAZY
-+# define LT_DLLAZY_OR_NOW RTLD_LAZY
-+# else
-+# ifdef DL_LAZY
-+# define LT_DLLAZY_OR_NOW DL_LAZY
-+# else
-+# ifdef RTLD_NOW
-+# define LT_DLLAZY_OR_NOW RTLD_NOW
-+# else
-+# ifdef DL_NOW
-+# define LT_DLLAZY_OR_NOW DL_NOW
-+# else
-+# define LT_DLLAZY_OR_NOW 0
-+# endif
-+# endif
-+# endif
-+# endif
-+#endif
-+
-+/* When -fvisbility=hidden is used, assume the code has been annotated
-+ correspondingly for the symbols needed. */
-+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-+int fnord () __attribute__((visibility("default")));
-+#endif
-+
-+int fnord () { return 42; }
-+int main ()
-+{
-+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+ int status = $lt_dlunknown;
-+
-+ if (self)
-+ {
-+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-+ else
-+ {
-+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+ else puts (dlerror ());
-+ }
-+ /* dlclose (self); */
-+ }
-+ else
-+ puts (dlerror ());
-+
-+ return status;
-+}]
-+_LT_EOF
-+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-+ (./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_dlunknown|x*) $3 ;;
-+ esac
-+ else :
-+ # compilation failed
-+ $3
-+ fi
-+fi
-+rm -fr conftest*
-+])# _LT_TRY_DLOPEN_SELF
-+
-+
-+# LT_SYS_DLOPEN_SELF
-+# ------------------
-+AC_DEFUN([LT_SYS_DLOPEN_SELF],
-+[m4_require([_LT_HEADER_DLFCN])dnl
-+if test "x$enable_dlopen" != xyes; then
-+ enable_dlopen=unknown
-+ enable_dlopen_self=unknown
-+ enable_dlopen_self_static=unknown
-+else
-+ lt_cv_dlopen=no
-+ lt_cv_dlopen_libs=
-+
-+ case $host_os in
-+ beos*)
-+ lt_cv_dlopen="load_add_on"
-+ lt_cv_dlopen_libs=
-+ lt_cv_dlopen_self=yes
-+ ;;
-+
-+ mingw* | pw32* | cegcc*)
-+ lt_cv_dlopen="LoadLibrary"
-+ lt_cv_dlopen_libs=
-+ ;;
-+
-+ cygwin*)
-+ lt_cv_dlopen="dlopen"
-+ lt_cv_dlopen_libs=
-+ ;;
-+
-+ darwin*)
-+ # if libdl is installed we need to link against it
-+ AC_CHECK_LIB([dl], [dlopen],
-+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-+ lt_cv_dlopen="dyld"
-+ lt_cv_dlopen_libs=
-+ lt_cv_dlopen_self=yes
-+ ])
-+ ;;
-+
-+ *)
-+ AC_CHECK_FUNC([shl_load],
-+ [lt_cv_dlopen="shl_load"],
-+ [AC_CHECK_LIB([dld], [shl_load],
-+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-+ [AC_CHECK_FUNC([dlopen],
-+ [lt_cv_dlopen="dlopen"],
-+ [AC_CHECK_LIB([dl], [dlopen],
-+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-+ [AC_CHECK_LIB([svld], [dlopen],
-+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-+ [AC_CHECK_LIB([dld], [dld_link],
-+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-+ ])
-+ ])
-+ ])
-+ ])
-+ ])
-+ ;;
-+ esac
-+
-+ if test "x$lt_cv_dlopen" != xno; then
-+ enable_dlopen=yes
-+ else
-+ enable_dlopen=no
-+ fi
-+
-+ case $lt_cv_dlopen in
-+ dlopen)
-+ save_CPPFLAGS="$CPPFLAGS"
-+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+
-+ save_LDFLAGS="$LDFLAGS"
-+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+
-+ save_LIBS="$LIBS"
-+ LIBS="$lt_cv_dlopen_libs $LIBS"
-+
-+ AC_CACHE_CHECK([whether a program can dlopen itself],
-+ lt_cv_dlopen_self, [dnl
-+ _LT_TRY_DLOPEN_SELF(
-+ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-+ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-+ ])
-+
-+ if test "x$lt_cv_dlopen_self" = xyes; then
-+ 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_TRY_DLOPEN_SELF(
-+ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-+ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
-+ ])
-+ fi
-+
-+ CPPFLAGS="$save_CPPFLAGS"
-+ LDFLAGS="$save_LDFLAGS"
-+ LIBS="$save_LIBS"
-+ ;;
-+ esac
-+
-+ case $lt_cv_dlopen_self in
-+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+ *) enable_dlopen_self=unknown ;;
-+ esac
-+
-+ case $lt_cv_dlopen_self_static in
-+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+ *) enable_dlopen_self_static=unknown ;;
-+ esac
-+fi
-+_LT_DECL([dlopen_support], [enable_dlopen], [0],
-+ [Whether dlopen is supported])
-+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-+ [Whether dlopen of programs is supported])
-+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-+ [Whether dlopen of statically linked programs is supported])
-+])# LT_SYS_DLOPEN_SELF
-+
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-+
-+
-+# _LT_COMPILER_C_O([TAGNAME])
-+# ---------------------------
-+# Check to see if options -c and -o are simultaneously supported by compiler.
-+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-+m4_defun([_LT_COMPILER_C_O],
-+[m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_TAG_COMPILER])dnl
-+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-+ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-+ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-+ $RM -r conftest 2>/dev/null
-+ mkdir conftest
-+ cd conftest
-+ mkdir out
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+ lt_compiler_flag="-o out/conftest2.$ac_objext"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (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}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&AS_MESSAGE_LOG_FD
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+ then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings
-+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/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_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+ fi
-+ fi
-+ 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 ..
-+ $RM -r conftest
-+ $RM conftest*
-+])
-+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-+ [Does compiler simultaneously support -c and -o options?])
-+])# _LT_COMPILER_C_O
-+
-+
-+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-+# ----------------------------------
-+# Check to see if we can do hard links to lock some files if needed
-+m4_defun([_LT_COMPILER_FILE_LOCKS],
-+[m4_require([_LT_ENABLE_LOCK])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+_LT_COMPILER_C_O([$1])
-+
-+hard_links="nottested"
-+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-+ # do not overwrite the value of need_locks provided by the user
-+ AC_MSG_CHECKING([if we can lock with hard links])
-+ hard_links=yes
-+ $RM conftest*
-+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+ touch conftest.a
-+ ln conftest.a conftest.b 2>&5 || hard_links=no
-+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+ AC_MSG_RESULT([$hard_links])
-+ if test "$hard_links" = no; then
-+ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-+ need_locks=warn
-+ fi
-+else
-+ need_locks=no
-+fi
-+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-+])# _LT_COMPILER_FILE_LOCKS
-+
-+
-+# _LT_CHECK_OBJDIR
-+# ----------------
-+m4_defun([_LT_CHECK_OBJDIR],
-+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-+[rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+ lt_cv_objdir=.libs
-+else
-+ # MS-DOS does not allow filenames that begin with a dot.
-+ lt_cv_objdir=_libs
-+fi
-+rmdir .libs 2>/dev/null])
-+objdir=$lt_cv_objdir
-+_LT_DECL([], [objdir], [0],
-+ [The name of the directory that contains temporary libtool files])dnl
-+m4_pattern_allow([LT_OBJDIR])dnl
-+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-+ [Define to the sub-directory in which libtool stores uninstalled libraries.])
-+])# _LT_CHECK_OBJDIR
-+
-+
-+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-+# --------------------------------------
-+# Check hardcoding attributes.
-+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-+[AC_MSG_CHECKING([how to hardcode library paths into programs])
-+_LT_TAGVAR(hardcode_action, $1)=
-+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-+ test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-+ test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-+
-+ # We can hardcode non-existent directories.
-+ if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
-+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+ # have to relink, otherwise we might link with an installed library
-+ # when we should be linking with a yet-to-be-installed one
-+ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-+ test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-+ # Linking always hardcodes the temporary library directory.
-+ _LT_TAGVAR(hardcode_action, $1)=relink
-+ else
-+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+ _LT_TAGVAR(hardcode_action, $1)=immediate
-+ fi
-+else
-+ # We cannot hardcode anything, or else we can only hardcode existing
-+ # directories.
-+ _LT_TAGVAR(hardcode_action, $1)=unsupported
-+fi
-+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-+
-+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-+ test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
-+ # Fast installation is not supported
-+ enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+ test "$enable_shared" = no; then
-+ # Fast installation is not necessary
-+ enable_fast_install=needless
-+fi
-+_LT_TAGDECL([], [hardcode_action], [0],
-+ [How to hardcode a shared library path into an executable])
-+])# _LT_LINKER_HARDCODE_LIBPATH
-+
-+
-+# _LT_CMD_STRIPLIB
-+# ----------------
-+m4_defun([_LT_CMD_STRIPLIB],
-+[m4_require([_LT_DECL_EGREP])
-+striplib=
-+old_striplib=
-+AC_MSG_CHECKING([whether stripping libraries is possible])
-+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+ AC_MSG_RESULT([yes])
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-+ case $host_os in
-+ darwin*)
-+ if test -n "$STRIP" ; then
-+ striplib="$STRIP -x"
-+ old_striplib="$STRIP -S"
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_RESULT([no])
-+ fi
-+ ;;
-+ *)
-+ AC_MSG_RESULT([no])
-+ ;;
-+ esac
-+fi
-+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-+_LT_DECL([], [striplib], [1])
-+])# _LT_CMD_STRIPLIB
-+
-+
-+# _LT_SYS_DYNAMIC_LINKER([TAG])
-+# -----------------------------
-+# PORTME Fill in your ld.so characteristics
-+m4_defun([_LT_SYS_DYNAMIC_LINKER],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_OBJDUMP])dnl
-+m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-+AC_MSG_CHECKING([dynamic linker characteristics])
-+m4_if([$1],
-+ [], [
-+if test "$GCC" = yes; then
-+ case $host_os in
-+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-+ *) lt_awk_arg="/^libraries:/" ;;
-+ esac
-+ case $host_os in
-+ mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
-+ *) lt_sed_strip_eq="s,=/,/,g" ;;
-+ esac
-+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-+ case $lt_search_path_spec in
-+ *\;*)
-+ # 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.
-+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-+ ;;
-+ *)
-+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-+ ;;
-+ esac
-+ # Ok, now we have the path, separated by spaces, we can step through it
-+ # and add multilib dir if necessary.
-+ lt_tmp_lt_search_path_spec=
-+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-+ for lt_sys_path in $lt_search_path_spec; do
-+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-+ else
-+ test -d "$lt_sys_path" && \
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-+ fi
-+ done
-+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-+BEGIN {RS=" "; FS="/|\n";} {
-+ lt_foo="";
-+ lt_count=0;
-+ for (lt_i = NF; lt_i > 0; lt_i--) {
-+ if ($lt_i != "" && $lt_i != ".") {
-+ if ($lt_i == "..") {
-+ lt_count++;
-+ } else {
-+ if (lt_count == 0) {
-+ lt_foo="/" $lt_i lt_foo;
-+ } else {
-+ lt_count--;
-+ }
-+ }
-+ }
-+ }
-+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-+}'`
-+ # AWK program above erroneously prepends '/' to C:/dos/paths
-+ # for these hosts.
-+ case $host_os in
-+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-+ $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
-+ esac
-+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-+else
-+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi])
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-+
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-+
-+case $host_os in
-+aix3*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+ shlibpath_var=LIBPATH
-+
-+ # AIX 3 has no versioning support, so we append a major version to the name.
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-+
-+aix[[4-9]]*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ need_lib_prefix=no
-+ need_version=no
-+ hardcode_into_libs=yes
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 supports IA64
-+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ else
-+ # With GCC up to 2.95.x, collect2 would create an import file
-+ # for dependence libraries. The import file would start with
-+ # the line `#! .'. This would cause the generated library to
-+ # depend on `.', always an invalid library. This was fixed in
-+ # development snapshots of GCC prior to 3.0.
-+ case $host_os in
-+ aix4 | aix4.[[01]] | aix4.[[01]].*)
-+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+ echo ' yes '
-+ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-+ :
-+ else
-+ can_build_shared=no
-+ fi
-+ ;;
-+ esac
-+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+ # soname into executable. Probably we can add versioning support to
-+ # collect2, so additional links can be useful in future.
-+ if test "$aix_use_runtimelinking" = yes; then
-+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+ # instead of lib<name>.a to let people know that these are not
-+ # typical AIX shared libraries.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ else
-+ # We preserve .a as extension for shared libraries through AIX4.2
-+ # and later when we are not doing run time linking.
-+ library_names_spec='${libname}${release}.a $libname.a'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ fi
-+ shlibpath_var=LIBPATH
-+ fi
-+ ;;
-+
-+amigaos*)
-+ case $host_cpu in
-+ powerpc)
-+ # Since July 2007 AmigaOS4 officially supports .so libraries.
-+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ ;;
-+ m68k)
-+ 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=`func_echo_all "$lib" | $SED '\''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'
-+ ;;
-+ esac
-+ ;;
-+
-+beos*)
-+ library_names_spec='${libname}${shared_ext}'
-+ dynamic_linker="$host_os ld.so"
-+ shlibpath_var=LIBRARY_PATH
-+ ;;
-+
-+bsdi[[45]]*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ 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 $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+ # the default ld.so.conf also contains /usr/contrib/lib and
-+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+ # libtool to hard-code these into programs
-+ ;;
-+
-+cygwin* | mingw* | pw32* | cegcc*)
-+ version_type=windows
-+ shrext_cmds=".dll"
-+ need_version=no
-+ need_lib_prefix=no
-+
-+ case $GCC,$cc_basename in
-+ yes,*)
-+ # gcc
-+ library_names_spec='$libname.dll.a'
-+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+ postinstall_cmds='base_file=`basename \${file}`~
-+ 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~
-+ chmod a+x \$dldir/$dlname~
-+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-+ fi'
-+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+ dlpath=$dir/\$dldll~
-+ $RM \$dlpath'
-+ shlibpath_overrides_runpath=yes
-+
-+ case $host_os in
-+ cygwin*)
-+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+m4_if([$1], [],[
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
-+ ;;
-+ mingw* | cegcc*)
-+ # MinGW DLLs use traditional 'lib' prefix
-+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+ ;;
-+ 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}'
-+ ;;
-+ esac
-+ dynamic_linker='Win32 ld.exe'
-+ ;;
-+
-+ *,cl*)
-+ # Native MSVC
-+ libname_spec='$name'
-+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+ library_names_spec='${libname}.dll.lib'
-+
-+ case $build_os in
-+ mingw*)
-+ sys_lib_search_path_spec=
-+ lt_save_ifs=$IFS
-+ IFS=';'
-+ for lt_path in $LIB
-+ do
-+ IFS=$lt_save_ifs
-+ # Let DOS variable expansion print the short 8.3 style file name.
-+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-+ done
-+ IFS=$lt_save_ifs
-+ # Convert to MSYS style.
-+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
-+ ;;
-+ cygwin*)
-+ # Convert to unix form, then to dos form, then back to unix form
-+ # but this time dos style (no spaces!) so that the unix form looks
-+ # like /cygdrive/c/PROGRA~1:/cygdr...
-+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ ;;
-+ *)
-+ sys_lib_search_path_spec="$LIB"
-+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-+ # It is most probably a Windows format PATH.
-+ 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
-+ # FIXME: find the short name or the path components, as spaces are
-+ # common. (e.g. "Program Files" -> "PROGRA~1")
-+ ;;
-+ esac
-+
-+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+ postinstall_cmds='base_file=`basename \${file}`~
-+ 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'
-+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+ dlpath=$dir/\$dldll~
-+ $RM \$dlpath'
-+ shlibpath_overrides_runpath=yes
-+ dynamic_linker='Win32 link.exe'
-+ ;;
-+
-+ *)
-+ # Assume MSVC wrapper
-+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+ dynamic_linker='Win32 ld.exe'
-+ ;;
-+ esac
-+ # FIXME: first we should search . and the directory the executable is in
-+ shlibpath_var=PATH
-+ ;;
-+
-+darwin* | rhapsody*)
-+ dynamic_linker="$host_os dyld"
-+ version_type=darwin
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+ soname_spec='${libname}${release}${major}$shared_ext'
-+ shlibpath_overrides_runpath=yes
-+ shlibpath_var=DYLD_LIBRARY_PATH
-+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+m4_if([$1], [],[
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+ ;;
-+
-+dgux*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ 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
-+ ;;
-+
-+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[[23]].*) objformat=aout ;;
-+ *) objformat=elf ;;
-+ esac
-+ fi
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ need_version=no
-+ need_lib_prefix=no
-+ ;;
-+ freebsd-*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+ need_version=yes
-+ ;;
-+ esac
-+ shlibpath_var=LD_LIBRARY_PATH
-+ case $host_os in
-+ freebsd2.*)
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+ freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+ 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
-+ ;;
-+ *) # from 4.6 on, and DragonFly
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+ esac
-+ ;;
-+
-+gnu*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ 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
-+ ;;
-+
-+haiku*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ need_lib_prefix=no
-+ need_version=no
-+ dynamic_linker="$host_os runtime_loader"
-+ 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=LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-+ hardcode_into_libs=yes
-+ ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+ # Give a soname corresponding to the major version so that dld.sl refuses to
-+ # link against other versions.
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ case $host_cpu in
-+ ia64*)
-+ shrext_cmds='.so'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.so"
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ if test "X$HPUX_IA64_MODE" = X32; then
-+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+ else
-+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+ fi
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ hppa*64*)
-+ shrext_cmds='.sl'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ *)
-+ shrext_cmds='.sl'
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=SHLIB_PATH
-+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-+ esac
-+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-+ postinstall_cmds='chmod 555 $lib'
-+ # or fails outright, so override atomically:
-+ install_override_mode=555
-+ ;;
-+
-+interix[[3-9]]*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ 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 ;;
-+ *)
-+ if test "$lt_cv_prog_gnu_ld" = yes; then
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ else
-+ version_type=irix
-+ fi ;;
-+ esac
-+ need_lib_prefix=no
-+ need_version=no
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ case $host_os in
-+ irix5* | nonstopux*)
-+ libsuff= shlibsuff=
-+ ;;
-+ *)
-+ case $LD in # libtool.m4 will add one of these switches to LD
-+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+ libsuff= shlibsuff= libmagic=32-bit;;
-+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+ libsuff=32 shlibsuff=N32 libmagic=N32;;
-+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+ *) libsuff= shlibsuff= libmagic=never-match;;
-+ esac
-+ ;;
-+ esac
-+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+ hardcode_into_libs=yes
-+ ;;
-+
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+ dynamic_linker=no
-+ ;;
-+
-+# This must be glibc/ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ 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'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+
-+ # Some binutils ld are patched to set DT_RUNPATH
-+ AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
-+ [lt_cv_shlibpath_overrides_runpath=no
-+ save_LDFLAGS=$LDFLAGS
-+ save_libdir=$libdir
-+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-+ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-+ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-+ [lt_cv_shlibpath_overrides_runpath=yes])])
-+ LDFLAGS=$save_LDFLAGS
-+ libdir=$save_libdir
-+ ])
-+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-+
-+ # 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>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;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,
-+ # most powerpc-linux boxes support dynamic linking these days and
-+ # people can always --disable-shared, the test was removed, and we
-+ # assume the GNU/Linux dynamic linker is in use.
-+ dynamic_linker='GNU/Linux ld.so'
-+ ;;
-+
-+netbsd*)
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ 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}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='NetBSD ld.elf_so'
-+ fi
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+
-+newsos6)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+
-+*nto* | *qnx*)
-+ version_type=qnx
-+ 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='ldqnx.so'
-+ ;;
-+
-+openbsd*)
-+ version_type=sunos
-+ sys_lib_dlsearch_path_spec="/usr/lib"
-+ need_lib_prefix=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
-+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ case $host_os in
-+ openbsd2.[[89]] | openbsd2.[[89]].*)
-+ shlibpath_overrides_runpath=no
-+ ;
-+ *)
-+ shlibpath_overrides_runpath=yes
-+ ;
-+ esac
-+ else
-+ shlibpath_overrides_runpath=yes
-+ fi
-+ ;;
-+
-+os2*)
-+ libname_spec='$name'
-+ shrext_cmds=".dll"
-+ need_lib_prefix=no
-+ library_names_spec='$libname${shared_ext} $libname.a'
-+ dynamic_linker='OS/2 ld.exe'
-+ shlibpath_var=LIBPATH
-+ ;;
-+
-+osf3* | osf4* | osf5*)
-+ version_type=osf
-+ need_lib_prefix=no
-+ need_version=no
-+ 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
-+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+ ;;
-+
-+rdos*)
-+ dynamic_linker=no
-+ ;;
-+
-+solaris*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ 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=yes
-+ hardcode_into_libs=yes
-+ # ldd complains unless libraries are executable
-+ postinstall_cmds='chmod +x $lib'
-+ ;;
-+
-+sunos4*)
-+ version_type=sunos
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ if test "$with_gnu_ld" = yes; then
-+ need_lib_prefix=no
-+ fi
-+ need_version=yes
-+ ;;
-+
-+sysv4 | sysv4.3*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ 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
-+ case $host_vendor in
-+ sni)
-+ shlibpath_overrides_runpath=no
-+ need_lib_prefix=no
-+ runpath_var=LD_RUN_PATH
-+ ;;
-+ siemens)
-+ need_lib_prefix=no
-+ ;;
-+ motorola)
-+ need_lib_prefix=no
-+ need_version=no
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+ ;;
-+ esac
-+ ;;
-+
-+sysv4*MP*)
-+ if test -d /usr/nec ;then
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+ soname_spec='$libname${shared_ext}.$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ 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
-+ shlibpath_overrides_runpath=yes
-+ 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'
-+ else
-+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+ 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'
-+ ;;
-+
-+tpf*)
-+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-+
-+uts4*)
-+ version_type=linux # correct to gnu/linux during the next big refactor
-+ 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
-+ ;;
-+
-+*)
-+ dynamic_linker=no
-+ ;;
-+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
-+
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+fi
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+fi
-+
-+_LT_DECL([], [variables_saved_for_relink], [1],
-+ [Variables whose values should be saved in libtool wrapper scripts and
-+ restored at link time])
-+_LT_DECL([], [need_lib_prefix], [0],
-+ [Do we need the "lib" prefix for modules?])
-+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-+_LT_DECL([], [version_type], [0], [Library versioning type])
-+_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable])
-+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-+_LT_DECL([], [shlibpath_overrides_runpath], [0],
-+ [Is shlibpath searched before the hard-coded library search path?])
-+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-+_LT_DECL([], [library_names_spec], [1],
-+ [[List of archive names. First name is the real one, the rest are links.
-+ The last name is the one that the linker finds with -lNAME]])
-+_LT_DECL([], [soname_spec], [1],
-+ [[The coded name of the library, if different from the real name]])
-+_LT_DECL([], [install_override_mode], [1],
-+ [Permission mode override for installation of shared libraries])
-+_LT_DECL([], [postinstall_cmds], [2],
-+ [Command to use after installation of a shared archive])
-+_LT_DECL([], [postuninstall_cmds], [2],
-+ [Command to use after uninstallation of a shared archive])
-+_LT_DECL([], [finish_cmds], [2],
-+ [Commands used to finish a libtool library installation in a directory])
-+_LT_DECL([], [finish_eval], [1],
-+ [[As "finish_cmds", except a single script fragment to be evaled but
-+ not shown]])
-+_LT_DECL([], [hardcode_into_libs], [0],
-+ [Whether we should hardcode library paths into libraries])
-+_LT_DECL([], [sys_lib_search_path_spec], [2],
-+ [Compile-time system search path for libraries])
-+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-+ [Run-time system search path for libraries])
-+])# _LT_SYS_DYNAMIC_LINKER
-+
-+
-+# _LT_PATH_TOOL_PREFIX(TOOL)
-+# --------------------------
-+# find a file program which can recognize shared library
-+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-+[m4_require([_LT_DECL_EGREP])dnl
-+AC_MSG_CHECKING([for $1])
-+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-+[case $MAGIC_CMD in
-+[[\\/*] | ?:[\\/]*])
-+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+ ;;
-+*)
-+ lt_save_MAGIC_CMD="$MAGIC_CMD"
-+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+dnl $ac_dummy forces splitting on constant user-supplied paths.
-+dnl POSIX.2 word splitting is done only on the output of word expansions,
-+dnl not every word. This closes a longstanding sh security hole.
-+ ac_dummy="m4_if([$2], , $PATH, [$2])"
-+ for ac_dir in $ac_dummy; do
-+ IFS="$lt_save_ifs"
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$1; then
-+ lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-+ if test -n "$file_magic_test_file"; then
-+ case $deplibs_check_method in
-+ "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
-+ :
-+ else
-+ cat <<_LT_EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such. This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem. Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
-+
-+_LT_EOF
-+ fi ;;
-+ esac
-+ fi
-+ break
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ MAGIC_CMD="$lt_save_MAGIC_CMD"
-+ ;;
-+esac])
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+ AC_MSG_RESULT($MAGIC_CMD)
-+else
-+ AC_MSG_RESULT(no)
-+fi
-+_LT_DECL([], [MAGIC_CMD], [0],
-+ [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-+])# _LT_PATH_TOOL_PREFIX
-+
-+# Old name:
-+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-+
-+
-+# _LT_PATH_MAGIC
-+# --------------
-+# find a file program which can recognize a shared library
-+m4_defun([_LT_PATH_MAGIC],
-+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+ if test -n "$ac_tool_prefix"; then
-+ _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-+ else
-+ MAGIC_CMD=:
-+ fi
-+fi
-+])# _LT_PATH_MAGIC
-+
-+
-+# LT_PATH_LD
-+# ----------
-+# find the pathname to the GNU or non-GNU linker
-+AC_DEFUN([LT_PATH_LD],
-+[AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
-+
-+AC_ARG_WITH([gnu-ld],
-+ [AS_HELP_STRING([--with-gnu-ld],
-+ [assume the C compiler uses GNU ld @<:@default=no@:>@])],
-+ [test "$withval" = no || with_gnu_ld=yes],
-+ [with_gnu_ld=no])dnl
-+
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+ # Check if gcc -print-prog-name=ld gives a path.
-+ AC_MSG_CHECKING([for ld used by $CC])
-+ case $host in
-+ *-*-mingw*)
-+ # gcc leaves a trailing carriage return which upsets mingw
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+ *)
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+ esac
-+ case $ac_prog in
-+ # Accept absolute paths.
-+ [[\\/]]* | ?:[[\\/]]*)
-+ re_direlt='/[[^/]][[^/]]*/\.\./'
-+ # Canonicalize the pathname of ld
-+ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-+ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-+ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-+ done
-+ test -z "$LD" && LD="$ac_prog"
-+ ;;
-+ "")
-+ # If it fails, then pretend we aren't using GCC.
-+ ac_prog=ld
-+ ;;
-+ *)
-+ # If it is relative, then search for the first ld in PATH.
-+ with_gnu_ld=unknown
-+ ;;
-+ esac
-+elif test "$with_gnu_ld" = yes; then
-+ AC_MSG_CHECKING([for GNU ld])
-+else
-+ AC_MSG_CHECKING([for non-GNU ld])
-+fi
-+AC_CACHE_VAL(lt_cv_path_LD,
-+[if test -z "$LD"; then
-+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+ for ac_dir in $PATH; do
-+ IFS="$lt_save_ifs"
-+ test -z "$ac_dir" && ac_dir=.
-+ 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 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'*)
-+ test "$with_gnu_ld" != no && break
-+ ;
-+ *)
-+ test "$with_gnu_ld" != yes && break
-+ ;
-+ esac
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+else
-+ lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi])
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+ AC_MSG_RESULT($LD)
-+else
-+ AC_MSG_RESULT(no)
-+fi
-+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-+_LT_PATH_LD_GNU
-+AC_SUBST([LD])
-+
-+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-+])# LT_PATH_LD
-+
-+# Old names:
-+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_PROG_LD], [])
-+dnl AC_DEFUN([AC_PROG_LD], [])
-+
-+
-+# _LT_PATH_LD_GNU
-+#- --------------
-+m4_defun([_LT_PATH_LD_GNU],
-+[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 lds only accept -v.
-+case `$LD -v 2>&1 </dev/null` in
-+*GNU* | *'with BFD'*)
-+ lt_cv_prog_gnu_ld=yes
-+ ;;
-+*)
-+ lt_cv_prog_gnu_ld=no
-+ ;;
-+esac])
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+])# _LT_PATH_LD_GNU
-+
-+
-+# _LT_CMD_RELOAD
-+# --------------
-+# find reload flag for linker
-+# -- PORTME Some linkers may need a different reload flag.
-+m4_defun([_LT_CMD_RELOAD],
-+[AC_CACHE_CHECK([for $LD option to reload object files],
-+ lt_cv_ld_reload_flag,
-+ [lt_cv_ld_reload_flag='-r'])
-+reload_flag=$lt_cv_ld_reload_flag
-+case $reload_flag in
-+"" | " "*) ;;
-+*) reload_flag=" $reload_flag" ;;
-+esac
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+ cygwin* | mingw* | pw32* | cegcc*)
-+ if test "$GCC" != yes; then
-+ reload_cmds=false
-+ fi
-+ ;;
-+ 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
-+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-+_LT_TAGDECL([], [reload_cmds], [2])dnl
-+])# _LT_CMD_RELOAD
-+
-+
-+# _LT_CHECK_MAGIC_METHOD
-+# ----------------------
-+# how to check for library dependencies
-+# -- PORTME fill in with the dynamic library characteristics
-+m4_defun([_LT_CHECK_MAGIC_METHOD],
-+[m4_require([_LT_DECL_EGREP])
-+m4_require([_LT_DECL_OBJDUMP])
-+AC_CACHE_CHECK([how to recognize dependent libraries],
-+lt_cv_deplibs_check_method,
-+[lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given extended regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+
-+case $host_os in
-+aix[[4-9]]*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+beos*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+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*)
-+ # 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*)
-+ # Base MSYS/MinGW do not provide the 'file' command needed by
-+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
-+ # unless we find 'file', for example because we are cross-compiling.
-+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
-+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+ lt_cv_file_magic_cmd='func_win32_libid'
-+ else
-+ # Keep this pattern in sync with the one in func_win32_libid.
-+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-+ lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ fi
-+ ;;
-+
-+cegcc*)
-+ # use the weaker test based on 'objdump'. See mingw*.
-+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-+ lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ ;;
-+
-+darwin* | rhapsody*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+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|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.*`
-+ ;;
-+ esac
-+ else
-+ lt_cv_deplibs_check_method=pass_all
-+ fi
-+ ;;
-+
-+gnu*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+haiku*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+hpux10.20* | hpux11*)
-+ lt_cv_file_magic_cmd=/usr/bin/file
-+ 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
-+ ;;
-+ hppa*64*)
-+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
-+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-+ ;;
-+ *)
-+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
-+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+ ;;
-+ esac
-+ ;;
-+
-+interix[[3-9]]*)
-+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-+ ;;
-+
-+irix5* | irix6* | nonstopux*)
-+ case $LD in
-+ *-32|*"-32 ") libmagic=32-bit;;
-+ *-n32|*"-n32 ") libmagic=N32;;
-+ *-64|*"-64 ") libmagic=64-bit;;
-+ *) libmagic=never-match;;
-+ esac
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+# This must be glibc/ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+netbsd*)
-+ 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
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-+ fi
-+ ;;
-+
-+newos6*)
-+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-+ lt_cv_file_magic_cmd=/usr/bin/file
-+ lt_cv_file_magic_test_file=/usr/lib/libnls.so
-+ ;;
-+
-+*nto* | *qnx*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+openbsd*)
-+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-+ else
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-+ fi
-+ ;;
-+
-+osf3* | osf4* | osf5*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+rdos*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+solaris*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+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]]'
-+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-+ ;;
-+ ncr)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+ sequent)
-+ lt_cv_file_magic_cmd='/bin/file'
-+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-+ ;;
-+ sni)
-+ lt_cv_file_magic_cmd='/bin/file'
-+ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-+ lt_cv_file_magic_test_file=/lib/libc.so
-+ ;;
-+ siemens)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+ pc)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+ esac
-+ ;;
-+
-+tpf*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+esac
-+])
-+
-+file_magic_glob=
-+want_nocaseglob=no
-+if test "$build" = "$host"; then
-+ case $host_os in
-+ mingw* | pw32*)
-+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-+ want_nocaseglob=yes
-+ else
-+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
-+ fi
-+ ;;
-+ esac
-+fi
-+
-+file_magic_cmd=$lt_cv_file_magic_cmd
-+deplibs_check_method=$lt_cv_deplibs_check_method
-+test -z "$deplibs_check_method" && deplibs_check_method=unknown
-+
-+_LT_DECL([], [deplibs_check_method], [1],
-+ [Method to check whether dependent libraries are shared objects])
-+_LT_DECL([], [file_magic_cmd], [1],
-+ [Command to use when deplibs_check_method = "file_magic"])
-+_LT_DECL([], [file_magic_glob], [1],
-+ [How to find potential files when deplibs_check_method = "file_magic"])
-+_LT_DECL([], [want_nocaseglob], [1],
-+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
-+])# _LT_CHECK_MAGIC_METHOD
-+
-+
-+# LT_PATH_NM
-+# ----------
-+# find the pathname to a BSD- or MS-compatible name lister
-+AC_DEFUN([LT_PATH_NM],
-+[AC_REQUIRE([AC_PROG_CC])dnl
-+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-+[if test -n "$NM"; then
-+ # Let the user override the test.
-+ lt_cv_path_NM="$NM"
-+else
-+ 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
-+ ;;
-+ *)
-+ 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
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ done
-+ : ${lt_cv_path_NM=no}
-+fi])
-+if test "$lt_cv_path_NM" != "no"; then
-+ NM="$lt_cv_path_NM"
-+else
-+ # Didn't find any BSD compatible name lister, look for dumpbin.
-+ if test -n "$DUMPBIN"; then :
-+ # Let the user override the test.
-+ else
-+ AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
-+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-+ *COFF*)
-+ DUMPBIN="$DUMPBIN -symbols"
-+ ;;
-+ *)
-+ DUMPBIN=:
-+ ;;
-+ esac
-+ fi
-+ AC_SUBST([DUMPBIN])
-+ if test "$DUMPBIN" != ":"; then
-+ NM="$DUMPBIN"
-+ fi
-+fi
-+test -z "$NM" && NM=nm
-+AC_SUBST([NM])
-+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-+
-+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-+ [lt_cv_nm_interface="BSD nm"
-+ echo "int some_variable = 0;" > conftest.$ac_ext
-+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-+ (eval "$ac_compile" 2>conftest.err)
-+ cat conftest.err >&AS_MESSAGE_LOG_FD
-+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-+ cat conftest.err >&AS_MESSAGE_LOG_FD
-+ (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
-+ cat conftest.out >&AS_MESSAGE_LOG_FD
-+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-+ lt_cv_nm_interface="MS dumpbin"
-+ fi
-+ rm -f conftest*])
-+])# LT_PATH_NM
-+
-+# Old names:
-+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_PROG_NM], [])
-+dnl AC_DEFUN([AC_PROG_NM], [])
-+
-+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-+# --------------------------------
-+# how to determine the name of the shared library
-+# associated with a specific link library.
-+# -- PORTME fill in with the dynamic library characteristics
-+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
-+[m4_require([_LT_DECL_EGREP])
-+m4_require([_LT_DECL_OBJDUMP])
-+m4_require([_LT_DECL_DLLTOOL])
-+AC_CACHE_CHECK([how to associate runtime and link libraries],
-+lt_cv_sharedlib_from_linklib_cmd,
-+[lt_cv_sharedlib_from_linklib_cmd='unknown'
-+
-+case $host_os in
-+cygwin* | mingw* | pw32* | cegcc*)
-+ # two different shell functions defined in ltmain.sh
-+ # decide which to use based on capabilities of $DLLTOOL
-+ case `$DLLTOOL --help 2>&1` in
-+ *--identify-strict*)
-+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-+ ;;
-+ *)
-+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-+ ;;
-+ esac
-+ ;;
-+*)
-+ # fallback: assume linklib IS sharedlib
-+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-+ ;;
-+esac
-+])
-+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-+
-+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
-+ [Command to associate shared and link libraries])
-+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-+
-+
-+# _LT_PATH_MANIFEST_TOOL
-+# ----------------------
-+# locate the manifest tool
-+m4_defun([_LT_PATH_MANIFEST_TOOL],
-+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
-+ [lt_cv_path_mainfest_tool=no
-+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
-+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-+ cat conftest.err >&AS_MESSAGE_LOG_FD
-+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-+ lt_cv_path_mainfest_tool=yes
-+ fi
-+ rm -f conftest*])
-+if test "x$lt_cv_path_mainfest_tool" != xyes; then
-+ MANIFEST_TOOL=:
-+fi
-+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
-+])# _LT_PATH_MANIFEST_TOOL
-+
-+
-+# LT_LIB_M
-+# --------
-+# check for math library
-+AC_DEFUN([LT_LIB_M],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+LIBM=
-+case $host in
-+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-+ # These system don't have libm, or don't need it
-+ ;;
-+*-ncr-sysv4.3*)
-+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-+ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-+ ;;
-+*)
-+ AC_CHECK_LIB(m, cos, LIBM="-lm")
-+ ;;
-+esac
-+AC_SUBST([LIBM])
-+])# LT_LIB_M
-+
-+# Old name:
-+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_CHECK_LIBM], [])
-+
-+
-+# _LT_COMPILER_NO_RTTI([TAGNAME])
-+# -------------------------------
-+m4_defun([_LT_COMPILER_NO_RTTI],
-+[m4_require([_LT_TAG_COMPILER])dnl
-+
-+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-+
-+if test "$GCC" = yes; then
-+ case $cc_basename in
-+ nvcc*)
-+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
-+ esac
-+
-+ _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-+ lt_cv_prog_compiler_rtti_exceptions,
-+ [-fno-rtti -fno-exceptions], [],
-+ [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-+fi
-+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-+ [Compiler flag to turn off builtin functions])
-+])# _LT_COMPILER_NO_RTTI
-+
-+
-+# _LT_CMD_GLOBAL_SYMBOLS
-+# ----------------------
-+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_PROG_AWK])dnl
-+AC_REQUIRE([LT_PATH_NM])dnl
-+AC_REQUIRE([LT_PATH_LD])dnl
-+m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_TAG_COMPILER])dnl
-+
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-+[
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix. What could be older than Ultrix?!! ;)]
-+
-+# Character class describing NM global symbol codes.
-+symcode='[[BCDEGRST]]'
-+
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-+
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+ symcode='[[BCDT]]'
-+ ;;
-+cygwin* | mingw* | pw32* | cegcc*)
-+ symcode='[[ABCDGISTW]]'
-+ ;;
-+hpux*)
-+ if test "$host_cpu" = ia64; then
-+ symcode='[[ABCDEGRST]]'
-+ fi
-+ ;;
-+irix* | nonstopux*)
-+ symcode='[[BCDEGRST]]'
-+ ;;
-+osf*)
-+ symcode='[[BCDEGQRST]]'
-+ ;;
-+solaris*)
-+ symcode='[[BDRT]]'
-+ ;;
-+sco3.2v5*)
-+ symcode='[[DT]]'
-+ ;;
-+sysv4.2uw2*)
-+ symcode='[[DT]]'
-+ ;;
-+sysv5* | sco5v6* | unixware* | OpenUNIX*)
-+ symcode='[[ABDT]]'
-+ ;;
-+sysv4)
-+ symcode='[[DFNSTU]]'
-+ ;;
-+esac
-+
-+# If we're using GNU nm, then use its standard symbol codes.
-+case `$NM -V 2>&1` in
-+*GNU* | *'with BFD'*)
-+ symcode='[[ABCDGIRSTW]]' ;;
-+esac
-+
-+# Transform an extracted symbol line into a proper C declaration.
-+# Some systems (esp. on ia64) link data and code symbols differently,
-+# so use this general approach.
-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
-+
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $build_os in
-+mingw*)
-+ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+ ;;
-+esac
-+
-+# Try without a prefix underscore, 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.
-+ if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-+ # Fake it for dumpbin and say T for any non-static function
-+ # and D for any global variable.
-+ # Also find C++ and __fastcall symbols from MSVC++,
-+ # which start with @ or ?.
-+ lt_cv_sys_global_symbol_pipe="$AWK ['"\
-+" {last_section=section; section=\$ 3};"\
-+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-+" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-+" \$ 0!~/External *\|/{next};"\
-+" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-+" {if(hide[section]) next};"\
-+" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-+" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-+" s[1]~/^[@?]/{print s[1], s[1]; next};"\
-+" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-+" ' prfx=^$ac_symprfx]"
-+ else
-+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-+ fi
-+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-+
-+ # Check to see that the pipe works correctly.
-+ pipe_works=no
-+
-+ rm -f conftest*
-+ cat > conftest.$ac_ext <<_LT_EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(void);
-+void nm_test_func(void){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+_LT_EOF
-+
-+ if AC_TRY_EVAL(ac_compile); then
-+ # Now try to grab the symbols.
-+ nlist=conftest.nm
-+ if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
-+ # Try sorting and uniquifying the output.
-+ if sort "$nlist" | uniq > "$nlist"T; then
-+ mv -f "$nlist"T "$nlist"
-+ else
-+ rm -f "$nlist"T
-+ fi
-+
-+ # Make sure that we snagged all the symbols we need.
-+ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-+ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-+ cat <<_LT_EOF > conftest.$ac_ext
-+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-+/* DATA imports from DLLs on WIN32 con't be const, because runtime
-+ relocations are performed -- see ld's documentation on pseudo-relocs. */
-+# define LT@&t@_DLSYM_CONST
-+#elif defined(__osf__)
-+/* This system does not cope well with relocations in const data. */
-+# define LT@&t@_DLSYM_CONST
-+#else
-+# define LT@&t@_DLSYM_CONST const
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+_LT_EOF
-+ # Now generate the symbol file.
-+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-+
-+ cat <<_LT_EOF >> conftest.$ac_ext
-+
-+/* The mapping between symbol names and symbols. */
-+LT@&t@_DLSYM_CONST struct {
-+ const char *name;
-+ void *address;
-+}
-+lt__PROGRAM__LTX_preloaded_symbols[[]] =
-+{
-+ { "@PROGRAM@", (void *) 0 },
-+_LT_EOF
-+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-+ cat <<\_LT_EOF >> conftest.$ac_ext
-+ {0, (void *) 0}
-+};
-+
-+/* This works around a problem in FreeBSD linker */
-+#ifdef FREEBSD_WORKAROUND
-+static const void *lt_preloaded_setup() {
-+ return lt__PROGRAM__LTX_preloaded_symbols;
-+}
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+_LT_EOF
-+ # Now try linking the two files.
-+ mv conftest.$ac_objext conftstm.$ac_objext
-+ lt_globsym_save_LIBS=$LIBS
-+ lt_globsym_save_CFLAGS=$CFLAGS
-+ LIBS="conftstm.$ac_objext"
-+ CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-+ pipe_works=yes
-+ fi
-+ LIBS=$lt_globsym_save_LIBS
-+ CFLAGS=$lt_globsym_save_CFLAGS
-+ else
-+ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-+ fi
-+ else
-+ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-+ fi
-+ else
-+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-+ fi
-+ else
-+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-+ cat conftest.$ac_ext >&5
-+ fi
-+ rm -rf conftest* conftst*
-+
-+ # Do not use the global_symbol_pipe unless it works.
-+ if test "$pipe_works" = yes; then
-+ break
-+ else
-+ lt_cv_sys_global_symbol_pipe=
-+ fi
-+done
-+])
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+ lt_cv_sys_global_symbol_to_cdecl=
-+fi
-+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-+ AC_MSG_RESULT(failed)
-+else
-+ AC_MSG_RESULT(ok)
-+fi
-+
-+# Response file support.
-+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-+ nm_file_list_spec='@'
-+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
-+ nm_file_list_spec='@'
-+fi
-+
-+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-+ [Take the output of nm and produce a listing of raw symbols and C names])
-+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-+ [Transform the output of nm in a proper C declaration])
-+_LT_DECL([global_symbol_to_c_name_address],
-+ [lt_cv_sys_global_symbol_to_c_name_address], [1],
-+ [Transform the output of nm in a C name address pair])
-+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-+ [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-+ [Transform the output of nm in a C name address pair when lib prefix is needed])
-+_LT_DECL([], [nm_file_list_spec], [1],
-+ [Specify filename containing input files for $NM])
-+]) # _LT_CMD_GLOBAL_SYMBOLS
-+
-+
-+# _LT_COMPILER_PIC([TAGNAME])
-+# ---------------------------
-+m4_defun([_LT_COMPILER_PIC],
-+[m4_require([_LT_TAG_COMPILER])dnl
-+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+_LT_TAGVAR(lt_prog_compiler_static, $1)=
-+
-+m4_if([$1], [CXX], [
-+ # C++ specific cases for pic, static, wl, etc.
-+ if test "$GXX" = yes; then
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+
-+ case $host_os in
-+ aix*)
-+ # All AIX code is PIC.
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ fi
-+ ;;
-+
-+ amigaos*)
-+ case $host_cpu in
-+ powerpc)
-+ # see comment about AmigaOS4 .so support
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;;
-+ m68k)
-+ # FIXME: we need at least 68020 code to build shared libraries, but
-+ # adding the `-m68020' flag to GCC prevents building anything better,
-+ # like `-m68040'.
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-+ ;;
-+ esac
-+ ;;
-+
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ # PIC is the default for these OSes.
-+ ;;
-+ mingw* | cygwin* | os2* | pw32* | cegcc*)
-+ # This hack is so that the source file can tell whether it is being
-+ # built for inclusion in a dll (and should export symbols for example).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
-+ m4_if([$1], [GCJ], [],
-+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-+ ;;
-+ darwin* | rhapsody*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-+ ;;
-+ *djgpp*)
-+ # DJGPP does not support shared libraries at all
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+ ;;
-+ haiku*)
-+ # PIC is the default for Haiku.
-+ # The "-static" flag exists, but is broken.
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
-+ ;;
-+ interix[[3-9]]*)
-+ # 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_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-+ fi
-+ ;;
-+ hpux*)
-+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
-+ # sets the default TLS model and affects inlining.
-+ case $host_cpu in
-+ hppa*64*)
-+ ;
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;
-+ esac
-+ ;;
-+ *qnx* | *nto*)
-+ # QNX uses GNU C++, but need to define -shared option too, otherwise
-+ # it will coredump.
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-+ ;;
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;;
-+ esac
-+ else
-+ case $host_os in
-+ aix[[4-9]]*)
-+ # All AIX code is PIC.
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ else
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-+ fi
-+ ;
-+ chorus*)
-+ case $cc_basename in
-+ cxch68*)
-+ # Green Hills C++ Compiler
-+ # _LT_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
-+ ;
-+ mingw* | cygwin* | os2* | pw32* | cegcc*)
-+ # This hack is so that the source file can tell whether it is being
-+ # built for inclusion in a dll (and should export symbols for example).
-+ m4_if([$1], [GCJ], [],
-+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-+ ;
-+ dgux*)
-+ case $cc_basename in
-+ ec++*)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ ;;
-+ ghcx*)
-+ # Green Hills C++ Compiler
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;
-+ freebsd* | dragonfly*)
-+ # FreeBSD uses GNU C++
-+ ;
-+ hpux9* | hpux10* | hpux11*)
-+ case $cc_basename in
-+ CC*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+ if test "$host_cpu" != ia64; then
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+ fi
-+ ;;
-+ aCC*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+ case $host_cpu in
-+ hppa*64*|ia64*)
-+ # +Z the default
-+ ;;
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+ ;;
-+ esac
-+ ;;
-+ *)
-+ ;;
-+ 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*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ # CC pic flag -KPIC is the default.
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+ case $cc_basename in
-+ KCC*)
-+ # KAI C++ Compiler
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;;
-+ ecpc* )
-+ # old Intel C++ for x86_64 which still supported -KPIC.
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ ;;
-+ icpc* )
-+ # Intel C++, used to be incompatible with GCC.
-+ # ICC 10 doesn't accept -KPIC any more.
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ ;;
-+ pgCC* | pgcpp*)
-+ # Portland Group C++ compiler
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+ _LT_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.
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+ xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
-+ # IBM XL 8.0, 9.0 on PPC and BlueGene
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-+ ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+ ;;
-+ esac
-+ ;;
-+ esac
-+ ;
-+ lynxos*)
-+ ;
-+ m88k*)
-+ ;
-+ mvs*)
-+ case $cc_basename in
-+ cxx*)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;
-+ netbsd*)
-+ ;
-+ *qnx* | *nto*)
-+ # QNX uses GNU C++, but need to define -shared option too, otherwise
-+ # it will coredump.
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-+ ;;
-+ osf3* | osf4* | osf5*)
-+ case $cc_basename in
-+ KCC*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-+ ;;
-+ RCC*)
-+ # Rational C++ 2.4.1
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+ ;;
-+ cxx*)
-+ # Digital/Compaq C++
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ # Make sure the PIC flag is empty. It appears that all Alpha
-+ # Linux and Compaq Tru64 Unix objects are PIC.
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;
-+ psos*)
-+ ;
-+ solaris*)
-+ case $cc_basename in
-+ CC* | sunCC*)
-+ # Sun C++ 4.2, 5.x and Centerline C++
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+ ;;
-+ gcx*)
-+ # Green Hills C++ Compiler
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;
-+ sunos4*)
-+ case $cc_basename in
-+ CC*)
-+ # Sun C++ 4.x
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+ lcc*)
-+ # Lucid
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;
-+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+ case $cc_basename in
-+ CC*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+ esac
-+ ;
-+ tandem*)
-+ case $cc_basename in
-+ NCC*)
-+ # NonStop-UX NCC 3.20
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;
-+ vxworks*)
-+ ;
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+ ;
-+ esac
-+ fi
-+],
-+[
-+ if test "$GCC" = yes; then
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+
-+ case $host_os in
-+ aix*)
-+ # All AIX code is PIC.
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ fi
-+ ;;
-+
-+ amigaos*)
-+ case $host_cpu in
-+ powerpc)
-+ # see comment about AmigaOS4 .so support
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;;
-+ m68k)
-+ # FIXME: we need at least 68020 code to build shared libraries, but
-+ # adding the `-m68020' flag to GCC prevents building anything better,
-+ # like `-m68040'.
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-+ ;;
-+ esac
-+ ;;
-+
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ # PIC is the default for these OSes.
-+ ;;
-+
-+ mingw* | cygwin* | pw32* | os2* | cegcc*)
-+ # This hack is so that the source file can tell whether it is being
-+ # built for inclusion in a dll (and should export symbols for example).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
-+ m4_if([$1], [GCJ], [],
-+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-+ ;;
-+
-+ darwin* | rhapsody*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-+ ;;
-+
-+ haiku*)
-+ # PIC is the default for Haiku.
-+ # The "-static" flag exists, but is broken.
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
-+ ;;
-+
-+ hpux*)
-+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
-+ # sets the default TLS model and affects inlining.
-+ case $host_cpu in
-+ hppa*64*)
-+ # +Z the default
-+ ;
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;
-+ esac
-+ ;;
-+
-+ interix[[3-9]]*)
-+ # 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.
-+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+ enable_shared=no
-+ ;;
-+
-+ *nto* | *qnx*)
-+ # QNX uses GNU C++, but need to define -shared option too, otherwise
-+ # it will coredump.
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-+ ;;
-+
-+ sysv4*MP*)
-+ if test -d /usr/nec; then
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-+ fi
-+ ;;
-+
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;;
-+ esac
-+
-+ case $cc_basename in
-+ nvcc*) # Cuda Compiler Driver 2.2
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-+ if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
-+ fi
-+ ;;
-+ esac
-+ else
-+ # PORTME Check for flag to pass linker flags through the system compiler.
-+ case $host_os in
-+ aix*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ else
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-+ fi
-+ ;;
-+
-+ mingw* | cygwin* | pw32* | os2* | cegcc*)
-+ # This hack is so that the source file can tell whether it is being
-+ # built for inclusion in a dll (and should export symbols for example).
-+ m4_if([$1], [GCJ], [],
-+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-+ ;;
-+
-+ hpux9* | hpux10* | hpux11*)
-+ _LT_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
-+ hppa*64*|ia64*)
-+ # +Z the default
-+ ;
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+ ;
-+ esac
-+ # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+ ;;
-+
-+ irix5* | irix6* | nonstopux*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ # PIC (with -KPIC) is the default.
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+ case $cc_basename in
-+ # old Intel for x86_64 which still supported -KPIC.
-+ ecc*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ ;;
-+ # icc used to be incompatible with GCC.
-+ # ICC 10 doesn't accept -KPIC any more.
-+ icc* | ifort*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ ;;
-+ # Lahey Fortran 8.1.
-+ lf95*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-+ ;
-+ nagfor*)
-+ # NAG Fortran compiler
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;
-+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-+ # Portland Group compilers (*not* the Pentium gcc compiler,
-+ # which looks to be a dead project)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+ ccc*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ # All Alpha code is PIC.
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+ xl* | bgxl* | bgf* | mpixl*)
-+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-+ ;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
-+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-+ ;;
-+ *Sun\ F* | *Sun*Fortran*)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+ ;;
-+ *Sun\ C*)
-+ # Sun C 5.9
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ ;;
-+ *Intel*\ [[CF]]*Compiler*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ ;;
-+ *Portland\ Group*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+ esac
-+ ;
-+ esac
-+ ;;
-+
-+ newsos6)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+
-+ *nto* | *qnx*)
-+ # QNX uses GNU C++, but need to define -shared option too, otherwise
-+ # it will coredump.
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-+ ;;
-+
-+ osf3* | osf4* | osf5*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ # All OSF/1 code is PIC.
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+
-+ rdos*)
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+
-+ solaris*)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ case $cc_basename in
-+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-+ esac
-+ ;;
-+
-+ sunos4*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+
-+ sysv4 | sysv4.2uw2* | sysv4.3*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+
-+ sysv4*MP*)
-+ if test -d /usr/nec ;then
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ fi
-+ ;;
-+
-+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+
-+ unicos*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+ ;;
-+
-+ uts4*)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+ ;;
-+ esac
-+ fi
-+])
-+case $host_os in
-+ # For platforms which do not support PIC, -DPIC is meaningless:
-+ *djgpp*)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+ ;;
-+ *)
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-+ ;;
-+esac
-+
-+AC_CACHE_CHECK([for $compiler option to produce PIC],
-+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
-+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
-+
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-+ _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-+ [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-+ [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-+ [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-+ "" | " "*) ;;
-+ *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-+ esac],
-+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-+fi
-+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-+ [Additional compiler flags for building library objects])
-+
-+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-+ [How to pass a linker flag through the compiler])
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-+ _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-+ $lt_tmp_static_flag,
-+ [],
-+ [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-+ [Compiler flag to prevent dynamic linking])
-+])# _LT_COMPILER_PIC
-+
-+
-+# _LT_LINKER_SHLIBS([TAGNAME])
-+# ----------------------------
-+# See if the linker supports building shared libraries.
-+m4_defun([_LT_LINKER_SHLIBS],
-+[AC_REQUIRE([LT_PATH_LD])dnl
-+AC_REQUIRE([LT_PATH_NM])dnl
-+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-+m4_require([_LT_TAG_COMPILER])dnl
-+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+m4_if([$1], [CXX], [
-+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-+ case $host_os in
-+ aix[[4-9]]*)
-+ # If we're using GNU nm, then we don't want the "-C" option.
-+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+ # Also, AIX nm treats weak defined symbols like other global defined
-+ # symbols, whereas GNU nm marks them as "W".
-+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+ else
-+ _LT_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
-+ ;;
-+ pw32*)
-+ _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-+ ;;
-+ cygwin* | mingw* | cegcc*)
-+ case $cc_basename in
-+ cl*)
-+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-+ ;;
-+ *)
-+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-+ ;;
-+ esac
-+ ;;
-+ *)
-+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+ ;;
-+ esac
-+], [
-+ runpath_var=
-+ _LT_TAGVAR(allow_undefined_flag, $1)=
-+ _LT_TAGVAR(always_export_symbols, $1)=no
-+ _LT_TAGVAR(archive_cmds, $1)=
-+ _LT_TAGVAR(archive_expsym_cmds, $1)=
-+ _LT_TAGVAR(compiler_needs_object, $1)=no
-+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+ _LT_TAGVAR(hardcode_automatic, $1)=no
-+ _LT_TAGVAR(hardcode_direct, $1)=no
-+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=
-+ _LT_TAGVAR(hardcode_minus_L, $1)=no
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+ _LT_TAGVAR(inherit_rpath, $1)=no
-+ _LT_TAGVAR(link_all_deplibs, $1)=unknown
-+ _LT_TAGVAR(module_cmds, $1)=
-+ _LT_TAGVAR(module_expsym_cmds, $1)=
-+ _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-+ _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-+ _LT_TAGVAR(thread_safe_flag_spec, $1)=
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+ # include_expsyms should be a list of space-separated symbols to be *always*
-+ # included in the symbol list
-+ _LT_TAGVAR(include_expsyms, $1)=
-+ # exclude_expsyms can be an extended regexp of symbols to exclude
-+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+ # as well as any symbol that contains `d'.
-+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+ # platforms (ab)use it in PIC code, but their linkers get confused if
-+ # the symbol is explicitly referenced. Since portable code cannot
-+ # rely on this symbol name, it's probably fine to never include it in
-+ # preloaded symbol tables.
-+ # Exclude shared library initialization/finalization symbols.
-+dnl Note also adjust exclude_expsyms for C++ above.
-+ extract_expsyms_cmds=
-+
-+ case $host_os in
-+ cygwin* | mingw* | pw32* | cegcc*)
-+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+ # When not using gcc, we currently assume that we are using
-+ # Microsoft Visual C++.
-+ if test "$GCC" != yes; then
-+ 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
-+ ;;
-+ esac
-+
-+ _LT_TAGVAR(ld_shlibs, $1)=yes
-+
-+ # On some targets, GNU ld is compatible enough with the native linker
-+ # that we're better off using the native interface for both.
-+ lt_use_gnu_ld_interface=no
-+ if test "$with_gnu_ld" = yes; then
-+ case $host_os in
-+ aix*)
-+ # The AIX port of GNU ld has always aspired to compatibility
-+ # with the native linker. However, as the warning in the GNU ld
-+ # block says, versions before 2.19.5* couldn't really create working
-+ # shared libraries, regardless of the interface used.
-+ case `$LD -v 2>&1` in
-+ *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-+ *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
-+ *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
-+ *)
-+ lt_use_gnu_ld_interface=yes
-+ ;;
-+ esac
-+ ;
-+ *)
-+ lt_use_gnu_ld_interface=yes
-+ ;
-+ esac
-+ fi
-+
-+ if test "$lt_use_gnu_ld_interface" = yes; then
-+ # 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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_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_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ else
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+ fi
-+ supports_anon_versioning=no
-+ case `$LD -v 2>&1` in
-+ *GNU\ gold*) supports_anon_versioning=yes ;;
-+ *\ [[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
-+ aix[[3-9]]*)
-+ # On AIX/PPC, the GNU linker is very broken
-+ if test "$host_cpu" != ia64; then
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ cat <<_LT_EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.19, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support. If you
-+*** really care for shared libraries, you may want to install binutils
-+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-+*** You will then need to restart the configuration process.
-+
-+_LT_EOF
-+ fi
-+ ;;
-+
-+ amigaos*)
-+ case $host_cpu in
-+ powerpc)
-+ # see comment about AmigaOS4 .so support
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)=''
-+ ;;
-+ m68k)
-+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+ ;;
-+ esac
-+ ;;
-+
-+ beos*)
-+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+ # support --undefined. This deserves some investigation. FIXME
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
-+ cygwin* | mingw* | pw32* | cegcc*)
-+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+ # as there is no search path for DLLs.
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ _LT_TAGVAR(always_export_symbols, $1)=no
-+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-+
-+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+ _LT_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_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+ cp $export_symbols $output_objdir/$soname.def;
-+ else
-+ 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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
-+ haiku*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+ ;;
-+
-+ interix[[3-9]]*)
-+ _LT_TAGVAR(hardcode_direct, $1)=no
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_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_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_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'
-+ ;;
-+
-+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-+ tmp_diet=no
-+ if test "$host_os" = linux-dietlibc; then
-+ case $cc_basename in
-+ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
-+ esac
-+ fi
-+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-+ && test "$tmp_diet" = no
-+ then
-+ tmp_addflag=' $pic_flag'
-+ tmp_sharedflag='-shared'
-+ case $cc_basename,$host_cpu in
-+ pgcc*) # Portland Group C compiler
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_addflag=' $pic_flag'
-+ ;;
-+ pgf77* | pgf90* | pgf95* | pgfortran*)
-+ # Portland Group f77 and f90 compilers
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$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' ;;
-+ lf95*) # Lahey Fortran 8.1
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+ tmp_sharedflag='--shared' ;;
-+ xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-+ tmp_sharedflag='-qmkshrobj'
-+ tmp_addflag= ;;
-+ nvcc*) # Cuda Compiler Driver 2.2
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+ _LT_TAGVAR(compiler_needs_object, $1)=yes
-+ ;;
-+ esac
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*) # Sun C 5.9
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+ _LT_TAGVAR(compiler_needs_object, $1)=yes
-+ tmp_sharedflag='-G' ;;
-+ *Sun\ F*) # Sun Fortran 8.3
-+ tmp_sharedflag='-G' ;;
-+ esac
-+ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+ if test "x$supports_anon_versioning" = xyes; then
-+ _LT_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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ fi
-+
-+ case $cc_basename in
-+ xlf* | bgf* | bgxlf* | mpixlf*)
-+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-+ if test "x$supports_anon_versioning" = xyes; then
-+ _LT_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~
-+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-+ fi
-+ ;;
-+ esac
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
-+ netbsd*)
-+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+ wlarc=
-+ else
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ fi
-+ ;;
-+
-+ solaris*)
-+ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ cat <<_LT_EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems. Therefore, libtool
-+*** is disabling shared libraries support. We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer. Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+_LT_EOF
-+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
-+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-+ case `$LD -v 2>&1` in
-+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-+ _LT_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
-+ ;
-+ *)
-+ # 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.
-+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;
-+ esac
-+ ;;
-+
-+ sunos4*)
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ wlarc=
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ *)
-+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+ esac
-+
-+ if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
-+ runpath_var=
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+ fi
-+ else
-+ # PORTME fill in a description of your system's linker (not GNU ld)
-+ case $host_os in
-+ aix3*)
-+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ _LT_TAGVAR(always_export_symbols, $1)=yes
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+ # Note: this linker hardcodes the directories in LIBPATH if there
-+ # are no directories specified by -L.
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-+ # Neither direct hardcoding nor static linking is supported with a
-+ # broken collect2.
-+ _LT_TAGVAR(hardcode_direct, $1)=unsupported
-+ fi
-+ ;;
-+
-+ aix[[4-9]]*)
-+ if test "$host_cpu" = ia64; then
-+ # On IA64, the linker does run time linking by default, so we don't
-+ # have to do anything special.
-+ aix_use_runtimelinking=no
-+ exp_sym_flag='-Bexport'
-+ no_entry_flag=""
-+ else
-+ # If we're using GNU nm, then we don't want the "-C" option.
-+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+ # Also, AIX nm treats weak defined symbols like other global
-+ # defined symbols, whereas GNU nm marks them as "W".
-+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+ else
-+ _LT_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]].*|aix[[5-9]]*)
-+ 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
-+
-+ exp_sym_flag='-bexport'
-+ no_entry_flag='-bnoentry'
-+ fi
-+
-+ # When large executables or shared objects are built, AIX ld can
-+ # have problems creating the table of contents. If linking a library
-+ # or program results in "error TOC overflow" add -mminimal-toc to
-+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
-+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+ _LT_TAGVAR(archive_cmds, $1)=''
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-+
-+ if test "$GCC" = yes; then
-+ 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`
-+ if test -f "$collect2name" &&
-+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-+ then
-+ # We have reworked collect2
-+ :
-+ else
-+ # We have old collect2
-+ _LT_TAGVAR(hardcode_direct, $1)=unsupported
-+ # It fails to find uninstalled libraries when the uninstalled
-+ # path is not listed in the libpath. Setting hardcode_minus_L
-+ # to unsupported forces relinking
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_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
-+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+ # chokes on -Wl,-G. The following line is correct:
-+ shared_flag='-G'
-+ else
-+ if test "$aix_use_runtimelinking" = yes; then
-+ shared_flag='${wl}-G'
-+ else
-+ shared_flag='${wl}-bM:SRE'
-+ fi
-+ fi
-+ fi
-+
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-+ # It seems that -bexpall does not export symbols beginning with
-+ # underscore (_), so it is better to generate a list of symbols to export.
-+ _LT_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_TAGVAR(allow_undefined_flag, $1)='-berok'
-+ # Determine the default libpath from the value encoded in an
-+ # empty executable.
-+ _LT_SYS_MODULE_PATH_AIX([$1])
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ _LT_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 func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ else
-+ if test "$host_cpu" = ia64; then
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-+ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-+ _LT_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_SYS_MODULE_PATH_AIX([$1])
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ # Warning - without using the other run time loading flags,
-+ # -berok will link without error, but may produce a broken library.
-+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+ if test "$with_gnu_ld" = yes; then
-+ # We only use this code for GNU lds that support --whole-archive.
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+ else
-+ # Exported symbols can be pulled into shared objects from archives
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-+ fi
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+ # This is similar to how AIX traditionally builds its shared libraries.
-+ _LT_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
-+ ;;
-+
-+ amigaos*)
-+ case $host_cpu in
-+ powerpc)
-+ # see comment about AmigaOS4 .so support
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)=''
-+ ;;
-+ m68k)
-+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+ ;;
-+ esac
-+ ;;
-+
-+ bsdi[[45]]*)
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-+ ;;
-+
-+ cygwin* | mingw* | pw32* | cegcc*)
-+ # When not using gcc, we currently assume that we are using
-+ # Microsoft Visual C++.
-+ # hardcode_libdir_flag_spec is actually meaningless, as there is
-+ # no search path for DLLs.
-+ case $cc_basename in
-+ cl*)
-+ # Native MSVC
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ _LT_TAGVAR(always_export_symbols, $1)=yes
-+ _LT_TAGVAR(file_list_spec, $1)='@'
-+ # Tell ltmain to make .lib files, not .a files.
-+ libext=lib
-+ # Tell ltmain to make .dll files, not .so files.
-+ shrext_cmds=".dll"
-+ # FIXME: Setting linknames here is a bad hack.
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-+ else
-+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-+ fi~
-+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-+ linknames='
-+ # The linker will not automatically build a static lib if we build a DLL.
-+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-+ _LT_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'
-+ # Don't use ranlib
-+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-+ lt_tool_outputfile="@TOOL_OUTPUT@"~
-+ case $lt_outputfile in
-+ *.exe|*.EXE) ;;
-+ *)
-+ lt_outputfile="$lt_outputfile.exe"
-+ lt_tool_outputfile="$lt_tool_outputfile.exe"
-+ ;;
-+ esac~
-+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-+ $RM "$lt_outputfile.manifest";
-+ fi'
-+ ;
-+ *)
-+ # Assume MSVC wrapper
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-+ _LT_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_cmds=".dll"
-+ # FIXME: Setting linknames here is a bad hack.
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-+ # The linker will automatically build a .lib file if we build a DLL.
-+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-+ # FIXME: Should let the user specify the lib program.
-+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+ ;
-+ esac
-+ ;;
-+
-+ darwin* | rhapsody*)
-+ _LT_DARWIN_LINKER_FEATURES($1)
-+ ;;
-+
-+ dgux*)
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+ # support. Future versions do this automatically, but an explicit c++rt0.o
-+ # does not break anything, and helps significantly (at the cost of a little
-+ # extra space).
-+ freebsd2.2*)
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+ freebsd2.*)
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+ freebsd* | dragonfly*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ hpux9*)
-+ if test "$GCC" = yes; then
-+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+ else
-+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+ fi
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ ;;
-+
-+ hpux10*)
-+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+ _LT_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_TAGVAR(hardcode_minus_L, $1)=yes
-+ fi
-+ ;;
-+
-+ hpux11*)
-+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-+ case $host_cpu in
-+ hppa*64*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ ia64*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ *)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ esac
-+ else
-+ case $host_cpu in
-+ hppa*64*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ ia64*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ *)
-+ m4_if($1, [], [
-+ # Older versions of the 11.00 compiler do not understand -b yet
-+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-+ _LT_LINKER_OPTION([if $CC understands -b],
-+ _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
-+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
-+ [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
-+ [_LT_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
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ case $host_cpu in
-+ hppa*64*|ia64*)
-+ _LT_TAGVAR(hardcode_direct, $1)=no
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+ *)
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+ _LT_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_TAGVAR(hardcode_minus_L, $1)=yes
-+ ;;
-+ esac
-+ fi
-+ ;;
-+
-+ irix5* | irix6* | nonstopux*)
-+ if test "$GCC" = yes; then
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ # Try to use the -exported_symbol ld option, if it does not
-+ # work, assume that -exports_file does not work either and
-+ # implicitly export all symbols.
-+ # This should be the same for all languages, so no per-tag cache variable.
-+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
-+ [lt_cv_irix_exported_symbol],
-+ [save_LDFLAGS="$LDFLAGS"
-+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-+ AC_LINK_IFELSE(
-+ [AC_LANG_SOURCE(
-+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
-+ [C++], [[int foo (void) { return 0; }]],
-+ [Fortran 77], [[
-+ subroutine foo
-+ end]],
-+ [Fortran], [[
-+ subroutine foo
-+ end]])])],
-+ [lt_cv_irix_exported_symbol=yes],
-+ [lt_cv_irix_exported_symbol=no])
-+ LDFLAGS="$save_LDFLAGS"])
-+ if test "$lt_cv_irix_exported_symbol" = yes; then
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-+ fi
-+ else
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-+ fi
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_TAGVAR(inherit_rpath, $1)=yes
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+ ;;
-+
-+ netbsd*)
-+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
-+ else
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
-+ fi
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ newsos6)
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ *nto* | *qnx*)
-+ ;;
-+
-+ openbsd*)
-+ if test -f /usr/libexec/ld.so; then
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ ;;
-+ *)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
-+ os2*)
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+ ;;
-+
-+ osf3*)
-+ if test "$GCC" = yes; then
-+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ else
-+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+ fi
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+ ;;
-+
-+ osf4* | osf5*) # as osf3* with the addition of -msym flag
-+ if test "$GCC" = yes; then
-+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ else
-+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_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_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+ fi
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+ ;;
-+
-+ solaris*)
-+ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-+ if test "$GCC" = yes; then
-+ wlarc='${wl}'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+ else
-+ case `$CC -V 2>&1` in
-+ *"Compilers 5.0"*)
-+ wlarc=''
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_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'
-+ ;;
-+ *)
-+ wlarc='${wl}'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_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} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+ ;;
-+ esac
-+ fi
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ case $host_os in
-+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+ *)
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'. GCC discards it without `$wl',
-+ # but is careful enough not to reorder.
-+ # Supported since Solaris 2.6 (maybe 2.5.1?)
-+ if test "$GCC" = yes; then
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ else
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-+ fi
-+ ;
-+ esac
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+ ;;
-+
-+ sunos4*)
-+ if test "x$host_vendor" = xsequent; then
-+ # Use $CC to link under sequent, because it throws in some extra .o
-+ # files that make .init and .fini sections work.
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+ fi
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ sysv4)
-+ case $host_vendor in
-+ sni)
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-+ ;
-+ siemens)
-+ ## LD is ld it makes a PLAMLIB
-+ ## CC just makes a GrossModule.
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-+ _LT_TAGVAR(hardcode_direct, $1)=no
-+ ;;
-+ motorola)
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-+ ;
-+ esac
-+ runpath_var='LD_RUN_PATH'
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ sysv4.3*)
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-+ ;;
-+
-+ sysv4*MP*)
-+ if test -d /usr/nec; then
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ runpath_var=LD_RUN_PATH
-+ hardcode_runpath_var=yes
-+ _LT_TAGVAR(ld_shlibs, $1)=yes
-+ fi
-+ ;;
-+
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ runpath_var='LD_RUN_PATH'
-+
-+ if test "$GCC" = yes; then
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ fi
-+ ;;
-+
-+ 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_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-+ runpath_var='LD_RUN_PATH'
-+
-+ if test "$GCC" = yes; then
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ fi
-+ ;;
-+
-+ uts4*)
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ *)
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+
-+ if test x$host_vendor = xsni; then
-+ case $host in
-+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-+ ;
-+ esac
-+ fi
-+ fi
-+])
-+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+
-+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-+
-+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-+_LT_DECL([], [extract_expsyms_cmds], [2],
-+ [The commands to extract the exported symbol list from a shared archive])
-+
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-+x|xyes)
-+ # Assume -lc should be added
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+
-+ if test "$enable_shared" = yes && test "$GCC" = yes; then
-+ case $_LT_TAGVAR(archive_cmds, $1) in
-+ *'~'*)
-+ # FIXME: we may have to deal with multi-command sequences.
-+ ;;
-+ '$CC '*)
-+ # Test whether the compiler implicitly links with -lc since on some
-+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+ # to ld, don't add -lc before -lgcc.
-+ AC_CACHE_CHECK([whether -lc should be explicitly linked in],
-+ [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
-+ [$RM conftest*
-+ echo "$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_TAGVAR(lt_prog_compiler_wl, $1)
-+ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-+ compiler_flags=-v
-+ linker_flags=-v
-+ verstring=
-+ output_objdir=.
-+ libname=conftest
-+ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-+ _LT_TAGVAR(allow_undefined_flag, $1)=
-+ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-+ then
-+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+ else
-+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+ fi
-+ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-+ else
-+ cat conftest.err 1>&5
-+ fi
-+ $RM conftest*
-+ ])
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
-+ ;;
-+ esac
-+ fi
-+ ;;
-+esac
-+
-+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-+ [Whether or not to add -lc for building shared libraries])
-+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-+ [enable_shared_with_static_runtimes], [0],
-+ [Whether or not to disallow shared libs when runtime libs are static])
-+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-+ [Compiler flag to allow reflexive dlopens])
-+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-+ [Compiler flag to generate shared objects directly from archives])
-+_LT_TAGDECL([], [compiler_needs_object], [1],
-+ [Whether the compiler copes with passing no objects directly])
-+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-+ [Create an old-style archive from a shared archive])
-+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-+ [Create a temporary old-style archive to link instead of a shared archive])
-+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-+_LT_TAGDECL([], [archive_expsym_cmds], [2])
-+_LT_TAGDECL([], [module_cmds], [2],
-+ [Commands used to build a loadable module if different from building
-+ a shared archive.])
-+_LT_TAGDECL([], [module_expsym_cmds], [2])
-+_LT_TAGDECL([], [with_gnu_ld], [1],
-+ [Whether we are building with GNU ld or not])
-+_LT_TAGDECL([], [allow_undefined_flag], [1],
-+ [Flag that allows shared libraries with undefined symbols to be built])
-+_LT_TAGDECL([], [no_undefined_flag], [1],
-+ [Flag that enforces no undefined symbols])
-+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-+ [Flag to hardcode $libdir into a binary during linking.
-+ This must work even if $libdir does not exist])
-+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-+ [Whether we need a single "-rpath" flag with a separated argument])
-+_LT_TAGDECL([], [hardcode_direct], [0],
-+ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-+ DIR into the resulting binary])
-+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-+ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-+ DIR into the resulting binary and the resulting library dependency is
-+ "absolute", i.e impossible to change by setting ${shlibpath_var} if the
-+ library is relocated])
-+_LT_TAGDECL([], [hardcode_minus_L], [0],
-+ [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-+ into the resulting binary])
-+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-+ [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-+ into the resulting binary])
-+_LT_TAGDECL([], [hardcode_automatic], [0],
-+ [Set to "yes" if building a shared library automatically hardcodes DIR
-+ into the library and all subsequent libraries and executables linked
-+ against it])
-+_LT_TAGDECL([], [inherit_rpath], [0],
-+ [Set to yes if linker adds runtime paths of dependent libraries
-+ to runtime path list])
-+_LT_TAGDECL([], [link_all_deplibs], [0],
-+ [Whether libtool must link a program against all its dependency libraries])
-+_LT_TAGDECL([], [always_export_symbols], [0],
-+ [Set to "yes" if exported symbols are required])
-+_LT_TAGDECL([], [export_symbols_cmds], [2],
-+ [The commands to list exported symbols])
-+_LT_TAGDECL([], [exclude_expsyms], [1],
-+ [Symbols that should not be listed in the preloaded symbols])
-+_LT_TAGDECL([], [include_expsyms], [1],
-+ [Symbols that must always be exported])
-+_LT_TAGDECL([], [prelink_cmds], [2],
-+ [Commands necessary for linking programs (against libraries) with templates])
-+_LT_TAGDECL([], [postlink_cmds], [2],
-+ [Commands necessary for finishing linking programs])
-+_LT_TAGDECL([], [file_list_spec], [1],
-+ [Specify filename containing input files])
-+dnl FIXME: Not yet implemented
-+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-+dnl [Compiler flag to generate thread safe objects])
-+])# _LT_LINKER_SHLIBS
-+
-+
-+# _LT_LANG_C_CONFIG([TAG])
-+# ------------------------
-+# Ensure that the configuration variables for a C compiler are suitably
-+# defined. These variables are subsequently used by _LT_CONFIG to write
-+# the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_C_CONFIG],
-+[m4_require([_LT_DECL_EGREP])dnl
-+lt_save_CC="$CC"
-+AC_LANG_PUSH(C)
-+
-+# Source file extension for C test sources.
-+ac_ext=c
-+
-+# Object file extension for compiled C test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(){return(0);}'
-+
-+_LT_TAG_COMPILER
-+# Save the default compiler, since it gets overwritten when the other
-+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-+compiler_DEFAULT=$CC
-+
-+# 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
-+## the running order or otherwise move them around unless you know exactly
-+## what you are doing...
-+if test -n "$compiler"; then
-+ _LT_COMPILER_NO_RTTI($1)
-+ _LT_COMPILER_PIC($1)
-+ _LT_COMPILER_C_O($1)
-+ _LT_COMPILER_FILE_LOCKS($1)
-+ _LT_LINKER_SHLIBS($1)
-+ _LT_SYS_DYNAMIC_LINKER($1)
-+ _LT_LINKER_HARDCODE_LIBPATH($1)
-+ LT_SYS_DLOPEN_SELF
-+ _LT_CMD_STRIPLIB
-+
-+ # Report which library types will actually be built
-+ AC_MSG_CHECKING([if libtool supports shared libraries])
-+ AC_MSG_RESULT([$can_build_shared])
-+
-+ AC_MSG_CHECKING([whether to build shared libraries])
-+ test "$can_build_shared" = "no" && enable_shared=no
-+
-+ # On AIX, shared libraries and static libraries use the same namespace, and
-+ # are all built from PIC.
-+ case $host_os in
-+ aix3*)
-+ test "$enable_shared" = yes && enable_static=no
-+ if test -n "$RANLIB"; then
-+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+ postinstall_cmds='$RANLIB $lib'
-+ fi
-+ ;;
-+
-+ aix[[4-9]]*)
-+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+ test "$enable_shared" = yes && enable_static=no
-+ fi
-+ ;;
-+ esac
-+ AC_MSG_RESULT([$enable_shared])
-+
-+ AC_MSG_CHECKING([whether to build static libraries])
-+ # Make sure either enable_shared or enable_static is yes.
-+ test "$enable_shared" = yes || enable_static=yes
-+ AC_MSG_RESULT([$enable_static])
-+
-+ _LT_CONFIG($1)
-+fi
-+AC_LANG_POP
-+CC="$lt_save_CC"
-+])# _LT_LANG_C_CONFIG
-+
-+
-+# _LT_LANG_CXX_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for a C++ compiler are suitably
-+# defined. These variables are subsequently used by _LT_CONFIG to write
-+# the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_CXX_CONFIG],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-+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
-+else
-+ _lt_caught_CXX_error=yes
-+fi
-+
-+AC_LANG_PUSH(C++)
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_TAGVAR(allow_undefined_flag, $1)=
-+_LT_TAGVAR(always_export_symbols, $1)=no
-+_LT_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_TAGVAR(compiler_needs_object, $1)=no
-+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_direct, $1)=no
-+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+_LT_TAGVAR(hardcode_automatic, $1)=no
-+_LT_TAGVAR(inherit_rpath, $1)=no
-+_LT_TAGVAR(module_cmds, $1)=
-+_LT_TAGVAR(module_expsym_cmds, $1)=
-+_LT_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(reload_flag, $1)=$reload_flag
-+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-+_LT_TAGVAR(no_undefined_flag, $1)=
-+_LT_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
-+# Source file extension for C++ test sources.
-+ac_ext=cpp
-+
-+# Object file extension for compiled C++ test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# No sense in running all these tests if we already determined that
-+# the CXX compiler isn't working. Some variables (like enable_shared)
-+# are currently assumed to apply to all compilers on this platform,
-+# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_caught_CXX_error" != yes; then
-+ # Code to be used in simple compile tests
-+ lt_simple_compile_test_code="int some_variable = 0;"
-+
-+ # Code to be used in simple link tests
-+ lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-+
-+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+ _LT_TAG_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_CFLAGS=$CFLAGS
-+ lt_save_LD=$LD
-+ lt_save_GCC=$GCC
-+ GCC=$GXX
-+ lt_save_with_gnu_ld=$with_gnu_ld
-+ lt_save_path_LD=$lt_cv_path_LD
-+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-+ else
-+ $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
-+ $as_unset lt_cv_path_LD
-+ fi
-+ test -z "${LDCXX+set}" || LD=$LDCXX
-+ CC=${CXX-"c++"}
-+ CFLAGS=$CXXFLAGS
-+ compiler=$CC
-+ _LT_TAGVAR(compiler, $1)=$CC
-+ _LT_CC_BASENAME([$compiler])
-+
-+ if test -n "$compiler"; then
-+ # We don't want -fno-exception when compiling C++ code, so set the
-+ # no_builtin_flag separately
-+ if test "$GXX" = yes; then
-+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-+ else
-+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-+ fi
-+
-+ if test "$GXX" = yes; then
-+ # Set up default GNU C++ configuration
-+
-+ LT_PATH_LD
-+
-+ # Check if GNU C++ uses GNU ld as the underlying linker, since the
-+ # archiving commands below assume that GNU ld is being used.
-+ if test "$with_gnu_ld" = yes; then
-+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+
-+ # If archive_cmds runs LD, not CC, wlarc should be empty
-+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-+ # investigate it a little bit more. (MM)
-+ wlarc='${wl}'
-+
-+ # ancient GNU ld didn't support --whole-archive et. al.
-+ if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-+ $GREP 'no-whole-archive' > /dev/null; then
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ else
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+ fi
-+ else
-+ with_gnu_ld=no
-+ wlarc=
-+
-+ # A generic and very simple default shared library creation
-+ # command for GNU C++ for the case where it uses the native
-+ # linker, instead of GNU ld. If possible, this setting should
-+ # overridden to take advantage of the native linker features on
-+ # the platform it is being used on.
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+ fi
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-+
-+ else
-+ GXX=no
-+ with_gnu_ld=no
-+ wlarc=
-+ fi
-+
-+ # PORTME: fill in a description of your system's C++ link characteristics
-+ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+ _LT_TAGVAR(ld_shlibs, $1)=yes
-+ case $host_os in
-+ aix3*)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ aix[[4-9]]*)
-+ if test "$host_cpu" = ia64; then
-+ # On IA64, the linker does run time linking by default, so we don't
-+ # have to do anything special.
-+ aix_use_runtimelinking=no
-+ exp_sym_flag='-Bexport'
-+ no_entry_flag=""
-+ else
-+ 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]].*|aix[[5-9]]*)
-+ 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
-+
-+ # When large executables or shared objects are built, AIX ld can
-+ # have problems creating the table of contents. If linking a library
-+ # or program results in "error TOC overflow" add -mminimal-toc to
-+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
-+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+ _LT_TAGVAR(archive_cmds, $1)=''
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-+
-+ if test "$GXX" = yes; then
-+ 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`
-+ if test -f "$collect2name" &&
-+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-+ then
-+ # We have reworked collect2
-+ :
-+ else
-+ # We have old collect2
-+ _LT_TAGVAR(hardcode_direct, $1)=unsupported
-+ # It fails to find uninstalled libraries when the uninstalled
-+ # path is not listed in the libpath. Setting hardcode_minus_L
-+ # to unsupported forces relinking
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_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
-+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+ # chokes on -Wl,-G. The following line is correct:
-+ shared_flag='-G'
-+ else
-+ if test "$aix_use_runtimelinking" = yes; then
-+ shared_flag='${wl}-G'
-+ else
-+ shared_flag='${wl}-bM:SRE'
-+ fi
-+ fi
-+ fi
-+
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-+ # It seems that -bexpall does not export symbols beginning with
-+ # underscore (_), so it is better to generate a list of symbols to
-+ # export.
-+ _LT_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_TAGVAR(allow_undefined_flag, $1)='-berok'
-+ # Determine the default libpath from the value encoded in an empty
-+ # executable.
-+ _LT_SYS_MODULE_PATH_AIX([$1])
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+
-+ _LT_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 func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ else
-+ if test "$host_cpu" = ia64; then
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-+ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-+ _LT_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_SYS_MODULE_PATH_AIX([$1])
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ # Warning - without using the other run time loading flags,
-+ # -berok will link without error, but may produce a broken library.
-+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+ if test "$with_gnu_ld" = yes; then
-+ # We only use this code for GNU lds that support --whole-archive.
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+ else
-+ # Exported symbols can be pulled into shared objects from archives
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-+ fi
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+ # This is similar to how AIX traditionally builds its shared
-+ # libraries.
-+ _LT_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_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+ # support --undefined. This deserves some investigation. FIXME
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;
-+
-+ chorus*)
-+ case $cc_basename in
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ ;;
-+
-+ cygwin* | mingw* | pw32* | cegcc*)
-+ case $GXX,$cc_basename in
-+ ,cl* | no,cl*)
-+ # Native MSVC
-+ # hardcode_libdir_flag_spec is actually meaningless, as there is
-+ # no search path for DLLs.
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ _LT_TAGVAR(always_export_symbols, $1)=yes
-+ _LT_TAGVAR(file_list_spec, $1)='@'
-+ # Tell ltmain to make .lib files, not .a files.
-+ libext=lib
-+ # Tell ltmain to make .dll files, not .so files.
-+ shrext_cmds=".dll"
-+ # FIXME: Setting linknames here is a bad hack.
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-+ else
-+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-+ fi~
-+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-+ linknames='
-+ # The linker will not automatically build a static lib if we build a DLL.
-+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+ # Don't use ranlib
-+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-+ lt_tool_outputfile="@TOOL_OUTPUT@"~
-+ case $lt_outputfile in
-+ *.exe|*.EXE) ;;
-+ *)
-+ lt_outputfile="$lt_outputfile.exe"
-+ lt_tool_outputfile="$lt_tool_outputfile.exe"
-+ ;
-+ esac~
-+ func_to_tool_file "$lt_outputfile"~
-+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-+ $RM "$lt_outputfile.manifest";
-+ fi'
-+ ;;
-+ *)
-+ # g++
-+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+ # as there is no search path for DLLs.
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ _LT_TAGVAR(always_export_symbols, $1)=no
-+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+
-+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+ _LT_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_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+ cp $export_symbols $output_objdir/$soname.def;
-+ else
-+ 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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+ esac
-+ ;
-+ darwin* | rhapsody*)
-+ _LT_DARWIN_LINKER_FEATURES($1)
-+ ;
-+
-+ dgux*)
-+ case $cc_basename in
-+ ec++*)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ ghcx*)
-+ # Green Hills C++ Compiler
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ ;;
-+
-+ freebsd2.*)
-+ # C++ shared libraries reported to be fairly broken before
-+ # switch to ELF
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+
-+ freebsd-elf*)
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+ ;;
-+
-+ freebsd* | dragonfly*)
-+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-+ # conventions
-+ _LT_TAGVAR(ld_shlibs, $1)=yes
-+ ;;
-+
-+ gnu*)
-+ ;;
-+
-+ haiku*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+ ;;
-+
-+ hpux9*)
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-+ # but as the default
-+ # location of the library.
-+
-+ case $cc_basename in
-+ CC*)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ aCC*)
-+ _LT_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
-+ # 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 -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; func_echo_all "$list"'
-+ ;;
-+ *)
-+ if test "$GXX" = yes; then
-+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${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'
-+ else
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+ esac
-+ ;;
-+
-+ hpux10*|hpux11*)
-+ if test $with_gnu_ld = no; then
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ case $host_cpu in
-+ hppa*64*|ia64*)
-+ ;;
-+ *)
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ ;;
-+ esac
-+ fi
-+ case $host_cpu in
-+ hppa*64*|ia64*)
-+ _LT_TAGVAR(hardcode_direct, $1)=no
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+ *)
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-+ # but as the default
-+ # location of the library.
-+ ;;
-+ esac
-+
-+ case $cc_basename in
-+ CC*)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ aCC*)
-+ case $host_cpu in
-+ hppa*64*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ ;;
-+ ia64*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ ;;
-+ *)
-+ _LT_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'
-+ ;;
-+ esac
-+ # 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 -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; func_echo_all "$list"'
-+ ;;
-+ *)
-+ if test "$GXX" = yes; then
-+ if test $with_gnu_ld = no; then
-+ case $host_cpu in
-+ hppa*64*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ ;;
-+ ia64*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ ;;
-+ *)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ ;;
-+ esac
-+ fi
-+ else
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+ esac
-+ ;;
-+
-+ interix[[3-9]]*)
-+ _LT_TAGVAR(hardcode_direct, $1)=no
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_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_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_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*)
-+ # SGI C++
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-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
-+ # necessary to make sure instantiated templates are included
-+ # in the archive.
-+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-+ ;;
-+ *)
-+ if test "$GXX" = yes; then
-+ if test "$with_gnu_ld" = no; then
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ else
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
-+ fi
-+ fi
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+ ;;
-+ esac
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_TAGVAR(inherit_rpath, $1)=yes
-+ ;;
-+
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+ case $cc_basename in
-+ KCC*)
-+ # Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+ # KCC will only create a shared library if the output file
-+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
-+ # to its proper name (with version) after linking.
-+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-+ # 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 $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-+
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-+ ;;
-+ icpc* | ecpc* )
-+ # 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_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_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_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_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_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+ ;;
-+ pgCC* | pgcpp*)
-+ # Portland Group C++ compiler
-+ case `$CC -V` in
-+ *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
-+ _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-+ rm -rf $tpldir~
-+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-+ _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-+ rm -rf $tpldir~
-+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-+ $RANLIB $oldlib'
-+ _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-+ rm -rf $tpldir~
-+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-+ rm -rf $tpldir~
-+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+ ;;
-+ *) # Version 6 and above use weak symbols
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+ _LT_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'
-+ ;;
-+ esac
-+
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+ ;;
-+ cxx*)
-+ # Compaq C++
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_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'
-+
-+ runpath_var=LD_RUN_PATH
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ # 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 -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
-+ ;;
-+ xl* | mpixl* | bgxl*)
-+ # IBM XL 8.0 on PPC, with GNU ld
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ if test "x$supports_anon_versioning" = xyes; then
-+ _LT_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 -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ fi
-+ ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+ _LT_TAGVAR(compiler_needs_object, $1)=yes
-+
-+ # Not sure whether something based on
-+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-+ # would be better.
-+ output_verbose_link_cmd='func_echo_all'
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
-+ # necessary to make sure instantiated templates are included
-+ # in the archive.
-+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-+ ;;
-+ esac
-+ ;;
-+ esac
-+ ;
-+
-+ lynxos*)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;
-+
-+ m88k*)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;
-+
-+ mvs*)
-+ case $cc_basename in
-+ cxx*)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ ;
-+
-+ netbsd*)
-+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-+ wlarc=
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ fi
-+ # 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::"'
-+ ;
-+
-+ *nto* | *qnx*)
-+ _LT_TAGVAR(ld_shlibs, $1)=yes
-+ ;
-+
-+ openbsd2*)
-+ # C++ shared libraries are fairly broken
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;
-+
-+ openbsd*)
-+ if test -f /usr/libexec/ld.so; then
-+ _LT_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+ _LT_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_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_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ fi
-+ output_verbose_link_cmd=func_echo_all
-+ else
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;
-+
-+ osf3* | osf4* | osf5*)
-+ case $cc_basename in
-+ KCC*)
-+ # Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+ # KCC will only create a shared library if the output file
-+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
-+ # to its proper name (with version) after linking.
-+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ # Archives containing C++ object files must be created using
-+ # the KAI C++ compiler.
-+ case $host in
-+ osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-+ *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-+ esac
-+ ;;
-+ RCC*)
-+ # Rational C++ 2.4.1
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ cxx*)
-+ case $host in
-+ osf3*)
-+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ ;
-+ *)
-+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+ _LT_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 ${output_objdir}/so_locations -o $lib~
-+ $RM $lib.exp'
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+ ;
-+ esac
-+
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ # 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 -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-+ ;;
-+ *)
-+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+ case $host in
-+ osf3*)
-+ _LT_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" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ ;;
-+ *)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ ;;
-+ esac
-+
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-+
-+ else
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+ esac
-+ ;;
-+
-+ psos*)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+
-+ sunos4*)
-+ case $cc_basename in
-+ CC*)
-+ # Sun C++ 4.x
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ lcc*)
-+ # Lucid
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ ;;
-+
-+ solaris*)
-+ case $cc_basename in
-+ CC* | sunCC*)
-+ # Sun C++ 4.2, 5.x and Centerline C++
-+ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-+ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ _LT_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} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ case $host_os in
-+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+ *)
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'.
-+ # Supported since Solaris 2.6 (maybe 2.5.1?)
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-+ ;;
-+ esac
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+
-+ output_verbose_link_cmd='func_echo_all'
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
-+ # necessary to make sure instantiated templates are included
-+ # in the archive.
-+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-+ ;;
-+ gcx*)
-+ # Green Hills C++ Compiler
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+
-+ # The C++ compiler must be used to create the archive.
-+ _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-+ ;;
-+ *)
-+ # GNU C++ compiler with Solaris linker
-+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-+ if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-+ else
-+ # g++ 2.7 appears to require `-G' NOT `-shared' on this
-+ # platform.
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-+ fi
-+
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-+ case $host_os in
-+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+ *)
-+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ ;;
-+ esac
-+ fi
-+ ;;
-+ esac
-+ ;;
-+
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ runpath_var='LD_RUN_PATH'
-+
-+ case $cc_basename in
-+ CC*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ *)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_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.
-+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+ _LT_TAGVAR(link_all_deplibs, $1)=yes
-+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-+ runpath_var='LD_RUN_PATH'
-+
-+ case $cc_basename in
-+ CC*)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
-+ '"$_LT_TAGVAR(old_archive_cmds, $1)"
-+ _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
-+ '"$_LT_TAGVAR(reload_cmds, $1)"
-+ ;;
-+ *)
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ esac
-+ ;;
-+
-+ tandem*)
-+ case $cc_basename in
-+ NCC*)
-+ # NonStop-UX NCC 3.20
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ ;;
-+
-+ vxworks*)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+
-+ AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-+ test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+
-+ _LT_TAGVAR(GCC, $1)="$GXX"
-+ _LT_TAGVAR(LD, $1)="$LD"
-+
-+ ## 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
-+ ## what you are doing...
-+ _LT_SYS_HIDDEN_LIBDEPS($1)
-+ _LT_COMPILER_PIC($1)
-+ _LT_COMPILER_C_O($1)
-+ _LT_COMPILER_FILE_LOCKS($1)
-+ _LT_LINKER_SHLIBS($1)
-+ _LT_SYS_DYNAMIC_LINKER($1)
-+ _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+ _LT_CONFIG($1)
-+ fi # test -n "$compiler"
-+
-+ CC=$lt_save_CC
-+ CFLAGS=$lt_save_CFLAGS
-+ LDCXX=$LD
-+ LD=$lt_save_LD
-+ GCC=$lt_save_GCC
-+ with_gnu_ld=$lt_save_with_gnu_ld
-+ lt_cv_path_LDCXX=$lt_cv_path_LD
-+ lt_cv_path_LD=$lt_save_path_LD
-+ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-+ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-+fi # test "$_lt_caught_CXX_error" != yes
-+
-+AC_LANG_POP
-+])# _LT_LANG_CXX_CONFIG
-+
-+
-+# _LT_FUNC_STRIPNAME_CNF
-+# ----------------------
-+# func_stripname_cnf prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+#
-+# This function is identical to the (non-XSI) version of func_stripname,
-+# except this one can be used by m4 code that may be executed by configure,
-+# rather than the libtool script.
-+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
-+AC_REQUIRE([_LT_DECL_SED])
-+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
-+func_stripname_cnf ()
-+{
-+ case ${2} in
-+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-+ esac
-+} # func_stripname_cnf
-+])# _LT_FUNC_STRIPNAME_CNF
-+
-+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-+# ---------------------------------
-+# Figure out "hidden" library dependencies from verbose
-+# compiler output when linking a shared library.
-+# Parse the compiler output and extract the necessary
-+# objects, libraries and library flags.
-+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
-+# Dependencies to place before and after the object being linked:
-+_LT_TAGVAR(predep_objects, $1)=
-+_LT_TAGVAR(postdep_objects, $1)=
-+_LT_TAGVAR(predeps, $1)=
-+_LT_TAGVAR(postdeps, $1)=
-+_LT_TAGVAR(compiler_lib_search_path, $1)=
-+
-+dnl we can't use the lt_simple_compile_test_code here,
-+dnl because it contains code intended for an executable,
-+dnl not a library. It's possible we should let each
-+dnl tag define a new lt_????_link_test_code variable,
-+dnl but it's only used here...
-+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-+int a;
-+void foo (void) { a = 0; }
-+_LT_EOF
-+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-+class Foo
-+{
-+public:
-+ Foo (void) { a = 0; }
-+private:
-+ int a;
-+};
-+_LT_EOF
-+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-+ subroutine foo
-+ implicit none
-+ integer*4 a
-+ a=0
-+ return
-+ end
-+_LT_EOF
-+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-+ subroutine foo
-+ implicit none
-+ integer a
-+ a=0
-+ return
-+ end
-+_LT_EOF
-+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-+public class foo {
-+ private int a;
-+ public void bar (void) {
-+ a = 0;
-+ }
-+};
-+_LT_EOF
-+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
-+package foo
-+func foo() {
-+}
-+_LT_EOF
-+])
-+
-+_lt_libdeps_save_CFLAGS=$CFLAGS
-+case "$CC $CFLAGS " in #(
-+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-+esac
-+
-+dnl Parse the compiler output and extract the necessary
-+dnl objects, libraries and library flags.
-+if AC_TRY_EVAL(ac_compile); then
-+ # Parse the compiler output and extract the necessary
-+ # objects, libraries and library flags.
-+
-+ # Sentinel used to keep track of whether or not we are before
-+ # the conftest object file.
-+ pre_test_object_deps_done=no
-+
-+ for p in `eval "$output_verbose_link_cmd"`; do
-+ case ${prev}${p} in
-+
-+ -L* | -R* | -l*)
-+ # Some compilers place space between "-{L,R}" and the path.
-+ # Remove the space.
-+ if test $p = "-L" ||
-+ test $p = "-R"; then
-+ prev=$p
-+ continue
-+ fi
-+
-+ # Expand the sysroot to ease extracting the directories later.
-+ if test -z "$prev"; then
-+ case $p in
-+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-+ esac
-+ fi
-+ case $p in
-+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-+ esac
-+ if test "$pre_test_object_deps_done" = no; then
-+ case ${prev} in
-+ -L | -R)
-+ # Internal compiler library paths should come after those
-+ # provided the user. The postdeps already come after the
-+ # user supplied libs so there is no need to process them.
-+ if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-+ _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-+ else
-+ _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-+ fi
-+ ;;
-+ # The "-l" case would never come before the object being
-+ # linked, so don't bother handling this case.
-+ esac
-+ else
-+ if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-+ _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-+ else
-+ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-+ fi
-+ fi
-+ prev=
-+ ;;
-+
-+ *.lto.$objext) ;; # Ignore GCC LTO objects
-+ *.$objext)
-+ # This assumes that the test object file only shows up
-+ # once in the compiler output.
-+ if test "$p" = "conftest.$objext"; then
-+ pre_test_object_deps_done=yes
-+ continue
-+ fi
-+
-+ if test "$pre_test_object_deps_done" = no; then
-+ if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-+ _LT_TAGVAR(predep_objects, $1)="$p"
-+ else
-+ _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-+ fi
-+ else
-+ if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-+ _LT_TAGVAR(postdep_objects, $1)="$p"
-+ else
-+ _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-+ fi
-+ fi
-+ ;;
-+
-+ *) ;; # Ignore the rest.
-+
-+ esac
-+ done
-+
-+ # Clean up.
-+ rm -f a.out a.exe
-+else
-+ echo "libtool.m4: error: problem compiling $1 test program"
-+fi
-+
-+$RM -f confest.$objext
-+CFLAGS=$_lt_libdeps_save_CFLAGS
-+
-+# PORTME: override above test on systems where it is broken
-+m4_if([$1], [CXX],
-+[case $host_os in
-+interix[[3-9]]*)
-+ # Interix 3.5 installs completely hosed .la files for C++, so rather than
-+ # hack all around it, let's just trust "g++" to DTRT.
-+ _LT_TAGVAR(predep_objects,$1)=
-+ _LT_TAGVAR(postdep_objects,$1)=
-+ _LT_TAGVAR(postdeps,$1)=
-+ ;;
-+
-+linux*)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-+
-+ if test "$solaris_use_stlport4" != yes; then
-+ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+ fi
-+ ;;
-+ esac
-+ ;;
-+
-+solaris*)
-+ case $cc_basename in
-+ CC* | sunCC*)
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-+
-+ # Adding this requires a known-good setup of shared libraries for
-+ # Sun compiler versions before 5.6, else PIC objects from an old
-+ # archive will be linked into the output, leading to subtle bugs.
-+ if test "$solaris_use_stlport4" != yes; then
-+ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+ fi
-+ ;;
-+ esac
-+ ;;
-+esac
-+])
-+
-+case " $_LT_TAGVAR(postdeps, $1) " in
-+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-+esac
-+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
-+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-+fi
-+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-+ [The directories searched by this compiler when creating a shared library])
-+_LT_TAGDECL([], [predep_objects], [1],
-+ [Dependencies to place before and after the objects being linked to
-+ create a shared library])
-+_LT_TAGDECL([], [postdep_objects], [1])
-+_LT_TAGDECL([], [predeps], [1])
-+_LT_TAGDECL([], [postdeps], [1])
-+_LT_TAGDECL([], [compiler_lib_search_path], [1],
-+ [The library search path used internally by the compiler when linking
-+ a shared library])
-+])# _LT_SYS_HIDDEN_LIBDEPS
-+
-+
-+# _LT_LANG_F77_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for a Fortran 77 compiler are
-+# suitably defined. These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_F77_CONFIG],
-+[AC_LANG_PUSH(Fortran 77)
-+if test -z "$F77" || test "X$F77" = "Xno"; then
-+ _lt_disable_F77=yes
-+fi
-+
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_TAGVAR(allow_undefined_flag, $1)=
-+_LT_TAGVAR(always_export_symbols, $1)=no
-+_LT_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_direct, $1)=no
-+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_TAGVAR(hardcode_automatic, $1)=no
-+_LT_TAGVAR(inherit_rpath, $1)=no
-+_LT_TAGVAR(module_cmds, $1)=
-+_LT_TAGVAR(module_expsym_cmds, $1)=
-+_LT_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(reload_flag, $1)=$reload_flag
-+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-+_LT_TAGVAR(no_undefined_flag, $1)=
-+_LT_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
-+# Source file extension for f77 test sources.
-+ac_ext=f
-+
-+# Object file extension for compiled f77 test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# No sense in running all these tests if we already determined that
-+# the F77 compiler isn't working. Some variables (like enable_shared)
-+# are currently assumed to apply to all compilers on this platform,
-+# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_disable_F77" != yes; then
-+ # Code to be used in simple compile tests
-+ lt_simple_compile_test_code="\
-+ subroutine t
-+ return
-+ end
-+"
-+
-+ # Code to be used in simple link tests
-+ lt_simple_link_test_code="\
-+ program t
-+ end
-+"
-+
-+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+ _LT_TAG_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_GCC=$GCC
-+ lt_save_CFLAGS=$CFLAGS
-+ CC=${F77-"f77"}
-+ CFLAGS=$FFLAGS
-+ compiler=$CC
-+ _LT_TAGVAR(compiler, $1)=$CC
-+ _LT_CC_BASENAME([$compiler])
-+ GCC=$G77
-+ if test -n "$compiler"; then
-+ AC_MSG_CHECKING([if libtool supports shared libraries])
-+ AC_MSG_RESULT([$can_build_shared])
-+
-+ AC_MSG_CHECKING([whether to build shared libraries])
-+ test "$can_build_shared" = "no" && enable_shared=no
-+
-+ # On AIX, shared libraries and static libraries use the same namespace, and
-+ # are all built from PIC.
-+ case $host_os in
-+ aix3*)
-+ test "$enable_shared" = yes && enable_static=no
-+ if test -n "$RANLIB"; then
-+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+ postinstall_cmds='$RANLIB $lib'
-+ fi
-+ ;;
-+ aix[[4-9]]*)
-+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+ test "$enable_shared" = yes && enable_static=no
-+ fi
-+ ;;
-+ esac
-+ AC_MSG_RESULT([$enable_shared])
-+
-+ AC_MSG_CHECKING([whether to build static libraries])
-+ # Make sure either enable_shared or enable_static is yes.
-+ test "$enable_shared" = yes || enable_static=yes
-+ AC_MSG_RESULT([$enable_static])
-+
-+ _LT_TAGVAR(GCC, $1)="$G77"
-+ _LT_TAGVAR(LD, $1)="$LD"
-+
-+ ## 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
-+ ## what you are doing...
-+ _LT_COMPILER_PIC($1)
-+ _LT_COMPILER_C_O($1)
-+ _LT_COMPILER_FILE_LOCKS($1)
-+ _LT_LINKER_SHLIBS($1)
-+ _LT_SYS_DYNAMIC_LINKER($1)
-+ _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+ _LT_CONFIG($1)
-+ fi # test -n "$compiler"
-+
-+ GCC=$lt_save_GCC
-+ CC="$lt_save_CC"
-+ CFLAGS="$lt_save_CFLAGS"
-+fi # test "$_lt_disable_F77" != yes
-+
-+AC_LANG_POP
-+])# _LT_LANG_F77_CONFIG
-+
-+
-+# _LT_LANG_FC_CONFIG([TAG])
-+# -------------------------
-+# Ensure that the configuration variables for a Fortran compiler are
-+# suitably defined. These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_FC_CONFIG],
-+[AC_LANG_PUSH(Fortran)
-+
-+if test -z "$FC" || test "X$FC" = "Xno"; then
-+ _lt_disable_FC=yes
-+fi
-+
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_TAGVAR(allow_undefined_flag, $1)=
-+_LT_TAGVAR(always_export_symbols, $1)=no
-+_LT_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_direct, $1)=no
-+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_TAGVAR(hardcode_automatic, $1)=no
-+_LT_TAGVAR(inherit_rpath, $1)=no
-+_LT_TAGVAR(module_cmds, $1)=
-+_LT_TAGVAR(module_expsym_cmds, $1)=
-+_LT_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(reload_flag, $1)=$reload_flag
-+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-+_LT_TAGVAR(no_undefined_flag, $1)=
-+_LT_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
-+# Source file extension for fc test sources.
-+ac_ext=${ac_fc_srcext-f}
-+
-+# Object file extension for compiled fc test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# No sense in running all these tests if we already determined that
-+# the FC compiler isn't working. Some variables (like enable_shared)
-+# are currently assumed to apply to all compilers on this platform,
-+# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_disable_FC" != yes; then
-+ # Code to be used in simple compile tests
-+ lt_simple_compile_test_code="\
-+ subroutine t
-+ return
-+ end
-+"
-+
-+ # Code to be used in simple link tests
-+ lt_simple_link_test_code="\
-+ program t
-+ end
-+"
-+
-+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+ _LT_TAG_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_GCC=$GCC
-+ lt_save_CFLAGS=$CFLAGS
-+ CC=${FC-"f95"}
-+ CFLAGS=$FCFLAGS
-+ compiler=$CC
-+ GCC=$ac_cv_fc_compiler_gnu
-+
-+ _LT_TAGVAR(compiler, $1)=$CC
-+ _LT_CC_BASENAME([$compiler])
-+
-+ if test -n "$compiler"; then
-+ AC_MSG_CHECKING([if libtool supports shared libraries])
-+ AC_MSG_RESULT([$can_build_shared])
-+
-+ AC_MSG_CHECKING([whether to build shared libraries])
-+ test "$can_build_shared" = "no" && enable_shared=no
-+
-+ # On AIX, shared libraries and static libraries use the same namespace, and
-+ # are all built from PIC.
-+ case $host_os in
-+ aix3*)
-+ test "$enable_shared" = yes && enable_static=no
-+ if test -n "$RANLIB"; then
-+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+ postinstall_cmds='$RANLIB $lib'
-+ fi
-+ ;;
-+ aix[[4-9]]*)
-+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+ test "$enable_shared" = yes && enable_static=no
-+ fi
-+ ;;
-+ esac
-+ AC_MSG_RESULT([$enable_shared])
-+
-+ AC_MSG_CHECKING([whether to build static libraries])
-+ # Make sure either enable_shared or enable_static is yes.
-+ test "$enable_shared" = yes || enable_static=yes
-+ AC_MSG_RESULT([$enable_static])
-+
-+ _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-+ _LT_TAGVAR(LD, $1)="$LD"
-+
-+ ## 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
-+ ## what you are doing...
-+ _LT_SYS_HIDDEN_LIBDEPS($1)
-+ _LT_COMPILER_PIC($1)
-+ _LT_COMPILER_C_O($1)
-+ _LT_COMPILER_FILE_LOCKS($1)
-+ _LT_LINKER_SHLIBS($1)
-+ _LT_SYS_DYNAMIC_LINKER($1)
-+ _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+ _LT_CONFIG($1)
-+ fi # test -n "$compiler"
-+
-+ GCC=$lt_save_GCC
-+ CC=$lt_save_CC
-+ CFLAGS=$lt_save_CFLAGS
-+fi # test "$_lt_disable_FC" != yes
-+
-+AC_LANG_POP
-+])# _LT_LANG_FC_CONFIG
-+
-+
-+# _LT_LANG_GCJ_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for the GNU Java Compiler compiler
-+# are suitably defined. These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_GCJ_CONFIG],
-+[AC_REQUIRE([LT_PROG_GCJ])dnl
-+AC_LANG_SAVE
-+
-+# Source file extension for Java test sources.
-+ac_ext=java
-+
-+# Object file extension for compiled Java test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="class foo {}"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_TAG_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_CFLAGS=$CFLAGS
-+lt_save_GCC=$GCC
-+GCC=yes
-+CC=${GCJ-"gcj"}
-+CFLAGS=$GCJFLAGS
-+compiler=$CC
-+_LT_TAGVAR(compiler, $1)=$CC
-+_LT_TAGVAR(LD, $1)="$LD"
-+_LT_CC_BASENAME([$compiler])
-+
-+# GCJ did not exist at the time GCC didn't implicitly link libc in.
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(reload_flag, $1)=$reload_flag
-+_LT_TAGVAR(reload_cmds, $1)=$reload_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
-+## what you are doing...
-+if test -n "$compiler"; then
-+ _LT_COMPILER_NO_RTTI($1)
-+ _LT_COMPILER_PIC($1)
-+ _LT_COMPILER_C_O($1)
-+ _LT_COMPILER_FILE_LOCKS($1)
-+ _LT_LINKER_SHLIBS($1)
-+ _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+ _LT_CONFIG($1)
-+fi
-+
-+AC_LANG_RESTORE
-+
-+GCC=$lt_save_GCC
-+CC=$lt_save_CC
-+CFLAGS=$lt_save_CFLAGS
-+])# _LT_LANG_GCJ_CONFIG
-+
-+
-+# _LT_LANG_GO_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for the GNU Go compiler
-+# are suitably defined. These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_GO_CONFIG],
-+[AC_REQUIRE([LT_PROG_GO])dnl
-+AC_LANG_SAVE
-+
-+# Source file extension for Go test sources.
-+ac_ext=go
-+
-+# Object file extension for compiled Go test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="package main; func main() { }"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='package main; func main() { }'
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_TAG_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_CFLAGS=$CFLAGS
-+lt_save_GCC=$GCC
-+GCC=yes
-+CC=${GOC-"gccgo"}
-+CFLAGS=$GOFLAGS
-+compiler=$CC
-+_LT_TAGVAR(compiler, $1)=$CC
-+_LT_TAGVAR(LD, $1)="$LD"
-+_LT_CC_BASENAME([$compiler])
-+
-+# Go did not exist at the time GCC didn't implicitly link libc in.
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(reload_flag, $1)=$reload_flag
-+_LT_TAGVAR(reload_cmds, $1)=$reload_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
-+## what you are doing...
-+if test -n "$compiler"; then
-+ _LT_COMPILER_NO_RTTI($1)
-+ _LT_COMPILER_PIC($1)
-+ _LT_COMPILER_C_O($1)
-+ _LT_COMPILER_FILE_LOCKS($1)
-+ _LT_LINKER_SHLIBS($1)
-+ _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+ _LT_CONFIG($1)
-+fi
-+
-+AC_LANG_RESTORE
-+
-+GCC=$lt_save_GCC
-+CC=$lt_save_CC
-+CFLAGS=$lt_save_CFLAGS
-+])# _LT_LANG_GO_CONFIG
-+
-+
-+# _LT_LANG_RC_CONFIG([TAG])
-+# -------------------------
-+# Ensure that the configuration variables for the Windows resource compiler
-+# are suitably defined. These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_RC_CONFIG],
-+[AC_REQUIRE([LT_PROG_RC])dnl
-+AC_LANG_SAVE
-+
-+# Source file extension for RC test sources.
-+ac_ext=rc
-+
-+# Object file extension for compiled RC test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code="$lt_simple_compile_test_code"
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_TAG_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_CFLAGS=$CFLAGS
-+lt_save_GCC=$GCC
-+GCC=
-+CC=${RC-"windres"}
-+CFLAGS=
-+compiler=$CC
-+_LT_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
-+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+
-+if test -n "$compiler"; then
-+ :
-+ _LT_CONFIG($1)
-+fi
-+
-+GCC=$lt_save_GCC
-+AC_LANG_RESTORE
-+CC=$lt_save_CC
-+CFLAGS=$lt_save_CFLAGS
-+])# _LT_LANG_RC_CONFIG
-+
-+
-+# LT_PROG_GCJ
-+# -----------
-+AC_DEFUN([LT_PROG_GCJ],
-+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-+ [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-+ [AC_CHECK_TOOL(GCJ, gcj,)
-+ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-+ AC_SUBST(GCJFLAGS)])])[]dnl
-+])
-+
-+# Old name:
-+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-+
-+
-+# LT_PROG_GO
-+# ----------
-+AC_DEFUN([LT_PROG_GO],
-+[AC_CHECK_TOOL(GOC, gccgo,)
-+])
-+
-+
-+# LT_PROG_RC
-+# ----------
-+AC_DEFUN([LT_PROG_RC],
-+[AC_CHECK_TOOL(RC, windres,)
-+])
-+
-+# Old name:
-+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([LT_AC_PROG_RC], [])
-+
-+
-+# _LT_DECL_EGREP
-+# --------------
-+# If we don't have a new enough Autoconf to choose the best grep
-+# available, choose the one first in the user's PATH.
-+m4_defun([_LT_DECL_EGREP],
-+[AC_REQUIRE([AC_PROG_EGREP])dnl
-+AC_REQUIRE([AC_PROG_FGREP])dnl
-+test -z "$GREP" && GREP=grep
-+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-+_LT_DECL([], [EGREP], [1], [An ERE matcher])
-+_LT_DECL([], [FGREP], [1], [A literal string matcher])
-+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-+AC_SUBST([GREP])
-+])
-+
-+
-+# _LT_DECL_OBJDUMP
-+# --------------
-+# If we don't have a new enough Autoconf to choose the best objdump
-+# available, choose the one first in the user's PATH.
-+m4_defun([_LT_DECL_OBJDUMP],
-+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-+AC_SUBST([OBJDUMP])
-+])
-+
-+# _LT_DECL_DLLTOOL
-+# ----------------
-+# Ensure DLLTOOL variable is set.
-+m4_defun([_LT_DECL_DLLTOOL],
-+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
-+AC_SUBST([DLLTOOL])
-+])
-+
-+# _LT_DECL_SED
-+# ------------
-+# Check for a fully-functional sed program, that truncates
-+# as few characters as possible. Prefer GNU sed if found.
-+m4_defun([_LT_DECL_SED],
-+[AC_PROG_SED
-+test -z "$SED" && SED=sed
-+Xsed="$SED -e 1s/^X//"
-+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-+ [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-+])# _LT_DECL_SED
-+
-+m4_ifndef([AC_PROG_SED], [
-+############################################################
-+# NOTE: This macro has been submitted for inclusion into #
-+# GNU Autoconf as AC_PROG_SED. When it is available in #
-+# a released version of Autoconf we should remove this #
-+# macro and use it instead. #
-+############################################################
-+
-+m4_defun([AC_PROG_SED],
-+[AC_MSG_CHECKING([for a sed that does not truncate output])
-+AC_CACHE_VAL(lt_cv_path_SED,
-+[# Loop through the user's path and test for sed and gsed.
-+# Then use that list of sed's as ones to test for truncation.
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for lt_ac_prog in sed gsed; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-+ fi
-+ done
-+ done
-+done
-+IFS=$as_save_IFS
-+lt_ac_max=0
-+lt_ac_count=0
-+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-+# 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 && continue
-+ cat /dev/null > conftest.in
-+ lt_ac_count=0
-+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-+ # Check for GNU sed and select it if it is found.
-+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-+ lt_cv_path_SED=$lt_ac_sed
-+ break
-+ fi
-+ while true; do
-+ cat conftest.in conftest.in >conftest.tmp
-+ mv conftest.tmp conftest.in
-+ cp conftest.in conftest.nl
-+ echo >>conftest.nl
-+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-+ cmp -s conftest.out conftest.nl || break
-+ # 10000 chars as input seems more than enough
-+ test $lt_ac_count -gt 10 && break
-+ lt_ac_count=`expr $lt_ac_count + 1`
-+ if test $lt_ac_count -gt $lt_ac_max; then
-+ lt_ac_max=$lt_ac_count
-+ lt_cv_path_SED=$lt_ac_sed
-+ fi
-+ done
-+done
-+])
-+SED=$lt_cv_path_SED
-+AC_SUBST([SED])
-+AC_MSG_RESULT([$SED])
-+])#AC_PROG_SED
-+])#m4_ifndef
-+
-+# Old name:
-+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([LT_AC_PROG_SED], [])
-+
-+
-+# _LT_CHECK_SHELL_FEATURES
-+# ------------------------
-+# Find out whether the shell is Bourne or XSI compatible,
-+# or has some other useful features.
-+m4_defun([_LT_CHECK_SHELL_FEATURES],
-+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-+# Try some XSI features
-+xsi_shell=no
-+( _lt_dummy="a/b/c"
-+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-+ = c,a/b,b/c, \
-+ && eval 'test $(( 1 + 1 )) -eq 2 \
-+ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-+ && xsi_shell=yes
-+AC_MSG_RESULT([$xsi_shell])
-+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-+
-+AC_MSG_CHECKING([whether the shell understands "+="])
-+lt_shell_append=no
-+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-+ >/dev/null 2>&1 \
-+ && lt_shell_append=yes
-+AC_MSG_RESULT([$lt_shell_append])
-+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-+
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+ lt_unset=unset
-+else
-+ lt_unset=false
-+fi
-+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-+
-+# test EBCDIC or ASCII
-+case `echo X|tr X '\101'` in
-+ A) # ASCII based system
-+ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-+ lt_SP2NL='tr \040 \012'
-+ lt_NL2SP='tr \015\012 \040\040'
-+ ;;
-+ *) # EBCDIC based system
-+ lt_SP2NL='tr \100 \n'
-+ lt_NL2SP='tr \r\n \100\100'
-+ ;;
-+esac
-+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-+])# _LT_CHECK_SHELL_FEATURES
-+
-+
-+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-+# ------------------------------------------------------
-+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-+m4_defun([_LT_PROG_FUNCTION_REPLACE],
-+[dnl {
-+sed -e '/^$1 ()$/,/^} # $1 /c\
-+$1 ()\
-+{\
-+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
-+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
-+ && mv -f "$cfgfile.tmp" "$cfgfile" \
-+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+])
-+
-+
-+# _LT_PROG_REPLACE_SHELLFNS
-+# -------------------------
-+# Replace existing portable implementations of several shell functions with
-+# equivalent extended shell implementations where those features are available..
-+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-+[if test x"$xsi_shell" = xyes; then
-+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
-+ case ${1} in
-+ */*) func_dirname_result="${1%/*}${2}" ;;
-+ * ) func_dirname_result="${3}" ;;
-+ esac])
-+
-+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
-+ func_basename_result="${1##*/}"])
-+
-+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
-+ case ${1} in
-+ */*) func_dirname_result="${1%/*}${2}" ;;
-+ * ) func_dirname_result="${3}" ;;
-+ esac
-+ func_basename_result="${1##*/}"])
-+
-+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
-+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-+ # positional parameters, so assign one to ordinary parameter first.
-+ func_stripname_result=${3}
-+ func_stripname_result=${func_stripname_result#"${1}"}
-+ func_stripname_result=${func_stripname_result%"${2}"}])
-+
-+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
-+ func_split_long_opt_name=${1%%=*}
-+ func_split_long_opt_arg=${1#*=}])
-+
-+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
-+ func_split_short_opt_arg=${1#??}
-+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-+
-+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
-+ case ${1} in
-+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-+ *) func_lo2o_result=${1} ;;
-+ esac])
-+
-+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
-+
-+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
-+
-+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
-+fi
-+
-+if test x"$lt_shell_append" = xyes; then
-+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
-+
-+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
-+ func_quote_for_eval "${2}"
-+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
-+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-+
-+ # Save a `func_append' function call where possible by direct use of '+='
-+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-+ && mv -f "$cfgfile.tmp" "$cfgfile" \
-+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+ test 0 -eq $? || _lt_function_replace_fail=:
-+else
-+ # Save a `func_append' function call even when '+=' is not available
-+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-+ && mv -f "$cfgfile.tmp" "$cfgfile" \
-+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+ test 0 -eq $? || _lt_function_replace_fail=:
-+fi
-+
-+if test x"$_lt_function_replace_fail" = x":"; then
-+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-+fi
-+])
-+
-+# _LT_PATH_CONVERSION_FUNCTIONS
-+# -----------------------------
-+# Determine which file name conversion functions should be used by
-+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
-+# for certain cross-compile configurations and native mingw.
-+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+AC_MSG_CHECKING([how to convert $build file names to $host format])
-+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-+[case $host in
-+ *-*-mingw* )
-+ case $build in
-+ *-*-mingw* ) # actually msys
-+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-+ ;;
-+ *-*-cygwin* )
-+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-+ ;;
-+ * ) # otherwise, assume *nix
-+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-+ ;;
-+ esac
-+ ;;
-+ *-*-cygwin* )
-+ case $build in
-+ *-*-mingw* ) # actually msys
-+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-+ ;;
-+ *-*-cygwin* )
-+ lt_cv_to_host_file_cmd=func_convert_file_noop
-+ ;;
-+ * ) # otherwise, assume *nix
-+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-+ ;;
-+ esac
-+ ;;
-+ * ) # unhandled hosts (and "normal" native builds)
-+ lt_cv_to_host_file_cmd=func_convert_file_noop
-+ ;;
-+esac
-+])
-+to_host_file_cmd=$lt_cv_to_host_file_cmd
-+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
-+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
-+ [0], [convert $build file names to $host format])dnl
-+
-+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
-+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-+[#assume ordinary cross tools, or native build.
-+lt_cv_to_tool_file_cmd=func_convert_file_noop
-+case $host in
-+ *-*-mingw* )
-+ case $build in
-+ *-*-mingw* ) # actually msys
-+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-+ ;;
-+ esac
-+ ;;
-+esac
-+])
-+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
-+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
-+ [0], [convert $build files to toolchain format])dnl
-+])# _LT_PATH_CONVERSION_FUNCTIONS
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/m4/ltoptions.m4 gettext-0.18.3.1/gettext-tools/m4/ltoptions.m4
---- gettext-0.18.3.1.orig/gettext-tools/m4/ltoptions.m4 1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.18.3.1/gettext-tools/m4/ltoptions.m4 2013-12-31 11:58:08.000000000 -0800
-@@ -0,0 +1,384 @@
-+# Helper functions for option handling. -*- Autoconf -*-
-+#
-+# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-+# Inc.
-+# Written by Gary V. Vaughan, 2004
-+#
-+# 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 7 ltoptions.m4
-+
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-+
-+
-+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-+# ------------------------------------------
-+m4_define([_LT_MANGLE_OPTION],
-+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-+
-+
-+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-+# ---------------------------------------
-+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-+# matching handler defined, dispatch to it. Other OPTION-NAMEs are
-+# saved as a flag.
-+m4_define([_LT_SET_OPTION],
-+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-+ _LT_MANGLE_DEFUN([$1], [$2]),
-+ [m4_warning([Unknown $1 option `$2'])])[]dnl
-+])
-+
-+
-+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-+# ------------------------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+m4_define([_LT_IF_OPTION],
-+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-+
-+
-+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-+# -------------------------------------------------------
-+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-+# are set.
-+m4_define([_LT_UNLESS_OPTIONS],
-+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-+ [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-+ [m4_define([$0_found])])])[]dnl
-+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-+])[]dnl
-+])
-+
-+
-+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-+# ----------------------------------------
-+# OPTION-LIST is a space-separated list of Libtool options associated
-+# with MACRO-NAME. If any OPTION has a matching handler declared with
-+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-+# the unknown option and exit.
-+m4_defun([_LT_SET_OPTIONS],
-+[# Set options
-+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-+ [_LT_SET_OPTION([$1], _LT_Option)])
-+
-+m4_if([$1],[LT_INIT],[
-+ dnl
-+ dnl Simply set some default values (i.e off) if boolean options were not
-+ dnl specified:
-+ _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-+ ])
-+ _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-+ ])
-+ dnl
-+ dnl If no reference was made to various pairs of opposing options, then
-+ dnl we run the default mode handler for the pair. For example, if neither
-+ dnl `shared' nor `disable-shared' was passed, we enable building of shared
-+ dnl archives by default:
-+ _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-+ _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-+ _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-+ _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-+ [_LT_ENABLE_FAST_INSTALL])
-+ ])
-+])# _LT_SET_OPTIONS
-+
-+
-+## --------------------------------- ##
-+## Macros to handle LT_INIT options. ##
-+## --------------------------------- ##
-+
-+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-+# -----------------------------------------
-+m4_define([_LT_MANGLE_DEFUN],
-+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-+
-+
-+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-+# -----------------------------------------------
-+m4_define([LT_OPTION_DEFINE],
-+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-+])# LT_OPTION_DEFINE
-+
-+
-+# dlopen
-+# ------
-+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-+])
-+
-+AU_DEFUN([AC_LIBTOOL_DLOPEN],
-+[_LT_SET_OPTION([LT_INIT], [dlopen])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `dlopen' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-+
-+
-+# win32-dll
-+# ---------
-+# Declare package support for building win32 dll's.
-+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-+[enable_win32_dll=yes
-+
-+case $host in
-+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-+ AC_CHECK_TOOL(AS, as, false)
-+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+ ;;
-+esac
-+
-+test -z "$AS" && AS=as
-+_LT_DECL([], [AS], [1], [Assembler program])dnl
-+
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
-+
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
-+])# win32-dll
-+
-+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+_LT_SET_OPTION([LT_INIT], [win32-dll])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `win32-dll' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-+
-+
-+# _LT_ENABLE_SHARED([DEFAULT])
-+# ----------------------------
-+# implement the --enable-shared flag, and supports the `shared' and
-+# `disable-shared' LT_INIT options.
-+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_SHARED],
-+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([shared],
-+ [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-+ [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-+ [p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_shared=yes ;;
-+ no) enable_shared=no ;;
-+ *)
-+ enable_shared=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_shared=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-+
-+ _LT_DECL([build_libtool_libs], [enable_shared], [0],
-+ [Whether or not to build shared libraries])
-+])# _LT_ENABLE_SHARED
-+
-+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-+
-+# Old names:
-+AC_DEFUN([AC_ENABLE_SHARED],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-+])
-+
-+AC_DEFUN([AC_DISABLE_SHARED],
-+[_LT_SET_OPTION([LT_INIT], [disable-shared])
-+])
-+
-+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-+
-+
-+
-+# _LT_ENABLE_STATIC([DEFAULT])
-+# ----------------------------
-+# implement the --enable-static flag, and support the `static' and
-+# `disable-static' LT_INIT options.
-+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_STATIC],
-+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([static],
-+ [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-+ [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-+ [p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_static=yes ;;
-+ no) enable_static=no ;;
-+ *)
-+ enable_static=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_static=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-+
-+ _LT_DECL([build_old_libs], [enable_static], [0],
-+ [Whether or not to build static libraries])
-+])# _LT_ENABLE_STATIC
-+
-+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-+
-+# Old names:
-+AC_DEFUN([AC_ENABLE_STATIC],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-+])
-+
-+AC_DEFUN([AC_DISABLE_STATIC],
-+[_LT_SET_OPTION([LT_INIT], [disable-static])
-+])
-+
-+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-+
-+
-+
-+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-+# ----------------------------------
-+# implement the --enable-fast-install flag, and support the `fast-install'
-+# and `disable-fast-install' LT_INIT options.
-+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_FAST_INSTALL],
-+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([fast-install],
-+ [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-+ [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-+ [p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_fast_install=yes ;;
-+ no) enable_fast_install=no ;;
-+ *)
-+ enable_fast_install=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_fast_install=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-+
-+_LT_DECL([fast_install], [enable_fast_install], [0],
-+ [Whether or not to optimize for fast installation])dnl
-+])# _LT_ENABLE_FAST_INSTALL
-+
-+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-+
-+# Old names:
-+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-+the `fast-install' option into LT_INIT's first parameter.])
-+])
-+
-+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-+the `disable-fast-install' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-+
-+
-+# _LT_WITH_PIC([MODE])
-+# --------------------
-+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-+# LT_INIT options.
-+# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
-+m4_define([_LT_WITH_PIC],
-+[AC_ARG_WITH([pic],
-+ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
-+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-+ [lt_p=${PACKAGE-default}
-+ case $withval in
-+ yes|no) pic_mode=$withval ;;
-+ *)
-+ pic_mode=default
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for lt_pkg in $withval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$lt_pkg" = "X$lt_p"; then
-+ pic_mode=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [pic_mode=default])
-+
-+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-+
-+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-+])# _LT_WITH_PIC
-+
-+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-+
-+# Old name:
-+AU_DEFUN([AC_LIBTOOL_PICMODE],
-+[_LT_SET_OPTION([LT_INIT], [pic-only])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `pic-only' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-+
-+## ----------------- ##
-+## LTDL_INIT Options ##
-+## ----------------- ##
-+
-+m4_define([_LTDL_MODE], [])
-+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-+ [m4_define([_LTDL_MODE], [nonrecursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-+ [m4_define([_LTDL_MODE], [recursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-+ [m4_define([_LTDL_MODE], [subproject])])
-+
-+m4_define([_LTDL_TYPE], [])
-+LT_OPTION_DEFINE([LTDL_INIT], [installable],
-+ [m4_define([_LTDL_TYPE], [installable])])
-+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-+ [m4_define([_LTDL_TYPE], [convenience])])
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/m4/ltsugar.m4 gettext-0.18.3.1/gettext-tools/m4/ltsugar.m4
---- gettext-0.18.3.1.orig/gettext-tools/m4/ltsugar.m4 1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.18.3.1/gettext-tools/m4/ltsugar.m4 2013-12-31 11:58:08.000000000 -0800
-@@ -0,0 +1,123 @@
-+# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
-+#
-+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-+# Written by Gary V. Vaughan, 2004
-+#
-+# 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 6 ltsugar.m4
-+
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-+
-+
-+# lt_join(SEP, ARG1, [ARG2...])
-+# -----------------------------
-+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-+# associated separator.
-+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-+# versions in m4sugar had bugs.
-+m4_define([lt_join],
-+[m4_if([$#], [1], [],
-+ [$#], [2], [[$2]],
-+ [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-+m4_define([_lt_join],
-+[m4_if([$#$2], [2], [],
-+ [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-+
-+
-+# lt_car(LIST)
-+# lt_cdr(LIST)
-+# ------------
-+# Manipulate m4 lists.
-+# These macros are necessary as long as will still need to support
-+# Autoconf-2.59 which quotes differently.
-+m4_define([lt_car], [[$1]])
-+m4_define([lt_cdr],
-+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-+ [$#], 1, [],
-+ [m4_dquote(m4_shift($@))])])
-+m4_define([lt_unquote], $1)
-+
-+
-+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-+# ------------------------------------------
-+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-+# Note that neither SEPARATOR nor STRING are expanded; they are appended
-+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-+# than defined and empty).
-+#
-+# This macro is needed until we can rely on Autoconf 2.62, since earlier
-+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-+m4_define([lt_append],
-+[m4_define([$1],
-+ m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-+
-+
-+
-+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-+# ----------------------------------------------------------
-+# Produce a SEP delimited list of all paired combinations of elements of
-+# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
-+# has the form PREFIXmINFIXSUFFIXn.
-+# Needed until we can rely on m4_combine added in Autoconf 2.62.
-+m4_define([lt_combine],
-+[m4_if(m4_eval([$# > 3]), [1],
-+ [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-+[[m4_foreach([_Lt_prefix], [$2],
-+ [m4_foreach([_Lt_suffix],
-+ ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-+ [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-+
-+
-+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-+# -----------------------------------------------------------------------
-+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-+m4_define([lt_if_append_uniq],
-+[m4_ifdef([$1],
-+ [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-+ [lt_append([$1], [$2], [$3])$4],
-+ [$5])],
-+ [lt_append([$1], [$2], [$3])$4])])
-+
-+
-+# lt_dict_add(DICT, KEY, VALUE)
-+# -----------------------------
-+m4_define([lt_dict_add],
-+[m4_define([$1($2)], [$3])])
-+
-+
-+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-+# --------------------------------------------
-+m4_define([lt_dict_add_subkey],
-+[m4_define([$1($2:$3)], [$4])])
-+
-+
-+# lt_dict_fetch(DICT, KEY, [SUBKEY])
-+# ----------------------------------
-+m4_define([lt_dict_fetch],
-+[m4_ifval([$3],
-+ m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-+ m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-+
-+
-+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-+# -----------------------------------------------------------------
-+m4_define([lt_if_dict_fetch],
-+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-+ [$5],
-+ [$6])])
-+
-+
-+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-+# --------------------------------------------------------------
-+m4_define([lt_dict_filter],
-+[m4_if([$5], [], [],
-+ [lt_join(m4_quote(m4_default([$4], [[, ]])),
-+ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-+ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-+])
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/m4/ltversion.m4 gettext-0.18.3.1/gettext-tools/m4/ltversion.m4
---- gettext-0.18.3.1.orig/gettext-tools/m4/ltversion.m4 1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.18.3.1/gettext-tools/m4/ltversion.m4 2013-12-31 11:58:08.000000000 -0800
-@@ -0,0 +1,23 @@
-+# ltversion.m4 -- version numbers -*- Autoconf -*-
-+#
-+# Copyright (C) 2004 Free Software Foundation, Inc.
-+# Written by Scott James Remnant, 2004
-+#
-+# 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.
-+
-+# @configure_input@
-+
-+# serial 3337 ltversion.m4
-+# This file is part of GNU Libtool
-+
-+m4_define([LT_PACKAGE_VERSION], [2.4.2])
-+m4_define([LT_PACKAGE_REVISION], [1.3337])
-+
-+AC_DEFUN([LTVERSION_VERSION],
-+[macro_version='2.4.2'
-+macro_revision='1.3337'
-+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-+_LT_DECL(, macro_revision, 0)
-+])
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/m4/lt~obsolete.m4 gettext-0.18.3.1/gettext-tools/m4/lt~obsolete.m4
---- gettext-0.18.3.1.orig/gettext-tools/m4/lt~obsolete.m4 1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.18.3.1/gettext-tools/m4/lt~obsolete.m4 2013-12-31 11:58:08.000000000 -0800
-@@ -0,0 +1,98 @@
-+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
-+#
-+# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
-+# Written by Scott James Remnant, 2004.
-+#
-+# 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 5 lt~obsolete.m4
-+
-+# These exist entirely to fool aclocal when bootstrapping libtool.
-+#
-+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-+# which have later been changed to m4_define as they aren't part of the
-+# exported API, or moved to Autoconf or Automake where they belong.
-+#
-+# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN
-+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-+# using a macro with the same name in our local m4/libtool.m4 it'll
-+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-+# and doesn't know about Autoconf macros at all.)
-+#
-+# So we provide this file, which has a silly filename so it's always
-+# included after everything else. This provides aclocal with the
-+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-+# because those macros already exist, or will be overwritten later.
-+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
-+#
-+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-+# Yes, that means every name once taken will need to remain here until
-+# we give up compatibility with versions before 1.7, at which point
-+# we need to keep only those names which we still refer to.
-+
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-+
-+m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])])
-+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-+m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])])
-+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-+m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])])
-+m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])])
-+m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-+m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])])
-+m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])])
-+m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])])
-+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-+m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-+m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])])
-+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-+m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])])
-+m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])])
-+m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-+m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-+m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])])
-+m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])])
-+m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])])
-+m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-+m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-+m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])])
-+m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])])
-+m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-+m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])])
-+m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-+m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
-+m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
-+m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
-+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
-+m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-+m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-+m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-+m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
-+m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
-+m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/man/Makefile.in gettext-0.18.3.1/gettext-tools/man/Makefile.in
---- gettext-0.18.3.1.orig/gettext-tools/man/Makefile.in 2013-08-15 09:31:15.000000000 -0700
-+++ gettext-0.18.3.1/gettext-tools/man/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -287,11 +287,6 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/gnulib-m4/yield.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 \
- $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
- $(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
-@@ -321,8 +316,10 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \
- $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \
- $(top_srcdir)/m4/exported.m4 $(top_srcdir)/m4/hostname.m4 \
-- $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/siginfo.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/setlocale.m4 \
-+ $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/misc/Makefile.in gettext-0.18.3.1/gettext-tools/misc/Makefile.in
---- gettext-0.18.3.1.orig/gettext-tools/misc/Makefile.in 2013-08-15 09:31:15.000000000 -0700
-+++ gettext-0.18.3.1/gettext-tools/misc/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -291,11 +291,6 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/gnulib-m4/yield.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 \
- $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
- $(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
-@@ -325,8 +320,10 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \
- $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \
- $(top_srcdir)/m4/exported.m4 $(top_srcdir)/m4/hostname.m4 \
-- $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/siginfo.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/setlocale.m4 \
-+ $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/projects/Makefile.in gettext-0.18.3.1/gettext-tools/projects/Makefile.in
---- gettext-0.18.3.1.orig/gettext-tools/projects/Makefile.in 2013-08-15 09:31:15.000000000 -0700
-+++ gettext-0.18.3.1/gettext-tools/projects/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -285,11 +285,6 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/gnulib-m4/yield.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 \
- $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
- $(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
-@@ -319,8 +314,10 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \
- $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \
- $(top_srcdir)/m4/exported.m4 $(top_srcdir)/m4/hostname.m4 \
-- $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/siginfo.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/setlocale.m4 \
-+ $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/src/Makefile.in gettext-0.18.3.1/gettext-tools/src/Makefile.in
---- gettext-0.18.3.1.orig/gettext-tools/src/Makefile.in 2013-08-15 09:31:16.000000000 -0700
-+++ gettext-0.18.3.1/gettext-tools/src/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -302,11 +302,6 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/gnulib-m4/yield.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 \
- $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
- $(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
-@@ -336,8 +331,10 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \
- $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \
- $(top_srcdir)/m4/exported.m4 $(top_srcdir)/m4/hostname.m4 \
-- $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/siginfo.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/setlocale.m4 \
-+ $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
-@@ -2420,10 +2417,10 @@ distclean-compile:
- -rm -f *.tab.c
-
- .c.o:
-- $(AM_V_CC)$(COMPILE) -c $<
-+ $(AM_V_CC)$(COMPILE) -c -o $@ $<
-
- .c.obj:
-- $(AM_V_CC)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+ $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .c.lo:
- $(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/styles/Makefile.in gettext-0.18.3.1/gettext-tools/styles/Makefile.in
---- gettext-0.18.3.1.orig/gettext-tools/styles/Makefile.in 2013-08-15 09:31:16.000000000 -0700
-+++ gettext-0.18.3.1/gettext-tools/styles/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -286,11 +286,6 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/gnulib-m4/yield.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 \
- $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
- $(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
-@@ -320,8 +315,10 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \
- $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \
- $(top_srcdir)/m4/exported.m4 $(top_srcdir)/m4/hostname.m4 \
-- $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/siginfo.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/setlocale.m4 \
-+ $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
-diff -Naurp gettext-0.18.3.1.orig/gettext-tools/tests/Makefile.in gettext-0.18.3.1/gettext-tools/tests/Makefile.in
---- gettext-0.18.3.1.orig/gettext-tools/tests/Makefile.in 2013-08-15 09:31:16.000000000 -0700
-+++ gettext-0.18.3.1/gettext-tools/tests/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -294,11 +294,6 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/gnulib-m4/yield.m4 \
- $(top_srcdir)/../m4/fixautomake.m4 \
- $(top_srcdir)/../m4/init-package-version.m4 \
-- $(top_srcdir)/../m4/libtool.m4 \
-- $(top_srcdir)/../m4/ltoptions.m4 \
-- $(top_srcdir)/../m4/ltsugar.m4 \
-- $(top_srcdir)/../m4/ltversion.m4 \
-- $(top_srcdir)/../m4/lt~obsolete.m4 \
- $(top_srcdir)/../m4/woe32-dll.m4 \
- $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
- $(top_srcdir)/../gettext-runtime/m4/fcntl-o.m4 \
-@@ -328,8 +323,10 @@ am__aclocal_m4_deps = \
- $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \
- $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \
- $(top_srcdir)/m4/exported.m4 $(top_srcdir)/m4/hostname.m4 \
-- $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/siginfo.m4 \
-- $(top_srcdir)/configure.ac
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/setlocale.m4 \
-+ $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
-@@ -2085,10 +2082,10 @@ distclean-compile:
- -rm -f *.tab.c
-
- .c.o:
-- $(AM_V_CC)$(COMPILE) -c $<
-+ $(AM_V_CC)$(COMPILE) -c -o $@ $<
-
- .c.obj:
-- $(AM_V_CC)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+ $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
- .c.lo:
- $(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
-diff -Naurp gettext-0.18.3.1.orig/gnulib-local/Makefile.in gettext-0.18.3.1/gnulib-local/Makefile.in
---- gettext-0.18.3.1.orig/gnulib-local/Makefile.in 2013-08-15 09:34:36.000000000 -0700
-+++ gettext-0.18.3.1/gnulib-local/Makefile.in 2013-12-31 11:58:08.000000000 -0800
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-diff -Naurp gettext-0.18.3.1.orig/m4/libtool.m4 gettext-0.18.3.1/m4/libtool.m4
---- gettext-0.18.3.1.orig/m4/libtool.m4 2012-12-09 17:59:06.000000000 -0800
-+++ gettext-0.18.3.1/m4/libtool.m4 2013-12-31 11:58:08.000000000 -0800
-@@ -94,7 +94,7 @@ _LT_SET_OPTIONS([$0], [$1])
- LIBTOOL_DEPS="$ltmain"
-
- # Always use our own libtool.
--LIBTOOL="${CONFIG_SHELL-$SHELL} "'$(top_builddir)/libtool'
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- AC_SUBST(LIBTOOL)dnl
-
- _LT_SETUP
-@@ -3404,10 +3404,7 @@ AC_CACHE_CHECK([for BSD- or MS-compatibl
- lt_cv_path_NM="$NM"
- else
- lt_nm_to_check="${ac_tool_prefix}nm"
-- if test -n "$ac_tool_prefix" \
-- && { test "$build" = "$host" \
-- || { test "$build_os" = cygwin && test "$host_os" = mingw32; }; \
-- }; then
-+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
- lt_nm_to_check="$lt_nm_to_check nm"
- fi
- for lt_tmp_nm in $lt_nm_to_check; do
</del></span></pre></div>
<a id="trunkdportsdevelgettextfilesstdlibpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/gettext/files/stdlib.patch (0 => 115361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/gettext/files/stdlib.patch (rev 0)
+++ trunk/dports/devel/gettext/files/stdlib.patch 2013-12-31 22:46:15 UTC (rev 115361)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+diff -Naurp gettext-0.18.3.1.orig/build-aux/ltmain.sh gettext-0.18.3.1/build-aux/ltmain.sh
+--- build-aux/ltmain.sh 2012-12-09 17:59:06.000000000 -0800
++++ build-aux/ltmain.sh 2013-12-31 11:58:08.000000000 -0800
+@@ -5851,9 +5851,10 @@ func_mode_link ()
+ # -tp=* Portland pgcc target processor selection
+ # --sysroot=* for sysroot support
+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
++ # -stdlib=* select c++ std lib with clang
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-stdlib=*)
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ func_append compile_command " $arg"
</ins></span></pre>
</div>
</div>
</body>
</html>