diff -Nru procps-3.3.11/aclocal.m4 procps-3.3.12/aclocal.m4
--- procps-3.3.11/aclocal.m4	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/aclocal.m4	2016-07-10 06:40:26.000000000 +0000
@@ -20,32 +20,63 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
+dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29)
+dnl
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -67,18 +98,19 @@
 		PKG_CONFIG=""
 	fi
 fi[]dnl
-])# PKG_PROG_PKG_CONFIG
+])dnl PKG_PROG_PKG_CONFIG
 
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
@@ -88,8 +120,10 @@
   $3])dnl
 fi])
 
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
 m4_define([_PKG_CONFIG],
 [if test -n "$$1"; then
     pkg_cv_[]$1="$$1"
@@ -101,10 +135,11 @@
  else
     pkg_failed=untried
 fi[]dnl
-])# _PKG_CONFIG
+])dnl _PKG_CONFIG
 
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -112,19 +147,17 @@
 else
         _pkg_short_errors_supported=no
 fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
 
 
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
 AC_DEFUN([PKG_CHECK_MODULES],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
@@ -178,16 +211,40 @@
         AC_MSG_RESULT([yes])
 	$3
 fi[]dnl
-])# PKG_CHECK_MODULES
+])dnl PKG_CHECK_MODULES
 
 
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
 AC_DEFUN([PKG_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@@ -198,16 +255,18 @@
 AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
 m4_popdef([pkg_default])
 m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
+])dnl PKG_INSTALLDIR
 
 
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
 AC_DEFUN([PKG_NOARCH_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@@ -218,13 +277,15 @@
 AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
 m4_popdef([pkg_default])
 m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
+])dnl PKG_NOARCH_INSTALLDIR
 
 
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
 AC_DEFUN([PKG_CHECK_VAR],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
@@ -233,7 +294,7 @@
 AS_VAR_COPY([$1], [pkg_cv_][$1])
 
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
+])dnl PKG_CHECK_VAR
 
 # Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
diff -Nru procps-3.3.11/config.guess procps-3.3.12/config.guess
--- procps-3.3.11/config.guess	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/config.guess	2016-07-10 06:40:26.000000000 +0000
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2014-03-23'
+timestamp='2016-04-02'
 
 # 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
@@ -24,12 +24,12 @@
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 
 
 me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -168,20 +168,27 @@
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
 	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	    /sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || \
+	    echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
 	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
 	    sh5el) machine=sh5le-unknown ;;
+	    earmv*)
+		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
+		machine=${arch}${endian}-unknown
+		;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
 	# to ELF recently, or will in the future.
 	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+	    arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
@@ -197,6 +204,13 @@
 		os=netbsd
 		;;
 	esac
+	# Determine ABI tags.
+	case "${UNAME_MACHINE_ARCH}" in
+	    earm*)
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		;;
+	esac
 	# The OS release
 	# Debian GNU/NetBSD machines have a different userland, and
 	# thus, need a distinct triplet. However, they do not need
@@ -207,13 +221,13 @@
 		release='-gnu'
 		;;
 	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
+	echo "${machine}-${os}${release}${abi}"
 	exit ;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -223,6 +237,10 @@
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
+    *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
@@ -235,6 +253,9 @@
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
+    *:Sortix:*:*)
+	echo ${UNAME_MACHINE}-unknown-sortix
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -251,42 +272,42 @@
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
 	case "$ALPHA_CPU_TYPE" in
 	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
+		UNAME_MACHINE=alphaev5 ;;
 	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
+		UNAME_MACHINE=alphaev56 ;;
 	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
+		UNAME_MACHINE=alphapca56 ;;
 	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
+		UNAME_MACHINE=alphapca57 ;;
 	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
+		UNAME_MACHINE=alphaev6 ;;
 	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
+		UNAME_MACHINE=alphaev67 ;;
 	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
+		UNAME_MACHINE=alphaev69 ;;
 	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
+		UNAME_MACHINE=alphaev7 ;;
 	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
+		UNAME_MACHINE=alphaev79 ;;
 	esac
 	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 	exitcode=$?
 	trap '' 0
@@ -359,16 +380,16 @@
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
-	SUN_ARCH="i386"
+	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
-		SUN_ARCH="x86_64"
+		SUN_ARCH=x86_64
 	    fi
 	fi
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -393,7 +414,7 @@
 	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
 		echo m68k-sun-sunos${UNAME_RELEASE}
@@ -579,8 +600,9 @@
 	else
 		IBM_ARCH=powerpc
 	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
+	if [ -x /usr/bin/lslpp ] ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
 	else
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
@@ -617,13 +639,13 @@
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 		      532)                      # CPU_PA_RISC2_0
 			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			  32) HP_ARCH=hppa2.0n ;;
+			  64) HP_ARCH=hppa2.0w ;;
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
 			esac ;;
 		    esac
 		fi
@@ -662,11 +684,11 @@
 		    exit (0);
 		}
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
+	if [ ${HP_ARCH} = hppa2.0w ]
 	then
 	    eval $set_cc_for_build
 
@@ -679,12 +701,12 @@
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 	    # => hppa64-hp-hpux11.23
 
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
 		grep -q __LP64__
 	    then
-		HP_ARCH="hppa2.0w"
+		HP_ARCH=hppa2.0w
 	    else
-		HP_ARCH="hppa64"
+		HP_ARCH=hppa64
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -789,14 +811,14 @@
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
 	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -878,7 +900,7 @@
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
@@ -901,7 +923,7 @@
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arc:Linux:*:* | arceb:Linux:*:*)
@@ -932,6 +954,9 @@
     crisv32:Linux:*:*)
 	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
+    e2k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     frv:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@@ -944,6 +969,9 @@
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
+    k1om:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@@ -1020,7 +1048,7 @@
 	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1099,7 +1127,7 @@
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
 	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
+	# prints for the "djgpp" host, or else GDB configure will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
 	exit ;;
@@ -1248,6 +1276,9 @@
     SX-8R:SUPER-UX:*:*)
 	echo sx8r-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-ACE:SUPER-UX:*:*)
+	echo sxace-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1261,9 +1292,9 @@
 	    UNAME_PROCESSOR=powerpc
 	fi
 	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; 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) | \
+		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		    grep IS_64BIT_ARCH >/dev/null
 		then
 		    case $UNAME_PROCESSOR in
@@ -1285,7 +1316,7 @@
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
+	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
@@ -1316,7 +1347,7 @@
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = "386"; then
+	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
 	else
 	    UNAME_MACHINE="$cputype"
@@ -1358,7 +1389,7 @@
 	echo i386-pc-xenix
 	exit ;;
     i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
 	exit ;;
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
@@ -1369,6 +1400,9 @@
     x86_64:VMkernel:*:*)
 	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
+    amd64:Isilon\ OneFS:*:*)
+	echo x86_64-unknown-onefs
+	exit ;;
 esac
 
 cat >&2 <<EOF
@@ -1378,9 +1412,9 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff -Nru procps-3.3.11/config.h.in procps-3.3.12/config.h.in
--- procps-3.3.11/config.h.in	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/config.h.in	2016-07-10 06:40:26.000000000 +0000
@@ -41,9 +41,15 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
+/* Define to 1 if you have the <float.h> header file. */
+#undef HAVE_FLOAT_H
+
 /* Define to 1 if you have the `fork' function. */
 #undef HAVE_FORK
 
+/* Define to 1 if you have the `gethostname' function. */
+#undef HAVE_GETHOSTNAME
+
 /* Define to 1 if you have the `getpagesize' function. */
 #undef HAVE_GETPAGESIZE
 
@@ -96,9 +102,6 @@
 /* Define to 1 if you have a working `mmap' system call. */
 #undef HAVE_MMAP
 
-/* Define to 1 if you have the `munmap' function. */
-#undef HAVE_MUNMAP
-
 /* Define to 1 if you have the <ncurses.h> header file. */
 #undef HAVE_NCURSES_H
 
@@ -166,6 +169,9 @@
 /* Define to 1 if you have the `strncasecmp' function. */
 #undef HAVE_STRNCASECMP
 
+/* Define to 1 if you have the `strndup' function. */
+#undef HAVE_STRNDUP
+
 /* Define to 1 if you have the `strpbrk' function. */
 #undef HAVE_STRPBRK
 
@@ -217,9 +223,6 @@
 /* Define to 1 if you have the <term.h> header file. */
 #undef HAVE_TERM_H
 
-/* Define to 1 if you have the `uname' function. */
-#undef HAVE_UNAME
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
@@ -259,8 +262,7 @@
 /* Define to 1 if you have the `__fpending' function. */
 #undef HAVE___FPENDING
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR
 
 /* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
@@ -277,9 +279,6 @@
 /* disable NUMA/Node support in top */
 #undef NUMA_DISABLE
 
-/* add out-of-memory fields to the library and top */
-#undef OOMEM_ENABLE
-
 /* disable new startup defaults, return to original top */
 #undef ORIG_TOPDEFS
 
@@ -344,6 +343,17 @@
 /* enable w from field by default */
 #undef W_SHOWFROM
 
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
 /* Define to 1 if on MINIX. */
 #undef _MINIX
 
diff -Nru procps-3.3.11/config.sub procps-3.3.12/config.sub
--- procps-3.3.11/config.sub	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/config.sub	2016-07-10 06:40:26.000000000 +0000
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2014-09-11'
+timestamp='2016-03-30'
 
 # 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
@@ -25,7 +25,7 @@
 # of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -33,7 +33,7 @@
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -53,8 +53,7 @@
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
 
 Canonicalize a configuration name.
 
@@ -68,7 +67,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -117,7 +116,7 @@
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
@@ -255,12 +254,13 @@
 	| arc | arceb \
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 	| avr | avr32 \
+	| ba \
 	| be32 | be64 \
 	| bfin \
 	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
-	| fido | fr30 | frv \
+	| e2k | epiphany \
+	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
@@ -305,7 +305,7 @@
 	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -313,6 +313,7 @@
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -327,6 +328,9 @@
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -372,12 +376,13 @@
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| ba-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
+	| e2k-* | elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
@@ -424,12 +429,13 @@
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
+	| riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tile*-* \
@@ -437,6 +443,7 @@
 	| ubicom32-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
+	| visium-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -513,6 +520,9 @@
 		basic_machine=i386-pc
 		os=-aros
 		;;
+	asmjs)
+		basic_machine=asmjs-unknown
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -774,6 +784,9 @@
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
@@ -1365,11 +1378,11 @@
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
 	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
+	      | -aos* | -aros* | -cloudabi* | -sortix* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
@@ -1385,7 +1398,8 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+	      | -onefs* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1517,6 +1531,8 @@
 		;;
 	-nacl*)
 		;;
+	-ios)
+		;;
 	-none)
 		;;
 	*)
diff -Nru procps-3.3.11/configure procps-3.3.12/configure
--- procps-3.3.11/configure	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/configure	2016-07-10 06:40:26.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for procps-ng 3.3.11.
+# Generated by GNU Autoconf 2.69 for procps-ng 3.3.12.
 #
 # Report bugs to <procps@freelists.org>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='procps-ng'
 PACKAGE_TARNAME='procps-ng'
-PACKAGE_VERSION='3.3.11'
-PACKAGE_STRING='procps-ng 3.3.11'
+PACKAGE_VERSION='3.3.12'
+PACKAGE_STRING='procps-ng 3.3.12'
 PACKAGE_BUGREPORT='procps@freelists.org'
 PACKAGE_URL='https://gitlab.com/procps-ng/procps'
 
@@ -642,6 +642,8 @@
 EXAMPLE_FILES_TRUE
 BUILD_SKILL_FALSE
 BUILD_SKILL_TRUE
+CYGWIN_FALSE
+CYGWIN_TRUE
 LINUX_FALSE
 LINUX_TRUE
 BUILD_KILL_FALSE
@@ -674,7 +676,7 @@
 MKINSTALLDIRS
 POW_LIB
 LIBOBJS
-CXXCPP
+LT_SYS_LIBRARY_PATH
 OTOOL64
 OTOOL
 LIPO
@@ -705,12 +707,6 @@
 PKG_CONFIG_PATH
 PKG_CONFIG
 LN_S
-am__fastdepCXX_FALSE
-am__fastdepCXX_TRUE
-CXXDEPMODE
-ac_ct_CXX
-CXXFLAGS
-CXX
 EGREP
 GREP
 CPP
@@ -777,6 +773,7 @@
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -801,10 +798,12 @@
 enable_option_checking
 enable_silent_rules
 enable_dependency_tracking
+enable_largefile
 enable_shared
 enable_static
 with_pic
 enable_fast_install
+with_aix_soname
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
@@ -820,7 +819,6 @@
 enable_kill
 enable_skill
 enable_examples
-enable_oomem
 enable_sigwinch
 enable_wide_percent
 enable_wide_memory
@@ -838,13 +836,10 @@
 LIBS
 CPPFLAGS
 CPP
-CXX
-CXXFLAGS
-CCC
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
-CXXCPP
+LT_SYS_LIBRARY_PATH
 NCURSES_CFLAGS
 NCURSES_LIBS
 NCURSESW_CFLAGS
@@ -889,6 +884,7 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1141,6 +1137,15 @@
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1278,7 +1283,7 @@
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1391,7 +1396,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures procps-ng 3.3.11 to adapt to many kinds of systems.
+\`configure' configures procps-ng 3.3.12 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1431,6 +1436,7 @@
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1461,7 +1467,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of procps-ng 3.3.11:";;
+     short | recursive ) echo "Configuration of procps-ng 3.3.12:";;
    esac
   cat <<\_ACEOF
 
@@ -1475,6 +1481,7 @@
                           do not reject slow dependency extractors
   --disable-dependency-tracking
                           speeds up one-time build
+  --disable-largefile     omit support for large files
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
@@ -1488,7 +1495,6 @@
   --disable-kill          do not build kill
   --enable-skill          build skill and snice
   --enable-examples       add example files to installation
-  --enable-oomem          add out-of-memory fields to the library and top
   --enable-sigwinch       reduce impact of x-windows resize operations on top
   --enable-wide-percent   provide extra precision under %CPU and %MEM for top
   --disable-wide-memory   disable extra precision under memory fields for top
@@ -1502,9 +1508,12 @@
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
+  --with-aix-soname=aix|svr4|both
+                          shared library versioning (aka "SONAME") variant to
+                          provide on AIX, [default=aix].
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-sysroot=DIR Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).
+  --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
+                          compiler's sysroot if not specified).
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
@@ -1522,14 +1531,13 @@
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
   PKG_CONFIG  path to pkg-config utility
   PKG_CONFIG_PATH
               directories to add to pkg-config's search path
   PKG_CONFIG_LIBDIR
               path overriding pkg-config's built-in search path
-  CXXCPP      C++ preprocessor
+  LT_SYS_LIBRARY_PATH
+              User-defined run-time library search path.
   NCURSES_CFLAGS
               C compiler flags for NCURSES, overriding pkg-config
   NCURSES_LIBS
@@ -1610,7 +1618,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-procps-ng configure 3.3.11
+procps-ng configure 3.3.12
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1863,44 +1871,6 @@
 
 } # ac_fn_c_check_header_compile
 
-# ac_fn_cxx_try_compile LINENO
-# ----------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-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_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_compile
-
 # ac_fn_c_try_link LINENO
 # -----------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded.
@@ -2200,94 +2170,11 @@
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
-
-# ac_fn_cxx_try_cpp LINENO
-# ------------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-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_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_cpp
-
-# ac_fn_cxx_try_link LINENO
-# -------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-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_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_link
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by procps-ng $as_me 3.3.11, which was
+It was created by procps-ng $as_me 3.3.12, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3153,7 +3040,7 @@
 
 # Define the identity of the package.
  PACKAGE='procps-ng'
- VERSION='3.3.11'
+ VERSION='3.3.12'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4873,27 +4760,217 @@
   $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
 
 
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+  enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if ${ac_cv_sys_largefile_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_sys_largefile_CC=no
+     if test "$GCC" != yes; then
+       ac_save_CC=$CC
+       while :; do
+	 # IRIX 6.2 and later do not support large files by default,
+	 # so use the C compiler's -n32 option if that helps.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+	 if ac_fn_c_try_compile "$LINENO"; then :
+  break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 CC="$CC -n32"
+	 if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_largefile_CC=' -n32'; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if ${ac_cv_sys_file_offset_bits+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=64; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_file_offset_bits=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  if test $ac_cv_sys_file_offset_bits = unknown; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if ${ac_cv_sys_large_files+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_large_files=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  fi
+
+
+fi
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
+if ${ac_cv_prog_AWK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -4902,7 +4979,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -4912,32 +4989,34 @@
 
 fi
 fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+  test -n "$AWK" && break
+done
+
+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
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -4946,7 +5025,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -4956,21 +5035,57 @@
 
 fi
 fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$ac_ct_CXX" && break
-done
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
+  if test "x$ac_ct_CC" = x; then
+    CC=""
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -4978,14 +5093,220 @@
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    CXX=$ac_ct_CXX
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
   fi
 fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
   fi
 fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -5009,9 +5330,9 @@
   test $ac_status = 0; }
 done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5028,33 +5349,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
   ac_compiler_gnu=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
-  GXX=yes
+  GCC=yes
 else
-  GXX=
+  GCC=
 fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -5066,10 +5387,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
 else
-  CXXFLAGS=""
+  CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -5081,11 +5402,11 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 else
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -5097,44 +5418,193 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+   ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
   else
-    CXXFLAGS="-g"
+    CFLAGS="-g"
   fi
 else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
   else
-    CXXFLAGS=
+    CFLAGS=
   fi
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+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
+
+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
 
-depcc="$CXX"  am_compiler_list=
+
+depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -5157,7 +5627,7 @@
   # directory.
   mkdir sub
 
-  am_cv_CXX_dependencies_compiler_type=none
+  am_cv_CC_dependencies_compiler_type=none
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
@@ -5230,7 +5700,7 @@
       #   icc: Command line remark: option '-MP' not supported
       if (grep 'ignoring option' conftest.err ||
           grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CXX_dependencies_compiler_type=$depmode
+        am_cv_CC_dependencies_compiler_type=$depmode
         break
       fi
     fi
@@ -5239,3362 +5709,505 @@
   cd ..
   rm -rf conftest.dir
 else
-  am_cv_CXX_dependencies_compiler_type=none
+  am_cv_CC_dependencies_compiler_type=none
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
  if
   test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
 else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
 fi
 
 
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
+   case $ac_cv_prog_cc_stdc in #(
+  no) :
+    ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; #(
+  *) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
+$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
+if ${ac_cv_prog_cc_c99+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-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
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&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_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-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
-
-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
-
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-   case $ac_cv_prog_cc_stdc in #(
-  no) :
-    ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; #(
-  *) :
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
-$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
-if ${ac_cv_prog_cc_c99+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c99=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <stdio.h>
-
-// Check varargs macros.  These examples are taken from C99 6.10.3.5.
-#define debug(...) fprintf (stderr, __VA_ARGS__)
-#define showlist(...) puts (#__VA_ARGS__)
-#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
-static void
-test_varargs_macros (void)
-{
-  int x = 1234;
-  int y = 5678;
-  debug ("Flag");
-  debug ("X = %d\n", x);
-  showlist (The first, second, and third items.);
-  report (x>y, "x is %d but y is %d", x, y);
-}
-
-// Check long long types.
-#define BIG64 18446744073709551615ull
-#define BIG32 4294967295ul
-#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
-#if !BIG_OK
-  your preprocessor is broken;
-#endif
-#if BIG_OK
-#else
-  your preprocessor is broken;
-#endif
-static long long int bignum = -9223372036854775807LL;
-static unsigned long long int ubignum = BIG64;
-
-struct incomplete_array
-{
-  int datasize;
-  double data[];
-};
-
-struct named_init {
-  int number;
-  const wchar_t *name;
-  double average;
-};
-
-typedef const char *ccp;
-
-static inline int
-test_restrict (ccp restrict text)
-{
-  // See if C++-style comments work.
-  // Iterate through items via the restricted pointer.
-  // Also check for declarations in for loops.
-  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
-    continue;
-  return 0;
-}
-
-// Check varargs and va_copy.
-static void
-test_varargs (const char *format, ...)
-{
-  va_list args;
-  va_start (args, format);
-  va_list args_copy;
-  va_copy (args_copy, args);
-
-  const char *str;
-  int number;
-  float fnumber;
-
-  while (*format)
-    {
-      switch (*format++)
-	{
-	case 's': // string
-	  str = va_arg (args_copy, const char *);
-	  break;
-	case 'd': // int
-	  number = va_arg (args_copy, int);
-	  break;
-	case 'f': // float
-	  fnumber = va_arg (args_copy, double);
-	  break;
-	default:
-	  break;
-	}
-    }
-  va_end (args_copy);
-  va_end (args);
-}
-
-int
-main ()
-{
-
-  // Check bool.
-  _Bool success = false;
-
-  // Check restrict.
-  if (test_restrict ("String literal") == 0)
-    success = true;
-  char *restrict newvar = "Another string";
-
-  // Check varargs.
-  test_varargs ("s, d' f .", "string", 65, 34.234);
-  test_varargs_macros ();
-
-  // Check flexible array members.
-  struct incomplete_array *ia =
-    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
-  ia->datasize = 10;
-  for (int i = 0; i < ia->datasize; ++i)
-    ia->data[i] = i * 1.234;
-
-  // Check named initializers.
-  struct named_init ni = {
-    .number = 34,
-    .name = L"Test wide string",
-    .average = 543.34343,
-  };
-
-  ni.number = 58;
-
-  int dynamic_array[ni.number];
-  dynamic_array[ni.number - 1] = 543;
-
-  // work around unused variable warnings
-  return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
-	  || dynamic_array[ni.number - 1] != 543);
-
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c99=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c99" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c99" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c99"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c99" != xno; then :
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
-else
-  ac_cv_prog_cc_stdc=no
-fi
-
-fi
- ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO Standard C" >&5
-$as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; }
-  if ${ac_cv_prog_cc_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-
-  case $ac_cv_prog_cc_stdc in #(
-  no) :
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;; #(
-  '') :
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;; #(
-  *) :
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_stdc" >&5
-$as_echo "$ac_cv_prog_cc_stdc" >&6; } ;;
-esac
-
-if test "$cross_compiling" = no; then
-  if test "x$ac_cv_prog_cc_c99" = "xno" || test "x$ac_cv_prog_cc_c99" = "x"; then
-  # We might be on RHEL5 with a git checkout and so broken
-  # autoconf. Check if CC is gcc and if it bails when given -std=gnu99.
-  # If not, use that.  Yuck.
-    if test "x$ac_cv_c_compiler_gnu" = "xyes"; then
-       CC="$CC -std=gnu99"
-       if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  return 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  as_fn_error $? "Could not find a C99 compatible compiler" "$LINENO" 5
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-    else
-      as_fn_error $? "Could not find a C99 compatible compiler" "$LINENO" 5
-    fi
-  fi
-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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-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
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; 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, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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; }
-		PKG_CONFIG=""
-	fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
-# Checks for header files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5
-$as_echo_n "checking whether sys/types.h defines makedev... " >&6; }
-if ${ac_cv_header_sys_types_h_makedev+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-int
-main ()
-{
-return makedev(0, 0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_header_sys_types_h_makedev=yes
-else
-  ac_cv_header_sys_types_h_makedev=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_types_h_makedev" >&5
-$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; }
-
-if test $ac_cv_header_sys_types_h_makedev = no; then
-ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_mkdev_h" = xyes; then :
-
-$as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h
-
-fi
-
-
-
-  if test $ac_cv_header_sys_mkdev_h = no; then
-    ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then :
-
-$as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h
-
-fi
-
-
-  fi
-fi
-
-for ac_header in arpa/inet.h fcntl.h langinfo.h libintl.h limits.h locale.h netinet/in.h stdint.h stdio_ext.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/time.h termios.h unistd.h utmp.h values.h wchar.h wctype.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-# Checks for typedefs, structures, and compiler characteristics.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
-$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
-if ${ac_cv_header_stdbool_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-             #include <stdbool.h>
-             #ifndef bool
-              "error: bool is not defined"
-             #endif
-             #ifndef false
-              "error: false is not defined"
-             #endif
-             #if false
-              "error: false is not 0"
-             #endif
-             #ifndef true
-              "error: true is not defined"
-             #endif
-             #if true != 1
-              "error: true is not 1"
-             #endif
-             #ifndef __bool_true_false_are_defined
-              "error: __bool_true_false_are_defined is not defined"
-             #endif
-
-             struct s { _Bool s: 1; _Bool t; } s;
-
-             char a[true == 1 ? 1 : -1];
-             char b[false == 0 ? 1 : -1];
-             char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-             char d[(bool) 0.5 == true ? 1 : -1];
-             /* See body of main program for 'e'.  */
-             char f[(_Bool) 0.0 == false ? 1 : -1];
-             char g[true];
-             char h[sizeof (_Bool)];
-             char i[sizeof s.t];
-             enum { j = false, k = true, l = false * true, m = true * 256 };
-             /* The following fails for
-                HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
-             _Bool n[m];
-             char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-             char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
-             /* Catch a bug in an HP-UX C compiler.  See
-                http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
-                http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
-              */
-             _Bool q = true;
-             _Bool *pq = &q;
-
-int
-main ()
-{
-
-             bool e = &s;
-             *pq |= q;
-             *pq |= ! q;
-             /* Refer to every declared value, to avoid compiler optimizations.  */
-             return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
-                     + !m + !n + !o + !p + !q + !pq);
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdbool_h=yes
-else
-  ac_cv_header_stdbool_h=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
-$as_echo "$ac_cv_header_stdbool_h" >&6; }
-   ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
-if test "x$ac_cv_type__Bool" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE__BOOL 1
-_ACEOF
-
-
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
-$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-if ${ac_cv_type_uid_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uid_t" >/dev/null 2>&1; then :
-  ac_cv_type_uid_t=yes
-else
-  ac_cv_type_uid_t=no
-fi
-rm -f conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
-$as_echo "$ac_cv_type_uid_t" >&6; }
-if test $ac_cv_type_uid_t = no; then
-
-$as_echo "#define uid_t int" >>confdefs.h
-
-
-$as_echo "#define gid_t int" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_inline=$ac_kw
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  test "$ac_cv_c_inline" != no && break
-done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
-
-case $ac_cv_c_inline in
-  inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
-    ;;
-esac
-
-ac_fn_c_find_intX_t "$LINENO" "32" "ac_cv_c_int32_t"
-case $ac_cv_c_int32_t in #(
-  no|yes) ;; #(
-  *)
-
-cat >>confdefs.h <<_ACEOF
-#define int32_t $ac_cv_c_int32_t
-_ACEOF
-;;
-esac
-
-ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define pid_t int
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
-$as_echo_n "checking for C/C++ restrict keyword... " >&6; }
-if ${ac_cv_c_restrict+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_restrict=no
-   # The order here caters to the fact that C++ does not require restrict.
-   for ac_kw in __restrict __restrict__ _Restrict restrict; do
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-typedef int * int_ptr;
-	int foo (int_ptr $ac_kw ip) {
-	return ip[0];
-       }
-int
-main ()
-{
-int s[1];
-	int * $ac_kw t = s;
-	t[0] = 0;
-	return foo(t)
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_restrict=$ac_kw
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     test "$ac_cv_c_restrict" != no && break
-   done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
-$as_echo "$ac_cv_c_restrict" >&6; }
-
- case $ac_cv_c_restrict in
-   restrict) ;;
-   no) $as_echo "#define restrict /**/" >>confdefs.h
- ;;
-   *)  cat >>confdefs.h <<_ACEOF
-#define restrict $ac_cv_c_restrict
-_ACEOF
- ;;
- esac
-
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
-
-ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
-if test "x$ac_cv_type_ssize_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define ssize_t int
-_ACEOF
-
-fi
-
-ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_rdev" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_RDEV 1
-_ACEOF
-
-
-fi
-
-
-case `pwd` in
-  *\ * | *\	*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.4.2'
-macro_revision='1.3337'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-# 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'
-
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
-# 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*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-$as_echo "printf" >&6; } ;;
-  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-$as_echo "print -r" >&6; } ;;
-  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-$as_echo "cat" >&6; } ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_SED" || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-   then ac_cv_path_FGREP="$GREP -F"
-   else
-     if test -z "$FGREP"; then
-  ac_path_FGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in fgrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_FGREP" || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
-  # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'FGREP' >> "conftest.nl"
-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_FGREP="$ac_path_FGREP"
-      ac_path_FGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_FGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_FGREP=$FGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
-
-
-test -z "$GREP" && GREP=grep
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # 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
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if ${lt_cv_path_NM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-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
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in dumpbin "link -dump"
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DUMPBIN"; then
-  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$DUMPBIN" && break
-  done
-fi
-if test -z "$DUMPBIN"; then
-  ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in dumpbin "link -dump"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DUMPBIN"; then
-  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_DUMPBIN" && break
-done
-
-  if test "x$ac_ct_DUMPBIN" = x; then
-    DUMPBIN=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DUMPBIN=$ac_ct_DUMPBIN
-  fi
-fi
-
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if ${lt_cv_nm_interface+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-  cat conftest.out >&5
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
-
-# find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if ${lt_cv_sys_max_cmd_len+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-    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" && \
-	test undefined != "$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
-
-fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-
-
-
-
-
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# 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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-
-
-
-
-
-# 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
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
-$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
-if ${lt_cv_to_host_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-
-fi
-
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-$as_echo "$lt_cv_to_host_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
-$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
-if ${lt_cv_to_tool_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  #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
-
-fi
-
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if ${lt_cv_ld_reload_flag+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-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
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if ${lt_cv_deplibs_check_method+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-  ;;
-
-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 | gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | netbsdelf*-gnu)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    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
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
-
-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
-
-
-
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdio.h>
 
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+#define debug(...) fprintf (stderr, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
 
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  your preprocessor is broken;
+#endif
+#if BIG_OK
+#else
+  your preprocessor is broken;
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
 
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
 
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
 
+typedef const char *ccp;
 
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+    continue;
+  return 0;
+}
 
+// Check varargs and va_copy.
+static void
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
 
+  const char *str;
+  int number;
+  float fnumber;
 
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case 's': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case 'd': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case 'f': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+}
 
+int
+main ()
+{
 
+  // Check bool.
+  _Bool success = false;
 
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
 
+  // Check varargs.
+  test_varargs ("s, d' f .", "string", 65, 34.234);
+  test_varargs_macros ();
 
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = i * 1.234;
 
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
 
+  ni.number = 58;
 
+  int dynamic_array[ni.number];
+  dynamic_array[ni.number - 1] = 543;
 
+  // work around unused variable warnings
+  return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
+	  || dynamic_array[ni.number - 1] != 543);
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c99=$ac_arg
 fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
 done
-  done
-IFS=$as_save_IFS
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
 
 fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c99"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
 esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
+if test "x$ac_cv_prog_cc_c99" != xno; then :
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
 else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
-
-
-
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
 
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
-$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
-if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sharedlib_from_linklib_cmd='unknown'
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
 
-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
-    ;;
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
-    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"
-  ;;
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
-
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+else
+  ac_cv_prog_cc_stdc=no
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
+fi
+ ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO Standard C" >&5
+$as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; }
+  if ${ac_cv_prog_cc_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
 
+  case $ac_cv_prog_cc_stdc in #(
+  no) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;; #(
+  '') :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;; #(
+  *) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_stdc" >&5
+$as_echo "$ac_cv_prog_cc_stdc" >&6; } ;;
+esac
 
+if test "$cross_compiling" = no; then
+  if test "x$ac_cv_prog_cc_c99" = "xno" || test "x$ac_cv_prog_cc_c99" = "x"; then
+  # We might be on RHEL5 with a git checkout and so broken
+  # autoconf. Check if CC is gcc and if it bails when given -std=gnu99.
+  # If not, use that.  Yuck.
+    if test "x$ac_cv_c_compiler_gnu" = "xyes"; then
+       CC="$CC -std=gnu99"
+       if test "$cross_compiling" = yes; then :
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+int
+main ()
+{
 
+  return 0;
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
 
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in ar
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
+  as_fn_error $? "Could not find a C99 compatible compiler" "$LINENO" 5
 fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
+    else
+      as_fn_error $? "Could not find a C99 compatible compiler" "$LINENO" 5
+    fi
+  fi
+fi
 
-    test -n "$AR" && break
-  done
+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 how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
 fi
-if test -z "$AR"; then
-  ac_ct_AR=$AR
-  for ac_prog in ar
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
+if test -z "$CPP"; then
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
 
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  # Broken: fails on valid input.
+continue
 fi
+rm -f conftest.err conftest.i conftest.$ac_ext
 
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
 
-  test -n "$ac_ct_AR" && break
 done
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
 fi
 
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-
-
-
-
-
-
-
-
-
-
+    done
+    ac_cv_prog_CPP=$CPP
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
-$as_echo_n "checking for archiver @FILE support... " >&6; }
-if ${lt_cv_ar_at_file+:} false; then :
-  $as_echo_n "(cached) " >&6
+fi
+  CPP=$ac_cv_prog_CPP
 else
-  lt_cv_ar_at_file=no
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
 
-int
-main ()
-{
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
 
-  ;
-  return 0;
-}
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
-      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      if test "$ac_status" -eq 0; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	if test "$ac_status" -ne 0; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
 
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-$as_echo "$lt_cv_ar_at_file" >&6; }
 
-if test "x$lt_cv_ar_at_file" = xno; then
-  archiver_list_spec=
+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 ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  archiver_list_spec=$lt_cv_ar_at_file
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
 
@@ -8603,25 +6216,29 @@
 
 
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -8629,12 +6246,13 @@
   done
 IFS=$as_save_IFS
 
+  ;;
+esac
 fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -8642,26 +6260,28 @@
 
 
 fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -8669,19 +6289,20 @@
   done
 IFS=$as_save_IFS
 
+  ;;
+esac
 fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -8689,167 +6310,394 @@
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    STRIP=$ac_ct_STRIP
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
   fi
 else
-  STRIP="$ac_cv_prog_STRIP"
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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; }
+		PKG_CONFIG=""
+	fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+
+# Checks for header files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5
+$as_echo_n "checking whether sys/types.h defines makedev... " >&6; }
+if ${ac_cv_header_sys_types_h_makedev+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+int
+main ()
+{
+return makedev(0, 0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_header_sys_types_h_makedev=yes
+else
+  ac_cv_header_sys_types_h_makedev=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_types_h_makedev" >&5
+$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; }
+
+if test $ac_cv_header_sys_types_h_makedev = no; then
+ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_mkdev_h" = xyes; then :
+
+$as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h
+
+fi
+
+
+
+  if test $ac_cv_header_sys_mkdev_h = no; then
+    ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then :
+
+$as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h
+
 fi
 
-test -z "$STRIP" && STRIP=:
 
+  fi
+fi
 
+for ac_header in arpa/inet.h fcntl.h float.h langinfo.h libintl.h limits.h locale.h netinet/in.h stdint.h stdio_ext.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/time.h termios.h unistd.h utmp.h values.h wchar.h wctype.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
+fi
 
+done
 
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
+# Checks for typedefs, structures, and compiler characteristics.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
+$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
+if ${ac_cv_header_stdbool_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
+             #include <stdbool.h>
+             #ifndef bool
+              "error: bool is not defined"
+             #endif
+             #ifndef false
+              "error: false is not defined"
+             #endif
+             #if false
+              "error: false is not 0"
+             #endif
+             #ifndef true
+              "error: true is not defined"
+             #endif
+             #if true != 1
+              "error: true is not 1"
+             #endif
+             #ifndef __bool_true_false_are_defined
+              "error: __bool_true_false_are_defined is not defined"
+             #endif
+
+             struct s { _Bool s: 1; _Bool t; } s;
+
+             char a[true == 1 ? 1 : -1];
+             char b[false == 0 ? 1 : -1];
+             char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+             char d[(bool) 0.5 == true ? 1 : -1];
+             /* See body of main program for 'e'.  */
+             char f[(_Bool) 0.0 == false ? 1 : -1];
+             char g[true];
+             char h[sizeof (_Bool)];
+             char i[sizeof s.t];
+             enum { j = false, k = true, l = false * true, m = true * 256 };
+             /* The following fails for
+                HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
+             _Bool n[m];
+             char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+             char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+             /* Catch a bug in an HP-UX C compiler.  See
+                http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+                http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+              */
+             _Bool q = true;
+             _Bool *pq = &q;
+
+int
+main ()
+{
+
+             bool e = &s;
+             *pq |= q;
+             *pq |= ! q;
+             /* Refer to every declared value, to avoid compiler optimizations.  */
+             return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+                     + !m + !n + !o + !p + !q + !pq);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdbool_h=yes
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  ac_cv_header_stdbool_h=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
+$as_echo "$ac_cv_header_stdbool_h" >&6; }
+   ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
+if test "x$ac_cv_type__Bool" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE__BOOL 1
+_ACEOF
 
 
 fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
+if ${ac_cv_type_uid_t+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
 
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "uid_t" >/dev/null 2>&1; then :
+  ac_cv_type_uid_t=yes
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  ac_cv_type_uid_t=no
 fi
+rm -f conftest*
 
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
+$as_echo "$ac_cv_type_uid_t" >&6; }
+if test $ac_cv_type_uid_t = no; then
 
-test -z "$RANLIB" && RANLIB=:
-
+$as_echo "#define uid_t int" >>confdefs.h
 
 
+$as_echo "#define gid_t int" >>confdefs.h
 
+fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if ${ac_cv_c_inline+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_inline=no
+for ac_kw in inline __inline__ __inline; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __cplusplus
+typedef int foo_t;
+static $ac_kw foo_t static_foo () {return 0; }
+$ac_kw foo_t foo () {return 0; }
+#endif
 
-# 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=
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_inline=$ac_kw
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  test "$ac_cv_c_inline" != no && break
+done
 
-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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
 
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
+case $ac_cv_c_inline in
+  inline | yes) ;;
   *)
-    lock_old_archive_extraction=no ;;
+    case $ac_cv_c_inline in
+      no) ac_val=;;
+      *) ac_val=$ac_cv_c_inline;;
+    esac
+    cat >>confdefs.h <<_ACEOF
+#ifndef __cplusplus
+#define inline $ac_val
+#endif
+_ACEOF
+    ;;
 esac
 
+ac_fn_c_find_intX_t "$LINENO" "32" "ac_cv_c_int32_t"
+case $ac_cv_c_int32_t in #(
+  no|yes) ;; #(
+  *)
 
+cat >>confdefs.h <<_ACEOF
+#define int32_t $ac_cv_c_int32_t
+_ACEOF
+;;
+esac
 
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = xyes; then :
 
+else
 
+cat >>confdefs.h <<_ACEOF
+#define pid_t int
+_ACEOF
 
+fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
+$as_echo_n "checking for C/C++ restrict keyword... " >&6; }
+if ${ac_cv_c_restrict+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_restrict=no
+   # The order here caters to the fact that C++ does not require restrict.
+   for ac_kw in __restrict __restrict__ _Restrict restrict; do
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+typedef int * int_ptr;
+	int foo (int_ptr $ac_kw ip) {
+	return ip[0];
+       }
+int
+main ()
+{
+int s[1];
+	int * $ac_kw t = s;
+	t[0] = 0;
+	return foo(t)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_restrict=$ac_kw
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     test "$ac_cv_c_restrict" != no && break
+   done
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
+$as_echo "$ac_cv_c_restrict" >&6; }
 
+ case $ac_cv_c_restrict in
+   restrict) ;;
+   no) $as_echo "#define restrict /**/" >>confdefs.h
+ ;;
+   *)  cat >>confdefs.h <<_ACEOF
+#define restrict $ac_cv_c_restrict
+_ACEOF
+ ;;
+ esac
 
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
 
+else
 
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
+_ACEOF
 
+fi
 
+ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
+if test "x$ac_cv_type_ssize_t" = xyes; then :
 
+else
 
+cat >>confdefs.h <<_ACEOF
+#define ssize_t int
+_ACEOF
 
+fi
 
+ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_rdev" = xyes; then :
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_RDEV 1
+_ACEOF
 
 
+fi
 
 
+case `pwd` in
+  *\ * | *\	*)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
 
 
 
+macro_version='2.4.6'
+macro_revision='2.4.6'
 
 
 
@@ -8863,264 +6711,138 @@
 
 
 
-# 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
+ltmain=$ac_aux_dir/ltmain.sh
 
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
   $as_echo_n "(cached) " >&6
 else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
-# 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]' ;;
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; 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'"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
 
-# 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
-  ;;
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; 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
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
 
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && 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
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
 
-      # 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_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
 
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
 
-	  cat <<_LT_EOF >> conftest.$ac_ext
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
 
-/* The mapping between symbol names and symbols.  */
-LT_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}
-};
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# 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
 
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
 }
-#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_prog_compiler_no_builtin_flag"
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && 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" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
+case $ECHO in
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
 
-  # 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
 
-fi
 
-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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-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
 
 
 
@@ -9131,9 +6853,77 @@
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
 
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
 
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
 
 
 
@@ -9145,487 +6935,279 @@
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if ${ac_cv_path_FGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in fgrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_FGREP" || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
 
+      $ac_path_FGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_FGREP=$FGREP
+fi
 
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
-$as_echo_n "checking for sysroot... " >&6; }
 
-# Check whether --with-sysroot was given.
-if test "${with_sysroot+set}" = set; then :
-  withval=$with_sysroot;
-else
-  with_sysroot=no
-fi
+test -z "$GREP" && GREP=grep
 
 
-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|'')
-   ;; #(
- *)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
-   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
-   ;;
-esac
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-$as_echo "${lt_sysroot:-no}" >&6; }
 
 
 
 
 
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
-  enableval=$enable_libtool_lock;
-fi
 
-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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; 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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; 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*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; 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*)
-	    case `/usr/bin/file conftest.o` in
-	      *x86-64*)
-		LD="${LD-ld} -m elf32_x86_64"
-		;;
-	      *)
-		LD="${LD-ld} -m elf_i386"
-		;;
-	    esac
-	    ;;
-	  powerpc64le-*)
-	    LD="${LD-ld} -m elf32lppclinux"
-	    ;;
-	  powerpc64-*)
-	    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"
-	    ;;
-	  powerpcle-*)
-	    LD="${LD-ld} -m elf64lppc"
-	    ;;
-	  powerpc-*)
-	    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"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if ${lt_cv_cc_needs_belf+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
 
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_cc_needs_belf=yes
-else
-  lt_cv_cc_needs_belf=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     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
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
-  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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; 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"
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
-set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$MANIFEST_TOOL"; then
-  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
 
-fi
-fi
-MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
-if test -n "$MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-$as_echo "$MANIFEST_TOOL" >&6; }
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  with_gnu_ld=no
 fi
 
-
+ac_prog=ld
+if test yes = "$GCC"; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  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 yes = "$with_gnu_ld"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
-  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
-  # Extract the first word of "mt", so it can be a program name with args.
-set dummy mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+if ${lt_cv_path_LD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_MANIFEST_TOOL"; then
-  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
+  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 no != "$with_gnu_ld" && break
+	;;
+      *)
+	test yes != "$with_gnu_ld" && break
+	;;
+      esac
+    fi
   done
-IFS=$as_save_IFS
-
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
 fi
 fi
-ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
-if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-
-  if test "x$ac_ct_MANIFEST_TOOL" = x; then
-    MANIFEST_TOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
-  fi
-else
-  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
-fi
-
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
-$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
-if ${lt_cv_path_mainfest_tool+:} false; then :
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&5
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
-$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
-  MANIFEST_TOOL=:
+  # 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
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 
 
 
 
-  case $host_os in
-    rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
 
-fi
-fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
 
-fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if ${lt_cv_path_NM+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM=$NM
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
+  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
-done
+  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
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break 2
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break 2
+	    ;;
+	  *)
+	    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
-IFS=$as_save_IFS
-
+  : ${lt_cv_path_NM=no}
 fi
 fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
   else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
-  fi
-else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_NMEDIT+:} false; then :
+if ${ac_cv_prog_DUMPBIN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -9634,7 +7216,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -9644,28 +7226,32 @@
 
 fi
 fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
+    test -n "$DUMPBIN" && break
+  done
 fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in dumpbin "link -dump"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -9674,7 +7260,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -9684,17 +7270,21 @@
 
 fi
 fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -9702,206 +7292,356 @@
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    NMEDIT=$ac_ct_NMEDIT
+    DUMPBIN=$ac_ct_DUMPBIN
   fi
-else
-  NMEDIT="$ac_cv_prog_NMEDIT"
 fi
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
   fi
-done
-  done
-IFS=$as_save_IFS
 
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
+  fi
 fi
-fi
-LIPO=$ac_cv_prog_LIPO
-if test -n "$LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+test -z "$NM" && NM=nm
 
 
-fi
-if test -z "$ac_cv_prog_LIPO"; then
-  ac_ct_LIPO=$LIPO
-  # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if ${lt_cv_nm_interface+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_LIPO"; then
-  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
   fi
-done
-  done
-IFS=$as_save_IFS
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
+
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if ${lt_cv_sys_max_cmd_len+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+    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;
+    ;;
+
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+    # 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" && \
+       test undefined != "$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 17 != "$i" # 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
 
 fi
-fi
-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
+
+if test -n "$lt_cv_sys_max_cmd_len"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
 fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
 
-  if test "x$ac_ct_LIPO" = x; then
-    LIPO=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    LIPO=$ac_ct_LIPO
-  fi
+
+
+
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
 else
-  LIPO="$ac_cv_prog_LIPO"
+  lt_unset=false
 fi
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL+:} false; then :
+
+
+
+
+# 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
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+  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
 
 fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
 
-fi
-if test -z "$ac_cv_prog_OTOOL"; then
-  ac_ct_OTOOL=$OTOOL
-  # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_OTOOL"; then
-  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+  #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
 
 fi
-fi
-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
-  if test "x$ac_ct_OTOOL" = x; then
-    OTOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL=$ac_ct_OTOOL
-  fi
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if ${lt_cv_ld_reload_flag+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  OTOOL="$ac_cv_prog_OTOOL"
+  lt_cv_ld_reload_flag='-r'
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+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 yes != "$GCC"; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool64; ac_word=$2
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL64+:} false; then :
+if ${ac_cv_prog_OBJDUMP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$OTOOL64"; then
-  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -9910,7 +7650,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -9920,10 +7660,10 @@
 
 fi
 fi
-OTOOL64=$ac_cv_prog_OTOOL64
-if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -9931,17 +7671,17 @@
 
 
 fi
-if test -z "$ac_cv_prog_OTOOL64"; then
-  ac_ct_OTOOL64=$OTOOL64
-  # Extract the first word of "otool64", so it can be a program name with args.
-set dummy otool64; ac_word=$2
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_OTOOL64"; then
-  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -9950,7 +7690,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OTOOL64="otool64"
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -9959,287 +7699,32 @@
 IFS=$as_save_IFS
 
 fi
-fi
-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL64" = x; then
-    OTOOL64=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL64=$ac_ct_OTOOL64
-  fi
-else
-  OTOOL64="$ac_cv_prog_OTOOL64"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if ${lt_cv_apple_cc_single_mod+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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" >&5
-	$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 >&5
-	# 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 >&5
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if ${lt_cv_ld_exported_symbols_list+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_ld_exported_symbols_list=yes
-else
-  lt_cv_ld_exported_symbols_list=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-$as_echo_n "checking for -force_load linker flag... " >&6; }
-if ${lt_cv_ld_force_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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" >&5
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-      echo "$AR cru libconftest.a conftest.o" >&5
-      $AR cru libconftest.a conftest.o 2>&5
-      echo "$RANLIB libconftest.a" >&5
-      $RANLIB libconftest.a 2>&5
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
-      $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 >&5
-      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 >&5
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-$as_echo "$lt_cv_ld_force_load" >&6; }
-    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
-
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-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
-
-
-
-
-
-# Set options
-
-
-
-        enable_dlopen=no
-
-
-  enable_win32_dll=no
-
-
-            # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared; 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
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
 else
-  enable_shared=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-
-
-
-
-
-
-
-
-  # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; 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
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
 else
-  enable_static=yes
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
 fi
 
+test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
@@ -10249,98 +7734,226 @@
 
 
 
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
-  withval=$with_pic; 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if ${lt_cv_deplibs_check_method+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  pic_mode=default
-fi
-
+  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
+# that 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.
 
-test -z "$pic_mode" && pic_mode=default
+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.
+  if ( 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
+  ;;
 
-  # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
-  enableval=$enable_fast_install; 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"
+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
-  enable_fast_install=yes
-fi
-
-
-
-
-
-
-
-
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-
-
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
 
+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 | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+netbsd* | netbsdelf*-gnu)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    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* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; 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
+  ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
 
+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
 
 
 
@@ -10348,7 +7961,6 @@
 
 
 
-test -z "$LN_S" && LN_S="ln -s"
 
 
 
@@ -10363,722 +7975,545 @@
 
 
 
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if ${lt_cv_objdir+:} false; then :
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
 else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
-
-
-
-
-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
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   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
-
-for cc_temp in $compiler""; 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-%%"`
-
-
-# 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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      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
-fi
+IFS=$as_save_IFS
 
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-
-
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  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
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      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
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
   done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
+IFS=$as_save_IFS
 
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
   else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
 esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
 
-# Use C for the default configuration in the libtool script
-
-lt_save_CC="$CC"
-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
+test -z "$DLLTOOL" && DLLTOOL=dlltool
 
 
-# Source file extension for C test sources.
-ac_ext=c
 
-# Object file extension for compiled C test sources.
-objext=o
-objext=$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);}'
 
 
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  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 one 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
 
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 
-# Allow CC to be a program name with arguments.
-compiler=$CC
 
-# 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
-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*
 
-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*
 
 
-## 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
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-lt_prog_compiler_no_builtin_flag=
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
-  *)
-    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
-  esac
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # 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\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   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
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $RM conftest*
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
-    :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
 fi
 
+: ${AR=ar}
+: ${AR_FLAGS=cru}
 
 
 
 
 
-  lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
 
 
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
 
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
 
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic='-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_prog_compiler_pic='-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
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ar_at_file=no
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test 0 -eq "$ac_status"; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	if test 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
 
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static=
-      ;;
+if test no = "$lt_cv_ar_at_file"; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+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*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-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_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
 
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
 
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
 
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
 
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      lt_prog_compiler_wl='-Xlinker '
-      if test -n "$lt_prog_compiler_pic"; then
-        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-    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).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-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_prog_compiler_pic='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
-      ;;
 
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='--shared'
-	lt_prog_compiler_static='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	lt_prog_compiler_wl='-Wl,-Wl,,'
-	lt_prog_compiler_pic='-PIC'
-	lt_prog_compiler_static='-Bstatic'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fpic'
-	lt_prog_compiler_static='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-qpic'
-	lt_prog_compiler_static='-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_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Qoption ld '
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Wl,'
-	  ;;
-        *Intel*\ [CF]*Compiler*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fPIC'
-	  lt_prog_compiler_static='-static'
-	  ;;
-	*Portland\ Group*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fpic'
-	  lt_prog_compiler_static='-Bstatic'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
 
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
+test -z "$STRIP" && STRIP=:
 
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
 
-    rdos*)
-      lt_prog_compiler_static='-non_shared'
-      ;;
 
-    solaris*)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	lt_prog_compiler_wl='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl='-Wl,';;
-      esac
-      ;;
 
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
 
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
 
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
 
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
   fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
 
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
+test -z "$RANLIB" && RANLIB=:
+
+
+
+
+
+
+# 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
+  bitrig* | openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    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
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-$as_echo "$lt_cv_prog_compiler_pic" >&6; }
-lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-   # 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\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   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
-       lt_cv_prog_compiler_pic_works=yes
-     fi
-   fi
-   $RM conftest*
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
 
-fi
 
 
 
@@ -11090,46 +8525,8 @@
 
 
 
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   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>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-    :
-else
-    lt_prog_compiler_static=
-fi
 
 
 
@@ -11137,1386 +8534,1312 @@
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 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
+
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  lt_cv_prog_compiler_c_o=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\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   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_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $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*
+# 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 ia64 = "$host_cpu"; 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
 
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
+# 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"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$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"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/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"
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+  # 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,
+    # D for any global variable and I for any imported 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};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,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'"
 
-   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\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   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_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $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*
+  # 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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && 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
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+      # 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 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_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_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
 
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
+/* 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_prog_compiler_no_builtin_flag"
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && 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" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
   fi
-else
-  need_locks=no
-fi
+  rm -rf conftest* conftst*
 
+  # Do not use the global_symbol_pipe unless it works.
+  if test yes = "$pipe_works"; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
 
+fi
 
+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
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+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
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
-  runpath_var=
-  allow_undefined_flag=
-  always_export_symbols=no
-  archive_cmds=
-  archive_expsym_cmds=
-  compiler_needs_object=no
-  enable_shared_with_static_runtimes=no
-  export_dynamic_flag_spec=
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  hardcode_automatic=no
-  hardcode_direct=no
-  hardcode_direct_absolute=no
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_separator=
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  inherit_rpath=no
-  link_all_deplibs=unknown
-  module_cmds=
-  module_expsym_cmds=
-  old_archive_from_new_cmds=
-  old_archive_from_expsyms_cmds=
-  thread_safe_flag_spec=
-  whole_archive_flag_spec=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # 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'.
-  exclude_expsyms='_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.
-  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
-    ;;
-  linux* | k*bsd*-gnu | gnu*)
-    link_all_deplibs=no
-    ;;
-  esac
 
-  ld_shlibs=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
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${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
-      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec=
-    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
-	ld_shlibs=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
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$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)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
 
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
 
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      export_dynamic_flag_spec='${wl}--export-all-symbols'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms='[_]+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
-        archive_cmds='$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...
-	archive_expsym_cmds='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
-	ld_shlibs=no
-      fi
-      ;;
 
-    haiku*)
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      link_all_deplibs=yes
-      ;;
 
-    interix[3-9]*)
-      hardcode_direct=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec='${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.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='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
-	  whole_archive_flag_spec='${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
-	  whole_archive_flag_spec='${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
-	  whole_archive_flag_spec=
-	  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
-	  whole_archive_flag_spec='${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'
-	  compiler_needs_object=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${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'
-	  compiler_needs_object=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
-        if test "x$supports_anon_versioning" = xyes; then
-          archive_expsym_cmds='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
-	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    archive_expsym_cmds='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
-        ld_shlibs=no
-      fi
-      ;;
 
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$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
-	ld_shlibs=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
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
 
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs=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
-	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    ld_shlibs=no
-	  fi
-	;;
-      esac
-      ;;
 
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
 
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-    esac
 
-    if test "$ld_shlibs" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec=
-      export_dynamic_flag_spec=
-      whole_archive_flag_spec=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$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.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=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
-	  export_symbols_cmds='$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
-	  export_symbols_cmds='$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.
 
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_direct_absolute=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      file_list_spec='${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
-	  hardcode_direct=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
-	  hardcode_minus_L=yes
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_libdir_separator=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-	link_all_deplibs=no
-      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
 
-      export_dynamic_flag_spec='${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.
-      always_export_symbols=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.
-	allow_undefined_flag='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+  withval=$with_sysroot;
+else
+  with_sysroot=no
+fi
+
+
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+   if test yes = "$GCC"; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+$as_echo "$with_sysroot" >&6; }
+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+   ;;
+esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
 
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`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_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+  ac_path_lt_DD_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in dd; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
+      $ac_path_lt_DD_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_lt_DD"; then
+    :
   fi
-
+else
+  ac_cv_path_lt_DD=$lt_DD
 fi
 
-  aix_libpath=$lt_cv_aix_libpath_
+rm -f conftest.i conftest2.i conftest.out
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
 
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$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
-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$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.
-	 if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
 
-int
-main ()
-{
 
-  ;
-  return 0;
+
+
+
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 }
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
 
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`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_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then :
+  enableval=$enable_libtool_lock;
+fi
+
+test no = "$enable_libtool_lock" || 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 what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; 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 what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    if test yes = "$lt_cv_prog_gnu_ld"; 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*
+  ;;
+
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; 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*)
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  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"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  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"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if ${lt_cv_cc_needs_belf+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  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
+
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_cc_needs_belf=yes
+else
+  lt_cv_cc_needs_belf=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
-  fi
-
-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
 
-  aix_libpath=$lt_cv_aix_libpath_
 fi
-
-	 hardcode_libdir_flag_spec='${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.
-	  no_undefined_flag=' ${wl}-bernotok'
-	  allow_undefined_flag=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    whole_archive_flag_spec='$convenience'
-	  fi
-	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds="\$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
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$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)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test yes != "$lt_cv_cc_needs_belf"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS=$SAVE_CFLAGS
+  fi
+  ;;
+*-*solaris*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*|x86_64-*-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
         ;;
-      esac
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec=-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
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	always_export_symbols=yes
-	file_list_spec='@'
-	# 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.
-	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	archive_expsym_cmds='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, )='true'
-	enable_shared_with_static_runtimes=yes
-	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	old_postinstall_cmds='chmod 644 $oldlib'
-	postlink_cmds='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
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=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.
-	archive_cmds='$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.
-	old_archive_from_new_cmds='true'
-	# FIXME: Should let the user specify the lib program.
-	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	enable_shared_with_static_runtimes=yes
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
 	;;
       esac
       ;;
-
-    darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc=no
-  hardcode_direct=no
-  hardcode_automatic=yes
-  hardcode_shlibpath_var=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
-  else
-    whole_archive_flag_spec=''
-  fi
-  link_all_deplibs=yes
-  allow_undefined_flag="$_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
-    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds="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}"
-    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-
-  else
-  ld_shlibs=no
+    esac
   fi
+  rm -rf conftest*
+  ;;
+esac
 
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=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*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$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
-	archive_cmds='$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
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$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*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
+need_locks=$enable_libtool_lock
 
-	  # 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)
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-$as_echo_n "checking if $CC understands -b... " >&6; }
-if ${lt_cv_prog_compiler__b+:} false; then :
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  lt_cv_prog_compiler__b=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS -b"
-   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>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler__b=yes
-       fi
-     else
-       lt_cv_prog_compiler__b=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
+  if test -n "$MANIFEST_TOOL"; then
+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-$as_echo "$lt_cv_prog_compiler__b" >&6; }
-
-if test x"$lt_cv_prog_compiler__b" = xyes; then
-    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
 else
-    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	*)
-	  hardcode_direct=yes
-	  hardcode_direct_absolute=yes
-	  export_dynamic_flag_spec='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	esac
-      fi
-      ;;
 
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds='$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.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-if ${lt_cv_irix_exported_symbol+:} false; then :
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+  # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int foo (void) { return 0; }
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_irix_exported_symbol=yes
+  if test -n "$ac_ct_MANIFEST_TOOL"; then
+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
 else
-  lt_cv_irix_exported_symbol=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-           LDFLAGS="$save_LDFLAGS"
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-$as_echo "$lt_cv_irix_exported_symbol" >&6; }
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          archive_expsym_cmds='$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
-	archive_cmds='$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'
-	archive_expsym_cmds='$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
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      inherit_rpath=yes
-      link_all_deplibs=yes
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct=yes
-	hardcode_shlibpath_var=no
-	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	ld_shlibs=no
-      fi
-      ;;
+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
+    MANIFEST_TOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+  fi
+else
+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
 
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      archive_cmds='$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'
-      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&5
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test yes != "$lt_cv_path_mainfest_tool"; then
+  MANIFEST_TOOL=:
+fi
 
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$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
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$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
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
 
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$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'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$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'
-	archive_expsym_cmds='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
-	hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_separator=:
-      ;;
 
-    solaris*)
-      no_undefined_flag=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='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=''
-	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='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}'
-	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='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
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=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
-	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs=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.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
 
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds='$CC -r -o $output$reload_objs'
-	  hardcode_direct=no
-        ;;
-	motorola)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
-      fi
-      ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='${wl}-z,text'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+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.
-      no_undefined_flag='${wl}-z,text'
-      allow_undefined_flag='${wl}-z,nodefs'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-R,$libdir'
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
 
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-    *)
-      ld_shlibs=no
-      ;;
-    esac
 
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
+done
+  done
+IFS=$as_save_IFS
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-with_gnu_ld=$with_gnu_ld
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
 
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
 
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
+fi
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+fi
 
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
+fi
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
 
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL="otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
+fi
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
+fi
 
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
 
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds 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.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc+:} false; then :
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl
-	  pic_flag=$lt_prog_compiler_pic
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag
-	  allow_undefined_flag=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc=no
-	  else
-	    lt_cv_archive_cmds_need_lc=yes
-	  fi
-	  allow_undefined_flag=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL64="otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
-      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
-      ;;
-    esac
-  fi
-  ;;
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
 esac
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+
+
+
+
 
 
 
@@ -12539,25 +9862,228 @@
 
 
 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if ${lt_cv_apple_cc_single_mod+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  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" >&5
+	$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 >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&5
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_ld_exported_symbols_list=yes
+else
+  lt_cv_ld_exported_symbols_list=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+	LDFLAGS=$save_LDFLAGS
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  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" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+      echo "$RANLIB libconftest.a" >&5
+      $RANLIB libconftest.a 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $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 >&5
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
+    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 yes = "$lt_cv_apple_cc_single_mod"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test yes = "$lt_cv_ld_exported_symbols_list"; 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 no = "$lt_cv_ld_force_load"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
 
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
 
+for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
 
+fi
 
+done
 
 
 
 
 
+# Set options
 
 
 
+        enable_dlopen=no
 
 
+  enable_win32_dll=no
 
 
+            # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared; 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
+else
+  enable_shared=yes
+fi
 
 
 
@@ -12567,6 +10093,28 @@
 
 
 
+  # Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; 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
+else
+  enable_static=yes
+fi
 
 
 
@@ -12577,6 +10125,27 @@
 
 
 
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then :
+  withval=$with_pic; 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
+else
+  pic_mode=default
+fi
 
 
 
@@ -12585,6 +10154,28 @@
 
 
 
+  # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then :
+  enableval=$enable_fast_install; 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
+else
+  enable_fast_install=yes
+fi
 
 
 
@@ -12593,8 +10184,51 @@
 
 
 
+  shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+  withval=$with_aix_soname; case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname
+else
+  if ${lt_cv_with_aix_soname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_with_aix_soname=aix
+fi
 
+    with_aix_soname=$lt_cv_with_aix_soname
+fi
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
 
 
 
@@ -12605,7 +10239,11 @@
 
 
 
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS=$ltmain
 
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
@@ -12636,6 +10274,7 @@
 
 
 
+test -z "$LN_S" && LN_S="ln -s"
 
 
 
@@ -12650,798 +10289,746 @@
 
 
 
+if test -n "${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if ${lt_cv_objdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  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
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
 
 
 
 
 
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
 
 
 
 
+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 set != "${COLLECT_NAMES+set}"; 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
 
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
 
 
+# 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
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  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
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/${ac_tool_prefix}file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
+      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
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
+*** 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
 
-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"
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
     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`
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac
+fi
+
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 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
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  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
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"file"
+      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
 
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
   ;;
+esac
+fi
 
-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
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  else
+    MAGIC_CMD=:
+  fi
+fi
+
+  fi
   ;;
+esac
 
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
+# Use C for the default configuration in the libtool script
 
-  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
+lt_save_CC=$CC
+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
 
-    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}'
 
-      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'
-    ;;
+# Source file extension for C test sources.
+ac_ext=c
 
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
 
-    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
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
 
-    # 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'
-    ;;
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
 
-  *)
-    # 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`'
 
-  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
-  ;;
 
-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
-  ;;
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
 
-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
-  ;;
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 
-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
-  ;;
+# Allow CC to be a program name with arguments.
+compiler=$CC
 
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
+# 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
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | 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
+# save warnings/boilerplate of simple test code
+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*
 
-  # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+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*
+
+
+## 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_prog_compiler_no_builtin_flag=
+
+if test yes = "$GCC"; then
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
+  lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
+   # 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\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   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
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $RM conftest*
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
 
 fi
 
-  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'
-  ;;
 
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
 
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  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
-  ;;
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
 
-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'
-  ;;
+  if test yes = "$GCC"; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-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_prog_compiler_pic='-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
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
 
-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
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
+    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
 	;;
       *)
-	shlibpath_overrides_runpath=yes
+	lt_prog_compiler_pic='-fPIC'
 	;;
       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
-  ;;
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
 
-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"
-  ;;
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
 
-rdos*)
-  dynamic_linker=no
-  ;;
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
 
-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'
-  ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
 
-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
-  ;;
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
 
-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
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
       ;;
-    siemens)
-      need_lib_prefix=no
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      else
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+      fi
       ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        lt_prog_compiler_wl='-Wl,-Wl,,'
+        lt_prog_compiler_pic='-PIC'
+        lt_prog_compiler_static='-Bstatic'
+        ;;
+      esac
       ;;
-  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
-  ;;
+    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).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
+      ;;
 
-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"
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-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_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='$wl-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      case $cc_basename in
+      # old Intel for x86_64, which still supported -KPIC.
+      ecc*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='--shared'
+	lt_prog_compiler_static='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl='-Wl,-Wl,,'
+	lt_prog_compiler_pic='-PIC'
+	lt_prog_compiler_static='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-qpic'
+	lt_prog_compiler_static='-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_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
+	esac
 	;;
-    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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-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
-
-
-
-
-
-
+      esac
+      ;;
 
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
 
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
 
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
 
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
 
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
+      ;;
 
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
 
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
 
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
 
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
 
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
 
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
 
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
 
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
+   # 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\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   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
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
 
+fi
 
 
 
@@ -13453,8 +11040,46 @@
 
 
 
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   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>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
+if test yes = "$lt_cv_prog_compiler_static_works"; then
+    :
+else
+    lt_prog_compiler_static=
+fi
 
 
 
@@ -13462,1076 +11087,1534 @@
 
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=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\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   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_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $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*
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
 
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=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\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   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_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $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*
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
 
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  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
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test no = "$hard_links"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
 
 
 
 
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
+  runpath_var=
+  allow_undefined_flag=
+  always_export_symbols=no
+  archive_cmds=
+  archive_expsym_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
+  export_dynamic_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_separator=
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
+  link_all_deplibs=unknown
+  module_cmds=
+  module_expsym_cmds=
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # 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'.
+  exclude_expsyms='_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.
+  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 yes != "$GCC"; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd* | bitrig*)
+    with_gnu_ld=no
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    link_all_deplibs=no
+    ;;
+  esac
 
+  ld_shlibs=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 yes = "$with_gnu_ld"; 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 yes = "$lt_use_gnu_ld_interface"; 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
+    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+    export_dynamic_flag_spec='$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
+      whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 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 ia64 != "$host_cpu"; then
+	ld_shlibs=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
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$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)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
 
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
 
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='$wl--export-all-symbols'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms='[_]+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
+        archive_cmds='$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, use it as
+	# is; otherwise, prepend EXPORTS...
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; 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
+	ld_shlibs=no
+      fi
+      ;;
 
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
 
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      ;;
 
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+      export_dynamic_flag_spec='$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.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='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 linux-dietlibc = "$host_os"; 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 no = "$tmp_diet"
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='$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
+	  whole_archive_flag_spec='$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
+	  whole_archive_flag_spec=
+	  tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-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
+	  whole_archive_flag_spec='$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'
+	  compiler_needs_object=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='$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'
+	  compiler_needs_object=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 
+        if test yes = "$supports_anon_versioning"; then
+          archive_expsym_cmds='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
+	tcc*)
+	  export_dynamic_flag_spec='-rdynamic'
+	  ;;
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test yes = "$supports_anon_versioning"; then
+	    archive_expsym_cmds='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
+        ld_shlibs=no
+      fi
+      ;;
 
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$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
+	ld_shlibs=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
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
 
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
 
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
+*** 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
+	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    ld_shlibs=no
+	  fi
+	;;
+      esac
+      ;;
 
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" ||
-   test -n "$runpath_var" ||
-   test "X$hardcode_automatic" = "Xyes" ; then
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+    esac
 
-  # We can hardcode non-existent directories.
-  if test "$hardcode_direct" != 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, )" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
+    if test no = "$ld_shlibs"; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
+    fi
   else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
-
-if test "$hardcode_action" = relink ||
-   test "$inherit_rpath" = 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
-
-
-
-
-
-
-  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=
-    ;;
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$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.
+      hardcode_minus_L=yes
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct=unsupported
+      fi
+      ;;
 
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
+    aix[4-9]*)
+      if test ia64 = "$host_cpu"; 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 GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
 
-  darwin*)
-  # if libdl is installed we need to link against it
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
+	  ;;
+	esac
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
 
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
+      # 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.
 
-fi
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_direct_absolute=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      file_list_spec='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	hardcode_direct=no
+	hardcode_direct_absolute=no
+	;;
+      esac
 
-    ;;
+      if test yes = "$GCC"; 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
+	  hardcode_direct=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
+	  hardcode_minus_L=yes
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_libdir_separator=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
+	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
+      else
+	# not using gcc
+	if test ia64 = "$host_cpu"; 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 yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
+	  else
+	    shared_flag='$wl-bM:SRE'
+	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
+	fi
+      fi
 
-  *)
-    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load"
+      export_dynamic_flag_spec='$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.
+      always_export_symbols=yes
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
+  if ${lt_cv_aix_libpath_+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
 int
 main ()
 {
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_shl_load=yes
-else
-  ac_cv_lib_dld_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`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_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if ${ac_cv_lib_svld_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_svld_dlopen=yes
-else
-  ac_cv_lib_svld_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+
+  aix_libpath=$lt_cv_aix_libpath_
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+
+        hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+      else
+	if test ia64 = "$host_cpu"; then
+	  hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag="-z nodefs"
+	  archive_expsym_cmds="\$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.
+	 if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if ${ac_cv_lib_dld_dld_link+:} false; then :
+  if ${lt_cv_aix_libpath_+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
 int
 main ()
 {
-return dld_link ();
+
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_dld_link=yes
-else
-  ac_cv_lib_dld_dld_link=no
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`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_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-fi
-
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
 
 fi
 
-
+  aix_libpath=$lt_cv_aix_libpath_
 fi
 
+	 hardcode_libdir_flag_spec='$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.
+	  no_undefined_flag=' $wl-bernotok'
+	  allow_undefined_flag=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec='$convenience'
+	  fi
+	  archive_cmds_need_lc=yes
+	  archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
+	fi
+      fi
+      ;;
 
-fi
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$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)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[45]*)
+      export_dynamic_flag_spec=-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
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	always_export_symbols=yes
+	file_list_spec='@'
+	# 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.
+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $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, )='true'
+	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	old_postinstall_cmds='chmod 644 $oldlib'
+	postlink_cmds='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
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=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.
+	archive_cmds='$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.
+	old_archive_from_new_cmds='true'
+	# FIXME: Should let the user specify the lib program.
+	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	enable_shared_with_static_runtimes=yes
+	;;
+      esac
+      ;;
 
-fi
+    darwin* | rhapsody*)
 
 
-fi
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  if test yes = "$lt_cv_ld_force_load"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
 
-    ;;
+  else
+    whole_archive_flag_spec=''
+  fi
+  link_all_deplibs=yes
+  allow_undefined_flag=$_lt_dar_allow_undefined
+  case $cc_basename in
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
   esac
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    archive_expsym_cmds="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"
+    module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
 
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
   else
-    enable_dlopen=no
+  ld_shlibs=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"
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-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
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
 
-/* 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
+    # 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*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
 
-/* 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
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
 
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
 
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+    hpux9*)
+      if test yes = "$GCC"; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
 
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='$wl-E'
+      ;;
 
+    hpux10*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+	hardcode_libdir_separator=:
+	hardcode_direct=yes
+	hardcode_direct_absolute=yes
+	export_dynamic_flag_spec='$wl-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L=yes
+      fi
+      ;;
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
+    hpux11*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$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*)
+	  archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
 
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self_static+:} false; then :
+	  # 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)
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-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
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS -b"
+   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>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
 
-/* 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
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
 
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
+if test yes = "$lt_cv_prog_compiler__b"; then
+    archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
 
-  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 ());
+	  ;;
+	esac
+      fi
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+	hardcode_libdir_separator=:
 
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  hardcode_direct=no
+	  hardcode_shlibpath_var=no
+	  ;;
+	*)
+	  hardcode_direct=yes
+	  hardcode_direct_absolute=yes
+	  export_dynamic_flag_spec='$wl-E'
 
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	esac
+      fi
+      ;;
 
+    irix5* | irix6* | nonstopux*)
+      if test yes = "$GCC"; then
+	archive_cmds='$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.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo (void) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_irix_exported_symbol=yes
+else
+  lt_cv_irix_exported_symbol=no
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
-    fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+           LDFLAGS=$save_LDFLAGS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          archive_expsym_cmds='$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
+	link_all_deplibs=no
+      else
+	archive_cmds='$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'
+	archive_expsym_cmds='$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
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      inherit_rpath=yes
+      link_all_deplibs=yes
+      ;;
 
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	ld_shlibs=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
 
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
 
-  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
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
 
+    *nto* | *qnx*)
+      ;;
+
+    openbsd* | bitrig*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+	  export_dynamic_flag_spec='$wl-E'
+	else
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+	fi
+      else
+	ld_shlibs=no
+      fi
+      ;;
 
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      ;;
 
+    osf3*)
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$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
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$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
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      ;;
 
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$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'
+	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$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'
+	archive_expsym_cmds='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
+	hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_separator=:
+      ;;
 
+    solaris*)
+      no_undefined_flag=' -z defs'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='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=''
+	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_expsym_cmds='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'
+	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='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
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=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 yes = "$GCC"; then
+	  whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      link_all_deplibs=yes
+      ;;
 
+    sunos4*)
+      if test sequent = "$host_vendor"; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
 
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds='$CC -r -o $output$reload_objs'
+	  hardcode_direct=no
+        ;;
+	motorola)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
 
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
 
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs=yes
+      fi
+      ;;
 
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag='$wl-z,text'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
 
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
 
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We CANNOT 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.
+      no_undefined_flag='$wl-z,text'
+      allow_undefined_flag='$wl-z,nodefs'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='$wl-R,$libdir'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='$wl-Bexport'
+      runpath_var='LD_RUN_PATH'
 
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
 
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
 
+    *)
+      ld_shlibs=no
+      ;;
+    esac
 
-striplib=
-old_striplib=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-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"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-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"
-      { $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; }
+    if test sni = "$host_vendor"; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	export_dynamic_flag_spec='$wl-Blargedynsym'
+	;;
+      esac
     fi
-    ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  esac
-fi
-
-
-
-
+  fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
+test no = "$ld_shlibs" && can_build_shared=no
 
+with_gnu_ld=$with_gnu_ld
 
 
 
 
 
 
-  # Report which library types will actually be built
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-  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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
 
 
 
 
-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
 
-CC="$lt_save_CC"
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
 
-      if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-if test -z "$CXXCPP"; then
-  if ${ac_cv_prog_CXXCPP+:} false; then :
+  if test yes,yes = "$GCC,$enable_shared"; then
+    case $archive_cmds 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.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl
+	  pic_flag=$lt_prog_compiler_pic
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag
+	  allow_undefined_flag=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	  then
+	    lt_cv_archive_cmds_need_lc=no
+	  else
+	    lt_cv_archive_cmds_need_lc=yes
+	  fi
+	  allow_undefined_flag=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
 
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
 
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
 
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
 
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
 
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
 
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-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
 
-else
-  _lt_caught_CXX_error=yes
-fi
 
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-archive_cmds_need_lc_CXX=no
-allow_undefined_flag_CXX=
-always_export_symbols_CXX=no
-archive_expsym_cmds_CXX=
-compiler_needs_object_CXX=no
-export_dynamic_flag_spec_CXX=
-hardcode_direct_CXX=no
-hardcode_direct_absolute_CXX=no
-hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_separator_CXX=
-hardcode_minus_L_CXX=no
-hardcode_shlibpath_var_CXX=unsupported
-hardcode_automatic_CXX=no
-inherit_rpath_CXX=no
-module_cmds_CXX=
-module_expsym_cmds_CXX=
-link_all_deplibs_CXX=unknown
-old_archive_cmds_CXX=$old_archive_cmds
-reload_flag_CXX=$reload_flag
-reload_cmds_CXX=$reload_cmds
-no_undefined_flag_CXX=
-whole_archive_flag_spec_CXX=
-enable_shared_with_static_runtimes_CXX=no
 
-# Source file extension for C++ test sources.
-ac_ext=cpp
 
-# Object file extension for compiled C++ test sources.
-objext=o
-objext_CXX=$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.
 
 
 
 
 
 
-# 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
 
 
-  # save warnings/boilerplate of simple test code
-  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*
 
-  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*
 
 
-  # 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
-  compiler_CXX=$CC
-  for cc_temp in $compiler""; 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-%%"`
 
 
-  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_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
-    else
-      lt_prog_compiler_no_builtin_flag_CXX=
-    fi
 
-    if test "$GXX" = yes; then
-      # Set up default GNU C++ configuration
 
 
 
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
 
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-fi
 
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # 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
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 
@@ -14539,1251 +12622,88 @@
 
 
 
-      # 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
-        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        archive_expsym_cmds_CXX='$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'
-
-        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-        export_dynamic_flag_spec_CXX='${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
-          whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-        else
-          whole_archive_flag_spec_CXX=
-        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.
-        archive_cmds_CXX='$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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-    ld_shlibs_CXX=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=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.
-
-        archive_cmds_CXX=''
-        hardcode_direct_CXX=yes
-        hardcode_direct_absolute_CXX=yes
-        hardcode_libdir_separator_CXX=':'
-        link_all_deplibs_CXX=yes
-        file_list_spec_CXX='${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
-	    hardcode_direct_CXX=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
-	    hardcode_minus_L_CXX=yes
-	    hardcode_libdir_flag_spec_CXX='-L$libdir'
-	    hardcode_libdir_separator_CXX=
-	  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
 
-        export_dynamic_flag_spec_CXX='${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.
-        always_export_symbols_CXX=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.
-          allow_undefined_flag_CXX='-berok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath__CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
 
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath__CXX=`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_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
-  fi
 
-fi
 
-  aix_libpath=$lt_cv_aix_libpath__CXX
-fi
 
-          hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-          archive_expsym_cmds_CXX='$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
-	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-	    allow_undefined_flag_CXX="-z nodefs"
-	    archive_expsym_cmds_CXX="\$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.
-	    if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath__CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
 
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath__CXX=`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_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
-  fi
 
-fi
 
-  aix_libpath=$lt_cv_aix_libpath__CXX
-fi
 
-	    hardcode_libdir_flag_spec_CXX='${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.
-	    no_undefined_flag_CXX=' ${wl}-bernotok'
-	    allow_undefined_flag_CXX=' ${wl}-berok'
-	    if test "$with_gnu_ld" = yes; then
-	      # We only use this code for GNU lds that support --whole-archive.
-	      whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    else
-	      # Exported symbols can be pulled into shared objects from archives
-	      whole_archive_flag_spec_CXX='$convenience'
-	    fi
-	    archive_cmds_need_lc_CXX=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    archive_expsym_cmds_CXX="\$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
-	  allow_undefined_flag_CXX=unsupported
-	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	else
-	  ld_shlibs_CXX=no
-	fi
-	;;
 
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=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.
-	  hardcode_libdir_flag_spec_CXX=' '
-	  allow_undefined_flag_CXX=unsupported
-	  always_export_symbols_CXX=yes
-	  file_list_spec_CXX='@'
-	  # 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.
-	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	  archive_expsym_cmds_CXX='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, CXX)='true'
-	  enable_shared_with_static_runtimes_CXX=yes
-	  # Don't use ranlib
-	  old_postinstall_cmds_CXX='chmod 644 $oldlib'
-	  postlink_cmds_CXX='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, CXX) is actually meaningless,
-	  # as there is no search path for DLLs.
-	  hardcode_libdir_flag_spec_CXX='-L$libdir'
-	  export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
-	  allow_undefined_flag_CXX=unsupported
-	  always_export_symbols_CXX=no
-	  enable_shared_with_static_runtimes_CXX=yes
-
-	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    archive_cmds_CXX='$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...
-	    archive_expsym_cmds_CXX='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
-	    ld_shlibs_CXX=no
-	  fi
-	  ;;
-	esac
-	;;
-      darwin* | rhapsody*)
 
 
-  archive_cmds_need_lc_CXX=no
-  hardcode_direct_CXX=no
-  hardcode_automatic_CXX=yes
-  hardcode_shlibpath_var_CXX=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
 
-  else
-    whole_archive_flag_spec_CXX=''
-  fi
-  link_all_deplibs_CXX=yes
-  allow_undefined_flag_CXX="$_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
-    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds_CXX="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}"
-    module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-       if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      archive_cmds_CXX="\$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}"
-      archive_expsym_cmds_CXX="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
-  ld_shlibs_CXX=no
-  fi
 
-	;;
 
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-        esac
-        ;;
 
-      freebsd2.*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        ld_shlibs_CXX=no
-        ;;
 
-      freebsd-elf*)
-        archive_cmds_need_lc_CXX=no
-        ;;
 
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        ld_shlibs_CXX=yes
-        ;;
 
-      haiku*)
-        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        link_all_deplibs_CXX=yes
-        ;;
 
-      hpux9*)
-        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-        hardcode_libdir_separator_CXX=:
-        export_dynamic_flag_spec_CXX='${wl}-E'
-        hardcode_direct_CXX=yes
-        hardcode_minus_L_CXX=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
-            ld_shlibs_CXX=no
-            ;;
-          aCC*)
-            archive_cmds_CXX='$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
-              archive_cmds_CXX='$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
-              ld_shlibs_CXX=no
-            fi
-            ;;
-        esac
-        ;;
 
-      hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator_CXX=:
 
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      export_dynamic_flag_spec_CXX='${wl}-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            hardcode_direct_CXX=no
-            hardcode_shlibpath_var_CXX=no
-            ;;
-          *)
-            hardcode_direct_CXX=yes
-            hardcode_direct_absolute_CXX=yes
-            hardcode_minus_L_CXX=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
-	    ld_shlibs_CXX=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        archive_cmds_CXX='$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*)
-	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            archive_cmds_CXX='$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
-	      ld_shlibs_CXX=no
-	    fi
-	    ;;
-        esac
-        ;;
 
-      interix[3-9]*)
-	hardcode_direct_CXX=no
-	hardcode_shlibpath_var_CXX=no
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${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.
-	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	archive_expsym_cmds_CXX='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++
-	    archive_cmds_CXX='$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.
-	    old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test "$with_gnu_ld" = no; then
-	        archive_cmds_CXX='$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
-	        archive_cmds_CXX='$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
-	    link_all_deplibs_CXX=yes
-	    ;;
-        esac
-        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-        hardcode_libdir_separator_CXX=:
-        inherit_rpath_CXX=yes
-        ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu | 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.
-	    archive_cmds_CXX='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'
-	    archive_expsym_cmds_CXX='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"'
-
-	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    old_archive_cmds_CXX='$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."*)
-	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		archive_expsym_cmds_CXX='$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
-	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    archive_cmds_need_lc_CXX=no
-	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	    whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
-	      prelink_cmds_CXX='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`"'
-	      old_archive_cmds_CXX='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'
-	      archive_cmds_CXX='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'
-	      archive_expsym_cmds_CXX='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
-	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      archive_expsym_cmds_CXX='$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
 
-	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	    whole_archive_flag_spec_CXX='${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++
-	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$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
-	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	    hardcode_libdir_separator_CXX=:
-
-	    # 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
-	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    if test "x$supports_anon_versioning" = xyes; then
-	      archive_expsym_cmds_CXX='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
-	      no_undefined_flag_CXX=' -zdefs'
-	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	      hardcode_libdir_flag_spec_CXX='-R$libdir'
-	      whole_archive_flag_spec_CXX='${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'
-	      compiler_needs_object_CXX=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.
-	      old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
 
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
 
-      m88k*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-	;;
 
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-	esac
-	;;
 
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  hardcode_libdir_flag_spec_CXX='-R$libdir'
-	  hardcode_direct_CXX=yes
-	  hardcode_shlibpath_var_CXX=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*)
-        ld_shlibs_CXX=yes
-	;;
 
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	ld_shlibs_CXX=no
-	;;
 
-      openbsd*)
-	if test -f /usr/libexec/ld.so; then
-	  hardcode_direct_CXX=yes
-	  hardcode_shlibpath_var_CXX=no
-	  hardcode_direct_absolute_CXX=yes
-	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	    export_dynamic_flag_spec_CXX='${wl}-E'
-	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=func_echo_all
-	else
-	  ld_shlibs_CXX=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.
-	    archive_cmds_CXX='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'
-
-	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	    hardcode_libdir_separator_CXX=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	        archive_cmds_CXX='$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'
-	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-		;;
-	      *)
-	        allow_undefined_flag_CXX=' -expect_unresolved \*'
-	        archive_cmds_CXX='$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'
-	        archive_expsym_cmds_CXX='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'
-	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-		;;
-	    esac
 
-	    hardcode_libdir_separator_CXX=:
 
-	    # 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
-	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	      case $host in
-	        osf3*)
-	          archive_cmds_CXX='$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'
-		  ;;
-	        *)
-	          archive_cmds_CXX='$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
-
-	      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	      hardcode_libdir_separator_CXX=:
-
-	      # 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
-	      ld_shlibs_CXX=no
-	    fi
-	    ;;
-        esac
-        ;;
 
-      psos*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
 
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-        esac
-        ;;
 
-      solaris*)
-        case $cc_basename in
-          CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            archive_cmds_need_lc_CXX=yes
-	    no_undefined_flag_CXX=' -zdefs'
-	    archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    archive_expsym_cmds_CXX='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'
-
-	    hardcode_libdir_flag_spec_CXX='-R$libdir'
-	    hardcode_shlibpath_var_CXX=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?)
-		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    link_all_deplibs_CXX=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.
-	    old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    archive_cmds_CXX='$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.
-	    old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        archive_expsym_cmds_CXX='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.
-	        archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        archive_expsym_cmds_CXX='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
-
-	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-	      case $host_os in
-		solaris2.[0-5] | solaris2.[0-5].*) ;;
-		*)
-		  whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag_CXX='${wl}-z,text'
-      archive_cmds_need_lc_CXX=no
-      hardcode_shlibpath_var_CXX=no
-      runpath_var='LD_RUN_PATH'
 
-      case $cc_basename in
-        CC*)
-	  archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_CXX='$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.
-	no_undefined_flag_CXX='${wl}-z,text'
-	allow_undefined_flag_CXX='${wl}-z,nodefs'
-	archive_cmds_need_lc_CXX=no
-	hardcode_shlibpath_var_CXX=no
-	hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
-	hardcode_libdir_separator_CXX=':'
-	link_all_deplibs_CXX=yes
-	export_dynamic_flag_spec_CXX='${wl}-Bexport'
-	runpath_var='LD_RUN_PATH'
 
-	case $cc_basename in
-          CC*)
-	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
-	      '"$old_archive_cmds_CXX"
-	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
-	      '"$reload_cmds_CXX"
-	    ;;
-	  *)
-	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    archive_expsym_cmds_CXX='$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
-	    ld_shlibs_CXX=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-        esac
-        ;;
 
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
 
-      *)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
-    esac
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
-    test "$ld_shlibs_CXX" = no && can_build_shared=no
-
-    GCC_CXX="$GXX"
-    LD_CXX="$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...
-    # Dependencies to place before and after the object being linked:
-predep_objects_CXX=
-postdep_objects_CXX=
-predeps_CXX=
-postdeps_CXX=
-compiler_lib_search_path_CXX=
-
-cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_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
 
-if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; 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 "$compiler_lib_search_path_CXX"; then
-	     compiler_lib_search_path_CXX="${prev}${p}"
-	   else
-	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${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 "$postdeps_CXX"; then
-	   postdeps_CXX="${prev}${p}"
-	 else
-	   postdeps_CXX="${postdeps_CXX} ${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 "$predep_objects_CXX"; then
-	   predep_objects_CXX="$p"
-	 else
-	   predep_objects_CXX="$predep_objects_CXX $p"
-	 fi
-       else
-	 if test -z "$postdep_objects_CXX"; then
-	   postdep_objects_CXX="$p"
-	 else
-	   postdep_objects_CXX="$postdep_objects_CXX $p"
-	 fi
-       fi
-       ;;
 
-    *) ;; # Ignore the rest.
 
-    esac
-  done
 
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling CXX test program"
-fi
 
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
 
-# PORTME: override above test on systems where it is broken
-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.
-  predep_objects_CXX=
-  postdep_objects_CXX=
-  postdeps_CXX=
-  ;;
-
-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
-      postdeps_CXX='-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
-      postdeps_CXX='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
 
 
-case " $postdeps_CXX " in
-*" -lc "*) archive_cmds_need_lc_CXX=no ;;
-esac
- compiler_lib_search_dirs_CXX=
-if test -n "${compiler_lib_search_path_CXX}"; then
- compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
 
 
 
@@ -15805,706 +12725,876 @@
 
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+if test yes = "$GCC"; 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`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
+  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"
+    elif test -n "$lt_multi_os_dir"; then
+      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 ia64 = "$host_cpu"; 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
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
 
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
+      # 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'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
+      # 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'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
+    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%'\''`; $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
+  ;;
 
-    lt_prog_compiler_wl_CXX=
-lt_prog_compiler_pic_CXX=
-lt_prog_compiler_static_CXX=
+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
 
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    lt_prog_compiler_wl_CXX='-Wl,'
-    lt_prog_compiler_static_CXX='-static'
+  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
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_CXX='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic_CXX='-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_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
+    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'
 
-    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
-      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_CXX='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      lt_prog_compiler_pic_CXX=
-      ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static_CXX=
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
       ;;
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
       ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_CXX=-Kconform_pic
-      fi
+    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'
       ;;
-    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_prog_compiler_pic_CXX='-fPIC'
-	;;
-      esac
+    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|^ ||'`
       ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic_CXX='-fPIC -shared'
+    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"`
       ;;
     *)
-      lt_prog_compiler_pic_CXX='-fPIC'
+      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
-  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_prog_compiler_static_CXX='-Bstatic'
-	else
-	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--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).
-	lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      lt_prog_compiler_pic_CXX='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      lt_prog_compiler_pic_CXX='+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_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    ;;
-	  ecpc* )
-	    # old Intel C++ for x86_64 which still supported -KPIC.
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-static'
-	    ;;
-	  icpc* )
-	    # Intel C++, used to be incompatible with GCC.
-	    # ICC 10 doesn't accept -KPIC any more.
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    lt_prog_compiler_static_CXX='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-fpic'
-	    lt_prog_compiler_static_CXX='-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_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-qpic'
-	    lt_prog_compiler_static_CXX='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      lt_prog_compiler_pic_CXX='-KPIC'
-	      lt_prog_compiler_static_CXX='-Bstatic'
-	      lt_prog_compiler_wl_CXX='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    lt_prog_compiler_pic_CXX='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd* | netbsdelf*-gnu)
-	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        lt_prog_compiler_pic_CXX='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    lt_prog_compiler_wl_CXX='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    lt_prog_compiler_pic_CXX='-pic'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	lt_prog_compiler_can_build_shared_CXX=no
-	;;
+
+    # 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`'
+
+  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$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
+      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
+  ;;
 
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_CXX=
+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=no
+  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 32 = "$HPUX_IA64_MODE"; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+    fi
+    ;;
+  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
     ;;
   *)
-    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+    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
+  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
+  ;;
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
-lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
+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
+  ;;
 
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test yes = "$lt_cv_prog_gnu_ld"; 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
+  ;;
+
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # 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
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  hardcode_libdir_flag_spec='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | 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
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  lt_cv_prog_compiler_pic_works_CXX=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-   # 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\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   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
-       lt_cv_prog_compiler_pic_works_CXX=yes
-     fi
-   fi
-   $RM conftest*
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+int
+main ()
+{
 
-if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-    case $lt_prog_compiler_pic_CXX in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-     esac
-else
-    lt_prog_compiler_pic_CXX=
-     lt_prog_compiler_can_build_shared_CXX=no
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  lt_cv_shlibpath_overrides_runpath=yes
 fi
-
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
 
+fi
 
+  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
 
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) 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
 
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works_CXX=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   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>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works_CXX=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works_CXX=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-    :
-else
-    lt_prog_compiler_static_CXX=
-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'
+  ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
 
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  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
+  ;;
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_CXX=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+*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'
+  ;;
 
-   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\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   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_cv_prog_compiler_c_o_CXX=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $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*
+openbsd* | bitrig*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec=/usr/lib
+  need_lib_prefix=no
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  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
+  shlibpath_overrides_runpath=yes
+  ;;
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+os2*)
+  libname_spec='$name'
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  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'
+  ;;
 
+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
+  ;;
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_CXX=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+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'
+  ;;
 
-   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\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   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_cv_prog_compiler_c_o_CXX=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $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*
+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 yes = "$with_gnu_ld"; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+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=sco
+  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 yes = "$with_gnu_ld"; 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
+  ;;
 
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test no = "$dynamic_linker" && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
-  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  exclude_expsyms_CXX='_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
-      export_symbols_cmds_CXX='$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
-      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    export_symbols_cmds_CXX="$ltdll_cmds"
-    ;;
-  cygwin* | mingw* | cegcc*)
-    case $cc_basename in
-    cl*)
-      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-      ;;
-    *)
-      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-      ;;
-    esac
-    ;;
-  linux* | k*bsd*-gnu | gnu*)
-    link_all_deplibs_CXX=no
-    ;;
-  *)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-    ;;
-  esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
 
-with_gnu_ld_CXX=$with_gnu_ld
 
 
 
 
 
 
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_CXX" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_CXX=yes
 
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_CXX 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.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl_CXX
-	  pic_flag=$lt_prog_compiler_pic_CXX
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-	  allow_undefined_flag_CXX=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc_CXX=no
-	  else
-	    lt_cv_archive_cmds_need_lc_CXX=yes
-	  fi
-	  allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
-      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
-      ;;
-    esac
-  fi
-  ;;
-esac
 
 
 
@@ -16567,692 +13657,580 @@
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
 
-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}'
 
-      ;;
-    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`'
 
-  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`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
+   test yes = "$hardcode_automatic"; then
+
+  # We can hardcode non-existent directories.
+  if test no != "$hardcode_direct" &&
+     # 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 no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+     test no != "$hardcode_minus_L"; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
   else
-    case $host_os in
-    freebsd[23].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
   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
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
+
+if test relink = "$hardcode_action" ||
+   test yes = "$inherit_rpath"; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+  if test yes != "$enable_dlopen"; 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
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
+  beos*)
+    lt_cv_dlopen=load_add_on
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=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
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen=LoadLibrary
+    lt_cv_dlopen_libs=
     ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
+
+  cygwin*)
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
     ;;
-  esac
-  ;;
 
-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
-  ;;
+  darwin*)
+    # if libdl is installed we need to link against it
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-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
-  ;;
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
+else
 
-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
-  ;;
+    lt_cv_dlopen=dyld
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
 
-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
-  ;;
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
 
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | 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
+  *)
+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = xyes; then :
+  lt_cv_dlopen=shl_load
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-  # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+int
+main ()
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_shl_load=yes
+else
+  ac_cv_lib_dld_shl_load=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+  lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
+else
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
 int
 main ()
 {
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if ${ac_cv_lib_svld_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_svld_dlopen=yes
+else
+  ac_cv_lib_svld_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if ${ac_cv_lib_dld_dld_link+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link ();
+int
+main ()
+{
+return dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_dld_link=yes
+else
+  ac_cv_lib_dld_dld_link=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+  lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
+fi
+
 
 fi
 
-  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
+fi
 
-  # 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'
-  ;;
+fi
 
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
 
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  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'
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test no = "$lt_cv_dlopen"; then
+    enable_dlopen=no
   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'
+    enable_dlopen=yes
   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
-  ;;
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && 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"
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test yes = "$cross_compiling"; then :
+  lt_cv_dlopen_self=cross
+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 -fvisibility=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
 
-*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'
-  ;;
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
 
-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
+  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
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
+    puts (dlerror ());
 
-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
-  ;;
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
 
-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
-  ;;
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
 
-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'
-  ;;
+    if test yes = "$lt_cv_dlopen_self"; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self_static+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test yes = "$cross_compiling"; then :
+  lt_cv_dlopen_self_static=cross
+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"
 
-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
-  ;;
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
 
-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
-  ;;
+#include <stdio.h>
 
-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
-  ;;
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
 
-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'
-  ;;
+/* 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
 
-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
-  ;;
+/* When -fvisibility=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
 
-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
-  ;;
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
 
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+  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 ());
 
-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"
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
 fi
+rm -fr conftest*
+
 
-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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
+    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
 
 
 
@@ -17270,6 +14248,35 @@
 
 
 
+striplib=
+old_striplib=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+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"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+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"
+      { $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; }
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
+fi
 
 
 
@@ -17282,76 +14289,59 @@
 
 
 
+  # Report what library types will actually be built
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+  test no = "$can_build_shared" && 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 yes = "$enable_shared" && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
 
+  aix[4-9]*)
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test yes = "$enable_shared" || enable_static=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action_CXX=
-if test -n "$hardcode_libdir_flag_spec_CXX" ||
-   test -n "$runpath_var_CXX" ||
-   test "X$hardcode_automatic_CXX" = "Xyes" ; then
 
-  # We can hardcode non-existent directories.
-  if test "$hardcode_direct_CXX" != 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, CXX)" != no &&
-     test "$hardcode_minus_L_CXX" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_CXX=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_CXX=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_CXX=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
-$as_echo "$hardcode_action_CXX" >&6; }
 
-if test "$hardcode_action_CXX" = relink ||
-   test "$inherit_rpath_CXX" = 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
-
-
-
-
-
-
-
-  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_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
 
+CC=$lt_save_CC
+
 
 
 
@@ -20347,6 +17337,14 @@
   LINUX_FALSE=
 fi
 
+ if test "x$host_os" = xcygwin; then
+  CYGWIN_TRUE=
+  CYGWIN_FALSE='#'
+else
+  CYGWIN_TRUE='#'
+  CYGWIN_FALSE=
+fi
+
 
 # Check whether --enable-skill was given.
 if test "${enable_skill+set}" = set; then :
@@ -20382,20 +17380,6 @@
 fi
 
 
-# Check whether --enable-oomem was given.
-if test "${enable_oomem+set}" = set; then :
-  enableval=$enable_oomem;
-else
-  enable_oomem=no
-
-fi
-
-if test "x$enable_oomem" = xyes; then
-
-$as_echo "#define OOMEM_ENABLE 1" >>confdefs.h
-
-fi
-
 # Check whether --enable-sigwinch was given.
 if test "${enable_sigwinch+set}" = set; then :
   enableval=$enable_sigwinch;
@@ -20564,7 +17548,7 @@
 fi
 
 
-for ac_func in __fpending alarm atexit dup2 getpagesize gettimeofday iswprint memchr memmove memset munmap nl_langinfo putenv regcomp rpmatch select setlocale strcasecmp strchr strcspn strdup strerror strncasecmp strpbrk strrchr strspn strstr strtol strtoul strtoull strverscmp uname utmpname wcwidth
+for ac_func in __fpending alarm atexit dup2 gethostname getpagesize gettimeofday iswprint memchr memmove memset nl_langinfo putenv regcomp rpmatch select setlocale strcasecmp strchr strcspn strdup strerror strncasecmp strndup strpbrk strrchr strspn strstr strtol strtoul strtoull strverscmp utmpname wcwidth
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -20712,10 +17696,6 @@
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -20744,6 +17724,10 @@
   as_fn_error $? "conditional \"LINUX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${CYGWIN_TRUE}" && test -z "${CYGWIN_FALSE}"; then
+  as_fn_error $? "conditional \"CYGWIN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${BUILD_SKILL_TRUE}" && test -z "${BUILD_SKILL_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_SKILL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -21149,7 +18133,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by procps-ng $as_me 3.3.11, which was
+This file was extended by procps-ng $as_me 3.3.12, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21216,7 +18200,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-procps-ng config.status 3.3.11
+procps-ng config.status 3.3.12
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -21351,6 +18335,7 @@
 enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
 pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
 PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
@@ -21400,10 +18385,13 @@
 GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
 lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
 nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
 lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
@@ -21468,67 +18456,14 @@
 finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
 hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
 sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
 hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
 enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
 enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
 enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
 old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
 striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
-predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
-postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
-predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
-postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
-LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
-reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
-reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
-GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
-inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
-always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
-include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
-prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
-predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
-postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
-predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
-postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
 
 LTCC='$LTCC'
 LTCFLAGS='$LTCFLAGS'
@@ -21573,9 +18508,12 @@
 compiler \
 lt_cv_sys_global_symbol_pipe \
 lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
 lt_cv_sys_global_symbol_to_c_name_address \
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_cv_nm_interface \
 nm_file_list_spec \
+lt_cv_truncate_bin \
 lt_prog_compiler_no_builtin_flag \
 lt_prog_compiler_pic \
 lt_prog_compiler_wl \
@@ -21607,41 +18545,10 @@
 install_override_mode \
 finish_eval \
 old_striplib \
-striplib \
-compiler_lib_search_dirs \
-predep_objects \
-postdep_objects \
-predeps \
-postdeps \
-compiler_lib_search_path \
-LD_CXX \
-reload_flag_CXX \
-compiler_CXX \
-lt_prog_compiler_no_builtin_flag_CXX \
-lt_prog_compiler_pic_CXX \
-lt_prog_compiler_wl_CXX \
-lt_prog_compiler_static_CXX \
-lt_cv_prog_compiler_c_o_CXX \
-export_dynamic_flag_spec_CXX \
-whole_archive_flag_spec_CXX \
-compiler_needs_object_CXX \
-with_gnu_ld_CXX \
-allow_undefined_flag_CXX \
-no_undefined_flag_CXX \
-hardcode_libdir_flag_spec_CXX \
-hardcode_libdir_separator_CXX \
-exclude_expsyms_CXX \
-include_expsyms_CXX \
-file_list_spec_CXX \
-compiler_lib_search_dirs_CXX \
-predep_objects_CXX \
-postdep_objects_CXX \
-predeps_CXX \
-postdeps_CXX \
-compiler_lib_search_path_CXX; do
+striplib; do
     case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -21668,21 +18575,11 @@
 postuninstall_cmds \
 finish_cmds \
 sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec \
-reload_cmds_CXX \
-old_archive_cmds_CXX \
-old_archive_from_new_cmds_CXX \
-old_archive_from_expsyms_cmds_CXX \
-archive_cmds_CXX \
-archive_expsym_cmds_CXX \
-module_cmds_CXX \
-module_expsym_cmds_CXX \
-export_symbols_cmds_CXX \
-prelink_cmds_CXX \
-postlink_cmds_CXX; do
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path; 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=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -21691,26 +18588,21 @@
 done
 
 ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
 
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
 # commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
 
     PACKAGE='$PACKAGE'
     VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
     RM='$RM'
     ofile='$ofile'
 
 
 
-
-
 # Capture the value of obsolete ALL_LINGUAS because we need it to compute
     # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
     # from automake.
@@ -22427,55 +19319,53 @@
  ;;
     "libtool":C)
 
-    # See if we are running on zsh, and set the options which allow our
+    # See if we are running on zsh, and set the options that allow our
     # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
+    if test -n "${ZSH_VERSION+set}"; then
       setopt NO_GLOB_SUBST
     fi
 
-    cfgfile="${ofile}T"
+    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
+# Generated automatically by $as_me ($PACKAGE) $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.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# 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 of the License, or
+# (at your option) any later version.
 #
-#   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.
+# 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
+# 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # The names of the tagged configurations supported by this script.
-available_tags="CXX "
+available_tags=''
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
 
 # ### BEGIN LIBTOOL CONFIG
 
@@ -22495,6 +19385,9 @@
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install
 
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
 # Shell to use when invoking shell scripts.
 SHELL=$lt_SHELL
 
@@ -22612,18 +19505,27 @@
 # Transform the output of nm in a proper C declaration.
 global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
 
+# Transform the output of nm into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
 # Transform the output of nm in a C name address pair.
 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
 
 # Transform the output of nm in a C name address pair when lib prefix is needed.
 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
 
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
+
 # Specify filename containing input files for \$NM.
 nm_file_list_spec=$lt_nm_file_list_spec
 
-# The root where to search for dependent libraries,and in which our libraries should be installed.
+# The root where to search for dependent libraries,and where our libraries should be installed.
 lt_sysroot=$lt_sysroot
 
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
 
@@ -22714,8 +19616,11 @@
 # Compile-time system search path for libraries.
 sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
 
 # Whether dlopen is supported.
 dlopen_support=$enable_dlopen
@@ -22808,13 +19713,13 @@
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary.
 hardcode_direct=$hardcode_direct
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# 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
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
 # library is relocated.
 hardcode_direct_absolute=$hardcode_direct_absolute
 
@@ -22862,21 +19767,66 @@
 # How to hardcode a shared library path into an executable.
 hardcode_action=$hardcode_action
 
-# The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+# ### END LIBTOOL CONFIG
 
-# Dependencies to place before and after the objects being linked to
-# create a shared library.
-predep_objects=$lt_predep_objects
-postdep_objects=$lt_postdep_objects
-predeps=$lt_predeps
-postdeps=$lt_postdeps
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
+_LT_EOF
 
-# ### END LIBTOOL CONFIG
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
 
 _LT_EOF
 
@@ -22886,7 +19836,7 @@
 # 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
+if test set != "${COLLECT_NAMES+set}"; then
   COLLECT_NAMES=
   export COLLECT_NAMES
 fi
@@ -22895,7 +19845,7 @@
   esac
 
 
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
 
 
   # We use sed instead of cat because bash on DJGPP gets confused if
@@ -22905,322 +19855,10 @@
   sed '$q' "$ltmain" >> "$cfgfile" \
      || (rm -f "$cfgfile"; exit 1)
 
-  if test x"$xsi_shell" = xyes; then
-  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-} # Extended-shell func_dirname 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=:
-
-
-  sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_basename 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=:
-
-
-  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename 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=:
-
-
-  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\    # 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}"}\
-} # Extended-shell func_stripname 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=:
-
-
-  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\    func_split_long_opt_name=${1%%=*}\
-\    func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt 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=:
-
-
-  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\    func_split_short_opt_arg=${1#??}\
-\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt 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=:
-
-
-  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\    case ${1} in\
-\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\      *)    func_lo2o_result=${1} ;;\
-\    esac\
-} # Extended-shell func_lo2o 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=:
-
-
-  sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
-    func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform 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=:
-
-
-  sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
-    func_arith_result=$(( $* ))\
-} # Extended-shell func_arith 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=:
-
-
-  sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
-    func_len_result=${#1}\
-} # Extended-shell func_len 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=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
-    eval "${1}+=\\${2}"\
-} # Extended-shell func_append 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=:
-
-
-  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\    func_quote_for_eval "${2}"\
-\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted 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=:
-
-
-  # 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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
-
-
    mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 
-
-    cat <<_LT_EOF >> "$ofile"
-
-# ### BEGIN LIBTOOL TAG CONFIG: CXX
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag_CXX
-reload_cmds=$lt_reload_cmds_CXX
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds_CXX
-
-# A language specific compiler.
-CC=$lt_compiler_CXX
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC_CXX
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object_CXX
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld_CXX
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct_CXX
-
-# 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.
-hardcode_direct_absolute=$hardcode_direct_absolute_CXX
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L_CXX
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic_CXX
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath_CXX
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_CXX
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols_CXX
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_CXX
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_CXX
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_CXX
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds_CXX
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds_CXX
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec_CXX
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_CXX
-
-# The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
-
-# Dependencies to place before and after the objects being linked to
-# create a shared library.
-predep_objects=$lt_predep_objects_CXX
-postdep_objects=$lt_postdep_objects_CXX
-predeps=$lt_predeps_CXX
-postdeps=$lt_postdeps_CXX
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
-# ### END LIBTOOL TAG CONFIG: CXX
-_LT_EOF
-
  ;;
     "default-1":C)
     for ac_file in $CONFIG_FILES; do
diff -Nru procps-3.3.11/configure.ac procps-3.3.12/configure.ac
--- procps-3.3.11/configure.ac	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/configure.ac	2016-07-10 06:40:26.000000000 +0000
@@ -12,8 +12,8 @@
 AC_CONFIG_HEADERS([config.h])
 
 # Checks for programs.
-AC_USE_SYSTEM_EXTENSIONS(_GNU_SOURCE)
-AC_PROG_CXX
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
 AC_PROG_AWK
 AC_PROG_CC
 AC_PROG_CC_STDC
@@ -44,7 +44,7 @@
 
 # Checks for header files.
 AC_HEADER_MAJOR
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h langinfo.h libintl.h limits.h locale.h netinet/in.h stdint.h stdio_ext.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/time.h termios.h unistd.h utmp.h values.h wchar.h wctype.h])
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h langinfo.h libintl.h limits.h locale.h netinet/in.h stdint.h stdio_ext.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/time.h termios.h unistd.h utmp.h values.h wchar.h wctype.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_CHECK_HEADER_STDBOOL
@@ -168,6 +168,7 @@
 )
 AM_CONDITIONAL(BUILD_KILL, test "x$enable_kill" = xyes)
 AM_CONDITIONAL(LINUX, test "x$host_os" = xlinux-gnu)
+AM_CONDITIONAL(CYGWIN, test "x$host_os" = xcygwin)
 
 AC_ARG_ENABLE([skill],
   AS_HELP_STRING([--enable-skill], [build skill and snice]),
@@ -181,14 +182,6 @@
 )
 AM_CONDITIONAL(EXAMPLE_FILES, test "x$enable_examples" = xyes)
 
-AC_ARG_ENABLE([oomem],
-  AS_HELP_STRING([--enable-oomem], [add out-of-memory fields to the library and top]),
-  [], [enable_oomem=no]
-)
-if test "x$enable_oomem" = xyes; then
-  AC_DEFINE(OOMEM_ENABLE, 1, [add out-of-memory fields to the library and top])
-fi
-
 AC_ARG_ENABLE([sigwinch],
   AS_HELP_STRING([--enable-sigwinch], [reduce impact of x-windows resize operations on top]),
   [], [enable_sigwinch=no]
@@ -259,7 +252,7 @@
 fi
 AC_SUBST(DEJAGNU)
 
-AC_CHECK_FUNCS([__fpending alarm atexit dup2 getpagesize gettimeofday iswprint memchr memmove memset munmap nl_langinfo putenv regcomp rpmatch select setlocale strcasecmp strchr strcspn strdup strerror strncasecmp strpbrk strrchr strspn strstr strtol strtoul strtoull strverscmp uname utmpname wcwidth])
+AC_CHECK_FUNCS([__fpending alarm atexit dup2 gethostname getpagesize gettimeofday iswprint memchr memmove memset nl_langinfo putenv regcomp rpmatch select setlocale strcasecmp strchr strcspn strdup strerror strncasecmp strndup strpbrk strrchr strspn strstr strtol strtoul strtoull strverscmp utmpname wcwidth])
 
 AC_CONFIG_FILES([Makefile
                  include/Makefile
diff -Nru procps-3.3.11/debian/changelog procps-3.3.12/debian/changelog
--- procps-3.3.11/debian/changelog	2016-05-20 16:13:11.000000000 +0000
+++ procps-3.3.12/debian/changelog	2016-07-12 06:08:48.000000000 +0000
@@ -1,3 +1,65 @@
+procps (2:3.3.12-1ubuntu2) yakkety; urgency=medium
+
+  * Remove strtod_nol tests Closes: #830733
+    (Cherry-picked from Debian packaging git).
+  * Only have one installinit override, thanks Sven! Closes: #827423
+    (Cherry-picked from Debian packaging git).
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 12 Jul 2016 08:07:11 +0200
+
+procps (2:3.3.12-1ubuntu1) yakkety; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/sysctl.d (Ubuntu-specific):
+      + 10-console-messages.conf: stop low-level kernel messages on console.
+      + 10-kernel-hardening.conf: add the kptr_restrict setting
+      + 10-keyboard.conf.powerpc: mouse button emulation on PowerPC.
+      + 10-ipv6-privacy.conf: add a file to sysctl.d to apply the defaults
+        for IPv6 privacy extensions for interfaces. (LP: #176125, #841353)
+      + 10-link-restrictions.conf: even though the Ubuntu
+        kernel is built with these defaults in place, we want to make sure
+        that people running stock kernels don't miss out.
+      + 10-magic-sysrq.conf: Disable most magic sysrq by default, allowing
+        critical sync, remount, reboot functions. (LP: #194676, LP: #1025467)
+      + 10-network-security.conf: enable rp_filter and SYN-flood protection.
+      + 10-ptrace.conf: describe new PTRACE setting.
+      + 10-zeropage.conf: safe mmap_min_addr value for graceful fall-back.
+        for armhf, and arm64.
+      + 10-qemu.conf.s390x for qemu.
+      + README: describe how this directory is supposed to work.
+    - debian/rules: Fix cross build
+    - ignore_eaccess.patch: If we get eaccess when opening a sysctl file for
+      writing, don't error out.  Otherwise package upgrades can fail,
+      especially in containers.
+    - ignore_erofs.patch: Same as ignore_eaccess but for the case where
+      part of /proc is read/only.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 11 Jul 2016 22:30:18 +0200
+
+procps (2:3.3.12-1) unstable; urgency=medium
+
+  [ Helmut Grohne <helmut@subdivi.de> ]
+  * Fix FTBFS pass --host to configure Closes: #812394
+
+  [ Craig Small ]
+  * New upstream version
+  - free: man document rewritten for shared Closes: #755233
+  - free: interpret intervals in non-locale way Closes: #692113
+  - library: find tty quicker Closes: #770215
+  - kill: report error if cannot kill process Closes: #733172
+  - ps: sort by cgroup Closes: #692279
+  - ps: fallback to attr/current for context Closes: #786956
+  - tests: conditionally add prctl Closes: #816237
+  - watch: better handling ANSI including esc[m Closes: #830313
+  - watch: use locale-independent float Closes: #692113
+  * Fix FTBFS for hurd Closes: #816237
+  * Dropped initscript dependency Closes: #804966
+  * Don't start procps on install Closes: #827423
+  * Fix LSB init script patch from Guillem Closes: #823080
+  * Update to standards 3.9.8
+
+ -- Craig Small <csmall@debian.org>  Sun, 10 Jul 2016 17:39:28 +1000
+
 procps (2:3.3.11-3ubuntu1) yakkety; urgency=medium
 
   [ Martin Pitt ]
@@ -61,42 +123,6 @@
 
  -- Craig Small <csmall@debian.org>  Sun, 03 Jan 2016 17:10:26 +1100
 
-procps (2:3.3.10-4ubuntu2) xenial; urgency=high
-
-  * Add debian/sysctl.d/10-qemu.conf.s390x for qemu.
-
- -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 13 Jan 2016 11:33:36 +0000
-
-procps (2:3.3.10-4ubuntu1) xenial; urgency=low
-
-  * Merge from Debian unstable.  Remaining changes:
-    - debian/sysctl.d (Ubuntu-specific):
-      + 10-console-messages.conf: stop low-level kernel messages on console.
-      + 10-kernel-hardening.conf: add the kptr_restrict setting
-      + 10-keyboard.conf.powerpc: mouse button emulation on PowerPC.
-      + 10-ipv6-privacy.conf: add a file to sysctl.d to apply the defaults
-        for IPv6 privacy extensions for interfaces. (LP: #176125, #841353)
-      + 10-link-restrictions.conf: even though the Ubuntu
-        kernel is built with these defaults in place, we want to make sure
-        that people running stock kernels don't miss out.
-      + 10-magic-sysrq.conf: Disable most magic sysrq by default, allowing
-        critical sync, remount, reboot functions. (LP: #194676, LP: #1025467)
-      + 10-network-security.conf: enable rp_filter and SYN-flood protection.
-      + 10-ptrace.conf: describe new PTRACE setting.
-      + 10-zeropage.conf: safe mmap_min_addr value for graceful fall-back.
-        for armhf, and arm64.
-      + README: describe how this directory is supposed to work.
-    - debian/upstart (Ubuntu-specific): upstart configuration to replace old
-      style sysv init script
-    - Fix cross build
-    - ignore_eaccess.patch: If we get eaccess when opening a sysctl file for
-      writing, don't error out.  Otherwise package upgrades can fail,
-      especially in containers.
-    - ignore_erofs.patch: Same as ignore_eaccess but for the case where
-      part of /proc is read/only.
-
- -- Dimitri John Ledkov <xnox@ubuntu.com>  Sun, 06 Sep 2015 05:30:20 +0000
-
 procps (2:3.3.10-4) unstable; urgency=medium
 
   * A proper patch for libsystemd Closes: #791896
@@ -198,76 +224,6 @@
 
  -- Craig Small <csmall@debian.org>  Fri, 10 Jan 2014 22:24:15 +1100
 
-procps (1:3.3.9-1ubuntu8) vivid; urgency=medium
-
-  * ignore_erofs.patch: Same as ignore_eaccess but for the case where
-    part of /proc is read/only. (LP: #1419554)
-
- -- Stéphane Graber <stgraber@ubuntu.com>  Tue, 10 Feb 2015 13:53:27 -0500
-
-procps (1:3.3.9-1ubuntu7) vivid; urgency=medium
-
-  * Copy 10-zeropage.conf.armhf to 10-zeropage.conf.arm64 (LP: #1415481)
-
- -- Adam Conrad <adconrad@ubuntu.com>  Wed, 28 Jan 2015 10:17:09 -0700
-
-procps (1:3.3.9-1ubuntu6) vivid; urgency=medium
-
-  * No change rebuild to get debug symbols for all architectures.
-
- -- Brian Murray <brian@ubuntu.com>  Wed, 03 Dec 2014 09:00:05 -0800
-
-procps (1:3.3.9-1ubuntu5) utopic; urgency=medium
-
-  * Move procps upstart job to procps-instance, and make procps job to not
-    be a task, such that startpar knows that procps has already run.
-    (LP: #1326338)  
-  * Build with a fixed debhelper. (unlike previous ubuntu4 upload). 
-
- -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 29 May 2014 09:46:15 +0200
-
-procps (1:3.3.9-1ubuntu3) utopic; urgency=high
-
-  * No change rebuild against new dh_installinit, to call update-rc.d at
-    postinst.
-
- -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 28 May 2014 10:41:49 +0100
-
-procps (1:3.3.9-1ubuntu2) trusty; urgency=medium
-
-  * Fix libprocps.so symlink to point to libprocps.so.3.
-
- -- Matthias Klose <doko@ubuntu.com>  Mon, 06 Jan 2014 23:27:16 +0000
-
-procps (1:3.3.9-1ubuntu1) trusty; urgency=medium
-
-  * Merge with Debian; remaining changes:
-    - debian/sysctl.d (Ubuntu-specific):
-      + 10-console-messages.conf: stop low-level kernel messages on console.
-      + 10-kernel-hardening.conf: add the kptr_restrict setting
-      + 10-keyboard.conf.powerpc: mouse button emulation on PowerPC.
-      + 10-ipv6-privacy.conf: add a file to sysctl.d to apply the defaults
-        for IPv6 privacy extensions for interfaces. (LP: #176125, #841353)
-      + 10-link-restrictions.conf: even though the Ubuntu
-        kernel is built with these defaults in place, we want to make sure
-        that people running stock kernels don't miss out.
-      + 10-magic-sysrq.conf: Disable most magic sysrq by default, allowing
-        critical sync, remount, reboot functions. (LP: #194676, LP: #1025467)
-      + 10-network-security.conf: enable rp_filter and SYN-flood protection.
-      + 10-ptrace.conf: describe new PTRACE setting.
-      + 10-zeropage.conf: safe mmap_min_addr value for graceful fall-back.
-      + README: describe how this directory is supposed to work.
-    - debian/upstart (Ubuntu-specific): upstart configuration to replace old
-      style sysv init script
-    - Fix cross build
-    - ignore_eaccess.patch: If we get eaccess when opening a sysctl file for
-      writing, don't error out.  Otherwise package upgrades can fail,
-      especially in containers.  (LP: #1157643)
-    - Build using dh-autoreconf, update libtool.m4.
-    - Build-depend on pkg-config.
-
- -- Matthias Klose <doko@ubuntu.com>  Mon, 06 Jan 2014 15:28:04 +0100
-
 procps (1:3.3.9-1) unstable; urgency=medium
 
   * New upstream version
@@ -282,50 +238,6 @@
 
  -- Craig Small <csmall@debian.org>  Mon, 16 Dec 2013 21:56:39 +1100
 
-procps (1:3.3.8-2ubuntu3) trusty; urgency=medium
-
-  * Build-depend on pkg-config.
-
- -- Matthias Klose <doko@ubuntu.com>  Thu, 05 Dec 2013 14:31:04 +0100
-
-procps (1:3.3.8-2ubuntu2) trusty; urgency=low
-
-  * Build using dh-autoreconf, update libtool.m4.
-  * Fix build with glibc-2.18/linux-3.13.
-
- -- Matthias Klose <doko@ubuntu.com>  Thu, 05 Dec 2013 13:27:37 +0100
-
-procps (1:3.3.8-2ubuntu1) trusty; urgency=low
-
-  * Merge from Debian unstable.  Remaining changes:
-    - debian/sysctl.d (Ubuntu-specific):
-      + 10-console-messages.conf: stop low-level kernel messages on console.
-      + 10-kernel-hardening.conf: add the kptr_restrict setting
-      + 10-keyboard.conf.powerpc: mouse button emulation on PowerPC.
-      + 10-ipv6-privacy.conf: add a file to sysctl.d to apply the defaults
-        for IPv6 privacy extensions for interfaces. (LP: #176125, #841353)
-      + 10-link-restrictions.conf: even though the Ubuntu
-        kernel is built with these defaults in place, we want to make sure
-        that people running stock kernels don't miss out.
-      + 10-magic-sysrq.conf: Disable most magic sysrq by default, allowing
-        critical sync, remount, reboot functions. (LP: #194676, LP: #1025467)
-      + 10-network-security.conf: enable rp_filter and SYN-flood protection.
-      + 10-ptrace.conf: describe new PTRACE setting.
-      + 10-zeropage.conf: safe mmap_min_addr value for graceful fall-back.
-      + README: describe how this directory is supposed to work.
-    - debian/upstart (Ubuntu-specific): upstart configuration to replace old
-      style sysv init script
-    - pwdx.c: Fix failure when executed in a nonexistent locale (LP: #1213160)
-    - Fix cross build
-    - ignore_eaccess.patch: If we get eaccess when opening a sysctl file for
-      writing, don't error out.  Otherwise package upgrades can fail,
-      especially in containers.  (LP: #1157643)
-  * Disable one pmap test to allow the package to build on LP sbuild
-    (the test suite seems a bit unreliable as the failures appear to
-     vary between LP sbuild, local sbuild and local pbuilder).
-
- -- Stﾃｩphane Graber <stgraber@ubuntu.com>  Mon, 21 Oct 2013 16:20:22 -0400
-
 procps (1:3.3.8-2) unstable; urgency=low
 
   * Fixed numa dependencies Closes: #711312
@@ -409,80 +321,6 @@
 
  -- Craig Small <csmall@debian.org>  Mon, 29 Oct 2012 22:12:08 +1100
 
-procps (1:3.3.3-2ubuntu8) saucy; urgency=low
-
-  * ignore_eaccess.patch: If we get eaccess when opening a sysctl file for
-    writing, don't error out.  Otherwise package upgrades can fail, especially
-    in containers.  (LP: #1157643)
-
- -- Serge Hallyn <serge.hallyn@ubuntu.com>  Wed, 16 Oct 2013 13:45:48 -0500
-
-procps (1:3.3.3-2ubuntu7) saucy; urgency=low
-
-  * Backport of a45dace4 and 95d01362 in order to enable dynamically
-    allocated buffers in file2str.  This fixes a number of seg fault problems
-    including the one related to large numbers of groups per user.
-    (LP: #1150413) 
-
- -- Dave Chiluk <chiluk@canonical.com>  Thu, 26 Sep 2013 15:32:17 -0700
-
-procps (1:3.3.3-2ubuntu6) saucy; urgency=low
-
-  * pwdx.c: Fix pwdx argument parsing, fixing FTBFS on arm64 (LP: #1213156)
-  * pwdx.c: Fix failure when executed in a nonexistent locale (LP: #1213160)
-
- -- dann frazier <dann.frazier@canonical.com>  Fri, 16 Aug 2013 10:07:49 -0600
-
-procps (1:3.3.3-2ubuntu5) raring; urgency=low
-
-  * Fix cross build.
-
- -- Matthias Klose <doko@ubuntu.com>  Fri, 04 Jan 2013 17:13:35 +0100
-
-procps (1:3.3.3-2ubuntu4) raring; urgency=low
-
-  * debian/sysctl.d/10-link-restrictions.conf: even though the Ubuntu
-    kernel is built with these defaults in place, we want to make sure
-    that people running stock kernels don't miss out.
-
- -- Kees Cook <kees@ubuntu.com>  Wed, 28 Nov 2012 11:13:01 -0800
-
-procps (1:3.3.3-2ubuntu3) quantal; urgency=low
-
-  * debian/sysctl.d/10-magic-sysrq.conf: adjust to 176 by default, retaining
-    support for the critical sync, remount, reboot functions.  SysRq+E and
-    SysRq+I are still disabled, which unfortunately means SysRq by default
-    cannot be used to kill a broken X server; but the only way to enable
-    these would be to re-enable SysRq+F, which is one of the options that's
-    problematic security-wise.  LP: #1025467
-
- -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 16 Jul 2012 17:06:59 -0700
-
-procps (1:3.3.3-2ubuntu2) quantal; urgency=low
-
-  * Add debian/sysctl.d/10-magic-sysrq.conf: disable the magic sysrq key
-    by default, since it's not needed for the average system, and exposes
-    security issues such as memory disclosure and killing arbitrary
-    processes including the screen lock. (LP: #194676)
-
- -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Thu, 21 Jun 2012 08:19:56 -0400
-
-procps (1:3.3.3-2ubuntu1) quantal; urgency=low
-
-  * Merge from Debian unstable.  Remaining changes:
-    - debian/sysctl.d (Ubuntu-specific):
-      + 10-console-messages.conf: stop low-level kernel messages on console.
-      + 10-kernel-hardening.conf: add the kptr_restrict setting
-      + 10-keyboard.conf.powerpc: mouse button emulation on PowerPC.
-      + 10-network-security.conf: enable rp_filter and SYN-flood protection.
-      + 10-ptrace.conf: describe new PTRACE setting.
-      + 10-zeropage.conf: safe mmap_min_addr value for graceful fall-back.
-      + README: describe how this directory is supposed to work.
-    - debian/upstart (Ubuntu-specific): upstart configuration to replace old
-      style sysv init script
-
- -- Oliver Grawert <ogra@ubuntu.com>  Wed, 20 Jun 2012 13:12:40 +0200
-
 procps (1:3.3.3-2) unstable; urgency=low
 
   * Fixes for kFreeBSD Closes: #674785
@@ -570,72 +408,6 @@
 
  -- Craig Small <csmall@debian.org>  Mon, 21 Nov 2011 22:34:17 +1100
 
-procps (1:3.2.8-11ubuntu6) precise; urgency=low
-
-  * debian/sysctl.d/10-zeroconf ... have armhf using teh same value that 
-    is used on armel for vm.mmap_min_addr (LP: #901847)
-
- -- Oliver Grawert <ogra@ubuntu.com>  Mon, 12 Dec 2011 18:31:15 +0100
-
-procps (1:3.2.8-11ubuntu5) precise; urgency=low
-
-  * debian/sysctl.d/10-ipv6-privacy.conf: add a file to sysctl.d to apply the
-    defaults for IPv6 privacy extensions for interfaces. (LP: #176125, #841353)
-
- -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Mon, 05 Dec 2011 12:46:24 +0100
-
-procps (1:3.2.8-11ubuntu4) precise; urgency=low
-
-  * Reintroduce the patch from -11ubuntu2 to run sysctl twice, this time
-    with an upgrade-proof upstart job.
-
- -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 17 Nov 2011 13:07:06 -0800
-
-procps (1:3.2.8-11ubuntu3) precise; urgency=low
-
-  * debian/upstart: Revert previous upload, breaks upgrades. (LP: #891369)
-
- -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 17 Nov 2011 06:04:10 +0100
-
-procps (1:3.2.8-11ubuntu2) precise; urgency=low
-
-  * Make procps job run twice: as early as possible (for kernel
-    parameters such as kernel.printk) and then after all network
-    interfaces are up (to account for any kernel parameters relating
-    to recently loaded networking modules) (LP: #771372).
-
- -- James Hunt <james.hunt@ubuntu.com>  Wed, 16 Nov 2011 15:17:38 +0000
-
-procps (1:3.2.8-11ubuntu1) precise; urgency=low
-
-  * Merge from Debian testing, remaining changes:
-    - debian/rules (Ubuntu-specific):
-      + use upstart for init script.
-      + install sysctl files from new sysctl.d directory.
-      + set init script to S17.
-    - debian/sysctl.d (Ubuntu-specific):
-      + 10-console-messages.conf: stop low-level kernel messages on console.
-      + 10-kernel-hardening.conf: add the kptr_restrict setting
-      + 10-keyboard.conf.powerpc: mouse button emulation on PowerPC.
-      + 10-network-security.conf: enable rp_filter and SYN-flood protection.
-      + 10-ptrace.conf: describe new PTRACE setting.
-      + 10-zeropage.conf: safe mmap_min_addr value for graceful fall-back.
-      + README: describe how this directory is supposed to work.
-    - debian/upstart (Ubuntu-specific): upstart configuration to replace old
-      style sysv init script.
-  * Dropped changes, included in Debian:
-    - debian/patch/ubuntu-handle-short-kernel-versions.patch -- quiet
-      warning when kernel version are less than 3 digits.
-    - pmap.c: pmap -x correctly reports Kbytes column and prints
-      summaries for RSS and Dirty
-  * Other dropped changes:
-    - specifying '--error-handler=:': the correct way to avoid starting jobs
-      in a schroot is by configuring policy-rc.d or by diverting invoke-rc.d;
-      we should not silently ignore errors.
-  * Mark procps multiarch: foreign.
-
- -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 27 Oct 2011 09:26:56 -0700
-
 procps (1:3.2.8-11) unstable; urgency=low
 
   * No more complaints for 3.0 kernels Closes: #632749
@@ -644,63 +416,6 @@
 
  -- Craig Small <csmall@debian.org>  Mon, 25 Jul 2011 22:20:41 +1000
 
-procps (1:3.2.8-10ubuntu5) oneiric; urgency=low
-
-  * Add debian/sysctl.d/10-kernel-hardening.conf: add the kptr_restrict
-    setting in the case of people running non-Ubuntu kernels to gain
-    the protection, as well as providing direct documentation about the
-    possible values.
-
- -- Kees Cook <kees@ubuntu.com>  Thu, 23 Jun 2011 14:56:34 -0700
-
-procps (1:3.2.8-10ubuntu4) oneiric; urgency=low
-
-  * debian/patch/ubuntu-handle-short-kernel-versions.patch -- quiet warning
-    when kernel version are less than 3 digits.
-
- -- Andy Whitcroft <apw@canonical.com>  Fri, 10 Jun 2011 18:51:11 +0100
-
-procps (1:3.2.8-10ubuntu3) natty; urgency=low
-
-  * debian/rules: fix installation in a schroot by telling dh_installinit
-    to use the old '|| :' behavior instead of the default behavior (exiting
-    with error) by specifying '--error-handler=:' (LP: #753675)
-
- -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Thu, 07 Apr 2011 11:22:04 -0400
-
-procps (1:3.2.8-10ubuntu2) natty; urgency=low
-
-  * pmap.c: pmap -x correctly reports Kbytes column and prints
-    summaries for RSS and Dirty (LP: #753124)
-
- -- Andrey Bondarenko <abondarenko@users.sourceforge.net>  Thu, 07 Apr 2011 08:51:12 +0600
-
-procps (1:3.2.8-10ubuntu1) natty; urgency=low
-
-  * Merge from debian unstable (LP: #690632), remaining changes:
-    - debian/rules (Ubuntu-specific):
-      + use upstart for init script.
-      + install sysctl files from new sysctl.d directory.
-    - debian/sysctl.d (Ubuntu-specific):
-      + 10-console-messages.conf: stop low-level kernel messages on console.
-      + 10-network-security.conf: enable rp_filter and SYN-flood protection.
-      + 10-keyboard.conf.powerpc: mouse button emulation on PowerPC.
-      + 10-zeropage.conf: safe mmap_min_addr value for graceful fall-back.
-      + README: describe how this directory is supposed to work.
-    - debian/upstart, debian/postinst (Ubuntu-specific): upstart configuration 
-      to replace old style sysv init script.
-    - Added debian/sysctl.d/10-ptrace.conf: 
-      + describe new PTRACE setting.
-      + adjusted to include new yama path.
-    - debian/procps.upstart: duplicate the original init script behavior of
-      not failing on unknown keys (required for cross-kernel upgrades, etc).
-    - debian/postinst, debian/rules: instead of manually calling 'start' in
-      the postinst, allow dh_installinit to DTRT.
-    - debian/sysctl.d/README: fix the documentation to point at the standard
-      interfaces, not at the 'start' command.
-
- -- Lorenzo De Liso <blackz@ubuntu.com>  Wed, 15 Dec 2010 13:38:28 +0100
-
 procps (1:3.2.8-10) unstable; urgency=low
 
   * PATH_MAX fix for hurd Closes: #588677
@@ -716,48 +431,6 @@
 
  -- Craig Small <csmall@debian.org>  Thu, 18 Nov 2010 22:37:56 +1100
 
-procps (1:3.2.8-9ubuntu5) natty; urgency=low
-
-  [ Steve Langasek ]
-  * debian/postinst, debian/rules: instead of manually calling 'start' in
-    the postinst, allow dh_installinit to DTRT (LP: #602896).
-  * debian/sysctl.d/README: fix the documentation to point at the standard
-    interfaces, not at the 'start' command.
-
- -- Kees Cook <kees@ubuntu.com>  Thu, 04 Nov 2010 10:32:25 -0700
-
-procps (1:3.2.8-9ubuntu3) maverick; urgency=low
-
-  * debian/sysctl.d/10-ptrace.conf: adjusted to include new yama path.
-
- -- Kees Cook <kees@ubuntu.com>  Tue, 06 Jul 2010 15:23:12 -0700
-
-procps (1:3.2.8-9ubuntu2) maverick; urgency=low
-
-  * debian/procps.upstart: duplicate the original init script behavior of
-    not failing on unknown keys (required for cross-kernel upgrades, etc).
-
- -- Kees Cook <kees@ubuntu.com>  Wed, 09 Jun 2010 10:18:14 -0700
-
-procps (1:3.2.8-9ubuntu1) maverick; urgency=low
-
-  * Merge with Debian unstable; remaining changes:
-    - debian/rules (Ubuntu-specific):
-      - use upstart for init script.
-      - install sysctl files from new sysctl.d directory.
-    - debian/sysctl.d (Ubuntu-specific):
-      - 10-console-messages.conf: stop low-level kernel messages on console.
-      - 10-network-security.conf: enable rp_filter and SYN-flood protection.
-      - 10-keyboard.conf.powerpc: mouse button emulation on PowerPC.
-      - 10-zeropage.conf: safe mmap_min_addr value for graceful fall-back.
-      - README: describe how this directory is supposed to work.
-    - debian/upstart, debian/postinst (Ubuntu-specific):
-      - upstart configuration to replace old style sysv init script.
-  * Fixed upstream: debian/patches/60_linux_version_init.dpatch
-  * Added debian/sysctl.d/10-ptrace.conf: describe new PTRACE setting.
-
- -- Kees Cook <kees@ubuntu.com>  Tue, 08 Jun 2010 11:45:44 -0700
-
 procps (1:3.2.8-9) unstable; urgency=low
 
   * Fix for patch on cgroup crash Closes: #579824
@@ -873,61 +546,6 @@
 
  -- Petter Reinholdtsen <pere@debian.org>  Wed, 16 Sep 2009 17:02:42 +0200
 
-procps (1:3.2.8-1ubuntu4) lucid; urgency=low
-
-  * debian/sysctl.d/10-zeropage.conf*: Reestablish a procps-controlled
-    mmap_min_addr value so that when package-installed sysctl settings
-    are removed, the secure default is restored.
-  * debian/rules: enhance per-architecture sysctl install logic to allow
-    installing "non-default" conf files instead of always building up
-    a single arch-specific config.
-  * debian/sysctl.d/README: clarify how to use procps when changing files.
-  * debian/sysctl.conf:
-    - remove outdated example of maps_protect (LP: #269715).
-    - remove invalid warning about TCP Window Scaling.
-
- -- Kees Cook <kees@ubuntu.com>  Wed, 16 Dec 2009 11:06:56 -0800
-
-procps (1:3.2.8-1ubuntu3) karmic; urgency=low
-
-  FFE LP: #427356.
-
-  * Replace init script with Upstart job.
-    - Do not start after upgrade.
-  * debian/control:
-    - Add missing ${misc:Depends}
-    - Bump build-dependency on debhelper for Upstart-aware dh_installinit
-  * Use contents of /etc/sysctl.conf after contents of files in /etc/sysctl.d
-    LP: #292470.
-
- -- Scott James Remnant <scott@ubuntu.com>  Tue, 15 Sep 2009 03:26:56 +0100
-
-procps (1:3.2.8-1ubuntu2) karmic; urgency=low
-
-  * New patch 60_linux_version_init, fixes linux version detection.  This
-    relied on a side-effect of the elf loader and previously hoped that
-    constructors would be called in a certain order.  That behavior was
-    undefined and hence unreliable.  For newer kernels, an elf note is now
-    checked to extract HZ tick count.  (LP: #364656).
-
- -- David Sugar <david.sugar@canonical.com>  Thu, 06 Aug 2009 10:02:54 +0000
-
-procps (1:3.2.8-1ubuntu1) karmic; urgency=low
-
-  * Merge from debian unstable, remaining changes:
-    - debian/rules (Ubuntu-specific):
-      - set init script to priority 17.
-      - install sysctl files from new sysctl.d directory.
-      - append debian/sysctl.d/*.conf.$DEB_HOST_ARCH to 10-arch-specific.conf
-    - debian/sysctl.d (Ubuntu-specific):
-      - 10-console-messages.conf: stop low-level kernel messages on console.
-      - 10-network-security.conf: enable rp_filter and SYN-flood protection.
-      - 10-keyboard.conf.powerpc: mouse button emulation on PowerPC.
-    - Drop conf-file-cleanups in debian/{preinst,postinst,postrm}.
-    - Drop pre-Hardy rcS.d procps.sh cleanups in debian/postinst.
-
- -- Kees Cook <kees@ubuntu.com>  Wed, 03 Jun 2009 07:28:56 -0700
-
 procps (1:3.2.8-1) unstable; urgency=low
 
   * New upstream release
@@ -938,36 +556,6 @@
 
  -- Craig Small <csmall@debian.org>  Thu, 28 May 2009 17:34:22 +1000
 
-procps (1:3.2.7-11ubuntu2) jaunty; urgency=low
-
-  * debian/{preinst,postinst,postrm}: drop sysctl.d/10-process-security.conf
-    now that the defaults are carried in the kernel configurations
-    (LP: #344955).
-
- -- Kees Cook <kees@ubuntu.com>  Wed, 18 Mar 2009 14:52:48 -0700
-
-procps (1:3.2.7-11ubuntu1) jaunty; urgency=low
-
-  * Merge from debian unstable, remaining changes:
-    - debian/{postinst,rules}: init script to priority 17, remove on upgrade.
-    - debian/rules (Ubuntu-specific):
-      - install sysctl files from new sysctl.d directory.
-      - append debian/sysctl.d/*.conf.$DEB_HOST_ARCH to 10-arch-specific.conf
-    - debian/sysctl.d (Ubuntu-specific):
-      - 10-console-messages.conf: stop low-level kernel messages on console.
-      - 10-network-security.conf: enable "rp_filter" by default.
-      - 10-process-security.conf: block lower 64k allocations to protect
-        kernel from NULL deref attacks.
-      - 10-keyboard.conf.powerpc: mouse button emulation on PowerPC.
-  * procps-3.2.7/debian/{preinst,postinst,postrm}: drop
-    sysctl.d/10-tcp-timestamps-workaround.conf again now that we have a
-    fixed kernel, and make sure it gets removed on upgrade to this version
-    (LP: #264019, duplicated from 1:3.2.7-9ubuntu2.1).
-  * debian/sysctl.d/10-network-security.conf: enable SYN-flood protection
-    by default (LP: #57091).
-
- -- Kees Cook <kees@ubuntu.com>  Fri, 06 Feb 2009 08:22:44 -0800
-
 procps (1:3.2.7-11) unstable; urgency=low
 
   * Reversed rules line so init.d is in everything except kfreebsd
@@ -1013,49 +601,6 @@
 
  -- Hilko Bengen <bengen@debian.org>  Wed, 07 Jan 2009 13:47:37 +0100
 
-procps (1:3.2.7-9ubuntu3) jaunty; urgency=low
-
-  * debian/sysctl.d/10-process-security.conf:
-    - Remove kernel.maps_protect option, it has been dropped in 2.6.28
-      kernel tree: http://lkml.org/lkml/2008/10/9/399 (LP: #304117).
-
- -- Luca Falavigna <dktrkranz@ubuntu.com>  Mon, 01 Dec 2008 20:17:15 +0100
-
-procps (1:3.2.7-9ubuntu2) intrepid; urgency=low
-
-  * Add debian/sysctl.d/10-tcp-timestamps-workaround.conf to disable TCP
-    timestamping, since its implementation in the 2.6.27 kernel in Ubuntu
-    8.10 causes problems with certain routers (LP: #264019).
-
- -- Colin Watson <cjwatson@ubuntu.com>  Mon, 27 Oct 2008 10:47:21 +0000
-
-procps (1:3.2.7-9ubuntu1) intrepid; urgency=low
-
-  * Merge from debian unstable, remaining changes:
-    - debian/{postinst,rules}: init script to priority 17, remove on upgrade.
-    - debian/patches/60_top_nohz: fix idle report when running NOHZ (debian
-      bug #495882).
-    - debian/init: respect $VERBOSE setting (debian bug #495885).
-    - debian/sysctl.conf: recommend against tcp_syncookies since it blocks
-      tcp window scaling (debian bug #495884).
-    - debian/control: Maintainer field update.
-  * debian/sysctl.d: move all Ubuntu-specific sysctl settings:
-    - 10-console-messages.conf: stop low-level kernel messages on console.
-    - 10-network-security.conf: enable "rp_filter" by default.
-    - 10-process-security.conf:
-      - block lower 64k allocations to protect kernel from NULL deref attacks.
-      - enable /proc/$pid/maps protection.
-    - 10-keyboard.conf.powerpc: Mouse button emulation.
-    - 30-inotify-limits.conf: moved to "tracker" package for increasing
-      inotify watches to 524,388 for tracker.
-  * debian/rules:
-    - install sysctl files from new sysctl.d directory.
-    - append debian/sysctl.d/*.conf.$DEB_HOST_ARCH to 10-arch-specific.conf
-  * debian/sysctl.conf: add comment drawing attention to sysctl.d directory
-    (debian bug #495884).
-
- -- Kees Cook <kees@ubuntu.com>  Sun, 17 Aug 2008 06:25:40 -0700
-
 procps (1:3.2.7-9) unstable; urgency=low
 
   * Reverse order of sysctl file reads
@@ -1068,34 +613,6 @@
 
  -- Craig Small <csmall@debian.org>  Sun, 10 Aug 2008 11:49:12 +1000
 
-procps (1:3.2.7-8ubuntu2) intrepid; urgency=low
-
-  * Remove rcS.d/S17procps.sh on upgrade, eliminating Ubuntu cruft.
-
- -- Adam Conrad <adconrad@ubuntu.com>  Mon, 30 Jun 2008 15:46:16 -0600
-
-procps (1:3.2.7-8ubuntu1) intrepid; urgency=low
-
-  * Merge from debian unstable, remaining changes (LP: #242976):
-    - debian/{postinst,rules}: Place init script at priority 17.
-    - debian/patches/60_top_nohz: fix idle report when running NOHZ.
-    - debian/sysctl.conf: enable /proc/$pid/maps protection.
-    - debian/rules: allow for arch-specific sysctl.conf settings.
-      (append debian/sysctl.conf.$DEB_HOST_ARCH, if it exists, to sysctl.conf)
-    - debian/sysctl.conf.powerpc: Mouse button emulation.
-    - debian/init: respect $VERBOSE setting.
-    - debian/control: Maintainer field update.
-    - debian/sysctl.conf: stop low-level kernel messages to console
-      (this was formerly not documented in the changelog)
-    - debian/sysctl.conf: increase inotify watches to 524,388 for tracker.
-    - debian/sysctl.conf: enable "rp_filter" by default.
-    - debian/sysctl.conf: comment added about tcp_syncookies setting disabling
-      TCP Window Scaling
-    - debian/sysctl.conf: enable lower 64k protection to stop NULL deref 
-      attacks.
-
- -- Lars Wirzenius <lars@ubuntu.com>  Wed, 25 Jun 2008 22:36:33 +0300
-
 procps (1:3.2.7-8) unstable; urgency=low
 
   * Quote $file in init script and remove weird *.conf directory
@@ -1132,29 +649,6 @@
 
  -- Craig Small <csmall@debian.org>  Fri, 01 Feb 2008 23:01:28 +1100
 
-procps (1:3.2.7-5ubuntu2) hardy; urgency=low
-
-  * debian/sysctl.conf:
-    - enable "rp_filter" by default (LP: #201952).
-    - clean up duplicated entries, adjust documentation about syn cookies.
-
- -- Kees Cook <kees@ubuntu.com>  Thu, 13 Mar 2008 14:13:26 -0700
-
-procps (1:3.2.7-5ubuntu1) hardy; urgency=low
-
-  * Merge from debian unstable, remaining changes:
-    - debian/{postinst,rules}: Place init script at priority 17.
-    - debian/patches/60_top_nohz: fix idle report when running NOHZ.
-    - debian/sysctl.conf: enable /proc/$pid/maps protection.
-    - debian/rules: allow for arch-specific sysctl.conf settings.
-    - debian/sysctl.conf.powerpc: Mouse button emulation.
-    - debian/init: respect $VERBOSE setting.
-    - debian/control: Maintainer field update.
-    - debian/sysctl.conf: increase inotify watches to 524,388 for tracker.
-  * debian/sysctl.conf: enable lower 64k protection to stop NULL deref attacks.
-
- -- Kees Cook <kees@ubuntu.com>  Wed, 24 Oct 2007 10:41:23 -0700
-
 procps (1:3.2.7-5) unstable; urgency=low
 
   * Added headers into vmstat Closes: #436805
@@ -1193,64 +687,6 @@
 
  -- Craig Small <csmall@debian.org>  Wed, 08 Aug 2007 20:27:55 +1000
 
-procps (1:3.2.7-3ubuntu7) hardy; urgency=low
-
-  * No particular need for the maximum inotify instances to be that high,
-    leave them at the default -- otherwise you'll exhaust file descriptors
-    first.
-
- -- Scott James Remnant <scott@ubuntu.com>  Sat, 10 Nov 2007 10:47:44 -0500
-
-procps (1:3.2.7-3ubuntu6) hardy; urgency=low
-
-  * Increase maximum inotify instances to 1,024 and watches to 524,388 -
-    since tracker is in our default install, we need a lot more.
-
- -- Scott James Remnant <scott@ubuntu.com>  Sun, 28 Oct 2007 10:34:10 -0400
-
-procps (1:3.2.7-3ubuntu5) gutsy; urgency=low
-
-  * Test for DEB_HOST_ARCH_OS=linux instead of DEB_HOST_GNU_SYSTEM=linux-gnu
-    as the lpia DEB_HOST_GNU_SYSTEM is linux-gnulp instead, which breaks.
-
- -- Adam Conrad <adconrad@ubuntu.com>  Tue, 31 Jul 2007 17:03:28 +1000
-
-procps (1:3.2.7-3ubuntu4) gutsy; urgency=low
-
-  * Fix idle counter display with NOHZ kernels.
-    With massive SMP machines and NOHZ, it is possible that the CPU is really
-    idle.. so idle that top will show 0.0% in idle. This one liner will make
-    sure to report that the CPU is 100.0% in idle and produce a less confusing
-    output.
-
- -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Fri, 20 Jul 2007 12:53:29 +0200
-
-procps (1:3.2.7-3ubuntu3) gutsy; urgency=low
-
-  * debian/sysctl.conf: enable /proc/$pid/maps protection, new in 2.6.22.
-
- -- Kees Cook <kees@ubuntu.com>  Thu, 10 May 2007 00:39:48 -0700
-
-procps (1:3.2.7-3ubuntu2) feisty; urgency=low
-
-  * Rebuild for changes in the amd64 toolchain.
-  * Set Ubuntu maintainer address.
-
- -- Matthias Klose <doko@ubuntu.com>  Mon,  5 Mar 2007 01:24:55 +0000
-
-procps (1:3.2.7-3ubuntu1) feisty; urgency=low
-
-  * Merge from Debian unstable. Remaining Ubuntu changes:
-    - debian/rules: Add debian/sysctl.conf.$(DEB_HOST_ARCH) to default
-      sysctl.conf file.
-    - debian/sysctl.conf.powerpc: Mouse button emulation.
-    - debian/postinst, debian/rules: Place init script at priority 17.
-    - debian/sysctl.conf: Set kernel.printk to default values 4 4 1 7 to avoid
-      cluttering consoles on powerpc.
-    - debian/procps.sh: Respect $VERBOSE.
-
- -- Martin Pitt <martin.pitt@ubuntu.com>  Fri,  3 Nov 2006 18:28:41 +0100
-
 procps (1:3.2.7-3) unstable; urgency=low
 
   * Changed init script dependencies Closes: #386637, #386341
@@ -1258,30 +694,6 @@
 
  -- Craig Small <csmall@debian.org>  Wed, 13 Sep 2006 11:27:56 +1000
 
-procps (1:3.2.7-2ubuntu3) edgy; urgency=low
-
-  * debian/sysctl.conf: Explicitly set the kernel.printk sysctl to '4 4 1 7'
-    to stop kernel log spewage to consoles on powerpc. On i386/amd64 this is
-    the default printk setting anyway, thus does not change any default, but
-    with the powerpc kernels the default is '0 0 0 0'.
-
- -- Martin Pitt <martin.pitt@ubuntu.com>  Fri,  8 Sep 2006 15:44:45 +0200
-
-procps (1:3.2.7-2ubuntu2) edgy; urgency=low
-
-  * debian/rules: Re-add debian/sysctl.conf.$(DEB_HOST_ARCH) addition to the
-    default sysctl.conf file (apparently this got dropped in the last merge).
-    This repairs mouse F11/F12 mouse button emulation on powerpc.
-
- -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 16 Aug 2006 15:19:51 +0200
-
-procps (1:3.2.7-2ubuntu1) edgy; urgency=low
-
-  [ Ubuntu Merge-o-Matic ]
-  * Merge from debian unstable.
-
- -- Scott James Remnant <scott@ubuntu.com>  Fri, 30 Jun 2006 01:33:16 +0100
-
 procps (1:3.2.7-2) unstable; urgency=medium
 
   * pgrep c option patch works correctly Closes: #375791
@@ -1289,16 +701,6 @@
 
  -- Craig Small <csmall@debian.org>  Wed, 28 Jun 2006 22:28:02 +1000
 
-procps (1:3.2.7-1ubuntu1) edgy; urgency=low
-
-  [ Ongoing Merge Process ]
-  * Merge from debian unstable.
-
-  [ Scott James Remnant ]
-  * Drop postinst migration now that dapper is released. 
-
- -- Scott James Remnant <scott@ubuntu.com>  Wed, 28 Jun 2006 23:31:06 +0100
-
 procps (1:3.2.7-1) unstable; urgency=low
 
   * New upstream release
@@ -1348,38 +750,6 @@
 
  -- Don Armstrong <don@debian.org>  Sun, 19 Feb 2006 15:48:35 -0800
 
-procps (1:3.2.6-2ubuntu4) dapper; urgency=low
-
-  * Move init script to S17 so it gets run after all modules have probably
-    been loaded, otherwise many sysctls will probably not be set.  Users
-    will have to worry about disabling things a different way (which this
-    has never been useful for anyway).
-
- -- Scott James Remnant <scott@ubuntu.com>  Mon, 23 Jan 2006 15:34:03 +0000
-
-procps (1:3.2.6-2ubuntu3) dapper; urgency=low
-
-  * Undo rename of init script, I was overzealously reading my notes and
-    it's not necessary.  Keeps the Debian diff smaller.
-
- -- Scott James Remnant <scott@ubuntu.com>  Wed,  4 Jan 2006 10:41:49 +0000
-
-procps (1:3.2.6-2ubuntu2) dapper; urgency=low
-
-  * Move init script from S30 to S05 so it can apply options before
-    modules are loaded; especially important for disabling networking
-    features, etc.
-  * Rename init script to avoid confusion, and avoid problems using exit
-    in *.sh scripts.
-
- -- Scott James Remnant <scott@ubuntu.com>  Thu, 15 Dec 2005 01:44:51 +0000
-
-procps (1:3.2.6-2ubuntu1) dapper; urgency=low
-
-  * resync with debian, merged by hand
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Nov 2005 17:50:43 +0100
-
 procps (1:3.2.6-2) unstable; urgency=low
 
   * properly patched for kfreebsd Closes: #290719
@@ -1403,12 +773,6 @@
 
  -- Craig Small <csmall@debian.org>  Mon, 31 Oct 2005 18:49:07 +1100
 
-procps (1:3.2.5-1ubuntu1) breezy; urgency=low
- 
-   * Resynchronise with Debian.
- 
- -- Adam Conrad <adconrad@0c3.net>  Thu, 21 Apr 2005 08:50:56 +0000
-
 procps (1:3.2.5-1) unstable; urgency=low
 
   * New upstream release
@@ -1420,12 +784,6 @@
 
  -- Craig Small <csmall@debian.org>  Thu, 27 Jan 2005 11:07:46 +1100
 
-procps (1:3.2.4-1ubuntu1) hoary; urgency=low
-
-  * Resynchronise with Debian.
-
- -- Colin Watson <cjwatson@canonical.com>  Wed,  8 Dec 2004 10:45:17 +0100
-
 procps (1:3.2.4-1) unstable; urgency=low
 
   * New upstream release
@@ -1436,12 +794,6 @@
 
  -- Craig Small <csmall@debian.org>  Wed, 17 Nov 2004 12:56:21 +1100
 
-procps (1:3.2.3-1ubuntu1) hoary; urgency=low
-
-  * Resynchronise with Debian.
-
- -- Scott James Remnant <scott@canonical.com>  Wed, 27 Oct 2004 14:28:50 +0100
-
 procps (1:3.2.3-1) unstable; urgency=low
 
   * New upstream release
@@ -1463,25 +815,6 @@
 
  -- Craig Small <csmall@debian.org>  Wed, 28 Jul 2004 16:25:34 +1000
 
-procps (1:3.2.1-2ubuntu3) warty; urgency=low
-
-  * On Macs, emulate the middle and right mouse buttons with F11 and F12
-    respectively (closes: Warty #1187).
-
- -- Colin Watson <cjwatson@canonical.com>  Tue, 14 Sep 2004 20:11:25 +0100
-
-procps (1:3.2.1-2ubuntu2) warty; urgency=low
-
-  * Added versioned depend on lsb-base
-
- -- Nathaniel McCallum <npmccallum@canonical.com>  Fri,  3 Sep 2004 15:15:09 -0400
-
-procps (1:3.2.1-2ubuntu1) warty; urgency=low
-
-  * debian/procps.sh: pretty initscript
-
- -- Nathaniel McCallum <npmccallum@canonical.com>  Fri,  3 Sep 2004 11:59:29 -0400
-
 procps (1:3.2.1-2) unstable; urgency=low
 
   * Fix Makefile patch so it works  with newer patch packages 
@@ -1498,7 +831,7 @@
   * menu item has text quoted
 
  -- Craig Small <csmall@debian.org>  Thu,  1 Apr 2004 22:53:37 +1000
-
+ 
 procps (1:3.2.0-1) unstable; urgency=low
 
   * New upstream release
@@ -2259,4 +1592,3 @@
     (i.e. it will  look like this if there is not too much resistance).  
 
  -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de>  Sat, 5 Oct 1996 14:26:57 +0200
-
diff -Nru procps-3.3.11/debian/control procps-3.3.12/debian/control
--- procps-3.3.11/debian/control	2016-05-20 16:11:07.000000000 +0000
+++ procps-3.3.12/debian/control	2016-07-11 20:31:25.000000000 +0000
@@ -10,7 +10,7 @@
     libnuma-dev [amd64 i386 ia64 mips mipsel mips64 mips64el powerpc ppc64el],
     dh-autoreconf, pkg-config,
     libsystemd-dev (>= 209) [linux-any]
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Vcs-Git: git://git.debian.org/collab-maint/procps.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/procps.git;a=summary
 Homepage: https://gitlab.com/procps-ng/procps
@@ -32,7 +32,7 @@
  It contains free, kill, pkill, pgrep, pmap, ps, pwdx, skill, slabtop,
  snice, sysctl, tload, top, uptime, vmstat, w, and watch.
 
-Package: libprocps5
+Package: libprocps6
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -51,7 +51,7 @@
 Multi-Arch: same
 Section: libdevel
 Priority: optional
-Depends: libprocps5 (=${binary:Version}), ${misc:Depends}
+Depends: libprocps6 (=${binary:Version}), ${misc:Depends}
 Conflicts: libproc-dev, libprocps0-dev, libprocps1-dev,
            libprocps3-dev, libprocps4-dev
 Replaces: libproc-dev, libprocps0-dev, libprocps1-dev,
diff -Nru procps-3.3.11/debian/libprocps5-dev.dirs procps-3.3.12/debian/libprocps5-dev.dirs
--- procps-3.3.11/debian/libprocps5-dev.dirs	2016-01-03 06:10:47.000000000 +0000
+++ procps-3.3.12/debian/libprocps5-dev.dirs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib
-usr/include/proc
diff -Nru procps-3.3.11/debian/libprocps5.install procps-3.3.12/debian/libprocps5.install
--- procps-3.3.11/debian/libprocps5.install	2016-01-03 06:10:47.000000000 +0000
+++ procps-3.3.12/debian/libprocps5.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-#! /usr/bin/dh-exec
-usr/lib/${DEB_HOST_MULTIARCH}/libprocps.so.* lib/${DEB_HOST_MULTIARCH}/
diff -Nru procps-3.3.11/debian/libprocps6.install procps-3.3.12/debian/libprocps6.install
--- procps-3.3.11/debian/libprocps6.install	1970-01-01 00:00:00.000000000 +0000
+++ procps-3.3.12/debian/libprocps6.install	2016-07-10 07:39:46.000000000 +0000
@@ -0,0 +1,2 @@
+#! /usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}/libprocps.so.* lib/${DEB_HOST_MULTIARCH}/
diff -Nru procps-3.3.11/debian/libprocps-dev.links procps-3.3.12/debian/libprocps-dev.links
--- procps-3.3.11/debian/libprocps-dev.links	2016-01-03 06:10:47.000000000 +0000
+++ procps-3.3.12/debian/libprocps-dev.links	2016-07-10 07:39:46.000000000 +0000
@@ -1,2 +1,2 @@
 #! /usr/bin/dh-exec
-lib/${DEB_HOST_MULTIARCH}/libprocps.so.5 usr/lib/${DEB_HOST_MULTIARCH}/libprocps.so
+lib/${DEB_HOST_MULTIARCH}/libprocps.so.6 usr/lib/${DEB_HOST_MULTIARCH}/libprocps.so
diff -Nru procps-3.3.11/debian/patches/main_cached procps-3.3.12/debian/patches/main_cached
--- procps-3.3.11/debian/patches/main_cached	2016-01-03 06:10:47.000000000 +0000
+++ procps-3.3.12/debian/patches/main_cached	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-Description: Fix main cached calculation
- Main cached used to be page cache + slab in fact the
- second item should be slab reclaimable as the point of this
- item is to show potiential available memory.
- Many thanks to Omega Phil for hunting this one down
-Author: Craig Small <csmall@debian.org>
-Origin: upstream
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=799716
-Applied-Upstream: https://gitlab.com/procps-ng/procps/commit/05d751c4f076a2f0118b914c5e51cfbb4762ad8e
-Last-Update: 2016-01-03
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/proc/sysinfo.c
-+++ b/proc/sysinfo.c
-@@ -704,7 +704,7 @@
-   if(kb_inactive==~0UL){
-     kb_inactive = kb_inact_dirty + kb_inact_clean + kb_inact_laundry;
-   }
--  kb_main_cached = kb_page_cache + kb_slab;
-+  kb_main_cached = kb_page_cache + kb_slab_reclaimable;
-   kb_swap_used = kb_swap_total - kb_swap_free;
- 
-   /* if kb_main_available is greater than kb_main_total or our calculation of
diff -Nru procps-3.3.11/debian/patches/remove_strtod_tests procps-3.3.12/debian/patches/remove_strtod_tests
--- procps-3.3.11/debian/patches/remove_strtod_tests	1970-01-01 00:00:00.000000000 +0000
+++ procps-3.3.12/debian/patches/remove_strtod_tests	2016-07-12 06:07:52.000000000 +0000
@@ -0,0 +1,10 @@
+--- a/lib/test_strtod_nol.c
++++ b/lib/test_strtod_nol.c
+@@ -32,6 +32,7 @@
+     int i;
+     double val;
+ 
++    return EXIT_SUCCESS; // always success
+     for(i=0; tests[i].string != NULL; i++) {
+         if(strtod_nol_or_err(tests[i].string, "Cannot parse number") !=
+            tests[i].result) {
diff -Nru procps-3.3.11/debian/patches/series procps-3.3.12/debian/patches/series
--- procps-3.3.11/debian/patches/series	2016-05-20 16:09:22.000000000 +0000
+++ procps-3.3.12/debian/patches/series	2016-07-12 06:08:24.000000000 +0000
@@ -1,6 +1,6 @@
+remove_strtod_tests
 disable_sched_test
 uptime_test
-main_cached
 pmap_test
 ignore_eaccess.patch
 ignore_erofs.patch
diff -Nru procps-3.3.11/debian/procps.init.linux procps-3.3.12/debian/procps.init.linux
--- procps-3.3.11/debian/procps.init.linux	2016-01-03 06:10:47.000000000 +0000
+++ procps-3.3.12/debian/procps.init.linux	2016-07-10 07:39:46.000000000 +0000
@@ -36,7 +36,7 @@
 
 case "$1" in
 	start|restart|force-reload|reload)
-		log_action_begin_msg "Setting kernel variables "
+		log_action_begin_msg "Setting kernel variables"
 		STATUS=0
 		$SYSCTL $QUIET_SYSCTL --system || STATUS=$?
 		log_action_end_msg $STATUS
diff -Nru procps-3.3.11/debian/procps.install.hurd procps-3.3.12/debian/procps.install.hurd
--- procps-3.3.11/debian/procps.install.hurd	2016-01-03 06:10:47.000000000 +0000
+++ procps-3.3.12/debian/procps.install.hurd	2016-07-10 07:39:46.000000000 +0000
@@ -1,4 +1,4 @@
 # Files to install for hurd systems
-bin/kill bin
-bin/ps bin
+bbin/kill bin/kill.procps
+bbin/ps bin/ps.procps
 bin/* /usr/bin
diff -Nru procps-3.3.11/debian/procps.install.kfreebsd procps-3.3.12/debian/procps.install.kfreebsd
--- procps-3.3.11/debian/procps.install.kfreebsd	2016-01-03 06:10:47.000000000 +0000
+++ procps-3.3.12/debian/procps.install.kfreebsd	2016-07-10 07:39:46.000000000 +0000
@@ -1,4 +1,4 @@
 # Files to install for kfreebsd systems
-bin/kill bin
-bin/ps bin
+bbin/kill bin/kill.procps
+bbin/ps bin
 bin/* /usr/bin
diff -Nru procps-3.3.11/debian/procps.procps-instance.upstart procps-3.3.12/debian/procps.procps-instance.upstart
--- procps-3.3.11/debian/procps.procps-instance.upstart	2016-05-20 16:06:56.000000000 +0000
+++ procps-3.3.12/debian/procps.procps-instance.upstart	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-# procps - set sysctls from /etc/sysctl.conf
-#
-# This task sets kernel sysctl variables from /etc/sysctl.conf and
-# /etc/sysctl.d
-
-description	"set sysctls from /etc/sysctl.conf"
-
-instance $UPSTART_EVENTS
-env UPSTART_EVENTS=
-
-start on virtual-filesystems or static-network-up
-
-task
-script
-    cat /etc/sysctl.d/*.conf /etc/sysctl.conf | sysctl -e -p -
-end script
diff -Nru procps-3.3.11/debian/rules procps-3.3.12/debian/rules
--- procps-3.3.11/debian/rules	2016-05-20 16:08:50.000000000 +0000
+++ procps-3.3.12/debian/rules	2016-07-12 06:07:08.000000000 +0000
@@ -12,6 +12,7 @@
 DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+configure_flags += --host=$(DEB_HOST_GNU_TYPE)
 CROSS = PKG_CONFIG=$(DEB_HOST_GNU_TYPE)-pkg-config \
 	ac_cv_func_malloc_0_nonnull=yes \
 	ac_cv_func_realloc_0_nonnull=yes
@@ -33,6 +34,7 @@
 
 override_dh_auto_configure:
 	$(CROSS) ./configure \
+	  $(configure_flags) \
 	  --build=$(DEB_BUILD_GNU_TYPE) \
 	  --disable-silent-rules \
 	  --enable-watch8bit --enable-w-from \
@@ -73,6 +75,7 @@
 	(cd $(DEBROOT)/bin && mv w w.procps )
 	(cd $(DEBROOT)/usr/share/man/man1 && mv w.1 w.procps.1 )
 
+
 ifneq ($(DEB_HOST_ARCH_OS), linux)
 	rm -f \
 		$(DEBROOT)/bin/slabtop \
@@ -100,7 +103,7 @@
 	# Rename vmstat as there are two of them
 	(cd $(DEBROOT)/bin && mv vmstat vmstat.procps )
 	(cd $(DEBROOT)/usr/share/man/man8 && mv vmstat.8 vmstat.procps.8 )
-
+	
     # Rename uptime as there are two of them
 	(cd $(DEBROOT)/bin && mv uptime uptime.procps )
 	(cd $(DEBROOT)/usr/share/man/man1 && mv uptime.1 uptime.procps.1 )
@@ -115,10 +118,9 @@
 
 override_dh_installinit:
 ifeq ($(DEB_HOST_ARCH_OS), linux)
-	dh_installinit --update-rcd-params='start 17 S .'
-	dh_installinit --name procps-instance --no-start
+	dh_installinit --no-start
 endif
 
 override_dh_makeshlibs:
-	dh_makeshlibs -V 'libprocps5'
+	dh_makeshlibs -V 'libprocps6'
 
diff -Nru procps-3.3.11/debian/upstart procps-3.3.12/debian/upstart
--- procps-3.3.11/debian/upstart	2016-05-20 16:06:56.000000000 +0000
+++ procps-3.3.12/debian/upstart	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-# procps - set sysctls from /etc/sysctl.conf
-#
-# signal startpar that procps has run
-
-start on started procps-instance
diff -Nru procps-3.3.11/free.1 procps-3.3.12/free.1
--- procps-3.3.11/free.1	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/free.1	2016-07-10 06:40:26.000000000 +0000
@@ -2,7 +2,7 @@
 .\"  This page Copyright (C) 1993 Matt Welsh, mdw@sunsite.unc.edu.
 .\"  Long options where added at April 15th, 2011.
 .\"  Freely distributable under the terms of the GPL
-.TH FREE 1 "Apr 2015" "procps-ng" "User Commands"
+.TH FREE 1 "2016-06-03" "procps-ng" "User Commands"
 .SH NAME
 free \- Display amount of free and used memory in the system
 .SH SYNOPSIS
@@ -25,14 +25,13 @@
 Unused memory (MemFree and SwapFree in /proc/meminfo)
 .TP
 \fBshared\fR
-Memory used (mostly) by tmpfs (Shmem in /proc/meminfo, available on
-kernels 2.6.32, displayed as zero if not available)
+Memory used (mostly) by tmpfs (Shmem in /proc/meminfo)
 .TP
 \fBbuffers\fR
 Memory used by kernel buffers (Buffers in /proc/meminfo)
 .TP
 \fBcache\fR
-Memory used by the page cache and slabs (Cached and Slab in /proc/meminfo)
+Memory used by the page cache and slabs (Cached and SReclaimable in /proc/meminfo)
 .TP
 \fBbuff/cache\fR
 Sum of \fBbuffers\fR and \fBcache\fR
@@ -111,11 +110,10 @@
 \fB\-l\fR, \fB\-\-lohi\fR
 Show detailed low and high memory statistics.
 .TP
-\fB\-s\fR, \fB\-\-seconds\fR \fIseconds\fR
-Continuously display the result delay
-.I seconds
+\fB\-s\fR, \fB\-\-seconds\fR \fIdelay\fR
+Continuously display the result \fIdelay\fR  seconds
 apart.  You may actually specify any floating point number for
-.IR delay ,
+\fIdelay\fR using either . or , for decimal point.
 .BR usleep (3)
 is used for microsecond resolution delay times.
 .TP
@@ -137,14 +135,15 @@
 /proc/meminfo
 memory information
 .PD
+.SH BUGS
+The value for the \fBshared\fR column is not available from kernels before
+2.6.32 and is displayed as zero.
+.TP
+Please send bug reports to
+.UR procps@freelists.org
+.UE
 .SH "SEE ALSO"
 .BR ps (1),
 .BR slabtop (1),
 .BR top "(1),
 .BR vmstat (8).
-.SH AUTHORS
-Written by Brian Edmonds.
-.SH "REPORTING BUGS"
-Please send bug reports to
-.UR procps@freelists.org
-.UE
diff -Nru procps-3.3.11/free.c procps-3.3.12/free.c
--- procps-3.3.11/free.c	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/free.c	2016-07-10 06:40:26.000000000 +0000
@@ -148,7 +148,7 @@
 
 	/* human readable output */
 	up = nextup;
-	for (i = 1; up[0] != '0'; i++, up++) {
+	for (i = 1; up[0] != 0; i++, up++) {
 		switch (i) {
 		case 1:
 			if (4 >= snprintf(buf, sizeof(buf), "%ld%c", (long)size * 1024, *up))
@@ -324,9 +324,7 @@
 		case 's':
 			flags |= FREE_REPEAT;
 			errno = 0;
-			args.repeat_interval = (1000000 * strtof(optarg, &endptr));
-			if (errno || optarg == endptr || (endptr && *endptr))
-				xerrx(EXIT_FAILURE, _("seconds argument `%s' failed"), optarg);
+            args.repeat_interval = (1000000 * strtod_nol_or_err(optarg, "seconds argument failed"));
 			if (args.repeat_interval < 1)
 				xerrx(EXIT_FAILURE,
 				     _("seconds argument `%s' is not positive number"), optarg);
diff -Nru procps-3.3.11/include/Makefile.in procps-3.3.12/include/Makefile.in
--- procps-3.3.11/include/Makefile.in	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/include/Makefile.in	2016-07-10 06:40:26.000000000 +0000
@@ -160,10 +160,6 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEJAGNU = @DEJAGNU@
@@ -198,6 +194,7 @@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -245,7 +242,6 @@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -284,6 +280,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff -Nru procps-3.3.11/include/strutils.h procps-3.3.12/include/strutils.h
--- procps-3.3.11/include/strutils.h	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/include/strutils.h	2016-07-10 06:40:26.000000000 +0000
@@ -7,5 +7,6 @@
 
 extern long strtol_or_err(const char *str, const char *errmesg);
 extern double strtod_or_err(const char *str, const char *errmesg);
+double strtod_nol_or_err(char *str, const char *errmesg);
 
 #endif
diff -Nru procps-3.3.11/install-sh procps-3.3.12/install-sh
--- procps-3.3.11/install-sh	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/install-sh	2016-07-10 06:40:26.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2013-12-25.23; # UTC
+scriptversion=2014-09-12.12; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -324,34 +324,41 @@
             # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
             ;;
           *)
+            # $RANDOM is not portable (e.g. dash);  use it when possible to
+            # lower collision chance
             tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-            trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
 
+            # As "mkdir -p" follows symlinks and we work in /tmp possibly;  so
+            # create the $tmpdir first (and fail if unsuccessful) to make sure
+            # that nobody tries to guess the $tmpdir name.
             if (umask $mkdir_umask &&
-                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+                $mkdirprog $mkdir_mode "$tmpdir" &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
             then
               if test -z "$dir_arg" || {
                    # Check for POSIX incompatibilities with -m.
                    # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
                    # other-writable bit of parent directory when it shouldn't.
                    # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+                   test_tmpdir="$tmpdir/a"
+                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
                    case $ls_ld_tmpdir in
                      d????-?r-*) different_mode=700;;
                      d????-?--*) different_mode=755;;
                      *) false;;
                    esac &&
-                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-                     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
                      test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
                    }
                  }
               then posix_mkdir=:
               fi
-              rmdir "$tmpdir/d" "$tmpdir"
+              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
             else
               # Remove any dirs left behind by ancient mkdir implementations.
-              rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
             fi
             trap '' 0;;
         esac;;
diff -Nru procps-3.3.11/lib/strutils.c procps-3.3.12/lib/strutils.c
--- procps-3.3.11/lib/strutils.c	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/lib/strutils.c	2016-07-10 06:40:26.000000000 +0000
@@ -21,6 +21,7 @@
  */
 
 #include <stdlib.h>
+#include <ctype.h>
 
 #include "c.h"
 #include "strutils.h"
@@ -60,3 +61,63 @@
 	error(EXIT_FAILURE, errno, "%s: '%s'", errmesg, str);
 	return 0;
 }
+
+/*
+ * Covert a string into a double in a non-locale aware way.
+ * This means the decimal point can be either . or ,
+ * Also means you cannot use the other for thousands separator
+ *
+ * Exits on failure like its other _or_err cousins
+ */
+double strtod_nol_or_err(char *str, const char *errmesg)
+{
+    double num;
+    const char *cp, *radix;
+    double mult;
+    int negative = 0;
+
+    if (str != NULL && *str != '\0') {
+        num = 0.0;
+        cp = str;
+        /* strip leading spaces */
+        while (isspace(*cp))
+            cp++;
+
+        /* get sign */
+        if (*cp == '-') {
+            negative = 1;
+            cp++;
+        } else if (*cp == '+')
+            cp++;
+
+        /* find radix */
+        radix = cp;
+        mult=0.1;
+        while(isdigit(*radix)) {
+            radix++;
+            mult *= 10;
+        }
+        while(isdigit(*cp)) {
+            num += (*cp - '0') * mult;
+            mult /= 10;
+            cp++;
+        }
+        /* got the integers */
+        if (*cp == '\0')
+            return (negative?-num:num);
+        if (*cp != '.' && *cp != ',')
+            error(EXIT_FAILURE, EINVAL, "%s: '%s'", errmesg, str);
+
+        cp++;
+        mult = 0.1;
+        while(isdigit(*cp)) {
+            num += (*cp - '0') * mult;
+            mult /= 10;
+            cp++;
+        }
+        if (*cp == '\0')
+            return (negative?-num:num);
+    }
+    error(EXIT_FAILURE, errno, "%s: '%s'", errmesg, str);
+    return 0;
+}
diff -Nru procps-3.3.11/lib/strverscmp.c procps-3.3.12/lib/strverscmp.c
--- procps-3.3.11/lib/strverscmp.c	1970-01-01 00:00:00.000000000 +0000
+++ procps-3.3.12/lib/strverscmp.c	2016-07-10 06:40:26.000000000 +0000
@@ -0,0 +1,158 @@
+/* Compare strings while treating digits characters numerically.
+   Copyright (C) 1997, 2002, 2005 Free Software Foundation, Inc.
+   This file is part of the libiberty library.
+   Contributed by Jean-Fran�ois Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
+
+   Libiberty is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   Libiberty 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301 USA.  */
+
+/* #include "libiberty.h" */
+/* #include "safe-ctype.h" */
+#include <ctype.h>
+
+/* 
+@deftypefun int strverscmp (const char *@var{s1}, const char *@var{s2})
+The @code{strverscmp} function compares the string @var{s1} against
+@var{s2}, considering them as holding indices/version numbers.  Return
+value follows the same conventions as found in the @code{strverscmp}
+function.  In fact, if @var{s1} and @var{s2} contain no digits,
+@code{strverscmp} behaves like @code{strcmp}.
+
+Basically, we compare strings normally (character by character), until
+we find a digit in each string - then we enter a special comparison
+mode, where each sequence of digits is taken as a whole.  If we reach the
+end of these two parts without noticing a difference, we return to the
+standard comparison mode.  There are two types of numeric parts:
+"integral" and "fractional" (those  begin with a '0'). The types
+of the numeric parts affect the way we sort them:
+
+@itemize @bullet
+@item
+integral/integral: we compare values as you would expect.
+
+@item
+fractional/integral: the fractional part is less than the integral one.
+Again, no surprise.
+
+@item
+fractional/fractional: the things become a bit more complex.
+If the common prefix contains only leading zeroes, the longest part is less
+than the other one; else the comparison behaves normally.
+@end itemize
+
+@smallexample
+strverscmp ("no digit", "no digit")
+    @result{} 0    // @r{same behavior as strcmp.}
+strverscmp ("item#99", "item#100")
+    @result{} <0   // @r{same prefix, but 99 < 100.}
+strverscmp ("alpha1", "alpha001")
+    @result{} >0   // @r{fractional part inferior to integral one.}
+strverscmp ("part1_f012", "part1_f01")
+    @result{} >0   // @r{two fractional parts.}
+strverscmp ("foo.009", "foo.0")
+    @result{} <0   // @r{idem, but with leading zeroes only.}
+@end smallexample
+
+This function is especially useful when dealing with filename sorting,
+because filenames frequently hold indices/version numbers.
+@end deftypefun
+
+*/
+
+/* states: S_N: normal, S_I: comparing integral part, S_F: comparing
+           fractional parts, S_Z: idem but with leading Zeroes only */
+#define  S_N    0x0
+#define  S_I    0x4
+#define  S_F    0x8
+#define  S_Z    0xC
+
+/* result_type: CMP: return diff; LEN: compare using len_diff/diff */
+#define  CMP    2
+#define  LEN    3
+
+
+/* Compare S1 and S2 as strings holding indices/version numbers,
+   returning less than, equal to or greater than zero if S1 is less than,
+   equal to or greater than S2 (for more info, see the Glibc texinfo doc).  */
+
+int
+strverscmp (const char *s1, const char *s2)
+{
+  const unsigned char *p1 = (const unsigned char *) s1;
+  const unsigned char *p2 = (const unsigned char *) s2;
+  unsigned char c1, c2;
+  int state;
+  int diff;
+
+  /* Symbol(s)    0       [1-9]   others  (padding)
+     Transition   (10) 0  (01) d  (00) x  (11) -   */
+  static const unsigned int next_state[] =
+    {
+      /* state    x    d    0    - */
+      /* S_N */  S_N, S_I, S_Z, S_N,
+      /* S_I */  S_N, S_I, S_I, S_I,
+      /* S_F */  S_N, S_F, S_F, S_F,
+      /* S_Z */  S_N, S_F, S_Z, S_Z
+    };
+
+  static const int result_type[] =
+    {
+      /* state   x/x  x/d  x/0  x/-  d/x  d/d  d/0  d/-
+                 0/x  0/d  0/0  0/-  -/x  -/d  -/0  -/- */
+
+      /* S_N */  CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
+                 CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
+      /* S_I */  CMP, -1,  -1,  CMP, +1,  LEN, LEN, CMP,
+                 +1,  LEN, LEN, CMP, CMP, CMP, CMP, CMP,
+      /* S_F */  CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
+                 CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
+      /* S_Z */  CMP, +1,  +1,  CMP, -1,  CMP, CMP, CMP,
+                 -1,  CMP, CMP, CMP
+    };
+
+  if (p1 == p2)
+    return 0;
+
+  c1 = *p1++;
+  c2 = *p2++;
+  /* Hint: '0' is a digit too.  */
+  state = S_N | ((c1 == '0') + (isdigit (c1) != 0));
+
+  while ((diff = c1 - c2) == 0 && c1 != '\0')
+    {
+      state = next_state[state];
+      c1 = *p1++;
+      c2 = *p2++;
+      state |= (c1 == '0') + (isdigit (c1) != 0);
+    }
+
+  state = result_type[state << 2 | (((c2 == '0') + (isdigit (c2) != 0)))];
+
+  switch (state)
+    {
+    case CMP:
+      return diff;
+      
+    case LEN:
+      while (isdigit (*p1++))
+	if (!isdigit (*p2++))
+	  return 1;
+      
+      return isdigit (*p2) ? -1 : diff;
+      
+    default:
+      return state;
+    }
+}
diff -Nru procps-3.3.11/lib/test_process.c procps-3.3.12/lib/test_process.c
--- procps-3.3.11/lib/test_process.c	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/lib/test_process.c	2016-07-10 06:40:26.000000000 +0000
@@ -21,7 +21,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <signal.h>
+#ifdef __linux__
 #include <sys/prctl.h>
+#endif
 #include "c.h"
 
 #define DEFAULT_SLEEPTIME 300
@@ -78,8 +80,10 @@
     sigaction(SIGUSR1, &signal_action, NULL);
     sigaction(SIGUSR2, &signal_action, NULL);
 
+#ifdef __linux__
     /* set process name */
     prctl(PR_SET_NAME, MY_NAME, NULL, NULL, NULL);
+#endif
 
     while (sleep_time > 0) {
 	sleep_time = sleep(sleep_time);
diff -Nru procps-3.3.11/lib/test_strtod_nol.c procps-3.3.12/lib/test_strtod_nol.c
--- procps-3.3.11/lib/test_strtod_nol.c	1970-01-01 00:00:00.000000000 +0000
+++ procps-3.3.12/lib/test_strtod_nol.c	2016-07-10 06:40:26.000000000 +0000
@@ -0,0 +1,45 @@
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "strutils.h"
+
+struct strtod_tests {
+    char *string;
+    double result;
+};
+
+struct strtod_tests tests[] = {
+    {"123",     123.0},
+    {"-123",    -123.0},
+    {"12.34",   12.34},
+    {"-12.34",  -12.34},
+    {".34",     0.34},
+    {"-.34",    -0.34},
+    {"12,34",   12.34},
+    {"-12,34",  -12.34},
+    {",34",     0.34},
+    {"-,34",    -0.34},
+    {"0",       0.0},
+    {".0",      0.0},
+    {"0.0",     0.0},
+    {NULL, 0.0}
+};
+
+
+
+int main(int argc, char *argv[])
+{
+    int i;
+    double val;
+
+    for(i=0; tests[i].string != NULL; i++) {
+        if(strtod_nol_or_err(tests[i].string, "Cannot parse number") !=
+           tests[i].result) {
+            fprintf(stderr, "FAIL: strtod_nol_or_err(\"%s\") != %f\n",
+                    tests[i].string, tests[i].result);
+            return EXIT_FAILURE;
+        }
+        //fprintf(stderr, "PASS: strtod_nol for %s\n", tests[i].string);
+    }
+    return EXIT_SUCCESS;
+}
diff -Nru procps-3.3.11/ltmain.sh procps-3.3.12/ltmain.sh
--- procps-3.3.11/ltmain.sh	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/ltmain.sh	2016-07-10 06:40:26.000000000 +0000
@@ -1,9 +1,12 @@
+#! /bin/sh
+## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+##               by inline-source v2014-01-03.01
 
-# libtool (GNU libtool) 2.4.2
+# libtool (GNU libtool) 2.4.6
+# Provide generalized library-building support services.
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2015 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -23,881 +26,2112 @@
 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
-#
-#       --config             show all configuration variables
-#       --debug              enable verbose shell tracing
-#   -n, --dry-run            display commands without modifying any files
-#       --features           display basic configuration information and exit
-#       --mode=MODE          use operation mode MODE
-#       --preserve-dup-deps  don't remove duplicate dependency libraries
-#       --quiet, --silent    don't print informational messages
-#       --no-quiet, --no-silent
-#                            print informational messages (default)
-#       --no-warn            don't display warning messages
-#       --tag=TAG            use configuration variables from tag TAG
-#   -v, --verbose            print more informational messages than default
-#       --no-verbose         don't print the extra informational messages
-#       --version            print version information
-#   -h, --help, --help-all   print short, long, or detailed help message
-#
-# MODE must be one of the following:
-#
-#         clean              remove files from the build directory
-#         compile            compile a source file into a libtool object
-#         execute            automatically set library path, then run a program
-#         finish             complete the installation of libtool libraries
-#         install            install libraries or executables
-#         link               create a library or an executable
-#         uninstall          remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE.  When passed as first option,
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-#         host-triplet:	$host
-#         shell:		$SHELL
-#         compiler:		$LTCC
-#         compiler flags:		$LTCFLAGS
-#         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.11
-#         automake:	$automake_version
-#         autoconf:	$autoconf_version
-#
-# Report bugs to <bug-libtool@gnu.org>.
-# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-# General help using GNU software: <http://www.gnu.org/gethelp/>.
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.11"
-TIMESTAMP=""
-package_revision=1.3337
+VERSION="2.4.6 Debian-2.4.6-0.1"
+package_revision=2.4.6
 
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Run './libtool --help' for help with using this script from the
+# command line.
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# After configure completes, it has a better idea of some of the
+# shell tools we need than the defaults used by the functions shared
+# with bootstrap, so set those here where they can still be over-
+# ridden by the user, but otherwise take precedence.
+
+: ${AUTOCONF="autoconf"}
+: ${AUTOMAKE="automake"}
+
+
+## -------------------------- ##
+## Source external libraries. ##
+## -------------------------- ##
+
+# Much of our low-level functionality needs to be sourced from external
+# libraries, which are installed to $pkgauxdir.
+
+# Set a version string for this script.
+scriptversion=2015-01-20.17; # UTC
+
+# General shell script boiler plate, and helper functions.
+# Written by Gary V. Vaughan, 2004
+
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Evaluate this file near the top of your script to gain access to
+# the functions and variables defined here:
+#
+#   . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
+#
+# If you need to override any of the default environment variable
+# settings, do that before evaluating this file.
+
+
+## -------------------- ##
+## Shell normalisation. ##
+## -------------------- ##
+
+# Some shells need a little help to be as Bourne compatible as possible.
+# Before doing anything else, make sure all that help has been provided!
+
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
 
-# NLS nuisances: We save the old values to restore during execute mode.
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+# NLS nuisances: We save the old values in case they are required later.
+_G_user_locale=
+_G_safe_locale=
+for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
 do
-  eval "if test \"\${$lt_var+set}\" = set; then
-          save_$lt_var=\$$lt_var
-          $lt_var=C
-	  export $lt_var
-	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
-	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+  eval "if test set = \"\${$_G_var+set}\"; then
+          save_$_G_var=\$$_G_var
+          $_G_var=C
+	  export $_G_var
+	  _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
+	  _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
 	fi"
 done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
 
-$lt_unset CDPATH
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Make sure IFS has a sensible default
+sp=' '
+nl='
+'
+IFS="$sp	$nl"
 
+# There are apparently some retarded systems that use ';' as a PATH separator!
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
 
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
 
 
+## ------------------------- ##
+## Locate command utilities. ##
+## ------------------------- ##
+
+
+# func_executable_p FILE
+# ----------------------
+# Check that FILE is an executable regular file.
+func_executable_p ()
+{
+    test -f "$1" && test -x "$1"
+}
+
+
+# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
+# --------------------------------------------
+# Search for either a program that responds to --version with output
+# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+# trying all the directories in PATH with each of the elements of
+# PROGS_LIST.
+#
+# CHECK_FUNC should accept the path to a candidate program, and
+# set $func_check_prog_result if it truncates its output less than
+# $_G_path_prog_max characters.
+func_path_progs ()
+{
+    _G_progs_list=$1
+    _G_check_func=$2
+    _G_PATH=${3-"$PATH"}
+
+    _G_path_prog_max=0
+    _G_path_prog_found=false
+    _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+    for _G_dir in $_G_PATH; do
+      IFS=$_G_save_IFS
+      test -z "$_G_dir" && _G_dir=.
+      for _G_prog_name in $_G_progs_list; do
+        for _exeext in '' .EXE; do
+          _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+          func_executable_p "$_G_path_prog" || continue
+          case `"$_G_path_prog" --version 2>&1` in
+            *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+            *)     $_G_check_func $_G_path_prog
+		   func_path_progs_result=$func_check_prog_result
+		   ;;
+          esac
+          $_G_path_prog_found && break 3
+        done
+      done
+    done
+    IFS=$_G_save_IFS
+    test -z "$func_path_progs_result" && {
+      echo "no acceptable sed could be found in \$PATH" >&2
+      exit 1
+    }
+}
+
+
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
+# Unless the user overrides by setting SED, search the path for either GNU
+# sed, or the sed that truncates its output the least.
+test -z "$SED" && {
+  _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+  for _G_i in 1 2 3 4 5 6 7; do
+    _G_sed_script=$_G_sed_script$nl$_G_sed_script
+  done
+  echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+  _G_sed_script=
+
+  func_check_prog_sed ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo '' >> conftest.nl
+      "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+  rm -f conftest.sed
+  SED=$func_path_progs_result
+}
+
+
+# Unless the user overrides by setting GREP, search the path for either GNU
+# grep, or the grep that truncates its output the least.
+test -z "$GREP" && {
+  func_check_prog_grep ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    _G_path_prog_max=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo 'GREP' >> conftest.nl
+      "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+  GREP=$func_path_progs_result
+}
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# All uppercase variable names are used for environment variables.  These
+# variables can be overridden by the user before calling a script that
+# uses them if a suitable command of that name is not already available
+# in the command search PATH.
 
 : ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${ECHO="printf %s\n"}
+: ${EGREP="$GREP -E"}
+: ${FGREP="$GREP -F"}
+: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
-
-exit_status=$EXIT_SUCCESS
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
 
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
 
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-    if test "X$func_dirname_result" = "X${1}"; then
-      func_dirname_result="${3}"
-    else
-      func_dirname_result="$func_dirname_result${2}"
-    fi
-} # func_dirname may be replaced by extended shell implementation
+## -------------------- ##
+## Useful sed snippets. ##
+## -------------------- ##
 
+sed_dirname='s|/[^/]*$||'
+sed_basename='s|^.*/||'
 
-# func_basename file
-func_basename ()
-{
-    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
 
+# Same as above, but do not quote variable references.
+sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
 
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-    # Extract subdirectory from the argument.
-    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
-    if test "X$func_dirname_result" = "X${1}"; then
-      func_dirname_result="${3}"
-    else
-      func_dirname_result="$func_dirname_result${2}"
-    fi
-    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
 
+# Sed substitution that converts a w32 file name or path
+# that contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
 
-# func_stripname 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).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-    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 may be replaced by extended shell implementation
+# Re-'\' parameter expansions in output of sed_double_quote_subst that
+# were '\'-ed in input to the same.  If an odd number of '\' preceded a
+# '$' in input to sed_double_quote_subst, that '$' was protected from
+# expansion.  Since each input '\' is now two '\'s, look for any number
+# of runs of four '\'s followed by two '\'s and then a '$'.  '\' that '$'.
+_G_bs='\\'
+_G_bs2='\\\\'
+_G_bs4='\\\\\\\\'
+_G_dollar='\$'
+sed_double_backslash="\
+  s/$_G_bs4/&\\
+/g
+  s/^$_G_bs2$_G_dollar/$_G_bs&/
+  s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
+  s/\n//g"
 
 
-# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/\([^/]*\).*$,\1,'
-pathcdr='s,^/[^/]*,,'
-removedotparts=':dotsl
-		s@/\./@/@g
-		t dotsl
-		s,/\.$,/,'
-collapseslashes='s@/\{1,\}@/@g'
-finalslash='s,/*$,/,'
+## ----------------- ##
+## Global variables. ##
+## ----------------- ##
+
+# Except for the global variables explicitly listed below, the following
+# functions in the '^func_' namespace, and the '^require_' namespace
+# variables initialised in the 'Resource management' section, sourcing
+# this file will not pollute your global namespace with anything
+# else. There's no portable way to scope variables in Bourne shell
+# though, so actually running these functions will sometimes place
+# results into a variable named after the function, and often use
+# temporary variables in the '^_G_' namespace. If you are careful to
+# avoid using those namespaces casually in your sourcing script, things
+# should continue to work as you expect. And, of course, you can freely
+# overwrite any of the functions or variables defined here before
+# calling anything to customize them.
 
-# func_normal_abspath PATH
-# Remove doubled-up and trailing slashes, "." path components,
-# and cancel out any ".." path components in PATH after making
-# it an absolute path.
-#             value returned in "$func_normal_abspath_result"
-func_normal_abspath ()
-{
-  # Start from root dir and reassemble the path.
-  func_normal_abspath_result=
-  func_normal_abspath_tpath=$1
-  func_normal_abspath_altnamespace=
-  case $func_normal_abspath_tpath in
-    "")
-      # Empty path, that just means $cwd.
-      func_stripname '' '/' "`pwd`"
-      func_normal_abspath_result=$func_stripname_result
-      return
-    ;;
-    # The next three entries are used to spot a run of precisely
-    # two leading slashes without using negated character classes;
-    # we take advantage of case's first-match behaviour.
-    ///*)
-      # Unusual form of absolute path, do nothing.
-    ;;
-    //*)
-      # Not necessarily an ordinary path; POSIX reserves leading '//'
-      # and for example Cygwin uses it to access remote file shares
-      # over CIFS/SMB, so we conserve a leading double slash if found.
-      func_normal_abspath_altnamespace=/
-    ;;
-    /*)
-      # Absolute path, do nothing.
-    ;;
-    *)
-      # Relative path, prepend $cwd.
-      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
-    ;;
-  esac
-  # Cancel out all the simple stuff to save iterations.  We also want
-  # the path to end with a slash for ease of parsing, so make sure
-  # there is one (and only one) here.
-  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
-  while :; do
-    # Processed it all yet?
-    if test "$func_normal_abspath_tpath" = / ; then
-      # If we ascended to the root using ".." the result may be empty now.
-      if test -z "$func_normal_abspath_result" ; then
-        func_normal_abspath_result=/
-      fi
-      break
-    fi
-    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcar"`
-    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcdr"`
-    # Figure out what to do with it
-    case $func_normal_abspath_tcomponent in
-      "")
-        # Trailing empty path component, ignore it.
-      ;;
-      ..)
-        # Parent dir; strip last assembled component from result.
-        func_dirname "$func_normal_abspath_result"
-        func_normal_abspath_result=$func_dirname_result
-      ;;
-      *)
-        # Actual path component, append it.
-        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
-      ;;
-    esac
-  done
-  # Restore leading double-slash if one was found on entry.
-  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-}
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
 
-# func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
-# without needing to append a separator.
-#             value returned in "$func_relative_path_result"
-func_relative_path ()
-{
-  func_relative_path_result=
-  func_normal_abspath "$1"
-  func_relative_path_tlibdir=$func_normal_abspath_result
-  func_normal_abspath "$2"
-  func_relative_path_tbindir=$func_normal_abspath_result
-
-  # Ascend the tree starting from libdir
-  while :; do
-    # check if we have found a prefix of bindir
-    case $func_relative_path_tbindir in
-      $func_relative_path_tlibdir)
-        # found an exact match
-        func_relative_path_tcancelled=
-        break
-        ;;
-      $func_relative_path_tlibdir*)
-        # found a matching prefix
-        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
-        func_relative_path_tcancelled=$func_stripname_result
-        if test -z "$func_relative_path_result"; then
-          func_relative_path_result=.
-        fi
-        break
-        ;;
-      *)
-        func_dirname $func_relative_path_tlibdir
-        func_relative_path_tlibdir=${func_dirname_result}
-        if test "x$func_relative_path_tlibdir" = x ; then
-          # Have to descend all the way to the root!
-          func_relative_path_result=../$func_relative_path_result
-          func_relative_path_tcancelled=$func_relative_path_tbindir
-          break
-        fi
-        func_relative_path_result=../$func_relative_path_result
-        ;;
-    esac
-  done
+# Allow overriding, eg assuming that you follow the convention of
+# putting '$debug_cmd' at the start of all your functions, you can get
+# bash to show function call trace with:
+#
+#    debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+debug_cmd=${debug_cmd-":"}
+exit_cmd=:
 
-  # Now calculate path; take care to avoid doubling-up slashes.
-  func_stripname '' '/' "$func_relative_path_result"
-  func_relative_path_result=$func_stripname_result
-  func_stripname '/' '/' "$func_relative_path_tcancelled"
-  if test "x$func_stripname_result" != x ; then
-    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
-  fi
+# By convention, finish your script with:
+#
+#    exit $exit_status
+#
+# so that you can set exit_status to non-zero if you want to indicate
+# something went wrong during execution without actually bailing out at
+# the point of failure.
+exit_status=$EXIT_SUCCESS
 
-  # Normalisation. If bindir is libdir, return empty string,
-  # else relative path ending with a slash; either way, target
-  # file name can be directly appended.
-  if test ! -z "$func_relative_path_result"; then
-    func_stripname './' '' "$func_relative_path_result/"
-    func_relative_path_result=$func_stripname_result
-  fi
-}
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath=$0
 
-# The name of this program:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
+# The name of this program.
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
 
-# Make sure we have an absolute path for reexecution:
+# Make sure we have an absolute progpath for reexecution:
 case $progpath in
   [\\/]*|[A-Za-z]:\\*) ;;
   *[\\/]*)
-     progdir=$func_dirname_result
+     progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
      progdir=`cd "$progdir" && pwd`
-     progpath="$progdir/$progname"
+     progpath=$progdir/$progname
      ;;
   *)
-     save_IFS="$IFS"
+     _G_IFS=$IFS
      IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
-       IFS="$save_IFS"
+       IFS=$_G_IFS
        test -x "$progdir/$progname" && break
      done
-     IFS="$save_IFS"
+     IFS=$_G_IFS
      test -n "$progdir" || progdir=`pwd`
-     progpath="$progdir/$progname"
+     progpath=$progdir/$progname
      ;;
 esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
 
-# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
-# (escaped) backslashes.  A very naive implementation.
-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
-  s/$bs4/&\\
-/g
-  s/^$bs2$dollar/$bs&/
-  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
-  s/\n//g"
+## ----------------- ##
+## Standard options. ##
+## ----------------- ##
+
+# The following options affect the operation of the functions defined
+# below, and should be set appropriately depending on run-time para-
+# meters passed on the command line.
 
-# Standard options:
 opt_dry_run=false
-opt_help=false
 opt_quiet=false
 opt_verbose=false
-opt_warning=:
-
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
-{
-    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
-}
 
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
-    $opt_verbose && func_echo ${1+"$@"}
+# Categories 'all' and 'none' are always available.  Append any others
+# you will pass as the first argument to func_warning from your own
+# code.
+warning_categories=
+
+# By default, display warnings according to 'opt_warning_types'.  Set
+# 'warning_func'  to ':' to elide all warnings, or func_fatal_error to
+# treat the next displayed warning as a fatal error.
+warning_func=func_warn_and_continue
+
+# Set to 'all' to display all warnings, 'none' to suppress all
+# warnings, or a space delimited list of some subset of
+# 'warning_categories' to display only the listed warnings.
+opt_warning_types=all
+
+
+## -------------------- ##
+## Resource management. ##
+## -------------------- ##
+
+# This section contains definitions for functions that each ensure a
+# particular resource (a file, or a non-empty configuration variable for
+# example) is available, and if appropriate to extract default values
+# from pertinent package files. Call them using their associated
+# 'require_*' variable to ensure that they are executed, at most, once.
+#
+# It's entirely deliberate that calling these functions can set
+# variables that don't obey the namespace limitations obeyed by the rest
+# of this file, in order that that they be as useful as possible to
+# callers.
+
+
+# require_term_colors
+# -------------------
+# Allow display of bold text on terminals that support it.
+require_term_colors=func_require_term_colors
+func_require_term_colors ()
+{
+    $debug_cmd
+
+    test -t 1 && {
+      # COLORTERM and USE_ANSI_COLORS environment variables take
+      # precedence, because most terminfo databases neglect to describe
+      # whether color sequences are supported.
+      test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+
+      if test 1 = "$USE_ANSI_COLORS"; then
+        # Standard ANSI escape sequences
+        tc_reset=''
+        tc_bold='';   tc_standout=''
+        tc_red='';   tc_green=''
+        tc_blue='';  tc_cyan=''
+      else
+        # Otherwise trust the terminfo database after all.
+        test -n "`tput sgr0 2>/dev/null`" && {
+          tc_reset=`tput sgr0`
+          test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+          tc_standout=$tc_bold
+          test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+          test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
+          test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
+          test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+          test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+        }
+      fi
+    }
 
-    # A bug in bash halts the script if the last line of a function
-    # fails when set -e is in force, so we need another command to
-    # work around that:
-    :
+    require_term_colors=:
 }
 
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*"
-}
 
-# func_error arg...
-# Echo program name prefixed message to standard error.
-func_error ()
-{
-    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
-}
+## ----------------- ##
+## Function library. ##
+## ----------------- ##
 
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
-    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+# This section contains a variety of useful functions to call in your
+# scripts. Take note of the portable wrappers for features provided by
+# some modern shells, which will fall back to slower equivalents on
+# less featureful shells.
 
-    # bash bug again:
-    :
-}
 
-# func_fatal_error arg...
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
-{
-    func_error ${1+"$@"}
-    exit $EXIT_FAILURE
-}
+# func_append VAR VALUE
+# ---------------------
+# Append VALUE onto the existing contents of VAR.
 
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
-    func_error ${1+"$@"}
-    func_fatal_error "$help"
-}
-help="Try \`$progname --help' for more information."  ## default
+  # We should try to minimise forks, especially on Windows where they are
+  # unreasonably slow, so skip the feature probes when bash or zsh are
+  # being used:
+  if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
+    : ${_G_HAVE_ARITH_OP="yes"}
+    : ${_G_HAVE_XSI_OPS="yes"}
+    # The += operator was introduced in bash 3.1
+    case $BASH_VERSION in
+      [12].* | 3.0 | 3.0*) ;;
+      *)
+        : ${_G_HAVE_PLUSEQ_OP="yes"}
+        ;;
+    esac
+  fi
 
+  # _G_HAVE_PLUSEQ_OP
+  # Can be empty, in which case the shell is probed, "yes" if += is
+  # useable or anything else if it does not work.
+  test -z "$_G_HAVE_PLUSEQ_OP" \
+    && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
+    && _G_HAVE_PLUSEQ_OP=yes
+
+if test yes = "$_G_HAVE_PLUSEQ_OP"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_append ()
+  {
+    $debug_cmd
+
+    eval "$1+=\$2"
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_append ()
+  {
+    $debug_cmd
+
+    eval "$1=\$$1\$2"
+  }
+fi
+
+
+# func_append_quoted VAR VALUE
+# ----------------------------
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+if test yes = "$_G_HAVE_PLUSEQ_OP"; then
+  eval 'func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_for_eval "$2"
+    eval "$1+=\\ \$func_quote_for_eval_result"
+  }'
+else
+  func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_for_eval "$2"
+    eval "$1=\$$1\\ \$func_quote_for_eval_result"
+  }
+fi
+
+
+# func_append_uniq VAR VALUE
+# --------------------------
+# Append unique VALUE onto the existing contents of VAR, assuming
+# entries are delimited by the first character of VALUE.  For example:
+#
+#   func_append_uniq options " --another-option option-argument"
+#
+# will only append to $options if " --another-option option-argument "
+# is not already present somewhere in $options already (note spaces at
+# each end implied by leading space in second argument).
+func_append_uniq ()
+{
+    $debug_cmd
+
+    eval _G_current_value='`$ECHO $'$1'`'
+    _G_delim=`expr "$2" : '\(.\)'`
+
+    case $_G_delim$_G_current_value$_G_delim in
+      *"$2$_G_delim"*) ;;
+      *) func_append "$@" ;;
+    esac
+}
+
+
+# func_arith TERM...
+# ------------------
+# Set func_arith_result to the result of evaluating TERMs.
+  test -z "$_G_HAVE_ARITH_OP" \
+    && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+    && _G_HAVE_ARITH_OP=yes
+
+if test yes = "$_G_HAVE_ARITH_OP"; then
+  eval 'func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=$(( $* ))
+  }'
+else
+  func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=`expr "$@"`
+  }
+fi
+
+
+# func_basename FILE
+# ------------------
+# Set func_basename_result to FILE with everything up to and including
+# the last / stripped.
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  # If this shell supports suffix pattern removal, then use it to avoid
+  # forking. Hide the definitions single quotes in case the shell chokes
+  # on unsupported syntax...
+  _b='func_basename_result=${1##*/}'
+  _d='case $1 in
+        */*) func_dirname_result=${1%/*}$2 ;;
+        *  ) func_dirname_result=$3        ;;
+      esac'
+
+else
+  # ...otherwise fall back to using sed.
+  _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
+  _d='func_dirname_result=`$ECHO "$1"  |$SED "$sed_dirname"`
+      if test "X$func_dirname_result" = "X$1"; then
+        func_dirname_result=$3
+      else
+        func_append func_dirname_result "$2"
+      fi'
+fi
+
+eval 'func_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+}'
+
+
+# func_dirname FILE APPEND NONDIR_REPLACEMENT
+# -------------------------------------------
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+eval 'func_dirname ()
+{
+    $debug_cmd
 
-# func_grep expression filename
+    '"$_d"'
+}'
+
+
+# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
+# --------------------------------------------------------
+# Perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# For efficiency, we do not delegate to the functions above but instead
+# duplicate the functionality here.
+eval 'func_dirname_and_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+    '"$_d"'
+}'
+
+
+# func_echo ARG...
+# ----------------
+# Echo program name prefixed message.
+func_echo ()
+{
+    $debug_cmd
+
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname: $_G_line"
+    done
+    IFS=$func_echo_IFS
+}
+
+
+# func_echo_all ARG...
+# --------------------
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+
+# func_echo_infix_1 INFIX ARG...
+# ------------------------------
+# Echo program name, followed by INFIX on the first line, with any
+# additional lines not showing INFIX.
+func_echo_infix_1 ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    _G_infix=$1; shift
+    _G_indent=$_G_infix
+    _G_prefix="$progname: $_G_infix: "
+    _G_message=$*
+
+    # Strip color escape sequences before counting printable length
+    for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
+    do
+      test -n "$_G_tc" && {
+        _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+        _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+      }
+    done
+    _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
+
+    func_echo_infix_1_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_infix_1_IFS
+      $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+      _G_prefix=$_G_indent
+    done
+    IFS=$func_echo_infix_1_IFS
+}
+
+
+# func_error ARG...
+# -----------------
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    func_echo_infix_1 "  $tc_standout${tc_red}error$tc_reset" "$*" >&2
+}
+
+
+# func_fatal_error ARG...
+# -----------------------
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+    $debug_cmd
+
+    func_error "$*"
+    exit $EXIT_FAILURE
+}
+
+
+# func_grep EXPRESSION FILENAME
+# -----------------------------
 # Check whether EXPRESSION matches any line of FILENAME, without output.
 func_grep ()
 {
+    $debug_cmd
+
     $GREP "$1" "$2" >/dev/null 2>&1
 }
 
 
-# func_mkdir_p directory-path
+# func_len STRING
+# ---------------
+# Set func_len_result to the length of STRING. STRING may not
+# start with a hyphen.
+  test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=${#1}
+  }'
+else
+  func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+  }
+fi
+
+
+# func_mkdir_p DIRECTORY-PATH
+# ---------------------------
 # Make sure the entire path to DIRECTORY-PATH is available.
 func_mkdir_p ()
 {
-    my_directory_path="$1"
-    my_dir_list=
+    $debug_cmd
+
+    _G_directory_path=$1
+    _G_dir_list=
 
-    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+    if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
 
-      # Protect directory names starting with `-'
-      case $my_directory_path in
-        -*) my_directory_path="./$my_directory_path" ;;
+      # Protect directory names starting with '-'
+      case $_G_directory_path in
+        -*) _G_directory_path=./$_G_directory_path ;;
       esac
 
       # While some portion of DIR does not yet exist...
-      while test ! -d "$my_directory_path"; do
+      while test ! -d "$_G_directory_path"; do
         # ...make a list in topmost first order.  Use a colon delimited
 	# list incase some portion of path contains whitespace.
-        my_dir_list="$my_directory_path:$my_dir_list"
+        _G_dir_list=$_G_directory_path:$_G_dir_list
 
         # If the last portion added has no slash in it, the list is done
-        case $my_directory_path in */*) ;; *) break ;; esac
+        case $_G_directory_path in */*) ;; *) break ;; esac
 
         # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+        _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
       done
-      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+      _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
 
-      save_mkdir_p_IFS="$IFS"; IFS=':'
-      for my_dir in $my_dir_list; do
-	IFS="$save_mkdir_p_IFS"
-        # mkdir can fail with a `File exist' error if two processes
+      func_mkdir_p_IFS=$IFS; IFS=:
+      for _G_dir in $_G_dir_list; do
+	IFS=$func_mkdir_p_IFS
+        # mkdir can fail with a 'File exist' error if two processes
         # try to create one of the directories concurrently.  Don't
         # stop in that case!
-        $MKDIR "$my_dir" 2>/dev/null || :
+        $MKDIR "$_G_dir" 2>/dev/null || :
       done
-      IFS="$save_mkdir_p_IFS"
+      IFS=$func_mkdir_p_IFS
 
       # Bail out if we (or some other process) failed to create a directory.
-      test -d "$my_directory_path" || \
-        func_fatal_error "Failed to create \`$1'"
+      test -d "$_G_directory_path" || \
+        func_fatal_error "Failed to create '$1'"
     fi
 }
 
 
-# func_mktempdir [string]
+# func_mktempdir [BASENAME]
+# -------------------------
 # Make a temporary directory that won't clash with other running
 # libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
+# given, BASENAME is the basename for that directory.
 func_mktempdir ()
 {
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
+    $debug_cmd
+
+    _G_template=${TMPDIR-/tmp}/${1-$progname}
 
-    if test "$opt_dry_run" = ":"; then
+    if test : = "$opt_dry_run"; then
       # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
+      _G_tmpdir=$_G_template-$$
     else
 
       # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+      _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
 
-      if test ! -d "$my_tmpdir"; then
+      if test ! -d "$_G_tmpdir"; then
         # Failing that, at least try and use $RANDOM to avoid a race
-        my_tmpdir="${my_template}-${RANDOM-0}$$"
+        _G_tmpdir=$_G_template-${RANDOM-0}$$
+
+        func_mktempdir_umask=`umask`
+        umask 0077
+        $MKDIR "$_G_tmpdir"
+        umask $func_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$_G_tmpdir" || \
+        func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
+    fi
+
+    $ECHO "$_G_tmpdir"
+}
+
+
+# func_normal_abspath PATH
+# ------------------------
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+func_normal_abspath ()
+{
+    $debug_cmd
+
+    # These SED scripts presuppose an absolute path with a trailing slash.
+    _G_pathcar='s|^/\([^/]*\).*$|\1|'
+    _G_pathcdr='s|^/[^/]*||'
+    _G_removedotparts=':dotsl
+		s|/\./|/|g
+		t dotsl
+		s|/\.$|/|'
+    _G_collapseslashes='s|/\{1,\}|/|g'
+    _G_finalslash='s|/*$|/|'
+
+    # Start from root dir and reassemble the path.
+    func_normal_abspath_result=
+    func_normal_abspath_tpath=$1
+    func_normal_abspath_altnamespace=
+    case $func_normal_abspath_tpath in
+      "")
+        # Empty path, that just means $cwd.
+        func_stripname '' '/' "`pwd`"
+        func_normal_abspath_result=$func_stripname_result
+        return
+        ;;
+      # The next three entries are used to spot a run of precisely
+      # two leading slashes without using negated character classes;
+      # we take advantage of case's first-match behaviour.
+      ///*)
+        # Unusual form of absolute path, do nothing.
+        ;;
+      //*)
+        # Not necessarily an ordinary path; POSIX reserves leading '//'
+        # and for example Cygwin uses it to access remote file shares
+        # over CIFS/SMB, so we conserve a leading double slash if found.
+        func_normal_abspath_altnamespace=/
+        ;;
+      /*)
+        # Absolute path, do nothing.
+        ;;
+      *)
+        # Relative path, prepend $cwd.
+        func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+        ;;
+    esac
+
+    # Cancel out all the simple stuff to save iterations.  We also want
+    # the path to end with a slash for ease of parsing, so make sure
+    # there is one (and only one) here.
+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
+    while :; do
+      # Processed it all yet?
+      if test / = "$func_normal_abspath_tpath"; then
+        # If we ascended to the root using ".." the result may be empty now.
+        if test -z "$func_normal_abspath_result"; then
+          func_normal_abspath_result=/
+        fi
+        break
+      fi
+      func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcar"`
+      func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcdr"`
+      # Figure out what to do with it
+      case $func_normal_abspath_tcomponent in
+        "")
+          # Trailing empty path component, ignore it.
+          ;;
+        ..)
+          # Parent dir; strip last assembled component from result.
+          func_dirname "$func_normal_abspath_result"
+          func_normal_abspath_result=$func_dirname_result
+          ;;
+        *)
+          # Actual path component, append it.
+          func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
+          ;;
+      esac
+    done
+    # Restore leading double-slash if one was found on entry.
+    func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+
+# func_notquiet ARG...
+# --------------------
+# Echo program name prefixed message only when not in quiet mode.
+func_notquiet ()
+{
+    $debug_cmd
+
+    $opt_quiet || func_echo ${1+"$@"}
+
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
+}
+
+
+# func_relative_path SRCDIR DSTDIR
+# --------------------------------
+# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
+func_relative_path ()
+{
+    $debug_cmd
+
+    func_relative_path_result=
+    func_normal_abspath "$1"
+    func_relative_path_tlibdir=$func_normal_abspath_result
+    func_normal_abspath "$2"
+    func_relative_path_tbindir=$func_normal_abspath_result
+
+    # Ascend the tree starting from libdir
+    while :; do
+      # check if we have found a prefix of bindir
+      case $func_relative_path_tbindir in
+        $func_relative_path_tlibdir)
+          # found an exact match
+          func_relative_path_tcancelled=
+          break
+          ;;
+        $func_relative_path_tlibdir*)
+          # found a matching prefix
+          func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+          func_relative_path_tcancelled=$func_stripname_result
+          if test -z "$func_relative_path_result"; then
+            func_relative_path_result=.
+          fi
+          break
+          ;;
+        *)
+          func_dirname $func_relative_path_tlibdir
+          func_relative_path_tlibdir=$func_dirname_result
+          if test -z "$func_relative_path_tlibdir"; then
+            # Have to descend all the way to the root!
+            func_relative_path_result=../$func_relative_path_result
+            func_relative_path_tcancelled=$func_relative_path_tbindir
+            break
+          fi
+          func_relative_path_result=../$func_relative_path_result
+          ;;
+      esac
+    done
+
+    # Now calculate path; take care to avoid doubling-up slashes.
+    func_stripname '' '/' "$func_relative_path_result"
+    func_relative_path_result=$func_stripname_result
+    func_stripname '/' '/' "$func_relative_path_tcancelled"
+    if test -n "$func_stripname_result"; then
+      func_append func_relative_path_result "/$func_stripname_result"
+    fi
+
+    # Normalisation. If bindir is libdir, return '.' else relative path.
+    if test -n "$func_relative_path_result"; then
+      func_stripname './' '' "$func_relative_path_result"
+      func_relative_path_result=$func_stripname_result
+    fi
+
+    test -n "$func_relative_path_result" || func_relative_path_result=.
+
+    :
+}
+
+
+# func_quote_for_eval ARG...
+# --------------------------
+# Aesthetically quote ARGs to be evaled later.
+# This function returns two values:
+#   i) func_quote_for_eval_result
+#      double-quoted, suitable for a subsequent eval
+#  ii) func_quote_for_eval_unquoted_result
+#      has all characters that are still active within double
+#      quotes backslashified.
+func_quote_for_eval ()
+{
+    $debug_cmd
+
+    func_quote_for_eval_unquoted_result=
+    func_quote_for_eval_result=
+    while test 0 -lt $#; do
+      case $1 in
+        *[\\\`\"\$]*)
+	  _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+        *)
+          _G_unquoted_arg=$1 ;;
+      esac
+      if test -n "$func_quote_for_eval_unquoted_result"; then
+	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+      else
+        func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+      fi
+
+      case $_G_unquoted_arg in
+        # Double-quote args containing shell metacharacters to delay
+        # word splitting, command substitution and variable expansion
+        # for a subsequent eval.
+        # Many Bourne shells cannot handle close brackets correctly
+        # in scan sets, so we specify it separately.
+        *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+          _G_quoted_arg=\"$_G_unquoted_arg\"
+          ;;
+        *)
+          _G_quoted_arg=$_G_unquoted_arg
+	  ;;
+      esac
+
+      if test -n "$func_quote_for_eval_result"; then
+	func_append func_quote_for_eval_result " $_G_quoted_arg"
+      else
+        func_append func_quote_for_eval_result "$_G_quoted_arg"
+      fi
+      shift
+    done
+}
+
+
+# func_quote_for_expand ARG
+# -------------------------
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+    $debug_cmd
+
+    case $1 in
+      *[\\\`\"]*)
+	_G_arg=`$ECHO "$1" | $SED \
+	    -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
+      *)
+        _G_arg=$1 ;;
+    esac
+
+    case $_G_arg in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting and command substitution for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        _G_arg=\"$_G_arg\"
+        ;;
+    esac
+
+    func_quote_for_expand_result=$_G_arg
+}
+
+
+# func_stripname PREFIX SUFFIX NAME
+# ---------------------------------
+# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
+# 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).
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_stripname ()
+  {
+    $debug_cmd
+
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary variable first.
+    func_stripname_result=$3
+    func_stripname_result=${func_stripname_result#"$1"}
+    func_stripname_result=${func_stripname_result%"$2"}
+  }'
+else
+  func_stripname ()
+  {
+    $debug_cmd
+
+    case $2 in
+      .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
+      *)  func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
+    esac
+  }
+fi
+
+
+# func_show_eval CMD [FAIL_EXP]
+# -----------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+    $debug_cmd
+
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
+
+    func_quote_for_expand "$_G_cmd"
+    eval "func_notquiet $func_quote_for_expand_result"
+
+    $opt_dry_run || {
+      eval "$_G_cmd"
+      _G_status=$?
+      if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
+      fi
+    }
+}
+
+
+# func_show_eval_locale CMD [FAIL_EXP]
+# ------------------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.  Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+    $debug_cmd
+
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
+
+    $opt_quiet || {
+      func_quote_for_expand "$_G_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    $opt_dry_run || {
+      eval "$_G_user_locale
+	    $_G_cmd"
+      _G_status=$?
+      eval "$_G_safe_locale"
+      if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
+      fi
+    }
+}
+
+
+# func_tr_sh
+# ----------
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+    $debug_cmd
+
+    case $1 in
+    [0-9]* | *[!a-zA-Z0-9_]*)
+      func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
+      ;;
+    * )
+      func_tr_sh_result=$1
+      ;;
+    esac
+}
+
+
+# func_verbose ARG...
+# -------------------
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+    $debug_cmd
+
+    $opt_verbose && func_echo "$*"
+
+    :
+}
+
+
+# func_warn_and_continue ARG...
+# -----------------------------
+# Echo program name prefixed warning message to standard error.
+func_warn_and_continue ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
+}
+
+
+# func_warning CATEGORY ARG...
+# ----------------------------
+# Echo program name prefixed warning message to standard error. Warning
+# messages can be filtered according to CATEGORY, where this function
+# elides messages where CATEGORY is not listed in the global variable
+# 'opt_warning_types'.
+func_warning ()
+{
+    $debug_cmd
+
+    # CATEGORY must be in the warning_categories list!
+    case " $warning_categories " in
+      *" $1 "*) ;;
+      *) func_internal_error "invalid warning category '$1'" ;;
+    esac
+
+    _G_category=$1
+    shift
+
+    case " $opt_warning_types " in
+      *" $_G_category "*) $warning_func ${1+"$@"} ;;
+    esac
+}
+
+
+# func_sort_ver VER1 VER2
+# -----------------------
+# 'sort -V' is not generally available.
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+func_sort_ver ()
+{
+    $debug_cmd
+
+    printf '%s\n%s\n' "$1" "$2" \
+      | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+}
+
+# func_lt_ver PREV CURR
+# ---------------------
+# Return true if PREV and CURR are in the correct order according to
+# func_sort_ver, otherwise false.  Use it like this:
+#
+#  func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+func_lt_ver ()
+{
+    $debug_cmd
+
+    test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+#! /bin/sh
+
+# Set a version string for this script.
+scriptversion=2014-01-07.03; # UTC
+
+# A portable, pluggable option parser for Bourne shell.
+# Written by Gary V. Vaughan, 2010
+
+# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# This file is a library for parsing options in your shell scripts along
+# with assorted other useful supporting features that you can make use
+# of too.
+#
+# For the simplest scripts you might need only:
+#
+#   #!/bin/sh
+#   . relative/path/to/funclib.sh
+#   . relative/path/to/options-parser
+#   scriptversion=1.0
+#   func_options ${1+"$@"}
+#   eval set dummy "$func_options_result"; shift
+#   ...rest of your script...
+#
+# In order for the '--version' option to work, you will need to have a
+# suitably formatted comment like the one at the top of this file
+# starting with '# Written by ' and ending with '# warranty; '.
+#
+# For '-h' and '--help' to work, you will also need a one line
+# description of your script's purpose in a comment directly above the
+# '# Written by ' line, like the one at the top of this file.
+#
+# The default options also support '--debug', which will turn on shell
+# execution tracing (see the comment above debug_cmd below for another
+# use), and '--verbose' and the func_verbose function to allow your script
+# to display verbose messages only when your user has specified
+# '--verbose'.
+#
+# After sourcing this file, you can plug processing for additional
+# options by amending the variables from the 'Configuration' section
+# below, and following the instructions in the 'Option parsing'
+# section further down.
+
+## -------------- ##
+## Configuration. ##
+## -------------- ##
+
+# You should override these variables in your script after sourcing this
+# file so that they reflect the customisations you have added to the
+# option parser.
+
+# The usage line for option parsing errors and the start of '-h' and
+# '--help' output messages. You can embed shell variables for delayed
+# expansion at the time the message is displayed, but you will need to
+# quote other shell meta-characters carefully to prevent them being
+# expanded when the contents are evaled.
+usage='$progpath [OPTION]...'
+
+# Short help message in response to '-h' and '--help'.  Add to this or
+# override it after sourcing this library to reflect the full set of
+# options your script accepts.
+usage_message="\
+       --debug        enable verbose shell tracing
+   -W, --warnings=CATEGORY
+                      report the warnings falling in CATEGORY [all]
+   -v, --verbose      verbosely report processing
+       --version      print version information and exit
+   -h, --help         print short or long help message and exit
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+long_help_message="
+Warning categories include:
+       'all'          show all warnings
+       'none'         turn off all the warnings
+       'error'        warnings are treated as fatal errors"
+
+# Help message printed before fatal option parsing errors.
+fatal_help="Try '\$progname --help' for more information."
+
+
+
+## ------------------------- ##
+## Hook function management. ##
+## ------------------------- ##
+
+# This section contains functions for adding, removing, and running hooks
+# to the main code.  A hook is just a named list of of function, that can
+# be run in order later on.
+
+# func_hookable FUNC_NAME
+# -----------------------
+# Declare that FUNC_NAME will run hooks added with
+# 'func_add_hook FUNC_NAME ...'.
+func_hookable ()
+{
+    $debug_cmd
+
+    func_append hookable_fns " $1"
+}
+
+
+# func_add_hook FUNC_NAME HOOK_FUNC
+# ---------------------------------
+# Request that FUNC_NAME call HOOK_FUNC before it returns.  FUNC_NAME must
+# first have been declared "hookable" by a call to 'func_hookable'.
+func_add_hook ()
+{
+    $debug_cmd
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not accept hook functions." ;;
+    esac
+
+    eval func_append ${1}_hooks '" $2"'
+}
+
+
+# func_remove_hook FUNC_NAME HOOK_FUNC
+# ------------------------------------
+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+func_remove_hook ()
+{
+    $debug_cmd
+
+    eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
+}
+
+
+# func_run_hooks FUNC_NAME [ARG]...
+# ---------------------------------
+# Run all hook functions registered to FUNC_NAME.
+# It is assumed that the list of hook functions contains nothing more
+# than a whitespace-delimited list of legal shell function names, and
+# no effort is wasted trying to catch shell meta-characters or preserve
+# whitespace.
+func_run_hooks ()
+{
+    $debug_cmd
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+    esac
+
+    eval _G_hook_fns=\$$1_hooks; shift
+
+    for _G_hook in $_G_hook_fns; do
+      eval $_G_hook '"$@"'
+
+      # store returned options list back into positional
+      # parameters for next 'cmd' execution.
+      eval _G_hook_result=\$${_G_hook}_result
+      eval set dummy "$_G_hook_result"; shift
+    done
+
+    func_quote_for_eval ${1+"$@"}
+    func_run_hooks_result=$func_quote_for_eval_result
+}
+
+
+
+## --------------- ##
+## Option parsing. ##
+## --------------- ##
+
+# In order to add your own option parsing hooks, you must accept the
+# full positional parameter list in your hook function, remove any
+# options that you action, and then pass back the remaining unprocessed
+# options in '<hooked_function_name>_result', escaped suitably for
+# 'eval'.  Like this:
+#
+#    my_options_prep ()
+#    {
+#        $debug_cmd
+#
+#        # Extend the existing usage message.
+#        usage_message=$usage_message'
+#      -s, --silent       don'\''t print informational messages
+#    '
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_options_prep_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_options_prep my_options_prep
+#
+#
+#    my_silent_option ()
+#    {
+#        $debug_cmd
+#
+#        # Note that for efficiency, we parse as many options as we can
+#        # recognise in a loop before passing the remainder back to the
+#        # caller on the first unrecognised argument we encounter.
+#        while test $# -gt 0; do
+#          opt=$1; shift
+#          case $opt in
+#            --silent|-s) opt_silent=: ;;
+#            # Separate non-argument short options:
+#            -s*)         func_split_short_opt "$_G_opt"
+#                         set dummy "$func_split_short_opt_name" \
+#                             "-$func_split_short_opt_arg" ${1+"$@"}
+#                         shift
+#                         ;;
+#            *)            set dummy "$_G_opt" "$*"; shift; break ;;
+#          esac
+#        done
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_silent_option_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_parse_options my_silent_option
+#
+#
+#    my_option_validation ()
+#    {
+#        $debug_cmd
+#
+#        $opt_silent && $opt_verbose && func_fatal_help "\
+#    '--silent' and '--verbose' options are mutually exclusive."
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_option_validation_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_validate_options my_option_validation
+#
+# You'll alse need to manually amend $usage_message to reflect the extra
+# options you parse.  It's preferable to append if you can, so that
+# multiple option parsing hooks can be added safely.
+
+
+# func_options [ARG]...
+# ---------------------
+# All the functions called inside func_options are hookable. See the
+# individual implementations for details.
+func_hookable func_options
+func_options ()
+{
+    $debug_cmd
 
-        save_mktempdir_umask=`umask`
-        umask 0077
-        $MKDIR "$my_tmpdir"
-        umask $save_mktempdir_umask
-      fi
+    func_options_prep ${1+"$@"}
+    eval func_parse_options \
+        ${func_options_prep_result+"$func_options_prep_result"}
+    eval func_validate_options \
+        ${func_parse_options_result+"$func_parse_options_result"}
 
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || \
-        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-    fi
+    eval func_run_hooks func_options \
+        ${func_validate_options_result+"$func_validate_options_result"}
 
-    $ECHO "$my_tmpdir"
+    # save modified positional parameters for caller
+    func_options_result=$func_run_hooks_result
 }
 
 
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
+# func_options_prep [ARG]...
+# --------------------------
+# All initialisations required before starting the option parse loop.
+# Note that when calling hook functions, we pass through the list of
+# positional parameters.  If a hook function modifies that list, and
+# needs to propogate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before
+# returning.
+func_hookable func_options_prep
+func_options_prep ()
 {
-    case $1 in
-      *[\\\`\"\$]*)
-	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
-      *)
-        func_quote_for_eval_unquoted_result="$1" ;;
-    esac
+    $debug_cmd
 
-    case $func_quote_for_eval_unquoted_result in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting, command substitution and and variable
-      # expansion for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
-        ;;
-      *)
-        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
-    esac
+    # Option defaults:
+    opt_verbose=false
+    opt_warning_types=
+
+    func_run_hooks func_options_prep ${1+"$@"}
+
+    # save modified positional parameters for caller
+    func_options_prep_result=$func_run_hooks_result
 }
 
 
-# func_quote_for_expand arg
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
+# func_parse_options [ARG]...
+# ---------------------------
+# The main option parsing loop.
+func_hookable func_parse_options
+func_parse_options ()
 {
-    case $1 in
-      *[\\\`\"]*)
-	my_arg=`$ECHO "$1" | $SED \
-	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
-      *)
-        my_arg="$1" ;;
-    esac
+    $debug_cmd
 
-    case $my_arg in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting and command substitution for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        my_arg="\"$my_arg\""
-        ;;
-    esac
+    func_parse_options_result=
 
-    func_quote_for_expand_result="$my_arg"
-}
+    # this just eases exit handling
+    while test $# -gt 0; do
+      # Defer to hook functions for initial option parsing, so they
+      # get priority in the event of reusing an option name.
+      func_run_hooks func_parse_options ${1+"$@"}
 
+      # Adjust func_parse_options positional parameters to match
+      eval set dummy "$func_run_hooks_result"; shift
 
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.
-func_show_eval ()
-{
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
+      # Break out of the loop if we already parsed every option.
+      test $# -gt 0 || break
 
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --debug|-x)   debug_cmd='set -x'
+                      func_echo "enabling shell trace mode"
+                      $debug_cmd
+                      ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                      set dummy --warnings none ${1+"$@"}
+                      shift
+		      ;;
 
-    if ${opt_dry_run-false}; then :; else
-      eval "$my_cmd"
-      my_status=$?
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
-      fi
-    fi
+        --warnings|--warning|-W)
+                      test $# = 0 && func_missing_arg $_G_opt && break
+                      case " $warning_categories $1" in
+                        *" $1 "*)
+                          # trailing space prevents matching last $1 above
+                          func_append_uniq opt_warning_types " $1"
+                          ;;
+                        *all)
+                          opt_warning_types=$warning_categories
+                          ;;
+                        *none)
+                          opt_warning_types=none
+                          warning_func=:
+                          ;;
+                        *error)
+                          opt_warning_types=$warning_categories
+                          warning_func=func_fatal_error
+                          ;;
+                        *)
+                          func_fatal_error \
+                             "unsupported warning category: '$1'"
+                          ;;
+                      esac
+                      shift
+                      ;;
+
+        --verbose|-v) opt_verbose=: ;;
+        --version)    func_version ;;
+        -\?|-h)       func_usage ;;
+        --help)       func_help ;;
+
+	# Separate optargs to long options (plugins may need this):
+	--*=*)        func_split_equals "$_G_opt"
+	              set dummy "$func_split_equals_lhs" \
+                          "$func_split_equals_rhs" ${1+"$@"}
+                      shift
+                      ;;
+
+       # Separate optargs to short options:
+        -W*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        # Separate non-argument short options:
+        -\?*|-h*|-v*|-x*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "-$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        --)           break ;;
+        -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
+        *)            set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+      esac
+    done
+
+    # save modified positional parameters for caller
+    func_quote_for_eval ${1+"$@"}
+    func_parse_options_result=$func_quote_for_eval_result
 }
 
 
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.  Use the saved locale for evaluation.
-func_show_eval_locale ()
+# func_validate_options [ARG]...
+# ------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+func_hookable func_validate_options
+func_validate_options ()
 {
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
+    $debug_cmd
 
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
+    # Display all warnings if -W was not given.
+    test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
 
-    if ${opt_dry_run-false}; then :; else
-      eval "$lt_user_locale
-	    $my_cmd"
-      my_status=$?
-      eval "$lt_safe_locale"
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
-      fi
-    fi
-}
+    func_run_hooks func_validate_options ${1+"$@"}
 
-# func_tr_sh
-# Turn $1 into a string suitable for a shell variable name.
-# Result is stored in $func_tr_sh_result.  All characters
-# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-# if $1 begins with a digit, a '_' is prepended as well.
-func_tr_sh ()
-{
-  case $1 in
-  [0-9]* | *[!a-zA-Z0-9_]*)
-    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
-    ;;
-  * )
-    func_tr_sh_result=$1
-    ;;
-  esac
+    # Bail if the options were screwed!
+    $exit_cmd $EXIT_FAILURE
+
+    # save modified positional parameters for caller
+    func_validate_options_result=$func_run_hooks_result
 }
 
 
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
-{
-    $opt_debug
 
-    $SED -n '/(C)/!b go
-	:more
-	/\./!{
-	  N
-	  s/\n# / /
-	  b more
-	}
-	:go
-	/^# '$PROGRAM' (GNU /,/# warranty; / {
-        s/^# //
-	s/^# *$//
-        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-        p
-     }' < "$progpath"
-     exit $?
-}
+## ----------------- ##
+## Helper functions. ##
+## ----------------- ##
 
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
+# This section contains the helper functions used by the rest of the
+# hookable option parser framework in ascii-betical order.
+
+
+# func_fatal_help ARG...
+# ----------------------
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
 {
-    $opt_debug
+    $debug_cmd
 
-    $SED -n '/^# Usage:/,/^#  *.*--help/ {
-        s/^# //
-	s/^# *$//
-	s/\$progname/'$progname'/
-	p
-    }' < "$progpath"
-    echo
-    $ECHO "run \`$progname --help | more' for full usage"
-    exit $?
+    eval \$ECHO \""Usage: $usage"\"
+    eval \$ECHO \""$fatal_help"\"
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
 }
 
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
+
+# func_help
+# ---------
+# Echo long help message to standard output and exit.
 func_help ()
 {
-    $opt_debug
+    $debug_cmd
 
-    $SED -n '/^# Usage:/,/# Report bugs to/ {
-	:print
-        s/^# //
-	s/^# *$//
-	s*\$progname*'$progname'*
-	s*\$host*'"$host"'*
-	s*\$SHELL*'"$SHELL"'*
-	s*\$LTCC*'"$LTCC"'*
-	s*\$LTCFLAGS*'"$LTCFLAGS"'*
-	s*\$LD*'"$LD"'*
-	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
-	p
-	d
-     }
-     /^# .* home page:/b print
-     /^# General help using/b print
-     ' < "$progpath"
-    ret=$?
-    if test -z "$1"; then
-      exit $ret
-    fi
+    func_usage_message
+    $ECHO "$long_help_message"
+    exit 0
 }
 
-# func_missing_arg argname
+
+# func_missing_arg ARGNAME
+# ------------------------
 # Echo program name prefixed message to standard error and set global
 # exit_cmd.
 func_missing_arg ()
 {
-    $opt_debug
+    $debug_cmd
 
-    func_error "missing argument for $1."
+    func_error "Missing argument for '$1'."
     exit_cmd=exit
 }
 
 
-# func_split_short_opt shortopt
+# func_split_equals STRING
+# ------------------------
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+# splitting STRING at the '=' sign.
+test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_equals ()
+  {
+      $debug_cmd
+
+      func_split_equals_lhs=${1%%=*}
+      func_split_equals_rhs=${1#*=}
+      test "x$func_split_equals_lhs" = "x$1" \
+        && func_split_equals_rhs=
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_equals ()
+  {
+      $debug_cmd
+
+      func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
+      func_split_equals_rhs=
+      test "x$func_split_equals_lhs" = "x$1" \
+        || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
+  }
+fi #func_split_equals
+
+
+# func_split_short_opt SHORTOPT
+# -----------------------------
 # Set func_split_short_opt_name and func_split_short_opt_arg shell
 # variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_short_opt ()
+  {
+      $debug_cmd
+
+      func_split_short_opt_arg=${1#??}
+      func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_short_opt ()
+  {
+      $debug_cmd
+
+      func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
+      func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
+  }
+fi #func_split_short_opt
+
+
+# func_usage
+# ----------
+# Echo short help message to standard output and exit.
+func_usage ()
 {
-    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
-    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+    $debug_cmd
 
-    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
-    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
+    func_usage_message
+    $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+    exit 0
+}
 
 
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
+# func_usage_message
+# ------------------
+# Echo short help message to standard output.
+func_usage_message ()
 {
-    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
-    my_sed_long_arg='1s/^--[^=]*=//'
+    $debug_cmd
 
-    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
-    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
+    eval \$ECHO \""Usage: $usage"\"
+    echo
+    $SED -n 's|^# ||
+        /^Written by/{
+          x;p;x
+        }
+	h
+	/^Written by/q' < "$progpath"
+    echo
+    eval \$ECHO \""$usage_message"\"
+}
 
-exit_cmd=:
 
+# func_version
+# ------------
+# Echo version message to standard output and exit.
+func_version ()
+{
+    $debug_cmd
 
+    printf '%s\n' "$progname $scriptversion"
+    $SED -n '
+        /(C)/!b go
+        :more
+        /\./!{
+          N
+          s|\n# | |
+          b more
+        }
+        :go
+        /^# Written by /,/# warranty; / {
+          s|^# ||
+          s|^# *$||
+          s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
+          p
+        }
+        /^# Written by / {
+          s|^# ||
+          p
+        }
+        /^warranty; /q' < "$progpath"
 
+    exit $?
+}
 
 
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
 
-# Global variables.
-nonopt=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
+# Set a version string.
+scriptversion='(GNU libtool) 2.4.6'
 
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
 
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
+# func_echo ARG...
+# ----------------
+# Libtool also displays the current mode in messages, so override
+# funclib.sh func_echo with this custom definition.
+func_echo ()
 {
-    eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
+    $debug_cmd
 
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
-    func_quote_for_eval "${2}"
-    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
+    done
+    IFS=$func_echo_IFS
+}
 
 
-# func_arith arithmetic-term...
-func_arith ()
+# func_warning ARG...
+# -------------------
+# Libtool warnings are not categorized, so override funclib.sh
+# func_warning with this simpler definition.
+func_warning ()
 {
-    func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
+    $debug_cmd
 
+    $warning_func ${1+"$@"}
+}
 
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
 
+## ---------------- ##
+## Options parsing. ##
+## ---------------- ##
+
+# Hook in the functions to make sure our own options are parsed during
+# the option parsing loop.
+
+usage='$progpath [OPTION]... [MODE-ARG]...'
+
+# Short help message in response to '-h'.
+usage_message="Options:
+       --config             show all configuration variables
+       --debug              enable verbose shell tracing
+   -n, --dry-run            display commands without modifying any files
+       --features           display basic configuration information and exit
+       --mode=MODE          use operation mode MODE
+       --no-warnings        equivalent to '-Wnone'
+       --preserve-dup-deps  don't remove duplicate dependency libraries
+       --quiet, --silent    don't print informational messages
+       --tag=TAG            use configuration variables from tag TAG
+   -v, --verbose            print more informational messages than default
+       --version            print version information
+   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [all]
+   -h, --help, --help-all   print short, long, or detailed help message
+"
 
-# func_lo2o object
-func_lo2o ()
+# Additional text appended to 'usage_message' in response to '--help'.
+func_help ()
 {
-    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
+    $debug_cmd
 
+    func_usage_message
+    $ECHO "$long_help_message
 
-# func_xform libobj-or-source
-func_xform ()
-{
-    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
+MODE must be one of the following:
+
+       clean           remove files from the build directory
+       compile         compile a source file into a libtool object
+       execute         automatically set library path, then run a program
+       finish          complete the installation of libtool libraries
+       install         install libraries or executables
+       link            create a library or an executable
+       uninstall       remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE.  When passed as first option,
+'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
+Try '$progname --help --mode=MODE' for a more detailed description of MODE.
+
+When reporting a bug, please describe a test case to reproduce it and
+include the following information:
+
+       host-triplet:   $host
+       shell:          $SHELL
+       compiler:       $LTCC
+       compiler flags: $LTCFLAGS
+       linker:         $LD (gnu? $with_gnu_ld)
+       version:        $progname (GNU libtool) 2.4.6
+       automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
+       autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+
+Report bugs to <bug-libtool@gnu.org>.
+GNU libtool home page: <http://www.gnu.org/s/libtool/>.
+General help using GNU software: <http://www.gnu.org/gethelp/>."
+    exit 0
+}
+
+
+# func_lo2o OBJECT-NAME
+# ---------------------
+# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+# object suffix.
+
+lo2o=s/\\.lo\$/.$objext/
+o2lo=s/\\.$objext\$/.lo/
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_lo2o ()
+  {
+    case $1 in
+      *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+      *   ) func_lo2o_result=$1               ;;
+    esac
+  }'
+
+  # func_xform LIBOBJ-OR-SOURCE
+  # ---------------------------
+  # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
+  # suffix to a '.lo' libtool-object suffix.
+  eval 'func_xform ()
+  {
+    func_xform_result=${1%.*}.lo
+  }'
+else
+  # ...otherwise fall back to using sed.
+  func_lo2o ()
+  {
+    func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
+  }
+
+  func_xform ()
+  {
+    func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
+  }
+fi
 
 
-# func_fatal_configuration arg...
+# func_fatal_configuration ARG...
+# -------------------------------
 # Echo program name prefixed message to standard error, followed by
 # a configuration failure hint, and exit.
 func_fatal_configuration ()
 {
-    func_error ${1+"$@"}
-    func_error "See the $PACKAGE documentation for more information."
-    func_fatal_error "Fatal configuration error."
+    func__fatal_error ${1+"$@"} \
+      "See the $PACKAGE documentation for more information." \
+      "Fatal configuration error."
 }
 
 
 # func_config
+# -----------
 # Display the configuration for all the tags in this script.
 func_config ()
 {
@@ -915,17 +2149,19 @@
     exit $?
 }
 
+
 # func_features
+# -------------
 # Display the features supported by this script.
 func_features ()
 {
     echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
+    if test yes = "$build_libtool_libs"; then
       echo "enable shared libraries"
     else
       echo "disable shared libraries"
     fi
-    if test "$build_old_libs" = yes; then
+    if test yes = "$build_old_libs"; then
       echo "enable static libraries"
     else
       echo "disable static libraries"
@@ -934,289 +2170,297 @@
     exit $?
 }
 
-# func_enable_tag tagname
+
+# func_enable_tag TAGNAME
+# -----------------------
 # Verify that TAGNAME is valid, and either flag an error and exit, or
 # enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
 # variable here.
 func_enable_tag ()
 {
-  # Global variable:
-  tagname="$1"
+    # Global variable:
+    tagname=$1
 
-  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-  sed_extractcf="/$re_begincf/,/$re_endcf/p"
-
-  # Validate tagname.
-  case $tagname in
-    *[!-_A-Za-z0-9,/]*)
-      func_fatal_error "invalid tag name: $tagname"
-      ;;
-  esac
+    re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+    re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+    sed_extractcf=/$re_begincf/,/$re_endcf/p
+
+    # Validate tagname.
+    case $tagname in
+      *[!-_A-Za-z0-9,/]*)
+        func_fatal_error "invalid tag name: $tagname"
+        ;;
+    esac
 
-  # Don't test for the "default" C tag, as we know it's
-  # there but not specially marked.
-  case $tagname in
-    CC) ;;
+    # Don't test for the "default" C tag, as we know it's
+    # there but not specially marked.
+    case $tagname in
+        CC) ;;
     *)
-      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-	taglist="$taglist $tagname"
+        if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	  taglist="$taglist $tagname"
 
-	# Evaluate the configuration.  Be careful to quote the path
-	# and the sed script, to avoid splitting on whitespace, but
-	# also don't use non-portable quotes within backquotes within
-	# quotes we have to do it in 2 steps:
-	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-	eval "$extractedcf"
-      else
-	func_error "ignoring unknown tag $tagname"
-      fi
-      ;;
-  esac
+	  # Evaluate the configuration.  Be careful to quote the path
+	  # and the sed script, to avoid splitting on whitespace, but
+	  # also don't use non-portable quotes within backquotes within
+	  # quotes we have to do it in 2 steps:
+	  extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	  eval "$extractedcf"
+        else
+	  func_error "ignoring unknown tag $tagname"
+        fi
+        ;;
+    esac
 }
 
+
 # func_check_version_match
+# ------------------------
 # Ensure that we are using m4 macros, and libtool script from the same
 # release of libtool.
 func_check_version_match ()
 {
-  if test "$package_revision" != "$macro_revision"; then
-    if test "$VERSION" != "$macro_version"; then
-      if test -z "$macro_version"; then
-        cat >&2 <<_LT_EOF
+    if test "$package_revision" != "$macro_revision"; then
+      if test "$VERSION" != "$macro_version"; then
+        if test -z "$macro_version"; then
+          cat >&2 <<_LT_EOF
 $progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
 $progname: definition of this LT_INIT comes from an older release.
 $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
 $progname: and run autoconf again.
 _LT_EOF
-      else
-        cat >&2 <<_LT_EOF
+        else
+          cat >&2 <<_LT_EOF
 $progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
 $progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
 $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
 $progname: and run autoconf again.
 _LT_EOF
-      fi
-    else
-      cat >&2 <<_LT_EOF
+        fi
+      else
+        cat >&2 <<_LT_EOF
 $progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
 $progname: but the definition of this LT_INIT comes from revision $macro_revision.
 $progname: You should recreate aclocal.m4 with macros from revision $package_revision
 $progname: of $PACKAGE $VERSION and run autoconf again.
 _LT_EOF
-    fi
+      fi
 
-    exit $EXIT_MISMATCH
-  fi
+      exit $EXIT_MISMATCH
+    fi
 }
 
 
-# Shorthand for --mode=foo, only valid as the first argument
-case $1 in
-clean|clea|cle|cl)
-  shift; set dummy --mode clean ${1+"$@"}; shift
-  ;;
-compile|compil|compi|comp|com|co|c)
-  shift; set dummy --mode compile ${1+"$@"}; shift
-  ;;
-execute|execut|execu|exec|exe|ex|e)
-  shift; set dummy --mode execute ${1+"$@"}; shift
-  ;;
-finish|finis|fini|fin|fi|f)
-  shift; set dummy --mode finish ${1+"$@"}; shift
-  ;;
-install|instal|insta|inst|ins|in|i)
-  shift; set dummy --mode install ${1+"$@"}; shift
-  ;;
-link|lin|li|l)
-  shift; set dummy --mode link ${1+"$@"}; shift
-  ;;
-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-  shift; set dummy --mode uninstall ${1+"$@"}; shift
-  ;;
-esac
+# libtool_options_prep [ARG]...
+# -----------------------------
+# Preparation for options parsed by libtool.
+libtool_options_prep ()
+{
+    $debug_mode
 
+    # Option defaults:
+    opt_config=false
+    opt_dlopen=
+    opt_dry_run=false
+    opt_help=false
+    opt_mode=
+    opt_preserve_dup_deps=false
+    opt_quiet=false
 
+    nonopt=
+    preserve_args=
 
-# Option defaults:
-opt_debug=:
-opt_dry_run=false
-opt_config=false
-opt_preserve_dup_deps=false
-opt_features=false
-opt_finish=false
-opt_help=false
-opt_help_all=false
-opt_silent=:
-opt_warning=:
-opt_verbose=:
-opt_silent=false
-opt_verbose=false
+    # Shorthand for --mode=foo, only valid as the first argument
+    case $1 in
+    clean|clea|cle|cl)
+      shift; set dummy --mode clean ${1+"$@"}; shift
+      ;;
+    compile|compil|compi|comp|com|co|c)
+      shift; set dummy --mode compile ${1+"$@"}; shift
+      ;;
+    execute|execut|execu|exec|exe|ex|e)
+      shift; set dummy --mode execute ${1+"$@"}; shift
+      ;;
+    finish|finis|fini|fin|fi|f)
+      shift; set dummy --mode finish ${1+"$@"}; shift
+      ;;
+    install|instal|insta|inst|ins|in|i)
+      shift; set dummy --mode install ${1+"$@"}; shift
+      ;;
+    link|lin|li|l)
+      shift; set dummy --mode link ${1+"$@"}; shift
+      ;;
+    uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+      shift; set dummy --mode uninstall ${1+"$@"}; shift
+      ;;
+    esac
 
+    # Pass back the list of options.
+    func_quote_for_eval ${1+"$@"}
+    libtool_options_prep_result=$func_quote_for_eval_result
+}
+func_add_hook func_options_prep libtool_options_prep
 
-# Parse options once, thoroughly.  This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
-{
-  # this just eases exit handling
-  while test $# -gt 0; do
-    opt="$1"
-    shift
-    case $opt in
-      --debug|-x)	opt_debug='set -x'
-			func_echo "enabling shell trace mode"
-			$opt_debug
-			;;
-      --dry-run|--dryrun|-n)
-			opt_dry_run=:
-			;;
-      --config)
-			opt_config=:
-func_config
-			;;
-      --dlopen|-dlopen)
-			optarg="$1"
-			opt_dlopen="${opt_dlopen+$opt_dlopen
-}$optarg"
-			shift
-			;;
-      --preserve-dup-deps)
-			opt_preserve_dup_deps=:
-			;;
-      --features)
-			opt_features=:
-func_features
-			;;
-      --finish)
-			opt_finish=:
-set dummy --mode finish ${1+"$@"}; shift
-			;;
-      --help)
-			opt_help=:
-			;;
-      --help-all)
-			opt_help_all=:
-opt_help=': help-all'
-			;;
-      --mode)
-			test $# = 0 && func_missing_arg $opt && break
-			optarg="$1"
-			opt_mode="$optarg"
-case $optarg in
-  # Valid mode arguments:
-  clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
-  # Catch anything else as an error
-  *) func_error "invalid argument for $opt"
-     exit_cmd=exit
-     break
-     ;;
-esac
-			shift
-			;;
-      --no-silent|--no-quiet)
-			opt_silent=false
-func_append preserve_args " $opt"
-			;;
-      --no-warning|--no-warn)
-			opt_warning=false
-func_append preserve_args " $opt"
-			;;
-      --no-verbose)
-			opt_verbose=false
-func_append preserve_args " $opt"
-			;;
-      --silent|--quiet)
-			opt_silent=:
-func_append preserve_args " $opt"
-        opt_verbose=false
-			;;
-      --verbose|-v)
-			opt_verbose=:
-func_append preserve_args " $opt"
-opt_silent=false
-			;;
-      --tag)
-			test $# = 0 && func_missing_arg $opt && break
-			optarg="$1"
-			opt_tag="$optarg"
-func_append preserve_args " $opt $optarg"
-func_enable_tag "$optarg"
-			shift
-			;;
-
-      -\?|-h)		func_usage				;;
-      --help)		func_help				;;
-      --version)	func_version				;;
-
-      # Separate optargs to long options:
-      --*=*)
-			func_split_long_opt "$opt"
-			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
-			shift
-			;;
-
-      # Separate non-argument short options:
-      -\?*|-h*|-n*|-v*)
-			func_split_short_opt "$opt"
-			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
-			shift
-			;;
-
-      --)		break					;;
-      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
-      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
-    esac
-  done
 
-  # Validate options:
+# libtool_parse_options [ARG]...
+# ---------------------------------
+# Provide handling for libtool specific options.
+libtool_parse_options ()
+{
+    $debug_cmd
 
-  # save first non-option argument
-  if test "$#" -gt 0; then
-    nonopt="$opt"
-    shift
-  fi
+    # Perform our own loop to consume as many options as possible in
+    # each iteration.
+    while test $# -gt 0; do
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --dry-run|--dryrun|-n)
+                        opt_dry_run=:
+                        ;;
+
+        --config)       func_config ;;
+
+        --dlopen|-dlopen)
+                        opt_dlopen="${opt_dlopen+$opt_dlopen
+}$1"
+                        shift
+                        ;;
+
+        --preserve-dup-deps)
+                        opt_preserve_dup_deps=: ;;
+
+        --features)     func_features ;;
+
+        --finish)       set dummy --mode finish ${1+"$@"}; shift ;;
+
+        --help)         opt_help=: ;;
+
+        --help-all)     opt_help=': help-all' ;;
+
+        --mode)         test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_mode=$1
+                        case $1 in
+                          # Valid mode arguments:
+                          clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+                          # Catch anything else as an error
+                          *) func_error "invalid argument for $_G_opt"
+                             exit_cmd=exit
+                             break
+                             ;;
+                        esac
+                        shift
+                        ;;
+
+        --no-silent|--no-quiet)
+                        opt_quiet=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                        opt_warning=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-verbose)
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --silent|--quiet)
+                        opt_quiet=:
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --tag)          test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_tag=$1
+                        func_append preserve_args " $_G_opt $1"
+                        func_enable_tag "$1"
+                        shift
+                        ;;
+
+        --verbose|-v)   opt_quiet=false
+                        opt_verbose=:
+                        func_append preserve_args " $_G_opt"
+                        ;;
 
-  # preserve --debug
-  test "$opt_debug" = : || func_append preserve_args " --debug"
+	# An option not handled by this hook function:
+        *)		set dummy "$_G_opt" ${1+"$@"};	shift; break  ;;
+      esac
+    done
 
-  case $host in
-    *cygwin* | *mingw* | *pw32* | *cegcc*)
-      # don't eliminate duplications in $postdeps and $predeps
-      opt_duplicate_compiler_generated_deps=:
-      ;;
-    *)
-      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
-      ;;
-  esac
 
-  $opt_help || {
-    # Sanity checks first:
-    func_check_version_match
+    # save modified positional parameters for caller
+    func_quote_for_eval ${1+"$@"}
+    libtool_parse_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_parse_options libtool_parse_options
 
-    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-      func_fatal_configuration "not configured to build any kind of library"
-    fi
 
-    # Darwin sucks
-    eval std_shrext=\"$shrext_cmds\"
 
-    # Only execute mode is allowed to have -dlopen flags.
-    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
-      func_error "unrecognized option \`-dlopen'"
-      $ECHO "$help" 1>&2
-      exit $EXIT_FAILURE
+# libtool_validate_options [ARG]...
+# ---------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+libtool_validate_options ()
+{
+    # save first non-option argument
+    if test 0 -lt $#; then
+      nonopt=$1
+      shift
     fi
 
-    # Change the help message to a mode-specific one.
-    generic_help="$help"
-    help="Try \`$progname --help --mode=$opt_mode' for more information."
-  }
+    # preserve --debug
+    test : = "$debug_cmd" || func_append preserve_args " --debug"
+
+    case $host in
+      # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+      # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+      *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+        # don't eliminate duplications in $postdeps and $predeps
+        opt_duplicate_compiler_generated_deps=:
+        ;;
+      *)
+        opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+        ;;
+    esac
 
+    $opt_help || {
+      # Sanity checks first:
+      func_check_version_match
+
+      test yes != "$build_libtool_libs" \
+        && test yes != "$build_old_libs" \
+        && func_fatal_configuration "not configured to build any kind of library"
+
+      # Darwin sucks
+      eval std_shrext=\"$shrext_cmds\"
+
+      # Only execute mode is allowed to have -dlopen flags.
+      if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
+        func_error "unrecognized option '-dlopen'"
+        $ECHO "$help" 1>&2
+        exit $EXIT_FAILURE
+      fi
+
+      # Change the help message to a mode-specific one.
+      generic_help=$help
+      help="Try '$progname --help --mode=$opt_mode' for more information."
+    }
 
-  # Bail if the options were screwed
-  $exit_cmd $EXIT_FAILURE
+    # Pass back the unparsed argument list
+    func_quote_for_eval ${1+"$@"}
+    libtool_validate_options_result=$func_quote_for_eval_result
 }
+func_add_hook func_validate_options libtool_validate_options
+
 
+# Process options as early as possible so that --help and --version
+# can return quickly.
+func_options ${1+"$@"}
+eval set dummy "$func_options_result"; shift
 
 
 
@@ -1224,24 +2468,52 @@
 ##    Main.    ##
 ## ----------- ##
 
+magic='%%%MAGIC variable%%%'
+magic_exe='%%%MAGIC EXE variable%%%'
+
+# Global variables.
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# func_generated_by_libtool
+# True iff stdin has been generated by Libtool. This function is only
+# a basic sanity check; it will hardly flush out determined imposters.
+func_generated_by_libtool_p ()
+{
+  $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
 # func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
 # This function is only a basic sanity check; it will hardly flush out
 # determined imposters.
 func_lalib_p ()
 {
     test -f "$1" &&
-      $SED -e 4q "$1" 2>/dev/null \
-        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+      $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
 }
 
 # func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
 # This function implements the same check as func_lalib_p without
 # resorting to external programs.  To this end, it redirects stdin and
 # closes it afterwards, without saving the original file descriptor.
 # As a safety measure, use it only where a negative result would be
-# fatal anyway.  Works if `file' does not exist.
+# fatal anyway.  Works if 'file' does not exist.
 func_lalib_unsafe_p ()
 {
     lalib_p=no
@@ -1249,13 +2521,13 @@
 	for lalib_p_l in 1 2 3 4
 	do
 	    read lalib_p_line
-	    case "$lalib_p_line" in
+	    case $lalib_p_line in
 		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
 	    esac
 	done
 	exec 0<&5 5<&-
     fi
-    test "$lalib_p" = yes
+    test yes = "$lalib_p"
 }
 
 # func_ltwrapper_script_p file
@@ -1264,7 +2536,8 @@
 # determined imposters.
 func_ltwrapper_script_p ()
 {
-    func_lalib_p "$1"
+    test -f "$1" &&
+      $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
 }
 
 # func_ltwrapper_executable_p file
@@ -1289,7 +2562,7 @@
 {
     func_dirname_and_basename "$1" "" "."
     func_stripname '' '.exe' "$func_basename_result"
-    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+    func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
 }
 
 # func_ltwrapper_p file
@@ -1308,11 +2581,13 @@
 # FAIL_CMD may read-access the current command in variable CMD!
 func_execute_cmds ()
 {
-    $opt_debug
+    $debug_cmd
+
     save_ifs=$IFS; IFS='~'
     for cmd in $1; do
-      IFS=$save_ifs
+      IFS=$sp$nl
       eval cmd=\"$cmd\"
+      IFS=$save_ifs
       func_show_eval "$cmd" "${2-:}"
     done
     IFS=$save_ifs
@@ -1324,10 +2599,11 @@
 # Note that it is not necessary on cygwin/mingw to append a dot to
 # FILE even if both FILE and FILE.exe exist: automatic-append-.exe
 # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
+# 'FILE.' does not work on cygwin managed mounts.
 func_source ()
 {
-    $opt_debug
+    $debug_cmd
+
     case $1 in
     */* | *\\*)	. "$1" ;;
     *)		. "./$1" ;;
@@ -1354,10 +2630,10 @@
 # store the result into func_replace_sysroot_result.
 func_replace_sysroot ()
 {
-  case "$lt_sysroot:$1" in
+  case $lt_sysroot:$1 in
   ?*:"$lt_sysroot"*)
     func_stripname "$lt_sysroot" '' "$1"
-    func_replace_sysroot_result="=$func_stripname_result"
+    func_replace_sysroot_result='='$func_stripname_result
     ;;
   *)
     # Including no sysroot.
@@ -1374,7 +2650,8 @@
 # arg is usually of the form 'gcc ...'
 func_infer_tag ()
 {
-    $opt_debug
+    $debug_cmd
+
     if test -n "$available_tags" && test -z "$tagname"; then
       CC_quoted=
       for arg in $CC; do
@@ -1393,7 +2670,7 @@
 	for z in $available_tags; do
 	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
 	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
 	    CC_quoted=
 	    for arg in $CC; do
 	      # Double-quote args containing other shell metacharacters.
@@ -1418,7 +2695,7 @@
 	# line option must be used.
 	if test -z "$tagname"; then
 	  func_echo "unable to infer tagged configuration"
-	  func_fatal_error "specify a tag with \`--tag'"
+	  func_fatal_error "specify a tag with '--tag'"
 #	else
 #	  func_verbose "using $tagname tagged configuration"
 	fi
@@ -1434,15 +2711,15 @@
 # but don't create it if we're doing a dry run.
 func_write_libtool_object ()
 {
-    write_libobj=${1}
-    if test "$build_libtool_libs" = yes; then
-      write_lobj=\'${2}\'
+    write_libobj=$1
+    if test yes = "$build_libtool_libs"; then
+      write_lobj=\'$2\'
     else
       write_lobj=none
     fi
 
-    if test "$build_old_libs" = yes; then
-      write_oldobj=\'${3}\'
+    if test yes = "$build_old_libs"; then
+      write_oldobj=\'$3\'
     else
       write_oldobj=none
     fi
@@ -1450,7 +2727,7 @@
     $opt_dry_run || {
       cat >${write_libobj}T <<EOF
 # $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -1462,7 +2739,7 @@
 non_pic_object=$write_oldobj
 
 EOF
-      $MV "${write_libobj}T" "${write_libobj}"
+      $MV "${write_libobj}T" "$write_libobj"
     }
 }
 
@@ -1482,8 +2759,9 @@
 # be empty on error (or when ARG is empty)
 func_convert_core_file_wine_to_w32 ()
 {
-  $opt_debug
-  func_convert_core_file_wine_to_w32_result="$1"
+  $debug_cmd
+
+  func_convert_core_file_wine_to_w32_result=$1
   if test -n "$1"; then
     # Unfortunately, winepath does not exit with a non-zero error code, so we
     # are forced to check the contents of stdout. On the other hand, if the
@@ -1491,9 +2769,9 @@
     # *an error message* to stdout. So we must check for both error code of
     # zero AND non-empty stdout, which explains the odd construction:
     func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
-    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+    if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
       func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-        $SED -e "$lt_sed_naive_backslashify"`
+        $SED -e "$sed_naive_backslashify"`
     else
       func_convert_core_file_wine_to_w32_result=
     fi
@@ -1514,18 +2792,19 @@
 # are convertible, then the result may be empty.
 func_convert_core_path_wine_to_w32 ()
 {
-  $opt_debug
+  $debug_cmd
+
   # unfortunately, winepath doesn't convert paths, only file names
-  func_convert_core_path_wine_to_w32_result=""
+  func_convert_core_path_wine_to_w32_result=
   if test -n "$1"; then
     oldIFS=$IFS
     IFS=:
     for func_convert_core_path_wine_to_w32_f in $1; do
       IFS=$oldIFS
       func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
-      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+      if test -n "$func_convert_core_file_wine_to_w32_result"; then
         if test -z "$func_convert_core_path_wine_to_w32_result"; then
-          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+          func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
         else
           func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
         fi
@@ -1554,7 +2833,8 @@
 # environment variable; do not put it in $PATH.
 func_cygpath ()
 {
-  $opt_debug
+  $debug_cmd
+
   if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
     func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
     if test "$?" -ne 0; then
@@ -1563,7 +2843,7 @@
     fi
   else
     func_cygpath_result=
-    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+    func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
   fi
 }
 #end: func_cygpath
@@ -1574,10 +2854,11 @@
 # result in func_convert_core_msys_to_w32_result.
 func_convert_core_msys_to_w32 ()
 {
-  $opt_debug
+  $debug_cmd
+
   # awkward: cmd appends spaces to result
   func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+    $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
 }
 #end: func_convert_core_msys_to_w32
 
@@ -1588,13 +2869,14 @@
 # func_to_host_file_result to ARG1).
 func_convert_file_check ()
 {
-  $opt_debug
-  if test -z "$2" && test -n "$1" ; then
+  $debug_cmd
+
+  if test -z "$2" && test -n "$1"; then
     func_error "Could not determine host file name corresponding to"
-    func_error "  \`$1'"
+    func_error "  '$1'"
     func_error "Continuing, but uninstalled executables may not work."
     # Fallback:
-    func_to_host_file_result="$1"
+    func_to_host_file_result=$1
   fi
 }
 # end func_convert_file_check
@@ -1606,10 +2888,11 @@
 # func_to_host_file_result to a simplistic fallback value (see below).
 func_convert_path_check ()
 {
-  $opt_debug
+  $debug_cmd
+
   if test -z "$4" && test -n "$3"; then
     func_error "Could not determine the host path corresponding to"
-    func_error "  \`$3'"
+    func_error "  '$3'"
     func_error "Continuing, but uninstalled executables may not work."
     # Fallback.  This is a deliberately simplistic "conversion" and
     # should not be "improved".  See libtool.info.
@@ -1618,7 +2901,7 @@
       func_to_host_path_result=`echo "$3" |
         $SED -e "$lt_replace_pathsep_chars"`
     else
-      func_to_host_path_result="$3"
+      func_to_host_path_result=$3
     fi
   fi
 }
@@ -1630,9 +2913,10 @@
 # and appending REPL if ORIG matches BACKPAT.
 func_convert_path_front_back_pathsep ()
 {
-  $opt_debug
+  $debug_cmd
+
   case $4 in
-  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+  $1 ) func_to_host_path_result=$3$func_to_host_path_result
     ;;
   esac
   case $4 in
@@ -1646,7 +2930,7 @@
 ##################################################
 # $build to $host FILE NAME CONVERSION FUNCTIONS #
 ##################################################
-# invoked via `$to_host_file_cmd ARG'
+# invoked via '$to_host_file_cmd ARG'
 #
 # In each case, ARG is the path to be converted from $build to $host format.
 # Result will be available in $func_to_host_file_result.
@@ -1657,7 +2941,8 @@
 # in func_to_host_file_result.
 func_to_host_file ()
 {
-  $opt_debug
+  $debug_cmd
+
   $to_host_file_cmd "$1"
 }
 # end func_to_host_file
@@ -1669,7 +2954,8 @@
 # in (the comma separated) LAZY, no conversion takes place.
 func_to_tool_file ()
 {
-  $opt_debug
+  $debug_cmd
+
   case ,$2, in
     *,"$to_tool_file_cmd",*)
       func_to_tool_file_result=$1
@@ -1687,7 +2973,7 @@
 # Copy ARG to func_to_host_file_result.
 func_convert_file_noop ()
 {
-  func_to_host_file_result="$1"
+  func_to_host_file_result=$1
 }
 # end func_convert_file_noop
 
@@ -1698,11 +2984,12 @@
 # func_to_host_file_result.
 func_convert_file_msys_to_w32 ()
 {
-  $opt_debug
-  func_to_host_file_result="$1"
+  $debug_cmd
+
+  func_to_host_file_result=$1
   if test -n "$1"; then
     func_convert_core_msys_to_w32 "$1"
-    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result=$func_convert_core_msys_to_w32_result
   fi
   func_convert_file_check "$1" "$func_to_host_file_result"
 }
@@ -1714,8 +3001,9 @@
 # func_to_host_file_result.
 func_convert_file_cygwin_to_w32 ()
 {
-  $opt_debug
-  func_to_host_file_result="$1"
+  $debug_cmd
+
+  func_to_host_file_result=$1
   if test -n "$1"; then
     # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
     # LT_CYGPATH in this case.
@@ -1731,11 +3019,12 @@
 # and a working winepath. Returns result in func_to_host_file_result.
 func_convert_file_nix_to_w32 ()
 {
-  $opt_debug
-  func_to_host_file_result="$1"
+  $debug_cmd
+
+  func_to_host_file_result=$1
   if test -n "$1"; then
     func_convert_core_file_wine_to_w32 "$1"
-    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
   fi
   func_convert_file_check "$1" "$func_to_host_file_result"
 }
@@ -1747,12 +3036,13 @@
 # Returns result in func_to_host_file_result.
 func_convert_file_msys_to_cygwin ()
 {
-  $opt_debug
-  func_to_host_file_result="$1"
+  $debug_cmd
+
+  func_to_host_file_result=$1
   if test -n "$1"; then
     func_convert_core_msys_to_w32 "$1"
     func_cygpath -u "$func_convert_core_msys_to_w32_result"
-    func_to_host_file_result="$func_cygpath_result"
+    func_to_host_file_result=$func_cygpath_result
   fi
   func_convert_file_check "$1" "$func_to_host_file_result"
 }
@@ -1765,13 +3055,14 @@
 # in func_to_host_file_result.
 func_convert_file_nix_to_cygwin ()
 {
-  $opt_debug
-  func_to_host_file_result="$1"
+  $debug_cmd
+
+  func_to_host_file_result=$1
   if test -n "$1"; then
     # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
     func_convert_core_file_wine_to_w32 "$1"
     func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
-    func_to_host_file_result="$func_cygpath_result"
+    func_to_host_file_result=$func_cygpath_result
   fi
   func_convert_file_check "$1" "$func_to_host_file_result"
 }
@@ -1781,7 +3072,7 @@
 #############################################
 # $build to $host PATH CONVERSION FUNCTIONS #
 #############################################
-# invoked via `$to_host_path_cmd ARG'
+# invoked via '$to_host_path_cmd ARG'
 #
 # In each case, ARG is the path to be converted from $build to $host format.
 # The result will be available in $func_to_host_path_result.
@@ -1805,10 +3096,11 @@
 to_host_path_cmd=
 func_init_to_host_path_cmd ()
 {
-  $opt_debug
+  $debug_cmd
+
   if test -z "$to_host_path_cmd"; then
     func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
-    to_host_path_cmd="func_convert_path_${func_stripname_result}"
+    to_host_path_cmd=func_convert_path_$func_stripname_result
   fi
 }
 
@@ -1818,7 +3110,8 @@
 # in func_to_host_path_result.
 func_to_host_path ()
 {
-  $opt_debug
+  $debug_cmd
+
   func_init_to_host_path_cmd
   $to_host_path_cmd "$1"
 }
@@ -1829,7 +3122,7 @@
 # Copy ARG to func_to_host_path_result.
 func_convert_path_noop ()
 {
-  func_to_host_path_result="$1"
+  func_to_host_path_result=$1
 }
 # end func_convert_path_noop
 
@@ -1840,8 +3133,9 @@
 # func_to_host_path_result.
 func_convert_path_msys_to_w32 ()
 {
-  $opt_debug
-  func_to_host_path_result="$1"
+  $debug_cmd
+
+  func_to_host_path_result=$1
   if test -n "$1"; then
     # Remove leading and trailing path separator characters from ARG.  MSYS
     # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
@@ -1849,7 +3143,7 @@
     func_stripname : : "$1"
     func_to_host_path_tmp1=$func_stripname_result
     func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result=$func_convert_core_msys_to_w32_result
     func_convert_path_check : ";" \
       "$func_to_host_path_tmp1" "$func_to_host_path_result"
     func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1863,8 +3157,9 @@
 # func_to_host_file_result.
 func_convert_path_cygwin_to_w32 ()
 {
-  $opt_debug
-  func_to_host_path_result="$1"
+  $debug_cmd
+
+  func_to_host_path_result=$1
   if test -n "$1"; then
     # See func_convert_path_msys_to_w32:
     func_stripname : : "$1"
@@ -1883,14 +3178,15 @@
 # a working winepath.  Returns result in func_to_host_file_result.
 func_convert_path_nix_to_w32 ()
 {
-  $opt_debug
-  func_to_host_path_result="$1"
+  $debug_cmd
+
+  func_to_host_path_result=$1
   if test -n "$1"; then
     # See func_convert_path_msys_to_w32:
     func_stripname : : "$1"
     func_to_host_path_tmp1=$func_stripname_result
     func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+    func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
     func_convert_path_check : ";" \
       "$func_to_host_path_tmp1" "$func_to_host_path_result"
     func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1904,15 +3200,16 @@
 # Returns result in func_to_host_file_result.
 func_convert_path_msys_to_cygwin ()
 {
-  $opt_debug
-  func_to_host_path_result="$1"
+  $debug_cmd
+
+  func_to_host_path_result=$1
   if test -n "$1"; then
     # See func_convert_path_msys_to_w32:
     func_stripname : : "$1"
     func_to_host_path_tmp1=$func_stripname_result
     func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
     func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
-    func_to_host_path_result="$func_cygpath_result"
+    func_to_host_path_result=$func_cygpath_result
     func_convert_path_check : : \
       "$func_to_host_path_tmp1" "$func_to_host_path_result"
     func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1927,8 +3224,9 @@
 # func_to_host_file_result.
 func_convert_path_nix_to_cygwin ()
 {
-  $opt_debug
-  func_to_host_path_result="$1"
+  $debug_cmd
+
+  func_to_host_path_result=$1
   if test -n "$1"; then
     # Remove leading and trailing path separator characters from
     # ARG. msys behavior is inconsistent here, cygpath turns them
@@ -1937,7 +3235,7 @@
     func_to_host_path_tmp1=$func_stripname_result
     func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
     func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
-    func_to_host_path_result="$func_cygpath_result"
+    func_to_host_path_result=$func_cygpath_result
     func_convert_path_check : : \
       "$func_to_host_path_tmp1" "$func_to_host_path_result"
     func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1946,13 +3244,31 @@
 # end func_convert_path_nix_to_cygwin
 
 
+# func_dll_def_p FILE
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with _LT_DLL_DEF_P in libtool.m4
+func_dll_def_p ()
+{
+  $debug_cmd
+
+  func_dll_def_p_tmp=`$SED -n \
+    -e 's/^[	 ]*//' \
+    -e '/^\(;.*\)*$/d' \
+    -e 's/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p' \
+    -e q \
+    "$1"`
+  test DEF = "$func_dll_def_p_tmp"
+}
+
+
 # func_mode_compile arg...
 func_mode_compile ()
 {
-    $opt_debug
+    $debug_cmd
+
     # Get the compilation command and the source file.
     base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    srcfile=$nonopt  #  always keep a non-empty value in "srcfile"
     suppress_opt=yes
     suppress_output=
     arg_mode=normal
@@ -1965,12 +3281,12 @@
       case $arg_mode in
       arg  )
 	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
+	lastarg=$arg
 	arg_mode=normal
 	;;
 
       target )
-	libobj="$arg"
+	libobj=$arg
 	arg_mode=normal
 	continue
 	;;
@@ -1980,7 +3296,7 @@
 	case $arg in
 	-o)
 	  test -n "$libobj" && \
-	    func_fatal_error "you cannot specify \`-o' more than once"
+	    func_fatal_error "you cannot specify '-o' more than once"
 	  arg_mode=target
 	  continue
 	  ;;
@@ -2009,12 +3325,12 @@
 	  func_stripname '-Wc,' '' "$arg"
 	  args=$func_stripname_result
 	  lastarg=
-	  save_ifs="$IFS"; IFS=','
+	  save_ifs=$IFS; IFS=,
 	  for arg in $args; do
-	    IFS="$save_ifs"
+	    IFS=$save_ifs
 	    func_append_quoted lastarg "$arg"
 	  done
-	  IFS="$save_ifs"
+	  IFS=$save_ifs
 	  func_stripname ' ' '' "$lastarg"
 	  lastarg=$func_stripname_result
 
@@ -2027,8 +3343,8 @@
 	  # Accept the current argument as the source file.
 	  # The previous "srcfile" becomes the current argument.
 	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
+	  lastarg=$srcfile
+	  srcfile=$arg
 	  ;;
 	esac  #  case $arg
 	;;
@@ -2043,13 +3359,13 @@
       func_fatal_error "you must specify an argument for -Xcompile"
       ;;
     target)
-      func_fatal_error "you must specify a target with \`-o'"
+      func_fatal_error "you must specify a target with '-o'"
       ;;
     *)
       # Get the name of the library object.
       test -z "$libobj" && {
 	func_basename "$srcfile"
-	libobj="$func_basename_result"
+	libobj=$func_basename_result
       }
       ;;
     esac
@@ -2069,7 +3385,7 @@
     case $libobj in
     *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
     *)
-      func_fatal_error "cannot determine name of library object from \`$libobj'"
+      func_fatal_error "cannot determine name of library object from '$libobj'"
       ;;
     esac
 
@@ -2078,8 +3394,8 @@
     for arg in $later; do
       case $arg in
       -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
+	test yes = "$build_libtool_libs" \
+	  || func_fatal_configuration "cannot build a shared library"
 	build_old_libs=no
 	continue
 	;;
@@ -2105,17 +3421,17 @@
     func_quote_for_eval "$libobj"
     test "X$libobj" != "X$func_quote_for_eval_result" \
       && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
-      && func_warning "libobj name \`$libobj' may not contain shell special characters."
+      && func_warning "libobj name '$libobj' may not contain shell special characters."
     func_dirname_and_basename "$obj" "/" ""
-    objname="$func_basename_result"
-    xdir="$func_dirname_result"
-    lobj=${xdir}$objdir/$objname
+    objname=$func_basename_result
+    xdir=$func_dirname_result
+    lobj=$xdir$objdir/$objname
 
     test -z "$base_compile" && \
       func_fatal_help "you must specify a compilation command"
 
     # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
+    if test yes = "$build_old_libs"; then
       removelist="$obj $lobj $libobj ${libobj}T"
     else
       removelist="$lobj $libobj ${libobj}T"
@@ -2127,16 +3443,16 @@
       pic_mode=default
       ;;
     esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+    if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
       # non-PIC code in shared libraries is not supported
       pic_mode=default
     fi
 
     # Calculate the filename of the output object if compiler does
     # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
+    if test no = "$compiler_c_o"; then
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+      lockfile=$output_obj.lock
     else
       output_obj=
       need_locks=no
@@ -2145,12 +3461,12 @@
 
     # Lock this critical section if it is needed
     # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
+    if test yes = "$need_locks"; then
       until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
 	func_echo "Waiting for $lockfile to be removed"
 	sleep 2
       done
-    elif test "$need_locks" = warn; then
+    elif test warn = "$need_locks"; then
       if test -f "$lockfile"; then
 	$ECHO "\
 *** ERROR, $lockfile exists and contains:
@@ -2158,7 +3474,7 @@
 
 This indicates that another process is trying to use the same
 temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
+your compiler does not support '-c' and '-o' together.  If you
 repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
@@ -2180,11 +3496,11 @@
     qsrcfile=$func_quote_for_eval_result
 
     # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
+    if test yes = "$build_libtool_libs"; then
       # Without this assignment, base_compile gets emptied.
       fbsd_hideous_sh_bug=$base_compile
 
-      if test "$pic_mode" != no; then
+      if test no != "$pic_mode"; then
 	command="$base_compile $qsrcfile $pic_flag"
       else
 	# Don't build PIC code
@@ -2201,7 +3517,7 @@
       func_show_eval_locale "$command"	\
           'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
 
-      if test "$need_locks" = warn &&
+      if test warn = "$need_locks" &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 	$ECHO "\
 *** ERROR, $lockfile contains:
@@ -2212,7 +3528,7 @@
 
 This indicates that another process is trying to use the same
 temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
+your compiler does not support '-c' and '-o' together.  If you
 repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
@@ -2228,20 +3544,20 @@
       fi
 
       # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
+      if test yes = "$suppress_opt"; then
 	suppress_output=' >/dev/null 2>&1'
       fi
     fi
 
     # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
+    if test yes = "$build_old_libs"; then
+      if test yes != "$pic_mode"; then
 	# Don't build PIC code
 	command="$base_compile $qsrcfile$pie_flag"
       else
 	command="$base_compile $qsrcfile $pic_flag"
       fi
-      if test "$compiler_c_o" = yes; then
+      if test yes = "$compiler_c_o"; then
 	func_append command " -o $obj"
       fi
 
@@ -2250,7 +3566,7 @@
       func_show_eval_locale "$command" \
         '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
 
-      if test "$need_locks" = warn &&
+      if test warn = "$need_locks" &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 	$ECHO "\
 *** ERROR, $lockfile contains:
@@ -2261,7 +3577,7 @@
 
 This indicates that another process is trying to use the same
 temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
+your compiler does not support '-c' and '-o' together.  If you
 repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
@@ -2281,7 +3597,7 @@
       func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
 
       # Unlock the critical section if it was locked
-      if test "$need_locks" != no; then
+      if test no != "$need_locks"; then
 	removelist=$lockfile
         $RM "$lockfile"
       fi
@@ -2291,7 +3607,7 @@
 }
 
 $opt_help || {
-  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+  test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
 }
 
 func_mode_help ()
@@ -2311,7 +3627,7 @@
 Remove files from the build directory.
 
 RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
 to RM.
 
 If FILE is a libtool library, object or program, all the files associated
@@ -2330,16 +3646,16 @@
   -no-suppress      do not suppress compiler output for multiple passes
   -prefer-pic       try to build PIC objects only
   -prefer-non-pic   try to build non-PIC objects only
-  -shared           do not build a \`.o' file suitable for static linking
-  -static           only build a \`.o' file suitable for static linking
+  -shared           do not build a '.o' file suitable for static linking
+  -static           only build a '.o' file suitable for static linking
   -Wc,FLAG          pass FLAG directly to the compiler
 
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+COMPILE-COMMAND is a command to be used in creating a 'standard' object file
 from the given SOURCEFILE.
 
 The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
+SOURCEFILE, then substituting the C source code suffix '.c' with the
+library object suffix, '.lo'."
         ;;
 
       execute)
@@ -2352,7 +3668,7 @@
 
   -dlopen FILE      add the directory containing FILE to the library path
 
-This mode sets the library path environment variable according to \`-dlopen'
+This mode sets the library path environment variable according to '-dlopen'
 flags.
 
 If any of the ARGS are libtool executable wrappers, then they are translated
@@ -2371,7 +3687,7 @@
 Each LIBDIR is a directory that contains libtool libraries.
 
 The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
+the '--dry-run' option if you just want to see what would be executed."
         ;;
 
       install)
@@ -2381,7 +3697,7 @@
 Install executables or libraries.
 
 INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
+either the 'install' or 'cp' program.
 
 The following components of INSTALL-COMMAND are treated specially:
 
@@ -2407,7 +3723,7 @@
   -avoid-version    do not add a version suffix if possible
   -bindir BINDIR    specify path to binaries directory (for systems where
                     libraries must be found in the PATH setting at runtime)
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlopen FILE      '-dlpreopen' FILE if it cannot be dlopened at runtime
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
@@ -2421,7 +3737,8 @@
   -no-install       link a not-installable executable
   -no-undefined     declare that a library does not refer to external symbols
   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -objectlist FILE  use a list of object files found in FILE to specify objects
+  -os2dllname NAME  force a short DLL name on OS/2 (no effect on other OSes)
   -precious-files-regex REGEX
                     don't remove output files matching REGEX
   -release RELEASE  specify package release information
@@ -2441,20 +3758,20 @@
   -Xlinker FLAG     pass linker-specific FLAG directly to the linker
   -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
 
-All other options (arguments beginning with \`-') are ignored.
+All other options (arguments beginning with '-') are ignored.
 
-Every other argument is treated as a filename.  Files ending in \`.la' are
+Every other argument is treated as a filename.  Files ending in '.la' are
 treated as uninstalled libtool libraries, other files are standard or library
 object files.
 
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
+If the OUTPUT-FILE ends in '.la', then a libtool library is created,
+only library objects ('.lo' files) may be specified, and '-rpath' is
 required, except when creating a convenience library.
 
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
+If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
+using 'ar' and 'ranlib', or on Windows using 'lib'.
 
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
 is created, otherwise an executable program is created."
         ;;
 
@@ -2465,7 +3782,7 @@
 Remove libraries from an installation directory.
 
 RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
 to RM.
 
 If FILE is a libtool library, all the files associated with it are deleted.
@@ -2473,17 +3790,17 @@
         ;;
 
       *)
-        func_fatal_help "invalid operation mode \`$opt_mode'"
+        func_fatal_help "invalid operation mode '$opt_mode'"
         ;;
     esac
 
     echo
-    $ECHO "Try \`$progname --help' for more information about other modes."
+    $ECHO "Try '$progname --help' for more information about other modes."
 }
 
 # Now that we've collected a possible --mode arg, show help if necessary
 if $opt_help; then
-  if test "$opt_help" = :; then
+  if test : = "$opt_help"; then
     func_mode_help
   else
     {
@@ -2491,7 +3808,7 @@
       for opt_mode in compile link execute install finish uninstall clean; do
 	func_mode_help
       done
-    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
+    } | $SED -n '1p; 2,$s/^Usage:/  or: /p'
     {
       func_help noexit
       for opt_mode in compile link execute install finish uninstall clean; do
@@ -2499,7 +3816,7 @@
 	func_mode_help
       done
     } |
-    sed '1d
+    $SED '1d
       /^When reporting/,/^Report/{
 	H
 	d
@@ -2516,16 +3833,17 @@
 # func_mode_execute arg...
 func_mode_execute ()
 {
-    $opt_debug
+    $debug_cmd
+
     # The first argument is the command name.
-    cmd="$nonopt"
+    cmd=$nonopt
     test -z "$cmd" && \
       func_fatal_help "you must specify a COMMAND"
 
     # Handle -dlopen flags immediately.
     for file in $opt_dlopen; do
       test -f "$file" \
-	|| func_fatal_help "\`$file' is not a file"
+	|| func_fatal_help "'$file' is not a file"
 
       dir=
       case $file in
@@ -2535,7 +3853,7 @@
 
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$lib' is not a valid libtool archive"
+	  || func_fatal_help "'$lib' is not a valid libtool archive"
 
 	# Read the libtool library.
 	dlname=
@@ -2546,18 +3864,18 @@
 	if test -z "$dlname"; then
 	  # Warn if it was a shared library.
 	  test -n "$library_names" && \
-	    func_warning "\`$file' was not linked with \`-export-dynamic'"
+	    func_warning "'$file' was not linked with '-export-dynamic'"
 	  continue
 	fi
 
 	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
+	dir=$func_dirname_result
 
 	if test -f "$dir/$objdir/$dlname"; then
 	  func_append dir "/$objdir"
 	else
 	  if test ! -f "$dir/$dlname"; then
-	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	    func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
 	  fi
 	fi
 	;;
@@ -2565,18 +3883,18 @@
       *.lo)
 	# Just add the directory containing the .lo file.
 	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
+	dir=$func_dirname_result
 	;;
 
       *)
-	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+	func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
 	continue
 	;;
       esac
 
       # Get the absolute pathname.
       absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
+      test -n "$absdir" && dir=$absdir
 
       # Now add the directory to shlibpath_var.
       if eval "test -z \"\$$shlibpath_var\""; then
@@ -2588,7 +3906,7 @@
 
     # This variable tells wrapper scripts just to set shlibpath_var
     # rather than running their programs.
-    libtool_execute_magic="$magic"
+    libtool_execute_magic=$magic
 
     # Check if any of the arguments is a wrapper script.
     args=
@@ -2601,12 +3919,12 @@
 	if func_ltwrapper_script_p "$file"; then
 	  func_source "$file"
 	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
+	  file=$progdir/$program
 	elif func_ltwrapper_executable_p "$file"; then
 	  func_ltwrapper_scriptname "$file"
 	  func_source "$func_ltwrapper_scriptname_result"
 	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
+	  file=$progdir/$program
 	fi
 	;;
       esac
@@ -2614,7 +3932,15 @@
       func_append_quoted args "$file"
     done
 
-    if test "X$opt_dry_run" = Xfalse; then
+    if $opt_dry_run; then
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	echo "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    else
       if test -n "$shlibpath_var"; then
 	# Export the shlibpath_var.
 	eval "export $shlibpath_var"
@@ -2631,25 +3957,18 @@
       done
 
       # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	echo "export $shlibpath_var"
-      fi
-      $ECHO "$cmd$args"
-      exit $EXIT_SUCCESS
+      exec_cmd=\$cmd$args
     fi
 }
 
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
 
 
 # func_mode_finish arg...
 func_mode_finish ()
 {
-    $opt_debug
+    $debug_cmd
+
     libs=
     libdirs=
     admincmds=
@@ -2663,11 +3982,11 @@
 	if func_lalib_unsafe_p "$opt"; then
 	  func_append libs " $opt"
 	else
-	  func_warning "\`$opt' is not a valid libtool archive"
+	  func_warning "'$opt' is not a valid libtool archive"
 	fi
 
       else
-	func_fatal_error "invalid argument \`$opt'"
+	func_fatal_error "invalid argument '$opt'"
       fi
     done
 
@@ -2682,12 +4001,12 @@
       # Remove sysroot references
       if $opt_dry_run; then
         for lib in $libs; do
-          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+          echo "removing references to $lt_sysroot and '=' prefixes from $lib"
         done
       else
         tmpdir=`func_mktempdir`
         for lib in $libs; do
-	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+	  $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
 	    > $tmpdir/tmp-la
 	  mv -f $tmpdir/tmp-la $lib
 	done
@@ -2712,7 +4031,7 @@
     fi
 
     # Exit here if they wanted silent mode.
-    $opt_silent && exit $EXIT_SUCCESS
+    $opt_quiet && exit $EXIT_SUCCESS
 
     if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
       echo "----------------------------------------------------------------------"
@@ -2723,27 +4042,27 @@
       echo
       echo "If you ever happen to want to link against installed libraries"
       echo "in a given directory, LIBDIR, you must either use libtool, and"
-      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+      echo "specify the full pathname of the library, or use the '-LLIBDIR'"
       echo "flag during linking and do at least one of the following:"
       if test -n "$shlibpath_var"; then
-	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+	echo "   - add LIBDIR to the '$shlibpath_var' environment variable"
 	echo "     during execution"
       fi
       if test -n "$runpath_var"; then
-	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+	echo "   - add LIBDIR to the '$runpath_var' environment variable"
 	echo "     during linking"
       fi
       if test -n "$hardcode_libdir_flag_spec"; then
 	libdir=LIBDIR
 	eval flag=\"$hardcode_libdir_flag_spec\"
 
-	$ECHO "   - use the \`$flag' linker flag"
+	$ECHO "   - use the '$flag' linker flag"
       fi
       if test -n "$admincmds"; then
 	$ECHO "   - have your system administrator run these commands:$admincmds"
       fi
       if test -f /etc/ld.so.conf; then
-	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+	echo "   - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
       fi
       echo
 
@@ -2762,18 +4081,20 @@
     exit $EXIT_SUCCESS
 }
 
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
 
 
 # func_mode_install arg...
 func_mode_install ()
 {
-    $opt_debug
+    $debug_cmd
+
     # There may be an optional sh(1) argument at the beginning of
     # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+    if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
        # Allow the use of GNU shtool's install command.
-       case $nonopt in *shtool*) :;; *) false;; esac; then
+       case $nonopt in *shtool*) :;; *) false;; esac
+    then
       # Aesthetically quote it.
       func_quote_for_eval "$nonopt"
       install_prog="$func_quote_for_eval_result "
@@ -2800,7 +4121,7 @@
     opts=
     prev=
     install_type=
-    isdir=no
+    isdir=false
     stripme=
     no_mode=:
     for arg
@@ -2813,7 +4134,7 @@
       fi
 
       case $arg in
-      -d) isdir=yes ;;
+      -d) isdir=: ;;
       -f)
 	if $install_cp; then :; else
 	  prev=$arg
@@ -2831,7 +4152,7 @@
       *)
 	# If the previous option needed an argument, then skip it.
 	if test -n "$prev"; then
-	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
+	  if test X-m = "X$prev" && test -n "$install_override_mode"; then
 	    arg2=$install_override_mode
 	    no_mode=false
 	  fi
@@ -2856,7 +4177,7 @@
       func_fatal_help "you must specify an install program"
 
     test -n "$prev" && \
-      func_fatal_help "the \`$prev' option requires an argument"
+      func_fatal_help "the '$prev' option requires an argument"
 
     if test -n "$install_override_mode" && $no_mode; then
       if $install_cp; then :; else
@@ -2878,19 +4199,19 @@
     dest=$func_stripname_result
 
     # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
+    test -d "$dest" && isdir=:
+    if $isdir; then
+      destdir=$dest
       destname=
     else
       func_dirname_and_basename "$dest" "" "."
-      destdir="$func_dirname_result"
-      destname="$func_basename_result"
+      destdir=$func_dirname_result
+      destname=$func_basename_result
 
       # Not a directory, so check to see that there is only one file specified.
       set dummy $files; shift
       test "$#" -gt 1 && \
-	func_fatal_help "\`$dest' is not a directory"
+	func_fatal_help "'$dest' is not a directory"
     fi
     case $destdir in
     [\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -2899,7 +4220,7 @@
 	case $file in
 	*.lo) ;;
 	*)
-	  func_fatal_help "\`$destdir' must be an absolute directory name"
+	  func_fatal_help "'$destdir' must be an absolute directory name"
 	  ;;
 	esac
       done
@@ -2908,7 +4229,7 @@
 
     # This variable tells wrapper scripts just to set variables rather
     # than running their programs.
-    libtool_install_magic="$magic"
+    libtool_install_magic=$magic
 
     staticlibs=
     future_libdirs=
@@ -2928,7 +4249,7 @@
 
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$file' is not a valid libtool archive"
+	  || func_fatal_help "'$file' is not a valid libtool archive"
 
 	library_names=
 	old_library=
@@ -2950,7 +4271,7 @@
 	fi
 
 	func_dirname "$file" "/" ""
-	dir="$func_dirname_result"
+	dir=$func_dirname_result
 	func_append dir "$objdir"
 
 	if test -n "$relink_command"; then
@@ -2964,7 +4285,7 @@
 	  # are installed into $libdir/../bin (currently, that works fine)
 	  # but it's something to keep an eye on.
 	  test "$inst_prefix_dir" = "$destdir" && \
-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+	    func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
@@ -2973,29 +4294,36 @@
 	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
 	  fi
 
-	  func_warning "relinking \`$file'"
+	  func_warning "relinking '$file'"
 	  func_show_eval "$relink_command" \
-	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+	    'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
 	fi
 
 	# See the names of the shared library.
 	set dummy $library_names; shift
 	if test -n "$1"; then
-	  realname="$1"
+	  realname=$1
 	  shift
 
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
+	  srcname=$realname
+	  test -n "$relink_command" && srcname=${realname}T
 
 	  # Install the shared library and build the symlinks.
 	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
 	      'exit $?'
-	  tstripme="$stripme"
+	  tstripme=$stripme
 	  case $host_os in
 	  cygwin* | mingw* | pw32* | cegcc*)
 	    case $realname in
 	    *.dll.a)
-	      tstripme=""
+	      tstripme=
+	      ;;
+	    esac
+	    ;;
+	  os2*)
+	    case $realname in
+	    *_dll.a)
+	      tstripme=
 	      ;;
 	    esac
 	    ;;
@@ -3006,7 +4334,7 @@
 
 	  if test "$#" -gt 0; then
 	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # Try 'ln -sf' first, because the 'ln' binary might depend on
 	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
 	    # so we also need to try rm && ln -s.
 	    for linkname
@@ -3017,14 +4345,14 @@
 	  fi
 
 	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
+	  lib=$destdir/$realname
 	  func_execute_cmds "$postinstall_cmds" 'exit $?'
 	fi
 
 	# Install the pseudo-library for information purposes.
 	func_basename "$file"
-	name="$func_basename_result"
-	instname="$dir/$name"i
+	name=$func_basename_result
+	instname=$dir/${name}i
 	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
 
 	# Maybe install the static library, too.
@@ -3036,11 +4364,11 @@
 
 	# Figure out destination file name, if it wasn't already specified.
 	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
+	  destfile=$destdir/$destname
 	else
 	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
+	  destfile=$func_basename_result
+	  destfile=$destdir/$destfile
 	fi
 
 	# Deduce the name of the destination old-style object file.
@@ -3050,11 +4378,11 @@
 	  staticdest=$func_lo2o_result
 	  ;;
 	*.$objext)
-	  staticdest="$destfile"
+	  staticdest=$destfile
 	  destfile=
 	  ;;
 	*)
-	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
+	  func_fatal_help "cannot copy a libtool object to '$destfile'"
 	  ;;
 	esac
 
@@ -3063,7 +4391,7 @@
 	  func_show_eval "$install_prog $file $destfile" 'exit $?'
 
 	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
+	if test yes = "$build_old_libs"; then
 	  # Deduce the name of the old-style object file.
 	  func_lo2o "$file"
 	  staticobj=$func_lo2o_result
@@ -3075,23 +4403,23 @@
       *)
 	# Figure out destination file name, if it wasn't already specified.
 	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
+	  destfile=$destdir/$destname
 	else
 	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
+	  destfile=$func_basename_result
+	  destfile=$destdir/$destfile
 	fi
 
 	# If the file is missing, and there is a .exe on the end, strip it
 	# because it is most likely a libtool script we actually want to
 	# install
-	stripped_ext=""
+	stripped_ext=
 	case $file in
 	  *.exe)
 	    if test ! -f "$file"; then
 	      func_stripname '' '.exe' "$file"
 	      file=$func_stripname_result
-	      stripped_ext=".exe"
+	      stripped_ext=.exe
 	    fi
 	    ;;
 	esac
@@ -3119,19 +4447,19 @@
 
 	  # Check the variables that should have been set.
 	  test -z "$generated_by_libtool_version" && \
-	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+	    func_fatal_error "invalid libtool wrapper script '$wrapper'"
 
-	  finalize=yes
+	  finalize=:
 	  for lib in $notinst_deplibs; do
 	    # Check to see that each library is installed.
 	    libdir=
 	    if test -f "$lib"; then
 	      func_source "$lib"
 	    fi
-	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
 	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      func_warning "\`$lib' has not been installed in \`$libdir'"
-	      finalize=no
+	      func_warning "'$lib' has not been installed in '$libdir'"
+	      finalize=false
 	    fi
 	  done
 
@@ -3139,29 +4467,29 @@
 	  func_source "$wrapper"
 
 	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
+	  if test no = "$fast_install" && test -n "$relink_command"; then
 	    $opt_dry_run || {
-	      if test "$finalize" = yes; then
+	      if $finalize; then
 	        tmpdir=`func_mktempdir`
 		func_basename "$file$stripped_ext"
-		file="$func_basename_result"
-	        outputname="$tmpdir/$file"
+		file=$func_basename_result
+	        outputname=$tmpdir/$file
 	        # Replace the output file specification.
 	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
 
-	        $opt_silent || {
+	        $opt_quiet || {
 	          func_quote_for_expand "$relink_command"
 		  eval "func_echo $func_quote_for_expand_result"
 	        }
 	        if eval "$relink_command"; then :
 	          else
-		  func_error "error: relink \`$file' with the above command before installing it"
+		  func_error "error: relink '$file' with the above command before installing it"
 		  $opt_dry_run || ${RM}r "$tmpdir"
 		  continue
 	        fi
-	        file="$outputname"
+	        file=$outputname
 	      else
-	        func_warning "cannot relink \`$file'"
+	        func_warning "cannot relink '$file'"
 	      fi
 	    }
 	  else
@@ -3198,10 +4526,10 @@
 
     for file in $staticlibs; do
       func_basename "$file"
-      name="$func_basename_result"
+      name=$func_basename_result
 
       # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
+      oldlib=$destdir/$name
       func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
       tool_oldlib=$func_to_tool_file_result
 
@@ -3216,18 +4544,18 @@
     done
 
     test -n "$future_libdirs" && \
-      func_warning "remember to run \`$progname --finish$future_libdirs'"
+      func_warning "remember to run '$progname --finish$future_libdirs'"
 
     if test -n "$current_libdirs"; then
       # Maybe just do a dry run.
       $opt_dry_run && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+      exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
     else
       exit $EXIT_SUCCESS
     fi
 }
 
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
 
 
 # func_generate_dlsyms outputname originator pic_p
@@ -3235,16 +4563,17 @@
 # a dlpreopen symbol table.
 func_generate_dlsyms ()
 {
-    $opt_debug
-    my_outputname="$1"
-    my_originator="$2"
-    my_pic_p="${3-no}"
-    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+    $debug_cmd
+
+    my_outputname=$1
+    my_originator=$2
+    my_pic_p=${3-false}
+    my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
     my_dlsyms=
 
-    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+    if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
       if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	my_dlsyms="${my_outputname}S.c"
+	my_dlsyms=${my_outputname}S.c
       else
 	func_error "not configured to extract global symbols from dlpreopened files"
       fi
@@ -3255,7 +4584,7 @@
       "") ;;
       *.c)
 	# Discover the nlist of each of the dlfiles.
-	nlist="$output_objdir/${my_outputname}.nm"
+	nlist=$output_objdir/$my_outputname.nm
 
 	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
 
@@ -3263,34 +4592,36 @@
 	func_verbose "creating $output_objdir/$my_dlsyms"
 
 	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
 
 #ifdef __cplusplus
 extern \"C\" {
 #endif
 
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
 #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
 #endif
 
 /* 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
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
    relocations are performed -- see ld's documentation on pseudo-relocs.  */
 # define LT_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
 /* This system does not cope well with relocations in const data.  */
 # define LT_DLSYM_CONST
 #else
 # define LT_DLSYM_CONST const
 #endif
 
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
 /* External symbol declarations for the compiler. */\
 "
 
-	if test "$dlself" = yes; then
-	  func_verbose "generating symbol list for \`$output'"
+	if test yes = "$dlself"; then
+	  func_verbose "generating symbol list for '$output'"
 
 	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
 
@@ -3298,7 +4629,7 @@
 	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
 	  for progfile in $progfiles; do
 	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
-	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+	    func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
 	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
 	  done
 
@@ -3318,10 +4649,10 @@
 
 	  # Prepare the list of exported symbols
 	  if test -z "$export_symbols"; then
-	    export_symbols="$output_objdir/$outputname.exp"
+	    export_symbols=$output_objdir/$outputname.exp
 	    $opt_dry_run || {
 	      $RM $export_symbols
-	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
 	      case $host in
 	      *cygwin* | *mingw* | *cegcc* )
                 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
@@ -3331,7 +4662,7 @@
 	    }
 	  else
 	    $opt_dry_run || {
-	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
 	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 	      eval '$MV "$nlist"T "$nlist"'
 	      case $host in
@@ -3345,22 +4676,22 @@
 	fi
 
 	for dlprefile in $dlprefiles; do
-	  func_verbose "extracting global C symbols from \`$dlprefile'"
+	  func_verbose "extracting global C symbols from '$dlprefile'"
 	  func_basename "$dlprefile"
-	  name="$func_basename_result"
+	  name=$func_basename_result
           case $host in
 	    *cygwin* | *mingw* | *cegcc* )
 	      # if an import library, we need to obtain dlname
 	      if func_win32_import_lib_p "$dlprefile"; then
 	        func_tr_sh "$dlprefile"
 	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
-	        dlprefile_dlbasename=""
+	        dlprefile_dlbasename=
 	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
 	          # Use subshell, to avoid clobbering current variable values
 	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
-	          if test -n "$dlprefile_dlname" ; then
+	          if test -n "$dlprefile_dlname"; then
 	            func_basename "$dlprefile_dlname"
-	            dlprefile_dlbasename="$func_basename_result"
+	            dlprefile_dlbasename=$func_basename_result
 	          else
 	            # no lafile. user explicitly requested -dlpreopen <import library>.
 	            $sharedlib_from_linklib_cmd "$dlprefile"
@@ -3368,7 +4699,7 @@
 	          fi
 	        fi
 	        $opt_dry_run || {
-	          if test -n "$dlprefile_dlbasename" ; then
+	          if test -n "$dlprefile_dlbasename"; then
 	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
 	          else
 	            func_warning "Could not compute DLL name from $name"
@@ -3424,6 +4755,11 @@
 	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
 	  fi
 
+	  func_show_eval '$RM "${nlist}I"'
+	  if test -n "$global_symbol_to_import"; then
+	    eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
+	  fi
+
 	  echo >> "$output_objdir/$my_dlsyms" "\
 
 /* The mapping between symbol names and symbols.  */
@@ -3432,11 +4768,30 @@
   void *address;
 } lt_dlsymlist;
 extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
+lt_${my_prefix}_LTX_preloaded_symbols[];\
+"
+
+	  if test -s "$nlist"I; then
+	    echo >> "$output_objdir/$my_dlsyms" "\
+static void lt_syminit(void)
+{
+  LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
+  for (; symbol->name; ++symbol)
+    {"
+	    $SED 's/.*/      if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
+	    echo >> "$output_objdir/$my_dlsyms" "\
+    }
+}"
+	  fi
+	  echo >> "$output_objdir/$my_dlsyms" "\
 LT_DLSYM_CONST lt_dlsymlist
 lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
-  { \"$my_originator\", (void *) 0 },"
+{ {\"$my_originator\", (void *) 0},"
+
+	  if test -s "$nlist"I; then
+	    echo >> "$output_objdir/$my_dlsyms" "\
+  {\"@INIT@\", (void *) &lt_syminit},"
+	  fi
 
 	  case $need_lib_prefix in
 	  no)
@@ -3478,9 +4833,7 @@
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
 	  *)
-	    if test "X$my_pic_p" != Xno; then
-	      pic_flag_for_symtable=" $pic_flag"
-	    fi
+	    $my_pic_p && pic_flag_for_symtable=" $pic_flag"
 	    ;;
 	  esac
 	  ;;
@@ -3497,10 +4850,10 @@
 	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
 
 	# Clean up the generated files.
-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
 
 	# Transform the symbol file into the correct name.
-	symfileobj="$output_objdir/${my_outputname}S.$objext"
+	symfileobj=$output_objdir/${my_outputname}S.$objext
 	case $host in
 	*cygwin* | *mingw* | *cegcc* )
 	  if test -f "$output_objdir/$my_outputname.def"; then
@@ -3518,7 +4871,7 @@
 	esac
 	;;
       *)
-	func_fatal_error "unknown suffix for \`$my_dlsyms'"
+	func_fatal_error "unknown suffix for '$my_dlsyms'"
 	;;
       esac
     else
@@ -3532,6 +4885,32 @@
     fi
 }
 
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
 # func_win32_libid arg
 # return the library type of file 'arg'
 #
@@ -3541,8 +4920,9 @@
 # Despite the name, also deal with 64 bit binaries.
 func_win32_libid ()
 {
-  $opt_debug
-  win32_libid_type="unknown"
+  $debug_cmd
+
+  win32_libid_type=unknown
   win32_fileres=`file -L $1 2>/dev/null`
   case $win32_fileres in
   *ar\ archive\ import\ library*) # definitely import
@@ -3552,16 +4932,29 @@
     # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
        $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-      func_to_tool_file "$1" func_convert_file_msys_to_w32
-      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
-	$SED -n -e '
+      case $nm_interface in
+      "MS dumpbin")
+	if func_cygming_ms_implib_p "$1" ||
+	   func_cygming_gnu_implib_p "$1"
+	then
+	  win32_nmres=import
+	else
+	  win32_nmres=
+	fi
+	;;
+      *)
+	func_to_tool_file "$1" func_convert_file_msys_to_w32
+	win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+	  $SED -n -e '
 	    1,100{
 		/ I /{
-		    s,.*,import,
+		    s|.*|import|
 		    p
 		    q
 		}
 	    }'`
+	;;
+      esac
       case $win32_nmres in
       import*)  win32_libid_type="x86 archive import";;
       *)        win32_libid_type="x86 archive static";;
@@ -3593,7 +4986,8 @@
 #    $sharedlib_from_linklib_result
 func_cygming_dll_for_implib ()
 {
-  $opt_debug
+  $debug_cmd
+
   sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
 }
 
@@ -3610,7 +5004,8 @@
 # specified import library.
 func_cygming_dll_for_implib_fallback_core ()
 {
-  $opt_debug
+  $debug_cmd
+
   match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
   $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
     $SED '/^Contents of section '"$match_literal"':/{
@@ -3646,8 +5041,8 @@
       /./p' |
     # we now have a list, one entry per line, of the stringified
     # contents of the appropriate section of all members of the
-    # archive which possess that section. Heuristic: eliminate
-    # all those which have a first or second character that is
+    # archive that possess that section. Heuristic: eliminate
+    # all those that have a first or second character that is
     # a '.' (that is, objdump's representation of an unprintable
     # character.) This should work for all archives with less than
     # 0x302f exports -- but will fail for DLLs whose name actually
@@ -3658,30 +5053,6 @@
     $SED -e '/^\./d;/^.\./d;q'
 }
 
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
-  test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
-  test -n "$func_cygming_ms_implib_tmp"
-}
-
 # func_cygming_dll_for_implib_fallback ARG
 # Platform-specific function to extract the
 # name of the DLL associated with the specified
@@ -3695,16 +5066,17 @@
 #    $sharedlib_from_linklib_result
 func_cygming_dll_for_implib_fallback ()
 {
-  $opt_debug
-  if func_cygming_gnu_implib_p "$1" ; then
+  $debug_cmd
+
+  if func_cygming_gnu_implib_p "$1"; then
     # binutils import library
     sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
-  elif func_cygming_ms_implib_p "$1" ; then
+  elif func_cygming_ms_implib_p "$1"; then
     # ms-generated import library
     sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
   else
     # unknown
-    sharedlib_from_linklib_result=""
+    sharedlib_from_linklib_result=
   fi
 }
 
@@ -3712,10 +5084,11 @@
 # func_extract_an_archive dir oldlib
 func_extract_an_archive ()
 {
-    $opt_debug
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-    if test "$lock_old_archive_extraction" = yes; then
+    $debug_cmd
+
+    f_ex_an_ar_dir=$1; shift
+    f_ex_an_ar_oldlib=$1
+    if test yes = "$lock_old_archive_extraction"; then
       lockfile=$f_ex_an_ar_oldlib.lock
       until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
 	func_echo "Waiting for $lockfile to be removed"
@@ -3724,7 +5097,7 @@
     fi
     func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
 		   'stat=$?; rm -f "$lockfile"; exit $stat'
-    if test "$lock_old_archive_extraction" = yes; then
+    if test yes = "$lock_old_archive_extraction"; then
       $opt_dry_run || rm -f "$lockfile"
     fi
     if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
@@ -3738,22 +5111,23 @@
 # func_extract_archives gentop oldlib ...
 func_extract_archives ()
 {
-    $opt_debug
-    my_gentop="$1"; shift
+    $debug_cmd
+
+    my_gentop=$1; shift
     my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
+    my_oldobjs=
+    my_xlib=
+    my_xabs=
+    my_xdir=
 
     for my_xlib in $my_oldlibs; do
       # Extract the objects.
       case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       func_basename "$my_xlib"
-      my_xlib="$func_basename_result"
+      my_xlib=$func_basename_result
       my_xlib_u=$my_xlib
       while :; do
         case " $extracted_archives " in
@@ -3765,7 +5139,7 @@
 	esac
       done
       extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
+      my_xdir=$my_gentop/$my_xlib_u
 
       func_mkdir_p "$my_xdir"
 
@@ -3778,22 +5152,23 @@
 	  cd $my_xdir || exit $?
 	  darwin_archive=$my_xabs
 	  darwin_curdir=`pwd`
-	  darwin_base_archive=`basename "$darwin_archive"`
+	  func_basename "$darwin_archive"
+	  darwin_base_archive=$func_basename_result
 	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
 	  if test -n "$darwin_arches"; then
 	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
 	    darwin_arch=
 	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	    for darwin_arch in  $darwin_arches; do
+	      func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
+	      $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
+	      cd "unfat-$$/$darwin_base_archive-$darwin_arch"
+	      func_extract_an_archive "`pwd`" "$darwin_base_archive"
 	      cd "$darwin_curdir"
-	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	      $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
 	    done # $darwin_arches
             ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
 	    darwin_file=
 	    darwin_files=
 	    for darwin_file in $darwin_filelist; do
@@ -3815,7 +5190,7 @@
       my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
     done
 
-    func_extract_archives_result="$my_oldobjs"
+    func_extract_archives_result=$my_oldobjs
 }
 
 
@@ -3830,7 +5205,7 @@
 #
 # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
 # variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
+# will assume that the directory where it is stored is
 # the $objdir directory.  This is a cygwin/mingw-specific
 # behavior.
 func_emit_wrapper ()
@@ -3841,7 +5216,7 @@
 #! $SHELL
 
 # $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 #
 # The $output program cannot be directly executed until all the libtool
 # libraries that it depends on are installed.
@@ -3898,9 +5273,9 @@
 
 # Very basic option parsing. These options are (a) specific to
 # the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ which is used only on
+# /script/ and the wrapper /executable/ that is used only on
 # windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
+# (application programs are unlikely to have options that match
 # this pattern).
 #
 # There are only two supported options: --lt-debug and
@@ -3933,7 +5308,7 @@
 
   # Print the debug banner immediately:
   if test -n \"\$lt_option_debug\"; then
-    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+    echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
   fi
 }
 
@@ -3944,7 +5319,7 @@
   lt_dump_args_N=1;
   for lt_arg
   do
-    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+    \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
     lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
   done
 }
@@ -3958,7 +5333,7 @@
   *-*-mingw | *-*-os2* | *-cegcc*)
     $ECHO "\
       if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
         func_lt_dump_args \${1+\"\$@\"} 1>&2
       fi
       exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
@@ -3968,7 +5343,7 @@
   *)
     $ECHO "\
       if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
         func_lt_dump_args \${1+\"\$@\"} 1>&2
       fi
       exec \"\$progdir/\$program\" \${1+\"\$@\"}
@@ -4043,13 +5418,13 @@
   test -n \"\$absdir\" && thisdir=\"\$absdir\"
 "
 
-	if test "$fast_install" = yes; then
+	if test yes = "$fast_install"; then
 	  $ECHO "\
   program=lt-'$outputname'$exeext
   progdir=\"\$thisdir/$objdir\"
 
   if test ! -f \"\$progdir/\$program\" ||
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
        test \"X\$file\" != \"X\$progdir/\$program\"; }; then
 
     file=\"\$\$-\$program\"
@@ -4066,7 +5441,7 @@
     if test -n \"\$relink_command\"; then
       if relink_command_output=\`eval \$relink_command 2>&1\`; then :
       else
-	$ECHO \"\$relink_command_output\" >&2
+	\$ECHO \"\$relink_command_output\" >&2
 	$RM \"\$progdir/\$file\"
 	exit 1
       fi
@@ -4101,7 +5476,7 @@
 	fi
 
 	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
 	  $ECHO "\
     # Add our own library path to $shlibpath_var
     $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
@@ -4121,7 +5496,7 @@
     fi
   else
     # The program doesn't exist.
-    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
     \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
     \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
     exit 1
@@ -4140,7 +5515,7 @@
 	cat <<EOF
 
 /* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+   Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 
    The $output program cannot be directly executed until all the libtool
    libraries that it depends on are installed.
@@ -4175,47 +5550,45 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
 /* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
+#if defined __MINGW32__
 # ifdef __STRICT_ANSI__
 int _putenv (const char *);
 # endif
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
 # ifdef __STRICT_ANSI__
 char *realpath (const char *, char *);
 int putenv (char *);
 int setenv (const char *, const char *, int);
 # endif
-/* #elif defined (other platforms) ... */
+/* #elif defined other_platform || defined ... */
 #endif
 
 /* portability defines, excluding path handling macros */
-#if defined(_MSC_VER)
+#if defined _MSC_VER
 # define setmode _setmode
 # define stat    _stat
 # define chmod   _chmod
 # define getcwd  _getcwd
 # define putenv  _putenv
 # define S_IXUSR _S_IEXEC
-# ifndef _INTPTR_T_DEFINED
-#  define _INTPTR_T_DEFINED
-#  define intptr_t int
-# endif
-#elif defined(__MINGW32__)
+#elif defined __MINGW32__
 # define setmode _setmode
 # define stat    _stat
 # define chmod   _chmod
 # define getcwd  _getcwd
 # define putenv  _putenv
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
 # define HAVE_SETENV
 # define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
+/* #elif defined other platforms ... */
 #endif
 
-#if defined(PATH_MAX)
+#if defined PATH_MAX
 # define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
+#elif defined MAXPATHLEN
 # define LT_PATHMAX MAXPATHLEN
 #else
 # define LT_PATHMAX 1024
@@ -4234,8 +5607,8 @@
 # define PATH_SEPARATOR ':'
 #endif
 
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
+#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+  defined __OS2__
 # define HAVE_DOS_BASED_FILE_SYSTEM
 # define FOPEN_WB "wb"
 # ifndef DIR_SEPARATOR_2
@@ -4268,10 +5641,10 @@
 
 #define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
 #define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
+  if (stale) { free (stale); stale = 0; } \
 } while (0)
 
-#if defined(LT_DEBUGWRAPPER)
+#if defined LT_DEBUGWRAPPER
 static int lt_debug = 1;
 #else
 static int lt_debug = 0;
@@ -4300,11 +5673,16 @@
 EOF
 
 	    cat <<EOF
-volatile const char * MAGIC_EXE = "$magic_exe";
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+# define externally_visible volatile
+#else
+# define externally_visible __attribute__((externally_visible)) volatile
+#endif
+externally_visible const char * MAGIC_EXE = "$magic_exe";
 const char * LIB_PATH_VARNAME = "$shlibpath_var";
 EOF
 
-	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	    if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
               func_to_host_path "$temp_rpath"
 	      cat <<EOF
 const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
@@ -4328,7 +5706,7 @@
 EOF
 	    fi
 
-	    if test "$fast_install" = yes; then
+	    if test yes = "$fast_install"; then
 	      cat <<EOF
 const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
 EOF
@@ -4357,12 +5735,12 @@
   char *actual_cwrapper_name;
   char *target_name;
   char *lt_argv_zero;
-  intptr_t rval = 127;
+  int rval = 127;
 
   int i;
 
   program_name = (char *) xstrdup (base_name (argv[0]));
-  newargz = XMALLOC (char *, argc + 1);
+  newargz = XMALLOC (char *, (size_t) argc + 1);
 
   /* very simple arg parsing; don't want to rely on getopt
    * also, copy all non cwrapper options to newargz, except
@@ -4371,10 +5749,10 @@
   newargc=0;
   for (i = 1; i < argc; i++)
     {
-      if (strcmp (argv[i], dumpscript_opt) == 0)
+      if (STREQ (argv[i], dumpscript_opt))
 	{
 EOF
-	    case "$host" in
+	    case $host in
 	      *mingw* | *cygwin* )
 		# make stdout use "unix" line endings
 		echo "          setmode(1,_O_BINARY);"
@@ -4385,12 +5763,12 @@
 	  lt_dump_script (stdout);
 	  return 0;
 	}
-      if (strcmp (argv[i], debug_opt) == 0)
+      if (STREQ (argv[i], debug_opt))
 	{
           lt_debug = 1;
           continue;
 	}
-      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+      if (STREQ (argv[i], ltwrapper_option_prefix))
         {
           /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
              namespace, but it is not one of the ones we know about and
@@ -4413,7 +5791,7 @@
 EOF
 	    cat <<EOF
   /* The GNU banner must be the first non-error debug message */
-  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
 EOF
 	    cat <<"EOF"
   lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
@@ -4524,7 +5902,7 @@
 		cat <<"EOF"
   /* execv doesn't actually work on mingw as expected on unix */
   newargz = prepare_spawn (newargz);
-  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
   if (rval == -1)
     {
       /* failed to start process */
@@ -4569,7 +5947,7 @@
 {
   const char *base;
 
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
   /* Skip over the disk name in MSDOS pathnames. */
   if (isalpha ((unsigned char) name[0]) && name[1] == ':')
     name += 2;
@@ -4628,7 +6006,7 @@
   const char *p_next;
   /* static buffer for getcwd */
   char tmp[LT_PATHMAX + 1];
-  int tmp_len;
+  size_t tmp_len;
   char *concat_name;
 
   lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
@@ -4638,7 +6016,7 @@
     return NULL;
 
   /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
   if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
     {
       concat_name = xstrdup (wrapper);
@@ -4656,7 +6034,7 @@
 	    return concat_name;
 	  XFREE (concat_name);
 	}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
     }
 #endif
 
@@ -4679,7 +6057,7 @@
 	      for (q = p; *q; q++)
 		if (IS_PATH_SEPARATOR (*q))
 		  break;
-	      p_len = q - p;
+	      p_len = (size_t) (q - p);
 	      p_next = (*q == '\0' ? q : q + 1);
 	      if (p_len == 0)
 		{
@@ -4798,7 +6176,7 @@
   if (patlen <= len)
     {
       str += len - patlen;
-      if (strcmp (str, pat) == 0)
+      if (STREQ (str, pat))
 	*str = '\0';
     }
   return str;
@@ -4863,7 +6241,7 @@
     char *str = xstrdup (value);
     setenv (name, str, 1);
 #else
-    int len = strlen (name) + 1 + strlen (value) + 1;
+    size_t len = strlen (name) + 1 + strlen (value) + 1;
     char *str = XMALLOC (char, len);
     sprintf (str, "%s=%s", name, value);
     if (putenv (str) != EXIT_SUCCESS)
@@ -4880,8 +6258,8 @@
   char *new_value;
   if (orig_value && *orig_value)
     {
-      int orig_value_len = strlen (orig_value);
-      int add_len = strlen (add);
+      size_t orig_value_len = strlen (orig_value);
+      size_t add_len = strlen (add);
       new_value = XMALLOC (char, add_len + orig_value_len + 1);
       if (to_end)
         {
@@ -4912,10 +6290,10 @@
     {
       char *new_value = lt_extend_str (getenv (name), value, 0);
       /* some systems can't cope with a ':'-terminated path #' */
-      int len = strlen (new_value);
-      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+      size_t len = strlen (new_value);
+      while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
         {
-          new_value[len-1] = '\0';
+          new_value[--len] = '\0';
         }
       lt_setenv (name, new_value);
       XFREE (new_value);
@@ -5082,27 +6460,47 @@
 # True if ARG is an import lib, as indicated by $file_magic_cmd
 func_win32_import_lib_p ()
 {
-    $opt_debug
+    $debug_cmd
+
     case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
     *import*) : ;;
     *) false ;;
     esac
 }
 
+# func_suncc_cstd_abi
+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+# Several compiler flags select an ABI that is incompatible with the
+# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+func_suncc_cstd_abi ()
+{
+    $debug_cmd
+
+    case " $compile_command " in
+    *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+      suncc_use_cstd_abi=no
+      ;;
+    *)
+      suncc_use_cstd_abi=yes
+      ;;
+    esac
+}
+
 # func_mode_link arg...
 func_mode_link ()
 {
-    $opt_debug
+    $debug_cmd
+
     case $host in
     *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
       # It is impossible to link a dll without this setting, and
       # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
+      # what system we are compiling for in order to pass an extra
       # flag for every libtool invocation.
       # allow_undefined=no
 
       # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
+      # to make a dll that has undefined symbols, in which case not
       # even a static library is built.  For now, we need to specify
       # -no-undefined on the libtool link line when we can be certain
       # that all symbols are satisfied, otherwise we get a static library.
@@ -5146,10 +6544,11 @@
     module=no
     no_install=no
     objs=
+    os2dllname=
     non_pic_objects=
     precious_files_regex=
     prefer_static_libs=no
-    preload=no
+    preload=false
     prev=
     prevarg=
     release=
@@ -5161,7 +6560,7 @@
     vinfo=
     vinfo_number=no
     weak_libs=
-    single_module="${wl}-single_module"
+    single_module=$wl-single_module
     func_infer_tag $base_compile
 
     # We need to know -static, to get the right output filenames.
@@ -5169,15 +6568,15 @@
     do
       case $arg in
       -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
+	test yes != "$build_libtool_libs" \
+	  && func_fatal_configuration "cannot build a shared library"
 	build_old_libs=no
 	break
 	;;
       -all-static | -static | -static-libtool-libs)
 	case $arg in
 	-all-static)
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+	  if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
 	    func_warning "complete static linking is impossible in this configuration"
 	  fi
 	  if test -n "$link_static_flag"; then
@@ -5210,7 +6609,7 @@
 
     # Go through the arguments, transforming them on the way.
     while test "$#" -gt 0; do
-      arg="$1"
+      arg=$1
       shift
       func_quote_for_eval "$arg"
       qarg=$func_quote_for_eval_unquoted_result
@@ -5227,21 +6626,21 @@
 
 	case $prev in
 	bindir)
-	  bindir="$arg"
+	  bindir=$arg
 	  prev=
 	  continue
 	  ;;
 	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
+	  $preload || {
 	    # Add the symbol object into the linking commands.
 	    func_append compile_command " @SYMFILE@"
 	    func_append finalize_command " @SYMFILE@"
-	    preload=yes
-	  fi
+	    preload=:
+	  }
 	  case $arg in
 	  *.la | *.lo) ;;  # We handle these cases below.
 	  force)
-	    if test "$dlself" = no; then
+	    if test no = "$dlself"; then
 	      dlself=needless
 	      export_dynamic=yes
 	    fi
@@ -5249,9 +6648,9 @@
 	    continue
 	    ;;
 	  self)
-	    if test "$prev" = dlprefiles; then
+	    if test dlprefiles = "$prev"; then
 	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+	    elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
 	      dlself=yes
 	    else
 	      dlself=needless
@@ -5261,7 +6660,7 @@
 	    continue
 	    ;;
 	  *)
-	    if test "$prev" = dlfiles; then
+	    if test dlfiles = "$prev"; then
 	      func_append dlfiles " $arg"
 	    else
 	      func_append dlprefiles " $arg"
@@ -5272,14 +6671,14 @@
 	  esac
 	  ;;
 	expsyms)
-	  export_symbols="$arg"
+	  export_symbols=$arg
 	  test -f "$arg" \
-	    || func_fatal_error "symbol file \`$arg' does not exist"
+	    || func_fatal_error "symbol file '$arg' does not exist"
 	  prev=
 	  continue
 	  ;;
 	expsyms_regex)
-	  export_symbols_regex="$arg"
+	  export_symbols_regex=$arg
 	  prev=
 	  continue
 	  ;;
@@ -5297,7 +6696,13 @@
 	  continue
 	  ;;
 	inst_prefix)
-	  inst_prefix_dir="$arg"
+	  inst_prefix_dir=$arg
+	  prev=
+	  continue
+	  ;;
+	mllvm)
+	  # Clang does not use LLVM to link, so we can simply discard any
+	  # '-mllvm $arg' options when doing the link step.
 	  prev=
 	  continue
 	  ;;
@@ -5321,21 +6726,21 @@
 
 		if test -z "$pic_object" ||
 		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none &&
-		   test "$non_pic_object" = none; then
-		  func_fatal_error "cannot find name of object for \`$arg'"
+		   test none = "$pic_object" &&
+		   test none = "$non_pic_object"; then
+		  func_fatal_error "cannot find name of object for '$arg'"
 		fi
 
 		# Extract subdirectory from the argument.
 		func_dirname "$arg" "/" ""
-		xdir="$func_dirname_result"
+		xdir=$func_dirname_result
 
-		if test "$pic_object" != none; then
+		if test none != "$pic_object"; then
 		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
+		  pic_object=$xdir$pic_object
 
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		  if test dlfiles = "$prev"; then
+		    if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
 		      func_append dlfiles " $pic_object"
 		      prev=
 		      continue
@@ -5346,7 +6751,7 @@
 		  fi
 
 		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
+		  if test dlprefiles = "$prev"; then
 		    # Preload the old-style object.
 		    func_append dlprefiles " $pic_object"
 		    prev=
@@ -5354,23 +6759,23 @@
 
 		  # A PIC object.
 		  func_append libobjs " $pic_object"
-		  arg="$pic_object"
+		  arg=$pic_object
 		fi
 
 		# Non-PIC object.
-		if test "$non_pic_object" != none; then
+		if test none != "$non_pic_object"; then
 		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
+		  non_pic_object=$xdir$non_pic_object
 
 		  # A standard non-PIC object
 		  func_append non_pic_objects " $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
+		  if test -z "$pic_object" || test none = "$pic_object"; then
+		    arg=$non_pic_object
 		  fi
 		else
 		  # If the PIC object exists, use it instead.
 		  # $xdir was prepended to $pic_object above.
-		  non_pic_object="$pic_object"
+		  non_pic_object=$pic_object
 		  func_append non_pic_objects " $non_pic_object"
 		fi
 	      else
@@ -5378,7 +6783,7 @@
 		if $opt_dry_run; then
 		  # Extract subdirectory from the argument.
 		  func_dirname "$arg" "/" ""
-		  xdir="$func_dirname_result"
+		  xdir=$func_dirname_result
 
 		  func_lo2o "$arg"
 		  pic_object=$xdir$objdir/$func_lo2o_result
@@ -5386,24 +6791,29 @@
 		  func_append libobjs " $pic_object"
 		  func_append non_pic_objects " $non_pic_object"
 	        else
-		  func_fatal_error "\`$arg' is not a valid libtool object"
+		  func_fatal_error "'$arg' is not a valid libtool object"
 		fi
 	      fi
 	    done
 	  else
-	    func_fatal_error "link input file \`$arg' does not exist"
+	    func_fatal_error "link input file '$arg' does not exist"
 	  fi
 	  arg=$save_arg
 	  prev=
 	  continue
 	  ;;
+	os2dllname)
+	  os2dllname=$arg
+	  prev=
+	  continue
+	  ;;
 	precious_regex)
-	  precious_files_regex="$arg"
+	  precious_files_regex=$arg
 	  prev=
 	  continue
 	  ;;
 	release)
-	  release="-$arg"
+	  release=-$arg
 	  prev=
 	  continue
 	  ;;
@@ -5415,7 +6825,7 @@
 	    func_fatal_error "only absolute run-paths are allowed"
 	    ;;
 	  esac
-	  if test "$prev" = rpath; then
+	  if test rpath = "$prev"; then
 	    case "$rpath " in
 	    *" $arg "*) ;;
 	    *) func_append rpath " $arg" ;;
@@ -5430,7 +6840,7 @@
 	  continue
 	  ;;
 	shrext)
-	  shrext_cmds="$arg"
+	  shrext_cmds=$arg
 	  prev=
 	  continue
 	  ;;
@@ -5470,7 +6880,7 @@
 	esac
       fi # test -n "$prev"
 
-      prevarg="$arg"
+      prevarg=$arg
 
       case $arg in
       -all-static)
@@ -5484,7 +6894,7 @@
 
       -allow-undefined)
 	# FIXME: remove this flag sometime in the future.
-	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+	func_fatal_error "'-allow-undefined' must not be used because it is the default"
 	;;
 
       -avoid-version)
@@ -5516,7 +6926,7 @@
 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
 	  func_fatal_error "more than one -exported-symbols argument is not allowed"
 	fi
-	if test "X$arg" = "X-export-symbols"; then
+	if test X-export-symbols = "X$arg"; then
 	  prev=expsyms
 	else
 	  prev=expsyms_regex
@@ -5550,9 +6960,9 @@
 	func_stripname "-L" '' "$arg"
 	if test -z "$func_stripname_result"; then
 	  if test "$#" -gt 0; then
-	    func_fatal_error "require no space between \`-L' and \`$1'"
+	    func_fatal_error "require no space between '-L' and '$1'"
 	  else
-	    func_fatal_error "need path for \`-L' option"
+	    func_fatal_error "need path for '-L' option"
 	  fi
 	fi
 	func_resolve_sysroot "$func_stripname_result"
@@ -5563,8 +6973,8 @@
 	*)
 	  absdir=`cd "$dir" && pwd`
 	  test -z "$absdir" && \
-	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
-	  dir="$absdir"
+	    func_fatal_error "cannot determine absolute directory name of '$dir'"
+	  dir=$absdir
 	  ;;
 	esac
 	case "$deplibs " in
@@ -5599,7 +7009,7 @@
 	;;
 
       -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+	if test X-lc = "X$arg" || test X-lm = "X$arg"; then
 	  case $host in
 	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
 	    # These systems don't actually have a C or math library (as such)
@@ -5607,11 +7017,11 @@
 	    ;;
 	  *-*-os2*)
 	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
+	    test X-lc = "X$arg" && continue
 	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
 	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
+	    test X-lc = "X$arg" && continue
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C and math libraries are in the System framework
@@ -5620,16 +7030,16 @@
 	    ;;
 	  *-*-sco3.2v5* | *-*-sco5v6*)
 	    # Causes problems with __ctype
-	    test "X$arg" = "X-lc" && continue
+	    test X-lc = "X$arg" && continue
 	    ;;
 	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
 	    # Compiler inserts libc in the correct place for threads to work
-	    test "X$arg" = "X-lc" && continue
+	    test X-lc = "X$arg" && continue
 	    ;;
 	  esac
-	elif test "X$arg" = "X-lc_r"; then
+	elif test X-lc_r = "X$arg"; then
 	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
 	   # Do not include libc_r directly, use -pthread flag.
 	   continue
 	   ;;
@@ -5639,6 +7049,11 @@
 	continue
 	;;
 
+      -mllvm)
+	prev=mllvm
+	continue
+	;;
+
       -module)
 	module=yes
 	continue
@@ -5668,7 +7083,7 @@
 	;;
 
       -multi_module)
-	single_module="${wl}-multi_module"
+	single_module=$wl-multi_module
 	continue
 	;;
 
@@ -5682,8 +7097,8 @@
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
 	  # The PATH hackery in wrapper scripts is required on Windows
 	  # and Darwin in order for the loader to find any dlls it needs.
-	  func_warning "\`-no-install' is ignored for $host"
-	  func_warning "assuming \`-no-fast-install' instead"
+	  func_warning "'-no-install' is ignored for $host"
+	  func_warning "assuming '-no-fast-install' instead"
 	  fast_install=no
 	  ;;
 	*) no_install=yes ;;
@@ -5701,6 +7116,11 @@
 	continue
 	;;
 
+      -os2dllname)
+	prev=os2dllname
+	continue
+	;;
+
       -o) prev=output ;;
 
       -precious-files-regex)
@@ -5788,14 +7208,14 @@
 	func_stripname '-Wc,' '' "$arg"
 	args=$func_stripname_result
 	arg=
-	save_ifs="$IFS"; IFS=','
+	save_ifs=$IFS; IFS=,
 	for flag in $args; do
-	  IFS="$save_ifs"
+	  IFS=$save_ifs
           func_quote_for_eval "$flag"
 	  func_append arg " $func_quote_for_eval_result"
 	  func_append compiler_flags " $func_quote_for_eval_result"
 	done
-	IFS="$save_ifs"
+	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
 	arg=$func_stripname_result
 	;;
@@ -5804,15 +7224,15 @@
 	func_stripname '-Wl,' '' "$arg"
 	args=$func_stripname_result
 	arg=
-	save_ifs="$IFS"; IFS=','
+	save_ifs=$IFS; IFS=,
 	for flag in $args; do
-	  IFS="$save_ifs"
+	  IFS=$save_ifs
           func_quote_for_eval "$flag"
 	  func_append arg " $wl$func_quote_for_eval_result"
 	  func_append compiler_flags " $wl$func_quote_for_eval_result"
 	  func_append linker_flags " $func_quote_for_eval_result"
 	done
-	IFS="$save_ifs"
+	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
 	arg=$func_stripname_result
 	;;
@@ -5835,7 +7255,7 @@
       # -msg_* for osf cc
       -msg_*)
 	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
 	;;
 
       # Flags to be passed through unchanged, with rationale:
@@ -5847,25 +7267,49 @@
       # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
       # -F/path              path to uninstalled frameworks, gcc on darwin
       # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # -fstack-protector*   stack protector flags for GCC
       # @file                GCC response files
       # -tp=*                Portland pgcc target processor selection
       # --sysroot=*          for sysroot support
-      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      # -specs=*             GCC specs files
+      # -stdlib=*            select c++ std lib with clang
+      # -fsanitize=*         Clang/GCC memory and address sanitizer
       -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*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+      -specs=*|-fsanitize=*)
         func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
         func_append compile_command " $arg"
         func_append finalize_command " $arg"
         func_append compiler_flags " $arg"
         continue
         ;;
 
+      -Z*)
+        if test os2 = "`expr $host : '.*\(os2\)'`"; then
+          # OS/2 uses -Zxxx to specify OS/2-specific options
+	  compiler_flags="$compiler_flags $arg"
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  case $arg in
+	  -Zlinker | -Zstack)
+	    prev=xcompiler
+	    ;;
+	  esac
+	  continue
+        else
+	  # Otherwise treat like 'Some other compiler flag' below
+	  func_quote_for_eval "$arg"
+	  arg=$func_quote_for_eval_result
+        fi
+	;;
+
       # Some other compiler flag.
       -* | +*)
         func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
 	;;
 
       *.$objext)
@@ -5886,21 +7330,21 @@
 
 	  if test -z "$pic_object" ||
 	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none &&
-	     test "$non_pic_object" = none; then
-	    func_fatal_error "cannot find name of object for \`$arg'"
+	     test none = "$pic_object" &&
+	     test none = "$non_pic_object"; then
+	    func_fatal_error "cannot find name of object for '$arg'"
 	  fi
 
 	  # Extract subdirectory from the argument.
 	  func_dirname "$arg" "/" ""
-	  xdir="$func_dirname_result"
+	  xdir=$func_dirname_result
 
-	  if test "$pic_object" != none; then
+	  test none = "$pic_object" || {
 	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
+	    pic_object=$xdir$pic_object
 
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+	    if test dlfiles = "$prev"; then
+	      if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
 		func_append dlfiles " $pic_object"
 		prev=
 		continue
@@ -5911,7 +7355,7 @@
 	    fi
 
 	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
+	    if test dlprefiles = "$prev"; then
 	      # Preload the old-style object.
 	      func_append dlprefiles " $pic_object"
 	      prev=
@@ -5919,23 +7363,23 @@
 
 	    # A PIC object.
 	    func_append libobjs " $pic_object"
-	    arg="$pic_object"
-	  fi
+	    arg=$pic_object
+	  }
 
 	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
+	  if test none != "$non_pic_object"; then
 	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
+	    non_pic_object=$xdir$non_pic_object
 
 	    # A standard non-PIC object
 	    func_append non_pic_objects " $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
+	    if test -z "$pic_object" || test none = "$pic_object"; then
+	      arg=$non_pic_object
 	    fi
 	  else
 	    # If the PIC object exists, use it instead.
 	    # $xdir was prepended to $pic_object above.
-	    non_pic_object="$pic_object"
+	    non_pic_object=$pic_object
 	    func_append non_pic_objects " $non_pic_object"
 	  fi
 	else
@@ -5943,7 +7387,7 @@
 	  if $opt_dry_run; then
 	    # Extract subdirectory from the argument.
 	    func_dirname "$arg" "/" ""
-	    xdir="$func_dirname_result"
+	    xdir=$func_dirname_result
 
 	    func_lo2o "$arg"
 	    pic_object=$xdir$objdir/$func_lo2o_result
@@ -5951,7 +7395,7 @@
 	    func_append libobjs " $pic_object"
 	    func_append non_pic_objects " $non_pic_object"
 	  else
-	    func_fatal_error "\`$arg' is not a valid libtool object"
+	    func_fatal_error "'$arg' is not a valid libtool object"
 	  fi
 	fi
 	;;
@@ -5967,11 +7411,11 @@
 	# A libtool-controlled library.
 
 	func_resolve_sysroot "$arg"
-	if test "$prev" = dlfiles; then
+	if test dlfiles = "$prev"; then
 	  # This library was specified with -dlopen.
 	  func_append dlfiles " $func_resolve_sysroot_result"
 	  prev=
-	elif test "$prev" = dlprefiles; then
+	elif test dlprefiles = "$prev"; then
 	  # The library was specified with -dlpreopen.
 	  func_append dlprefiles " $func_resolve_sysroot_result"
 	  prev=
@@ -5986,7 +7430,7 @@
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
 	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
 	;;
       esac # arg
 
@@ -5998,9 +7442,9 @@
     done # argument parsing loop
 
     test -n "$prev" && \
-      func_fatal_help "the \`$prevarg' option requires an argument"
+      func_fatal_help "the '$prevarg' option requires an argument"
 
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+    if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
       eval arg=\"$export_dynamic_flag_spec\"
       func_append compile_command " $arg"
       func_append finalize_command " $arg"
@@ -6009,20 +7453,23 @@
     oldlibs=
     # calculate the name of the file, without its directory
     func_basename "$output"
-    outputname="$func_basename_result"
-    libobjs_save="$libobjs"
+    outputname=$func_basename_result
+    libobjs_save=$libobjs
 
     if test -n "$shlibpath_var"; then
       # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+      eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
     else
       shlib_search_path=
     fi
     eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
     eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
 
+    # Definition is injected by LT_CONFIG during libtool generation.
+    func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+
     func_dirname "$output" "/" ""
-    output_objdir="$func_dirname_result$objdir"
+    output_objdir=$func_dirname_result$objdir
     func_to_tool_file "$output_objdir/"
     tool_output_objdir=$func_to_tool_file_result
     # Create the object directory.
@@ -6045,7 +7492,7 @@
     # Find all interdependent deplibs by searching for libraries
     # that are linked more than once (e.g. -la -lb -la)
     for deplib in $deplibs; do
-      if $opt_preserve_dup_deps ; then
+      if $opt_preserve_dup_deps; then
 	case "$libs " in
 	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	esac
@@ -6053,7 +7500,7 @@
       func_append libs " $deplib"
     done
 
-    if test "$linkmode" = lib; then
+    if test lib = "$linkmode"; then
       libs="$predeps $libs $compiler_lib_search_path $postdeps"
 
       # Compute libraries that are listed more than once in $predeps
@@ -6085,7 +7532,7 @@
 	  case $file in
 	  *.la) ;;
 	  *)
-	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+	    func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
 	    ;;
 	  esac
 	done
@@ -6093,7 +7540,7 @@
     prog)
 	compile_deplibs=
 	finalize_deplibs=
-	alldeplibs=no
+	alldeplibs=false
 	newdlfiles=
 	newdlprefiles=
 	passes="conv scan dlopen dlpreopen link"
@@ -6105,32 +7552,32 @@
     for pass in $passes; do
       # The preopen pass in lib mode reverses $deplibs; put it back here
       # so that -L comes before libs that need it for instance...
-      if test "$linkmode,$pass" = "lib,link"; then
+      if test lib,link = "$linkmode,$pass"; then
 	## FIXME: Find the place where the list is rebuilt in the wrong
 	##        order, and fix it there properly
         tmp_deplibs=
 	for deplib in $deplibs; do
 	  tmp_deplibs="$deplib $tmp_deplibs"
 	done
-	deplibs="$tmp_deplibs"
+	deplibs=$tmp_deplibs
       fi
 
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
+      if test lib,link = "$linkmode,$pass" ||
+	 test prog,scan = "$linkmode,$pass"; then
+	libs=$deplibs
 	deplibs=
       fi
-      if test "$linkmode" = prog; then
+      if test prog = "$linkmode"; then
 	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
+	dlopen) libs=$dlfiles ;;
+	dlpreopen) libs=$dlprefiles ;;
 	link)
 	  libs="$deplibs %DEPLIBS%"
 	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
 	  ;;
 	esac
       fi
-      if test "$linkmode,$pass" = "lib,dlpreopen"; then
+      if test lib,dlpreopen = "$linkmode,$pass"; then
 	# Collect and forward deplibs of preopened libtool libs
 	for lib in $dlprefiles; do
 	  # Ignore non-libtool-libs
@@ -6151,26 +7598,26 @@
 	    esac
 	  done
 	done
-	libs="$dlprefiles"
+	libs=$dlprefiles
       fi
-      if test "$pass" = dlopen; then
+      if test dlopen = "$pass"; then
 	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
+	save_deplibs=$deplibs
 	deplibs=
       fi
 
       for deplib in $libs; do
 	lib=
-	found=no
+	found=false
 	case $deplib in
 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
         |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-	  if test "$linkmode,$pass" = "prog,link"; then
+	  if test prog,link = "$linkmode,$pass"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
 	  else
 	    func_append compiler_flags " $deplib"
-	    if test "$linkmode" = lib ; then
+	    if test lib = "$linkmode"; then
 		case "$new_inherited_linker_flags " in
 		    *" $deplib "*) ;;
 		    * ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6180,13 +7627,13 @@
 	  continue
 	  ;;
 	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    func_warning "\`-l' is ignored for archives/objects"
+	  if test lib != "$linkmode" && test prog != "$linkmode"; then
+	    func_warning "'-l' is ignored for archives/objects"
 	    continue
 	  fi
 	  func_stripname '-l' '' "$deplib"
 	  name=$func_stripname_result
-	  if test "$linkmode" = lib; then
+	  if test lib = "$linkmode"; then
 	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
 	  else
 	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
@@ -6194,31 +7641,22 @@
 	  for searchdir in $searchdirs; do
 	    for search_ext in .la $std_shrext .so .a; do
 	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
+	      lib=$searchdir/lib$name$search_ext
 	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
+		if test .la = "$search_ext"; then
+		  found=:
 		else
-		  found=no
+		  found=false
 		fi
 		break 2
 	      fi
 	    done
 	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
+	  if $found; then
+	    # deplib is a libtool library
 	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
 	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	    if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 	      case " $predeps $postdeps " in
 	      *" $deplib "*)
 		if func_lalib_p "$lib"; then
@@ -6226,19 +7664,19 @@
 		  old_library=
 		  func_source "$lib"
 		  for l in $old_library $library_names; do
-		    ll="$l"
+		    ll=$l
 		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
+		  if test "X$ll" = "X$old_library"; then # only static version available
+		    found=false
 		    func_dirname "$lib" "" "."
-		    ladir="$func_dirname_result"
+		    ladir=$func_dirname_result
 		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
+		    if test prog,link = "$linkmode,$pass"; then
 		      compile_deplibs="$deplib $compile_deplibs"
 		      finalize_deplibs="$deplib $finalize_deplibs"
 		    else
 		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+		      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
 		    fi
 		    continue
 		  fi
@@ -6247,15 +7685,25 @@
 	      *) ;;
 	      esac
 	    fi
+	  else
+	    # deplib doesn't seem to be a libtool library
+	    if test prog,link = "$linkmode,$pass"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
 	  fi
 	  ;; # -l
 	*.ltframework)
-	  if test "$linkmode,$pass" = "prog,link"; then
+	  if test prog,link = "$linkmode,$pass"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
 	  else
 	    deplibs="$deplib $deplibs"
-	    if test "$linkmode" = lib ; then
+	    if test lib = "$linkmode"; then
 		case "$new_inherited_linker_flags " in
 		    *" $deplib "*) ;;
 		    * ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6268,18 +7716,18 @@
 	  case $linkmode in
 	  lib)
 	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
+	    test conv = "$pass" && continue
 	    newdependency_libs="$deplib $newdependency_libs"
 	    func_stripname '-L' '' "$deplib"
 	    func_resolve_sysroot "$func_stripname_result"
 	    func_append newlib_search_path " $func_resolve_sysroot_result"
 	    ;;
 	  prog)
-	    if test "$pass" = conv; then
+	    if test conv = "$pass"; then
 	      deplibs="$deplib $deplibs"
 	      continue
 	    fi
-	    if test "$pass" = scan; then
+	    if test scan = "$pass"; then
 	      deplibs="$deplib $deplibs"
 	    else
 	      compile_deplibs="$deplib $compile_deplibs"
@@ -6290,13 +7738,13 @@
 	    func_append newlib_search_path " $func_resolve_sysroot_result"
 	    ;;
 	  *)
-	    func_warning "\`-L' is ignored for archives/objects"
+	    func_warning "'-L' is ignored for archives/objects"
 	    ;;
 	  esac # linkmode
 	  continue
 	  ;; # -L
 	-R*)
-	  if test "$pass" = link; then
+	  if test link = "$pass"; then
 	    func_stripname '-R' '' "$deplib"
 	    func_resolve_sysroot "$func_stripname_result"
 	    dir=$func_resolve_sysroot_result
@@ -6314,7 +7762,7 @@
 	  lib=$func_resolve_sysroot_result
 	  ;;
 	*.$libext)
-	  if test "$pass" = conv; then
+	  if test conv = "$pass"; then
 	    deplibs="$deplib $deplibs"
 	    continue
 	  fi
@@ -6325,21 +7773,26 @@
 	    case " $dlpreconveniencelibs " in
 	    *" $deplib "*) ;;
 	    *)
-	      valid_a_lib=no
+	      valid_a_lib=false
 	      case $deplibs_check_method in
 		match_pattern*)
 		  set dummy $deplibs_check_method; shift
 		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
 		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
 		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		    valid_a_lib=yes
+		    valid_a_lib=:
 		  fi
 		;;
 		pass_all)
-		  valid_a_lib=yes
+		  valid_a_lib=:
 		;;
 	      esac
-	      if test "$valid_a_lib" != yes; then
+	      if $valid_a_lib; then
+		echo
+		$ECHO "*** Warning: Linking the shared library $output against the"
+		$ECHO "*** static library $deplib is not portable!"
+		deplibs="$deplib $deplibs"
+	      else
 		echo
 		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
 		echo "*** I have the capability to make that library automatically link in when"
@@ -6347,18 +7800,13 @@
 		echo "*** shared version of the library, which you do not appear to have"
 		echo "*** because the file extensions .$libext of this argument makes me believe"
 		echo "*** that it is just a static archive that I should not use here."
-	      else
-		echo
-		$ECHO "*** Warning: Linking the shared library $output against the"
-		$ECHO "*** static library $deplib is not portable!"
-		deplibs="$deplib $deplibs"
 	      fi
 	      ;;
 	    esac
 	    continue
 	    ;;
 	  prog)
-	    if test "$pass" != link; then
+	    if test link != "$pass"; then
 	      deplibs="$deplib $deplibs"
 	    else
 	      compile_deplibs="$deplib $compile_deplibs"
@@ -6369,10 +7817,10 @@
 	  esac # linkmode
 	  ;; # *.$libext
 	*.lo | *.$objext)
-	  if test "$pass" = conv; then
+	  if test conv = "$pass"; then
 	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	  elif test prog = "$linkmode"; then
+	    if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
 	      # If there is no dlopen support or we're linking statically,
 	      # we need to preload.
 	      func_append newdlprefiles " $deplib"
@@ -6385,22 +7833,20 @@
 	  continue
 	  ;;
 	%DEPLIBS%)
-	  alldeplibs=yes
+	  alldeplibs=:
 	  continue
 	  ;;
 	esac # case $deplib
 
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-	fi
+	$found || test -f "$lib" \
+	  || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
 
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$lib" \
-	  || func_fatal_error "\`$lib' is not a valid libtool archive"
+	  || func_fatal_error "'$lib' is not a valid libtool archive"
 
 	func_dirname "$lib" "" "."
-	ladir="$func_dirname_result"
+	ladir=$func_dirname_result
 
 	dlname=
 	dlopen=
@@ -6430,19 +7876,19 @@
 	  done
 	fi
 	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+	if test lib,link = "$linkmode,$pass" ||
+	   test prog,scan = "$linkmode,$pass" ||
+	   { test prog != "$linkmode" && test lib != "$linkmode"; }; then
 	  test -n "$dlopen" && func_append dlfiles " $dlopen"
 	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
 	fi
 
-	if test "$pass" = conv; then
+	if test conv = "$pass"; then
 	  # Only check for convenience libraries
 	  deplibs="$lib $deplibs"
 	  if test -z "$libdir"; then
 	    if test -z "$old_library"; then
-	      func_fatal_error "cannot find name of link library for \`$lib'"
+	      func_fatal_error "cannot find name of link library for '$lib'"
 	    fi
 	    # It is a libtool convenience library, so add in its objects.
 	    func_append convenience " $ladir/$objdir/$old_library"
@@ -6450,15 +7896,15 @@
 	    tmp_libs=
 	    for deplib in $dependency_libs; do
 	      deplibs="$deplib $deplibs"
-	      if $opt_preserve_dup_deps ; then
+	      if $opt_preserve_dup_deps; then
 		case "$tmp_libs " in
 		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
 		esac
 	      fi
 	      func_append tmp_libs " $deplib"
 	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    func_fatal_error "\`$lib' is not a convenience library"
+	  elif test prog != "$linkmode" && test lib != "$linkmode"; then
+	    func_fatal_error "'$lib' is not a convenience library"
 	  fi
 	  continue
 	fi # $pass = conv
@@ -6467,26 +7913,26 @@
 	# Get the name of the library we link against.
 	linklib=
 	if test -n "$old_library" &&
-	   { test "$prefer_static_libs" = yes ||
-	     test "$prefer_static_libs,$installed" = "built,no"; }; then
+	   { test yes = "$prefer_static_libs" ||
+	     test built,no = "$prefer_static_libs,$installed"; }; then
 	  linklib=$old_library
 	else
 	  for l in $old_library $library_names; do
-	    linklib="$l"
+	    linklib=$l
 	  done
 	fi
 	if test -z "$linklib"; then
-	  func_fatal_error "cannot find name of link library for \`$lib'"
+	  func_fatal_error "cannot find name of link library for '$lib'"
 	fi
 
 	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-	  fi
+	if test dlopen = "$pass"; then
+	  test -z "$libdir" \
+	    && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
 	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
+	     test yes != "$dlopen_support" ||
+	     test no = "$build_libtool_libs"
+	  then
 	    # If there is no dlname, no dlopen support or we're linking
 	    # statically, we need to preload.  We also need to preload any
 	    # dependent libraries so libltdl's deplib preloader doesn't
@@ -6500,40 +7946,40 @@
 
 	# We need an absolute path.
 	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
 	*)
 	  abs_ladir=`cd "$ladir" && pwd`
 	  if test -z "$abs_ladir"; then
-	    func_warning "cannot determine absolute directory name of \`$ladir'"
+	    func_warning "cannot determine absolute directory name of '$ladir'"
 	    func_warning "passing it literally to the linker, although it might fail"
-	    abs_ladir="$ladir"
+	    abs_ladir=$ladir
 	  fi
 	  ;;
 	esac
 	func_basename "$lib"
-	laname="$func_basename_result"
+	laname=$func_basename_result
 
 	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
+	if test yes = "$installed"; then
 	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    func_warning "library \`$lib' was moved."
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
+	    func_warning "library '$lib' was moved."
+	    dir=$ladir
+	    absdir=$abs_ladir
+	    libdir=$abs_ladir
 	  else
-	    dir="$lt_sysroot$libdir"
-	    absdir="$lt_sysroot$libdir"
+	    dir=$lt_sysroot$libdir
+	    absdir=$lt_sysroot$libdir
 	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+	  test yes = "$hardcode_automatic" && avoidtemprpath=yes
 	else
 	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
+	    dir=$ladir
+	    absdir=$abs_ladir
 	    # Remove this search path later
 	    func_append notinst_path " $abs_ladir"
 	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
+	    dir=$ladir/$objdir
+	    absdir=$abs_ladir/$objdir
 	    # Remove this search path later
 	    func_append notinst_path " $abs_ladir"
 	  fi
@@ -6542,11 +7988,11 @@
 	name=$func_stripname_result
 
 	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir" && test "$linkmode" = prog; then
-	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+	if test dlpreopen = "$pass"; then
+	  if test -z "$libdir" && test prog = "$linkmode"; then
+	    func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
 	  fi
-	  case "$host" in
+	  case $host in
 	    # special handling for platforms with PE-DLLs.
 	    *cygwin* | *mingw* | *cegcc* )
 	      # Linker will automatically link against shared library if both
@@ -6590,9 +8036,9 @@
 
 	if test -z "$libdir"; then
 	  # Link the convenience library
-	  if test "$linkmode" = lib; then
+	  if test lib = "$linkmode"; then
 	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
+	  elif test prog,link = "$linkmode,$pass"; then
 	    compile_deplibs="$dir/$old_library $compile_deplibs"
 	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
 	  else
@@ -6602,14 +8048,14 @@
 	fi
 
 
-	if test "$linkmode" = prog && test "$pass" != link; then
+	if test prog = "$linkmode" && test link != "$pass"; then
 	  func_append newlib_search_path " $ladir"
 	  deplibs="$lib $deplibs"
 
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
+	  linkalldeplibs=false
+	  if test no != "$link_all_deplibs" || test -z "$library_names" ||
+	     test no = "$build_libtool_libs"; then
+	    linkalldeplibs=:
 	  fi
 
 	  tmp_libs=
@@ -6621,14 +8067,14 @@
 		 ;;
 	    esac
 	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
+	    if $linkalldeplibs; then
 	      deplibs="$deplib $deplibs"
 	    else
 	      # Need to hardcode shared library paths
 	      # or/and link against static libraries
 	      newdependency_libs="$deplib $newdependency_libs"
 	    fi
-	    if $opt_preserve_dup_deps ; then
+	    if $opt_preserve_dup_deps; then
 	      case "$tmp_libs " in
 	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	      esac
@@ -6638,15 +8084,15 @@
 	  continue
 	fi # $linkmode = prog...
 
-	if test "$linkmode,$pass" = "prog,link"; then
+	if test prog,link = "$linkmode,$pass"; then
 	  if test -n "$library_names" &&
-	     { { test "$prefer_static_libs" = no ||
-	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	     { { test no = "$prefer_static_libs" ||
+	         test built,yes = "$prefer_static_libs,$installed"; } ||
 	       test -z "$old_library"; }; then
 	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
 	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath:" in
+	      case $temp_rpath: in
 	      *"$absdir:"*) ;;
 	      *) func_append temp_rpath "$absdir:" ;;
 	      esac
@@ -6675,9 +8121,9 @@
 	    esac
 	  fi # $linkmode,$pass = prog,link...
 
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
+	  if $alldeplibs &&
+	     { test pass_all = "$deplibs_check_method" ||
+	       { test yes = "$build_libtool_libs" &&
 		 test -n "$library_names"; }; }; then
 	    # We only need to search for static libraries
 	    continue
@@ -6686,19 +8132,19 @@
 
 	link_static=no # Whether the deplib will be linked statically
 	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes; then
+	if test built = "$use_static_libs" && test yes = "$installed"; then
 	  use_static_libs=no
 	fi
 	if test -n "$library_names" &&
-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+	   { test no = "$use_static_libs" || test -z "$old_library"; }; then
 	  case $host in
-	  *cygwin* | *mingw* | *cegcc*)
+	  *cygwin* | *mingw* | *cegcc* | *os2*)
 	      # No point in relinking DLLs because paths are not encoded
 	      func_append notinst_deplibs " $lib"
 	      need_relink=no
 	    ;;
 	  *)
-	    if test "$installed" = no; then
+	    if test no = "$installed"; then
 	      func_append notinst_deplibs " $lib"
 	      need_relink=yes
 	    fi
@@ -6708,24 +8154,24 @@
 
 	  # Warn about portability, can't link against -module's on some
 	  # systems (darwin).  Don't bleat about dlopened modules though!
-	  dlopenmodule=""
+	  dlopenmodule=
 	  for dlpremoduletest in $dlprefiles; do
 	    if test "X$dlpremoduletest" = "X$lib"; then
-	      dlopenmodule="$dlpremoduletest"
+	      dlopenmodule=$dlpremoduletest
 	      break
 	    fi
 	  done
-	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+	  if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
 	    echo
-	    if test "$linkmode" = prog; then
+	    if test prog = "$linkmode"; then
 	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
 	    else
 	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
 	    fi
 	    $ECHO "*** $linklib is not portable!"
 	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
+	  if test lib = "$linkmode" &&
+	     test yes = "$hardcode_into_libs"; then
 	    # Hardcode the library path.
 	    # Skip directories that are in the system default run-time
 	    # search path.
@@ -6753,43 +8199,43 @@
 	    # figure out the soname
 	    set dummy $library_names
 	    shift
-	    realname="$1"
+	    realname=$1
 	    shift
 	    libname=`eval "\\$ECHO \"$libname_spec\""`
 	    # use dlname if we got it. it's perfectly good, no?
 	    if test -n "$dlname"; then
-	      soname="$dlname"
+	      soname=$dlname
 	    elif test -n "$soname_spec"; then
 	      # bleh windows
 	      case $host in
-	      *cygwin* | mingw* | *cegcc*)
+	      *cygwin* | mingw* | *cegcc* | *os2*)
 	        func_arith $current - $age
 		major=$func_arith_result
-		versuffix="-$major"
+		versuffix=-$major
 		;;
 	      esac
 	      eval soname=\"$soname_spec\"
 	    else
-	      soname="$realname"
+	      soname=$realname
 	    fi
 
 	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
+	    soroot=$soname
 	    func_basename "$soroot"
-	    soname="$func_basename_result"
+	    soname=$func_basename_result
 	    func_stripname 'lib' '.dll' "$soname"
 	    newlib=libimp-$func_stripname_result.a
 
 	    # If the library has no export list, then create one now
 	    if test -f "$output_objdir/$soname-def"; then :
 	    else
-	      func_verbose "extracting exported symbol list from \`$soname'"
+	      func_verbose "extracting exported symbol list from '$soname'"
 	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
 	    fi
 
 	    # Create $newlib
 	    if test -f "$output_objdir/$newlib"; then :; else
-	      func_verbose "generating import library for \`$soname'"
+	      func_verbose "generating import library for '$soname'"
 	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
 	    fi
 	    # make sure the library variables are pointing to the new library
@@ -6797,58 +8243,58 @@
 	    linklib=$newlib
 	  fi # test -n "$old_archive_from_expsyms_cmds"
 
-	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
+	  if test prog = "$linkmode" || test relink != "$opt_mode"; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
 	    lib_linked=yes
 	    case $hardcode_action in
 	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
+	      if test no = "$hardcode_direct"; then
+		add=$dir/$linklib
 		case $host in
-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+		  *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
+		  *-*-sysv4*uw2*) add_dir=-L$dir ;;
 		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		    *-*-unixware7*) add_dir="-L$dir" ;;
+		    *-*-unixware7*) add_dir=-L$dir ;;
 		  *-*-darwin* )
-		    # if the lib is a (non-dlopened) module then we can not
+		    # if the lib is a (non-dlopened) module then we cannot
 		    # link against it, someone is ignoring the earlier warnings
 		    if /usr/bin/file -L $add 2> /dev/null |
-			 $GREP ": [^:]* bundle" >/dev/null ; then
+			 $GREP ": [^:]* bundle" >/dev/null; then
 		      if test "X$dlopenmodule" != "X$lib"; then
 			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-			if test -z "$old_library" ; then
+			if test -z "$old_library"; then
 			  echo
 			  echo "*** And there doesn't seem to be a static archive available"
 			  echo "*** The link will probably fail, sorry"
 			else
-			  add="$dir/$old_library"
+			  add=$dir/$old_library
 			fi
 		      elif test -n "$old_library"; then
-			add="$dir/$old_library"
+			add=$dir/$old_library
 		      fi
 		    fi
 		esac
-	      elif test "$hardcode_minus_L" = no; then
+	      elif test no = "$hardcode_minus_L"; then
 		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
+		*-*-sunos*) add_shlibpath=$dir ;;
 		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
+		add_dir=-L$dir
+		add=-l$name
+	      elif test no = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
 	      else
 		lib_linked=no
 	      fi
 	      ;;
 	    relink)
-	      if test "$hardcode_direct" = yes &&
-	         test "$hardcode_direct_absolute" = no; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$absdir"
+	      if test yes = "$hardcode_direct" &&
+	         test no = "$hardcode_direct_absolute"; then
+		add=$dir/$linklib
+	      elif test yes = "$hardcode_minus_L"; then
+		add_dir=-L$absdir
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -6857,10 +8303,10 @@
 		      ;;
 		  esac
 		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
+		add=-l$name
+	      elif test yes = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
 	      else
 		lib_linked=no
 	      fi
@@ -6868,7 +8314,7 @@
 	    *) lib_linked=no ;;
 	    esac
 
-	    if test "$lib_linked" != yes; then
+	    if test yes != "$lib_linked"; then
 	      func_fatal_configuration "unsupported hardcode properties"
 	    fi
 
@@ -6878,15 +8324,15 @@
 	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
 	      esac
 	    fi
-	    if test "$linkmode" = prog; then
+	    if test prog = "$linkmode"; then
 	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
 	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
 	    else
 	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
 	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes &&
-		 test "$hardcode_minus_L" != yes &&
-		 test "$hardcode_shlibpath_var" = yes; then
+	      if test yes != "$hardcode_direct" &&
+		 test yes != "$hardcode_minus_L" &&
+		 test yes = "$hardcode_shlibpath_var"; then
 		case :$finalize_shlibpath: in
 		*":$libdir:"*) ;;
 		*) func_append finalize_shlibpath "$libdir:" ;;
@@ -6895,33 +8341,33 @@
 	    fi
 	  fi
 
-	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
+	  if test prog = "$linkmode" || test relink = "$opt_mode"; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
 	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes &&
-	       test "$hardcode_direct_absolute" = no; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
+	    if test yes = "$hardcode_direct" &&
+	       test no = "$hardcode_direct_absolute"; then
+	      add=$libdir/$linklib
+	    elif test yes = "$hardcode_minus_L"; then
+	      add_dir=-L$libdir
+	      add=-l$name
+	    elif test yes = "$hardcode_shlibpath_var"; then
 	      case :$finalize_shlibpath: in
 	      *":$libdir:"*) ;;
 	      *) func_append finalize_shlibpath "$libdir:" ;;
 	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
+	      add=-l$name
+	    elif test yes = "$hardcode_automatic"; then
 	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-		add="$inst_prefix_dir$libdir/$linklib"
+		 test -f "$inst_prefix_dir$libdir/$linklib"; then
+		add=$inst_prefix_dir$libdir/$linklib
 	      else
-		add="$libdir/$linklib"
+		add=$libdir/$linklib
 	      fi
 	    else
 	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
+	      add_dir=-L$libdir
 	      # Try looking first in the location we're being installed to.
 	      if test -n "$inst_prefix_dir"; then
 		case $libdir in
@@ -6930,10 +8376,10 @@
 		    ;;
 		esac
 	      fi
-	      add="-l$name"
+	      add=-l$name
 	    fi
 
-	    if test "$linkmode" = prog; then
+	    if test prog = "$linkmode"; then
 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
 	    else
@@ -6941,43 +8387,43 @@
 	      test -n "$add" && deplibs="$add $deplibs"
 	    fi
 	  fi
-	elif test "$linkmode" = prog; then
+	elif test prog = "$linkmode"; then
 	  # Here we assume that one of hardcode_direct or hardcode_minus_L
 	  # is not unsupported.  This is valid on all known static and
 	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
+	  if test unsupported != "$hardcode_direct"; then
+	    test -n "$old_library" && linklib=$old_library
 	    compile_deplibs="$dir/$linklib $compile_deplibs"
 	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
 	  else
 	    compile_deplibs="-l$name -L$dir $compile_deplibs"
 	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
 	  fi
-	elif test "$build_libtool_libs" = yes; then
+	elif test yes = "$build_libtool_libs"; then
 	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
+	  if test pass_all != "$deplibs_check_method"; then
 	    # We're trying link a shared library against a static one
 	    # but the system doesn't support it.
 
 	    # Just print a warning and add the library to dependency_libs so
 	    # that the program can be linked against the static library.
 	    echo
-	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
+	    $ECHO "*** Warning: This system cannot link to static lib archive $lib."
 	    echo "*** I have the capability to make that library automatically link in when"
 	    echo "*** you link to this library.  But I can only do this if you have a"
 	    echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
+	    if test yes = "$module"; then
 	      echo "*** But as you try to build a module library, libtool will still create "
 	      echo "*** a static module, that should work as long as the dlopening application"
 	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
 	      if test -z "$global_symbol_pipe"; then
 		echo
 		echo "*** However, this would only work if libtool was able to extract symbol"
-		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
 		echo "*** not find such a program.  So, this module is probably useless."
-		echo "*** \`nm' from GNU binutils and a full rebuild may help."
+		echo "*** 'nm' from GNU binutils and a full rebuild may help."
 	      fi
-	      if test "$build_old_libs" = no; then
+	      if test no = "$build_old_libs"; then
 		build_libtool_libs=module
 		build_old_libs=yes
 	      else
@@ -6990,11 +8436,11 @@
 	  fi
 	fi # link shared/static library?
 
-	if test "$linkmode" = lib; then
+	if test lib = "$linkmode"; then
 	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
+	     { test yes != "$hardcode_into_libs" ||
+	       test yes = "$build_old_libs" ||
+	       test yes = "$link_static"; }; then
 	    # Extract -R from dependency_libs
 	    temp_deplibs=
 	    for libdir in $dependency_libs; do
@@ -7008,12 +8454,12 @@
 	      *) func_append temp_deplibs " $libdir";;
 	      esac
 	    done
-	    dependency_libs="$temp_deplibs"
+	    dependency_libs=$temp_deplibs
 	  fi
 
 	  func_append newlib_search_path " $absdir"
 	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
 	  # ... and its dependency_libs
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
@@ -7023,7 +8469,7 @@
                    func_resolve_sysroot "$func_stripname_result";;
               *) func_resolve_sysroot "$deplib" ;;
             esac
-	    if $opt_preserve_dup_deps ; then
+	    if $opt_preserve_dup_deps; then
 	      case "$tmp_libs " in
 	      *" $func_resolve_sysroot_result "*)
                 func_append specialdeplibs " $func_resolve_sysroot_result" ;;
@@ -7032,12 +8478,12 @@
 	    func_append tmp_libs " $func_resolve_sysroot_result"
 	  done
 
-	  if test "$link_all_deplibs" != no; then
+	  if test no != "$link_all_deplibs"; then
 	    # Add the search paths of all dependency libraries
 	    for deplib in $dependency_libs; do
 	      path=
 	      case $deplib in
-	      -L*) path="$deplib" ;;
+	      -L*) path=$deplib ;;
 	      *.la)
 	        func_resolve_sysroot "$deplib"
 	        deplib=$func_resolve_sysroot_result
@@ -7045,12 +8491,12 @@
 		dir=$func_dirname_result
 		# We need an absolute path.
 		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+		[\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
 		*)
 		  absdir=`cd "$dir" && pwd`
 		  if test -z "$absdir"; then
-		    func_warning "cannot determine absolute directory name of \`$dir'"
-		    absdir="$dir"
+		    func_warning "cannot determine absolute directory name of '$dir'"
+		    absdir=$dir
 		  fi
 		  ;;
 		esac
@@ -7058,35 +8504,35 @@
 		case $host in
 		*-*-darwin*)
 		  depdepl=
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
+		  eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names"; then
+		    for tmp in $deplibrary_names; do
 		      depdepl=$tmp
 		    done
-		    if test -f "$absdir/$objdir/$depdepl" ; then
-		      depdepl="$absdir/$objdir/$depdepl"
-		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+		    if test -f "$absdir/$objdir/$depdepl"; then
+		      depdepl=$absdir/$objdir/$depdepl
+		      darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
                       if test -z "$darwin_install_name"; then
-                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                          darwin_install_name=`$OTOOL64 -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
                       fi
-		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+		      func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
+		      func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
 		      path=
 		    fi
 		  fi
 		  ;;
 		*)
-		  path="-L$absdir/$objdir"
+		  path=-L$absdir/$objdir
 		  ;;
 		esac
 		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		  test -z "$libdir" && \
-		    func_fatal_error "\`$deplib' is not a valid libtool archive"
+		    func_fatal_error "'$deplib' is not a valid libtool archive"
 		  test "$absdir" != "$libdir" && \
-		    func_warning "\`$deplib' seems to be moved"
+		    func_warning "'$deplib' seems to be moved"
 
-		  path="-L$absdir"
+		  path=-L$absdir
 		fi
 		;;
 	      esac
@@ -7098,23 +8544,23 @@
 	  fi # link_all_deplibs != no
 	fi # linkmode = lib
       done # for deplib in $libs
-      if test "$pass" = link; then
-	if test "$linkmode" = "prog"; then
+      if test link = "$pass"; then
+	if test prog = "$linkmode"; then
 	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
 	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
 	else
 	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 	fi
       fi
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
+      dependency_libs=$newdependency_libs
+      if test dlpreopen = "$pass"; then
 	# Link the dlpreopened libraries before other libraries
 	for deplib in $save_deplibs; do
 	  deplibs="$deplib $deplibs"
 	done
       fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
+      if test dlopen != "$pass"; then
+	test conv = "$pass" || {
 	  # Make sure lib_search_path contains only unique directories.
 	  lib_search_path=
 	  for dir in $newlib_search_path; do
@@ -7124,12 +8570,12 @@
 	    esac
 	  done
 	  newlib_search_path=
-	fi
+	}
 
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
+	if test prog,link = "$linkmode,$pass"; then
 	  vars="compile_deplibs finalize_deplibs"
+	else
+	  vars=deplibs
 	fi
 	for var in $vars dependency_libs; do
 	  # Add libraries to $var in reverse order
@@ -7187,62 +8633,93 @@
 	  eval $var=\"$tmp_libs\"
 	done # for var
       fi
+
+      # Add Sun CC postdeps if required:
+      test CXX = "$tagname" && {
+        case $host_os in
+        linux*)
+          case `$CC -V 2>&1 | sed 5q` in
+          *Sun\ C*) # Sun C++ 5.9
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+
+        solaris*)
+          func_cc_basename "$CC"
+          case $func_cc_basename_result in
+          CC* | sunCC*)
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+        esac
+      }
+
       # Last step: remove runtime libs from dependency_libs
       # (they stay in deplibs)
       tmp_libs=
-      for i in $dependency_libs ; do
+      for i in $dependency_libs; do
 	case " $predeps $postdeps $compiler_lib_search_path " in
 	*" $i "*)
-	  i=""
+	  i=
 	  ;;
 	esac
-	if test -n "$i" ; then
+	if test -n "$i"; then
 	  func_append tmp_libs " $i"
 	fi
       done
       dependency_libs=$tmp_libs
     done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
+    if test prog = "$linkmode"; then
+      dlfiles=$newdlfiles
     fi
-    if test "$linkmode" = prog || test "$linkmode" = lib; then
-      dlprefiles="$newdlprefiles"
+    if test prog = "$linkmode" || test lib = "$linkmode"; then
+      dlprefiles=$newdlprefiles
     fi
 
     case $linkmode in
     oldlib)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for archives"
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for archives"
       fi
 
       case " $deplibs" in
       *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for archives" ;;
+	func_warning "'-l' and '-L' are ignored for archives" ;;
       esac
 
       test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for archives"
+	func_warning "'-rpath' is ignored for archives"
 
       test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for archives"
+	func_warning "'-R' is ignored for archives"
 
       test -n "$vinfo" && \
-	func_warning "\`-version-info/-version-number' is ignored for archives"
+	func_warning "'-version-info/-version-number' is ignored for archives"
 
       test -n "$release" && \
-	func_warning "\`-release' is ignored for archives"
+	func_warning "'-release' is ignored for archives"
 
       test -n "$export_symbols$export_symbols_regex" && \
-	func_warning "\`-export-symbols' is ignored for archives"
+	func_warning "'-export-symbols' is ignored for archives"
 
       # Now set the variables for building old libraries.
       build_libtool_libs=no
-      oldlibs="$output"
+      oldlibs=$output
       func_append objs "$old_deplibs"
       ;;
 
     lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
+      # Make sure we only generate libraries of the form 'libNAME.la'.
       case $outputname in
       lib*)
 	func_stripname 'lib' '.la' "$outputname"
@@ -7251,10 +8728,10 @@
 	eval libname=\"$libname_spec\"
 	;;
       *)
-	test "$module" = no && \
-	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
+	test no = "$module" \
+	  && func_fatal_help "libtool library '$output' must begin with 'lib'"
 
-	if test "$need_lib_prefix" != no; then
+	if test no != "$need_lib_prefix"; then
 	  # Add the "lib" prefix for modules if required
 	  func_stripname '' '.la' "$outputname"
 	  name=$func_stripname_result
@@ -7268,8 +8745,8 @@
       esac
 
       if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+	if test pass_all != "$deplibs_check_method"; then
+	  func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
 	else
 	  echo
 	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
@@ -7278,21 +8755,21 @@
 	fi
       fi
 
-      test "$dlself" != no && \
-	func_warning "\`-dlopen self' is ignored for libtool libraries"
+      test no = "$dlself" \
+	|| func_warning "'-dlopen self' is ignored for libtool libraries"
 
       set dummy $rpath
       shift
-      test "$#" -gt 1 && \
-	func_warning "ignoring multiple \`-rpath's for a libtool library"
+      test 1 -lt "$#" \
+	&& func_warning "ignoring multiple '-rpath's for a libtool library"
 
-      install_libdir="$1"
+      install_libdir=$1
 
       oldlibs=
       if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
+	if test yes = "$build_libtool_libs"; then
 	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
+	  # Some compilers have problems with a '.al' extension so
 	  # convenience libraries should have the same extension an
 	  # archive normally would.
 	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
@@ -7301,20 +8778,20 @@
 	fi
 
 	test -n "$vinfo" && \
-	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+	  func_warning "'-version-info/-version-number' is ignored for convenience libraries"
 
 	test -n "$release" && \
-	  func_warning "\`-release' is ignored for convenience libraries"
+	  func_warning "'-release' is ignored for convenience libraries"
       else
 
 	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
+	save_ifs=$IFS; IFS=:
 	set dummy $vinfo 0 0 0
 	shift
-	IFS="$save_ifs"
+	IFS=$save_ifs
 
 	test -n "$7" && \
-	  func_fatal_help "too many parameters to \`-version-info'"
+	  func_fatal_help "too many parameters to '-version-info'"
 
 	# convert absolute version numbers to libtool ages
 	# this retains compatibility with .la files and attempts
@@ -7322,45 +8799,45 @@
 
 	case $vinfo_number in
 	yes)
-	  number_major="$1"
-	  number_minor="$2"
-	  number_revision="$3"
+	  number_major=$1
+	  number_minor=$2
+	  number_revision=$3
 	  #
 	  # There are really only two kinds -- those that
 	  # use the current revision as the major version
 	  # and those that subtract age and use age as
 	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
+	  # that has an extra 1 added just for fun
 	  #
 	  case $version_type in
 	  # correct linux to gnu/linux during the next big refactor
-	  darwin|linux|osf|windows|none)
+	  darwin|freebsd-elf|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_revision"
+	    age=$number_minor
+	    revision=$number_revision
 	    ;;
-	  freebsd-aout|freebsd-elf|qnx|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
+	  freebsd-aout|qnx|sunos)
+	    current=$number_major
+	    revision=$number_minor
+	    age=0
 	    ;;
 	  irix|nonstopux)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_minor"
+	    age=$number_minor
+	    revision=$number_minor
 	    lt_irix_increment=no
 	    ;;
 	  *)
-	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+	    func_fatal_configuration "$modename: unknown library version type '$version_type'"
 	    ;;
 	  esac
 	  ;;
 	no)
-	  current="$1"
-	  revision="$2"
-	  age="$3"
+	  current=$1
+	  revision=$2
+	  age=$3
 	  ;;
 	esac
 
@@ -7368,30 +8845,30 @@
 	case $current in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  func_error "CURRENT \`$current' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
+	  func_error "CURRENT '$current' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	case $revision in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  func_error "REVISION \`$revision' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
+	  func_error "REVISION '$revision' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	case $age in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  func_error "AGE \`$age' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
+	  func_error "AGE '$age' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	if test "$age" -gt "$current"; then
-	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
-	  func_fatal_error "\`$vinfo' is not valid version information"
+	  func_error "AGE '$age' is greater than the current interface number '$current'"
+	  func_fatal_error "'$vinfo' is not valid version information"
 	fi
 
 	# Calculate the version variables.
@@ -7406,26 +8883,36 @@
 	  # verstring for coding it into the library header
 	  func_arith $current - $age
 	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
+	  versuffix=$major.$age.$revision
 	  # Darwin ld doesn't like 0 for these options...
 	  func_arith $current + 1
 	  minor_current=$func_arith_result
-	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
 	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+          # On Darwin other compilers
+          case $CC in
+              nagfor*)
+                  verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+                  ;;
+              *)
+                  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+                  ;;
+          esac
 	  ;;
 
 	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
+	  major=.$current
+	  versuffix=.$current.$revision
 	  ;;
 
 	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current"
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
 	  ;;
 
 	irix | nonstopux)
-	  if test "X$lt_irix_increment" = "Xno"; then
+	  if test no = "$lt_irix_increment"; then
 	    func_arith $current - $age
 	  else
 	    func_arith $current - $age + 1
@@ -7436,69 +8923,74 @@
 	    nonstopux) verstring_prefix=nonstopux ;;
 	    *)         verstring_prefix=sgi ;;
 	  esac
-	  verstring="$verstring_prefix$major.$revision"
+	  verstring=$verstring_prefix$major.$revision
 
 	  # Add in all the interfaces that we are compatible with.
 	  loop=$revision
-	  while test "$loop" -ne 0; do
+	  while test 0 -ne "$loop"; do
 	    func_arith $revision - $loop
 	    iface=$func_arith_result
 	    func_arith $loop - 1
 	    loop=$func_arith_result
-	    verstring="$verstring_prefix$major.$iface:$verstring"
+	    verstring=$verstring_prefix$major.$iface:$verstring
 	  done
 
-	  # Before this point, $major must not contain `.'.
+	  # Before this point, $major must not contain '.'.
 	  major=.$major
-	  versuffix="$major.$revision"
+	  versuffix=$major.$revision
 	  ;;
 
 	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
+	  versuffix=$major.$age.$revision
 	  ;;
 
 	osf)
 	  func_arith $current - $age
 	  major=.$func_arith_result
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
+	  versuffix=.$current.$age.$revision
+	  verstring=$current.$age.$revision
 
 	  # Add in all the interfaces that we are compatible with.
 	  loop=$age
-	  while test "$loop" -ne 0; do
+	  while test 0 -ne "$loop"; do
 	    func_arith $current - $loop
 	    iface=$func_arith_result
 	    func_arith $loop - 1
 	    loop=$func_arith_result
-	    verstring="$verstring:${iface}.0"
+	    verstring=$verstring:$iface.0
 	  done
 
 	  # Make executables depend on our current version.
-	  func_append verstring ":${current}.0"
+	  func_append verstring ":$current.0"
 	  ;;
 
 	qnx)
-	  major=".$current"
-	  versuffix=".$current"
+	  major=.$current
+	  versuffix=.$current
+	  ;;
+
+	sco)
+	  major=.$current
+	  versuffix=.$current
 	  ;;
 
 	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
+	  major=.$current
+	  versuffix=.$current.$revision
 	  ;;
 
 	windows)
 	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
+	  # extension on DOS 8.3 file systems.
 	  func_arith $current - $age
 	  major=$func_arith_result
-	  versuffix="-$major"
+	  versuffix=-$major
 	  ;;
 
 	*)
-	  func_fatal_configuration "unknown library version type \`$version_type'"
+	  func_fatal_configuration "unknown library version type '$version_type'"
 	  ;;
 	esac
 
@@ -7512,42 +9004,45 @@
 	    verstring=
 	    ;;
 	  *)
-	    verstring="0.0"
+	    verstring=0.0
 	    ;;
 	  esac
-	  if test "$need_version" = no; then
+	  if test no = "$need_version"; then
 	    versuffix=
 	  else
-	    versuffix=".0.0"
+	    versuffix=.0.0
 	  fi
 	fi
 
 	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
+	if test yes,no = "$avoid_version,$need_version"; then
 	  major=
 	  versuffix=
-	  verstring=""
+	  verstring=
 	fi
 
 	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    func_warning "undefined symbols not allowed in $host shared libraries"
-	    build_libtool_libs=no
-	    build_old_libs=yes
+	if test yes = "$allow_undefined"; then
+	  if test unsupported = "$allow_undefined_flag"; then
+	    if test yes = "$build_old_libs"; then
+	      func_warning "undefined symbols not allowed in $host shared libraries; building static only"
+	      build_libtool_libs=no
+	    else
+	      func_fatal_error "can't build $host shared library unless -no-undefined is specified"
+	    fi
 	  fi
 	else
 	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
+	  allow_undefined_flag=$no_undefined_flag
 	fi
 
       fi
 
-      func_generate_dlsyms "$libname" "$libname" "yes"
+      func_generate_dlsyms "$libname" "$libname" :
       func_append libobjs " $symfileobj"
-      test "X$libobjs" = "X " && libobjs=
+      test " " = "$libobjs" && libobjs=
 
-      if test "$opt_mode" != relink; then
+      if test relink != "$opt_mode"; then
 	# Remove our outputs, but don't remove object files since they
 	# may have been created when compiling PIC objects.
 	removelist=
@@ -7556,8 +9051,8 @@
 	  case $p in
 	    *.$objext | *.gcno)
 	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+	       if test -n "$precious_files_regex"; then
 		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
 		 then
 		   continue
@@ -7573,11 +9068,11 @@
       fi
 
       # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+      if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
 	func_append oldlibs " $output_objdir/$libname.$libext"
 
 	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
       fi
 
       # Eliminate all temporary directories.
@@ -7598,13 +9093,13 @@
 	  *) func_append finalize_rpath " $libdir" ;;
 	  esac
 	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+	if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
 	  dependency_libs="$temp_xrpath $dependency_libs"
 	fi
       fi
 
       # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
+      old_dlfiles=$dlfiles
       dlfiles=
       for lib in $old_dlfiles; do
 	case " $dlprefiles $dlfiles " in
@@ -7614,7 +9109,7 @@
       done
 
       # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
+      old_dlprefiles=$dlprefiles
       dlprefiles=
       for lib in $old_dlprefiles; do
 	case "$dlprefiles " in
@@ -7623,7 +9118,7 @@
 	esac
       done
 
-      if test "$build_libtool_libs" = yes; then
+      if test yes = "$build_libtool_libs"; then
 	if test -n "$rpath"; then
 	  case $host in
 	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
@@ -7647,7 +9142,7 @@
 	    ;;
 	  *)
 	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
+	    if test yes = "$build_libtool_need_lc"; then
 	      func_append deplibs " -lc"
 	    fi
 	    ;;
@@ -7663,9 +9158,9 @@
 	# I'm not sure if I'm treating the release correctly.  I think
 	# release should show up in the -l (ie -lgmp5) so we don't want to
 	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
+	release=
+	versuffix=
+	major=
 	newdeplibs=
 	droppeddeps=no
 	case $deplibs_check_method in
@@ -7694,20 +9189,20 @@
 	      -l*)
 		func_stripname -l '' "$i"
 		name=$func_stripname_result
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
 		    func_append newdeplibs " $i"
-		    i=""
+		    i=
 		    ;;
 		  esac
 		fi
-		if test -n "$i" ; then
+		if test -n "$i"; then
 		  libname=`eval "\\$ECHO \"$libname_spec\""`
 		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
 		  set dummy $deplib_matches; shift
 		  deplib_match=$1
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
 		    func_append newdeplibs " $i"
 		  else
 		    droppeddeps=yes
@@ -7737,20 +9232,20 @@
 		$opt_dry_run || $RM conftest
 		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		    case " $predeps $postdeps " in
 		    *" $i "*)
 		      func_append newdeplibs " $i"
-		      i=""
+		      i=
 		      ;;
 		    esac
 		  fi
-		  if test -n "$i" ; then
+		  if test -n "$i"; then
 		    libname=`eval "\\$ECHO \"$libname_spec\""`
 		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
 		    set dummy $deplib_matches; shift
 		    deplib_match=$1
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
 		      func_append newdeplibs " $i"
 		    else
 		      droppeddeps=yes
@@ -7787,24 +9282,24 @@
 	    -l*)
 	      func_stripname -l '' "$a_deplib"
 	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
 		  func_append newdeplibs " $a_deplib"
-		  a_deplib=""
+		  a_deplib=
 		  ;;
 		esac
 	      fi
-	      if test -n "$a_deplib" ; then
+	      if test -n "$a_deplib"; then
 		libname=`eval "\\$ECHO \"$libname_spec\""`
 		if test -n "$file_magic_glob"; then
 		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
 		else
 		  libnameglob=$libname
 		fi
-		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+		test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  if test "$want_nocaseglob" = yes; then
+		  if test yes = "$want_nocaseglob"; then
 		    shopt -s nocaseglob
 		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
 		    $nocaseglob
@@ -7822,25 +9317,25 @@
 		      # We might still enter an endless loop, since a link
 		      # loop can be closed while we follow links,
 		      # but so what?
-		      potlib="$potent_lib"
+		      potlib=$potent_lib
 		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+			potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
 			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+			[\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
+			*) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
 			esac
 		      done
 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
 			 $SED -e 10q |
 			 $EGREP "$file_magic_regex" > /dev/null; then
 			func_append newdeplibs " $a_deplib"
-			a_deplib=""
+			a_deplib=
 			break 2
 		      fi
 		  done
 		done
 	      fi
-	      if test -n "$a_deplib" ; then
+	      if test -n "$a_deplib"; then
 		droppeddeps=yes
 		echo
 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7848,7 +9343,7 @@
 		echo "*** you link to this library.  But I can only do this if you have a"
 		echo "*** shared version of the library, which you do not appear to have"
 		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
+		if test -z "$potlib"; then
 		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
 		else
 		  $ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7871,30 +9366,30 @@
 	    -l*)
 	      func_stripname -l '' "$a_deplib"
 	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
 		  func_append newdeplibs " $a_deplib"
-		  a_deplib=""
+		  a_deplib=
 		  ;;
 		esac
 	      fi
-	      if test -n "$a_deplib" ; then
+	      if test -n "$a_deplib"; then
 		libname=`eval "\\$ECHO \"$libname_spec\""`
 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
 		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
 		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
+		    potlib=$potent_lib # see symlink-check above in file_magic test
 		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
 		       $EGREP "$match_pattern_regex" > /dev/null; then
 		      func_append newdeplibs " $a_deplib"
-		      a_deplib=""
+		      a_deplib=
 		      break 2
 		    fi
 		  done
 		done
 	      fi
-	      if test -n "$a_deplib" ; then
+	      if test -n "$a_deplib"; then
 		droppeddeps=yes
 		echo
 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7902,7 +9397,7 @@
 		echo "*** you link to this library.  But I can only do this if you have a"
 		echo "*** shared version of the library, which you do not appear to have"
 		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
+		if test -z "$potlib"; then
 		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
 		else
 		  $ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7918,18 +9413,18 @@
 	  done # Gone through all deplibs.
 	  ;;
 	none | unknown | *)
-	  newdeplibs=""
+	  newdeplibs=
 	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
+	  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+	    for i in $predeps $postdeps; do
 	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
 	    done
 	  fi
 	  case $tmp_deplibs in
 	  *[!\	\ ]*)
 	    echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
+	    if test none = "$deplibs_check_method"; then
 	      echo "*** Warning: inter-library dependencies are not supported in this platform."
 	    else
 	      echo "*** Warning: inter-library dependencies are not known to be supported."
@@ -7953,8 +9448,8 @@
 	  ;;
 	esac
 
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
+	if test yes = "$droppeddeps"; then
+	  if test yes = "$module"; then
 	    echo
 	    echo "*** Warning: libtool could not satisfy all declared inter-library"
 	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
@@ -7963,12 +9458,12 @@
 	    if test -z "$global_symbol_pipe"; then
 	      echo
 	      echo "*** However, this would only work if libtool was able to extract symbol"
-	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
 	      echo "*** not find such a program.  So, this module is probably useless."
-	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	      echo "*** 'nm' from GNU binutils and a full rebuild may help."
 	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
+	    if test no = "$build_old_libs"; then
+	      oldlibs=$output_objdir/$libname.$libext
 	      build_libtool_libs=module
 	      build_old_libs=yes
 	    else
@@ -7979,14 +9474,14 @@
 	    echo "*** automatically added whenever a program is linked with this library"
 	    echo "*** or is declared to -dlopen it."
 
-	    if test "$allow_undefined" = no; then
+	    if test no = "$allow_undefined"; then
 	      echo
 	      echo "*** Since this library must not contain undefined symbols,"
 	      echo "*** because either the platform does not support them or"
 	      echo "*** it was explicitly requested with -no-undefined,"
 	      echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
+	      if test no = "$build_old_libs"; then
+		oldlibs=$output_objdir/$libname.$libext
 		build_libtool_libs=module
 		build_old_libs=yes
 	      else
@@ -8032,7 +9527,7 @@
 	*) func_append new_libs " $deplib" ;;
 	esac
       done
-      deplibs="$new_libs"
+      deplibs=$new_libs
 
       # All the library-specific variables (install_libdir is set above).
       library_names=
@@ -8040,25 +9535,25 @@
       dlname=
 
       # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	# Remove ${wl} instances when linking with ld.
+      if test yes = "$build_libtool_libs"; then
+	# Remove $wl instances when linking with ld.
 	# FIXME: should test the right _cmds variable.
 	case $archive_cmds in
 	  *\$LD\ *) wl= ;;
         esac
-	if test "$hardcode_into_libs" = yes; then
+	if test yes = "$hardcode_into_libs"; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
 	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+	  rpath=$finalize_rpath
+	  test relink = "$opt_mode" || rpath=$compile_rpath$rpath
 	  for libdir in $rpath; do
 	    if test -n "$hardcode_libdir_flag_spec"; then
 	      if test -n "$hardcode_libdir_separator"; then
 		func_replace_sysroot "$libdir"
 		libdir=$func_replace_sysroot_result
 		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
+		  hardcode_libdirs=$libdir
 		else
 		  # Just accumulate the unique libdirs.
 		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8083,7 +9578,7 @@
 	  # Substitute the hardcoded libdirs into the rpath.
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
+	    libdir=$hardcode_libdirs
 	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
@@ -8097,8 +9592,8 @@
 	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
 	fi
 
-	shlibpath="$finalize_shlibpath"
-	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	shlibpath=$finalize_shlibpath
+	test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
 	if test -n "$shlibpath"; then
 	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
 	fi
@@ -8108,19 +9603,19 @@
 	eval library_names=\"$library_names_spec\"
 	set dummy $library_names
 	shift
-	realname="$1"
+	realname=$1
 	shift
 
 	if test -n "$soname_spec"; then
 	  eval soname=\"$soname_spec\"
 	else
-	  soname="$realname"
+	  soname=$realname
 	fi
 	if test -z "$dlname"; then
 	  dlname=$soname
 	fi
 
-	lib="$output_objdir/$realname"
+	lib=$output_objdir/$realname
 	linknames=
 	for link
 	do
@@ -8134,7 +9629,7 @@
 	delfiles=
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-	  export_symbols="$output_objdir/$libname.uexp"
+	  export_symbols=$output_objdir/$libname.uexp
 	  func_append delfiles " $export_symbols"
 	fi
 
@@ -8143,31 +9638,31 @@
 	cygwin* | mingw* | cegcc*)
 	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
 	    # exporting using user supplied symfile
-	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+	    func_dll_def_p "$export_symbols" || {
 	      # and it's NOT already a .def file. Must figure out
 	      # which of the given symbols are data symbols and tag
 	      # them as such. So, trigger use of export_symbols_cmds.
 	      # export_symbols gets reassigned inside the "prepare
 	      # the list of exported symbols" if statement, so the
 	      # include_expsyms logic still works.
-	      orig_export_symbols="$export_symbols"
+	      orig_export_symbols=$export_symbols
 	      export_symbols=
 	      always_export_symbols=yes
-	    fi
+	    }
 	  fi
 	  ;;
 	esac
 
 	# Prepare the list of exported symbols
 	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    func_verbose "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
+	  if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
+	    func_verbose "generating symbol list for '$libname.la'"
+	    export_symbols=$output_objdir/$libname.exp
 	    $opt_dry_run || $RM $export_symbols
 	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
+	    save_ifs=$IFS; IFS='~'
 	    for cmd1 in $cmds; do
-	      IFS="$save_ifs"
+	      IFS=$save_ifs
 	      # Take the normal branch if the nm_file_list_spec branch
 	      # doesn't work or if tool conversion is not needed.
 	      case $nm_file_list_spec~$to_tool_file_cmd in
@@ -8181,7 +9676,7 @@
 		  try_normal_branch=no
 		  ;;
 	      esac
-	      if test "$try_normal_branch" = yes \
+	      if test yes = "$try_normal_branch" \
 		 && { test "$len" -lt "$max_cmd_len" \
 		      || test "$max_cmd_len" -le -1; }
 	      then
@@ -8192,7 +9687,7 @@
 		output_la=$func_basename_result
 		save_libobjs=$libobjs
 		save_output=$output
-		output=${output_objdir}/${output_la}.nm
+		output=$output_objdir/$output_la.nm
 		func_to_tool_file "$output"
 		libobjs=$nm_file_list_spec$func_to_tool_file_result
 		func_append delfiles " $output"
@@ -8215,8 +9710,8 @@
 		break
 	      fi
 	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+	    IFS=$save_ifs
+	    if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
 	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
 	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
 	    fi
@@ -8224,16 +9719,16 @@
 	fi
 
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  tmp_export_symbols="$export_symbols"
-	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	  tmp_export_symbols=$export_symbols
+	  test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
 	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 	fi
 
-	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+	if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
 	  # The given exports_symbols file has to be filtered, so filter it.
-	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	  func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
 	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	  # 's' commands which not all seds can handle. GNU sed should be fine
+	  # 's' commands, which not all seds can handle. GNU sed should be fine
 	  # though. Also, the filter scales superlinearly with the number of
 	  # global variables. join(1) would be nice here, but unfortunately
 	  # isn't a blessed tool.
@@ -8252,11 +9747,11 @@
 	    ;;
 	  esac
 	done
-	deplibs="$tmp_deplibs"
+	deplibs=$tmp_deplibs
 
 	if test -n "$convenience"; then
 	  if test -n "$whole_archive_flag_spec" &&
-	    test "$compiler_needs_object" = yes &&
+	    test yes = "$compiler_needs_object" &&
 	    test -z "$libobjs"; then
 	    # extract the archives, so we have objects to list.
 	    # TODO: could optimize this to just extract one archive.
@@ -8267,7 +9762,7 @@
 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
 	    test "X$libobjs" = "X " && libobjs=
 	  else
-	    gentop="$output_objdir/${outputname}x"
+	    gentop=$output_objdir/${outputname}x
 	    func_append generated " $gentop"
 
 	    func_extract_archives $gentop $convenience
@@ -8276,18 +9771,18 @@
 	  fi
 	fi
 
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+	if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
 	  eval flag=\"$thread_safe_flag_spec\"
 	  func_append linker_flags " $flag"
 	fi
 
 	# Make a backup of the uninstalled library when relinking
-	if test "$opt_mode" = relink; then
+	if test relink = "$opt_mode"; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
 	fi
 
 	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
+	if test yes = "$module" && test -n "$module_cmds"; then
 	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
 	    eval test_cmds=\"$module_expsym_cmds\"
 	    cmds=$module_expsym_cmds
@@ -8305,7 +9800,7 @@
 	  fi
 	fi
 
-	if test "X$skipped_export" != "X:" &&
+	if test : != "$skipped_export" &&
 	   func_len " $test_cmds" &&
 	   len=$func_len_result &&
 	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
@@ -8338,8 +9833,8 @@
 	  last_robj=
 	  k=1
 
-	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-	    output=${output_objdir}/${output_la}.lnkscript
+	  if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+	    output=$output_objdir/$output_la.lnkscript
 	    func_verbose "creating GNU ld script: $output"
 	    echo 'INPUT (' > $output
 	    for obj in $save_libobjs
@@ -8351,14 +9846,14 @@
 	    func_append delfiles " $output"
 	    func_to_tool_file "$output"
 	    output=$func_to_tool_file_result
-	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-	    output=${output_objdir}/${output_la}.lnk
+	  elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+	    output=$output_objdir/$output_la.lnk
 	    func_verbose "creating linker input file list: $output"
 	    : > $output
 	    set x $save_libobjs
 	    shift
 	    firstobj=
-	    if test "$compiler_needs_object" = yes; then
+	    if test yes = "$compiler_needs_object"; then
 	      firstobj="$1 "
 	      shift
 	    fi
@@ -8373,7 +9868,7 @@
 	  else
 	    if test -n "$save_libobjs"; then
 	      func_verbose "creating reloadable object files..."
-	      output=$output_objdir/$output_la-${k}.$objext
+	      output=$output_objdir/$output_la-$k.$objext
 	      eval test_cmds=\"$reload_cmds\"
 	      func_len " $test_cmds"
 	      len0=$func_len_result
@@ -8385,13 +9880,13 @@
 		func_len " $obj"
 		func_arith $len + $func_len_result
 		len=$func_arith_result
-		if test "X$objlist" = X ||
+		if test -z "$objlist" ||
 		   test "$len" -lt "$max_cmd_len"; then
 		  func_append objlist " $obj"
 		else
 		  # The command $test_cmds is almost too long, add a
 		  # command to the queue.
-		  if test "$k" -eq 1 ; then
+		  if test 1 -eq "$k"; then
 		    # The first file doesn't have a previous command to add.
 		    reload_objs=$objlist
 		    eval concat_cmds=\"$reload_cmds\"
@@ -8401,10 +9896,10 @@
 		    reload_objs="$objlist $last_robj"
 		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
 		  fi
-		  last_robj=$output_objdir/$output_la-${k}.$objext
+		  last_robj=$output_objdir/$output_la-$k.$objext
 		  func_arith $k + 1
 		  k=$func_arith_result
-		  output=$output_objdir/$output_la-${k}.$objext
+		  output=$output_objdir/$output_la-$k.$objext
 		  objlist=" $obj"
 		  func_len " $last_robj"
 		  func_arith $len0 + $func_len_result
@@ -8416,9 +9911,9 @@
 	      # files will link in the last one created.
 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
 	      reload_objs="$objlist $last_robj"
-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+	      eval concat_cmds=\"\$concat_cmds$reload_cmds\"
 	      if test -n "$last_robj"; then
-	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+	        eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
 	      fi
 	      func_append delfiles " $output"
 
@@ -8426,9 +9921,9 @@
 	      output=
 	    fi
 
-	    if ${skipped_export-false}; then
-	      func_verbose "generating symbol list for \`$libname.la'"
-	      export_symbols="$output_objdir/$libname.exp"
+	    ${skipped_export-false} && {
+	      func_verbose "generating symbol list for '$libname.la'"
+	      export_symbols=$output_objdir/$libname.exp
 	      $opt_dry_run || $RM $export_symbols
 	      libobjs=$output
 	      # Append the command to create the export file.
@@ -8437,16 +9932,16 @@
 	      if test -n "$last_robj"; then
 		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
 	      fi
-	    fi
+	    }
 
 	    test -n "$save_libobjs" &&
 	      func_verbose "creating a temporary reloadable object file: $output"
 
 	    # Loop through the commands generated above and execute them.
-	    save_ifs="$IFS"; IFS='~'
+	    save_ifs=$IFS; IFS='~'
 	    for cmd in $concat_cmds; do
-	      IFS="$save_ifs"
-	      $opt_silent || {
+	      IFS=$save_ifs
+	      $opt_quiet || {
 		  func_quote_for_expand "$cmd"
 		  eval "func_echo $func_quote_for_expand_result"
 	      }
@@ -8454,7 +9949,7 @@
 		lt_exit=$?
 
 		# Restore the uninstalled library and exit
-		if test "$opt_mode" = relink; then
+		if test relink = "$opt_mode"; then
 		  ( cd "$output_objdir" && \
 		    $RM "${realname}T" && \
 		    $MV "${realname}U" "$realname" )
@@ -8463,7 +9958,7 @@
 		exit $lt_exit
 	      }
 	    done
-	    IFS="$save_ifs"
+	    IFS=$save_ifs
 
 	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
 	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
@@ -8471,18 +9966,18 @@
 	    fi
 	  fi
 
-          if ${skipped_export-false}; then
+          ${skipped_export-false} && {
 	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	      tmp_export_symbols="$export_symbols"
-	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	      tmp_export_symbols=$export_symbols
+	      test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
 	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 	    fi
 
 	    if test -n "$orig_export_symbols"; then
 	      # The given exports_symbols file has to be filtered, so filter it.
-	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	      func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
 	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	      # 's' commands which not all seds can handle. GNU sed should be fine
+	      # 's' commands, which not all seds can handle. GNU sed should be fine
 	      # though. Also, the filter scales superlinearly with the number of
 	      # global variables. join(1) would be nice here, but unfortunately
 	      # isn't a blessed tool.
@@ -8491,7 +9986,7 @@
 	      export_symbols=$output_objdir/$libname.def
 	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	    fi
-	  fi
+	  }
 
 	  libobjs=$output
 	  # Restore the value of output.
@@ -8505,7 +10000,7 @@
 	  # value of $libobjs for piecewise linking.
 
 	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
+	  if test yes = "$module" && test -n "$module_cmds"; then
 	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
 	      cmds=$module_expsym_cmds
 	    else
@@ -8527,7 +10022,7 @@
 
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
+	  gentop=$output_objdir/${outputname}x
 	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
@@ -8535,11 +10030,12 @@
 	  test "X$libobjs" = "X " && libobjs=
 	fi
 
-	save_ifs="$IFS"; IFS='~'
+	save_ifs=$IFS; IFS='~'
 	for cmd in $cmds; do
-	  IFS="$save_ifs"
+	  IFS=$sp$nl
 	  eval cmd=\"$cmd\"
-	  $opt_silent || {
+	  IFS=$save_ifs
+	  $opt_quiet || {
 	    func_quote_for_expand "$cmd"
 	    eval "func_echo $func_quote_for_expand_result"
 	  }
@@ -8547,7 +10043,7 @@
 	    lt_exit=$?
 
 	    # Restore the uninstalled library and exit
-	    if test "$opt_mode" = relink; then
+	    if test relink = "$opt_mode"; then
 	      ( cd "$output_objdir" && \
 	        $RM "${realname}T" && \
 		$MV "${realname}U" "$realname" )
@@ -8556,10 +10052,10 @@
 	    exit $lt_exit
 	  }
 	done
-	IFS="$save_ifs"
+	IFS=$save_ifs
 
 	# Restore the uninstalled library and exit
-	if test "$opt_mode" = relink; then
+	if test relink = "$opt_mode"; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
 
 	  if test -n "$convenience"; then
@@ -8579,39 +10075,39 @@
 	done
 
 	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
+	if test yes = "$module" || test yes = "$export_dynamic"; then
 	  # On all known operating systems, these are identical.
-	  dlname="$soname"
+	  dlname=$soname
 	fi
       fi
       ;;
 
     obj)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for objects"
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for objects"
       fi
 
       case " $deplibs" in
       *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for objects" ;;
+	func_warning "'-l' and '-L' are ignored for objects" ;;
       esac
 
       test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for objects"
+	func_warning "'-rpath' is ignored for objects"
 
       test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for objects"
+	func_warning "'-R' is ignored for objects"
 
       test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for objects"
+	func_warning "'-version-info' is ignored for objects"
 
       test -n "$release" && \
-	func_warning "\`-release' is ignored for objects"
+	func_warning "'-release' is ignored for objects"
 
       case $output in
       *.lo)
 	test -n "$objs$old_deplibs" && \
-	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+	  func_fatal_error "cannot build library object '$output' from non-libtool objects"
 
 	libobj=$output
 	func_lo2o "$libobj"
@@ -8619,7 +10115,7 @@
 	;;
       *)
 	libobj=
-	obj="$output"
+	obj=$output
 	;;
       esac
 
@@ -8632,17 +10128,19 @@
       # the extraction.
       reload_conv_objs=
       gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
-      wl=
-
+      # if reload_cmds runs $LD directly, get rid of -Wl from
+      # whole_archive_flag_spec and hope we can get by with turning comma
+      # into space.
+      case $reload_cmds in
+        *\$LD[\ \$]*) wl= ;;
+      esac
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
 	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	  test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	  reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
 	else
-	  gentop="$output_objdir/${obj}x"
+	  gentop=$output_objdir/${obj}x
 	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $convenience
@@ -8651,12 +10149,12 @@
       fi
 
       # If we're not building shared, we need to use non_pic_objs
-      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+      test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
 
       # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+      reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
 
-      output="$obj"
+      output=$obj
       func_execute_cmds "$reload_cmds" 'exit $?'
 
       # Exit if we aren't doing a library object file.
@@ -8668,7 +10166,7 @@
 	exit $EXIT_SUCCESS
       fi
 
-      if test "$build_libtool_libs" != yes; then
+      test yes = "$build_libtool_libs" || {
 	if test -n "$gentop"; then
 	  func_show_eval '${RM}r "$gentop"'
 	fi
@@ -8678,12 +10176,12 @@
 	# $show "echo timestamp > $libobj"
 	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
 	exit $EXIT_SUCCESS
-      fi
+      }
 
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
+      if test -n "$pic_flag" || test default != "$pic_mode"; then
 	# Only do commands if we really have different PIC objects.
 	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
+	output=$libobj
 	func_execute_cmds "$reload_cmds" 'exit $?'
       fi
 
@@ -8700,16 +10198,14 @@
 	          output=$func_stripname_result.exe;;
       esac
       test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for programs"
+	func_warning "'-version-info' is ignored for programs"
 
       test -n "$release" && \
-	func_warning "\`-release' is ignored for programs"
+	func_warning "'-release' is ignored for programs"
 
-      test "$preload" = yes \
-        && test "$dlopen_support" = unknown \
-	&& test "$dlopen_self" = unknown \
-	&& test "$dlopen_self_static" = unknown && \
-	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+      $preload \
+	&& test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+	&& func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
 
       case $host in
       *-*-rhapsody* | *-*-darwin1.[012])
@@ -8723,11 +10219,11 @@
       *-*-darwin*)
 	# Don't allow lazy linking, it breaks C++ global constructors
 	# But is supposedly fixed on 10.4 or later (yay!).
-	if test "$tagname" = CXX ; then
+	if test CXX = "$tagname"; then
 	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
 	    10.[0123])
-	      func_append compile_command " ${wl}-bind_at_load"
-	      func_append finalize_command " ${wl}-bind_at_load"
+	      func_append compile_command " $wl-bind_at_load"
+	      func_append finalize_command " $wl-bind_at_load"
 	    ;;
 	  esac
 	fi
@@ -8763,7 +10259,7 @@
 	*) func_append new_libs " $deplib" ;;
 	esac
       done
-      compile_deplibs="$new_libs"
+      compile_deplibs=$new_libs
 
 
       func_append compile_command " $compile_deplibs"
@@ -8787,7 +10283,7 @@
 	if test -n "$hardcode_libdir_flag_spec"; then
 	  if test -n "$hardcode_libdir_separator"; then
 	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
+	      hardcode_libdirs=$libdir
 	    else
 	      # Just accumulate the unique libdirs.
 	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8810,7 +10306,7 @@
 	fi
 	case $host in
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+	  testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
 	  ::) dllsearchpath=$libdir;;
@@ -8827,10 +10323,10 @@
       # Substitute the hardcoded libdirs into the rpath.
       if test -n "$hardcode_libdir_separator" &&
 	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
+	libdir=$hardcode_libdirs
 	eval rpath=\" $hardcode_libdir_flag_spec\"
       fi
-      compile_rpath="$rpath"
+      compile_rpath=$rpath
 
       rpath=
       hardcode_libdirs=
@@ -8838,7 +10334,7 @@
 	if test -n "$hardcode_libdir_flag_spec"; then
 	  if test -n "$hardcode_libdir_separator"; then
 	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
+	      hardcode_libdirs=$libdir
 	    else
 	      # Just accumulate the unique libdirs.
 	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8863,45 +10359,43 @@
       # Substitute the hardcoded libdirs into the rpath.
       if test -n "$hardcode_libdir_separator" &&
 	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
+	libdir=$hardcode_libdirs
 	eval rpath=\" $hardcode_libdir_flag_spec\"
       fi
-      finalize_rpath="$rpath"
+      finalize_rpath=$rpath
 
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+      if test -n "$libobjs" && test yes = "$build_old_libs"; then
 	# Transform all the library objects into standard objects.
 	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
 	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
       fi
 
-      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+      func_generate_dlsyms "$outputname" "@PROGRAM@" false
 
       # template prelinking step
       if test -n "$prelink_cmds"; then
 	func_execute_cmds "$prelink_cmds" 'exit $?'
       fi
 
-      wrappers_required=yes
+      wrappers_required=:
       case $host in
       *cegcc* | *mingw32ce*)
         # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-        wrappers_required=no
+        wrappers_required=false
         ;;
       *cygwin* | *mingw* )
-        if test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
+        test yes = "$build_libtool_libs" || wrappers_required=false
         ;;
       *)
-        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-          wrappers_required=no
+        if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+          wrappers_required=false
         fi
         ;;
       esac
-      if test "$wrappers_required" = no; then
+      $wrappers_required || {
 	# Replace the output file specification.
 	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
+	link_command=$compile_command$compile_rpath
 
 	# We have no uninstalled library dependencies, so finalize right now.
 	exit_status=0
@@ -8914,12 +10408,12 @@
 	fi
 
 	# Delete the generated files.
-	if test -f "$output_objdir/${outputname}S.${objext}"; then
-	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+	if test -f "$output_objdir/${outputname}S.$objext"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
 	fi
 
 	exit $exit_status
-      fi
+      }
 
       if test -n "$compile_shlibpath$finalize_shlibpath"; then
 	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
@@ -8949,9 +10443,9 @@
 	fi
       fi
 
-      if test "$no_install" = yes; then
+      if test yes = "$no_install"; then
 	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
+	link_command=$compile_var$compile_command$compile_rpath
 	# Replace the output file specification.
 	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
 	# Delete the old output file.
@@ -8968,27 +10462,28 @@
 	exit $EXIT_SUCCESS
       fi
 
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	func_warning "this platform does not like uninstalled shared libraries"
-	func_warning "\`$output' will be relinked during installation"
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
+      case $hardcode_action,$fast_install in
+        relink,*)
+	  # Fast installation is not supported
+	  link_command=$compile_var$compile_command$compile_rpath
+	  relink_command=$finalize_var$finalize_command$finalize_rpath
+
+	  func_warning "this platform does not like uninstalled shared libraries"
+	  func_warning "'$output' will be relinked during installation"
+	  ;;
+        *,yes)
+	  link_command=$finalize_var$compile_command$finalize_rpath
+	  relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+          ;;
+	*,no)
+	  link_command=$compile_var$compile_command$compile_rpath
+	  relink_command=$finalize_var$finalize_command$finalize_rpath
+          ;;
+	*,needless)
+	  link_command=$finalize_var$compile_command$finalize_rpath
+	  relink_command=
+          ;;
+      esac
 
       # Replace the output file specification.
       link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
@@ -9045,8 +10540,8 @@
 	    func_dirname_and_basename "$output" "" "."
 	    output_name=$func_basename_result
 	    output_path=$func_dirname_result
-	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
-	    cwrapper="$output_path/$output_name.exe"
+	    cwrappersource=$output_path/$objdir/lt-$output_name.c
+	    cwrapper=$output_path/$output_name.exe
 	    $RM $cwrappersource $cwrapper
 	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
 
@@ -9067,7 +10562,7 @@
 	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
 	    $opt_dry_run || {
 	      # note: this script will not be executed, so do not chmod.
-	      if test "x$build" = "x$host" ; then
+	      if test "x$build" = "x$host"; then
 		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
 	      else
 		func_emit_wrapper no > $func_ltwrapper_scriptname_result
@@ -9090,25 +10585,27 @@
     # See if we need to build an old-fashioned archive.
     for oldlib in $oldlibs; do
 
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save $symfileobj"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
+      case $build_libtool_libs in
+        convenience)
+	  oldobjs="$libobjs_save $symfileobj"
+	  addlibs=$convenience
 	  build_libtool_libs=no
-	else
+	  ;;
+	module)
+	  oldobjs=$libobjs_save
+	  addlibs=$old_convenience
+	  build_libtool_libs=no
+          ;;
+	*)
 	  oldobjs="$old_deplibs $non_pic_objects"
-	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    func_append oldobjs " $symfileobj"
-	  fi
-	fi
-	addlibs="$old_convenience"
-      fi
+	  $preload && test -f "$symfileobj" \
+	    && func_append oldobjs " $symfileobj"
+	  addlibs=$old_convenience
+	  ;;
+      esac
 
       if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
+	gentop=$output_objdir/${outputname}x
 	func_append generated " $gentop"
 
 	func_extract_archives $gentop $addlibs
@@ -9116,13 +10613,13 @@
       fi
 
       # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+      if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
 	cmds=$old_archive_from_new_cmds
       else
 
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
+	  gentop=$output_objdir/${outputname}x
 	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
@@ -9143,7 +10640,7 @@
 	  :
 	else
 	  echo "copying selected object files to avoid basename conflicts..."
-	  gentop="$output_objdir/${outputname}x"
+	  gentop=$output_objdir/${outputname}x
 	  func_append generated " $gentop"
 	  func_mkdir_p "$gentop"
 	  save_oldobjs=$oldobjs
@@ -9152,7 +10649,7 @@
 	  for obj in $save_oldobjs
 	  do
 	    func_basename "$obj"
-	    objbase="$func_basename_result"
+	    objbase=$func_basename_result
 	    case " $oldobjs " in
 	    " ") oldobjs=$obj ;;
 	    *[\ /]"$objbase "*)
@@ -9221,18 +10718,18 @@
 	    else
 	      # the above command should be used before it gets too long
 	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
+	      if test "$obj" = "$last_oldobj"; then
 		RANLIB=$save_RANLIB
 	      fi
 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+	      eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
 	      objlist=
 	      len=$len0
 	    fi
 	  done
 	  RANLIB=$save_RANLIB
 	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
+	  if test -z "$oldobjs"; then
 	    eval cmds=\"\$concat_cmds\"
 	  else
 	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
@@ -9249,7 +10746,7 @@
     case $output in
     *.la)
       old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      test yes = "$build_old_libs" && old_library=$libname.$libext
       func_verbose "creating $output"
 
       # Preserve any variables that may affect compiler behavior
@@ -9264,31 +10761,31 @@
 	fi
       done
       # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
       relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
+      if test yes = "$hardcode_automatic"; then
 	relink_command=
       fi
 
       # Only create the output if not a dry run.
       $opt_dry_run || {
 	for installed in no yes; do
-	  if test "$installed" = yes; then
+	  if test yes = "$installed"; then
 	    if test -z "$install_libdir"; then
 	      break
 	    fi
-	    output="$output_objdir/$outputname"i
+	    output=$output_objdir/${outputname}i
 	    # Replace all uninstalled libtool libraries with the installed ones
 	    newdependency_libs=
 	    for deplib in $dependency_libs; do
 	      case $deplib in
 	      *.la)
 		func_basename "$deplib"
-		name="$func_basename_result"
+		name=$func_basename_result
 		func_resolve_sysroot "$deplib"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
-		  func_fatal_error "\`$deplib' is not a valid libtool archive"
+		  func_fatal_error "'$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
 		;;
 	      -L*)
@@ -9304,23 +10801,23 @@
 	      *) func_append newdependency_libs " $deplib" ;;
 	      esac
 	    done
-	    dependency_libs="$newdependency_libs"
+	    dependency_libs=$newdependency_libs
 	    newdlfiles=
 
 	    for lib in $dlfiles; do
 	      case $lib in
 	      *.la)
 	        func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		  func_fatal_error "'$lib' is not a valid libtool archive"
 		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
 	      *) func_append newdlfiles " $lib" ;;
 	      esac
 	    done
-	    dlfiles="$newdlfiles"
+	    dlfiles=$newdlfiles
 	    newdlprefiles=
 	    for lib in $dlprefiles; do
 	      case $lib in
@@ -9330,34 +10827,34 @@
 		# didn't already link the preopened objects directly into
 		# the library:
 		func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		  func_fatal_error "'$lib' is not a valid libtool archive"
 		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
 	      esac
 	    done
-	    dlprefiles="$newdlprefiles"
+	    dlprefiles=$newdlprefiles
 	  else
 	    newdlfiles=
 	    for lib in $dlfiles; do
 	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
 	      func_append newdlfiles " $abs"
 	    done
-	    dlfiles="$newdlfiles"
+	    dlfiles=$newdlfiles
 	    newdlprefiles=
 	    for lib in $dlprefiles; do
 	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
 	      func_append newdlprefiles " $abs"
 	    done
-	    dlprefiles="$newdlprefiles"
+	    dlprefiles=$newdlprefiles
 	  fi
 	  $RM $output
 	  # place dlname in correct position for cygwin
@@ -9373,10 +10870,9 @@
 	  case $host,$output,$installed,$module,$dlname in
 	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
 	      # If a -bindir argument was supplied, place the dll there.
-	      if test "x$bindir" != x ;
-	      then
+	      if test -n "$bindir"; then
 		func_relative_path "$install_libdir" "$bindir"
-		tdlname=$func_relative_path_result$dlname
+		tdlname=$func_relative_path_result/$dlname
 	      else
 		# Otherwise fall back on heuristic.
 		tdlname=../bin/$dlname
@@ -9385,7 +10881,7 @@
 	  esac
 	  $ECHO > $output "\
 # $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -9399,7 +10895,7 @@
 # The name of the static archive.
 old_library='$old_library'
 
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
 inherited_linker_flags='$new_inherited_linker_flags'
 
 # Libraries that this one depends upon.
@@ -9425,7 +10921,7 @@
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
+	  if test no,yes = "$installed,$need_relink"; then
 	    $ECHO >> $output "\
 relink_command=\"$relink_command\""
 	  fi
@@ -9440,27 +10936,29 @@
     exit $EXIT_SUCCESS
 }
 
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
-    func_mode_link ${1+"$@"}
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+  func_mode_link ${1+"$@"}
+fi
 
 
 # func_mode_uninstall arg...
 func_mode_uninstall ()
 {
-    $opt_debug
-    RM="$nonopt"
+    $debug_cmd
+
+    RM=$nonopt
     files=
-    rmforce=
+    rmforce=false
     exit_status=0
 
     # This variable tells wrapper scripts just to set variables rather
     # than running their programs.
-    libtool_install_magic="$magic"
+    libtool_install_magic=$magic
 
     for arg
     do
       case $arg in
-      -f) func_append RM " $arg"; rmforce=yes ;;
+      -f) func_append RM " $arg"; rmforce=: ;;
       -*) func_append RM " $arg" ;;
       *) func_append files " $arg" ;;
       esac
@@ -9473,18 +10971,18 @@
 
     for file in $files; do
       func_dirname "$file" "" "."
-      dir="$func_dirname_result"
-      if test "X$dir" = X.; then
-	odir="$objdir"
+      dir=$func_dirname_result
+      if test . = "$dir"; then
+	odir=$objdir
       else
-	odir="$dir/$objdir"
+	odir=$dir/$objdir
       fi
       func_basename "$file"
-      name="$func_basename_result"
-      test "$opt_mode" = uninstall && odir="$dir"
+      name=$func_basename_result
+      test uninstall = "$opt_mode" && odir=$dir
 
       # Remember odir for removal later, being careful to avoid duplicates
-      if test "$opt_mode" = clean; then
+      if test clean = "$opt_mode"; then
 	case " $rmdirs " in
 	  *" $odir "*) ;;
 	  *) func_append rmdirs " $odir" ;;
@@ -9499,11 +10997,11 @@
       elif test -d "$file"; then
 	exit_status=1
 	continue
-      elif test "$rmforce" = yes; then
+      elif $rmforce; then
 	continue
       fi
 
-      rmfiles="$file"
+      rmfiles=$file
 
       case $name in
       *.la)
@@ -9517,7 +11015,7 @@
 	  done
 	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
 
-	  case "$opt_mode" in
+	  case $opt_mode in
 	  clean)
 	    case " $library_names " in
 	    *" $dlname "*) ;;
@@ -9528,12 +11026,12 @@
 	  uninstall)
 	    if test -n "$library_names"; then
 	      # Do each command in the postuninstall commands.
-	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	      func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
 	    fi
 
 	    if test -n "$old_library"; then
 	      # Do each command in the old_postuninstall commands.
-	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	      func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
 	    fi
 	    # FIXME: should reinstall the best remaining shared library.
 	    ;;
@@ -9549,21 +11047,19 @@
 	  func_source $dir/$name
 
 	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" &&
-	     test "$pic_object" != none; then
+	  if test -n "$pic_object" && test none != "$pic_object"; then
 	    func_append rmfiles " $dir/$pic_object"
 	  fi
 
 	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" &&
-	     test "$non_pic_object" != none; then
+	  if test -n "$non_pic_object" && test none != "$non_pic_object"; then
 	    func_append rmfiles " $dir/$non_pic_object"
 	  fi
 	fi
 	;;
 
       *)
-	if test "$opt_mode" = clean ; then
+	if test clean = "$opt_mode"; then
 	  noexename=$name
 	  case $file in
 	  *.exe)
@@ -9590,12 +11086,12 @@
 
 	    # note $name still contains .exe if it was in $file originally
 	    # as does the version of $file that was added into $rmfiles
-	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
+	    func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+	    if test yes = "$fast_install" && test -n "$relink_command"; then
 	      func_append rmfiles " $odir/lt-$name"
 	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      func_append rmfiles " $odir/lt-${noexename}.c"
+	    if test "X$noexename" != "X$name"; then
+	      func_append rmfiles " $odir/lt-$noexename.c"
 	    fi
 	  fi
 	fi
@@ -9604,7 +11100,7 @@
       func_show_eval "$RM $rmfiles" 'exit_status=1'
     done
 
-    # Try to remove the ${objdir}s in the directories where we deleted files
+    # Try to remove the $objdir's in the directories where we deleted files
     for dir in $rmdirs; do
       if test -d "$dir"; then
 	func_show_eval "rmdir $dir >/dev/null 2>&1"
@@ -9614,16 +11110,17 @@
     exit $exit_status
 }
 
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
-    func_mode_uninstall ${1+"$@"}
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+  func_mode_uninstall ${1+"$@"}
+fi
 
 test -z "$opt_mode" && {
-  help="$generic_help"
+  help=$generic_help
   func_fatal_help "you must specify a MODE"
 }
 
 test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$opt_mode'"
+  func_fatal_help "invalid operation mode '$opt_mode'"
 
 if test -n "$exec_cmd"; then
   eval exec "$exec_cmd"
@@ -9634,7 +11131,7 @@
 
 
 # The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
+# where we disable both kinds of libraries.  Given conflicting
 # choices, we go for a static library, that is the most portable,
 # since we can't tell whether shared libraries were disabled because
 # the user asked for that or because the platform doesn't support
@@ -9657,5 +11154,3 @@
 # mode:shell-script
 # sh-indentation:2
 # End:
-# vi:sw=2
-
diff -Nru procps-3.3.11/m4/libtool.m4 procps-3.3.12/m4/libtool.m4
--- procps-3.3.11/m4/libtool.m4	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/m4/libtool.m4	2016-07-10 06:40:26.000000000 +0000
@@ -1,8 +1,6 @@
 # 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.
+#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -10,36 +8,30 @@
 # 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.
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# 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 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.
+# 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
+# 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ])
 
-# serial 57 LT_INIT
+# serial 58 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -67,7 +59,7 @@
 # LT_INIT([OPTIONS])
 # ------------------
 AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
 AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 AC_BEFORE([$0], [LT_LANG])dnl
 AC_BEFORE([$0], [LT_OUTPUT])dnl
@@ -91,7 +83,7 @@
 _LT_SET_OPTIONS([$0], [$1])
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -111,26 +103,43 @@
 dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
 
 
+# _LT_PREPARE_CC_BASENAME
+# -----------------------
+m4_defun([_LT_PREPARE_CC_BASENAME], [
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in @S|@*""; do
+      case $cc_temp in
+        compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+        distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+])# _LT_PREPARE_CC_BASENAME
+
+
 # _LT_CC_BASENAME(CC)
 # -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
 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-%%"`
+[m4_require([_LT_PREPARE_CC_BASENAME])dnl
+AC_REQUIRE([_LT_DECL_SED])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+func_cc_basename $1
+cc_basename=$func_cc_basename_result
 ])
 
 
 # _LT_FILEUTILS_DEFAULTS
 # ----------------------
 # It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
 m4_defun([_LT_FILEUTILS_DEFAULTS],
 [: ${CP="cp -f"}
 : ${MV="mv -f"}
@@ -177,15 +186,16 @@
 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
 m4_require([_LT_WITH_SYSROOT])dnl
+m4_require([_LT_CMD_TRUNCATE])dnl
 
 _LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
 # commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 ])
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
@@ -198,7 +208,7 @@
   # 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
+  if test set != "${COLLECT_NAMES+set}"; then
     COLLECT_NAMES=
     export COLLECT_NAMES
   fi
@@ -209,14 +219,14 @@
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# 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"
+with_gnu_ld=$lt_cv_prog_gnu_ld
 
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+old_CC=$CC
+old_CFLAGS=$CFLAGS
 
 # Set sane defaults for various variables
 test -z "$CC" && CC=cc
@@ -269,14 +279,14 @@
 
 # _LT_PROG_LTMAIN
 # ---------------
-# Note that this code is called both from `configure', and `config.status'
+# 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,
+# '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"
+ltmain=$ac_aux_dir/ltmain.sh
 ])# _LT_PROG_LTMAIN
 
 
@@ -286,7 +296,7 @@
 
 # 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'
+# in macros and then make a single call at the end using the 'libtool'
 # label.
 
 
@@ -421,8 +431,8 @@
 
 # _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
+# 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"`'])
@@ -446,7 +456,7 @@
 # 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
+available_tags='_LT_TAGS'dnl
 ])
 
 
@@ -474,7 +484,7 @@
 # _LT_LIBTOOL_CONFIG_VARS
 # -----------------------
 # Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# 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],
@@ -500,8 +510,8 @@
 # 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
+# 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],
@@ -547,7 +557,7 @@
 ]], lt_decl_quote_varnames); do
     case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -560,7 +570,7 @@
 ]], 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=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -576,7 +586,7 @@
 # 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
+# '#!' 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).
@@ -598,7 +608,7 @@
 _AS_PREPARE
 exec AS_MESSAGE_FD>&1
 _ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
+test 0 = "$lt_write_fail" && chmod +x $1[]dnl
 m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
 
 # LT_OUTPUT
@@ -621,7 +631,7 @@
 } >&AS_MESSAGE_LOG_FD
 
 lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
+'$as_me' creates a local libtool stub from the current configuration,
 for use in further configure time tests before the real libtool is
 generated.
 
@@ -643,7 +653,7 @@
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
-while test $[#] != 0
+while test 0 != $[#]
 do
   case $[1] in
     --version | --v* | -V )
@@ -656,10 +666,10 @@
       lt_cl_silent=: ;;
 
     -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
+Try '$[0] --help' for more information.]) ;;
 
     *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
+Try '$[0] --help' for more information.]) ;;
   esac
   shift
 done
@@ -685,7 +695,7 @@
 # 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 &&
+test yes = "$silent" &&
   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
@@ -705,27 +715,31 @@
 _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
+    # See if we are running on zsh, and set the options that allow our
     # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
+    if test -n "${ZSH_VERSION+set}"; then
       setopt NO_GLOB_SUBST
     fi
 
-    cfgfile="${ofile}T"
+    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
+# Generated automatically by $as_me ($PACKAGE) $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.
-#
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
 _LT_COPYING
 _LT_LIBTOOL_TAGS
 
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
 # ### BEGIN LIBTOOL CONFIG
 _LT_LIBTOOL_CONFIG_VARS
 _LT_LIBTOOL_TAG_VARS
@@ -733,13 +747,24 @@
 
 _LT_EOF
 
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_PREPARE_MUNGE_PATH_LIST
+_LT_PREPARE_CC_BASENAME
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_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
+if test set != "${COLLECT_NAMES+set}"; then
   COLLECT_NAMES=
   export COLLECT_NAMES
 fi
@@ -756,8 +781,6 @@
   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"
@@ -775,7 +798,6 @@
 [m4_if([$1], [], [
     PACKAGE='$PACKAGE'
     VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
     RM='$RM'
     ofile='$ofile'], [])
 ])dnl /_LT_CONFIG_SAVE_COMMANDS
@@ -974,7 +996,7 @@
 
     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
+      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
@@ -992,7 +1014,7 @@
 	  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
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1010,7 +1032,7 @@
       AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
 	[lt_cv_ld_exported_symbols_list=yes],
 	[lt_cv_ld_exported_symbols_list=no])
-	LDFLAGS="$save_LDFLAGS"
+	LDFLAGS=$save_LDFLAGS
     ])
 
     AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
@@ -1032,7 +1054,7 @@
       _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
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1042,32 +1064,32 @@
     ])
     case $host_os in
     rhapsody* | darwin1.[[012]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
     darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+      _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' ;;
+	  _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' ;;
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
       esac
     ;;
   esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+    if test yes = "$lt_cv_apple_cc_single_mod"; 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'
+    if test yes = "$lt_cv_ld_exported_symbols_list"; 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}'
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
     fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
@@ -1087,29 +1109,29 @@
   _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\"`'
+  if test yes = "$lt_cv_ld_force_load"; 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"
+  _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
   case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
      *) _lt_dar_can_shared=$GCC ;;
   esac
-  if test "$_lt_dar_can_shared" = "yes"; then
+  if test yes = "$_lt_dar_can_shared"; 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}"
+    _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}"
+[   if test yes != "$lt_cv_apple_cc_single_mod"; 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
@@ -1129,7 +1151,7 @@
 # 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
+if test set = "${lt_cv_aix_libpath+set}"; then
   aix_libpath=$lt_cv_aix_libpath
 else
   AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
@@ -1147,7 +1169,7 @@
     _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"
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
   fi
   ])
   aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
@@ -1167,8 +1189,8 @@
 # -----------------------
 # 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).
+# of the generated configure script that will find a shell with a builtin
+# printf (that we can use as an echo command).
 m4_defun([_LT_PROG_ECHO_BACKSLASH],
 [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
@@ -1196,10 +1218,10 @@
 # Invoke $ECHO with all args, space-separated.
 func_echo_all ()
 {
-    $ECHO "$*" 
+    $ECHO "$*"
 }
 
-case "$ECHO" in
+case $ECHO in
   printf*) AC_MSG_RESULT([printf]) ;;
   print*) AC_MSG_RESULT([print -r]) ;;
   *) AC_MSG_RESULT([cat]) ;;
@@ -1225,16 +1247,17 @@
 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).],
+[AS_HELP_STRING([--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 #(
+case $with_sysroot in #(
  yes)
-   if test "$GCC" = yes; then
+   if test yes = "$GCC"; then
      lt_sysroot=`$CC --print-sysroot 2>/dev/null`
    fi
    ;; #(
@@ -1244,14 +1267,14 @@
  no|'')
    ;; #(
  *)
-   AC_MSG_RESULT([${with_sysroot}])
+   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.])])
+[dependent libraries, and where our libraries should be installed.])])
 
 # _LT_ENABLE_LOCK
 # ---------------
@@ -1259,31 +1282,33 @@
 [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
+test no = "$enable_libtool_lock" || 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.
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
   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"
+	HPUX_IA64_MODE=32
 	;;
       *ELF-64*)
-	HPUX_IA64_MODE="64"
+	HPUX_IA64_MODE=64
 	;;
     esac
   fi
   rm -rf conftest*
   ;;
 *-*-irix6*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
   echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
       case `/usr/bin/file conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -melf32bsmip"
@@ -1312,9 +1337,46 @@
   rm -rf conftest*
   ;;
 
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
 x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
@@ -1333,10 +1395,10 @@
 		;;
 	    esac
 	    ;;
-	  powerpc64le-*)
+	  powerpc64le-*linux*)
 	    LD="${LD-ld} -m elf32lppclinux"
 	    ;;
-	  powerpc64-*)
+	  powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -1355,10 +1417,10 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  powerpcle-*)
+	  powerpcle-*linux*)
 	    LD="${LD-ld} -m elf64lppc"
 	    ;;
-	  powerpc-*)
+	  powerpc-*linux*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
@@ -1376,19 +1438,20 @@
 
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
+  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
+  if test yes != "$lt_cv_cc_needs_belf"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
+    CFLAGS=$SAVE_CFLAGS
   fi
   ;;
 *-*solaris*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
@@ -1396,7 +1459,7 @@
       case $lt_cv_prog_gnu_ld in
       yes*)
         case $host in
-        i?86-*-solaris*)
+        i?86-*-solaris*|x86_64-*-solaris*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
         sparc*-*-solaris*)
@@ -1405,7 +1468,7 @@
         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"
+          LD=${LD-ld}_sol2
         fi
         ;;
       *)
@@ -1421,7 +1484,7 @@
   ;;
 esac
 
-need_locks="$enable_libtool_lock"
+need_locks=$enable_libtool_lock
 ])# _LT_ENABLE_LOCK
 
 
@@ -1440,11 +1503,11 @@
      [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
+      if test 0 -eq "$ac_status"; 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
+	if test 0 -ne "$ac_status"; then
           lt_cv_ar_at_file=@
         fi
       fi
@@ -1452,7 +1515,7 @@
      ])
   ])
 
-if test "x$lt_cv_ar_at_file" = xno; then
+if test no = "$lt_cv_ar_at_file"; then
   archiver_list_spec=
 else
   archiver_list_spec=$lt_cv_ar_at_file
@@ -1483,7 +1546,7 @@
 
 if test -n "$RANLIB"; then
   case $host_os in
-  openbsd*)
+  bitrig* | openbsd*)
     old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
@@ -1519,7 +1582,7 @@
   [$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"
+   lt_compiler_flag="$3"  ## exclude from sc_useless_quotes_in_assignment
    # 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
@@ -1546,7 +1609,7 @@
    $RM conftest*
 ])
 
-if test x"[$]$2" = xyes; then
+if test yes = "[$]$2"; then
     m4_if([$5], , :, [$5])
 else
     m4_if([$6], , :, [$6])
@@ -1568,7 +1631,7 @@
 m4_require([_LT_DECL_SED])dnl
 AC_CACHE_CHECK([$1], [$2],
   [$2=no
-   save_LDFLAGS="$LDFLAGS"
+   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
@@ -1587,10 +1650,10 @@
      fi
    fi
    $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
+   LDFLAGS=$save_LDFLAGS
 ])
 
-if test x"[$]$2" = xyes; then
+if test yes = "[$]$2"; then
     m4_if([$4], , :, [$4])
 else
     m4_if([$5], , :, [$5])
@@ -1611,7 +1674,7 @@
 AC_MSG_CHECKING([the maximum length of command line arguments])
 AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
   i=0
-  teststring="ABCD"
+  teststring=ABCD
 
   case $build_os in
   msdosdjgpp*)
@@ -1651,7 +1714,7 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
     # 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`
@@ -1702,22 +1765,22 @@
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
     if test -n "$lt_cv_sys_max_cmd_len" && \
-	test undefined != "$lt_cv_sys_max_cmd_len"; then
+       test undefined != "$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
+      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` \
+      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
+	      test 17 != "$i" # 1/2 MB should be enough
       do
         i=`expr $i + 1`
         teststring=$teststring$teststring
@@ -1733,7 +1796,7 @@
     ;;
   esac
 ])
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len"; then
   AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
 else
   AC_MSG_RESULT(none)
@@ -1761,7 +1824,7 @@
 # ----------------------------------------------------------------
 m4_defun([_LT_TRY_DLOPEN_SELF],
 [m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
+if test yes = "$cross_compiling"; then :
   [$4]
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -1808,9 +1871,9 @@
 #  endif
 #endif
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
    correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
 int fnord () __attribute__((visibility("default")));
 #endif
 
@@ -1836,7 +1899,7 @@
   return status;
 }]
 _LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+  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
@@ -1857,7 +1920,7 @@
 # ------------------
 AC_DEFUN([LT_SYS_DLOPEN_SELF],
 [m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
+if test yes != "$enable_dlopen"; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
   enable_dlopen_self_static=unknown
@@ -1867,44 +1930,52 @@
 
   case $host_os in
   beos*)
-    lt_cv_dlopen="load_add_on"
+    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=LoadLibrary
     lt_cv_dlopen_libs=
     ;;
 
   cygwin*)
-    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen=dlopen
     lt_cv_dlopen_libs=
     ;;
 
   darwin*)
-  # if libdl is installed we need to link against it
+    # 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=dlopen lt_cv_dlopen_libs=-ldl],[
+    lt_cv_dlopen=dyld
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
     ])
     ;;
 
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
   *)
     AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
+	  [lt_cv_dlopen=shl_load],
       [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+	    [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
 	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
+	      [lt_cv_dlopen=dlopen],
 	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
 	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+		  [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"])
+		    [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
 	      ])
 	    ])
 	  ])
@@ -1913,21 +1984,21 @@
     ;;
   esac
 
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
+  if test no = "$lt_cv_dlopen"; then
     enable_dlopen=no
+  else
+    enable_dlopen=yes
   fi
 
   case $lt_cv_dlopen in
   dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
-    save_LDFLAGS="$LDFLAGS"
+    save_LDFLAGS=$LDFLAGS
     wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
-    save_LIBS="$LIBS"
+    save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
     AC_CACHE_CHECK([whether a program can dlopen itself],
@@ -1937,7 +2008,7 @@
 	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
     ])
 
-    if test "x$lt_cv_dlopen_self" = xyes; then
+    if test yes = "$lt_cv_dlopen_self"; 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
@@ -1947,9 +2018,9 @@
       ])
     fi
 
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
     ;;
   esac
 
@@ -2041,8 +2112,8 @@
 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
+hard_links=nottested
+if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; 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
@@ -2052,8 +2123,8 @@
   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])
+  if test no = "$hard_links"; then
+    AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
     need_locks=warn
   fi
 else
@@ -2080,8 +2151,8 @@
 _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.])
+AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
+  [Define to the sub-directory where libtool stores uninstalled libraries.])
 ])# _LT_CHECK_OBJDIR
 
 
@@ -2093,15 +2164,15 @@
 _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
+   test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
 
   # We can hardcode non-existent directories.
-  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+  if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
      # 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
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+     test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
     # Linking always hardcodes the temporary library directory.
     _LT_TAGVAR(hardcode_action, $1)=relink
   else
@@ -2115,12 +2186,12 @@
 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
+if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+   test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
   # Fast installation is not supported
   enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
   # Fast installation is not necessary
   enable_fast_install=needless
 fi
@@ -2144,7 +2215,7 @@
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
   darwin*)
-    if test -n "$STRIP" ; then
+    if test -n "$STRIP"; then
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
       AC_MSG_RESULT([yes])
@@ -2162,6 +2233,47 @@
 ])# _LT_CMD_STRIPLIB
 
 
+# _LT_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
+[[# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x@S|@2 in
+    x)
+        ;;
+    *:)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+        ;;
+    x:*)
+        eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+        ;;
+    *)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+]])# _LT_PREPARE_PATH_LIST
+
+
 # _LT_SYS_DYNAMIC_LINKER([TAG])
 # -----------------------------
 # PORTME Fill in your ld.so characteristics
@@ -2172,17 +2284,18 @@
 m4_require([_LT_DECL_OBJDUMP])dnl
 m4_require([_LT_DECL_SED])dnl
 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
 AC_MSG_CHECKING([dynamic linker characteristics])
 m4_if([$1],
 	[], [
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
+    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" ;;
+    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
@@ -2198,28 +2311,35 @@
     ;;
   esac
   # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
+  # 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`
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
   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
+    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"
+    elif test -n "$lt_multi_os_dir"; then
       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;
+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;
+          lt_foo = "/" $lt_i lt_foo;
         } else {
           lt_count--;
         }
@@ -2233,7 +2353,7 @@
   # 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'` ;;
+      $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
   esac
   sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 else
@@ -2242,7 +2362,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -2259,14 +2379,17 @@
 # flags to be left without arguments
 need_version=unknown
 
+AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
+[User-defined run-time library search path.])
+
 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'
+  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'
+  soname_spec='$libname$release$shared_ext$major'
   ;;
 
 aix[[4-9]]*)
@@ -2274,41 +2397,91 @@
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    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
+    # 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
+	   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
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot 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
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
       # 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
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a[(]lib.so.V[)]'
       # 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
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
     shlibpath_var=LIBPATH
   fi
   ;;
@@ -2318,18 +2491,18 @@
   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}'
+    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'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $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}'
+  library_names_spec='$libname$shared_ext'
   dynamic_linker="$host_os ld.so"
   shlibpath_var=LIBRARY_PATH
   ;;
@@ -2337,8 +2510,8 @@
 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'
+  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"
@@ -2350,7 +2523,7 @@
 
 cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
-  shrext_cmds=".dll"
+  shrext_cmds=.dll
   need_version=no
   need_lib_prefix=no
 
@@ -2359,8 +2532,8 @@
     # 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'\''`~
+    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~
@@ -2376,17 +2549,17 @@
     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}'
+      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}'
+      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}'
+      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'
@@ -2395,8 +2568,8 @@
   *,cl*)
     # Native MSVC
     libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
+    soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
 
     case $build_os in
     mingw*)
@@ -2423,7 +2596,7 @@
       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"
+      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'`
@@ -2436,8 +2609,8 @@
     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'\''`~
+    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'
@@ -2450,7 +2623,7 @@
 
   *)
     # Assume MSVC wrapper
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
     dynamic_linker='Win32 ld.exe'
     ;;
   esac
@@ -2463,8 +2636,8 @@
   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'
+  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`'
@@ -2477,8 +2650,8 @@
   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'
+  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
   ;;
 
@@ -2496,12 +2669,13 @@
   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}'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
     freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
       need_version=yes
       ;;
   esac
@@ -2531,10 +2705,10 @@
   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'
+  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
+  shlibpath_overrides_runpath=no
   sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
@@ -2552,14 +2726,15 @@
     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
+    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 32 = "$HPUX_IA64_MODE"; then
       sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
     else
       sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
     fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
   hppa*64*)
     shrext_cmds='.sl'
@@ -2567,8 +2742,8 @@
     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'
+    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
     ;;
@@ -2577,8 +2752,8 @@
     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'
+    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, ...
@@ -2591,8 +2766,8 @@
   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'
+  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
@@ -2603,7 +2778,7 @@
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
     *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
+	if test yes = "$lt_cv_prog_gnu_ld"; then
 		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
@@ -2611,8 +2786,8 @@
   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}'
+  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=
@@ -2631,8 +2806,8 @@
   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}"
+  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
   ;;
 
@@ -2641,13 +2816,33 @@
   dynamic_linker=no
   ;;
 
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # 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
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+  ;;
+
 # This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu | 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'
+  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
@@ -2672,7 +2867,12 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Append ld.so.conf contents to the search path
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) 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"
@@ -2704,12 +2904,12 @@
   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'
+    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'
+    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
@@ -2719,7 +2919,7 @@
 
 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}'
+  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
   ;;
@@ -2728,58 +2928,68 @@
   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'
+  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*)
+openbsd* | bitrig*)
   version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
+  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
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
   else
-    shlibpath_overrides_runpath=yes
+    need_version=yes
   fi
+  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
+  shlibpath_overrides_runpath=yes
   ;;
 
 os2*)
   libname_spec='$name'
-  shrext_cmds=".dll"
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
   need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  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'
   ;;
 
 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}'
+  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"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
   ;;
 
 rdos*)
@@ -2790,8 +3000,8 @@
   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'
+  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
@@ -2801,11 +3011,11 @@
 
 sunos4*)
   version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  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
+  if test yes = "$with_gnu_ld"; then
     need_lib_prefix=no
   fi
   need_version=yes
@@ -2813,8 +3023,8 @@
 
 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'
+  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)
@@ -2835,24 +3045,24 @@
   ;;
 
 sysv4*MP*)
-  if test -d /usr/nec ;then
+  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'
+    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
+  version_type=sco
   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'
+  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
+  if test yes = "$with_gnu_ld"; 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'
@@ -2870,7 +3080,7 @@
   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}'
+  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
@@ -2878,8 +3088,8 @@
 
 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'
+  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
   ;;
 
@@ -2888,20 +3098,30 @@
   ;;
 esac
 AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; 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"
+if test set = "${lt_cv_sys_lib_search_path_spec+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"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 fi
 
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
 _LT_DECL([], [variables_saved_for_relink], [1],
     [Variables whose values should be saved in libtool wrapper scripts and
     restored at link time])
@@ -2934,39 +3154,41 @@
     [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_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+    [Detected run-time system search path for libraries])
+_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+    [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
 ])# _LT_SYS_DYNAMIC_LINKER
 
 
 # _LT_PATH_TOOL_PREFIX(TOOL)
 # --------------------------
-# find a file program which can recognize shared library
+# find a file program that 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_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
+  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"
+    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 -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"
+	  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
 	    :
@@ -2989,11 +3211,11 @@
       break
     fi
   done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
   ;;
 esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
   AC_MSG_RESULT($MAGIC_CMD)
 else
@@ -3011,7 +3233,7 @@
 
 # _LT_PATH_MAGIC
 # --------------
-# find a file program which can recognize a shared library
+# find a file program that 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
@@ -3038,16 +3260,16 @@
 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],
+    [test no = "$withval" || with_gnu_ld=yes],
     [with_gnu_ld=no])dnl
 
 ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; 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
+    # 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` ;;
@@ -3061,7 +3283,7 @@
       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"
+      test -z "$LD" && LD=$ac_prog
       ;;
   "")
     # If it fails, then pretend we aren't using GCC.
@@ -3072,37 +3294,37 @@
     with_gnu_ld=unknown
     ;;
   esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; 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
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
+    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"
+      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 no != "$with_gnu_ld" && break
 	;;
       *)
-	test "$with_gnu_ld" != yes && break
+	test yes != "$with_gnu_ld" && break
 	;;
       esac
     fi
   done
-  IFS="$lt_save_ifs"
+  IFS=$lt_save_ifs
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
 fi])
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
 if test -n "$LD"; then
   AC_MSG_RESULT($LD)
 else
@@ -3156,13 +3378,13 @@
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
   cygwin* | mingw* | pw32* | cegcc*)
-    if test "$GCC" != yes; then
+    if test yes != "$GCC"; then
       reload_cmds=false
     fi
     ;;
   darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -3173,6 +3395,43 @@
 ])# _LT_CMD_RELOAD
 
 
+# _LT_PATH_DD
+# -----------
+# find a working dd
+m4_defun([_LT_PATH_DD],
+[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
+[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi])
+rm -f conftest.i conftest2.i conftest.out])
+])# _LT_PATH_DD
+
+
+# _LT_CMD_TRUNCATE
+# ----------------
+# find command to truncate a binary pipe
+m4_defun([_LT_CMD_TRUNCATE],
+[m4_require([_LT_PATH_DD])
+AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
+_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
+  [Command to truncate a binary pipe])
+])# _LT_CMD_TRUNCATE
+
+
 # _LT_CHECK_MAGIC_METHOD
 # ----------------------
 # how to check for library dependencies
@@ -3188,13 +3447,13 @@
 # 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.
+# '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.
+# that 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]]*)
@@ -3221,8 +3480,7 @@
   # 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
+  if ( 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
@@ -3318,8 +3576,8 @@
   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
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; 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)$'
@@ -3372,6 +3630,9 @@
 tpf*)
   lt_cv_deplibs_check_method=pass_all
   ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 esac
 ])
 
@@ -3412,33 +3673,38 @@
 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"
+  lt_cv_path_NM=$NM
 else
-  lt_nm_to_check="${ac_tool_prefix}nm"
+  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
+    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"
+      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
+      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:
+	# 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'*)
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
-	  break
+	  break 2
 	  ;;
 	*)
 	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 	  */dev/null*)
 	    lt_cv_path_NM="$tmp_nm -p"
-	    break
+	    break 2
 	    ;;
 	  *)
 	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -3449,21 +3715,21 @@
 	esac
       fi
     done
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
   done
   : ${lt_cv_path_NM=no}
 fi])
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; 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
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
     *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
+      DUMPBIN="$DUMPBIN -symbols -headers"
       ;;
     *)
       DUMPBIN=:
@@ -3471,8 +3737,8 @@
     esac
   fi
   AC_SUBST([DUMPBIN])
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
   fi
 fi
 test -z "$NM" && NM=nm
@@ -3518,8 +3784,8 @@
 
 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
+  # two different shell functions defined in ltmain.sh;
+  # decide which one 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
@@ -3531,7 +3797,7 @@
   ;;
 *)
   # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
   ;;
 esac
 ])
@@ -3558,13 +3824,28 @@
     lt_cv_path_mainfest_tool=yes
   fi
   rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
+if test yes != "$lt_cv_path_mainfest_tool"; then
   MANIFEST_TOOL=:
 fi
 _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
 ])# _LT_PATH_MANIFEST_TOOL
 
 
+# _LT_DLL_DEF_P([FILE])
+# ---------------------
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with func_dll_def_p in the libtool script
+AC_DEFUN([_LT_DLL_DEF_P],
+[dnl
+  test DEF = "`$SED -n dnl
+    -e '\''s/^[[	 ]]*//'\'' dnl Strip leading whitespace
+    -e '\''/^\(;.*\)*$/d'\'' dnl      Delete empty lines and comments
+    -e '\''s/^\(EXPORTS\|LIBRARY\)\([[	 ]].*\)*$/DEF/p'\'' dnl
+    -e q dnl                          Only consider the first "real" line
+    $1`" dnl
+])# _LT_DLL_DEF_P
+
+
 # LT_LIB_M
 # --------
 # check for math library
@@ -3576,11 +3857,11 @@
   # These system don't have libm, or don't need it
   ;;
 *-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
   AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
   ;;
 *)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  AC_CHECK_LIB(m, cos, LIBM=-lm)
   ;;
 esac
 AC_SUBST([LIBM])
@@ -3599,7 +3880,7 @@
 
 _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   case $cc_basename in
   nvcc*)
     _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
@@ -3651,7 +3932,7 @@
   symcode='[[ABCDGISTW]]'
   ;;
 hpux*)
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     symcode='[[ABCDEGRST]]'
   fi
   ;;
@@ -3684,14 +3965,44 @@
   symcode='[[ABCDGIRSTW]]' ;;
 esac
 
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
 # 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'"
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$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'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -3709,21 +4020,24 @@
 
   # 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.
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported 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};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
 "     \$ 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))}"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,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'"
@@ -3763,11 +4077,11 @@
 	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
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
    relocations are performed -- see ld's documentation on pseudo-relocs.  */
 # define LT@&t@_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
 /* This system does not cope well with relocations in const data.  */
 # define LT@&t@_DLSYM_CONST
 #else
@@ -3793,7 +4107,7 @@
 {
   { "@PROGRAM@", (void *) 0 },
 _LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
 	  cat <<\_LT_EOF >> conftest.$ac_ext
   {0, (void *) 0}
 };
@@ -3813,9 +4127,9 @@
 	  mv conftest.$ac_objext conftstm.$ac_objext
 	  lt_globsym_save_LIBS=$LIBS
 	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS="conftstm.$ac_objext"
+	  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
+	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
 	  LIBS=$lt_globsym_save_LIBS
@@ -3836,7 +4150,7 @@
   rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
+  if test yes = "$pipe_works"; then
     break
   else
     lt_cv_sys_global_symbol_pipe=
@@ -3863,12 +4177,16 @@
     [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_import], [lt_cv_sys_global_symbol_to_import], [1],
+    [Transform the output of nm into a list of symbols to manually relocate])
 _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_interface], [lt_cv_nm_interface], [1],
+    [The name lister interface])
 _LT_DECL([], [nm_file_list_spec], [1],
     [Specify filename containing input files for $NM])
 ]) # _LT_CMD_GLOBAL_SYMBOLS
@@ -3884,17 +4202,18 @@
 
 m4_if([$1], [CXX], [
   # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
+  if test yes = "$GXX"; 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
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
       ;;
 
     amigaos*)
@@ -3905,8 +4224,8 @@
         ;;
       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'.
+            # 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
@@ -3922,6 +4241,11 @@
       # (--disable-auto-import) libraries
       m4_if([$1], [GCJ], [],
 	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
       ;;
     darwin* | rhapsody*)
       # PIC is the default on this platform
@@ -3971,7 +4295,7 @@
     case $host_os in
       aix[[4-9]]*)
 	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
+	if test ia64 = "$host_cpu"; then
 	  # AIX 5 now supports IA64 processor
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	else
@@ -4012,14 +4336,14 @@
 	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_static, $1)='$wl-a ${wl}archive'
+	    if test ia64 != "$host_cpu"; 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'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
 	    case $host_cpu in
 	    hppa*64*|ia64*)
 	      # +Z the default
@@ -4056,7 +4380,7 @@
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	    ;;
 	  ecpc* )
-	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    # 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'
@@ -4201,17 +4525,18 @@
   fi
 ],
 [
-  if test "$GCC" = yes; then
+  if test yes = "$GCC"; 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
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
       ;;
 
     amigaos*)
@@ -4222,8 +4547,8 @@
         ;;
       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'.
+            # 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
@@ -4240,6 +4565,11 @@
       # (--disable-auto-import) libraries
       m4_if([$1], [GCJ], [],
 	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -4310,7 +4640,7 @@
     case $host_os in
     aix*)
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       else
@@ -4318,11 +4648,30 @@
       fi
       ;;
 
+    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'
+      case $cc_basename in
+      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'
+        ;;
+      esac
+      ;;
+
     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'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -4338,7 +4687,7 @@
 	;;
       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'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
       ;;
 
     irix5* | irix6* | nonstopux*)
@@ -4349,7 +4698,7 @@
 
     linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
+      # 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'
@@ -4374,6 +4723,12 @@
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny 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)='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -4471,7 +4826,7 @@
       ;;
 
     sysv4*MP*)
-      if test -d /usr/nec ;then
+      if test -d /usr/nec; then
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       fi
@@ -4500,7 +4855,7 @@
   fi
 ])
 case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
+  # For platforms that do not support PIC, -DPIC is meaningless:
   *djgpp*)
     _LT_TAGVAR(lt_prog_compiler_pic, $1)=
     ;;
@@ -4566,17 +4921,21 @@
   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".
+    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+    # Without the "-l" option, or with the "-B" option, AIX nm treats
+    # weak defined symbols like other global defined symbols, whereas
+    # GNU nm marks them as "W".
+    # While the 'weak' keyword is ignored in the Export File, we need
+    # it in the Import File for the 'aix-soname' feature, so we have
+    # to replace the "-B" option with "-P" for AIX nm.
     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'
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { 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'
+      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
-    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+    _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
@@ -4625,9 +4984,9 @@
   # 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'.
+  # 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
@@ -4643,7 +5002,7 @@
     # 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
+    if test yes != "$GCC"; then
       with_gnu_ld=no
     fi
     ;;
@@ -4651,7 +5010,7 @@
     # we just hope/assume this is gcc and not c89 (= MSVC++)
     with_gnu_ld=yes
     ;;
-  openbsd*)
+  openbsd* | bitrig*)
     with_gnu_ld=no
     ;;
   linux* | k*bsd*-gnu | gnu*)
@@ -4664,7 +5023,7 @@
   # 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
+  if test yes = "$with_gnu_ld"; then
     case $host_os in
       aix*)
 	# The AIX port of GNU ld has always aspired to compatibility
@@ -4686,24 +5045,24 @@
     esac
   fi
 
-  if test "$lt_use_gnu_ld_interface" = yes; then
+  if test yes = "$lt_use_gnu_ld_interface"; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
+    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'
+    _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'
+      _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
+    case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 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 ...
@@ -4716,7 +5075,7 @@
     case $host_os in
     aix[[3-9]]*)
       # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
+      if test ia64 != "$host_cpu"; then
 	_LT_TAGVAR(ld_shlibs, $1)=no
 	cat <<_LT_EOF 1>&2
 
@@ -4735,7 +5094,7 @@
       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_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             _LT_TAGVAR(archive_expsym_cmds, $1)=''
         ;;
       m68k)
@@ -4751,7 +5110,7 @@
 	_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'
+	_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
@@ -4761,7 +5120,7 @@
       # _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(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
@@ -4769,61 +5128,89 @@
       _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'
+        _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, use it as
+	# is; otherwise, prepend EXPORTS...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); 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(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $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'
+      _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'
+      _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
+      if test linux-dietlibc = "$host_os"; 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
+	 && test no = "$tmp_diet"
       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'
+	  _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'
+	  _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' ;;
@@ -4834,42 +5221,47 @@
 	lf95*)				# Lahey Fortran 8.1
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
 	  tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-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(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(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'
+	_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
+        if test yes = "$supports_anon_versioning"; 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'
+            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
+	tcc*)
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+	  ;;
 	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(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
+	  if test yes = "$supports_anon_versioning"; 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'
+              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
@@ -4883,8 +5275,8 @@
 	_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'
+	_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
       ;;
 
@@ -4902,8 +5294,8 @@
 
 _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'
+	_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
@@ -4915,7 +5307,7 @@
 	_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
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
 *** 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
@@ -4930,9 +5322,9 @@
 	  # 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'
+	    _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
@@ -4949,15 +5341,15 @@
 
     *)
       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'
+	_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
+    if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
       runpath_var=
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
       _LT_TAGVAR(export_dynamic_flag_spec, $1)=
@@ -4973,7 +5365,7 @@
       # 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
+      if test yes = "$GCC" && 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
@@ -4981,34 +5373,57 @@
       ;;
 
     aix[[4-9]]*)
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; 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=""
+	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".
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
 	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'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { 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'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | 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.
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
 	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
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
 	    aix_use_runtimelinking=yes
 	    break
 	  fi
 	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
 	  ;;
 	esac
 
@@ -5027,13 +5442,21 @@
       _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,'
+      _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+	;;
+      esac
 
-      if test "$GCC" = yes; then
+      if test yes = "$GCC"; 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`
+	  collect2name=`$CC -print-prog-name=collect2`
 	  if test -f "$collect2name" &&
 	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	  then
@@ -5052,62 +5475,80 @@
 	  ;;
 	esac
 	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
 	fi
-	_LT_TAGVAR(link_all_deplibs, $1)=no
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
       else
 	# not using gcc
-	if test "$host_cpu" = ia64; then
+	if test ia64 = "$host_cpu"; 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'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
 	  else
-	    shared_flag='${wl}-bM:SRE'
+	    shared_flag='$wl-bM:SRE'
 	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
 	fi
       fi
 
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+      _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
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; 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"
+        _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 -n "$allow_undefined_flag"; 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'
+	if test ia64 = "$host_cpu"; 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"
+	  _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"
+	 _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
+	  _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; 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'
+	    _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'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
 	fi
       fi
       ;;
@@ -5116,7 +5557,7 @@
       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_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             _LT_TAGVAR(archive_expsym_cmds, $1)=''
         ;;
       m68k)
@@ -5146,16 +5587,17 @@
 	# Tell ltmain to make .lib files, not .a files.
 	libext=lib
 	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
+	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='
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $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
@@ -5164,18 +5606,18 @@
 	# 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'
+          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
@@ -5184,7 +5626,7 @@
 	# Tell ltmain to make .lib files, not .a files.
 	libext=lib
 	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
+	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.
@@ -5234,33 +5676,33 @@
       ;;
 
     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'
+      if test yes = "$GCC"; 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 "x$output_objdir/$soname" = "x$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'
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _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'
+      _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'
+      if test yes,no = "$GCC,$with_gnu_ld"; 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'
+      if test no = "$with_gnu_ld"; 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'
+	_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
@@ -5268,25 +5710,25 @@
       ;;
 
     hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+      if test yes,no = "$GCC,$with_gnu_ld"; then
 	case $host_cpu in
 	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _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+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'
+	  _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'
+	  _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'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
 	m4_if($1, [], [
@@ -5294,14 +5736,14 @@
 	  # (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)='$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'])
+	  [_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'
+      if test no = "$with_gnu_ld"; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
 	case $host_cpu in
@@ -5312,7 +5754,7 @@
 	*)
 	  _LT_TAGVAR(hardcode_direct, $1)=yes
 	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	  _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.
@@ -5323,16 +5765,16 @@
       ;;
 
     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'
+      if test yes = "$GCC"; 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"
+	  [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; }]],
@@ -5345,21 +5787,32 @@
       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'
+           LDFLAGS=$save_LDFLAGS])
+	if test yes = "$lt_cv_irix_exported_symbol"; 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
+	_LT_TAGVAR(link_all_deplibs, $1)=no
       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'
+	_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_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
       ;;
 
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
     netbsd* | netbsdelf*-gnu)
       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
@@ -5374,7 +5827,7 @@
     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_flag_spec, $1)='$wl-rpath $wl$libdir'
       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
@@ -5382,27 +5835,19 @@
     *nto* | *qnx*)
       ;;
 
-    openbsd*)
+    openbsd* | bitrig*)
       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
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; 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'
+	  _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
+	  _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'
 	fi
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
@@ -5413,33 +5858,53 @@
       _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'
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
 
     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'
+      if test yes = "$GCC"; 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'
+	_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_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'
+      if test yes = "$GCC"; 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_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'
+          $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'
@@ -5450,24 +5915,24 @@
 
     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'
+      if test yes = "$GCC"; 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'
+          $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_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'
+            $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'
+	  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'
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 	  ;;
 	esac
       fi
@@ -5477,11 +5942,11 @@
       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 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'
+	if test yes = "$GCC"; 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
@@ -5491,10 +5956,10 @@
       ;;
 
     sunos4*)
-      if test "x$host_vendor" = xsequent; then
+      if test sequent = "$host_vendor"; 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'
+	_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
@@ -5543,43 +6008,43 @@
       ;;
 
     sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _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'
+      if test yes = "$GCC"; 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'
+	_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
+      # Note: We CANNOT 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(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_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'
+      _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'
+      if test yes = "$GCC"; 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'
+	_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
       ;;
 
@@ -5594,17 +6059,17 @@
       ;;
     esac
 
-    if test x$host_vendor = xsni; then
+    if test sni = "$host_vendor"; then
       case $host in
       sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+	_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
+test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
 
 _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
 
@@ -5621,7 +6086,7 @@
   # Assume -lc should be added
   _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+  if test yes,yes = "$GCC,$enable_shared"; then
     case $_LT_TAGVAR(archive_cmds, $1) in
     *'~'*)
       # FIXME: we may have to deal with multi-command sequences.
@@ -5701,12 +6166,12 @@
 _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
+    [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
+    [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
+    "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
@@ -5747,10 +6212,10 @@
 # ------------------------
 # 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'.
+# the compiler configuration to 'libtool'.
 m4_defun([_LT_LANG_C_CONFIG],
 [m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
+lt_save_CC=$CC
 AC_LANG_PUSH(C)
 
 # Source file extension for C test sources.
@@ -5790,18 +6255,18 @@
   LT_SYS_DLOPEN_SELF
   _LT_CMD_STRIPLIB
 
-  # Report which library types will actually be built
+  # Report what 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
+  test no = "$can_build_shared" && 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
+    test yes = "$enable_shared" && enable_static=no
     if test -n "$RANLIB"; then
       archive_cmds="$archive_cmds~\$RANLIB \$lib"
       postinstall_cmds='$RANLIB $lib'
@@ -5809,8 +6274,12 @@
     ;;
 
   aix[[4-9]]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
     fi
     ;;
   esac
@@ -5818,13 +6287,13 @@
 
   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
+  test yes = "$enable_shared" || enable_static=yes
   AC_MSG_RESULT([$enable_static])
 
   _LT_CONFIG($1)
 fi
 AC_LANG_POP
-CC="$lt_save_CC"
+CC=$lt_save_CC
 ])# _LT_LANG_C_CONFIG
 
 
@@ -5832,14 +6301,14 @@
 # --------------------------
 # 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'.
+# 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
+if test -n "$CXX" && ( test no != "$CXX" &&
+    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+    (test g++ != "$CXX"))); then
   AC_PROG_CXXCPP
 else
   _lt_caught_CXX_error=yes
@@ -5881,7 +6350,7 @@
 # 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
+if test yes != "$_lt_caught_CXX_error"; then
   # Code to be used in simple compile tests
   lt_simple_compile_test_code="int some_variable = 0;"
 
@@ -5923,35 +6392,35 @@
   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
+    if test yes = "$GXX"; 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
+    if test yes = "$GXX"; 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'
+      if test yes = "$with_gnu_ld"; 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'
+        _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}'
+        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'
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
         else
           _LT_TAGVAR(whole_archive_flag_spec, $1)=
         fi
@@ -5987,18 +6456,30 @@
         _LT_TAGVAR(ld_shlibs, $1)=no
         ;;
       aix[[4-9]]*)
-        if test "$host_cpu" = ia64; then
+        if test ia64 = "$host_cpu"; 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=""
+          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.
+          # have runtime linking enabled, and use it for executables.
+          # For shared libraries, we enable/disable runtime linking
+          # depending on the kind of the shared library created -
+          # when "with_aix_soname,aix_use_runtimelinking" is:
+          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "aix,yes"  lib.so          shared, rtl:yes, for executables
+          #            lib.a           static archive
+          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
+          #            lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a(lib.so.V) shared, rtl:no
+          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a           static archive
           case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 	    for ld_flag in $LDFLAGS; do
 	      case $ld_flag in
@@ -6008,6 +6489,13 @@
 	        ;;
 	      esac
 	    done
+	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	      # so we don't have lib.a shared libs to link our executables.
+	      # We have to force runtime linking in this case.
+	      aix_use_runtimelinking=yes
+	      LDFLAGS="$LDFLAGS -Wl,-brtl"
+	    fi
 	    ;;
           esac
 
@@ -6026,13 +6514,21 @@
         _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,'
+        _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+        case $with_aix_soname,$aix_use_runtimelinking in
+        aix,*) ;;	# no import file
+        svr4,* | *,yes) # use import file
+          # The Import File defines what to hardcode.
+          _LT_TAGVAR(hardcode_direct, $1)=no
+          _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+          ;;
+        esac
 
-        if test "$GXX" = yes; then
+        if test yes = "$GXX"; 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`
+	  collect2name=`$CC -print-prog-name=collect2`
 	  if test -f "$collect2name" &&
 	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	  then
@@ -6050,64 +6546,84 @@
 	  fi
           esac
           shared_flag='-shared'
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag="$shared_flag "'${wl}-G'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag=$shared_flag' $wl-G'
 	  fi
+	  # Need to ensure runtime linking is disabled for the traditional
+	  # shared library, or the linker may eventually find shared libraries
+	  # /with/ Import File - we do not want to mix them.
+	  shared_flag_aix='-shared'
+	  shared_flag_svr4='-shared $wl-G'
         else
           # not using gcc
-          if test "$host_cpu" = ia64; then
+          if test ia64 = "$host_cpu"; 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'
+	    if test yes = "$aix_use_runtimelinking"; then
+	      shared_flag='$wl-G'
 	    else
-	      shared_flag='${wl}-bM:SRE'
+	      shared_flag='$wl-bM:SRE'
 	    fi
+	    shared_flag_aix='$wl-bM:SRE'
+	    shared_flag_svr4='$wl-G'
           fi
         fi
 
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+        _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
+	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; 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'
+          # The "-G" linker flag allows undefined symbols.
+          _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
           # 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(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"
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; 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'
+          if test ia64 = "$host_cpu"; 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"
+	    _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"
+	    _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
+	    _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	    if test yes = "$with_gnu_ld"; 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'
+	      _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'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	    # -brtl affects multiple linker settings, -berok does not and is overridden later
+	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	    if test svr4 != "$with_aix_soname"; then
+	      # This is similar to how AIX traditionally builds its shared
+	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	    fi
+	    if test aix != "$with_aix_soname"; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	    else
+	      # used by -dlpreopen to get the symbols
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	    fi
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
           fi
         fi
         ;;
@@ -6117,7 +6633,7 @@
 	  _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'
+	  _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
@@ -6145,57 +6661,58 @@
 	  # Tell ltmain to make .lib files, not .a files.
 	  libext=lib
 	  # Tell ltmain to make .dll files, not .so files.
-	  shrext_cmds=".dll"
+	  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='
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+              cp "$export_symbols" "$output_objdir/$soname.def";
+              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            else
+              $SED -e '\''s/^/-link -EXPORT:/'\'' < $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'
+            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(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'
+	    _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, use it as
+	    # is; otherwise, prepend EXPORTS...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); 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
@@ -6206,6 +6723,34 @@
         _LT_DARWIN_LINKER_FEATURES($1)
 	;;
 
+      os2*)
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	shrext_cmds=.dll
+	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  prefix_cmds="$SED"~
+	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	    prefix_cmds="$prefix_cmds -e 1d";
+	  fi~
+	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+
       dgux*)
         case $cc_basename in
           ec++*)
@@ -6241,14 +6786,14 @@
         ;;
 
       haiku*)
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _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_flag_spec, $1)='$wl+b $wl$libdir'
         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        _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
@@ -6260,7 +6805,7 @@
             _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'
+            _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 "x$output_objdir/$soname" = "x$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.
@@ -6269,11 +6814,11 @@
             # explicitly linking system object files so we need to strip them
             # from the output so that they don't get included in the library
             # dependencies.
-            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"'
+            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'
+            if test yes = "$GXX"; 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 "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
             else
               # FIXME: insert proper C++ library support
               _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6283,15 +6828,15 @@
         ;;
 
       hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        if test no = "$with_gnu_ld"; 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'
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
               ;;
           esac
         fi
@@ -6317,13 +6862,13 @@
           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'
+	        _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+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'
+	        _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
@@ -6334,20 +6879,20 @@
 	    # 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"'
+	    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
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; 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'
+	            _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+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'
+	            _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
@@ -6362,22 +6907,22 @@
       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'
+	_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'
+	_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'
+	    _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
@@ -6386,17 +6931,17 @@
 	    _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'
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; 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'
+	        _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_flag_spec, $1)='$wl-rpath $wl$libdir'
         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
@@ -6409,8 +6954,8 @@
 	    # 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'
+	    _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.
@@ -6419,10 +6964,10 @@
 	    # 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"'
+	    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'
+	    _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.
@@ -6436,59 +6981,59 @@
 	    # 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'
+	        _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'
+	        _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'
+	    _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`"'
+               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'
+                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'
+                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'
+                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'
+	      _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'
+	    _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'
+	    _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'
@@ -6502,18 +7047,18 @@
 	    # 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'
+	    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(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 yes = "$supports_anon_versioning"; 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'
+                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
 	    ;;
 	  *)
@@ -6521,10 +7066,10 @@
 	    *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(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(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
@@ -6582,22 +7127,17 @@
         _LT_TAGVAR(ld_shlibs, $1)=yes
 	;;
 
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      openbsd*)
+      openbsd* | bitrig*)
 	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'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; 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
@@ -6613,9 +7153,9 @@
 	    # 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_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_flag_spec, $1)='$wl-rpath,$libdir'
 	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
 	    # Archives containing C++ object files must be created using
@@ -6633,17 +7173,17 @@
           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)=' $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_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'
+                  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
@@ -6658,21 +7198,21 @@
 	    # 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"'
+	    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}\*'
+	    if test yes,no = "$GXX,$with_gnu_ld"; 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 -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'
+	          _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_flag_spec, $1)='$wl-rpath $wl$libdir'
 	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
 	      # Commands to make compiler produce verbose output that lists
@@ -6718,9 +7258,9 @@
 	    # 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_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'
+              $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
@@ -6728,7 +7268,7 @@
 	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 	      *)
 		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
+		# 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'
 	        ;;
@@ -6745,30 +7285,30 @@
 	    ;;
           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'
+	    _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 test yes,no = "$GXX,$with_gnu_ld"; 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_cmds, $1)='$CC -shared $pic_flag -nostdlib $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'
+                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -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
+	        # 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_cmds, $1)='$CC -G -nostdlib $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'
+                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -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
@@ -6776,11 +7316,11 @@
 	        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'
+	      _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'
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 		  ;;
 	      esac
 	    fi
@@ -6789,52 +7329,52 @@
         ;;
 
     sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _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 -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'
+	  _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
+	# Note: We CANNOT 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(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_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'
+	_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(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(old_archive_cmds, $1)"
 	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
-	      '"$_LT_TAGVAR(reload_cmds, $1)"
+              '"$_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'
+	    _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
       ;;
@@ -6865,10 +7405,10 @@
     esac
 
     AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+    test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
 
-    _LT_TAGVAR(GCC, $1)="$GXX"
-    _LT_TAGVAR(LD, $1)="$LD"
+    _LT_TAGVAR(GCC, $1)=$GXX
+    _LT_TAGVAR(LD, $1)=$LD
 
     ## CAVEAT EMPTOR:
     ## There is no encapsulation within the following macros, do not change
@@ -6895,7 +7435,7 @@
   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
+fi # test yes != "$_lt_caught_CXX_error"
 
 AC_LANG_POP
 ])# _LT_LANG_CXX_CONFIG
@@ -6917,13 +7457,14 @@
 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}\$%%"`;;
+  case @S|@2 in
+  .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
+  *)  func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
   esac
 } # func_stripname_cnf
 ])# _LT_FUNC_STRIPNAME_CNF
 
+
 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
 # ---------------------------------
 # Figure out "hidden" library dependencies from verbose
@@ -7007,13 +7548,13 @@
   pre_test_object_deps_done=no
 
   for p in `eval "$output_verbose_link_cmd"`; do
-    case ${prev}${p} in
+    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
+       if test x-L = "$p" ||
+          test x-R = "$p"; then
 	 prev=$p
 	 continue
        fi
@@ -7029,16 +7570,16 @@
        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
+       if test no = "$pre_test_object_deps_done"; 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}"
+	     _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}"
+	     _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
@@ -7046,9 +7587,9 @@
 	 esac
        else
 	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+	   _LT_TAGVAR(postdeps, $1)=$prev$p
 	 else
-	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
 	 fi
        fi
        prev=
@@ -7063,15 +7604,15 @@
 	 continue
        fi
 
-       if test "$pre_test_object_deps_done" = no; then
+       if test no = "$pre_test_object_deps_done"; then
 	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	   _LT_TAGVAR(predep_objects, $1)="$p"
+	   _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"
+	   _LT_TAGVAR(postdep_objects, $1)=$p
 	 else
 	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
 	 fi
@@ -7102,51 +7643,6 @@
   _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
 ])
 
@@ -7155,7 +7651,7 @@
 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!^ !!'`
+ _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])
@@ -7175,10 +7671,10 @@
 # --------------------------
 # 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'.
+# 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
+if test -z "$F77" || test no = "$F77"; then
   _lt_disable_F77=yes
 fi
 
@@ -7215,7 +7711,7 @@
 # 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
+if test yes != "$_lt_disable_F77"; then
   # Code to be used in simple compile tests
   lt_simple_compile_test_code="\
       subroutine t
@@ -7237,7 +7733,7 @@
   _LT_LINKER_BOILERPLATE
 
   # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
+  lt_save_CC=$CC
   lt_save_GCC=$GCC
   lt_save_CFLAGS=$CFLAGS
   CC=${F77-"f77"}
@@ -7251,21 +7747,25 @@
     AC_MSG_RESULT([$can_build_shared])
 
     AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
+    test no = "$can_build_shared" && 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
+        test yes = "$enable_shared" && 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
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
 	fi
         ;;
     esac
@@ -7273,11 +7773,11 @@
 
     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
+    test yes = "$enable_shared" || enable_static=yes
     AC_MSG_RESULT([$enable_static])
 
-    _LT_TAGVAR(GCC, $1)="$G77"
-    _LT_TAGVAR(LD, $1)="$LD"
+    _LT_TAGVAR(GCC, $1)=$G77
+    _LT_TAGVAR(LD, $1)=$LD
 
     ## CAVEAT EMPTOR:
     ## There is no encapsulation within the following macros, do not change
@@ -7294,9 +7794,9 @@
   fi # test -n "$compiler"
 
   GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-  CFLAGS="$lt_save_CFLAGS"
-fi # test "$_lt_disable_F77" != yes
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_F77"
 
 AC_LANG_POP
 ])# _LT_LANG_F77_CONFIG
@@ -7306,11 +7806,11 @@
 # -------------------------
 # 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'.
+# 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
+if test -z "$FC" || test no = "$FC"; then
   _lt_disable_FC=yes
 fi
 
@@ -7347,7 +7847,7 @@
 # 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
+if test yes != "$_lt_disable_FC"; then
   # Code to be used in simple compile tests
   lt_simple_compile_test_code="\
       subroutine t
@@ -7369,7 +7869,7 @@
   _LT_LINKER_BOILERPLATE
 
   # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
+  lt_save_CC=$CC
   lt_save_GCC=$GCC
   lt_save_CFLAGS=$CFLAGS
   CC=${FC-"f95"}
@@ -7385,21 +7885,25 @@
     AC_MSG_RESULT([$can_build_shared])
 
     AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
+    test no = "$can_build_shared" && 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
+        test yes = "$enable_shared" && 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
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
 	fi
         ;;
     esac
@@ -7407,11 +7911,11 @@
 
     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
+    test yes = "$enable_shared" || enable_static=yes
     AC_MSG_RESULT([$enable_static])
 
-    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-    _LT_TAGVAR(LD, $1)="$LD"
+    _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
@@ -7431,7 +7935,7 @@
   GCC=$lt_save_GCC
   CC=$lt_save_CC
   CFLAGS=$lt_save_CFLAGS
-fi # test "$_lt_disable_FC" != yes
+fi # test yes != "$_lt_disable_FC"
 
 AC_LANG_POP
 ])# _LT_LANG_FC_CONFIG
@@ -7441,7 +7945,7 @@
 # --------------------------
 # 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'.
+# to write the compiler configuration to 'libtool'.
 m4_defun([_LT_LANG_GCJ_CONFIG],
 [AC_REQUIRE([LT_PROG_GCJ])dnl
 AC_LANG_SAVE
@@ -7475,7 +7979,7 @@
 CFLAGS=$GCJFLAGS
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
+_LT_TAGVAR(LD, $1)=$LD
 _LT_CC_BASENAME([$compiler])
 
 # GCJ did not exist at the time GCC didn't implicitly link libc in.
@@ -7512,7 +8016,7 @@
 # --------------------------
 # 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'.
+# to write the compiler configuration to 'libtool'.
 m4_defun([_LT_LANG_GO_CONFIG],
 [AC_REQUIRE([LT_PROG_GO])dnl
 AC_LANG_SAVE
@@ -7546,7 +8050,7 @@
 CFLAGS=$GOFLAGS
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
+_LT_TAGVAR(LD, $1)=$LD
 _LT_CC_BASENAME([$compiler])
 
 # Go did not exist at the time GCC didn't implicitly link libc in.
@@ -7583,7 +8087,7 @@
 # -------------------------
 # 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'.
+# to write the compiler configuration to 'libtool'.
 m4_defun([_LT_LANG_RC_CONFIG],
 [AC_REQUIRE([LT_PROG_RC])dnl
 AC_LANG_SAVE
@@ -7599,7 +8103,7 @@
 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"
+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
@@ -7609,7 +8113,7 @@
 _LT_LINKER_BOILERPLATE
 
 # Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
 lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
 GCC=
@@ -7638,7 +8142,7 @@
 [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"
+      test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
       AC_SUBST(GCJFLAGS)])])[]dnl
 ])
 
@@ -7749,7 +8253,7 @@
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
 # along with /bin/sed that truncates output.
 for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
+  test ! -f "$lt_ac_sed" && continue
   cat /dev/null > conftest.in
   lt_ac_count=0
   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -7766,9 +8270,9 @@
     $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
+    test 10 -lt "$lt_ac_count" && break
     lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
+    if test "$lt_ac_count" -gt "$lt_ac_max"; then
       lt_ac_max=$lt_ac_count
       lt_cv_path_SED=$lt_ac_sed
     fi
@@ -7792,27 +8296,7 @@
 # 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
+[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   lt_unset=unset
 else
   lt_unset=false
@@ -7836,102 +8320,9 @@
 ])# _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
+# Determine what 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],
diff -Nru procps-3.3.11/m4/lt~obsolete.m4 procps-3.3.12/m4/lt~obsolete.m4
--- procps-3.3.11/m4/lt~obsolete.m4	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/m4/lt~obsolete.m4	2016-07-10 06:40:26.000000000 +0000
@@ -1,6 +1,7 @@
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+#   Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
 # This file is free software; the Free Software Foundation gives
@@ -11,7 +12,7 @@
 
 # These exist entirely to fool aclocal when bootstrapping libtool.
 #
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# 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.
 #
@@ -25,7 +26,7 @@
 # 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. 
+# 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
diff -Nru procps-3.3.11/m4/ltoptions.m4 procps-3.3.12/m4/ltoptions.m4
--- procps-3.3.11/m4/ltoptions.m4	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/m4/ltoptions.m4	2016-07-10 06:40:26.000000000 +0000
@@ -1,14 +1,14 @@
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-#   Inc.
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 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
+# serial 8 ltoptions.m4
 
 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -29,7 +29,7 @@
 [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
+    [m4_warning([Unknown $1 option '$2'])])[]dnl
 ])
 
 
@@ -75,13 +75,15 @@
   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 '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_ENABLE_FAST_INSTALL])
+  _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+		   [_LT_WITH_AIX_SONAME([aix])])
   ])
 ])# _LT_SET_OPTIONS
 
@@ -112,7 +114,7 @@
 [_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.])
+put the 'dlopen' option into LT_INIT's first parameter.])
 ])
 
 dnl aclocal-1.4 backwards compatibility:
@@ -148,7 +150,7 @@
 _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.])
+put the 'win32-dll' option into LT_INIT's first parameter.])
 ])
 
 dnl aclocal-1.4 backwards compatibility:
@@ -157,9 +159,9 @@
 
 # _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'.
+# 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],
@@ -172,14 +174,14 @@
     *)
       enable_shared=no
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_shared=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac],
     [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
@@ -211,9 +213,9 @@
 
 # _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'.
+# 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],
@@ -226,14 +228,14 @@
     *)
      enable_static=no
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_static=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac],
     [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
@@ -265,9 +267,9 @@
 
 # _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'.
+# 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],
@@ -280,14 +282,14 @@
     *)
       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,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_fast_install=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac],
     [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
@@ -304,14 +306,14 @@
 [_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.])
+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.])
+the 'disable-fast-install' option into LT_INIT's first parameter.])
 ])
 
 dnl aclocal-1.4 backwards compatibility:
@@ -319,11 +321,64 @@
 dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
 
 
+# _LT_WITH_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+  AC_MSG_CHECKING([which variant of shared library versioning to provide])
+  AC_ARG_WITH([aix-soname],
+    [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+      [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+    [case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname],
+    [AC_CACHE_VAL([lt_cv_with_aix_soname],
+      [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+    with_aix_soname=$lt_cv_with_aix_soname])
+  AC_MSG_RESULT([$with_aix_soname])
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+    [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
 # _LT_WITH_PIC([MODE])
 # --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# 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'.
+# 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@:>@],
@@ -334,19 +389,17 @@
     *)
       pic_mode=default
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$lt_pkg" = "X$lt_p"; then
 	  pic_mode=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac],
-    [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+    [pic_mode=m4_default([$1], [default])])
 
 _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
 ])# _LT_WITH_PIC
@@ -359,7 +412,7 @@
 [_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.])
+put the 'pic-only' option into LT_INIT's first parameter.])
 ])
 
 dnl aclocal-1.4 backwards compatibility:
diff -Nru procps-3.3.11/m4/ltsugar.m4 procps-3.3.12/m4/ltsugar.m4
--- procps-3.3.11/m4/ltsugar.m4	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/m4/ltsugar.m4	2016-07-10 06:40:26.000000000 +0000
@@ -1,6 +1,7 @@
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
 # Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
@@ -33,7 +34,7 @@
 # ------------
 # Manipulate m4 lists.
 # These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
+# 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])],
@@ -44,7 +45,7 @@
 
 # lt_append(MACRO-NAME, STRING, [SEPARATOR])
 # ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# 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
diff -Nru procps-3.3.11/m4/ltversion.m4 procps-3.3.12/m4/ltversion.m4
--- procps-3.3.11/m4/ltversion.m4	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/m4/ltversion.m4	2016-07-10 06:40:26.000000000 +0000
@@ -1,6 +1,6 @@
 # ltversion.m4 -- version numbers			-*- Autoconf -*-
 #
-#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004
 #
 # This file is free software; the Free Software Foundation gives
@@ -9,15 +9,15 @@
 
 # @configure_input@
 
-# serial 3337 ltversion.m4
+# serial 4179 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4.2])
-m4_define([LT_PACKAGE_REVISION], [1.3337])
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2'
-macro_revision='1.3337'
+[macro_version='2.4.6'
+macro_revision='2.4.6'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff -Nru procps-3.3.11/Makefile.am procps-3.3.12/Makefile.am
--- procps-3.3.11/Makefile.am	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/Makefile.am	2016-07-10 06:40:26.000000000 +0000
@@ -1,3 +1,8 @@
+CYGWINFLAGS =
+if CYGWIN
+  CYGWINFLAGS += -lintl
+endif
+
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
 	-I$(top_srcdir) \
@@ -14,7 +19,7 @@
 	testsuite
 
 AM_CFLAGS = -Iproc
-LDADD = ./proc/libprocps.la
+LDADD = ./proc/libprocps.la $(CYGWINFLAGS)
 
 transform = s/pscommand/ps/; $(program_transform_name)
 
@@ -96,13 +101,17 @@
 slabtop_SOURCES = slabtop.c lib/strutils.c lib/fileutils.c
 slabtop_LDADD = $(LDADD) @NCURSES_LIBS@
 watch_SOURCES = watch.c lib/strutils.c lib/fileutils.c
-watch_LDADD = $(LDADD) @WATCH_NCURSES_LIBS@
+watch_LDADD = @WATCH_NCURSES_LIBS@ $(CYGWINFLAGS)
 top_top_SOURCES = \
 	top/top.h \
 	top/top.c \
 	top/top_nls.h \
 	top/top_nls.c \
 	lib/fileutils.c
+if CYGWIN
+  top_top_SOURCES += lib/strverscmp.c
+endif
+
 top_top_LDADD = $(LDADD) @NCURSES_LIBS@ $(DL_LIB)
 endif
 
@@ -126,7 +135,7 @@
 pkill_SOURCES = pgrep.c lib/fileutils.c lib/nsutils.c
 pmap_SOURCES = pmap.c lib/fileutils.c
 pwdx_SOURCES = pwdx.c lib/fileutils.c
-pwdx_LDADD=
+pwdx_LDADD= $(CYGWINFLAGS)
 sysctl_SOURCES = sysctl.c lib/fileutils.c
 tload_SOURCES = tload.c lib/strutils.c lib/fileutils.c
 uptime_SOURCES = uptime.c lib/fileutils.c
@@ -136,7 +145,7 @@
 # proc/libprocps.la
 
 # See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-LIBprocps_CURRENT=5
+LIBprocps_CURRENT=6
 LIBprocps_REVISION=0
 LIBprocps_AGE=0
 
@@ -217,7 +226,12 @@
 	ps/stacktrace.c \
 	lib/fileutils.c
 
-# lib/test_* binaries
+# Test programs not used by dejagnu but run directly
+TESTS = \
+	lib/test_strtod_nol
+check_PROGRAMS = $(TESTS)
+
+# Test programs required for dejagnu
 noinst_PROGRAMS = \
 	lib/test_strutils \
 	lib/test_fileutils \
@@ -225,13 +239,16 @@
 	lib/test_process
 
 lib_test_strutils_SOURCES = lib/test_strutils.c lib/strutils.c
-lib_test_strutils_LDADD =
+lib_test_strutils_LDADD = $(CYGWINFLAGS)
 lib_test_fileutils_SOURCES = lib/test_fileutils.c lib/fileutils.c
-lib_test_fileutils_LDADD =
+lib_test_fileutils_LDADD = $(CYGWINFLAGS)
 lib_test_nsutils_SOURCES = lib/test_nsutils.c lib/nsutils.c
-lib_test_nsutils_LDADD =
+lib_test_nsutils_LDADD = $(CYGWINFLAGS)
 lib_test_process_SOURCES = lib/test_process.c
-lib_test_process_LDADD =
+lib_test_process_LDADD = $(CYGWINFLAGS)
+
+lib_test_strtod_nol_SOURCES = lib/test_strtod_nol.c lib/strutils.c
+lib_test_strtod_nol_LDADD = $(CYGWINFLAGS)
 
 if EXAMPLE_FILES
 sysconf_DATA = sysctl.conf
diff -Nru procps-3.3.11/Makefile.in procps-3.3.12/Makefile.in
--- procps-3.3.11/Makefile.in	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/Makefile.in	2016-07-10 06:40:26.000000000 +0000
@@ -90,40 +90,44 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@CYGWIN_TRUE@am__append_1 = -lintl
 bin_PROGRAMS = ps/pscommand$(EXEEXT) free$(EXEEXT) pgrep$(EXEEXT) \
 	pkill$(EXEEXT) pmap$(EXEEXT) pwdx$(EXEEXT) tload$(EXEEXT) \
 	uptime$(EXEEXT) vmstat$(EXEEXT) w$(EXEEXT) $(am__EXEEXT_1) \
 	$(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4)
 sbin_PROGRAMS = sysctl$(EXEEXT)
-@BUILD_PIDOF_TRUE@am__append_1 = pidof
-@BUILD_PIDOF_TRUE@am__append_2 = pidof.1
-@BUILD_PIDOF_FALSE@am__append_3 = pidof.1
-@BUILD_KILL_TRUE@am__append_4 = kill
-@BUILD_KILL_TRUE@am__append_5 = kill.1
-@BUILD_KILL_FALSE@am__append_6 = kill.1
-@WITH_NCURSES_TRUE@am__append_7 = \
+@BUILD_PIDOF_TRUE@am__append_2 = pidof
+@BUILD_PIDOF_TRUE@am__append_3 = pidof.1
+@BUILD_PIDOF_FALSE@am__append_4 = pidof.1
+@BUILD_KILL_TRUE@am__append_5 = kill
+@BUILD_KILL_TRUE@am__append_6 = kill.1
+@BUILD_KILL_FALSE@am__append_7 = kill.1
+@WITH_NCURSES_TRUE@am__append_8 = \
 @WITH_NCURSES_TRUE@	slabtop \
 @WITH_NCURSES_TRUE@	watch \
 @WITH_NCURSES_TRUE@	top/top
 
-@WITH_NCURSES_TRUE@am__append_8 = \
+@WITH_NCURSES_TRUE@am__append_9 = \
 @WITH_NCURSES_TRUE@	slabtop.1 \
 @WITH_NCURSES_TRUE@	watch.1 \
 @WITH_NCURSES_TRUE@	top/top.1
 
-@BUILD_SKILL_TRUE@am__append_9 = \
+@CYGWIN_TRUE@@WITH_NCURSES_TRUE@am__append_10 = lib/strverscmp.c
+@BUILD_SKILL_TRUE@am__append_11 = \
 @BUILD_SKILL_TRUE@	skill \
 @BUILD_SKILL_TRUE@	snice
 
-@BUILD_SKILL_TRUE@am__append_10 = \
+@BUILD_SKILL_TRUE@am__append_12 = \
 @BUILD_SKILL_TRUE@	skill.1 \
 @BUILD_SKILL_TRUE@	snice.1
 
-@BUILD_SKILL_FALSE@am__append_11 = \
+@BUILD_SKILL_FALSE@am__append_13 = \
 @BUILD_SKILL_FALSE@	skill.1 \
 @BUILD_SKILL_FALSE@	snice.1
 
-@WITH_SYSTEMD_TRUE@am__append_12 = @SYSTEMD_LIBS@
+@WITH_SYSTEMD_TRUE@am__append_14 = @SYSTEMD_LIBS@
+TESTS = lib/test_strtod_nol$(EXEEXT)
+check_PROGRAMS = $(am__EXEEXT_5)
 noinst_PROGRAMS = lib/test_strutils$(EXEEXT) \
 	lib/test_fileutils$(EXEEXT) lib/test_nsutils$(EXEEXT) \
 	lib/test_process$(EXEEXT)
@@ -203,12 +207,14 @@
 @WITH_NCURSES_TRUE@am__EXEEXT_3 = slabtop$(EXEEXT) watch$(EXEEXT) \
 @WITH_NCURSES_TRUE@	top/top$(EXEEXT)
 @BUILD_SKILL_TRUE@am__EXEEXT_4 = skill$(EXEEXT) snice$(EXEEXT)
+am__EXEEXT_5 = lib/test_strtod_nol$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS)
 am_free_OBJECTS = free.$(OBJEXT) lib/strutils.$(OBJEXT) \
 	lib/fileutils.$(OBJEXT)
 free_OBJECTS = $(am_free_OBJECTS)
 free_LDADD = $(LDADD)
-free_DEPENDENCIES = ./proc/libprocps.la
+am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+free_DEPENDENCIES = ./proc/libprocps.la $(am__DEPENDENCIES_2)
 am__kill_SOURCES_DIST = skill.c lib/strutils.c lib/fileutils.c \
 	lib/nsutils.c
 @BUILD_KILL_TRUE@am_kill_OBJECTS = skill.$(OBJEXT) \
@@ -216,52 +222,56 @@
 @BUILD_KILL_TRUE@	lib/fileutils.$(OBJEXT) lib/nsutils.$(OBJEXT)
 kill_OBJECTS = $(am_kill_OBJECTS)
 kill_LDADD = $(LDADD)
-kill_DEPENDENCIES = ./proc/libprocps.la
+kill_DEPENDENCIES = ./proc/libprocps.la $(am__DEPENDENCIES_2)
 am_lib_test_fileutils_OBJECTS = lib/test_fileutils.$(OBJEXT) \
 	lib/fileutils.$(OBJEXT)
 lib_test_fileutils_OBJECTS = $(am_lib_test_fileutils_OBJECTS)
-lib_test_fileutils_DEPENDENCIES =
+lib_test_fileutils_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_lib_test_nsutils_OBJECTS = lib/test_nsutils.$(OBJEXT) \
 	lib/nsutils.$(OBJEXT)
 lib_test_nsutils_OBJECTS = $(am_lib_test_nsutils_OBJECTS)
-lib_test_nsutils_DEPENDENCIES =
+lib_test_nsutils_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_lib_test_process_OBJECTS = lib/test_process.$(OBJEXT)
 lib_test_process_OBJECTS = $(am_lib_test_process_OBJECTS)
-lib_test_process_DEPENDENCIES =
+lib_test_process_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_lib_test_strtod_nol_OBJECTS = lib/test_strtod_nol.$(OBJEXT) \
+	lib/strutils.$(OBJEXT)
+lib_test_strtod_nol_OBJECTS = $(am_lib_test_strtod_nol_OBJECTS)
+lib_test_strtod_nol_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_lib_test_strutils_OBJECTS = lib/test_strutils.$(OBJEXT) \
 	lib/strutils.$(OBJEXT)
 lib_test_strutils_OBJECTS = $(am_lib_test_strutils_OBJECTS)
-lib_test_strutils_DEPENDENCIES =
+lib_test_strutils_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_pgrep_OBJECTS = pgrep.$(OBJEXT) lib/fileutils.$(OBJEXT) \
 	lib/nsutils.$(OBJEXT)
 pgrep_OBJECTS = $(am_pgrep_OBJECTS)
 pgrep_LDADD = $(LDADD)
-pgrep_DEPENDENCIES = ./proc/libprocps.la
+pgrep_DEPENDENCIES = ./proc/libprocps.la $(am__DEPENDENCIES_2)
 am__pidof_SOURCES_DIST = pidof.c lib/fileutils.c
 @BUILD_PIDOF_TRUE@am_pidof_OBJECTS = pidof.$(OBJEXT) \
 @BUILD_PIDOF_TRUE@	lib/fileutils.$(OBJEXT)
 pidof_OBJECTS = $(am_pidof_OBJECTS)
 pidof_LDADD = $(LDADD)
-pidof_DEPENDENCIES = ./proc/libprocps.la
+pidof_DEPENDENCIES = ./proc/libprocps.la $(am__DEPENDENCIES_2)
 am_pkill_OBJECTS = pgrep.$(OBJEXT) lib/fileutils.$(OBJEXT) \
 	lib/nsutils.$(OBJEXT)
 pkill_OBJECTS = $(am_pkill_OBJECTS)
 pkill_LDADD = $(LDADD)
-pkill_DEPENDENCIES = ./proc/libprocps.la
+pkill_DEPENDENCIES = ./proc/libprocps.la $(am__DEPENDENCIES_2)
 am_pmap_OBJECTS = pmap.$(OBJEXT) lib/fileutils.$(OBJEXT)
 pmap_OBJECTS = $(am_pmap_OBJECTS)
 pmap_LDADD = $(LDADD)
-pmap_DEPENDENCIES = ./proc/libprocps.la
+pmap_DEPENDENCIES = ./proc/libprocps.la $(am__DEPENDENCIES_2)
 am_ps_pscommand_OBJECTS = ps/display.$(OBJEXT) ps/global.$(OBJEXT) \
 	ps/help.$(OBJEXT) ps/output.$(OBJEXT) ps/parser.$(OBJEXT) \
 	ps/select.$(OBJEXT) ps/sortformat.$(OBJEXT) \
 	ps/stacktrace.$(OBJEXT) lib/fileutils.$(OBJEXT)
 ps_pscommand_OBJECTS = $(am_ps_pscommand_OBJECTS)
 ps_pscommand_LDADD = $(LDADD)
-ps_pscommand_DEPENDENCIES = ./proc/libprocps.la
+ps_pscommand_DEPENDENCIES = ./proc/libprocps.la $(am__DEPENDENCIES_2)
 am_pwdx_OBJECTS = pwdx.$(OBJEXT) lib/fileutils.$(OBJEXT)
 pwdx_OBJECTS = $(am_pwdx_OBJECTS)
-pwdx_DEPENDENCIES =
+pwdx_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am__skill_SOURCES_DIST = skill.c lib/strutils.c lib/fileutils.c \
 	lib/nsutils.c
 @BUILD_SKILL_TRUE@am_skill_OBJECTS = skill.$(OBJEXT) \
@@ -270,13 +280,14 @@
 @BUILD_SKILL_TRUE@	lib/nsutils.$(OBJEXT)
 skill_OBJECTS = $(am_skill_OBJECTS)
 skill_LDADD = $(LDADD)
-skill_DEPENDENCIES = ./proc/libprocps.la
+skill_DEPENDENCIES = ./proc/libprocps.la $(am__DEPENDENCIES_2)
 am__slabtop_SOURCES_DIST = slabtop.c lib/strutils.c lib/fileutils.c
 @WITH_NCURSES_TRUE@am_slabtop_OBJECTS = slabtop.$(OBJEXT) \
 @WITH_NCURSES_TRUE@	lib/strutils.$(OBJEXT) \
 @WITH_NCURSES_TRUE@	lib/fileutils.$(OBJEXT)
 slabtop_OBJECTS = $(am_slabtop_OBJECTS)
-@WITH_NCURSES_TRUE@slabtop_DEPENDENCIES = $(LDADD)
+am__DEPENDENCIES_3 = ./proc/libprocps.la $(am__DEPENDENCIES_2)
+@WITH_NCURSES_TRUE@slabtop_DEPENDENCIES = $(am__DEPENDENCIES_3)
 am__snice_SOURCES_DIST = skill.c lib/strutils.c lib/fileutils.c \
 	lib/nsutils.c
 @BUILD_SKILL_TRUE@am_snice_OBJECTS = skill.$(OBJEXT) \
@@ -285,43 +296,45 @@
 @BUILD_SKILL_TRUE@	lib/nsutils.$(OBJEXT)
 snice_OBJECTS = $(am_snice_OBJECTS)
 snice_LDADD = $(LDADD)
-snice_DEPENDENCIES = ./proc/libprocps.la
+snice_DEPENDENCIES = ./proc/libprocps.la $(am__DEPENDENCIES_2)
 am_sysctl_OBJECTS = sysctl.$(OBJEXT) lib/fileutils.$(OBJEXT)
 sysctl_OBJECTS = $(am_sysctl_OBJECTS)
 sysctl_LDADD = $(LDADD)
-sysctl_DEPENDENCIES = ./proc/libprocps.la
+sysctl_DEPENDENCIES = ./proc/libprocps.la $(am__DEPENDENCIES_2)
 am_tload_OBJECTS = tload.$(OBJEXT) lib/strutils.$(OBJEXT) \
 	lib/fileutils.$(OBJEXT)
 tload_OBJECTS = $(am_tload_OBJECTS)
 tload_LDADD = $(LDADD)
-tload_DEPENDENCIES = ./proc/libprocps.la
+tload_DEPENDENCIES = ./proc/libprocps.la $(am__DEPENDENCIES_2)
 am__top_top_SOURCES_DIST = top/top.h top/top.c top/top_nls.h \
-	top/top_nls.c lib/fileutils.c
+	top/top_nls.c lib/fileutils.c lib/strverscmp.c
+@CYGWIN_TRUE@@WITH_NCURSES_TRUE@am__objects_1 =  \
+@CYGWIN_TRUE@@WITH_NCURSES_TRUE@	lib/strverscmp.$(OBJEXT)
 @WITH_NCURSES_TRUE@am_top_top_OBJECTS = top/top.$(OBJEXT) \
 @WITH_NCURSES_TRUE@	top/top_nls.$(OBJEXT) \
-@WITH_NCURSES_TRUE@	lib/fileutils.$(OBJEXT)
+@WITH_NCURSES_TRUE@	lib/fileutils.$(OBJEXT) $(am__objects_1)
 top_top_OBJECTS = $(am_top_top_OBJECTS)
-@WITH_NCURSES_TRUE@top_top_DEPENDENCIES = $(LDADD) \
+@WITH_NCURSES_TRUE@top_top_DEPENDENCIES = $(am__DEPENDENCIES_3) \
 @WITH_NCURSES_TRUE@	$(am__DEPENDENCIES_1)
 am_uptime_OBJECTS = uptime.$(OBJEXT) lib/fileutils.$(OBJEXT)
 uptime_OBJECTS = $(am_uptime_OBJECTS)
 uptime_LDADD = $(LDADD)
-uptime_DEPENDENCIES = ./proc/libprocps.la
+uptime_DEPENDENCIES = ./proc/libprocps.la $(am__DEPENDENCIES_2)
 am_vmstat_OBJECTS = vmstat.$(OBJEXT) lib/strutils.$(OBJEXT) \
 	lib/fileutils.$(OBJEXT)
 vmstat_OBJECTS = $(am_vmstat_OBJECTS)
 vmstat_LDADD = $(LDADD)
-vmstat_DEPENDENCIES = ./proc/libprocps.la
+vmstat_DEPENDENCIES = ./proc/libprocps.la $(am__DEPENDENCIES_2)
 am_w_OBJECTS = w.$(OBJEXT) lib/fileutils.$(OBJEXT)
 w_OBJECTS = $(am_w_OBJECTS)
 w_LDADD = $(LDADD)
-w_DEPENDENCIES = ./proc/libprocps.la
+w_DEPENDENCIES = ./proc/libprocps.la $(am__DEPENDENCIES_2)
 am__watch_SOURCES_DIST = watch.c lib/strutils.c lib/fileutils.c
 @WITH_NCURSES_TRUE@am_watch_OBJECTS = watch.$(OBJEXT) \
 @WITH_NCURSES_TRUE@	lib/strutils.$(OBJEXT) \
 @WITH_NCURSES_TRUE@	lib/fileutils.$(OBJEXT)
 watch_OBJECTS = $(am_watch_OBJECTS)
-@WITH_NCURSES_TRUE@watch_DEPENDENCIES = $(LDADD)
+@WITH_NCURSES_TRUE@watch_DEPENDENCIES = $(am__DEPENDENCIES_2)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -358,19 +371,19 @@
 am__v_CCLD_1 = 
 SOURCES = $(proc_libprocps_la_SOURCES) $(free_SOURCES) $(kill_SOURCES) \
 	$(lib_test_fileutils_SOURCES) $(lib_test_nsutils_SOURCES) \
-	$(lib_test_process_SOURCES) $(lib_test_strutils_SOURCES) \
-	$(pgrep_SOURCES) $(pidof_SOURCES) $(pkill_SOURCES) \
-	$(pmap_SOURCES) $(ps_pscommand_SOURCES) $(pwdx_SOURCES) \
-	$(skill_SOURCES) $(slabtop_SOURCES) $(snice_SOURCES) \
-	$(sysctl_SOURCES) $(tload_SOURCES) $(top_top_SOURCES) \
-	$(uptime_SOURCES) $(vmstat_SOURCES) $(w_SOURCES) \
-	$(watch_SOURCES)
+	$(lib_test_process_SOURCES) $(lib_test_strtod_nol_SOURCES) \
+	$(lib_test_strutils_SOURCES) $(pgrep_SOURCES) $(pidof_SOURCES) \
+	$(pkill_SOURCES) $(pmap_SOURCES) $(ps_pscommand_SOURCES) \
+	$(pwdx_SOURCES) $(skill_SOURCES) $(slabtop_SOURCES) \
+	$(snice_SOURCES) $(sysctl_SOURCES) $(tload_SOURCES) \
+	$(top_top_SOURCES) $(uptime_SOURCES) $(vmstat_SOURCES) \
+	$(w_SOURCES) $(watch_SOURCES)
 DIST_SOURCES = $(proc_libprocps_la_SOURCES) $(free_SOURCES) \
 	$(am__kill_SOURCES_DIST) $(lib_test_fileutils_SOURCES) \
 	$(lib_test_nsutils_SOURCES) $(lib_test_process_SOURCES) \
-	$(lib_test_strutils_SOURCES) $(pgrep_SOURCES) \
-	$(am__pidof_SOURCES_DIST) $(pkill_SOURCES) $(pmap_SOURCES) \
-	$(ps_pscommand_SOURCES) $(pwdx_SOURCES) \
+	$(lib_test_strtod_nol_SOURCES) $(lib_test_strutils_SOURCES) \
+	$(pgrep_SOURCES) $(am__pidof_SOURCES_DIST) $(pkill_SOURCES) \
+	$(pmap_SOURCES) $(ps_pscommand_SOURCES) $(pwdx_SOURCES) \
 	$(am__skill_SOURCES_DIST) $(am__slabtop_SOURCES_DIST) \
 	$(am__snice_SOURCES_DIST) $(sysctl_SOURCES) $(tload_SOURCES) \
 	$(am__top_top_SOURCES_DIST) $(uptime_SOURCES) \
@@ -403,7 +416,7 @@
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir dist dist-all distcheck
+	cscope check recheck distdir dist dist-all distcheck
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
 	$(LISP)config.h.in
 # Read a list of newline-separated strings from the standard input,
@@ -425,12 +438,188 @@
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \
 	$(srcdir)/config.h.in $(top_srcdir)/proc/libprocps.pc.in \
 	ABOUT-NLS AUTHORS COPYING COPYING.LIB ChangeLog NEWS compile \
 	config.guess config.rpath config.sub depcomp install-sh \
-	ltmain.sh missing mkinstalldirs
+	ltmain.sh missing mkinstalldirs test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -487,10 +676,6 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEJAGNU = @DEJAGNU@
@@ -525,6 +710,7 @@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -572,7 +758,6 @@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -611,6 +796,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -619,6 +805,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+CYGWINFLAGS = $(am__append_1)
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
 	-I$(top_srcdir) \
@@ -633,20 +820,20 @@
 	testsuite
 
 AM_CFLAGS = -Iproc
-LDADD = ./proc/libprocps.la
+LDADD = ./proc/libprocps.la $(CYGWINFLAGS)
 lib_LTLIBRARIES = \
 	proc/libprocps.la
 
 dist_man_MANS = free.1 pgrep.1 pkill.1 pmap.1 pwdx.1 sysctl.8 \
 	sysctl.conf.5 tload.1 uptime.1 vmstat.8 w.1 ps/ps.1 \
-	$(am__append_2) $(am__append_5) $(am__append_8) \
-	$(am__append_10) proc/openproc.3 proc/readproc.3 \
+	$(am__append_3) $(am__append_6) $(am__append_9) \
+	$(am__append_12) proc/openproc.3 proc/readproc.3 \
 	proc/readproctab.3
 EXTRA_DIST = .version autogen.sh contrib COPYING.LIB \
 	misc/git-version-gen Documentation/CodingStyle.md \
 	Documentation/TODO sysctl.conf ps/HACKING ps/regression \
-	$(DIST_MAN_POTS) $(am__append_3) $(am__append_6) \
-	$(am__append_11) proc/libprocps.sym
+	$(DIST_MAN_POTS) $(am__append_4) $(am__append_7) \
+	$(am__append_13) proc/libprocps.sym
 procpsngdir = $(docdir)
 dist_procpsng_DATA = \
 	Documentation/bugs.md \
@@ -657,14 +844,10 @@
 @WITH_NCURSES_TRUE@slabtop_SOURCES = slabtop.c lib/strutils.c lib/fileutils.c
 @WITH_NCURSES_TRUE@slabtop_LDADD = $(LDADD) @NCURSES_LIBS@
 @WITH_NCURSES_TRUE@watch_SOURCES = watch.c lib/strutils.c lib/fileutils.c
-@WITH_NCURSES_TRUE@watch_LDADD = $(LDADD) @WATCH_NCURSES_LIBS@
-@WITH_NCURSES_TRUE@top_top_SOURCES = \
-@WITH_NCURSES_TRUE@	top/top.h \
-@WITH_NCURSES_TRUE@	top/top.c \
-@WITH_NCURSES_TRUE@	top/top_nls.h \
-@WITH_NCURSES_TRUE@	top/top_nls.c \
-@WITH_NCURSES_TRUE@	lib/fileutils.c
-
+@WITH_NCURSES_TRUE@watch_LDADD = @WATCH_NCURSES_LIBS@ $(CYGWINFLAGS)
+@WITH_NCURSES_TRUE@top_top_SOURCES = top/top.h top/top.c top/top_nls.h \
+@WITH_NCURSES_TRUE@	top/top_nls.c lib/fileutils.c \
+@WITH_NCURSES_TRUE@	$(am__append_10)
 @WITH_NCURSES_TRUE@top_top_LDADD = $(LDADD) @NCURSES_LIBS@ $(DL_LIB)
 @BUILD_SKILL_TRUE@skill_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/nsutils.c
 @BUILD_SKILL_TRUE@snice_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/nsutils.c
@@ -673,7 +856,7 @@
 pkill_SOURCES = pgrep.c lib/fileutils.c lib/nsutils.c
 pmap_SOURCES = pmap.c lib/fileutils.c
 pwdx_SOURCES = pwdx.c lib/fileutils.c
-pwdx_LDADD = 
+pwdx_LDADD = $(CYGWINFLAGS)
 sysctl_SOURCES = sysctl.c lib/fileutils.c
 tload_SOURCES = tload.c lib/strutils.c lib/fileutils.c
 uptime_SOURCES = uptime.c lib/fileutils.c
@@ -683,10 +866,10 @@
 # proc/libprocps.la
 
 # See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-LIBprocps_CURRENT = 5
+LIBprocps_CURRENT = 6
 LIBprocps_REVISION = 0
 LIBprocps_AGE = 0
-proc_libprocps_la_LIBADD = $(LIB_KPARTS) $(am__append_12)
+proc_libprocps_la_LIBADD = $(LIB_KPARTS) $(am__append_14)
 proc_libprocps_la_LDFLAGS = \
 	-version-info $(LIBprocps_CURRENT):$(LIBprocps_REVISION):$(LIBprocps_AGE) \
 	-no-undefined \
@@ -752,20 +935,22 @@
 	lib/fileutils.c
 
 lib_test_strutils_SOURCES = lib/test_strutils.c lib/strutils.c
-lib_test_strutils_LDADD = 
+lib_test_strutils_LDADD = $(CYGWINFLAGS)
 lib_test_fileutils_SOURCES = lib/test_fileutils.c lib/fileutils.c
-lib_test_fileutils_LDADD = 
+lib_test_fileutils_LDADD = $(CYGWINFLAGS)
 lib_test_nsutils_SOURCES = lib/test_nsutils.c lib/nsutils.c
-lib_test_nsutils_LDADD = 
+lib_test_nsutils_LDADD = $(CYGWINFLAGS)
 lib_test_process_SOURCES = lib/test_process.c
-lib_test_process_LDADD = 
+lib_test_process_LDADD = $(CYGWINFLAGS)
+lib_test_strtod_nol_SOURCES = lib/test_strtod_nol.c lib/strutils.c
+lib_test_strtod_nol_LDADD = $(CYGWINFLAGS)
 @EXAMPLE_FILES_TRUE@sysconf_DATA = sysctl.conf
 BUILT_SOURCES = $(top_srcdir)/.version
 all: $(BUILT_SOURCES) config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -921,6 +1106,15 @@
 	echo " rm -f" $$list; \
 	rm -f $$list
 
+clean-checkPROGRAMS:
+	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
 clean-noinstPROGRAMS:
 	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
 	echo " rm -f" $$list; \
@@ -1016,6 +1210,12 @@
 lib/test_process$(EXEEXT): $(lib_test_process_OBJECTS) $(lib_test_process_DEPENDENCIES) $(EXTRA_lib_test_process_DEPENDENCIES) lib/$(am__dirstamp)
 	@rm -f lib/test_process$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(lib_test_process_OBJECTS) $(lib_test_process_LDADD) $(LIBS)
+lib/test_strtod_nol.$(OBJEXT): lib/$(am__dirstamp) \
+	lib/$(DEPDIR)/$(am__dirstamp)
+
+lib/test_strtod_nol$(EXEEXT): $(lib_test_strtod_nol_OBJECTS) $(lib_test_strtod_nol_DEPENDENCIES) $(EXTRA_lib_test_strtod_nol_DEPENDENCIES) lib/$(am__dirstamp)
+	@rm -f lib/test_strtod_nol$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(lib_test_strtod_nol_OBJECTS) $(lib_test_strtod_nol_LDADD) $(LIBS)
 lib/test_strutils.$(OBJEXT): lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 
@@ -1091,6 +1291,8 @@
 top/top.$(OBJEXT): top/$(am__dirstamp) top/$(DEPDIR)/$(am__dirstamp)
 top/top_nls.$(OBJEXT): top/$(am__dirstamp) \
 	top/$(DEPDIR)/$(am__dirstamp)
+lib/strverscmp.$(OBJEXT): lib/$(am__dirstamp) \
+	lib/$(DEPDIR)/$(am__dirstamp)
 
 top/top$(EXEEXT): $(top_top_OBJECTS) $(top_top_DEPENDENCIES) $(EXTRA_top_top_DEPENDENCIES) top/$(am__dirstamp)
 	@rm -f top/top$(EXEEXT)
@@ -1139,9 +1341,11 @@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/fileutils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/nsutils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strutils.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/strverscmp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/test_fileutils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/test_nsutils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/test_process.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/test_strtod_nol.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/test_strutils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@proc/$(DEPDIR)/alloc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@proc/$(DEPDIR)/devname.Plo@am__quote@
@@ -1564,6 +1768,169 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+	  fi; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
+	    else \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+	    fi; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
+	    else \
+	      color_start= color_end=; \
+	    fi; \
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all $(check_PROGRAMS)
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+lib/test_strtod_nol.log: lib/test_strtod_nol$(EXEEXT)
+	@p='lib/test_strtod_nol$(EXEEXT)'; \
+	b='lib/test_strtod_nol'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
@@ -1755,6 +2122,8 @@
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-recursive
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(DATA) $(HEADERS) \
@@ -1787,6 +2156,9 @@
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 
@@ -1808,9 +2180,9 @@
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-recursive
 
-clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool clean-noinstPROGRAMS clean-sbinPROGRAMS \
-	mostlyclean-am
+clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
+	clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS \
+	clean-sbinPROGRAMS mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -1889,16 +2261,17 @@
 uninstall-man: uninstall-man1 uninstall-man3 uninstall-man5 \
 	uninstall-man8
 
-.MAKE: $(am__recursive_targets) all check install install-am \
+.MAKE: $(am__recursive_targets) all check check-am install install-am \
 	install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
-	am--refresh check check-am clean clean-binPROGRAMS \
-	clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \
-	clean-noinstPROGRAMS clean-sbinPROGRAMS cscope cscopelist-am \
-	ctags ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \
-	dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
-	distclean distclean-compile distclean-generic distclean-hdr \
+	am--refresh check check-TESTS check-am clean clean-binPROGRAMS \
+	clean-checkPROGRAMS clean-cscope clean-generic \
+	clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS \
+	clean-sbinPROGRAMS cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
+	dist-tarZ dist-xz dist-zip distcheck distclean \
+	distclean-compile distclean-generic distclean-hdr \
 	distclean-libtool distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-binPROGRAMS install-data \
@@ -1912,11 +2285,11 @@
 	install-sysconfDATA installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-dist_procpsngDATA \
-	uninstall-libLTLIBRARIES uninstall-man uninstall-man1 \
-	uninstall-man3 uninstall-man5 uninstall-man8 \
-	uninstall-pkgconfigDATA \
+	mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \
+	uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-dist_procpsngDATA uninstall-libLTLIBRARIES \
+	uninstall-man uninstall-man1 uninstall-man3 uninstall-man5 \
+	uninstall-man8 uninstall-pkgconfigDATA \
 	uninstall-proc_libprocps_la_includeHEADERS \
 	uninstall-sbinPROGRAMS uninstall-sysconfDATA
 
diff -Nru procps-3.3.11/man-po/de/man1/watch.1 procps-3.3.12/man-po/de/man1/watch.1
--- procps-3.3.11/man-po/de/man1/watch.1	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/man-po/de/man1/watch.1	2016-07-10 06:40:26.000000000 +0000
@@ -3,18 +3,17 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH WATCH 1 "Juni 2011" procps\-ng "Dienstprogramme für Benutzer"
+.TH WATCH 1 2016\-06\-03 procps\-ng "Dienstprogramme für Benutzer"
 .SH BEZEICHNUNG
 watch \- führt ein Programm in periodischen Abständen aus und zeigt die
 Ausgabe im Vollbild an
 .SH ÜBERSICHT
 \fBwatch\fP [\fIOptionen\fP] \fIBefehl\fP
 .SH BESCHREIBUNG
-\fBwatch\fP führt einen \fIBefehl\fP in periodischen Abständen aus und zeigt die
-Ausgabe sowie Fehlermeldungen im Vollbild an (der erste
-Bildschirminhalt). Dies ermöglicht Ihnen, die Änderungen eines Programms
-über einen bestimmten Zeitraum zu überwachen. Per Vorgabe wird das Programm
-alle 2 Sekunden ausgeführt, und \fBwatch\fP läuft, bis es abgebrochen wird.
+\fBwatch\fP runs \fIcommand\fP repeatedly, displaying its output and errors (the
+first screenfull).  This allows you to watch the program output change over
+time.  By default, \fIcommand\fP is run every 2 seconds and \fBwatch\fP will run
+until interrupted.
 .SH OPTIONEN
 .TP 
 \fB\-d\fP, \fB\-\-differences\fP [\fIpermanent\fP]
@@ -24,9 +23,9 @@
 mindestens seit dem ersten Durchlauf geändert hat.
 .TP 
 \fB\-n\fP, \fB\-\-interval\fP \fISekunden\fP
-gibt das Aktualisierungsintervall an. Der Befehl erlaubt keine
-Aktualisierungen in weniger als 0.1 Sekunden Abstand. Kleinere Werte werden
-entsprechend umgewandelt.
+Specify update interval.  The command will not allow quicker than 0.1 second
+interval, in which the smaller values are converted. Both '.' and ',' work
+for any locales.
 .TP 
 \fB\-p\fP, \fB\-\-precise\fP
 ermöglicht \fBwatch\fP zu versuchen, den \fIBefehl\fP im angegebenen \fIIntervall\fP
@@ -62,11 +61,69 @@
 .TP 
 \fB\-v\fP, \fB\-\-version\fP
 zeigt Versionsinformationen an und beendet das Programm.
-.SH ANMERKUNG
-Beachten Sie, dass die Optionen POSIX\-konform verarbeitet werden (d.h. die
-Verarbeitung der Optionen stoppt bei der ersten Nicht\-Option in der
-Befehlszeile). Dies bedeutet, dass Schalter nach dem \fIBefehl\fP von \fBwatch\fP
-selbst nicht interpretiert werden.
+.SH EXIT\-STATUS
+.PP
+.RS
+.PD 0
+.TP 
+\fB0\fP
+Erfolg.
+.TP 
+\fB1\fP
+Verschiedene Fehler.
+.TP 
+\fB2\fP
+Forken des zu überwachenden Prozesses ist fehlgeschlagen.
+.TP 
+\fB3\fP
+Replacing child process stdout with write side pipe failed.
+.TP 
+\fB4\fP
+Ausführung des Befehls ist fehlgeschlagen.
+.TP 
+\fB5\fP
+Closing child process write pipe failed.
+.TP 
+\fB7\fP
+Erstellung der IPC\-Pipe ist fehlgeschlagen.
+.TP 
+\fB8\fP
+Das Ermitteln des Rückgabewertes des Kindprozesses mit \fBwaitpid\fP(2) ist
+fehlgeschlagen oder der Befehl wurde mit einem Fehler beendet.
+.TP 
+\fBandere\fP
+Die Überwachung propagiert den Exit\-Status des Befehls als Exit\-Status des
+Kindprozesses.
+.SH ANMERKUNGEN
+POSIX option processing is used (i.e., option processing stops at the first
+non\-option argument).  This means that flags after \fIcommand\fP don't get
+interpreted by \fBwatch\fP itself.
+.SH FEHLER
+Nach der Größenänderung des Terminals wird der Bildschirm bis zur nächsten
+planmäßigen Aktualisierung nicht korrekt neu gezeichnet. Alle durch
+\fB\-\-differences\fP verursachten Hervorhebungen gehen bei einer Aktualisierung
+ebenfalls verloren.
+
+Nicht darstellbare Zeichen werden aus der Programmausgabe
+entfernt. Verwenden Sie »cat \-v« als Teil der Befehlsweiterleitung, falls
+Sie diese sehen wollen.
+
+Kombinationszeichen, die in der letzten Spalte angezeigt werden sollen,
+können eine Spalte eher angezeigt werden, oder überhaupt nicht.
+
+Kombinationszeichen werden im \fI\-\-differences\fP\-Modus niemals als
+unterschiedliche Zeichen aufgefasst. Lediglich das Basiszeichen ist von
+Belang.
+
+Leere Zeilen direkt nach einer Zeile, die in der letzten Spalte endet,
+werden nicht angezeigt.
+
+\fI\-\-precise\fP mode doesn't yet have advanced temporal distortion technology
+to compensate for a \fIcommand\fP that takes more than \fIinterval\fP seconds to
+execute.  \fBwatch\fP also can get into a state where it rapid\-fires as many
+executions of \fIcommand\fP as it can to catch up from a previous executions
+running longer than \fIinterval\fP (for example, \fBnetstat\fP taking ages on a
+DNS lookup).
 .SH BEISPIELE
 .PP
 Um nach Ihren Mails zu sehen, versuchen Sie
@@ -102,93 +159,3 @@
 (Beachten Sie, dass \fI\-p\fP nicht unbedingt nach einem Neustart des Systems
 funktioniert, speziell im Hinblick auf \fBntpdate\fP oder anderen beim
 Systemstart die Zeit anpassenden Mechanismen.)
-.SH FEHLER
-Nach der Größenänderung des Terminals wird der Bildschirm bis zur nächsten
-planmäßigen Aktualisierung nicht korrekt neu gezeichnet. Alle durch
-\fB\-\-differences\fP verursachten Hervorhebungen gehen bei einer Aktualisierung
-ebenfalls verloren.
-.PP
-Nicht darstellbare Zeichen werden aus der Programmausgabe
-entfernt. Verwenden Sie »cat \-v« als Teil der Befehlsweiterleitung, falls
-Sie diese sehen wollen.
-.PP
-Kombinationszeichen, die in der letzten Spalte angezeigt werden sollen,
-können eine Spalte eher angezeigt werden, oder überhaupt nicht.
-.PP
-Kombinationszeichen werden im \fI\-\-differences\fP\-Modus niemals als
-unterschiedliche Zeichen aufgefasst. Lediglich das Basiszeichen ist von
-Belang.
-.PP
-Leere Zeilen direkt nach einer Zeile, die in der letzten Spalte endet,
-werden nicht angezeigt.
-.PP
-\fI\-\-precise\fP mode doesn't yet have advanced temporal distortion technology
-to compensate for a \fIcommand\fP that takes more than \fIinterval\fP seconds to
-execute.  \fBwatch\fP also can get into a state where it rapid\-fires as many
-executions of \fIcommand\fP as it can to catch up from a previous executions
-running longer than \fIinterval\fP (for example, \fBnetstat\fP taking ages on a
-DNS lookup).
-.SH EXIT\-STATUS
-.PP
-.RS
-.PD 0
-.TP 
-\fB0\fP
-Erfolg.
-.TP 
-\fB1\fP
-Verschiedene Fehler.
-.TP 
-\fB2\fP
-Forken des zu überwachenden Prozesses ist fehlgeschlagen.
-.TP 
-\fB3\fP
-Replacing child process stdout with write side pipe failed.
-.TP 
-\fB4\fP
-Ausführung des Befehls ist fehlgeschlagen.
-.TP 
-\fB5\fP
-Closing child process write pipe failed.
-.TP 
-\fB7\fP
-Erstellung der IPC\-Pipe ist fehlgeschlagen.
-.TP 
-\fB8\fP
-Das Ermitteln des Rückgabewertes des Kindprozesses mit \fBwaitpid\fP(2) ist
-fehlgeschlagen oder der Befehl wurde mit einem Fehler beendet.
-.TP 
-\fBandere\fP
-Die Überwachung propagiert den Exit\-Status des Befehls als Exit\-Status des
-Kindprozesses.
-.SH AUTOREN
-Das originale \fBwatch\fP wurde von
-.UR rembo@\:unisoft.\:com
-Tony Rems
-.UE
-im Jahre 1991 geschrieben, mit Modifizierungen und Korrekturen von
-Francois Pinard. Es wurde im Jahre 1999 von
-.UR mkc@\:acm.\:org
-Mike
-Coleman
-.UE
-überarbeitet, wobei auch neue Funktionen hinzugefügt
-wurden. Die beep\- und exec\-Funktionen sowie jene zur Fehlerbehandlung wurden
-von
-.UR morty@\:frakir.\:org
-Morty Abzug
-.UE
-im Jahre 2008
-hinzugefügt. An einem nicht gar so dunklen und stürmischen Morgen im Jahre
-2003 war
-.UR asd@\:suespammers.\:org
-Anthony DeRobertis
-.UE
-ganz krank
-von seinen Überwachungen, die nur in Minutenabständen aktualisierten, und
-baute die Mikrosekunden\-Präzision ein. Unterstützung für Unicode wurde 2009
-von
-.UR procps@\:rrod.\:net
-Jarrod Lowe
-.UE
-hinzugefügt.
diff -Nru procps-3.3.11/man-po/fr/man1/watch.1 procps-3.3.12/man-po/fr/man1/watch.1
--- procps-3.3.11/man-po/fr/man1/watch.1	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/man-po/fr/man1/watch.1	2016-07-10 06:40:26.000000000 +0000
@@ -3,18 +3,17 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH WATCH 1 "juin 2011" procps\-ng "Commandes de l'utilisateur"
+.TH WATCH 1 2016\-06\-03 procps\-ng "Commandes de l'utilisateur"
 .SH NOM
 watch \- Exécuter un programme périodiquement en affichant le résultat à
 l'écran
 .SH SYNOPSIS
 \fBwatch\fP [\fIoptions\fP] \fIcommande\fP
 .SH DESCRIPTION
-\fBwatch\fP exécute la \fIcommande\fP périodiquement et affiche le résultat et les
-erreurs (en plein écran). Cela permet d'observer les changements de
-résultats du programme au fil du temps. Par défaut, le programme est exécuté
-toutes les deux secondes. Par défaut, \fBwatch\fP fonctionnera jusqu'à être
-interrompu.
+\fBwatch\fP runs \fIcommand\fP repeatedly, displaying its output and errors (the
+first screenfull).  This allows you to watch the program output change over
+time.  By default, \fIcommand\fP is run every 2 seconds and \fBwatch\fP will run
+until interrupted.
 .SH OPTIONS
 .TP 
 \fB\-d\fP, \fB\-\-differences\fP [\fIpermanent\fP]
@@ -24,9 +23,9 @@
 itération.
 .TP 
 \fB\-n\fP, \fB\-\-interval\fP \fIintervalle\fP
-Indiquer l'\fIintervalle\fP de mise à jour, en seconde. La commande ne permet
-pas d'utiliser un intervalle plus rapide que 0,1 seconde, qui est la valeur
-utilisée à la place des valeurs plus petites.
+Specify update interval.  The command will not allow quicker than 0.1 second
+interval, in which the smaller values are converted. Both '.' and ',' work
+for any locales.
 .TP 
 \fB\-p\fP, \fB\-\-precise\fP
 Essayer d'exécuter \fIcommande\fP toutes les \fIintervalle\fP secondes. Essayez
@@ -62,68 +61,6 @@
 .TP 
 \fB\-v\fP, \fB\-\-version\fP
 Afficher la version du logiciel et quitter.
-.SH NOTES
-La reconnaissance des options suit la norme POSIX (le traitement des options
-s'arrête dès le premier paramètre qui n'est pas une option). Cela signifie
-que les options se trouvant après la \fIcommande\fP ne seront pas interprétées
-par \fBwatch\fP.
-.SH EXEMPLES
-.PP
-Pour vérifier les courriels\ :
-.IP
-watch \-n 60 from
-.PP
-Pour afficher les changements dans le contenu d'un répertoire\ :
-.IP
-watch \-d ls \-l
-.PP
-Pour n'afficher que les fichiers appartenant à arthur\ :
-.IP
-watch\ \-d 'ls\ \-l\ |\ fgrep arthur'
-.PP
-Pour vérifier l'effet des guillemets\ :
-.IP
-watch echo $$
-.br
-watch echo '$$'
-.br
-watch echo "'"'$$'"'"
-.PP
-Pour vérifier l'effet du temps de maintien de la précision, essayez en
-ajoutant \fB\-p\fP à
-.IP
-watch \-n 10 sleep 1
-.PP
-Pour vérifier que l'administrateur a installé le dernier noyau avec
-.IP
-watch uname \-r
-.PP
-Notez que \fB\-p\fP peut ne pas fonctionner entre deux redémarrages, à cause de
-\fBntpdate\fP ou d'autres programmes modifiant la date au démarrage.
-.SH BOGUES
-Lors du redimensionnement d'un terminal, l'écran ne sera pas rafraîchi
-correctement avant la prochaine exécution. Les mises en évidence dues à
-\fB\-\-differences\fP sont également perdues.
-.PP
-Les caractères non imprimables de la sortie du programme sont
-ignorés. Utilisez «\ cat \-v\ » pour les afficher.
-.PP
-La combinaison de caractères supposés s'afficher en dernière colonne de
-l'écran risque de s'afficher dans la colonne précédente ou pas du tout.
-.PP
-Les combinaisons de caractères ne sont jamais considérées différentes en
-mode \fI\-\-differences\fP. Seul le caractère de base est considéré.
-.PP
-Les lignes blanches qui suivent directement une ligne s'arrêtant en dernière
-colonne ne sont pas affichées
-.PP
-Le mode \fB\-\-precise\fP ne dispose pas encore de fonctions de temporisation
-pour compenser une \fIcommande\fP dont le temps d'exécution est supérieure à
-\fIsecondes\fP secondes. \fBwatch\fP peut également lancer en rafales autant
-d'exécution de \fIcommande\fP que possible pour rattraper une exécution
-précédente qui aurait pris plus de \fIsecondes\fP secondes à s'exécuter (par
-exemple, \fBnetstat\fP prend beaucoup de temps pour effectuer une interrogation
-DNS).
 .SH "CODES DE RETOUR"
 .PP
 .RS
@@ -158,13 +95,64 @@
 \fBautre\fP
 L'observation propagera l'état du code de retour en tant que code de retour
 du fils.
-.SH AUTEURS
-Le programme \fBwatch\fP a été écrit par Tony Rems
-<\fIrembo@unisoft.com\fP> en 1991 avec des corrections et des
-modifications de François Pinard. Mike Coleman <\fImkc@acm.org\fP> l'a
-retravaillé et a ajouté de nouvelles fonctionnalités en 1999. Les
-fonctionnalités beep, exec et la gestion d'erreurs ont été ajoutés par Morty
-Abzug <\fImorty@frakir.org\fP> en 2008. Un matin de mars de 2003,
-Anthony DeRobertis <\fIasd@suespammers.org\fP> a ajouté la gestion de
-la précision à la milliseconde. La prise en charge d'Unicode a été ajoutée
-en 2009 par Jarrod Lowe <\fIprocps@rrod.net\fP>.
+.SH NOTES
+POSIX option processing is used (i.e., option processing stops at the first
+non\-option argument).  This means that flags after \fIcommand\fP don't get
+interpreted by \fBwatch\fP itself.
+.SH BOGUES
+Lors du redimensionnement d'un terminal, l'écran ne sera pas rafraîchi
+correctement avant la prochaine exécution. Les mises en évidence dues à
+\fB\-\-differences\fP sont également perdues.
+
+Les caractères non imprimables de la sortie du programme sont
+ignorés. Utilisez «\ cat \-v\ » pour les afficher.
+
+La combinaison de caractères supposés s'afficher en dernière colonne de
+l'écran risque de s'afficher dans la colonne précédente ou pas du tout.
+
+Les combinaisons de caractères ne sont jamais considérées différentes en
+mode \fI\-\-differences\fP. Seul le caractère de base est considéré.
+
+Les lignes blanches qui suivent directement une ligne s'arrêtant en dernière
+colonne ne sont pas affichées
+
+Le mode \fB\-\-precise\fP ne dispose pas encore de fonctions de temporisation
+pour compenser une \fIcommande\fP dont le temps d'exécution est supérieure à
+\fIsecondes\fP secondes. \fBwatch\fP peut également lancer en rafales autant
+d'exécution de \fIcommande\fP que possible pour rattraper une exécution
+précédente qui aurait pris plus de \fIsecondes\fP secondes à s'exécuter (par
+exemple, \fBnetstat\fP prend beaucoup de temps pour effectuer une interrogation
+DNS).
+.SH EXEMPLES
+.PP
+Pour vérifier les courriels\ :
+.IP
+watch \-n 60 from
+.PP
+Pour afficher les changements dans le contenu d'un répertoire\ :
+.IP
+watch \-d ls \-l
+.PP
+Pour n'afficher que les fichiers appartenant à arthur\ :
+.IP
+watch\ \-d 'ls\ \-l\ |\ fgrep arthur'
+.PP
+Pour vérifier l'effet des guillemets\ :
+.IP
+watch echo $$
+.br
+watch echo '$$'
+.br
+watch echo "'"'$$'"'"
+.PP
+Pour vérifier l'effet du temps de maintien de la précision, essayez en
+ajoutant \fB\-p\fP à
+.IP
+watch \-n 10 sleep 1
+.PP
+Pour vérifier que l'administrateur a installé le dernier noyau avec
+.IP
+watch uname \-r
+.PP
+Notez que \fB\-p\fP peut ne pas fonctionner entre deux redémarrages, à cause de
+\fBntpdate\fP ou d'autres programmes modifiant la date au démarrage.
diff -Nru procps-3.3.11/man-po/Makefile.in procps-3.3.12/man-po/Makefile.in
--- procps-3.3.11/man-po/Makefile.in	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/man-po/Makefile.in	2016-07-10 06:40:26.000000000 +0000
@@ -140,10 +140,6 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEJAGNU = @DEJAGNU@
@@ -178,6 +174,7 @@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -225,7 +222,6 @@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -264,6 +260,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff -Nru procps-3.3.11/man-po/pl/man1/watch.1 procps-3.3.12/man-po/pl/man1/watch.1
--- procps-3.3.11/man-po/pl/man1/watch.1	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/man-po/pl/man1/watch.1	2016-07-10 06:40:26.000000000 +0000
@@ -3,17 +3,17 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH WATCH 1 "czerwiec 2011" procps\-ng "Polecenia użytkownika"
+.TH WATCH 1 2016\-06\-03 procps\-ng "Polecenia użytkownika"
 .SH NAZWA
 watch \- regularne uruchamianie programu z wyświetlaniem wyjścia na pełnym
 ekranie
 .SH SKŁADNIA
 \fBwatch\fP [\fIopcje\fP] \fIpolecenie\fP
 .SH OPIS
-\fBwatch\fP powtarza uruchamianie \fIpolecenia\fP, wyświetlając jego wyjście oraz
-błędy (przy czym wyjście na pełnym ekranie). Pozwala to obserwować zmianę
-wyjścia programu w czasie. Domyślnie program jest uruchamiany co 2
-sekundy. \fBwatch\fP domyślnie działa aż do przerwania.
+\fBwatch\fP runs \fIcommand\fP repeatedly, displaying its output and errors (the
+first screenfull).  This allows you to watch the program output change over
+time.  By default, \fIcommand\fP is run every 2 seconds and \fBwatch\fP will run
+until interrupted.
 .SH OPCJE
 .TP 
 \fB\-d\fP, \fB\-\-differences\fP [\fItrwale\fP]
@@ -22,8 +22,9 @@
 zobaczyć, co zmieniło się przynajmniej raz od pierwszej iteracji.
 .TP 
 \fB\-n\fP, \fB\-\-interval\fP \fIsekundy\fP
-Określenie odstępu między uaktualnieniami. Polecenie nie będzie uruchamiane
-częściej niż co 0.1 sekundy \- na taką wartość są zamieniane krótsze okresy.
+Specify update interval.  The command will not allow quicker than 0.1 second
+interval, in which the smaller values are converted. Both '.' and ',' work
+for any locales.
 .TP 
 \fB\-p\fP, \fB\-\-precise\fP
 Próba uruchamiania \fIpolecenia\fP co podaną liczbę \fIsekund\fP. Można wypróbować
@@ -58,10 +59,65 @@
 .TP 
 \fB\-v\fP, \fB\-\-version\fP
 Wyświetlenie informacji o wersji i zakończenie.
-.SH UWAGA
-Uwaga: używany jest wariant POSIX przetwarzania opcji (tzn. przetwarzanie
-opcji kończy się na pierwszym argumencie nie będącym opcją). Oznacza to, że
-flagi podane po \fIpoleceniu\fP nie są interpretowane przez program \fBwatch\fP.
+.SH "KOD WYJŚCIA"
+.PP
+.RS
+.PD 0
+.TP 
+\fB0\fP
+Sukces.
+.TP 
+\fB1\fP
+Różne niepowodzenia.
+.TP 
+\fB2\fP
+Nie udało się odgałęzić procesu do obserwacji.
+.TP 
+\fB3\fP
+Nie udało się zastąpić standardowego wyjścia procesu potomnego stroną
+piszącą potoku.
+.TP 
+\fB4\fP
+Nie udało się uruchomić polecenia.
+.TP 
+\fB5\fP
+Nie udało się zamknąć potoku piszącego procesu potomnego.
+.TP 
+\fB7\fP
+Nie udało się utworzyć potoku IPC.
+.TP 
+\fB8\fP
+Nie udało się uzyskać kodu powrotu procesu potomnego przez \fBwaitpid\fP(2) lub
+polecenie zakończyło się błędem.
+.TP 
+\fBinne\fP
+Program watch propaguje kod wyjścia polecenia jako kod wyjścia potomka.
+.SH UWAGI
+POSIX option processing is used (i.e., option processing stops at the first
+non\-option argument).  This means that flags after \fIcommand\fP don't get
+interpreted by \fBwatch\fP itself.
+.SH BŁĘDY
+Przy zmianie rozmiaru terminala ekran nie zostanie poprawnie odrysowany aż
+do następnego uaktualnienia. Przy tym uaktualnieniu wszystkie podświetlenia
+\fB\-\-differences\fP zostaną utracone.
+
+Znaki niedrukowalne są usuwane z wyjścia programu. Aby je zobaczyć, można
+użyć "cat \-v" jako części potoku polecenia.
+
+Znaki dołączane, które mają być wyświetlane na znaku w ostatniej kolumnie
+ekranu, mogą wyświetlać się o jedną kolumnę za wcześnie albo wcale.
+
+Znaki dołączane nigdy nie liczą się jako różne w trybie
+\fI\-\-differences\fP. Liczy się tylko znak podstawowy.
+
+Puste wiersze bezpośrednio po wierszu kończącym się w ostatniej kolumnie,
+nie są wyświetlane.
+
+Tryb \fI\-\-precise\fP nie ma jeszcze zaawansowanej technologii zakrzywienia
+czasoprzestrzeni w celu skompensowania przypadku wykonywania \fIpolecenia\fP
+dłużej niż \fIokres\fP. \fBwatch\fP może też wejść w stan, w którym szybko
+uruchamia wiele instancji \fIpolecenia\fP, aby dogonić poprzednie działające
+więcej niż \fIokres\fP (np. \fBnetstat\fP trwający wieki przez wyszukiwania DNS).
 .SH PRZYKŁADY
 .PP
 Aby obserwować pocztę, można wykonać
@@ -96,84 +152,3 @@
 (Uwaga: \fI\-p\fP nie daje gwarancji działania między restartami systemu,
 szczególnie w obliczu \fBntpdate\fP czy innych mechanizmów zmieniających czas w
 trakcie rozruchu)
-.SH BŁĘDY
-Przy zmianie rozmiaru terminala ekran nie zostanie poprawnie odrysowany aż
-do następnego uaktualnienia. Przy tym uaktualnieniu wszystkie podświetlenia
-\fB\-\-differences\fP zostaną utracone.
-.PP
-Znaki niedrukowalne są usuwane z wyjścia programu. Aby je zobaczyć, można
-użyć "cat \-v" jako części potoku polecenia.
-.PP
-Znaki dołączane, które mają być wyświetlane na znaku w ostatniej kolumnie
-ekranu, mogą wyświetlać się o jedną kolumnę za wcześnie albo wcale.
-.PP
-Znaki dołączane nigdy nie liczą się jako różne w trybie
-\fI\-\-differences\fP. Liczy się tylko znak podstawowy.
-.PP
-Puste wiersze bezpośrednio po wierszu kończącym się w ostatniej kolumnie,
-nie są wyświetlane.
-.PP
-Tryb \fI\-\-precise\fP nie ma jeszcze zaawansowanej technologii zakrzywienia
-czasoprzestrzeni w celu skompensowania przypadku wykonywania \fIpolecenia\fP
-dłużej niż \fIokres\fP. \fBwatch\fP może też wejść w stan, w którym szybko
-uruchamia wiele instancji \fIpolecenia\fP, aby dogonić poprzednie działające
-więcej niż \fIokres\fP (np. \fBnetstat\fP trwający wieki przez wyszukiwania DNS).
-.SH "KOD WYJŚCIA"
-.PP
-.RS
-.PD 0
-.TP 
-\fB0\fP
-Sukces.
-.TP 
-\fB1\fP
-Różne niepowodzenia.
-.TP 
-\fB2\fP
-Nie udało się odgałęzić procesu do obserwacji.
-.TP 
-\fB3\fP
-Nie udało się zastąpić standardowego wyjścia procesu potomnego stroną
-piszącą potoku.
-.TP 
-\fB4\fP
-Nie udało się uruchomić polecenia.
-.TP 
-\fB5\fP
-Nie udało się zamknąć potoku piszącego procesu potomnego.
-.TP 
-\fB7\fP
-Nie udało się utworzyć potoku IPC.
-.TP 
-\fB8\fP
-Nie udało się uzyskać kodu powrotu procesu potomnego przez \fBwaitpid\fP(2) lub
-polecenie zakończyło się błędem.
-.TP 
-\fBinne\fP
-Program watch propaguje kod wyjścia polecenia jako kod wyjścia potomka.
-.SH AUTORZY
-Oryginalny program \fBwatch\fP napisał
-.UR rembo@\:unisoft.\:com
-Tony Rems
-.UE
-w roku 1991, z modyfikacjami i poprawkami autorstwa Francoisa
-Pinarda. Następnie przepisał go dodając nowe opcje
-.UR mkc@\:acm.\:org
-Mike Coleman
-.UE
-w 1999. Opcje sygnału dźwiękowego, uruchamiania przez
-exec oraz obsługi błędów dodał
-.UR morty@\:frakir.\:org
-Morty Abzug
-.UE
-w 2008. Pewnego niezbyt ciemnego i burzowego poranka w marcu 2003
-.UR asd@\:suespammers.\:org
-Anthony DeRobertis
-.UE
-miał dość
-obserwacji, które powinny uruchamiać się co minutę, uaktualniających się
-wiele sekund po początkowej minucie, i dodał precyzję
-mikrosekundową. Obsługę Unicode dodał w 2009 roku
-.UR procps@\:rrod.\:net
-Jarrod Lowe
-.UE
diff -Nru procps-3.3.11/man-po/template-man.pot procps-3.3.12/man-po/template-man.pot
--- procps-3.3.11/man-po/template-man.pot	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/man-po/template-man.pot	2016-07-10 06:40:26.000000000 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-09 17:55+1000\n"
+"POT-Creation-Date: 2016-07-10 08:19+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,7 +25,7 @@
 #. type: TH
 #: ../free.1:5
 #, no-wrap
-msgid "Apr 2015"
+msgid "2016-06-03"
 msgstr ""
 
 #. type: TH
@@ -116,53 +116,53 @@
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:30
-msgid ""
-"Memory used (mostly) by tmpfs (Shmem in /proc/meminfo, available on kernels "
-"2.6.32, displayed as zero if not available)"
+#: ../free.1:29
+msgid "Memory used (mostly) by tmpfs (Shmem in /proc/meminfo)"
 msgstr ""
 
 #. type: TP
-#: ../free.1:30
+#: ../free.1:29
 #, no-wrap
 msgid "B<buffers>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:33
+#: ../free.1:32
 msgid "Memory used by kernel buffers (Buffers in /proc/meminfo)"
 msgstr ""
 
 #. type: TP
-#: ../free.1:33
+#: ../free.1:32
 #, no-wrap
 msgid "B<cache>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:36
-msgid "Memory used by the page cache and slabs (Cached and Slab in /proc/meminfo)"
+#: ../free.1:35
+msgid ""
+"Memory used by the page cache and slabs (Cached and SReclaimable in "
+"/proc/meminfo)"
 msgstr ""
 
 #. type: TP
-#: ../free.1:36
+#: ../free.1:35
 #, no-wrap
 msgid "B<buff/cache>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:39
+#: ../free.1:38
 msgid "Sum of B<buffers> and B<cache>"
 msgstr ""
 
 #. type: TP
-#: ../free.1:39
+#: ../free.1:38
 #, no-wrap
 msgid "B<available>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:48
+#: ../free.1:47
 msgid ""
 "Estimation of how much memory is available for starting new applications, "
 "without swapping. Unlike the data provided by the B<cache> or B<free> "
@@ -173,147 +173,147 @@
 msgstr ""
 
 #. type: SH
-#: ../free.1:48
+#: ../free.1:47
 #, no-wrap
 msgid "OPTIONS"
 msgstr ""
 
 #. type: TP
-#: ../free.1:49
+#: ../free.1:48
 #, no-wrap
 msgid "B<-b>, B<--bytes>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:52
+#: ../free.1:51
 msgid "Display the amount of memory in bytes."
 msgstr ""
 
 #. type: TP
-#: ../free.1:52
+#: ../free.1:51
 #, no-wrap
 msgid "B<-k>, B<--kibi>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:55
+#: ../free.1:54
 msgid "Display the amount of memory in kibibytes.  This is the default."
 msgstr ""
 
 #. type: TP
-#: ../free.1:55
+#: ../free.1:54
 #, no-wrap
 msgid "B<-m>, B<--mebi>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:58
+#: ../free.1:57
 msgid "Display the amount of memory in mebibytes."
 msgstr ""
 
 #. type: TP
-#: ../free.1:58
+#: ../free.1:57
 #, no-wrap
 msgid "B<-g>, B<--gibi>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:61
+#: ../free.1:60
 msgid "Display the amount of memory in gibibytes."
 msgstr ""
 
 #. type: TP
-#: ../free.1:61
+#: ../free.1:60
 #, no-wrap
 msgid "B<--tebi>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:64
+#: ../free.1:63
 msgid "Display the amount of memory in tebibytes."
 msgstr ""
 
 #. type: TP
-#: ../free.1:64
+#: ../free.1:63
 #, no-wrap
 msgid "B<--pebi>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:67
+#: ../free.1:66
 msgid "Display the amount of memory in pebibytes."
 msgstr ""
 
 #. type: TP
-#: ../free.1:67
+#: ../free.1:66
 #, no-wrap
 msgid "B<--kilo>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:70
+#: ../free.1:69
 msgid "Display the amount of memory in kilobytes. Implies --si."
 msgstr ""
 
 #. type: TP
-#: ../free.1:70
+#: ../free.1:69
 #, no-wrap
 msgid "B<--mega>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:73
+#: ../free.1:72
 msgid "Display the amount of memory in megabytes. Implies --si."
 msgstr ""
 
 #. type: TP
-#: ../free.1:73
+#: ../free.1:72
 #, no-wrap
 msgid "B<--giga>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:76
+#: ../free.1:75
 msgid "Display the amount of memory in gigabytes. Implies --si."
 msgstr ""
 
 #. type: TP
-#: ../free.1:76
+#: ../free.1:75
 #, no-wrap
 msgid "B<--tera>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:79
+#: ../free.1:78
 msgid "Display the amount of memory in terabytes. Implies --si."
 msgstr ""
 
 #. type: TP
-#: ../free.1:79
+#: ../free.1:78
 #, no-wrap
 msgid "B<--peta>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:82
+#: ../free.1:81
 msgid "Display the amount of memory in petabytes. Implies --si."
 msgstr ""
 
 #. type: TP
-#: ../free.1:82
+#: ../free.1:81
 #, no-wrap
 msgid "B<-h>, B<--human>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:86
+#: ../free.1:85
 msgid ""
 "Show all output fields automatically scaled to shortest three digit unit and "
 "display the units of print out.  Following units are used."
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:94
+#: ../free.1:93
 #, no-wrap
 msgid ""
 "  B = bytes\n"
@@ -325,20 +325,20 @@
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:98
+#: ../free.1:97
 msgid ""
 "If unit is missing, and you have exbibyte of RAM or swap, the number is in "
 "tebibytes and columns might not be aligned with header."
 msgstr ""
 
 #. type: TP
-#: ../free.1:98
+#: ../free.1:97
 #, no-wrap
 msgid "B<-w>, B<--wide>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:103
+#: ../free.1:102
 msgid ""
 "Switch to the wide mode. The wide mode produces lines longer than 80 "
 "characters. In this mode B<buffers> and B<cache> are reported in two "
@@ -346,133 +346,136 @@
 msgstr ""
 
 #. type: TP
-#: ../free.1:103
+#: ../free.1:102
 #, no-wrap
 msgid "B<-c>, B<--count> I<count>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:110
+#: ../free.1:109
 msgid "Display the result I<count> times.  Requires the B<-s> option."
 msgstr ""
 
 #. type: TP
-#: ../free.1:110
+#: ../free.1:109
 #, no-wrap
 msgid "B<-l>, B<--lohi>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:113
+#: ../free.1:112
 msgid "Show detailed low and high memory statistics."
 msgstr ""
 
 #. type: TP
-#: ../free.1:113
+#: ../free.1:112
 #, no-wrap
-msgid "B<-s>, B<--seconds> I<seconds>"
+msgid "B<-s>, B<--seconds> I<delay>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:121
+#: ../free.1:119
 msgid ""
-"Continuously display the result delay I<seconds> apart.  You may actually "
-"specify any floating point number for I<delay>, B<usleep>(3)  is used for "
-"microsecond resolution delay times."
+"Continuously display the result I<delay> seconds apart.  You may actually "
+"specify any floating point number for I<delay> using either . or , for "
+"decimal point.  B<usleep>(3)  is used for microsecond resolution delay "
+"times."
 msgstr ""
 
 #. type: TP
-#: ../free.1:121
+#: ../free.1:119
 #, no-wrap
 msgid "B<--si>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:125
+#: ../free.1:123
 msgid ""
 "Use kilo, mega, giga etc (power of 1000) instead of kibi, mebi, gibi (power "
 "of 1024)."
 msgstr ""
 
 #. type: TP
-#: ../free.1:125
+#: ../free.1:123
 #, no-wrap
 msgid "B<-t>, B<--total>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:128
+#: ../free.1:126
 msgid "Display a line showing the column totals."
 msgstr ""
 
 #. type: TP
-#: ../free.1:128
+#: ../free.1:126
 #, no-wrap
 msgid "B<--help>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:131
+#: ../free.1:129
 msgid "Print help."
 msgstr ""
 
 #. type: TP
-#: ../free.1:131
+#: ../free.1:129
 #, no-wrap
 msgid "B<-V>, B<--version>"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:134
+#: ../free.1:132
 msgid "Display version information."
 msgstr ""
 
 #. type: SH
-#: ../free.1:135
+#: ../free.1:133
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: TP
-#: ../free.1:136
+#: ../free.1:134
 #, no-wrap
 msgid "/proc/meminfo"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:139
+#: ../free.1:137
 msgid "memory information"
 msgstr ""
 
 #. type: SH
-#: ../free.1:140
+#: ../free.1:138
 #, no-wrap
-msgid "SEE ALSO"
+msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:145
-msgid "B<ps>(1), B<slabtop>(1), B<top>(1), B<vmstat>(8)."
+#: ../free.1:141
+msgid ""
+"The value for the B<shared> column is not available from kernels before "
+"2.6.32 and is displayed as zero."
 msgstr ""
 
-#. type: SH
-#: ../free.1:145
+#. type: TP
+#: ../free.1:141
 #, no-wrap
-msgid "AUTHORS"
+msgid "Please send bug reports to"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:147
-msgid "Written by Brian Edmonds."
+#: ../free.1:145
+msgid "E<.UR procps@freelists.org> E<.UE>"
 msgstr ""
 
 #. type: SH
-#: ../free.1:147
+#: ../free.1:145
 #, no-wrap
-msgid "REPORTING BUGS"
+msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: ../free.1:150
-msgid "Please send bug reports to E<.UR procps@freelists.org> E<.UE>"
+#: ../free.1:149
+msgid "B<ps>(1), B<slabtop>(1), B<top>(1), B<vmstat>(8)."
 msgstr ""
diff -Nru procps-3.3.11/man-po/template-man-ps.pot procps-3.3.12/man-po/template-man-ps.pot
--- procps-3.3.11/man-po/template-man-ps.pot	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/man-po/template-man-ps.pot	2016-07-10 06:40:26.000000000 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-09 17:55+1000\n"
+"POT-Creation-Date: 2016-07-10 08:19+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,7 +25,7 @@
 #. type: TH
 #: ../ps/ps.1:7
 #, no-wrap
-msgid "June 2015"
+msgid "August 2015"
 msgstr ""
 
 #. type: TH
@@ -82,7 +82,7 @@
 msgstr ""
 
 #. type: IP
-#: ../ps/ps.1:45 ../ps/ps.1:814 ../ps/ps.1:1914
+#: ../ps/ps.1:45 ../ps/ps.1:814 ../ps/ps.1:1918
 #, no-wrap
 msgid "1"
 msgstr ""
@@ -93,7 +93,7 @@
 msgstr ""
 
 #. type: IP
-#: ../ps/ps.1:47 ../ps/ps.1:1916
+#: ../ps/ps.1:47 ../ps/ps.1:1920
 #, no-wrap
 msgid "2"
 msgstr ""
@@ -104,7 +104,7 @@
 msgstr ""
 
 #. type: IP
-#: ../ps/ps.1:49 ../ps/ps.1:1918
+#: ../ps/ps.1:49 ../ps/ps.1:1922
 #, no-wrap
 msgid "3"
 msgstr ""
@@ -1568,7 +1568,7 @@
 msgstr ""
 
 #. type: IP
-#: ../ps/ps.1:817 ../ps/ps.1:1920
+#: ../ps/ps.1:817 ../ps/ps.1:1924
 #, no-wrap
 msgid "4"
 msgstr ""
@@ -1615,7 +1615,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:837 ../ps/ps.1:922 ../ps/ps.1:1511 ../ps/ps.1:1633
+#: ../ps/ps.1:837 ../ps/ps.1:922 ../ps/ps.1:1515 ../ps/ps.1:1637
 #, no-wrap
 msgid "S"
 msgstr ""
@@ -1721,7 +1721,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:873 ../ps/ps.1:921 ../ps/ps.1:1511
+#: ../ps/ps.1:873 ../ps/ps.1:921 ../ps/ps.1:1515
 #, no-wrap
 msgid "s"
 msgstr ""
@@ -1797,7 +1797,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:904 ../ps/ps.1:1131
+#: ../ps/ps.1:904 ../ps/ps.1:1135
 #, no-wrap
 msgid "cmd"
 msgstr ""
@@ -1815,7 +1815,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:905 ../ps/ps.1:949 ../ps/ps.1:1386
+#: ../ps/ps.1:905 ../ps/ps.1:949 ../ps/ps.1:1390
 #, no-wrap
 msgid "pcpu"
 msgstr ""
@@ -1827,13 +1827,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:906 ../ps/ps.1:1230
+#: ../ps/ps.1:906 ../ps/ps.1:1234
 #, no-wrap
 msgid "f"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:906 ../ps/ps.1:1256
+#: ../ps/ps.1:906 ../ps/ps.1:1260
 #, no-wrap
 msgid "flags"
 msgstr ""
@@ -1851,7 +1851,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:907 ../ps/ps.1:1412
+#: ../ps/ps.1:907 ../ps/ps.1:1416
 #, no-wrap
 msgid "pgrp"
 msgstr ""
@@ -1869,7 +1869,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:908 ../ps/ps.1:1713
+#: ../ps/ps.1:908 ../ps/ps.1:1717
 #, no-wrap
 msgid "tpgid"
 msgstr ""
@@ -1941,7 +1941,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:912 ../ps/ps.1:1343
+#: ../ps/ps.1:912 ../ps/ps.1:1347
 #, no-wrap
 msgid "min_flt"
 msgstr ""
@@ -1959,7 +1959,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:913 ../ps/ps.1:1339
+#: ../ps/ps.1:913 ../ps/ps.1:1343
 #, no-wrap
 msgid "maj_flt"
 msgstr ""
@@ -2025,7 +2025,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:917 ../ps/ps.1:957 ../ps/ps.1:1419
+#: ../ps/ps.1:917 ../ps/ps.1:957 ../ps/ps.1:1423
 #, no-wrap
 msgid "pid"
 msgstr ""
@@ -2037,13 +2037,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:918 ../ps/ps.1:1537
+#: ../ps/ps.1:918 ../ps/ps.1:1541
 #, no-wrap
 msgid "P"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:918 ../ps/ps.1:951 ../ps/ps.1:1457
+#: ../ps/ps.1:918 ../ps/ps.1:951 ../ps/ps.1:1461
 #, no-wrap
 msgid "ppid"
 msgstr ""
@@ -2061,7 +2061,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:919 ../ps/ps.1:1478
+#: ../ps/ps.1:919 ../ps/ps.1:1482
 #, no-wrap
 msgid "rss"
 msgstr ""
@@ -2085,7 +2085,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:921 ../ps/ps.1:1587
+#: ../ps/ps.1:921 ../ps/ps.1:1591
 #, no-wrap
 msgid "size"
 msgstr ""
@@ -2109,7 +2109,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:923 ../ps/ps.1:962 ../ps/ps.1:1727
+#: ../ps/ps.1:923 ../ps/ps.1:962 ../ps/ps.1:1731
 #, no-wrap
 msgid "tty"
 msgstr ""
@@ -2121,7 +2121,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:924 ../ps/ps.1:1616
+#: ../ps/ps.1:924 ../ps/ps.1:1620
 #, no-wrap
 msgid "start_time"
 msgstr ""
@@ -2139,7 +2139,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:925 ../ps/ps.1:1746
+#: ../ps/ps.1:925 ../ps/ps.1:1750
 #, no-wrap
 msgid "uid"
 msgstr ""
@@ -2157,7 +2157,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:926 ../ps/ps.1:952 ../ps/ps.1:1765
+#: ../ps/ps.1:926 ../ps/ps.1:952 ../ps/ps.1:1769
 #, no-wrap
 msgid "user"
 msgstr ""
@@ -2175,7 +2175,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:927 ../ps/ps.1:1785
+#: ../ps/ps.1:927 ../ps/ps.1:1789
 #, no-wrap
 msgid "vsize"
 msgstr ""
@@ -2244,7 +2244,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:949 ../ps/ps.1:1001 ../ps/ps.1:1386
+#: ../ps/ps.1:949 ../ps/ps.1:1001 ../ps/ps.1:1390
 #, no-wrap
 msgid "%CPU"
 msgstr ""
@@ -2256,13 +2256,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:950 ../ps/ps.1:1285
+#: ../ps/ps.1:950 ../ps/ps.1:1289
 #, no-wrap
 msgid "group"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:950 ../ps/ps.1:1285
+#: ../ps/ps.1:950 ../ps/ps.1:1289
 #, no-wrap
 msgid "GROUP"
 msgstr ""
@@ -2274,7 +2274,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:951 ../ps/ps.1:1457
+#: ../ps/ps.1:951 ../ps/ps.1:1461
 #, no-wrap
 msgid "PPID"
 msgstr ""
@@ -2286,7 +2286,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:952 ../ps/ps.1:1753 ../ps/ps.1:1765
+#: ../ps/ps.1:952 ../ps/ps.1:1757 ../ps/ps.1:1769
 #, no-wrap
 msgid "USER"
 msgstr ""
@@ -2304,7 +2304,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:953 ../ps/ps.1:954 ../ps/ps.1:1015 ../ps/ps.1:1138 ../ps/ps.1:1167 ../ps/ps.1:1263 ../ps/ps.1:1739
+#: ../ps/ps.1:953 ../ps/ps.1:954 ../ps/ps.1:1015 ../ps/ps.1:1142 ../ps/ps.1:1171 ../ps/ps.1:1267 ../ps/ps.1:1743
 #, no-wrap
 msgid "COMMAND"
 msgstr ""
@@ -2316,7 +2316,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:954 ../ps/ps.1:1138
+#: ../ps/ps.1:954 ../ps/ps.1:1142
 #, no-wrap
 msgid "comm"
 msgstr ""
@@ -2328,13 +2328,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:955 ../ps/ps.1:1473
+#: ../ps/ps.1:955 ../ps/ps.1:1477
 #, no-wrap
 msgid "rgroup"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:955 ../ps/ps.1:1473
+#: ../ps/ps.1:955 ../ps/ps.1:1477
 #, no-wrap
 msgid "RGROUP"
 msgstr ""
@@ -2346,13 +2346,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:956 ../ps/ps.1:1363
+#: ../ps/ps.1:956 ../ps/ps.1:1367
 #, no-wrap
 msgid "nice"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:956 ../ps/ps.1:1355 ../ps/ps.1:1363
+#: ../ps/ps.1:956 ../ps/ps.1:1359 ../ps/ps.1:1367
 #, no-wrap
 msgid "NI"
 msgstr ""
@@ -2364,7 +2364,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:957 ../ps/ps.1:1419
+#: ../ps/ps.1:957 ../ps/ps.1:1423
 #, no-wrap
 msgid "PID"
 msgstr ""
@@ -2376,13 +2376,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:958 ../ps/ps.1:1406
+#: ../ps/ps.1:958 ../ps/ps.1:1410
 #, no-wrap
 msgid "pgid"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:958 ../ps/ps.1:1406
+#: ../ps/ps.1:958 ../ps/ps.1:1410
 #, no-wrap
 msgid "PGID"
 msgstr ""
@@ -2394,13 +2394,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:959 ../ps/ps.1:1209
+#: ../ps/ps.1:959 ../ps/ps.1:1213
 #, no-wrap
 msgid "etime"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:959 ../ps/ps.1:1209 ../ps/ps.1:1213
+#: ../ps/ps.1:959 ../ps/ps.1:1213 ../ps/ps.1:1217
 #, no-wrap
 msgid "ELAPSED"
 msgstr ""
@@ -2412,13 +2412,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:960 ../ps/ps.1:1506
+#: ../ps/ps.1:960 ../ps/ps.1:1510
 #, no-wrap
 msgid "ruser"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:960 ../ps/ps.1:1506
+#: ../ps/ps.1:960 ../ps/ps.1:1510
 #, no-wrap
 msgid "RUSER"
 msgstr ""
@@ -2430,13 +2430,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:961 ../ps/ps.1:1703
+#: ../ps/ps.1:961 ../ps/ps.1:1707
 #, no-wrap
 msgid "time"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:961 ../ps/ps.1:1063 ../ps/ps.1:1179 ../ps/ps.1:1703
+#: ../ps/ps.1:961 ../ps/ps.1:1063 ../ps/ps.1:1183 ../ps/ps.1:1707
 #, no-wrap
 msgid "TIME"
 msgstr ""
@@ -2448,7 +2448,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:962 ../ps/ps.1:1708
+#: ../ps/ps.1:962 ../ps/ps.1:1712
 #, no-wrap
 msgid "TTY"
 msgstr ""
@@ -2460,13 +2460,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:963 ../ps/ps.1:1792
+#: ../ps/ps.1:963 ../ps/ps.1:1796
 #, no-wrap
 msgid "vsz"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:963 ../ps/ps.1:1785 ../ps/ps.1:1792
+#: ../ps/ps.1:963 ../ps/ps.1:1789 ../ps/ps.1:1796
 #, no-wrap
 msgid "VSZ"
 msgstr ""
@@ -2549,7 +2549,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1009 ../ps/ps.1:1428
+#: ../ps/ps.1:1009 ../ps/ps.1:1432
 #, no-wrap
 msgid "%MEM"
 msgstr ""
@@ -2585,7 +2585,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1030 ../ps/ps.1:1093 ../ps/ps.1:1095 ../ps/ps.1:1097 ../ps/ps.1:1099 ../ps/ps.1:1101 ../ps/ps.1:1103 ../ps/ps.1:1105 ../ps/ps.1:1115 ../ps/ps.1:1117 ../ps/ps.1:1119 ../ps/ps.1:1121 ../ps/ps.1:1123 ../ps/ps.1:1125 ../ps/ps.1:1127 ../ps/ps.1:1151 ../ps/ps.1:1441 ../ps/ps.1:1443 ../ps/ps.1:1445 ../ps/ps.1:1447 ../ps/ps.1:1449 ../ps/ps.1:1451 ../ps/ps.1:1453
+#: ../ps/ps.1:1030 ../ps/ps.1:1097 ../ps/ps.1:1099 ../ps/ps.1:1101 ../ps/ps.1:1103 ../ps/ps.1:1105 ../ps/ps.1:1107 ../ps/ps.1:1109 ../ps/ps.1:1119 ../ps/ps.1:1121 ../ps/ps.1:1123 ../ps/ps.1:1125 ../ps/ps.1:1127 ../ps/ps.1:1129 ../ps/ps.1:1131 ../ps/ps.1:1155 ../ps/ps.1:1445 ../ps/ps.1:1447 ../ps/ps.1:1449 ../ps/ps.1:1451 ../ps/ps.1:1453 ../ps/ps.1:1455 ../ps/ps.1:1457
 #, no-wrap
 msgid ".br\n"
 msgstr ""
@@ -2620,7 +2620,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1048 ../ps/ps.1:1580
+#: ../ps/ps.1:1048 ../ps/ps.1:1584
 #, no-wrap
 msgid "BLOCKED"
 msgstr ""
@@ -2643,7 +2643,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1056 ../ps/ps.1:1616
+#: ../ps/ps.1:1056 ../ps/ps.1:1620
 #, no-wrap
 msgid "START"
 msgstr ""
@@ -2692,7 +2692,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1075 ../ps/ps.1:1566
+#: ../ps/ps.1:1075 ../ps/ps.1:1570
 #, no-wrap
 msgid "CAUGHT"
 msgstr ""
@@ -2711,35 +2711,53 @@
 #. type: tbl table
 #: ../ps/ps.1:1083
 #, no-wrap
-msgid "cgroup"
+msgid "cgname"
 msgstr ""
 
 #. type: tbl table
 #: ../ps/ps.1:1083
 #, no-wrap
-msgid "CGROUP"
+msgid "CGNAME"
 msgstr ""
 
 #. type: tbl table
 #: ../ps/ps.1:1085
 #, no-wrap
-msgid "display control groups to which the process belongs.\n"
+msgid "display name of control groups to which the process belongs.\n"
+msgstr ""
+
+#. type: tbl table
+#: ../ps/ps.1:1087
+#, no-wrap
+msgid "cgroup"
 msgstr ""
 
 #. type: tbl table
 #: ../ps/ps.1:1087
 #, no-wrap
+msgid "CGROUP"
+msgstr ""
+
+#. type: tbl table
+#: ../ps/ps.1:1089
+#, no-wrap
+msgid "display control groups to which the process belongs.\n"
+msgstr ""
+
+#. type: tbl table
+#: ../ps/ps.1:1091
+#, no-wrap
 msgid "class"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1087 ../ps/ps.1:1109
+#: ../ps/ps.1:1091 ../ps/ps.1:1113
 #, no-wrap
 msgid "CLS"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1091 ../ps/ps.1:1113
+#: ../ps/ps.1:1095 ../ps/ps.1:1117
 #, no-wrap
 msgid ""
 "scheduling class of the process.  (alias\n"
@@ -2748,73 +2766,73 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1091 ../ps/ps.1:1113 ../ps/ps.1:1439
+#: ../ps/ps.1:1095 ../ps/ps.1:1117 ../ps/ps.1:1443
 #, no-wrap
 msgid ".IP \"\" 2\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1093 ../ps/ps.1:1115 ../ps/ps.1:1441
+#: ../ps/ps.1:1097 ../ps/ps.1:1119 ../ps/ps.1:1445
 #, no-wrap
 msgid "-\tnot reported\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1095 ../ps/ps.1:1117 ../ps/ps.1:1443
+#: ../ps/ps.1:1099 ../ps/ps.1:1121 ../ps/ps.1:1447
 #, no-wrap
 msgid "TS\tSCHED_OTHER\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1097 ../ps/ps.1:1119 ../ps/ps.1:1445
+#: ../ps/ps.1:1101 ../ps/ps.1:1123 ../ps/ps.1:1449
 #, no-wrap
 msgid "FF\tSCHED_FIFO\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1099 ../ps/ps.1:1121 ../ps/ps.1:1447
+#: ../ps/ps.1:1103 ../ps/ps.1:1125 ../ps/ps.1:1451
 #, no-wrap
 msgid "RR\tSCHED_RR\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1101 ../ps/ps.1:1123 ../ps/ps.1:1449
+#: ../ps/ps.1:1105 ../ps/ps.1:1127 ../ps/ps.1:1453
 #, no-wrap
 msgid "B\tSCHED_BATCH\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1103 ../ps/ps.1:1125 ../ps/ps.1:1451
+#: ../ps/ps.1:1107 ../ps/ps.1:1129 ../ps/ps.1:1455
 #, no-wrap
 msgid "ISO\tSCHED_ISO\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1105 ../ps/ps.1:1127 ../ps/ps.1:1453
+#: ../ps/ps.1:1109 ../ps/ps.1:1131 ../ps/ps.1:1457
 #, no-wrap
 msgid "IDL\tSCHED_IDLE\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1107 ../ps/ps.1:1129 ../ps/ps.1:1455
+#: ../ps/ps.1:1111 ../ps/ps.1:1133 ../ps/ps.1:1459
 #, no-wrap
 msgid "?\tunknown value\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1109
+#: ../ps/ps.1:1113
 #, no-wrap
 msgid "cls"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1131 ../ps/ps.1:1732
+#: ../ps/ps.1:1135 ../ps/ps.1:1736
 #, no-wrap
 msgid "CMD"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1136
+#: ../ps/ps.1:1140
 #, no-wrap
 msgid ""
 "see\n"
@@ -2824,7 +2842,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1151
+#: ../ps/ps.1:1155
 #, no-wrap
 msgid ""
 "command name (only the executable name).  Modifications to the command "
@@ -2845,7 +2863,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1165
+#: ../ps/ps.1:1169
 #, no-wrap
 msgid ""
 "When specified last, this column will extend to the edge of the display.  "
@@ -2866,13 +2884,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1167
+#: ../ps/ps.1:1171
 #, no-wrap
 msgid "command"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1172
+#: ../ps/ps.1:1176
 #, no-wrap
 msgid ""
 "See\n"
@@ -2882,19 +2900,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1174
+#: ../ps/ps.1:1178
 #, no-wrap
 msgid "cp"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1174
+#: ../ps/ps.1:1178
 #, no-wrap
 msgid "CP"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1177
+#: ../ps/ps.1:1181
 #, no-wrap
 msgid ""
 "per-mill (tenths of a percent) CPU usage.  (see\n"
@@ -2902,13 +2920,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1179
+#: ../ps/ps.1:1183
 #, no-wrap
 msgid "cputime"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1182
+#: ../ps/ps.1:1186
 #, no-wrap
 msgid ""
 "cumulative CPU time, \"[DD-]hh:mm:ss\" format.  (alias\n"
@@ -2916,19 +2934,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1184
+#: ../ps/ps.1:1188
 #, no-wrap
 msgid "drs"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1184
+#: ../ps/ps.1:1188
 #, no-wrap
 msgid "DRS"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1187
+#: ../ps/ps.1:1191
 #, no-wrap
 msgid ""
 "data resident set size, the amount of physical memory devoted to other "
@@ -2937,19 +2955,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1189
+#: ../ps/ps.1:1193
 #, no-wrap
 msgid "egid"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1189
+#: ../ps/ps.1:1193
 #, no-wrap
 msgid "EGID"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1192
+#: ../ps/ps.1:1196
 #, no-wrap
 msgid ""
 "effective group ID number of the process as a decimal integer.  (alias\n"
@@ -2957,19 +2975,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1194
+#: ../ps/ps.1:1198
 #, no-wrap
 msgid "egroup"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1194
+#: ../ps/ps.1:1198
 #, no-wrap
 msgid "EGROUP"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1199
+#: ../ps/ps.1:1203
 #, no-wrap
 msgid ""
 "effective group ID of the process.  This will be the textual group ID, if "
@@ -2980,73 +2998,73 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1201
+#: ../ps/ps.1:1205
 #, no-wrap
 msgid "eip"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1201
+#: ../ps/ps.1:1205
 #, no-wrap
 msgid "EIP"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1203
+#: ../ps/ps.1:1207
 #, no-wrap
 msgid "instruction pointer.\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1205
+#: ../ps/ps.1:1209
 #, no-wrap
 msgid "esp"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1205
+#: ../ps/ps.1:1209
 #, no-wrap
 msgid "ESP"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1207
+#: ../ps/ps.1:1211
 #, no-wrap
 msgid "stack pointer.\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1211
+#: ../ps/ps.1:1215
 #, no-wrap
 msgid "elapsed time since the process was started, in the form [[DD-]hh:]mm:ss.\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1213
+#: ../ps/ps.1:1217
 #, no-wrap
 msgid "etimes"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1215
+#: ../ps/ps.1:1219
 #, no-wrap
 msgid "elapsed time since the process was started, in seconds.\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1217
+#: ../ps/ps.1:1221
 #, no-wrap
 msgid "euid"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1217
+#: ../ps/ps.1:1221
 #, no-wrap
 msgid "EUID"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1220
+#: ../ps/ps.1:1224
 #, no-wrap
 msgid ""
 "effective user ID (alias\n"
@@ -3054,19 +3072,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1222
+#: ../ps/ps.1:1226
 #, no-wrap
 msgid "euser"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1222
+#: ../ps/ps.1:1226
 #, no-wrap
 msgid "EUSER"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1228
+#: ../ps/ps.1:1232
 #, no-wrap
 msgid ""
 "effective user name.  This will be the textual user ID, if it can be "
@@ -3078,13 +3096,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1230 ../ps/ps.1:1249 ../ps/ps.1:1256
+#: ../ps/ps.1:1234 ../ps/ps.1:1253 ../ps/ps.1:1260
 #, no-wrap
 msgid "F"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1235
+#: ../ps/ps.1:1239
 #, no-wrap
 msgid ""
 "flags associated with the process, see the\n"
@@ -3094,19 +3112,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1237
+#: ../ps/ps.1:1241
 #, no-wrap
 msgid "fgid"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1237
+#: ../ps/ps.1:1241
 #, no-wrap
 msgid "FGID"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1240
+#: ../ps/ps.1:1244
 #, no-wrap
 msgid ""
 "filesystem access group\\ ID.  (alias\n"
@@ -3114,19 +3132,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1242
+#: ../ps/ps.1:1246
 #, no-wrap
 msgid "fgroup"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1242
+#: ../ps/ps.1:1246
 #, no-wrap
 msgid "FGROUP"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1247
+#: ../ps/ps.1:1251
 #, no-wrap
 msgid ""
 "filesystem access group ID.  This will be the textual group ID, if it can\n"
@@ -3136,13 +3154,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1249
+#: ../ps/ps.1:1253
 #, no-wrap
 msgid "flag"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1254
+#: ../ps/ps.1:1258
 #, no-wrap
 msgid ""
 "see\n"
@@ -3152,7 +3170,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1261
+#: ../ps/ps.1:1265
 #, no-wrap
 msgid ""
 "see\n"
@@ -3162,13 +3180,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1263
+#: ../ps/ps.1:1267
 #, no-wrap
 msgid "fname"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1266
+#: ../ps/ps.1:1270
 #, no-wrap
 msgid ""
 "first 8 bytes of the base name of the process's executable file.  The "
@@ -3177,19 +3195,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1268
+#: ../ps/ps.1:1272
 #, no-wrap
 msgid "fuid"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1268
+#: ../ps/ps.1:1272
 #, no-wrap
 msgid "FUID"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1271
+#: ../ps/ps.1:1275
 #, no-wrap
 msgid ""
 "filesystem access user ID.  (alias\n"
@@ -3197,19 +3215,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1273
+#: ../ps/ps.1:1277
 #, no-wrap
 msgid "fuser"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1273
+#: ../ps/ps.1:1277
 #, no-wrap
 msgid "FUSER"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1276
+#: ../ps/ps.1:1280
 #, no-wrap
 msgid ""
 "filesystem access user ID.  This will be the textual user ID, if it can be\n"
@@ -3218,19 +3236,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1278
+#: ../ps/ps.1:1282
 #, no-wrap
 msgid "gid"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1278
+#: ../ps/ps.1:1282
 #, no-wrap
 msgid "GID"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1283
+#: ../ps/ps.1:1287
 #, no-wrap
 msgid ""
 "see\n"
@@ -3240,7 +3258,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1290
+#: ../ps/ps.1:1294
 #, no-wrap
 msgid ""
 "see\n"
@@ -3250,19 +3268,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1292
+#: ../ps/ps.1:1296
 #, no-wrap
 msgid "ignored"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1292 ../ps/ps.1:1573
+#: ../ps/ps.1:1296 ../ps/ps.1:1577
 #, no-wrap
 msgid "IGNORED"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1298
+#: ../ps/ps.1:1302
 #, no-wrap
 msgid ""
 "mask of the ignored signals, see\n"
@@ -3273,19 +3291,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1300
+#: ../ps/ps.1:1304
 #, no-wrap
 msgid "ipcns"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1300
+#: ../ps/ps.1:1304
 #, no-wrap
 msgid "IPCNS"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1302 ../ps/ps.1:1349 ../ps/ps.1:1353 ../ps/ps.1:1426 ../ps/ps.1:1774 ../ps/ps.1:1778
+#: ../ps/ps.1:1306 ../ps/ps.1:1353 ../ps/ps.1:1357 ../ps/ps.1:1430 ../ps/ps.1:1778 ../ps/ps.1:1782
 #, no-wrap
 msgid ""
 "Unique inode number describing the namespace the process belongs to. See "
@@ -3293,19 +3311,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1304
+#: ../ps/ps.1:1308
 #, no-wrap
 msgid "label"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1304
+#: ../ps/ps.1:1308
 #, no-wrap
 msgid "LABEL"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1309
+#: ../ps/ps.1:1313
 #, no-wrap
 msgid ""
 "security label, most commonly used for SELinux context data.  This is for\n"
@@ -3315,19 +3333,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1311
+#: ../ps/ps.1:1315
 #, no-wrap
 msgid "lstart"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1311 ../ps/ps.1:1609
+#: ../ps/ps.1:1315 ../ps/ps.1:1613
 #, no-wrap
 msgid "STARTED"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1314
+#: ../ps/ps.1:1318
 #, no-wrap
 msgid ""
 "time the command started.  See also\n"
@@ -3335,19 +3353,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1316
+#: ../ps/ps.1:1320
 #, no-wrap
 msgid "lsession"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1316
+#: ../ps/ps.1:1320
 #, no-wrap
 msgid "SESSION"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1319
+#: ../ps/ps.1:1323
 #, no-wrap
 msgid ""
 "displays the login session identifier of a process,\n"
@@ -3355,19 +3373,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1321
+#: ../ps/ps.1:1325
 #, no-wrap
 msgid "lwp"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1321
+#: ../ps/ps.1:1325
 #, no-wrap
 msgid "LWP"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1327
+#: ../ps/ps.1:1331
 #, no-wrap
 msgid ""
 "light weight process (thread) ID of the dispatchable entity (alias\n"
@@ -3378,19 +3396,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1329
+#: ../ps/ps.1:1333
 #, no-wrap
 msgid "lxc"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1329
+#: ../ps/ps.1:1333
 #, no-wrap
 msgid "LXC"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1332
+#: ../ps/ps.1:1336
 #, no-wrap
 msgid ""
 "The name of the lxc container within which a task is running.\n"
@@ -3399,19 +3417,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1334
+#: ../ps/ps.1:1338
 #, no-wrap
 msgid "machine"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1334
+#: ../ps/ps.1:1338
 #, no-wrap
 msgid "MACHINE"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1337
+#: ../ps/ps.1:1341
 #, no-wrap
 msgid ""
 "displays the machine name for processes assigned to VM or container,\n"
@@ -3419,61 +3437,61 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1339
+#: ../ps/ps.1:1343
 #, no-wrap
 msgid "MAJFLT"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1341
+#: ../ps/ps.1:1345
 #, no-wrap
 msgid "The number of major page faults that have occurred with this process.\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1343
+#: ../ps/ps.1:1347
 #, no-wrap
 msgid "MINFLT"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1345
+#: ../ps/ps.1:1349
 #, no-wrap
 msgid "The number of minor page faults that have occurred with this process.\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1347
+#: ../ps/ps.1:1351
 #, no-wrap
 msgid "mntns"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1347
+#: ../ps/ps.1:1351
 #, no-wrap
 msgid "MNTNS"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1351
+#: ../ps/ps.1:1355
 #, no-wrap
 msgid "netns"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1351
+#: ../ps/ps.1:1355
 #, no-wrap
 msgid "NETNS"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1355
+#: ../ps/ps.1:1359
 #, no-wrap
 msgid "ni"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1361
+#: ../ps/ps.1:1365
 #, no-wrap
 msgid ""
 "nice value. This ranges from 19 (nicest) to -20 (not nice to others),\n"
@@ -3484,7 +3502,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1367
+#: ../ps/ps.1:1371
 #, no-wrap
 msgid ""
 "see\n"
@@ -3493,19 +3511,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1369
+#: ../ps/ps.1:1373
 #, no-wrap
 msgid "nlwp"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1369
+#: ../ps/ps.1:1373
 #, no-wrap
 msgid "NLWP"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1372
+#: ../ps/ps.1:1376
 #, no-wrap
 msgid ""
 "number of lwps (threads) in the process.  (alias\n"
@@ -3513,19 +3531,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1374
+#: ../ps/ps.1:1378
 #, no-wrap
 msgid "nwchan"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1374 ../ps/ps.1:1798
+#: ../ps/ps.1:1378 ../ps/ps.1:1802
 #, no-wrap
 msgid "WCHAN"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1379
+#: ../ps/ps.1:1383
 #, no-wrap
 msgid ""
 "address of the kernel function where the process is sleeping (use\n"
@@ -3535,19 +3553,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1381
+#: ../ps/ps.1:1385
 #, no-wrap
 msgid "ouid"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1381
+#: ../ps/ps.1:1385
 #, no-wrap
 msgid "OWNER"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1384
+#: ../ps/ps.1:1388
 #, no-wrap
 msgid ""
 "displays the Unix user identifier of the owner of the session of a "
@@ -3556,7 +3574,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1391
+#: ../ps/ps.1:1395
 #, no-wrap
 msgid ""
 "see\n"
@@ -3566,19 +3584,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1393
+#: ../ps/ps.1:1397
 #, no-wrap
 msgid "pending"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1393 ../ps/ps.1:1559
+#: ../ps/ps.1:1397 ../ps/ps.1:1563
 #, no-wrap
 msgid "PENDING"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1404
+#: ../ps/ps.1:1408
 #, no-wrap
 msgid ""
 "mask of the pending signals. See\n"
@@ -3594,7 +3612,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1410
+#: ../ps/ps.1:1414
 #, no-wrap
 msgid ""
 "process group ID or, equivalently, the process ID of the process group\n"
@@ -3603,13 +3621,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1412
+#: ../ps/ps.1:1416
 #, no-wrap
 msgid "PGRP"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1417
+#: ../ps/ps.1:1421
 #, no-wrap
 msgid ""
 "see\n"
@@ -3619,7 +3637,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1422
+#: ../ps/ps.1:1426
 #, no-wrap
 msgid ""
 "a number representing the process ID (alias\n"
@@ -3627,25 +3645,25 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1424
+#: ../ps/ps.1:1428
 #, no-wrap
 msgid "pidns"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1424
+#: ../ps/ps.1:1428
 #, no-wrap
 msgid "PIDNS"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1428
+#: ../ps/ps.1:1432
 #, no-wrap
 msgid "pmem"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1433
+#: ../ps/ps.1:1437
 #, no-wrap
 msgid ""
 "see\n"
@@ -3655,19 +3673,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1435
+#: ../ps/ps.1:1439
 #, no-wrap
 msgid "policy"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1435
+#: ../ps/ps.1:1439
 #, no-wrap
 msgid "POL"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1439
+#: ../ps/ps.1:1443
 #, no-wrap
 msgid ""
 "scheduling class of the process.  (alias\n"
@@ -3676,67 +3694,67 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1459
+#: ../ps/ps.1:1463
 #, no-wrap
 msgid "parent process ID.\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1461
+#: ../ps/ps.1:1465
 #, no-wrap
 msgid "pri"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1461
+#: ../ps/ps.1:1465
 #, no-wrap
 msgid "PRI"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1463
+#: ../ps/ps.1:1467
 #, no-wrap
 msgid "priority of the process.  Higher number means lower priority.\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1465
+#: ../ps/ps.1:1469
 #, no-wrap
 msgid "psr"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1465
+#: ../ps/ps.1:1469
 #, no-wrap
 msgid "PSR"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1467
+#: ../ps/ps.1:1471
 #, no-wrap
 msgid "processor that process is currently assigned to.\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1469
+#: ../ps/ps.1:1473
 #, no-wrap
 msgid "rgid"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1469
+#: ../ps/ps.1:1473
 #, no-wrap
 msgid "RGID"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1471
+#: ../ps/ps.1:1475
 #, no-wrap
 msgid "real group ID.\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1476
+#: ../ps/ps.1:1480
 #, no-wrap
 msgid ""
 "real group name.  This will be the textual group ID, if it can be obtained\n"
@@ -3744,13 +3762,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1478 ../ps/ps.1:1484
+#: ../ps/ps.1:1482 ../ps/ps.1:1488
 #, no-wrap
 msgid "RSS"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1482
+#: ../ps/ps.1:1486
 #, no-wrap
 msgid ""
 "resident set size, the non-swapped physical memory that a task has used "
@@ -3760,13 +3778,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1484
+#: ../ps/ps.1:1488
 #, no-wrap
 msgid "rssize"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1489
+#: ../ps/ps.1:1493
 #, no-wrap
 msgid ""
 "see\n"
@@ -3776,19 +3794,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1491
+#: ../ps/ps.1:1495
 #, no-wrap
 msgid "rsz"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1491
+#: ../ps/ps.1:1495
 #, no-wrap
 msgid "RSZ"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1496
+#: ../ps/ps.1:1500
 #, no-wrap
 msgid ""
 "see\n"
@@ -3798,43 +3816,43 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1498
+#: ../ps/ps.1:1502
 #, no-wrap
 msgid "rtprio"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1498
+#: ../ps/ps.1:1502
 #, no-wrap
 msgid "RTPRIO"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1500
+#: ../ps/ps.1:1504
 #, no-wrap
 msgid "realtime priority.\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1502
+#: ../ps/ps.1:1506
 #, no-wrap
 msgid "ruid"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1502
+#: ../ps/ps.1:1506
 #, no-wrap
 msgid "RUID"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1504
+#: ../ps/ps.1:1508
 #, no-wrap
 msgid "real user ID.\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1509
+#: ../ps/ps.1:1513
 #, no-wrap
 msgid ""
 "real user ID.  This will be the textual user ID, if it can be obtained and\n"
@@ -3842,7 +3860,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1518
+#: ../ps/ps.1:1522
 #, no-wrap
 msgid ""
 "minimal state display (one character).  See section\n"
@@ -3854,19 +3872,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1520
+#: ../ps/ps.1:1524
 #, no-wrap
 msgid "sched"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1520
+#: ../ps/ps.1:1524
 #, no-wrap
 msgid "SCH"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1524
+#: ../ps/ps.1:1528
 #, no-wrap
 msgid ""
 "scheduling policy of the process.  The policies SCHED_OTHER "
@@ -3877,19 +3895,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1526
+#: ../ps/ps.1:1530
 #, no-wrap
 msgid "seat"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1526
+#: ../ps/ps.1:1530
 #, no-wrap
 msgid "SEAT"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1530
+#: ../ps/ps.1:1534
 #, no-wrap
 msgid ""
 "displays the identifier associated with all hardware devices assigned\n"
@@ -3898,19 +3916,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1532
+#: ../ps/ps.1:1536
 #, no-wrap
 msgid "sess"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1532
+#: ../ps/ps.1:1536
 #, no-wrap
 msgid "SESS"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1535
+#: ../ps/ps.1:1539
 #, no-wrap
 msgid ""
 "session ID or, equivalently, the process ID of the session leader.  (alias\n"
@@ -3918,13 +3936,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1537
+#: ../ps/ps.1:1541
 #, no-wrap
 msgid "sgi_p"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1540
+#: ../ps/ps.1:1544
 #, no-wrap
 msgid ""
 "processor that the process is currently executing on.  Displays \"*\" if "
@@ -3933,19 +3951,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1542
+#: ../ps/ps.1:1546
 #, no-wrap
 msgid "sgid"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1542
+#: ../ps/ps.1:1546
 #, no-wrap
 msgid "SGID"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1545
+#: ../ps/ps.1:1549
 #, no-wrap
 msgid ""
 "saved group ID.  (alias\n"
@@ -3953,19 +3971,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1547
+#: ../ps/ps.1:1551
 #, no-wrap
 msgid "sgroup"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1547
+#: ../ps/ps.1:1551
 #, no-wrap
 msgid "SGROUP"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1550
+#: ../ps/ps.1:1554
 #, no-wrap
 msgid ""
 "saved group name.  This will be the textual group ID, if it can be "
@@ -3974,19 +3992,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1552
+#: ../ps/ps.1:1556
 #, no-wrap
 msgid "sid"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1552
+#: ../ps/ps.1:1556
 #, no-wrap
 msgid "SID"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1557
+#: ../ps/ps.1:1561
 #, no-wrap
 msgid ""
 "see\n"
@@ -3996,13 +4014,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1559
+#: ../ps/ps.1:1563
 #, no-wrap
 msgid "sig"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1564
+#: ../ps/ps.1:1568
 #, no-wrap
 msgid ""
 "see\n"
@@ -4012,13 +4030,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1566
+#: ../ps/ps.1:1570
 #, no-wrap
 msgid "sigcatch"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1571
+#: ../ps/ps.1:1575
 #, no-wrap
 msgid ""
 "see\n"
@@ -4028,13 +4046,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1573
+#: ../ps/ps.1:1577
 #, no-wrap
 msgid "sigignore"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1578
+#: ../ps/ps.1:1582
 #, no-wrap
 msgid ""
 "see\n"
@@ -4044,13 +4062,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1580
+#: ../ps/ps.1:1584
 #, no-wrap
 msgid "sigmask"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1585
+#: ../ps/ps.1:1589
 #, no-wrap
 msgid ""
 "see\n"
@@ -4060,13 +4078,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1587
+#: ../ps/ps.1:1591
 #, no-wrap
 msgid "SIZE"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1591
+#: ../ps/ps.1:1595
 #, no-wrap
 msgid ""
 "approximate amount of swap space that would be required if the process "
@@ -4076,19 +4094,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1593
+#: ../ps/ps.1:1597
 #, no-wrap
 msgid "slice"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1593
+#: ../ps/ps.1:1597
 #, no-wrap
 msgid "SLICE"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1596
+#: ../ps/ps.1:1600
 #, no-wrap
 msgid ""
 "displays the slice unit which a process belongs to,\n"
@@ -4096,19 +4114,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1598
+#: ../ps/ps.1:1602
 #, no-wrap
 msgid "spid"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1598
+#: ../ps/ps.1:1602
 #, no-wrap
 msgid "SPID"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1603
+#: ../ps/ps.1:1607
 #, no-wrap
 msgid ""
 "see\n"
@@ -4118,31 +4136,31 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1605
+#: ../ps/ps.1:1609
 #, no-wrap
 msgid "stackp"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1605
+#: ../ps/ps.1:1609
 #, no-wrap
 msgid "STACKP"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1607
+#: ../ps/ps.1:1611
 #, no-wrap
 msgid "address of the bottom (start) of stack for the process.\n"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1609
+#: ../ps/ps.1:1613
 #, no-wrap
 msgid "start"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1614
+#: ../ps/ps.1:1618
 #, no-wrap
 msgid ""
 "time the command started.  If the process was started less than 24 hours "
@@ -4154,7 +4172,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1623
+#: ../ps/ps.1:1627
 #, no-wrap
 msgid ""
 "starting time or date of the process.  Only the year will be displayed if "
@@ -4167,19 +4185,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1625
+#: ../ps/ps.1:1629
 #, no-wrap
 msgid "stat"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1625
+#: ../ps/ps.1:1629
 #, no-wrap
 msgid "STAT"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1631
+#: ../ps/ps.1:1635
 #, no-wrap
 msgid ""
 "multi-character process state.  See section\n"
@@ -4190,13 +4208,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1633
+#: ../ps/ps.1:1637
 #, no-wrap
 msgid "state"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1636
+#: ../ps/ps.1:1640
 #, no-wrap
 msgid ""
 "see\n"
@@ -4204,19 +4222,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1638
+#: ../ps/ps.1:1642
 #, no-wrap
 msgid "suid"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1638
+#: ../ps/ps.1:1642
 #, no-wrap
 msgid "SUID"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1641
+#: ../ps/ps.1:1645
 #, no-wrap
 msgid ""
 "saved user ID.  (alias\n"
@@ -4224,19 +4242,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1643
+#: ../ps/ps.1:1647
 #, no-wrap
 msgid "supgid"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1643
+#: ../ps/ps.1:1647
 #, no-wrap
 msgid "SUPGID"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1646
+#: ../ps/ps.1:1650
 #, no-wrap
 msgid ""
 "group ids of supplementary groups, if any.  See\n"
@@ -4244,19 +4262,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1648
+#: ../ps/ps.1:1652
 #, no-wrap
 msgid "supgrp"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1648
+#: ../ps/ps.1:1652
 #, no-wrap
 msgid "SUPGRP"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1651
+#: ../ps/ps.1:1655
 #, no-wrap
 msgid ""
 "group names of supplementary groups, if any.  See\n"
@@ -4264,19 +4282,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1653
+#: ../ps/ps.1:1657
 #, no-wrap
 msgid "suser"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1653
+#: ../ps/ps.1:1657
 #, no-wrap
 msgid "SUSER"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1657
+#: ../ps/ps.1:1661
 #, no-wrap
 msgid ""
 "saved user name.  This will be the textual user ID, if it can be obtained "
@@ -4286,19 +4304,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1659
+#: ../ps/ps.1:1663
 #, no-wrap
 msgid "svgid"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1659
+#: ../ps/ps.1:1663
 #, no-wrap
 msgid "SVGID"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1664
+#: ../ps/ps.1:1668
 #, no-wrap
 msgid ""
 "see\n"
@@ -4308,19 +4326,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1666
+#: ../ps/ps.1:1670
 #, no-wrap
 msgid "svuid"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1666
+#: ../ps/ps.1:1670
 #, no-wrap
 msgid "SVUID"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1671
+#: ../ps/ps.1:1675
 #, no-wrap
 msgid ""
 "see\n"
@@ -4330,19 +4348,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1673
+#: ../ps/ps.1:1677
 #, no-wrap
 msgid "sz"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1673
+#: ../ps/ps.1:1677
 #, no-wrap
 msgid "SZ"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1678
+#: ../ps/ps.1:1682
 #, no-wrap
 msgid ""
 "size in physical pages of the core image of the process.  This includes "
@@ -4353,19 +4371,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1680
+#: ../ps/ps.1:1684
 #, no-wrap
 msgid "tgid"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1680
+#: ../ps/ps.1:1684
 #, no-wrap
 msgid "TGID"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1684
+#: ../ps/ps.1:1688
 #, no-wrap
 msgid ""
 "a number representing the thread group to which a task belongs (alias\n"
@@ -4374,19 +4392,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1686
+#: ../ps/ps.1:1690
 #, no-wrap
 msgid "thcount"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1686
+#: ../ps/ps.1:1690
 #, no-wrap
 msgid "THCNT"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1692
+#: ../ps/ps.1:1696
 #, no-wrap
 msgid ""
 "see\n"
@@ -4397,19 +4415,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1694
+#: ../ps/ps.1:1698
 #, no-wrap
 msgid "tid"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1694
+#: ../ps/ps.1:1698
 #, no-wrap
 msgid "TID"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1701
+#: ../ps/ps.1:1705
 #, no-wrap
 msgid ""
 "the unique number representing a dispatchable entity (alias\n"
@@ -4424,7 +4442,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1706
+#: ../ps/ps.1:1710
 #, no-wrap
 msgid ""
 "cumulative CPU\\ time, \"[DD-]HH:MM:SS\" format.  (alias\n"
@@ -4432,13 +4450,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1708
+#: ../ps/ps.1:1712
 #, no-wrap
 msgid "tname"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1711
+#: ../ps/ps.1:1715
 #, no-wrap
 msgid ""
 "controlling tty (terminal).  (alias\n"
@@ -4446,13 +4464,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1713
+#: ../ps/ps.1:1717
 #, no-wrap
 msgid "TPGID"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1716
+#: ../ps/ps.1:1720
 #, no-wrap
 msgid ""
 "ID of the foreground process group on the tty (terminal) that the process "
@@ -4461,19 +4479,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1718
+#: ../ps/ps.1:1722
 #, no-wrap
 msgid "trs"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1718
+#: ../ps/ps.1:1722
 #, no-wrap
 msgid "TRS"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1720
+#: ../ps/ps.1:1724
 #, no-wrap
 msgid ""
 "text resident set size, the amount of physical memory devoted to executable "
@@ -4481,19 +4499,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1722
+#: ../ps/ps.1:1726
 #, no-wrap
 msgid "tt"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1722 ../ps/ps.1:1727
+#: ../ps/ps.1:1726 ../ps/ps.1:1731
 #, no-wrap
 msgid "TT"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1725
+#: ../ps/ps.1:1729
 #, no-wrap
 msgid ""
 "controlling tty (terminal).  (alias\n"
@@ -4501,7 +4519,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1730
+#: ../ps/ps.1:1734
 #, no-wrap
 msgid ""
 "controlling tty (terminal).  (alias\n"
@@ -4509,13 +4527,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1732
+#: ../ps/ps.1:1736
 #, no-wrap
 msgid "ucmd"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1737
+#: ../ps/ps.1:1741
 #, no-wrap
 msgid ""
 "see\n"
@@ -4525,13 +4543,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1739
+#: ../ps/ps.1:1743
 #, no-wrap
 msgid "ucomm"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1744
+#: ../ps/ps.1:1748
 #, no-wrap
 msgid ""
 "see\n"
@@ -4541,13 +4559,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1746
+#: ../ps/ps.1:1750
 #, no-wrap
 msgid "UID"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1751
+#: ../ps/ps.1:1755
 #, no-wrap
 msgid ""
 "see\n"
@@ -4557,13 +4575,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1753
+#: ../ps/ps.1:1757
 #, no-wrap
 msgid "uname"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1758
+#: ../ps/ps.1:1762
 #, no-wrap
 msgid ""
 "see\n"
@@ -4573,19 +4591,19 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1760
+#: ../ps/ps.1:1764
 #, no-wrap
 msgid "unit"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1760
+#: ../ps/ps.1:1764
 #, no-wrap
 msgid "UNIT"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1763
+#: ../ps/ps.1:1767
 #, no-wrap
 msgid ""
 "displays unit which a process belongs to,\n"
@@ -4593,7 +4611,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1770
+#: ../ps/ps.1:1774
 #, no-wrap
 msgid ""
 "see\n"
@@ -4603,43 +4621,43 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1772
+#: ../ps/ps.1:1776
 #, no-wrap
 msgid "userns"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1772
+#: ../ps/ps.1:1776
 #, no-wrap
 msgid "USERNS"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1776
+#: ../ps/ps.1:1780
 #, no-wrap
 msgid "utsns"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1776
+#: ../ps/ps.1:1780
 #, no-wrap
 msgid "UTSNS"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1780
+#: ../ps/ps.1:1784
 #, no-wrap
 msgid "uunit"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1780
+#: ../ps/ps.1:1784
 #, no-wrap
 msgid "UUNIT"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1783
+#: ../ps/ps.1:1787
 #, no-wrap
 msgid ""
 "displays user unit which a process belongs to,\n"
@@ -4647,7 +4665,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1790
+#: ../ps/ps.1:1794
 #, no-wrap
 msgid ""
 "see\n"
@@ -4657,7 +4675,7 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1796
+#: ../ps/ps.1:1800
 #, no-wrap
 msgid ""
 "virtual memory size of the process in KiB (1024-byte units).  Device\n"
@@ -4666,13 +4684,13 @@
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1798
+#: ../ps/ps.1:1802
 #, no-wrap
 msgid "wchan"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1803
+#: ../ps/ps.1:1807
 #, no-wrap
 msgid ""
 "name of the kernel function in which the process is sleeping, a \"-\" if "
@@ -4683,98 +4701,98 @@
 msgstr ""
 
 #. type: SH
-#: ../ps/ps.1:1809
+#: ../ps/ps.1:1813
 #, no-wrap
 msgid "ENVIRONMENT VARIABLES"
 msgstr ""
 
 #. type: Plain text
-#: ../ps/ps.1:1812
+#: ../ps/ps.1:1816
 msgid "The following environment variables could affect B<ps>:"
 msgstr ""
 
 #. type: TP
-#: ../ps/ps.1:1812
+#: ../ps/ps.1:1816
 #, no-wrap
 msgid "B<COLUMNS>"
 msgstr ""
 
 #. type: Plain text
-#: ../ps/ps.1:1815
+#: ../ps/ps.1:1819
 msgid "Override default display width."
 msgstr ""
 
 #. type: TP
-#: ../ps/ps.1:1815
+#: ../ps/ps.1:1819
 #, no-wrap
 msgid "B<LINES>"
 msgstr ""
 
 #. type: Plain text
-#: ../ps/ps.1:1818
+#: ../ps/ps.1:1822
 msgid "Override default display height."
 msgstr ""
 
 #. type: TP
-#: ../ps/ps.1:1818
+#: ../ps/ps.1:1822
 #, no-wrap
 msgid "B<PS_PERSONALITY>"
 msgstr ""
 
 #. type: Plain text
-#: ../ps/ps.1:1823 ../ps/ps.1:1828
+#: ../ps/ps.1:1827 ../ps/ps.1:1832
 msgid ""
 "Set to one of posix, old, linux, bsd, sun, digital...  (see section "
 "B<PERSONALITY> below)."
 msgstr ""
 
 #. type: TP
-#: ../ps/ps.1:1823
+#: ../ps/ps.1:1827
 #, no-wrap
 msgid "B<CMD_ENV>"
 msgstr ""
 
 #. type: TP
-#: ../ps/ps.1:1828
+#: ../ps/ps.1:1832
 #, no-wrap
 msgid "B<I_WANT_A_BROKEN_PS>"
 msgstr ""
 
 #. type: Plain text
-#: ../ps/ps.1:1831
+#: ../ps/ps.1:1835
 msgid "Force obsolete command line interpretation."
 msgstr ""
 
 #. type: TP
-#: ../ps/ps.1:1831
+#: ../ps/ps.1:1835
 #, no-wrap
 msgid "B<LC_TIME>"
 msgstr ""
 
 #. type: Plain text
-#: ../ps/ps.1:1834
+#: ../ps/ps.1:1838
 msgid "Date format."
 msgstr ""
 
 #. type: TP
-#: ../ps/ps.1:1834
+#: ../ps/ps.1:1838
 #, no-wrap
 msgid "B<PS_COLORS>"
 msgstr ""
 
 #. type: Plain text
-#: ../ps/ps.1:1837
+#: ../ps/ps.1:1841
 msgid "Not currently supported."
 msgstr ""
 
 #. type: TP
-#: ../ps/ps.1:1837
+#: ../ps/ps.1:1841
 #, no-wrap
 msgid "B<PS_FORMAT>"
 msgstr ""
 
 #. type: Plain text
-#: ../ps/ps.1:1848
+#: ../ps/ps.1:1852
 msgid ""
 "Default output format override. You may set this to a format string of the "
 "type used for the B<-o> option.  The B<DefSysV> and B<DefBSD> values are "
@@ -4782,46 +4800,46 @@
 msgstr ""
 
 #. type: TP
-#: ../ps/ps.1:1848
+#: ../ps/ps.1:1852
 #, no-wrap
 msgid "B<POSIXLY_CORRECT>"
 msgstr ""
 
 #. type: Plain text
-#: ../ps/ps.1:1851 ../ps/ps.1:1858
+#: ../ps/ps.1:1855 ../ps/ps.1:1862
 msgid "Don't find excuses to ignore bad \"features\"."
 msgstr ""
 
 #. type: TP
-#: ../ps/ps.1:1851
+#: ../ps/ps.1:1855
 #, no-wrap
 msgid "B<POSIX2>"
 msgstr ""
 
 #. type: Plain text
-#: ../ps/ps.1:1855
+#: ../ps/ps.1:1859
 msgid "When set to \"on\", acts as B<POSIXLY_CORRECT>."
 msgstr ""
 
 #. type: TP
-#: ../ps/ps.1:1855
+#: ../ps/ps.1:1859
 #, no-wrap
 msgid "B<UNIX95>"
 msgstr ""
 
 #. type: TP
-#: ../ps/ps.1:1858
+#: ../ps/ps.1:1862
 #, no-wrap
 msgid "B<_XPG>"
 msgstr ""
 
 #. type: Plain text
-#: ../ps/ps.1:1861
+#: ../ps/ps.1:1865
 msgid "Cancel B<CMD_ENV>=I<irix> non-standard behavior."
 msgstr ""
 
 #. type: Plain text
-#: ../ps/ps.1:1869
+#: ../ps/ps.1:1873
 msgid ""
 "In general, it is a bad idea to set these variables.  The one exception is "
 "B<CMD_ENV> or B<PS_PERSONALITY>, which could be set to Linux for normal "
@@ -4830,318 +4848,318 @@
 msgstr ""
 
 #. type: SH
-#: ../ps/ps.1:1870
+#: ../ps/ps.1:1874
 #, no-wrap
 msgid "PERSONALITY"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1873
+#: ../ps/ps.1:1877
 #, no-wrap
 msgid "390"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1873
+#: ../ps/ps.1:1877
 #, no-wrap
 msgid "like the OS/390 OpenEdition B<ps>"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1874
+#: ../ps/ps.1:1878
 #, no-wrap
 msgid "aix"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1874
+#: ../ps/ps.1:1878
 #, no-wrap
 msgid "like AIX B<ps>"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1875
+#: ../ps/ps.1:1879
 #, no-wrap
 msgid "bsd"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1875
+#: ../ps/ps.1:1879
 #, no-wrap
 msgid "like FreeBSD B<ps> (totally non-standard)"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1876
+#: ../ps/ps.1:1880
 #, no-wrap
 msgid "compaq"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1876
+#: ../ps/ps.1:1880
 #, no-wrap
 msgid "like Digital Unix B<ps>"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1877
+#: ../ps/ps.1:1881
 #, no-wrap
 msgid "debian"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1877 ../ps/ps.1:1879
+#: ../ps/ps.1:1881 ../ps/ps.1:1883
 #, no-wrap
 msgid "like the old Debian B<ps>"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1878
+#: ../ps/ps.1:1882
 #, no-wrap
 msgid "digital"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1878
+#: ../ps/ps.1:1882
 #, no-wrap
 msgid "like Tru64 (was Digital\\ Unix, was OSF/1) B<ps>"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1879
+#: ../ps/ps.1:1883
 #, no-wrap
 msgid "gnu"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1880
+#: ../ps/ps.1:1884
 #, no-wrap
 msgid "hp"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1880 ../ps/ps.1:1881
+#: ../ps/ps.1:1884 ../ps/ps.1:1885
 #, no-wrap
 msgid "like HP-UX B<ps>"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1881
+#: ../ps/ps.1:1885
 #, no-wrap
 msgid "hpux"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1882
+#: ../ps/ps.1:1886
 #, no-wrap
 msgid "irix"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1882 ../ps/ps.1:1889
+#: ../ps/ps.1:1886 ../ps/ps.1:1893
 #, no-wrap
 msgid "like Irix B<ps>"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1883
+#: ../ps/ps.1:1887
 #, no-wrap
 msgid "linux"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1883
+#: ../ps/ps.1:1887
 #, no-wrap
 msgid "***** B<recommended> *****"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1884
+#: ../ps/ps.1:1888
 #, no-wrap
 msgid "old"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1884
+#: ../ps/ps.1:1888
 #, no-wrap
 msgid "like the original Linux B<ps> (totally non-standard)"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1885
+#: ../ps/ps.1:1889
 #, no-wrap
 msgid "os390"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1885 ../ps/ps.1:1887
+#: ../ps/ps.1:1889 ../ps/ps.1:1891
 #, no-wrap
 msgid "like OS/390 Open Edition B<ps>"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1886
+#: ../ps/ps.1:1890
 #, no-wrap
 msgid "posix"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1886 ../ps/ps.1:1892 ../ps/ps.1:1893 ../ps/ps.1:1895 ../ps/ps.1:1896 ../ps/ps.1:1897
+#: ../ps/ps.1:1890 ../ps/ps.1:1896 ../ps/ps.1:1897 ../ps/ps.1:1899 ../ps/ps.1:1900 ../ps/ps.1:1901
 #, no-wrap
 msgid "standard"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1887
+#: ../ps/ps.1:1891
 #, no-wrap
 msgid "s390"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1888
+#: ../ps/ps.1:1892
 #, no-wrap
 msgid "sco"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1888
+#: ../ps/ps.1:1892
 #, no-wrap
 msgid "like SCO B<ps>"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1889
+#: ../ps/ps.1:1893
 #, no-wrap
 msgid "sgi"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1890
+#: ../ps/ps.1:1894
 #, no-wrap
 msgid "solaris2"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1890
+#: ../ps/ps.1:1894
 #, no-wrap
 msgid "like Solaris 2+ (SunOS 5) B<ps>"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1891
+#: ../ps/ps.1:1895
 #, no-wrap
 msgid "sunos4"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1891
+#: ../ps/ps.1:1895
 #, no-wrap
 msgid "like SunOS 4 (Solaris 1) B<ps> (totally non-standard)"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1892
+#: ../ps/ps.1:1896
 #, no-wrap
 msgid "svr4"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1893
+#: ../ps/ps.1:1897
 #, no-wrap
 msgid "sysv"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1894
+#: ../ps/ps.1:1898
 #, no-wrap
 msgid "tru64"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1894
+#: ../ps/ps.1:1898
 #, no-wrap
 msgid "like Tru64 (was Digital Unix, was OSF/1) B<ps>"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1895
+#: ../ps/ps.1:1899
 #, no-wrap
 msgid "unix"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1896
+#: ../ps/ps.1:1900
 #, no-wrap
 msgid "unix95"
 msgstr ""
 
 #. type: tbl table
-#: ../ps/ps.1:1897
+#: ../ps/ps.1:1901
 #, no-wrap
 msgid "unix98"
 msgstr ""
 
 #. type: SH
-#: ../ps/ps.1:1901
+#: ../ps/ps.1:1905
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: ../ps/ps.1:1906
+#: ../ps/ps.1:1910
 msgid "B<pgrep>(1), B<pstree>(1), B<top>(1), B<proc>(5)."
 msgstr ""
 
 #. type: SH
-#: ../ps/ps.1:1908
+#: ../ps/ps.1:1912
 #, no-wrap
 msgid "STANDARDS"
 msgstr ""
 
 #. type: Plain text
-#: ../ps/ps.1:1912
+#: ../ps/ps.1:1916
 msgid "This B<ps> conforms to:"
 msgstr ""
 
 #. type: Plain text
-#: ../ps/ps.1:1916
+#: ../ps/ps.1:1920
 msgid "Version 2 of the Single Unix Specification"
 msgstr ""
 
 #. type: Plain text
-#: ../ps/ps.1:1918
+#: ../ps/ps.1:1922
 msgid "The Open Group Technical Standard Base Specifications, Issue\\ 6"
 msgstr ""
 
 #. type: Plain text
-#: ../ps/ps.1:1920
+#: ../ps/ps.1:1924
 msgid "IEEE Std 1003.1, 2004\\ Edition"
 msgstr ""
 
 #. type: Plain text
-#: ../ps/ps.1:1922
+#: ../ps/ps.1:1926
 msgid "X/Open System Interfaces Extension [UP\\ XSI]"
 msgstr ""
 
 #. type: IP
-#: ../ps/ps.1:1922
+#: ../ps/ps.1:1926
 #, no-wrap
 msgid "5"
 msgstr ""
 
 #. type: Plain text
-#: ../ps/ps.1:1924
+#: ../ps/ps.1:1928
 msgid "ISO/IEC 9945:2003"
 msgstr ""
 
 #. type: SH
-#: ../ps/ps.1:1926
+#: ../ps/ps.1:1930
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: ../ps/ps.1:1953
+#: ../ps/ps.1:1957
 msgid ""
 "B<ps> was originally written by E<.UR lankeste@\\:fwi.\\:uva.\\:nl> Branko "
 "Lankester E<.UE .> E<.UR johnsonm@\\:redhat.\\:com> Michael K. Johnson "
@@ -5158,7 +5176,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../ps/ps.1:1957
+#: ../ps/ps.1:1961
 msgid ""
 "Please send bug reports to E<.UR procps@\\:freelists.\\:org> E<.UE .> No "
 "subscription is required or suggested."
diff -Nru procps-3.3.11/man-po/template-man-top.pot procps-3.3.12/man-po/template-man-top.pot
--- procps-3.3.11/man-po/template-man-top.pot	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/man-po/template-man-top.pot	2016-07-10 06:40:26.000000000 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-09 17:55+1000\n"
+"POT-Creation-Date: 2016-07-10 08:19+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -153,7 +153,7 @@
 #. type: ds MS
 #: ../top/top.1:45
 #, no-wrap
-msgid "shared memory"
+msgid "swap file"
 msgstr ""
 
 #. type: ds MV
@@ -263,26 +263,32 @@
 msgid "see topic"
 msgstr ""
 
+#. type: ds XX
+#: ../top/top.1:68
+#, no-wrap
+msgid "See `OVERVIEW, Linux Memory Types' for additional details"
+msgstr ""
+
 #. type: TH
-#: ../top/top.1:71
+#: ../top/top.1:72
 #, no-wrap
 msgid "TOP"
 msgstr ""
 
 #. type: TH
-#: ../top/top.1:71
+#: ../top/top.1:72
 #, no-wrap
-msgid "June 2015"
+msgid "July 2016"
 msgstr ""
 
 #. type: TH
-#: ../top/top.1:71
+#: ../top/top.1:72
 #, no-wrap
 msgid "procps-ng"
 msgstr ""
 
 #. type: TH
-#: ../top/top.1:71
+#: ../top/top.1:72
 #, no-wrap
 msgid "User Commands"
 msgstr ""
@@ -290,27 +296,27 @@
 #.  ----------------------------------------------------------------------
 #.  ----------------------------------------------------------------------
 #. type: SH
-#: ../top/top.1:75
+#: ../top/top.1:76
 #, no-wrap
 msgid "NAME"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:78
+#: ../top/top.1:79
 msgid "top - display Linux processes"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: SH
-#: ../top/top.1:80
+#: ../top/top.1:81
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:83
+#: ../top/top.1:84
 msgid "\\*(WE \\*(CL"
 msgstr ""
 
@@ -371,9 +377,13 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:147
+#: ../top/top.1:151
 #, no-wrap
 msgid ""
+"    OVERVIEW\n"
+"       Operation\n"
+"       Startup Defaults\n"
+"       Linux Memory Types\n"
 "    1. COMMAND-LINE Options\n"
 "    2. SUMMARY Display\n"
 "       a. UPTIME and LOAD Averages\n"
@@ -406,19 +416,19 @@
 "       b. Bouncing Windows\n"
 "       c. The Big Bird Window\n"
 "       d. The Ol' Switcheroo\n"
-"    8. BUGS, 9. HISTORY Former top, 10. AUTHOR, 11. SEE Also\n"
+"    8. BUGS, 9. SEE Also\n"
 msgstr ""
 
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:150
+#: ../top/top.1:154
 #, no-wrap
 msgid "Operation"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:156
+#: ../top/top.1:160
 msgid ""
 "When operating \\*(We, the two most important keys are the help (h or ?)  "
 "key and quit (`q') key.  Alternatively, you could simply use the traditional "
@@ -426,7 +436,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:163
+#: ../top/top.1:167
 msgid ""
 "When started for the first time, you'll be presented with these traditional "
 "elements on the main \\*(We screen: 1) Summary Area; 2) Fields/Columns "
@@ -436,7 +446,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:171
+#: ../top/top.1:175
 msgid ""
 "The main \\*(We screen is I<generally> quite adaptive to changes in terminal "
 "dimensions under X-Windows.  Other \\*(We screens may be less so, especially "
@@ -447,7 +457,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:176
+#: ../top/top.1:180
 msgid ""
 "Following any re-size operation, if a \\*(We screen is corrupted, appears "
 "incomplete or disordered, simply typing something innocuous like a "
@@ -456,7 +466,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:181
+#: ../top/top.1:185
 #, no-wrap
 msgid ""
 "       I<key/cmd  objective >\n"
@@ -466,7 +476,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:185
+#: ../top/top.1:189
 msgid ""
 "But if the display is still corrupted, there is one more step you could "
 "try.  Insert this command after \\*(We has been suspended but before "
@@ -474,7 +484,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:188
+#: ../top/top.1:192
 #, no-wrap
 msgid ""
 "       I<key/cmd  objective >\n"
@@ -482,7 +492,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:198
+#: ../top/top.1:202
 msgid ""
 "\\*(NT the width of \\*(We's display will be limited to \\*(WX positions.  "
 "Displaying all fields requires \\*(WF characters.  Remaining screen width is "
@@ -493,7 +503,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:203
+#: ../top/top.1:207
 msgid ""
 "Lastly, some of \\*(We's screens or functions require the use of cursor "
 "motion keys like the standard \\*(KAs plus the Home, End, PgUp and PgDn "
@@ -502,7 +512,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:213
+#: ../top/top.1:217
 #, no-wrap
 msgid ""
 "      I< key      equivalent-key-combinations >\n"
@@ -517,7 +527,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:220
+#: ../top/top.1:224
 msgid ""
 "The B<Up> and B<Down> \\*(KAs have special significance when prompted for "
 "line input terminated with the E<lt>EnterE<gt> key.  Those keys, or their "
@@ -527,7 +537,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:228
+#: ../top/top.1:232
 #, no-wrap
 msgid ""
 "      I< key      special-significance >\n"
@@ -541,14 +551,14 @@
 
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:231
+#: ../top/top.1:235
 #, no-wrap
 msgid "Startup Defaults"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:237
+#: ../top/top.1:241
 msgid ""
 "The following startup defaults assume no \\*(CF, thus no user "
 "customizations.  Even so, items shown with an \\*(AK could be overridden "
@@ -557,7 +567,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:266
+#: ../top/top.1:270
 #, no-wrap
 msgid ""
 "    I<Global-defaults>\n"
@@ -589,51 +599,153 @@
 "       z - color/mono       On  (show colors)\n"
 msgstr ""
 
+#.  ......................................................................
+#. type: SS
+#: ../top/top.1:273
+#, no-wrap
+msgid "Linux Memory Types"
+msgstr ""
+
+#.  ----------------------------------------------------------------------
+#. type: Plain text
+#: ../top/top.1:282
+msgid ""
+"For our purposes there are three types of memory, and one is optional.  "
+"First is \\*(MP, a limited resource where code and data must reside when "
+"executed or referenced.  Next is the optional \\*(MS, where modified (dirty) "
+"memory can be saved and later retrieved if too many demands are made on "
+"\\*(MP.  Lastly we have \\*(MV, a nearly unlimited resource serving the "
+"following goals:"
+msgstr ""
+
+#. type: Plain text
+#: ../top/top.1:288
+#, no-wrap
+msgid ""
+"   1. abstraction, free from physical memory addresses/limits\n"
+"   2. isolation, every process in a separate address space\n"
+"   3. sharing, a single mapping can serve multiple needs\n"
+"   4. flexibility, assign a virtual address to a file\n"
+msgstr ""
+
+#. type: Plain text
+#: ../top/top.1:297
+msgid ""
+"Regardless of which of these forms memory may take, all are managed as pages "
+"(typically 4096 bytes) but expressed by default in \\*(We as KiB "
+"(kibibyte).  The memory discussed under topic `2c. MEMORY Usage' deals with "
+"\\*(MP and the \\*(MS for the system as a whole.  The memory reviewed in "
+"topic `3. FIELDS / Columns Display' embraces all three memory types, but for "
+"individual processes."
+msgstr ""
+
+#. type: Plain text
+#: ../top/top.1:303
+msgid ""
+"For each such process, every memory page is restricted to a single quadrant "
+"from the table below.  Both \\*(MP and \\*(MV can include any of the four, "
+"while the \\*(MS only includes #1 through #3.  The memory in quadrant #4, "
+"when modified, acts as its own dedicated \\*(MS."
+msgstr ""
+
+#. type: Plain text
+#: ../top/top.1:315
+#, no-wrap
+msgid ""
+"                              B<Private> | B<Shared>\n"
+"                          B<1>           |          B<2>\n"
+"     B<Anonymous>  . stack               |\n"
+"                . malloc()            |\n"
+"                . brk()/sbrk()        | . POSIX shm*\n"
+"                . mmap(PRIVATE, ANON) | . mmap(SHARED, ANON)\n"
+"               -----------------------+----------------------\n"
+"                . mmap(PRIVATE, fd)   | . mmap(SHARED, fd)\n"
+"   B<File-backed>  . pgms/shared libs    |\n"
+"                          B<3>           |          B<4>\n"
+msgstr ""
+
+#. type: Plain text
+#: ../top/top.1:319
+msgid ""
+"The following may help in interpreting process level memory values displayed "
+"as scalable columns and discussed under topic `3a. DESCRIPTIONS of Fields'."
+msgstr ""
+
+#. type: Plain text
+#: ../top/top.1:336
+#, no-wrap
+msgid ""
+"   %MEM - simply RES divided by total \\*(MP\n"
+"   CODE - the `pgms' portion of quadrant B<3>\n"
+"   DATA - the entire quadrant B<1> portion of VIRT plus all\n"
+"          explicit mmap file-backed pages of quadrant B<3>\n"
+"   RES  - anything occupying \\*(MP which, beginning with\n"
+"          Linux-4.5, is the sum of the following three fields:\n"
+"          RSan - quadrant B<1> pages, which include any\n"
+"                 former quadrant B<3> pages if modified\n"
+"          RSfd - quadrant B<3> and quadrant B<4> pages\n"
+"          RSsh - quadrant B<2> pages\n"
+"   RSlk - subset of RES which cannot be swapped out (any quadrant)\n"
+"   SHR  - subset of RES (excludes B<1>, includes all B<2> & B<4>, some "
+"B<3>)\n"
+"   SWAP - potentially any quadrant except B<4>\n"
+"   USED - simply the sum of RES and SWAP\n"
+"   VIRT - everything in-use and/or reserved (all quadrants)\n"
+msgstr ""
+
+#. type: Plain text
+#: ../top/top.1:341
+msgid ""
+"\\*(NT Even though program images and shared libraries are considered "
+"I<private> to a process, they will be accounted for as I<shared> (SHR) by "
+"the kernel."
+msgstr ""
+
 #.  ----------------------------------------------------------------------
 #. type: SH
-#: ../top/top.1:269
+#: ../top/top.1:343
 #, no-wrap
 msgid "1. COMMAND-LINE Options"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:272
+#: ../top/top.1:346
 msgid "The command-line syntax for \\*(We consists of:"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:274
+#: ../top/top.1:348
 #, no-wrap
 msgid "  \\*(CL\n"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:277
+#: ../top/top.1:351
 msgid ""
 "The typically mandatory switch (`-') and even whitespace are completely "
 "optional."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:278
+#: ../top/top.1:352
 #, no-wrap
 msgid "-B<h> | -B<v>\\ \\ :I<Help/Version >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:281
+#: ../top/top.1:355
 msgid "Show library version and the usage prompt, then quit."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:282
+#: ../top/top.1:356
 #, no-wrap
 msgid "-B<b>\\ \\ :I<Batch-mode> operation "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:288
+#: ../top/top.1:362
 msgid ""
 "Starts \\*(We in Batch mode, which could be useful for sending output from "
 "\\*(We to other programs or to a file.  In this mode, \\*(We will not accept "
@@ -642,13 +754,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:289
+#: ../top/top.1:363
 #, no-wrap
 msgid "-B<c>\\ \\ :I<Command-line/Program-name> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:295
+#: ../top/top.1:369
 msgid ""
 "Starts \\*(We with the last remembered `c' state reversed.  Thus, if \\*(We "
 "was displaying command lines, now that field will show program names, and "
@@ -656,13 +768,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:296
+#: ../top/top.1:370
 #, no-wrap
 msgid "-B<d>\\ \\ :I<Delay-time> interval as:\\ \\ B<-d ss.t> (I<secs>.I<tenths>) "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:301
+#: ../top/top.1:375
 msgid ""
 "Specifies the delay between screen updates, and overrides the corresponding "
 "value in one's personal \\*(CF or the startup default.  Later this can be "
@@ -670,7 +782,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:306
+#: ../top/top.1:380
 msgid ""
 "Fractional seconds are honored, but a negative number is not allowed.  In "
 "all cases, however, such changes are prohibited if \\*(We is running in "
@@ -679,13 +791,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:307
+#: ../top/top.1:381
 #, no-wrap
 msgid "-B<H>\\ \\ :I<Threads-mode> operation "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:312
+#: ../top/top.1:386
 msgid ""
 "Instructs \\*(We to display individual threads.  Without this \\*(CO a "
 "summation of all threads in each process is shown.  Later this can be "
@@ -693,13 +805,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:313
+#: ../top/top.1:387
 #, no-wrap
 msgid "-B<i>\\ \\ :I<Idle-process> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:320
+#: ../top/top.1:394
 msgid ""
 "Starts \\*(We with the last remembered `i' state reversed.  When this toggle "
 "is \\*F, tasks that have not used any \\*(PU since the last update will not "
@@ -708,26 +820,26 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:321
+#: ../top/top.1:395
 #, no-wrap
 msgid "-B<n>\\ \\ :I<Number-of-iterations> limit as:B<\\ \\ -n number >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:325
+#: ../top/top.1:399
 msgid ""
 "Specifies the maximum number of iterations, or frames, \\*(We should produce "
 "before ending."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:326
+#: ../top/top.1:400
 #, no-wrap
 msgid "-B<o>\\ \\ :I<Override-sort-field> as:B<\\ \\ -o fieldname >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:333
+#: ../top/top.1:407
 msgid ""
 "Specifies the name of the field on which tasks will be sorted, independent "
 "of what is reflected in the configuration file.  You can prepend a `+' or "
@@ -737,20 +849,20 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:336
+#: ../top/top.1:410
 msgid ""
 "This option exists primarily to support automated/scripted batch mode "
 "operation."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:337
+#: ../top/top.1:411
 #, no-wrap
 msgid "-B<O>\\ \\ :I<Output-field-names >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:343
+#: ../top/top.1:417
 msgid ""
 "This option acts as a form of help for the above -o option.  It will cause "
 "\\*(We to print each of the available field names on a separate line, then "
@@ -758,7 +870,7 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:344
+#: ../top/top.1:418
 #, no-wrap
 msgid ""
 "-B<p>\\ \\ :I<Monitor-PIDs> mode as:B<\\ \\ -pN1 -pN2 ...>\\ \\ orB<\\ \\ "
@@ -766,7 +878,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:350
+#: ../top/top.1:424
 msgid ""
 "Monitor only processes with specified process IDs.  This option can be given "
 "up to \\*(WP times, or you can provide a comma delimited list with up to "
@@ -774,14 +886,14 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:353
+#: ../top/top.1:427
 msgid ""
 "A pid value of zero will be treated as the process id of the \\*(We program "
 "itself once it is running."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:357
+#: ../top/top.1:431
 msgid ""
 "This is a \\*(CO only and should you wish to return to normal operation, it "
 "is not necessary to quit and restart \\*(We \\*(Em just issue any of these "
@@ -789,31 +901,31 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:359 ../top/top.1:383
+#: ../top/top.1:433 ../top/top.1:457
 msgid "The `p', `u' and `U' \\*(COs are mutually exclusive."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:360
+#: ../top/top.1:434
 #, no-wrap
 msgid "-B<s>\\ \\ :I<Secure-mode> operation "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:365
+#: ../top/top.1:439
 msgid ""
 "Starts \\*(We with secure mode forced, even for root.  This mode is far "
 "better controlled through the system \\*(CF (\\*(Xt 6. FILES)."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:366
+#: ../top/top.1:440
 #, no-wrap
 msgid "-B<S>\\ \\ :I<Cumulative-time> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:372
+#: ../top/top.1:446
 msgid ""
 "Starts \\*(We with the last remembered `S' state reversed.  When Cumulative "
 "time mode is \\*O, each process is listed with the \\*(Pu time that it and "
@@ -822,7 +934,7 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:373
+#: ../top/top.1:447
 #, no-wrap
 msgid ""
 "-B<u> | -B<U>\\ \\ :I<User-filter-mode> as:\\ \\ B<-u> | B<-U number> orB< "
@@ -830,7 +942,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:378
+#: ../top/top.1:452
 msgid ""
 "Display only processes with a user id or user name matching that given.  The "
 "`-u' option matches on I< effective> user whereas the `-U' option matches "
@@ -838,20 +950,20 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:381
+#: ../top/top.1:455
 msgid ""
 "Prepending an exclamation point (`!') to the user id or name instructs top "
 "to display only processes with users not matching the one provided."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:384
+#: ../top/top.1:458
 #, no-wrap
 msgid "-B<w>\\ \\ :I<Output-width-override> as:\\ \\ B<-w> [B< number> ] "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:391
+#: ../top/top.1:465
 msgid ""
 "In Batch mode, when used without an argument \\*(We will format output using "
 "the COLUMNS= and LINES= environment variables, if set.  Otherwise, width "
@@ -861,7 +973,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:397
+#: ../top/top.1:471
 msgid ""
 "In normal display mode, when used without an argument \\*(We willI< attempt> "
 "to format output using the COLUMNS= and LINES= environment variables, if "
@@ -871,7 +983,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:400
+#: ../top/top.1:474
 msgid ""
 "\\*(NT Without the use of this \\*(CO, output width is always based on the "
 "terminal at which \\*(We was invoked whether or not in Batch mode."
@@ -879,14 +991,14 @@
 
 #.  ----------------------------------------------------------------------
 #. type: SH
-#: ../top/top.1:402
+#: ../top/top.1:476
 #, no-wrap
 msgid "2. SUMMARY Display"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:408
+#: ../top/top.1:482
 msgid ""
 "Each of the following three areas are individually controlled through one or "
 "more \\*(CIs.  \\*(XT 4b. SUMMARY AREA Commands for additional information "
@@ -895,19 +1007,19 @@
 
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:410
+#: ../top/top.1:484
 #, no-wrap
 msgid "2a. UPTIME and LOAD Averages"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:413
+#: ../top/top.1:487
 msgid "This portion consists of a single line containing:"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:418
+#: ../top/top.1:492
 #, no-wrap
 msgid ""
 "    B<program> orB< window> name, depending on display mode\n"
@@ -918,41 +1030,41 @@
 
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:421
+#: ../top/top.1:495
 #, no-wrap
 msgid "2b. TASK and CPU States"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:426
+#: ../top/top.1:500
 msgid ""
 "This portion consists of a minimum of two lines.  In an SMP environment, "
 "additional lines can reflect individual \\*(PU state percentages."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:430
+#: ../top/top.1:504
 msgid ""
 "Line 1 shows totalB< tasks> orB< threads>, depending on the state of the "
 "Threads-mode toggle.  That total is further classified as:"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:432
+#: ../top/top.1:506
 #, no-wrap
 msgid "    running; sleeping; stopped; zombie\n"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:436
+#: ../top/top.1:510
 msgid ""
 "Line 2 shows \\*(PU state percentages based on the interval since the last "
 "refresh."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:440
+#: ../top/top.1:514
 msgid ""
 "As a default, percentages for these individual categories are displayed.  "
 "Where two labels are shown below, those for more recent kernel versions are "
@@ -960,7 +1072,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:449
+#: ../top/top.1:523
 #, no-wrap
 msgid ""
 "    B<us>,B< user>    : time running un-niced user processes\n"
@@ -974,14 +1086,14 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:453
+#: ../top/top.1:527
 msgid ""
 "In the alternate cpu states display modes, beyond the first tasks/threads "
 "line, an abbreviated summary is shown consisting of these elements:"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:456
+#: ../top/top.1:530
 #, no-wrap
 msgid ""
 "               a    b     c    d\n"
@@ -989,7 +1101,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:463
+#: ../top/top.1:537
 msgid ""
 "Where: a) is the combined B<us> and B<ni> percentage; b) is the B<sy> "
 "percentage; c) is the total; and d) is one of two visual graphs of those "
@@ -999,14 +1111,14 @@
 
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:465
+#: ../top/top.1:539
 #, no-wrap
 msgid "2c. MEMORY Usage"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:470
+#: ../top/top.1:544
 msgid ""
 "This portion consists of two lines which may express values in kibibytes "
 "(KiB)  through exbibytes (EiB) depending on the scaling factor enforced with "
@@ -1014,29 +1126,29 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:472
+#: ../top/top.1:546
 msgid "As a default, Line 1 reflects \\*(MP, classified as:"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:474
+#: ../top/top.1:548
 #, no-wrap
 msgid "    total, free, used and buff/cache\n"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:477
+#: ../top/top.1:551
 msgid "Line 2 reflects mostly \\*(MV, classified as:"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:479
+#: ../top/top.1:553
 #, no-wrap
 msgid "    total, free, used and avail (which is \\*(MP)\n"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:487
+#: ../top/top.1:561
 msgid ""
 "The B<avail> number on line 2 is an estimation of \\*(MP available for "
 "starting new applications, without swapping.  Unlike the B<free> field, it "
@@ -1046,14 +1158,14 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:490
+#: ../top/top.1:564
 msgid ""
 "In the alternate memory display modes, two abbreviated summary lines are "
 "shown consisting of these elements:"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:494
+#: ../top/top.1:568
 #, no-wrap
 msgid ""
 "               a    b          c\n"
@@ -1062,14 +1174,14 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:498
+#: ../top/top.1:572
 msgid ""
 "Where: a) is the percentage used; b) is the total available; and c) is one "
 "of two visual graphs of those representations."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:505
+#: ../top/top.1:579
 msgid ""
 "In the case of \\*(MP, the percentage represents the B<total> minus the "
 "estimated B<avail> noted above.  The `Mem' graph itself is divided between "
@@ -1079,12 +1191,12 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:507
+#: ../top/top.1:581
 msgid "This table may help in interpreting the scaled values displayed:"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:514
+#: ../top/top.1:588
 #, no-wrap
 msgid ""
 "    KiB = kibibyte = 1024 bytes\n"
@@ -1097,7 +1209,7 @@
 
 #.  ----------------------------------------------------------------------
 #. type: SH
-#: ../top/top.1:517
+#: ../top/top.1:591
 #, no-wrap
 msgid "3. FIELDS / Columns"
 msgstr ""
@@ -1105,14 +1217,14 @@
 #.  ----------------------------------------------------------------------
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:520
+#: ../top/top.1:594
 #, no-wrap
 msgid "3a. DESCRIPTIONS of Fields"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:526
+#: ../top/top.1:600
 msgid ""
 "Listed below are \\*(We's available process fields (columns).  They are "
 "shown in strict ascii alphabetical order.  You may customize their position "
@@ -1121,7 +1233,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:531
+#: ../top/top.1:605
 msgid ""
 "Any field is selectable as the sort field, and you control whether they are "
 "sorted high-to-low or low-to-high.  For additional information on sort "
@@ -1129,7 +1241,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:537
+#: ../top/top.1:611
 msgid ""
 "The fields related to \\*(MP or \\*(MV reference `(KiB)' which is the "
 "unsuffixed display mode.  Such fields may, however, be scaled from KiB "
@@ -1138,20 +1250,20 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:538
+#: ../top/top.1:612
 #, no-wrap
 msgid " 1.B< %CPU \\*(Em \\*(PU Usage >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:542
+#: ../top/top.1:616
 msgid ""
 "The task's share of the elapsed \\*(PU time since the last screen update, "
 "expressed as a percentage of total \\*(PU time."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:547
+#: ../top/top.1:621
 msgid ""
 "In a true SMP environment, if a process is multi-threaded and \\*(We is "
 "I<not> operating in Threads mode, amounts greater than 100% may be "
@@ -1159,7 +1271,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:552
+#: ../top/top.1:626
 msgid ""
 "Also for multi-processor environments, if Irix mode is \\*F, \\*(We will "
 "operate in Solaris mode where a task's \\*(Pu usage will be divided by the "
@@ -1167,31 +1279,57 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:553
+#: ../top/top.1:627
 #, no-wrap
 msgid " 2.B< %MEM \\*(Em Memory Usage (RES) >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:556
-msgid "A task's currently used share of available \\*(MP."
+#: ../top/top.1:630
+msgid "A task's currently resident share of available \\*(MP."
+msgstr ""
+
+#. type: Plain text
+#: ../top/top.1:632 ../top/top.1:669 ../top/top.1:702 ../top/top.1:815 ../top/top.1:867 ../top/top.1:917 ../top/top.1:962 ../top/top.1:974
+msgid "\\*(XX."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:557
+#: ../top/top.1:633
 #, no-wrap
-msgid " 3.B< CGROUPS \\*(Em Control Groups >"
+msgid " 3.B< CGNAME \\*(Em Control Group Name >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:561
+#: ../top/top.1:637
+msgid ""
+"The name of the control group to which a process belongs, or `-' if not "
+"applicable for that process."
+msgstr ""
+
+#. type: Plain text
+#: ../top/top.1:641
+msgid ""
+"This will typically be the last entry in the full list of control groups as "
+"shown under the next heading (CGROUPS).  And as is true there, this field is "
+"also variable width."
+msgstr ""
+
+#. type: TP
+#: ../top/top.1:642
+#, no-wrap
+msgid " 4.B< CGROUPS \\*(Em Control Groups >"
+msgstr ""
+
+#. type: Plain text
+#: ../top/top.1:646
 msgid ""
 "The names of the control group(s) to which a process belongs, or `-' if not "
 "applicable for that process."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:566
+#: ../top/top.1:651
 msgid ""
 "Control Groups provide for allocating resources (cpu, memory, network "
 "bandwidth, etc.) among installation-defined groups of processes.  They "
@@ -1200,7 +1338,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:570
+#: ../top/top.1:655
 msgid ""
 "Many different hierarchies of cgroups can exist simultaneously on a system "
 "and each hierarchy is attached to one or more subsystems.  A subsystem "
@@ -1208,7 +1346,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:577
+#: ../top/top.1:662
 msgid ""
 "\\*(NT The CGROUPS field, unlike most columns, is not fixed-width.  When "
 "displayed, it plus any other variable width columns will be allocated all "
@@ -1218,26 +1356,26 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:578
+#: ../top/top.1:663
 #, no-wrap
-msgid " 4.B< CODE \\*(Em Code Size (KiB) >"
+msgid " 5.B< CODE \\*(Em Code Size (KiB) >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:582
+#: ../top/top.1:667
 msgid ""
-"The amount of \\*(MP devoted to executable code, also known as the Text "
-"Resident Set size or TRS."
+"The amount of \\*(MP currently devoted to executable code, also known as the "
+"Text Resident Set size or TRS."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:583
+#: ../top/top.1:670
 #, no-wrap
-msgid " 5.B< COMMAND \\*(Em Command Name> or CommandB< Line >"
+msgid " 6.B< COMMAND \\*(Em Command Name> or CommandB< Line >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:589
+#: ../top/top.1:676
 msgid ""
 "Display the command line used to start a task or the name of the associated "
 "program.  You toggle between commandI< line> andI< name> with `c', which is "
@@ -1245,7 +1383,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:594
+#: ../top/top.1:681
 #, no-wrap
 msgid ""
 "When you've chosen to display command lines, processes without a command\n"
@@ -1255,14 +1393,14 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:597
+#: ../top/top.1:684
 msgid ""
 "This field may also be impacted by the forest view display mode.  \\*(XC `V' "
 "\\*(CI for additional information regarding that mode."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:606
+#: ../top/top.1:693
 msgid ""
 "\\*(NT The COMMAND field, unlike most columns, is not fixed-width.  When "
 "displayed, it plus any other variable width columns will be allocated all "
@@ -1274,26 +1412,27 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:607
+#: ../top/top.1:694
 #, no-wrap
-msgid " 6.B< DATA \\*(Em Data + Stack Size (KiB) >"
+msgid " 7.B< DATA \\*(Em Data + Stack Size (KiB) >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:611
+#: ../top/top.1:700
 msgid ""
-"The amount of \\*(MP devoted to other than executable code, also known as "
-"the Data Resident Set size or DRS."
+"The amount of private memory I<reserved> by a process.  It is also known as "
+"the Data Resident Set or DRS.  Such memory may not yet be mapped to \\*(MP "
+"(RES) but will always be included in the \\*(MV (VIRT) amount."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:612
+#: ../top/top.1:703
 #, no-wrap
-msgid " 7.B< ENVIRON \\*(Em Environment variables >"
+msgid " 8.B< ENVIRON \\*(Em Environment variables >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:618
+#: ../top/top.1:709
 msgid ""
 "Display all of the environment variables, if any, as seen by the respective "
 "processes.  These variables will be displayed in their raw native order, not "
@@ -1301,7 +1440,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:626
+#: ../top/top.1:717
 msgid ""
 "\\*(NT The ENVIRON field, unlike most columns, is not fixed-width.  When "
 "displayed, it plus any other variable width columns will be allocated all "
@@ -1312,13 +1451,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:627
+#: ../top/top.1:718
 #, no-wrap
-msgid " 8.B< Flags \\*(Em Task Flags >"
+msgid " 9.B< Flags \\*(Em Task Flags >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:632
+#: ../top/top.1:723
 msgid ""
 "This column represents the task's current scheduling flags which are "
 "expressed in hexadecimal notation and with zeros suppressed.  These flags "
@@ -1326,48 +1465,48 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:633
+#: ../top/top.1:724
 #, no-wrap
-msgid " 9.B< GID \\*(Em Group Id >"
+msgid "10.B< GID \\*(Em Group Id >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:636
+#: ../top/top.1:727
 msgid "TheI< effective> group ID."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:637
+#: ../top/top.1:728
 #, no-wrap
-msgid "10.B< GROUP \\*(Em Group Name >"
+msgid "11.B< GROUP \\*(Em Group Name >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:640
+#: ../top/top.1:731
 msgid "TheI< effective> group name."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:641
+#: ../top/top.1:732
 #, no-wrap
-msgid "11.B< LXC \\*(Em Lxc Container Name >"
+msgid "12.B< LXC \\*(Em Lxc Container Name >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:645
+#: ../top/top.1:736
 msgid ""
 "The name of the lxc container within which a task is running.  If a process "
 "is not running inside a container, a dash (`-') will be shown."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:646
+#: ../top/top.1:737
 #, no-wrap
-msgid "12.B< NI \\*(Em Nice Value >"
+msgid "13.B< NI \\*(Em Nice Value >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:653
+#: ../top/top.1:744
 msgid ""
 "The nice value of the task.  A negative nice value means higher priority, "
 "whereas a positive nice value means lower priority.  Zero in this field "
@@ -1376,13 +1515,41 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:654
+#: ../top/top.1:745
 #, no-wrap
-msgid "13.B< P \\*(Em Last used \\*(PU (SMP) >"
+msgid "14.B< OOMa \\*(Em Out of Memory Adjustment Factor >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:662
+#: ../top/top.1:750
+msgid ""
+"The value, ranging from -1000 to +1000, added to the current out of memory "
+"score (OOMs) which is then used to determine which task to kill when memory "
+"is exhausted."
+msgstr ""
+
+#. type: TP
+#: ../top/top.1:751
+#, no-wrap
+msgid "15.B< OOMs \\*(Em Out of Memory Score >"
+msgstr ""
+
+#. type: Plain text
+#: ../top/top.1:756
+msgid ""
+"The value, ranging from 0 to +1000, used to select task(s) to kill when "
+"memory is exhausted.  Zero translates to `never kill' whereas 1000 means "
+"`always kill'."
+msgstr ""
+
+#. type: TP
+#: ../top/top.1:757
+#, no-wrap
+msgid "16.B< P \\*(Em Last used \\*(PU (SMP) >"
+msgstr ""
+
+#. type: Plain text
+#: ../top/top.1:765
 msgid ""
 "A number representing the last used processor.  In a true SMP environment "
 "this will likely change frequently since the kernel intentionally uses weak "
@@ -1392,13 +1559,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:663
+#: ../top/top.1:766
 #, no-wrap
-msgid "14.B< PGRP \\*(Em Process Group Id >"
+msgid "17.B< PGRP \\*(Em Process Group Id >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:672
+#: ../top/top.1:775
 msgid ""
 "Every process is member of a unique process group which is used for "
 "distribution of signals and by terminals to arbitrate requests for their "
@@ -1409,13 +1576,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:673
+#: ../top/top.1:776
 #, no-wrap
-msgid "15.B< PID \\*(Em Process Id >"
+msgid "18.B< PID \\*(Em Process Id >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:678
+#: ../top/top.1:781
 msgid ""
 "The task's unique process ID, which periodically wraps, though never "
 "restarting at zero.  In kernel terms, it is a dispatchable entity defined by "
@@ -1423,7 +1590,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:683
+#: ../top/top.1:786
 msgid ""
 "This value may also be used as: a process group ID (\\*(Xa PGRP); a session "
 "ID for the session leader (\\*(Xa SID); a thread group ID for the thread "
@@ -1432,31 +1599,31 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:684
+#: ../top/top.1:787
 #, no-wrap
-msgid "16.B< PPID \\*(Em Parent Process Id >"
+msgid "19.B< PPID \\*(Em Parent Process Id >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:687
+#: ../top/top.1:790
 msgid "The process ID (pid) of a task's parent."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:688
+#: ../top/top.1:791
 #, no-wrap
-msgid "17.B< PR \\*(Em Priority >"
+msgid "20.B< PR \\*(Em Priority >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:693
+#: ../top/top.1:796
 msgid ""
 "The scheduling priority of the task.  If you see `rt' in this field, it "
 "means the task is running under real time scheduling priority."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:697
+#: ../top/top.1:800
 msgid ""
 "Under linux, real time priority is somewhat misleading since traditionally "
 "the operating itself was not preemptible.  And while the 2.6 kernel can be "
@@ -1464,46 +1631,116 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:698
+#: ../top/top.1:801
+#, no-wrap
+msgid "21.B< RES \\*(Em Resident Memory Size (KiB) >"
+msgstr ""
+
+#. type: Plain text
+#: ../top/top.1:806
+msgid ""
+"A subset of the virtual address space (VIRT) representing the non-swapped "
+"\\*(MP a task is currently using.  It is also the sum of the RSan, RSfd and "
+"RSsh fields."
+msgstr ""
+
+#. type: Plain text
+#: ../top/top.1:810
+msgid ""
+"It can include private anonymous pages, private pages mapped to files "
+"(including program images and shared libraries) plus shared anonymous "
+"pages.  All such memory is backed by the \\*(MS represented separately under "
+"SWAP."
+msgstr ""
+
+#. type: Plain text
+#: ../top/top.1:813
+msgid ""
+"Lastly, this field may also include shared file-backed pages which, when "
+"modified, act as a dedicated \\*(MS and thus will never impact SWAP."
+msgstr ""
+
+#. type: TP
+#: ../top/top.1:816
+#, no-wrap
+msgid "22.B< RSan \\*(Em Resident Anonymous Memory Size (KiB) >"
+msgstr ""
+
+#. type: Plain text
+#: ../top/top.1:820
+msgid ""
+"A subset of resident memory (RES) representing private pages not mapped to a "
+"file."
+msgstr ""
+
+#. type: TP
+#: ../top/top.1:821
 #, no-wrap
-msgid "18.B< RES \\*(Em Resident Memory Size (KiB) >"
+msgid "23.B< RSfd \\*(Em Resident File-Backed Memory Size (KiB) >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:701
-msgid "The non-swapped \\*(MP a task is using."
+#: ../top/top.1:826
+msgid ""
+"A subset of resident memory (RES) representing the implicitly shared pages "
+"supporting program images and shared libraries.  It also includes explicit "
+"file mappings, both private and shared."
+msgstr ""
+
+#. type: TP
+#: ../top/top.1:827
+#, no-wrap
+msgid "24.B< RSlk \\*(Em Resident Locked Memory Size (KiB) >"
+msgstr ""
+
+#. type: Plain text
+#: ../top/top.1:830
+msgid "A subset of resident memory (RES) which cannot be swapped out."
+msgstr ""
+
+#. type: TP
+#: ../top/top.1:831
+#, no-wrap
+msgid "25.B< RSsh \\*(Em Resident Shared Memory Size (KiB) >"
+msgstr ""
+
+#. type: Plain text
+#: ../top/top.1:835
+msgid ""
+"A subset of resident memory (RES) representing the explicitly shared "
+"anonymous shm*/mmap pages."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:702
+#: ../top/top.1:836
 #, no-wrap
-msgid "19.B< RUID \\*(Em Real User Id >"
+msgid "26.B< RUID \\*(Em Real User Id >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:705
+#: ../top/top.1:839
 msgid "TheI< real> user ID."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:706
+#: ../top/top.1:840
 #, no-wrap
-msgid "20.B< RUSER \\*(Em Real User Name >"
+msgid "27.B< RUSER \\*(Em Real User Name >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:709
+#: ../top/top.1:843
 msgid "TheI< real> user name."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:710
+#: ../top/top.1:844
 #, no-wrap
-msgid "21.B< S \\*(Em Process Status >"
+msgid "28.B< S \\*(Em Process Status >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:719
+#: ../top/top.1:853
 #, no-wrap
 msgid ""
 "The status of the task which can be one of:\n"
@@ -1516,7 +1753,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:724
+#: ../top/top.1:858
 msgid ""
 "Tasks shown as running should be more properly thought of as ready to run "
 "\\*(Em their task_struct is simply represented on the Linux run-queue.  Even "
@@ -1525,27 +1762,28 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:725
+#: ../top/top.1:859
 #, no-wrap
-msgid "22.B< SHR \\*(Em Shared Memory Size (KiB) >"
+msgid "29.B< SHR \\*(Em Shared Memory Size (KiB) >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:731
+#: ../top/top.1:865
 msgid ""
-"The amount of \\*(MS available to a task, not all of which is typically "
-"resident.  It simply reflects memory that could be potentially shared with "
-"other processes."
+"A subset of resident memory (RES) that may be used by other processes.  It "
+"will include shared anonymous pages and shared file-backed pages.  It also "
+"includes private pages mapped to files representing program images and "
+"shared libraries."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:732
+#: ../top/top.1:868
 #, no-wrap
-msgid "23.B< SID \\*(Em Session Id >"
+msgid "30.B< SID \\*(Em Session Id >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:740
+#: ../top/top.1:876
 msgid ""
 "A session is a collection of process groups (\\*(Xa PGRP), usually "
 "established by the login shell.  A newly forked process joins the session of "
@@ -1555,31 +1793,31 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:741
+#: ../top/top.1:877
 #, no-wrap
-msgid "24.B< SUID \\*(Em Saved User Id >"
+msgid "31.B< SUID \\*(Em Saved User Id >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:744
+#: ../top/top.1:880
 msgid "TheI< saved> user ID."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:745
+#: ../top/top.1:881
 #, no-wrap
-msgid "25.B< SUPGIDS \\*(Em Supplementary Group IDs >"
+msgid "32.B< SUPGIDS \\*(Em Supplementary Group IDs >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:750
+#: ../top/top.1:886
 msgid ""
 "The IDs of any supplementary group(s) established at login or inherited from "
 "a task's parent.  They are displayed in a comma delimited list."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:757
+#: ../top/top.1:893
 msgid ""
 "\\*(NT The SUPGIDS field, unlike most columns, is not fixed-width.  When "
 "displayed, it plus any other variable width columns will be allocated all "
@@ -1589,20 +1827,20 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:758
+#: ../top/top.1:894
 #, no-wrap
-msgid "26.B< SUPGRPS \\*(Em Supplementary Group Names >"
+msgid "33.B< SUPGRPS \\*(Em Supplementary Group Names >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:763
+#: ../top/top.1:899
 msgid ""
 "The names of any supplementary group(s) established at login or inherited "
 "from a task's parent.  They are displayed in a comma delimited list."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:770
+#: ../top/top.1:906
 msgid ""
 "\\*(NT The SUPGRPS field, unlike most columns, is not fixed-width.  When "
 "displayed, it plus any other variable width columns will be allocated all "
@@ -1612,35 +1850,37 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:771
+#: ../top/top.1:907
 #, no-wrap
-msgid "27.B< SUSER \\*(Em Saved User Name >"
+msgid "34.B< SUSER \\*(Em Saved User Name >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:774
+#: ../top/top.1:910
 msgid "TheI< saved> user name."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:775
+#: ../top/top.1:911
 #, no-wrap
-msgid "28.B< SWAP \\*(Em Swapped Size (KiB) >"
+msgid "35.B< SWAP \\*(Em Swapped Size (KiB) >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:778
-msgid "The non-resident portion of a task's address space."
+#: ../top/top.1:915
+msgid ""
+"The formerly resident portion of a task's address space written to the "
+"\\*(MS when \\*(MP becomes over committed."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:779
+#: ../top/top.1:918
 #, no-wrap
-msgid "29.B< TGID \\*(Em Thread Group Id >"
+msgid "36.B< TGID \\*(Em Thread Group Id >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:784
+#: ../top/top.1:923
 msgid ""
 "The ID of the thread group to which a task belongs.  It is the PID of the "
 "thread group leader.  In kernel terms, it represents those tasks that share "
@@ -1648,13 +1888,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:785
+#: ../top/top.1:924
 #, no-wrap
-msgid "30.B< TIME \\*(Em \\*(PU Time >"
+msgid "37.B< TIME \\*(Em \\*(PU Time >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:792
+#: ../top/top.1:931
 msgid ""
 "Total \\*(PU time the task has used since it started.  When Cumulative mode "
 "is \\*O, each process is listed with the \\*(Pu time that it and its dead "
@@ -1664,26 +1904,26 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:793
+#: ../top/top.1:932
 #, no-wrap
-msgid "31.B< TIME+ \\*(Em \\*(PU Time, hundredths >"
+msgid "38.B< TIME+ \\*(Em \\*(PU Time, hundredths >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:797
+#: ../top/top.1:936
 msgid ""
 "The same as TIME, but reflecting more granularity through hundredths of a "
 "second."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:798
+#: ../top/top.1:937
 #, no-wrap
-msgid "32.B< TPGID \\*(Em Tty Process Group Id >"
+msgid "39.B< TPGID \\*(Em Tty Process Group Id >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:804
+#: ../top/top.1:943
 msgid ""
 "The process group ID of the foreground process for the connected tty, or -1 "
 "if a process is not connected to a terminal.  By convention, this value "
@@ -1692,13 +1932,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:805
+#: ../top/top.1:944
 #, no-wrap
-msgid "33.B< TTY \\*(Em Controlling Tty >"
+msgid "40.B< TTY \\*(Em Controlling Tty >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:812
+#: ../top/top.1:951
 msgid ""
 "The name of the controlling terminal.  This is usually the device (serial "
 "port, pty, etc.) from which the process was started, and which it uses for "
@@ -1707,48 +1947,48 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:813
+#: ../top/top.1:952
 #, no-wrap
-msgid "34.B< UID \\*(Em User Id >"
+msgid "41.B< UID \\*(Em User Id >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:816
+#: ../top/top.1:955
 msgid "TheI< effective> user ID of the task's owner."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:817
+#: ../top/top.1:956
 #, no-wrap
-msgid "35.B< USED \\*(Em Memory in Use (KiB) >"
+msgid "42.B< USED \\*(Em Memory in Use (KiB) >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:821
+#: ../top/top.1:960
 msgid ""
-"This field represents the non-swapped \\*(MP a task has used (RES) plus the "
-"non-resident portion of its address space (SWAP)."
+"This field represents the non-swapped \\*(MP a task is using (RES) plus the "
+"swapped out portion of its address space (SWAP)."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:822
+#: ../top/top.1:963
 #, no-wrap
-msgid "36.B< USER \\*(Em User Name >"
+msgid "43.B< USER \\*(Em User Name >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:825
+#: ../top/top.1:966
 msgid "TheI< effective> user name of the task's owner."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:826
+#: ../top/top.1:967
 #, no-wrap
-msgid "37.B< VIRT \\*(Em Virtual Memory Size (KiB) >"
+msgid "44.B< VIRT \\*(Em Virtual Memory Size (KiB) >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:831
+#: ../top/top.1:972
 msgid ""
 "The total amount of \\*(MV used by the task.  It includes all code, data and "
 "shared libraries plus pages that have been swapped out and pages that have "
@@ -1756,26 +1996,26 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:832
+#: ../top/top.1:975
 #, no-wrap
-msgid "38.B< WCHAN \\*(Em Sleeping in Function >"
+msgid "45.B< WCHAN \\*(Em Sleeping in Function >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:837
+#: ../top/top.1:980
 msgid ""
 "This field will show the name of the kernel function in which the task is "
 "currently sleeping.  Running tasks will display a dash (`-') in this column."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:838
+#: ../top/top.1:981
 #, no-wrap
-msgid "39.B< nDRT \\*(Em Dirty Pages Count >"
+msgid "46.B< nDRT \\*(Em Dirty Pages Count >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:844
+#: ../top/top.1:987
 msgid ""
 "The number of pages that have been modified since they were last written to "
 "\\*(AS.  Dirty pages must be written to \\*(AS before the corresponding "
@@ -1783,13 +2023,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:845
+#: ../top/top.1:988
 #, no-wrap
-msgid "40.B< nMaj \\*(Em Major Page Fault Count >"
+msgid "47.B< nMaj \\*(Em Major Page Fault Count >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:852
+#: ../top/top.1:995
 msgid ""
 "The number ofB< major> page faults that have occurred for a task.  A page "
 "fault occurs when a process attempts to read from or write to a virtual page "
@@ -1798,13 +2038,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:853
+#: ../top/top.1:996
 #, no-wrap
-msgid "41.B< nMin \\*(Em Minor Page Fault count >"
+msgid "48.B< nMin \\*(Em Minor Page Fault count >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:860
+#: ../top/top.1:1003
 msgid ""
 "The number ofB< minor> page faults that have occurred for a task.  A page "
 "fault occurs when a process attempts to read from or write to a virtual page "
@@ -1813,63 +2053,63 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:861
+#: ../top/top.1:1004
 #, no-wrap
-msgid "42.B< nTH \\*(Em Number of Threads >"
+msgid "48.B< nTH \\*(Em Number of Threads >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:864
+#: ../top/top.1:1007
 msgid "The number of threads associated with a process."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:865
+#: ../top/top.1:1008
 #, no-wrap
-msgid "43.B< nsIPC \\*(Em IPC namespace >"
+msgid "50.B< nsIPC \\*(Em IPC namespace >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:869
+#: ../top/top.1:1012
 msgid ""
 "The Inode of the namespace used to isolate interprocess communication (IPC)  "
 "resources such as System V IPC objects and POSIX message queues."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:870
+#: ../top/top.1:1013
 #, no-wrap
-msgid "44.B< nsMNT \\*(Em MNT namespace >"
+msgid "51.B< nsMNT \\*(Em MNT namespace >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:874
+#: ../top/top.1:1017
 msgid ""
 "The Inode of the namespace used to isolate filesystem mount points thus "
 "offering different views of the filesystem hierarchy."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:875
+#: ../top/top.1:1018
 #, no-wrap
-msgid "45.B< nsNET \\*(Em NET namespace >"
+msgid "52.B< nsNET \\*(Em NET namespace >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:879
+#: ../top/top.1:1022
 msgid ""
 "The Inode of the namespace used to isolate resources such as network "
 "devices, IP addresses, IP routing, port numbers, etc."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:880
+#: ../top/top.1:1023
 #, no-wrap
-msgid "46.B< nsPID \\*(Em PID namespace >"
+msgid "53.B< nsPID \\*(Em PID namespace >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:886
+#: ../top/top.1:1029
 msgid ""
 "The Inode of the namespace used to isolate process ID numbers meaning they "
 "need not remain unique.  Thus, each such namespace could have its own "
@@ -1878,13 +2118,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:887
+#: ../top/top.1:1030
 #, no-wrap
-msgid "47.B< nsUSER \\*(Em USER namespace >"
+msgid "54.B< nsUSER \\*(Em USER namespace >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:893
+#: ../top/top.1:1036
 msgid ""
 "The Inode of the namespace used to isolate the user and group ID numbers.  "
 "Thus, a process could have a normal unprivileged user ID outside a user "
@@ -1893,39 +2133,39 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:894
+#: ../top/top.1:1037
 #, no-wrap
-msgid "48.B< nsUTS \\*(Em UTS namespace >"
+msgid "55.B< nsUTS \\*(Em UTS namespace >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:898
+#: ../top/top.1:1041
 msgid ""
 "The Inode of the namespace used to isolate hostname and NIS domain name.  "
 "UTS simply means \"UNIX Time-sharing System\"."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:899
+#: ../top/top.1:1042
 #, no-wrap
-msgid "49.B< vMj \\*(Em Major Page Fault Count Delta>"
+msgid "56.B< vMj \\*(Em Major Page Fault Count Delta>"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:903
+#: ../top/top.1:1046
 msgid ""
 "The number ofB< major> page faults that have occurred since the last update "
 "(see nMaj)."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:904
+#: ../top/top.1:1047
 #, no-wrap
-msgid "50.B< vMn \\*(Em Minor Page Fault Count Delta>"
+msgid "57.B< vMn \\*(Em Minor Page Fault Count Delta>"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:908
+#: ../top/top.1:1051
 msgid ""
 "The number ofB< minor> page faults that have occurred since the last update "
 "(see nMin)."
@@ -1933,14 +2173,14 @@
 
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:911
+#: ../top/top.1:1053
 #, no-wrap
 msgid "3b. MANAGING Fields"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:918
+#: ../top/top.1:1060
 msgid ""
 "After pressing the \\*(CI `f' or `F' (Fields Management) you will be "
 "presented with a screen showing: 1) the \\*(CW name; 2) the designated sort "
@@ -1950,13 +2190,13 @@
 msgstr ""
 
 #. type: IP
-#: ../top/top.1:920 ../top/top.1:926 ../top/top.1:931 ../top/top.1:935 ../top/top.1:940 ../top/top.1:2205 ../top/top.1:2228 ../top/top.1:2237 ../top/top.1:2253 ../top/top.1:2259 ../top/top.1:2265 ../top/top.1:2275 ../top/top.1:2292
+#: ../top/top.1:1062 ../top/top.1:1068 ../top/top.1:1073 ../top/top.1:1077 ../top/top.1:1082 ../top/top.1:2347 ../top/top.1:2370 ../top/top.1:2379 ../top/top.1:2395 ../top/top.1:2401 ../top/top.1:2407 ../top/top.1:2417 ../top/top.1:2434
 #, no-wrap
 msgid "\\(bu"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:925
+#: ../top/top.1:1067
 msgid ""
 "As the on screen instructions indicate, you navigate among the fields with "
 "theB< Up> andB< Down> \\*(KAs.  The PgUp, PgDn, Home and End keys can also "
@@ -1964,21 +2204,21 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:930
+#: ../top/top.1:1072
 msgid ""
 "TheB< Right> \\*(KA selects a field for repositioning and theB< Left> \\*(KA "
 "or the E<lt>B<Enter>E<gt> key commits that field's placement."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:934
+#: ../top/top.1:1076
 msgid ""
 "The `B<d>' key or the E<lt>B<Space>E<gt> bar toggles a field's display "
 "status, and thus the presence or absence of the asterisk."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:939
+#: ../top/top.1:1081
 msgid ""
 "The `B<s>' key designates a field as the sort field.  \\*(XT 4c. TASK AREA "
 "Commands, SORTING for additional information regarding your selection of a "
@@ -1986,14 +2226,14 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:943
+#: ../top/top.1:1085
 msgid ""
 "The `B<a>' and `B<w>' keys can be used to cycle through all available "
 "windows and the `B<q>' or E<lt>B<Esc>E<gt> keys exit Fields Management."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:952
+#: ../top/top.1:1094
 msgid ""
 "The Fields Management screen can also be used to change the \\*(CG in either "
 "\\*(FM or \\*(AM.  Whatever was targeted when `q' or E<lt>EscE<gt> was "
@@ -2003,7 +2243,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:959
+#: ../top/top.1:1101
 msgid ""
 "\\*(NT Any window that has been scrolledI< horizontally> will be reset if "
 "any field changes are made via the Fields Management screen.  AnyI< "
@@ -2014,14 +2254,14 @@
 
 #.  ----------------------------------------------------------------------
 #. type: SH
-#: ../top/top.1:961
+#: ../top/top.1:1103
 #, no-wrap
 msgid "4. INTERACTIVE Commands"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:966
+#: ../top/top.1:1108
 msgid ""
 "Listed below is a brief index of commands within categories.  Some commands "
 "appear more than once \\*(Em their meaning or scope may vary depending on "
@@ -2029,7 +2269,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:986
+#: ../top/top.1:1128
 #, no-wrap
 msgid ""
 "  4a.I< Global-Commands >\n"
@@ -2054,14 +2294,14 @@
 
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:989
+#: ../top/top.1:1131
 #, no-wrap
 msgid "4a. GLOBAL Commands"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:994
+#: ../top/top.1:1136
 msgid ""
 "The global \\*(CIs areB< always> available in both \\*(FM and \\*(AM.  "
 "However, some of these \\*(CIs areB< not available> when running in Secure "
@@ -2069,20 +2309,20 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:998
+#: ../top/top.1:1140
 msgid ""
 "If you wish to know in advance whether or not your \\*(We has been secured, "
 "simply ask for help and view the system summary on the second line."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:999
+#: ../top/top.1:1141
 #, no-wrap
 msgid "\\ \\ E<lt>B<Enter>E<gt> or E<lt>B<Space>E<gt>\\ \\ :I<Refresh-Display >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1004
+#: ../top/top.1:1146
 msgid ""
 "These commands awaken \\*(We and following receipt of any input the entire "
 "display will be repainted.  They also force an update of any hotplugged "
@@ -2090,20 +2330,20 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1007
+#: ../top/top.1:1149
 msgid ""
 "Use either of these keys if you have a large delay interval and wish to see "
 "current status,"
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1008
+#: ../top/top.1:1150
 #, no-wrap
 msgid "\\ \\ \\ B<?> | B<h>\\ \\ :I<Help >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1013
+#: ../top/top.1:1155
 msgid ""
 "There are two help levels available.  The first will provide a reminder of "
 "all the basic \\*(CIs.  If \\*(We isI< secured>, that screen will be "
@@ -2111,31 +2351,31 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1016
+#: ../top/top.1:1158
 msgid ""
 "Typing `h' or `?' on that help screen will take you to help for those "
 "\\*(CIs applicable to \\*(AM."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1017
+#: ../top/top.1:1159
 #, no-wrap
 msgid "\\ \\ \\ B<=>\\ \\ :I<Exit-Task-Limits >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1026
+#: ../top/top.1:1169
 msgid ""
 "Removes restrictions on which tasks are shown.  This command will reverse "
 "any `i' (idle tasks) and `n' (max tasks)  commands that might be active.  It "
-"also provides for an exit from PID monitoring, User filtering and Other "
-"filtering.  See the `-p' \\*(CO for a discussion of PID monitoring, the `U' "
-"or `u' \\*(CIs for User filtering and the `O' or `o' \\*(CIs for Other "
-"filtering."
+"also provides for an exit from PID monitoring, User filtering, Other "
+"filtering and Locate processing.  See the `-p' \\*(CO for a discussion of "
+"PID monitoring, the `U' or `u' \\*(CIs for User filtering the `O' or `o' "
+"\\*(CIs for Other filtering and `L' or `&' \\*(CIs for Locate processing."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1031
+#: ../top/top.1:1174
 msgid ""
 "Additionally, any window that has been scrolled will be reset with this "
 "command.  \\*(XT 5c. SCROLLING a Window for additional information regarding "
@@ -2143,18 +2383,18 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1033
+#: ../top/top.1:1176
 msgid "When operating in \\*(AM this command has a broader meaning."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1034
+#: ../top/top.1:1177
 #, no-wrap
 msgid "\\ \\ \\ B<0>\\ \\ :I<Zero-Suppress> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1039
+#: ../top/top.1:1182
 msgid ""
 "This command determines whether zeros are shown or suppressed for many of "
 "the fields in a \\*(TW.  Fields like UID, GID, NI, PR or P are not affected "
@@ -2162,13 +2402,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1040
+#: ../top/top.1:1183
 #, no-wrap
 msgid "\\ \\ \\ B<A>\\ \\ :I<Alternate-Display-Mode> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1045
+#: ../top/top.1:1188
 msgid ""
 "This command will switch between \\*(FM and \\*(AM.  \\*(XT "
 "5. ALTERNATE-DISPLAY Provisions and the `g' \\*(CI for insight into \\*(CWs "
@@ -2176,13 +2416,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1046
+#: ../top/top.1:1189
 #, no-wrap
 msgid "\\ \\ \\ B<B>\\ \\ :I<Bold-Disable/Enable> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1052
+#: ../top/top.1:1195
 msgid ""
 "This command will influence use of the bold terminfo capability and altersB< "
 "both> the \\*(SA and \\*(TA for the \\*(CW.  While it is intended primarily "
@@ -2190,7 +2430,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1057
+#: ../top/top.1:1200
 msgid ""
 "\\*(NT When this toggle is \\*O and \\*(We is operating in monochrome mode, "
 "theB< entire display> will appear as normal text.  Thus, unless the `x' "
@@ -2199,20 +2439,20 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1058
+#: ../top/top.1:1201
 #, no-wrap
 msgid "*\\ \\ B<d> | B<s>\\ \\ :I<Change-Delay-Time-interval >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1062
+#: ../top/top.1:1205
 msgid ""
 "You will be prompted to enter the delay time, in seconds, between display "
 "updates."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1068
+#: ../top/top.1:1211
 msgid ""
 "Fractional seconds are honored, but a negative number is not allowed.  "
 "Entering 0 causes (nearly) continuous updates, with an unsatisfactory "
@@ -2222,20 +2462,20 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1071
+#: ../top/top.1:1214
 msgid ""
 "If at any time you wish to know the current delay time, simply ask for help "
 "and view the system summary on the second line."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1072
+#: ../top/top.1:1215
 #, no-wrap
 msgid "\\ \\ \\ B<E>\\ \\ :I<Extend-Memory-Scale> in Summary Area"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1077
+#: ../top/top.1:1220
 msgid ""
 "With this command you can cycle through the available \\*(SA memory scaling "
 "which ranges from KiB (kibibytes or 1,024 bytes) through EiB (exbibytes or "
@@ -2243,7 +2483,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1081
+#: ../top/top.1:1224
 msgid ""
 "If you see a `+' between a displayed number and the following label, it "
 "means that \\*(We was forced to truncate some portion of that number.  By "
@@ -2251,13 +2491,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1082
+#: ../top/top.1:1225
 #, no-wrap
 msgid "\\ \\ \\ B<e>\\ \\ :I<Extend-Memory-Scale> in Task Windows"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1087
+#: ../top/top.1:1230
 msgid ""
 "With this command you can cycle through the available \\*(TW memory scaling "
 "which ranges from KiB (kibibytes or 1,024 bytes) through PiB (pebibytes or "
@@ -2265,7 +2505,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1094
+#: ../top/top.1:1237
 msgid ""
 "While \\*(We will try to honor the selected target range, additional scaling "
 "might still be necessary in order to accommodate current values.  If you "
@@ -2276,13 +2516,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1095
+#: ../top/top.1:1238
 #, no-wrap
 msgid "\\ \\ \\ B<g>\\ \\ :I<Choose-Another-Window/Field-Group >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1101
+#: ../top/top.1:1244
 msgid ""
 "You will be prompted to enter a number between 1 and 4 designating the "
 "\\*(FG which should be made the \\*(CW.  You will soon grow comfortable with "
@@ -2290,13 +2530,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1102
+#: ../top/top.1:1245
 #, no-wrap
 msgid "\\ \\ \\ B<H>\\ \\ :I<Threads-mode> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1107
+#: ../top/top.1:1250
 msgid ""
 "When this toggle is \\*O, individual threads will be displayed for all "
 "processes in all visible \\*(TWs.  Otherwise, \\*(We displays a summation of "
@@ -2304,13 +2544,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1108
+#: ../top/top.1:1251
 #, no-wrap
 msgid "\\ \\ \\ B<I>\\ \\ :I<Irix/Solaris-Mode> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1113
+#: ../top/top.1:1256
 msgid ""
 "When operating in Solaris mode (`I' toggled \\*F), a task's \\*(Pu usage "
 "will be divided by the total number of \\*(PUs.  After issuing this command, "
@@ -2318,18 +2558,18 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1114
+#: ../top/top.1:1257
 #, no-wrap
 msgid "*\\ \\ B<k>\\ \\ :I<Kill-a-task >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1117
+#: ../top/top.1:1260
 msgid "You will be prompted for a PID and then the signal to send."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1121 ../top/top.1:1143
+#: ../top/top.1:1264 ../top/top.1:1286
 msgid ""
 "Entering no PID or a negative number will be interpreted as the default "
 "shown in the prompt (the first task displayed).  A PID value of zero means "
@@ -2337,21 +2577,21 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1124
+#: ../top/top.1:1267
 msgid ""
 "The default signal, as reflected in the prompt, is SIGTERM.  However, you "
 "can send any signal, via number or name."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1127
+#: ../top/top.1:1270
 msgid ""
 "If you wish to abort the kill process, do one of the following depending on "
 "your progress:"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1131
+#: ../top/top.1:1274
 #, no-wrap
 msgid ""
 "    1) at the pid prompt, type an invalid number\n"
@@ -2360,24 +2600,24 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1133
+#: ../top/top.1:1276
 #, no-wrap
 msgid "\\ \\ \\ B<q>\\ \\ :I<Quit >"
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1136
+#: ../top/top.1:1279
 #, no-wrap
 msgid "*\\ \\ B<r>\\ \\ :I<Renice-a-Task >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1139
+#: ../top/top.1:1282
 msgid "You will be prompted for a PID and then the value to nice it to."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1149
+#: ../top/top.1:1292
 msgid ""
 "A positive nice value will cause a process to lose priority.  Conversely, a "
 "negative nice value will cause a process to be viewed more favorably by the "
@@ -2386,14 +2626,14 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1152
+#: ../top/top.1:1295
 msgid ""
 "If you wish to abort the renice process, do one of the following depending "
 "on your progress:"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1156
+#: ../top/top.1:1299
 #, no-wrap
 msgid ""
 "    1) at the pid prompt, type an invalid number\n"
@@ -2402,13 +2642,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1158
+#: ../top/top.1:1301
 #, no-wrap
 msgid "\\ \\ \\ B<W>\\ \\ :I<Write-the-Configuration-File >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1164
+#: ../top/top.1:1307
 msgid ""
 "This will save all of your options and toggles plus the current display mode "
 "and delay time.  By issuing this command just before quitting \\*(We, you "
@@ -2416,25 +2656,25 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1165
+#: ../top/top.1:1308
 #, no-wrap
 msgid "\\ \\ \\ B<X>\\ \\ :I<Extra-Fixed-Width >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1170
+#: ../top/top.1:1313
 msgid ""
 "Some fields are fixed width and not scalable.  As such, they are subject to "
 "truncation which would be indicated by a `+' in the last position."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1172
+#: ../top/top.1:1315
 msgid "This \\*(CI can be used to alter the widths of the following fields:"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1182
+#: ../top/top.1:1325
 #, no-wrap
 msgid ""
 "   I< field  default    field  default    field  default >\n"
@@ -2448,14 +2688,14 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1187
+#: ../top/top.1:1330
 msgid ""
 "You will be prompted for the amount to be added to the default widths shown "
 "above.  Entering zero forces a return to those defaults."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1192
+#: ../top/top.1:1335
 msgid ""
 "If you enter a negative number, \\*(We will automatically increase the "
 "column size as needed until there is no more truncated data.  You can "
@@ -2464,7 +2704,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1196
+#: ../top/top.1:1339
 msgid ""
 "\\*(NT Whether explicitly or automatically increased, the widths for these "
 "fields are never decreased by \\*(We.  To narrow them you must specify a "
@@ -2472,13 +2712,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1197
+#: ../top/top.1:1340
 #, no-wrap
 msgid "\\ \\ \\ B<Y>\\ \\ :I<Inspect-Other-Output >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1203
+#: ../top/top.1:1346
 msgid ""
 "After issuing the `Y' \\*(CI, you will be prompted for a target PID.  Typing "
 "a value or accepting the default results in a separate screen.  That screen "
@@ -2487,7 +2727,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1207
+#: ../top/top.1:1350
 msgid ""
 "\\*(NT This \\*(CI is only fully realized when supporting entries have been "
 "manually added to the end of the \\*(We \\*(CF.  For details on creating "
@@ -2495,7 +2735,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1214
+#: ../top/top.1:1357
 msgid ""
 "Most of the keys used to navigate the Inspect feature are reflected in its "
 "header prologue.  There are, however, additional keys available once you "
@@ -2504,7 +2744,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1224
+#: ../top/top.1:1367
 #, no-wrap
 msgid ""
 "   I< key      function >\n"
@@ -2518,13 +2758,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1226
+#: ../top/top.1:1369
 #, no-wrap
 msgid "\\ \\ \\ B<Z>\\ \\ :I<Change-Color-Mapping >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1231
+#: ../top/top.1:1374
 msgid ""
 "This key will take you to a separate screen where you can change the colors "
 "for the \\*(CW, or for all windows.  For details regarding this \\*(CI "
@@ -2532,13 +2772,13 @@
 msgstr ""
 
 #. type: IP
-#: ../top/top.1:1232 ../top/top.1:1680
+#: ../top/top.1:1375 ../top/top.1:1823
 #, no-wrap
 msgid "*"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1235
+#: ../top/top.1:1378
 msgid ""
 "The commands shown with an \\*(AK are not available in Secure mode, nor will "
 "they be shown on the level-1 help screen."
@@ -2546,14 +2786,14 @@
 
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:1237
+#: ../top/top.1:1380
 #, no-wrap
 msgid "4b. SUMMARY AREA Commands"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:1242
+#: ../top/top.1:1385
 msgid ""
 "The \\*(SA \\*(CIs areB< always available> in both \\*(FM and \\*(AM.  They "
 "affect the beginning lines of your display and will determine the position "
@@ -2561,20 +2801,20 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1246
+#: ../top/top.1:1389
 msgid ""
 "These commands always impact just the \\*(CG.  \\*(XT 5. ALTERNATE-DISPLAY "
 "Provisions and the `g' \\*(CI for insight into \\*(CWs and \\*(FGs."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1247
+#: ../top/top.1:1390
 #, no-wrap
 msgid "\\ \\ \\ B<C>\\ \\ :I<Show-scroll-coordinates> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1252
+#: ../top/top.1:1395
 msgid ""
 "Toggle an informational message which is displayed whenever the message line "
 "is not otherwise being used.  For additional information \\*(Xt "
@@ -2582,26 +2822,26 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1253
+#: ../top/top.1:1396
 #, no-wrap
 msgid "\\ \\ \\ B<l>\\ \\ :I<Load-Average/Uptime> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1257
+#: ../top/top.1:1400
 msgid ""
 "This is also the line containing the program name (possibly an alias)  when "
 "operating in \\*(FM or the \\*(CW name when operating in \\*(AM."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1258
+#: ../top/top.1:1401
 #, no-wrap
 msgid "\\ \\ \\ B<t>\\ \\ :I<Task/Cpu-States> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1263
+#: ../top/top.1:1406
 msgid ""
 "This command affects from 2 to many \\*(SA lines, depending on the state of "
 "the `1', `2' or `3' \\*(CTs and whether or not \\*(We is running under true "
@@ -2609,19 +2849,19 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1266
+#: ../top/top.1:1409
 msgid ""
 "This portion of the \\*(SA is also influenced by the `H' \\*(CI toggle, as "
 "reflected in the total label which shows either Tasks or Threads."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1268 ../top/top.1:1285
+#: ../top/top.1:1411 ../top/top.1:1428
 msgid "This command serves as a 4-way toggle, cycling through these modes:"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1273
+#: ../top/top.1:1416
 #, no-wrap
 msgid ""
 "    1. detailed percentages by category\n"
@@ -2631,7 +2871,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1278
+#: ../top/top.1:1421
 msgid ""
 "When operating in either of the graphic modes, the display becomes much more "
 "meaningful when individual CPUs or NUMA nodes are also displayed.  \\*(XC "
@@ -2639,20 +2879,20 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1279
+#: ../top/top.1:1422
 #, no-wrap
 msgid "\\ \\ \\ B<m>\\ \\ :I<Memory/Swap-Usage> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1283
+#: ../top/top.1:1426
 msgid ""
 "This command affects the two \\*(SA lines dealing with physical and virtual "
 "memory."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1290
+#: ../top/top.1:1433
 #, no-wrap
 msgid ""
 "    1. detailed percentages by memory type\n"
@@ -2662,13 +2902,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1292
+#: ../top/top.1:1435
 #, no-wrap
 msgid "\\ \\ \\ B<1>\\ \\ :I<Single/Separate-Cpu-States> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1297
+#: ../top/top.1:1440
 msgid ""
 "This command affects how the `t' command's Cpu States portion is shown.  "
 "Although this toggle exists primarily to serve massively-parallel SMP "
@@ -2676,7 +2916,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1302
+#: ../top/top.1:1445
 msgid ""
 "When you see `%Cpu(s):' in the \\*(SA, the `1' toggle is \\*O and all \\*(Pu "
 "information is gathered in a single line.  Otherwise, each \\*(Pu is "
@@ -2684,13 +2924,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1303
+#: ../top/top.1:1446
 #, no-wrap
 msgid "\\ \\ \\ B<2>\\ \\ :I<NUMA-Nodes/Cpu-Summary> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1308
+#: ../top/top.1:1451
 msgid ""
 "This command toggles between the `1' command cpu summary display (only)  or "
 "a summary display plus the cpu usage statistics for each NUMA Node.  It is "
@@ -2698,13 +2938,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1309
+#: ../top/top.1:1452
 #, no-wrap
 msgid "\\ \\ \\ B<3>\\ \\ :I<Expand-NUMA-Node >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1315
+#: ../top/top.1:1458
 msgid ""
 "You will be invited to enter a number representing a NUMA Node.  Thereafter, "
 "a node summary plus the statistics for each cpu in that node will be shown "
@@ -2713,7 +2953,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1321
+#: ../top/top.1:1464
 msgid ""
 "\\*(NT If the entire \\*(SA has been toggled \\*F for any window, you would "
 "be left with just theB< message line>.  In that way, you will have maximized "
@@ -2723,19 +2963,19 @@
 
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:1323
+#: ../top/top.1:1466
 #, no-wrap
 msgid "4c. TASK AREA Commands"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:1326
+#: ../top/top.1:1469
 msgid "The \\*(TA \\*(CIs areB< always> available in \\*(FM."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1329
+#: ../top/top.1:1472
 msgid ""
 "The \\*(TA \\*(CIs areB< never available> in \\*(AMI< if> the \\*(CW's "
 "\\*(TD has been toggled \\*F (\\*(Xt 5. ALTERNATE-DISPLAY Provisions)."
@@ -2743,18 +2983,18 @@
 
 #.  ..................................................
 #. type: Plain text
-#: ../top/top.1:1333
+#: ../top/top.1:1476
 msgid "B<APPEARANCE> of \\*(TW"
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1334
+#: ../top/top.1:1477
 #, no-wrap
 msgid "\\ \\ \\ B<J>\\ \\ :I<Justify-Numeric-Columns> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1340
+#: ../top/top.1:1483
 msgid ""
 "Alternates between right-justified (the default) and left-justified numeric "
 "data.  If the numeric data completely fills the available column, this "
@@ -2762,13 +3002,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1341
+#: ../top/top.1:1484
 #, no-wrap
 msgid "\\ \\ \\ B<j>\\ \\ :I<Justify-Character-Columns> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1347
+#: ../top/top.1:1490
 msgid ""
 "Alternates between left-justified (the default) and right-justified "
 "character data.  If the character data completely fills the available "
@@ -2776,20 +3016,20 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1352
+#: ../top/top.1:1495
 msgid ""
 "The following commands will also be influenced by the state of the global "
 "`B' (bold enable) toggle."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1354
+#: ../top/top.1:1497
 #, no-wrap
 msgid "\\ \\ \\ B<b>\\ \\ :I<Bold/Reverse> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1359
+#: ../top/top.1:1502
 msgid ""
 "This command will impact how the `x' and `y' toggles are displayed.  It may "
 "also impact the \\*(SA when a bar graph has been selected for \\*(Pu states "
@@ -2797,13 +3037,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1360
+#: ../top/top.1:1503
 #, no-wrap
 msgid "\\ \\ \\ B<x>\\ \\ :I<Column-Highlight> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1368
+#: ../top/top.1:1511
 #, no-wrap
 msgid ""
 "Changes highlighting for the current sort field.\n"
@@ -2816,7 +3056,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1373
+#: ../top/top.1:1516
 msgid ""
 "\\*(NT Whenever Searching and/or Other Filtering is active in a window, "
 "column highlighting is temporarily disabled.  \\*(XC notes at the end of "
@@ -2824,13 +3064,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1374
+#: ../top/top.1:1517
 #, no-wrap
 msgid "\\ \\ \\ B<y>\\ \\ :I<Row-Highlight> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1379
+#: ../top/top.1:1522
 msgid ""
 "Changes highlighting for \"running\" tasks.  For additional insight into "
 "this task state, \\*(Xt 3a. DESCRIPTIONS of Fields, the `S' field (Process "
@@ -2838,20 +3078,20 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1382
+#: ../top/top.1:1525
 msgid ""
 "Use of this provision provides important insight into your system's health.  "
 "The only costs will be a few additional tty escape sequences."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1383
+#: ../top/top.1:1526
 #, no-wrap
 msgid "\\ \\ \\ B<z>\\ \\ :I<Color/Monochrome> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1389
+#: ../top/top.1:1532
 msgid ""
 "Switches the \\*(CW between your last used color scheme and the older form "
 "of black-on-white or white-on-black.  This command will alterB< both> the "
@@ -2861,18 +3101,18 @@
 
 #.  ..................................................
 #. type: Plain text
-#: ../top/top.1:1393
+#: ../top/top.1:1536
 msgid "B<CONTENT> of \\*(TW"
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1394
+#: ../top/top.1:1537
 #, no-wrap
 msgid "\\ \\ \\ B<c>\\ \\ :I<Command-Line/Program-Name> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1399
+#: ../top/top.1:1542
 msgid ""
 "This command will be honored whether or not the COMMAND column is currently "
 "visible.  Later, should that field come into view, the change you applied "
@@ -2880,13 +3120,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1400 ../top/top.1:1530
+#: ../top/top.1:1543 ../top/top.1:1673
 #, no-wrap
 msgid "\\ \\ \\ B<f> | B<F>\\ \\ :I<Fields-Management >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1406
+#: ../top/top.1:1549
 msgid ""
 "These keys display a separate screen where you can change which fields are "
 "displayed, their order and also designate the sort field.  For additional "
@@ -2894,13 +3134,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1407
+#: ../top/top.1:1550
 #, no-wrap
 msgid "\\ \\ \\ B<o> | B<O>\\ \\ :I<Other-Filtering >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1413
+#: ../top/top.1:1556
 msgid ""
 "You will be prompted for the selection criteria which then determines which "
 "tasks will be shown in the \\*(CW.  Your criteria can be made case sensitive "
@@ -2909,27 +3149,27 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1416
+#: ../top/top.1:1559
 msgid ""
 "\\*(XT 5e. FILTERING in a window for details on these and additional related "
 "\\*(CIs."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1417
+#: ../top/top.1:1560
 #, no-wrap
 msgid "\\ \\ \\ B<S>\\ \\ :I<Cumulative-Time-Mode> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1421
+#: ../top/top.1:1564
 msgid ""
 "When Cumulative mode is \\*O, each process is listed with the \\*(Pu time "
 "that it and its dead children have used."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1428
+#: ../top/top.1:1571
 msgid ""
 "When \\*F, programs that fork into many separate tasks will appear less "
 "demanding.  For programs like `init' or a shell this is appropriate but for "
@@ -2939,7 +3179,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1432
+#: ../top/top.1:1575
 msgid ""
 "After issuing this command, you'll be informed of the new state of this "
 "toggle.  If you wish to know in advance whether or not Cumulative mode is in "
@@ -2947,13 +3187,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1433
+#: ../top/top.1:1576
 #, no-wrap
 msgid "\\ \\ \\ B<u> | B<U>\\ \\ :I<Show-Specific-User-Only >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1438
+#: ../top/top.1:1581
 msgid ""
 "You will be prompted for theB< uid> orB< name> of the user to display.  The "
 "-u option matches on B< effective> user whereas the -U option matches onB< "
@@ -2961,7 +3201,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1443
+#: ../top/top.1:1586
 msgid ""
 "Thereafter, in that \\*(TW only matching users will be shown, or possibly no "
 "processes will be shown.  Prepending an exclamation point (`!') to the user "
@@ -2970,7 +3210,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1447
+#: ../top/top.1:1590
 msgid ""
 "Different \\*(TWs can be used to filter different users.  Later, if you wish "
 "to monitor all users again in the \\*(CW, re-issue this command but just "
@@ -2978,13 +3218,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1448
+#: ../top/top.1:1591
 #, no-wrap
 msgid "\\ \\ \\ B<V>\\ \\ :I<Forest-View-Mode> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1455
+#: ../top/top.1:1598
 msgid ""
 "In this mode, processes are reordered according to their parents and the "
 "layout of the COMMAND column resembles that of a tree.  In forest view mode "
@@ -2993,7 +3233,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1459
+#: ../top/top.1:1602
 msgid ""
 "\\*(NT Typing any key affecting the sort order will exit forest view mode in "
 "the \\*(CW.  \\*(XT 4c. TASK AREA Commands, SORTING for information on those "
@@ -3002,18 +3242,18 @@
 
 #.  ..................................................
 #. type: Plain text
-#: ../top/top.1:1463
+#: ../top/top.1:1606
 msgid "B<SIZE> of \\*(TW"
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1464
+#: ../top/top.1:1607
 #, no-wrap
 msgid "\\ \\ \\ B<i>\\ \\ :I<Idle-Process> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1472
+#: ../top/top.1:1615
 msgid ""
 "Displays all tasks or just active tasks.  When this toggle is \\*F, tasks "
 "that have not used any \\*(PU since the last update will not be displayed.  "
@@ -3022,7 +3262,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1475
+#: ../top/top.1:1618
 msgid ""
 "If this command is applied to the last \\*(TD when in \\*(AM, then it will "
 "not affect the window's size, as all prior \\*(TDs will have already been "
@@ -3030,20 +3270,20 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1476
+#: ../top/top.1:1619
 #, no-wrap
 msgid "\\ \\ \\ B<n> | B<#>\\ \\ :I<Set-Maximum-Tasks >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1480
+#: ../top/top.1:1623
 msgid ""
 "You will be prompted to enter the number of tasks to display.  The lessor of "
 "your number and available screen rows will be used."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1485
+#: ../top/top.1:1628
 msgid ""
 "When used in \\*(AM, this is the command that gives you precise control over "
 "the size of each currently visible \\*(TD, except for the very last.  It "
@@ -3052,7 +3292,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1488
+#: ../top/top.1:1631
 msgid ""
 "\\*(NT If you wish to increase the size of the last visible \\*(TD when in "
 "\\*(AM, simply decrease the size of the \\*(TD(s) above it."
@@ -3060,12 +3300,12 @@
 
 #.  ..................................................
 #. type: Plain text
-#: ../top/top.1:1492
+#: ../top/top.1:1635
 msgid "B<SORTING> of \\*(TW"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1497
+#: ../top/top.1:1640
 msgid ""
 "For compatibility, this \\*(We supports most of the former \\*(We sort "
 "keys.  Since this is primarily a service to former \\*(We users, these "
@@ -3073,7 +3313,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1504
+#: ../top/top.1:1647
 #, no-wrap
 msgid ""
 "     I< command   sorted-field                  supported >\n"
@@ -3085,7 +3325,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1509
+#: ../top/top.1:1652
 msgid ""
 "Before using any of the following sort provisions, \\*(We suggests that you "
 "temporarily turn on column highlighting using the `x' \\*(CI.  That will "
@@ -3093,7 +3333,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1515
+#: ../top/top.1:1658
 #, no-wrap
 msgid ""
 "The following \\*(CIs willB< only> be honored when the current sort field\n"
@@ -3104,40 +3344,40 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1516
+#: ../top/top.1:1659
 #, no-wrap
 msgid "\\ \\ \\ B<E<lt>>\\ \\ :I<Move-Sort-Field-Left >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1520
+#: ../top/top.1:1663
 msgid ""
 "Moves the sort column to the left unless the current sort field is the first "
 "field being displayed."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1521
+#: ../top/top.1:1664
 #, no-wrap
 msgid "\\ \\ \\ B<E<gt>>\\ \\ :I<Move-Sort-Field-Right >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1525
+#: ../top/top.1:1668
 msgid ""
 "Moves the sort column to the right unless the current sort field is the last "
 "field being displayed."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1529
+#: ../top/top.1:1672
 msgid ""
 "The following \\*(CIs willB< always> be honored whether or not the current "
 "sort field is visible."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1536
+#: ../top/top.1:1679
 msgid ""
 "These keys display a separate screen where you can change which field is "
 "used as the sort column, among other functions.  This can be a convenient "
@@ -3146,20 +3386,20 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1537
+#: ../top/top.1:1680
 #, no-wrap
 msgid "\\ \\ \\ B<R>\\ \\ :I<Reverse/Normal-Sort-Field> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1540
+#: ../top/top.1:1683
 msgid ""
 "Using this \\*(CI you can alternate between high-to-low and low-to-high "
 "sorts."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1544
+#: ../top/top.1:1687
 msgid ""
 "\\*(NT Field sorting uses internal values, not those in column display.  "
 "Thus, the TTY and WCHAN fields will violate strict ASCII collating sequence."
@@ -3167,14 +3407,14 @@
 
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:1547
+#: ../top/top.1:1690
 #, no-wrap
 msgid "4d. COLOR Mapping"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:1552
+#: ../top/top.1:1695
 msgid ""
 "When you issue the `Z' \\*(CI, you will be presented with a separate "
 "screen.  That screen can be used to change the colors in just the \\*(CW or "
@@ -3182,12 +3422,12 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1555
+#: ../top/top.1:1698
 msgid "The following \\*(CIs are available."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1566
+#: ../top/top.1:1709
 #, no-wrap
 msgid ""
 "    B<4> upper case letters to select aB< target >\n"
@@ -3203,7 +3443,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1572
+#: ../top/top.1:1715
 msgid ""
 "If you use `a' or `w' to cycle the targeted window, you will have applied "
 "the color scheme that was displayed when you left that window.  You can, of "
@@ -3212,7 +3452,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1577
+#: ../top/top.1:1720
 msgid ""
 "The Color Mapping screen can also be used to change the \\*(CG in either "
 "\\*(FM or \\*(AM.  Whatever was targeted when `q' or E<lt>EnterE<gt> was "
@@ -3221,7 +3461,7 @@
 
 #.  ----------------------------------------------------------------------
 #. type: SH
-#: ../top/top.1:1580
+#: ../top/top.1:1723
 #, no-wrap
 msgid "5. ALTERNATE-DISPLAY Provisions"
 msgstr ""
@@ -3229,19 +3469,19 @@
 #.  ----------------------------------------------------------------------
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:1583
+#: ../top/top.1:1726
 #, no-wrap
 msgid "5a. WINDOWS Overview"
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1585
+#: ../top/top.1:1728
 #, no-wrap
 msgid "B<Field Groups/Windows>:"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1592
+#: ../top/top.1:1735
 msgid ""
 "In \\*(FM there is a single window represented by the entire screen.  That "
 "single window can still be changed to display 1 of 4 differentB< field "
@@ -3251,14 +3491,14 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1595
+#: ../top/top.1:1738
 msgid ""
 "In \\*(AM, those 4 underlying \\*(FGs can now be made visible "
 "simultaneously, or can be turned \\*F individually at your command."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1600
+#: ../top/top.1:1743
 msgid ""
 "The \\*(SA will always exist, even if it's only the message line.  At any "
 "given time onlyI< one> \\*(SA can be displayed.  However, depending on your "
@@ -3267,13 +3507,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1602
+#: ../top/top.1:1745
 #, no-wrap
 msgid "B<Current Window>:"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1608
+#: ../top/top.1:1751
 msgid ""
 "The \\*(CW is the window associated with the \\*(SA and the window to which "
 "task related commands are always directed.  Since in \\*(AM you can toggle "
@@ -3281,7 +3521,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1613
+#: ../top/top.1:1756
 msgid ""
 "A further complication arises when you have toggled the first \\*(SA line "
 "\\*F.  With the loss of the window name (the `l' toggled line), you'll not "
@@ -3290,19 +3530,19 @@
 
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:1615
+#: ../top/top.1:1758
 #, no-wrap
 msgid "5b. COMMANDS for Windows"
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1617
+#: ../top/top.1:1760
 #, no-wrap
 msgid "\\ \\ \\ B<-> | B<_>\\ \\ :I<Show/Hide-Window(s)> toggles "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1624
+#: ../top/top.1:1767
 msgid ""
 "The `-' key turns the \\*(CW's \\*(TD \\*O and \\*F.  When \\*O, that \\*(TA "
 "will show a minimum of the columns header you've established with the `f' "
@@ -3311,7 +3551,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1630
+#: ../top/top.1:1773
 msgid ""
 "The `_' key does the same for all \\*(TDs.  In other words, it switches "
 "between the currently visible \\*(TD(s) and any \\*(TD(s) you had toggled "
@@ -3320,43 +3560,44 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1631
+#: ../top/top.1:1774
 #, no-wrap
 msgid "*\\ \\ B<=> | B<+>\\ \\ :I<Equalize-(reinitialize)-Window(s) >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1639
+#: ../top/top.1:1782
 msgid ""
 "The `=' key forces the \\*(CW's \\*(TD to be visible.  It also reverses any "
-"`i' (idle tasks), `n' (max tasks), `u/U' (user filter)  and `o/O' (other "
-"filter) commands that might be active.  Also, if the window had been "
-"scrolled, it will be reset with this command.  \\*(XT 5c. SCROLLING a Window "
-"for additional information regarding vertical and horizontal scrolling."
+"`i' (idle tasks), `n' (max tasks), `u/U' (user filter), \\`o/O' (other "
+"filter) and 'L' (locate) commands that might be active.  Also, if the window "
+"had been scrolled, it will be reset with this command.  \\*(XT 5c. SCROLLING "
+"a Window for additional information regarding vertical and horizontal "
+"scrolling."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1645
+#: ../top/top.1:1788
 msgid ""
 "The `+' key does the same for all windows.  The four \\*(TDs will reappear, "
 "evenly balanced.  They will also have retained any customizations you had "
 "previously applied, except for the `i' (idle tasks), `n' (max tasks), `u/U' "
-"(user filter), `o/O' (other filter) and scrolling \\*(CIs."
+"(user filter), `o/O' (other filter), `L' (locate) and scrolling \\*(CIs."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1646
+#: ../top/top.1:1789
 #, no-wrap
 msgid "*\\ \\ B<A>\\ \\ :I<Alternate-Display-Mode> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1649
+#: ../top/top.1:1792
 msgid "This command will switch between \\*(FM and \\*(AM."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1653
+#: ../top/top.1:1796
 msgid ""
 "The first time you issue this command, all four \\*(TDs will be shown.  "
 "Thereafter when you switch modes, you will see only the \\*(TD(s) you've "
@@ -3364,13 +3605,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1654
+#: ../top/top.1:1797
 #, no-wrap
 msgid "*\\ \\ B<a> | B<w>\\ \\ :I<Next-Window-Forward/Backward >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1660
+#: ../top/top.1:1803
 msgid ""
 "This will change the \\*(CW, which in turn changes the window to which "
 "commands are directed.  These keys act in a circular fashion so you can "
@@ -3378,7 +3619,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1664
+#: ../top/top.1:1807
 msgid ""
 "Assuming the window name is visible (you have not toggled `l' \\*F), "
 "whenever the \\*(CW name loses its emphasis/color, that's a reminder the "
@@ -3386,45 +3627,45 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1665
+#: ../top/top.1:1808
 #, no-wrap
 msgid "*\\ \\ B<g>\\ \\ :I<Choose-Another-Window/Field-Group >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1669
+#: ../top/top.1:1812
 msgid ""
 "You will be prompted to enter a number between 1 and 4 designating the "
 "\\*(FG which should be made the \\*(CW."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1673
+#: ../top/top.1:1816
 msgid ""
 "In \\*(FM, this command is necessary to alter the \\*(CW.  In \\*(AM, it is "
 "simply a less convenient alternative to the `a' and `w' commands."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1674
+#: ../top/top.1:1817
 #, no-wrap
 msgid "\\ \\ \\ B<G>\\ \\ :I<Change-Window/Field-Group-Name >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1679
+#: ../top/top.1:1822
 msgid ""
 "You will be prompted for a new name to be applied to the \\*(CW.  It does "
 "not require that the window name be visible (the `l' toggle to be \\*O)."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1682
+#: ../top/top.1:1825
 msgid "The \\*(CIs shown with an \\*(AK have use beyond \\*(AM."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1686
+#: ../top/top.1:1829
 #, no-wrap
 msgid ""
 "    =, A, g    are always available\n"
@@ -3434,14 +3675,14 @@
 
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:1689
+#: ../top/top.1:1832
 #, no-wrap
 msgid "5c. SCROLLING a Window"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:1695
+#: ../top/top.1:1838
 msgid ""
 "Typically a \\*(TW is a partial view into a systems's total tasks/threads "
 "which shows only some of the available fields/columns.  With these \\*(KSs, "
@@ -3450,13 +3691,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1696
+#: ../top/top.1:1839
 #, no-wrap
 msgid "B<Up>,B<PgUp>\\ \\ :I<Scroll-Tasks >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1702
+#: ../top/top.1:1845
 msgid ""
 "Move the view up toward the first task row, until the first task is "
 "displayed at the top of the \\*(CW.  The I<Up> \\*(KA moves a single line "
@@ -3464,13 +3705,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1703
+#: ../top/top.1:1846
 #, no-wrap
 msgid "B<Down>,B<PgDn>\\ \\ :I<Scroll-Tasks >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1709
+#: ../top/top.1:1852
 msgid ""
 "Move the view down toward the last task row, until the last task is the only "
 "task displayed at the top of the \\*(CW.  The I<Down> \\*(KA moves a single "
@@ -3478,18 +3719,18 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1710
+#: ../top/top.1:1853
 #, no-wrap
 msgid "B<Left>,B<Right>\\ \\ :I<Scroll-Columns >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1713
+#: ../top/top.1:1856
 msgid "Move the view of displayable fields horizontally one column at a time."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1718
+#: ../top/top.1:1861
 msgid ""
 "\\*(NT As a reminder, some fields/columns are not fixed-width but allocated "
 "all remaining screen width when visible.  When scrolling right or left, that "
@@ -3497,7 +3738,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1724
+#: ../top/top.1:1867
 msgid ""
 "Additionally, there are special provisions for any variable width field when "
 "positioned as the last displayed field.  Once that field is reached via the "
@@ -3507,31 +3748,31 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1725
+#: ../top/top.1:1868
 #, no-wrap
 msgid "B<Home>\\ \\ :I<Jump-to-Home-Position >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1728
+#: ../top/top.1:1871
 msgid "Reposition the display to the un-scrolled coordinates."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1729
+#: ../top/top.1:1872
 #, no-wrap
 msgid "B<End>\\ \\ :I<Jump-to-End-Position >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1733
+#: ../top/top.1:1876
 msgid ""
 "Reposition the display so that the rightmost column reflects the last "
 "displayable field and the bottom task row represents the last task."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1738
+#: ../top/top.1:1881
 msgid ""
 "\\*(NT From this position it is still possible to scrollI< down> andI< "
 "right> using the \\*(KAs.  This is true until a single column and a single "
@@ -3539,13 +3780,13 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1739
+#: ../top/top.1:1882
 #, no-wrap
 msgid "B<C>\\ \\ :I<Show-scroll-coordinates> toggle "
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1745
+#: ../top/top.1:1888
 msgid ""
 "Toggle an informational message which is displayed whenever the message line "
 "is not otherwise being used.  That message will take one of two forms "
@@ -3553,7 +3794,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1749
+#: ../top/top.1:1892
 #, no-wrap
 msgid ""
 "  B<scroll coordinates: y = n/n (tasks), x = n/n (fields)>\n"
@@ -3561,7 +3802,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1757
+#: ../top/top.1:1900
 msgid ""
 "The coordinates shown as B<n>/B<n> are relative to the upper left corner of "
 "the \\*(CW.  The additional `B<+\\ nn>' represents the displacement into a "
@@ -3571,26 +3812,26 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1759
+#: ../top/top.1:1902
 #, no-wrap
 msgid "B<y = n/n (tasks) >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1764
+#: ../top/top.1:1907
 msgid ""
 "The first B<n> represents the topmost visible task and is controlled by "
 "\\*(KSs.  The second B<n> is updated automatically to reflect total tasks."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1765
+#: ../top/top.1:1908
 #, no-wrap
 msgid "B<x = n/n (fields) >"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1771
+#: ../top/top.1:1914
 msgid ""
 "The first B<n> represents the leftmost displayed column and is controlled by "
 "\\*(KSs.  The second B<n> is the total number of displayable fields and is "
@@ -3598,14 +3839,14 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1776 ../top/top.1:1835
+#: ../top/top.1:1919 ../top/top.1:1978
 msgid ""
 "The above \\*(CIs areB< always> available in \\*(FM butB< never> available "
 "in \\*(AM if the \\*(CW's \\*(TD has been toggled \\*F."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1780
+#: ../top/top.1:1923
 msgid ""
 "\\*(NT When any form of filtering is active, you can expect some slight "
 "aberrations when scrolling since not all tasks will be visible.  This is "
@@ -3614,27 +3855,27 @@
 
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:1782
+#: ../top/top.1:1925
 #, no-wrap
 msgid "5d. SEARCHING in a Window"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:1785
+#: ../top/top.1:1928
 msgid ""
 "You can use these \\*(CIs to locate a task row containing a particular "
 "value."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1786
+#: ../top/top.1:1929
 #, no-wrap
 msgid "B<L>\\ \\ :I<Locate-a-string>"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1791
+#: ../top/top.1:1934
 msgid ""
 "You will be prompted for the case-sensitive string to locate starting from "
 "the current window coordinates.  There are no restrictions on search string "
@@ -3642,7 +3883,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1795
+#: ../top/top.1:1938
 msgid ""
 "Searches are not limited to values from a single field or column.  All of "
 "the values displayed in a task row are allowed in a search string.  You may "
@@ -3650,27 +3891,27 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1798
+#: ../top/top.1:1941
 msgid ""
 "Keying E<lt>EnterE<gt> with no input will effectively disable the `&' key "
 "until a new search string is entered."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1799
+#: ../top/top.1:1942
 #, no-wrap
 msgid "B<&>\\ \\ :I<Locate-next>"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1803
+#: ../top/top.1:1946
 msgid ""
 "Assuming a search string has been established, \\*(We will attempt to locate "
 "the next occurrence."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1810
+#: ../top/top.1:1953
 msgid ""
 "When a match is found, the current window is repositioned vertically so the "
 "task row containing that string is first.  The scroll coordinates message "
@@ -3679,58 +3920,58 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1813
+#: ../top/top.1:1956
 msgid ""
 "The availability of a matching string will be influenced by the following "
 "factors."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1814
+#: ../top/top.1:1957
 #, no-wrap
 msgid "a. Which fields are displayable from the total available,"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1817
+#: ../top/top.1:1960
 msgid "\\*(Xt 3b. MANAGING Fields."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1817
+#: ../top/top.1:1960
 #, no-wrap
 msgid "b. Scrolling a window vertically and/or horizontally,"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1820
+#: ../top/top.1:1963
 msgid "\\*(Xt 5c. SCROLLING a Window."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1820
+#: ../top/top.1:1963
 #, no-wrap
 msgid "c. The state of the command/command-line toggle,"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1823
+#: ../top/top.1:1966
 msgid "\\*(Xc `c' \\*(CI."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1823
+#: ../top/top.1:1966
 #, no-wrap
 msgid "d. The stability of the chosen sort column,"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1826
+#: ../top/top.1:1969
 msgid "for example PID is good but %CPU bad."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1832
+#: ../top/top.1:1975
 msgid ""
 "If a search fails, restoring the \\*(CW home (unscrolled) position, "
 "scrolling horizontally, displaying command-lines or choosing a more stable "
@@ -3738,7 +3979,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1841
+#: ../top/top.1:1984
 msgid ""
 "\\*(NT Whenever a Search is active in a window, \\*(We will turn column "
 "highlighting \\*F to prevent false matches on internal non-display escape "
@@ -3749,21 +3990,21 @@
 
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:1843
+#: ../top/top.1:1986
 #, no-wrap
 msgid "5e. FILTERING in a Window"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:1847
+#: ../top/top.1:1990
 msgid ""
 "You can use this Other Filter feature to establish selection criteria which "
 "will then determine which tasks are shown in the \\*(CW."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1853
+#: ../top/top.1:1996
 msgid ""
 "Establishing a filter requires: 1) a field name; 2) an operator; and 3) a "
 "selection value, as a minimum.  This is the most complex of \\*(We's user "
@@ -3773,60 +4014,60 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1855
+#: ../top/top.1:1998
 msgid "B<Filter Basics>"
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1856
+#: ../top/top.1:1999
 #, no-wrap
 msgid "1. field names are case sensitive and spelled as in the header"
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1858
+#: ../top/top.1:2001
 #, no-wrap
 msgid "2. selection values need not comprise the full displayed field"
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1860
+#: ../top/top.1:2003
 #, no-wrap
 msgid "3. a selection is either case insensitive or sensitive to case"
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1862
+#: ../top/top.1:2005
 #, no-wrap
 msgid "4. the default is inclusion, prepending `!' denotes exclusions"
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1864
+#: ../top/top.1:2007
 #, no-wrap
 msgid "5. multiple selection criteria can be applied to a \\*(TW"
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1866
+#: ../top/top.1:2009
 #, no-wrap
 msgid "6. inclusion and exclusion criteria can be used simultaneously"
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1868
+#: ../top/top.1:2011
 #, no-wrap
 msgid "7. the 1 equality and 2 relational filters can be freely mixed"
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1870
+#: ../top/top.1:2013
 #, no-wrap
 msgid "8. separate unique filters are maintained for each \\*(TW"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1878
+#: ../top/top.1:2021
 msgid ""
 "If a field is not turned on or is not currently in view, then your selection "
 "criteria will not affect the display.  Later, should a filtered field become "
@@ -3834,42 +4075,42 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1882
+#: ../top/top.1:2025
 msgid "B<Keyboard Summary>"
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1882
+#: ../top/top.1:2025
 #, no-wrap
 msgid "\\ \\ B<o>\\ \\ :I<Other-Filter> (lower case)"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1886
+#: ../top/top.1:2029
 msgid ""
 "You will be prompted to establish a filter that B<ignores case> when "
 "matching."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1887
+#: ../top/top.1:2030
 #, no-wrap
 msgid "\\ \\ B<O>\\ \\ :I<Other-Filter> (upper case)"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1890
+#: ../top/top.1:2033
 msgid "You will be prompted to establish a B<case sensitive> filter."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1891
+#: ../top/top.1:2034
 #, no-wrap
 msgid "\\ B<^O>\\ \\ :I<Show-Active-Filters> (Ctrl key + `o')"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1895
+#: ../top/top.1:2038
 msgid ""
 "This can serve as a reminder of which filters are active in the \\*(CW.  A "
 "summary will be shown on the message line until you press the "
@@ -3877,26 +4118,26 @@
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1896
+#: ../top/top.1:2039
 #, no-wrap
 msgid "\\ \\ B<=>\\ \\ :I<Reset-Filtering> in current window"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1900
+#: ../top/top.1:2043
 msgid ""
 "This clears all of your selection criteria in the \\*(CW.  It also has "
 "additional impact so please \\*(Xt 4a. GLOBAL Commands."
 msgstr ""
 
 #. type: TP
-#: ../top/top.1:1901
+#: ../top/top.1:2044
 #, no-wrap
 msgid "\\ \\ B<+>\\ \\ :I<Reset-Filtering> in all windows"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1906
+#: ../top/top.1:2049
 msgid ""
 "This clears the selection criteria in all windows, assuming you are in "
 "\\*(AM.  As with the `=' \\*(CI, it too has additional consequences so you "
@@ -3904,12 +4145,12 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1910
+#: ../top/top.1:2053
 msgid "B<Input Requirements>"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1916
+#: ../top/top.1:2059
 msgid ""
 "When prompted for selection criteria, the data you provide must take one of "
 "two forms.  There are 3 required pieces of information, with a 4th as "
@@ -3918,7 +4159,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1921
+#: ../top/top.1:2064
 #, no-wrap
 msgid ""
 "        #1           B<#2>  #3              ( required )\n"
@@ -3928,7 +4169,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1926
+#: ../top/top.1:2069
 msgid ""
 "Items #1, #3 and #4 should be self-explanatory.  Item B<#2> represents both "
 "a required I<delimiter> and the I<operator> which must be one of either "
@@ -3936,7 +4177,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1935
+#: ../top/top.1:2078
 msgid ""
 "The `=' equality operator requires only a partial match and that can reduce "
 "your `if-value' input requirements.  The `E<gt>' or `E<lt>' relational "
@@ -3947,7 +4188,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1942
+#: ../top/top.1:2085
 msgid ""
 "If you establish a relational filter and you B<have> changed the default "
 "Numeric or Character I<justification>, that filter is likely to fail.  When "
@@ -3958,7 +4199,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1946
+#: ../top/top.1:2089
 msgid ""
 "If your filtered results appear suspect, simply altering justification or "
 "scaling may yet achieve the desired objective.  See the `j', `J' and `e' "
@@ -3966,19 +4207,19 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1950
+#: ../top/top.1:2093
 msgid "B<Potential Problems>"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1954
+#: ../top/top.1:2097
 msgid ""
 "These B<GROUP> filters could produce the exact same results or the second "
 "one might not display anything at all, just a blank \\*(TW."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1957
+#: ../top/top.1:2100
 #, no-wrap
 msgid ""
 "     GROUP=root        ( only the same results when )\n"
@@ -3986,7 +4227,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1962
+#: ../top/top.1:2105
 msgid ""
 "Either of these B<RES> filters might yield inconsistent and/or misleading "
 "results, depending on the current memory scaling factor.  Or both filters "
@@ -3994,7 +4235,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1965
+#: ../top/top.1:2108
 #, no-wrap
 msgid ""
 "     RESE<gt>9999          ( only the same results when )\n"
@@ -4002,7 +4243,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1971
+#: ../top/top.1:2114
 msgid ""
 "This B<nMin> filter illustrates a problem unique to scalable fields.  This "
 "particular field can display a maximum of 4 digits, beyond which values are "
@@ -4011,18 +4252,18 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1973
+#: ../top/top.1:2116
 #, no-wrap
 msgid "     nMinE<gt>9999         ( always a blank \\*(TW )\n"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1978
+#: ../top/top.1:2121
 msgid "B<Potential Solutions>"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1985
+#: ../top/top.1:2128
 msgid ""
 "These examples illustrate how Other Filtering can be creatively applied to "
 "achieve almost any desired result.  Single quotes are sometimes shown to "
@@ -4032,7 +4273,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1990
+#: ../top/top.1:2133
 msgid ""
 "Assuming field B<nTH> is displayed, the first filter will result in only "
 "multi-threaded processes being shown.  It also reminds us that a trailing "
@@ -4041,7 +4282,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1993
+#: ../top/top.1:2136
 #, no-wrap
 msgid ""
 "     !nTH=` 1 '                ( ' for clarity only )\n"
@@ -4049,20 +4290,20 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1997
+#: ../top/top.1:2140
 msgid ""
 "With Forest View mode active and the B<COMMAND> column in view, this filter "
 "effectively collapses child processes so that just 3 levels are shown."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:1999
+#: ../top/top.1:2142
 #, no-wrap
 msgid "     !COMMAND=`       `- '     ( ' for clarity only )\n"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2007
+#: ../top/top.1:2150
 msgid ""
 "The final two filters appear as in response to the status request key (^O).  "
 "In reality, each filter would have required separate input.  The B<PR> "
@@ -4073,7 +4314,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2010
+#: ../top/top.1:2153
 #, no-wrap
 msgid ""
 "     `PRE<gt>20' + `!PR=-'         ( 2 for right result )\n"
@@ -4081,7 +4322,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2019
+#: ../top/top.1:2162
 msgid ""
 "\\*(NT Whenever Other Filtering is active in a window, \\*(We will turn "
 "column highlighting \\*F to prevent false matches on internal non-display "
@@ -4092,7 +4333,7 @@
 
 #.  ----------------------------------------------------------------------
 #. type: SH
-#: ../top/top.1:2022
+#: ../top/top.1:2165
 #, no-wrap
 msgid "6. FILES"
 msgstr ""
@@ -4100,14 +4341,14 @@
 #.  ----------------------------------------------------------------------
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:2025
+#: ../top/top.1:2168
 #, no-wrap
 msgid "6a. SYSTEM Configuration File"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:2032
+#: ../top/top.1:2175
 msgid ""
 "The presence of this file will influence which version of the help screen is "
 "shown to an ordinary user.  More importantly, it will limit what ordinary "
@@ -4116,7 +4357,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2036
+#: ../top/top.1:2179
 #, no-wrap
 msgid ""
 "    k        Kill a task\n"
@@ -4125,7 +4366,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2043
+#: ../top/top.1:2186
 msgid ""
 "The system \\*(CF isB< not> created by \\*(We.  Rather, you create this file "
 "manually and place it in the I</etc > directory.  Its name must be `toprc' "
@@ -4133,12 +4374,12 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2045
+#: ../top/top.1:2188
 msgid "Here is an example of the contents ofI< /etc/toprc>:"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2048
+#: ../top/top.1:2191
 #, no-wrap
 msgid ""
 "    s        # line 1: secure mode switch\n"
@@ -4147,26 +4388,26 @@
 
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:2051
+#: ../top/top.1:2194
 #, no-wrap
 msgid "6b. PERSONAL Configuration File"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:2055
+#: ../top/top.1:2198
 msgid ""
 "This file is written as `$HOME/.your-name-4-\\*(We' + `rc'.  Use the `W' "
 "\\*(CI to create it or update it."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2057
+#: ../top/top.1:2200
 msgid "Here is the general layout:"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2067
+#: ../top/top.1:2210
 #, no-wrap
 msgid ""
 "    global   # line  1: the program name/alias notation\n"
@@ -4181,7 +4422,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2071
+#: ../top/top.1:2214
 msgid ""
 "If the $HOME variable is not present, \\*(We will try to write the personal "
 "\\*(CF to the current directory, subject to permissions."
@@ -4189,14 +4430,14 @@
 
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:2073
+#: ../top/top.1:2216
 #, no-wrap
 msgid "6c. ADDING INSPECT Entries"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:2080
+#: ../top/top.1:2223
 msgid ""
 "To exploit the `Y' \\*(CI, you must add entries at theB< end> of the \\*(We "
 "personal \\*(CF.  Such entries simply reflect a file to be read or "
@@ -4205,14 +4446,14 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2083
+#: ../top/top.1:2226
 msgid ""
 "If you don't know the location or name of your \\*(We rcfile, use the `W' "
 "\\*(CI to rewrite it and note those details."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2089
+#: ../top/top.1:2232
 msgid ""
 "Inspect entries can be added with a redirected echo or by editing the "
 "\\*(CF.  Redirecting an echo risks overwriting the rcfile should it replace "
@@ -4222,7 +4463,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2094
+#: ../top/top.1:2237
 msgid ""
 "Those Inspect entries beginning with a `#' character are ignored, regardless "
 "of content.  Otherwise they consist of the following 3 elements, each of "
@@ -4230,7 +4471,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2099
+#: ../top/top.1:2242
 #, no-wrap
 msgid ""
 "  .type:  literal `file' or `pipe'\n"
@@ -4239,7 +4480,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2106
+#: ../top/top.1:2249
 msgid ""
 "The two types of Inspect entries areI< not> interchangeable.  Those "
 "designated `B<file>' will be accessed using fopen and must reference a "
@@ -4249,7 +4490,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2110
+#: ../top/top.1:2253
 msgid ""
 "If the file or pipeline represented in your `.fmts' deals with the specific "
 "PID input or accepted when prompted, then the format string must also "
@@ -4257,7 +4498,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2114
+#: ../top/top.1:2257
 #, no-wrap
 msgid ""
 "  .fmts=  /proc/I<%d>/numa_maps\n"
@@ -4265,20 +4506,20 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2119
+#: ../top/top.1:2262
 msgid ""
 "For `B<pipe>' type entries only, you may also wish to redirect stderr to "
 "stdout for a more comprehensive result.  Thus the format string becomes:"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2122
+#: ../top/top.1:2265
 #, no-wrap
 msgid "  .fmts=  pmap -x %dI< 2E<gt>&1>\n"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2129
+#: ../top/top.1:2272
 msgid ""
 "Here are examples of both types of Inspect entries as they might appear in "
 "the rcfile.  The first entry will be ignored due to the initial `#' "
@@ -4287,7 +4528,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2135
+#: ../top/top.1:2278
 #, no-wrap
 msgid ""
 "  # pipe ^I Sockets ^I lsof -n -P -i 2E<gt>&1\n"
@@ -4297,7 +4538,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2142
+#: ../top/top.1:2285
 msgid ""
 "Except for the commented entry above, these next examples show what could be "
 "echoed to achieve similar results, assuming the rcfile name was `.toprc'.  "
@@ -4307,7 +4548,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2147
+#: ../top/top.1:2290
 #, no-wrap
 msgid ""
 "  \"pipe\\etOpen Files\\etlsof -P -p %d 2E<gt>&1\" E<gt>E<gt> ~/.toprc\n"
@@ -4317,7 +4558,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2155
+#: ../top/top.1:2298
 msgid ""
 "B<Caution>: If any inspect entry you create produces output with unprintable "
 "characters they will be displayed in either the ^C notation or hexadecimal "
@@ -4327,7 +4568,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2161
+#: ../top/top.1:2304
 #, no-wrap
 msgid ""
 "  # next would have contained `\\et' ...\n"
@@ -4337,14 +4578,14 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2165
+#: ../top/top.1:2308
 msgid ""
 "The above example takes what could have been a `file' entry but employs a "
 "`pipe' instead so as to expand the embedded tabs."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2170
+#: ../top/top.1:2313
 msgid ""
 "\\*(NT While `B<pipe>' type entries have been discussed in terms of "
 "pipelines and commands, there is nothing to prevent you from including I< "
@@ -4353,7 +4594,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2174
+#: ../top/top.1:2317
 msgid ""
 "Lastly, as the number of your Inspect entries grows over time, the "
 "`Options:' row will be truncated when screen width is exceeded.  That does "
@@ -4361,14 +4602,14 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2177
+#: ../top/top.1:2320
 msgid ""
 "However, if some choices are lost to truncation but you want to see more "
 "options, there is an easy solution hinted at below."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2182
+#: ../top/top.1:2325
 #, no-wrap
 msgid ""
 "  Inspection Pause at pid ...\n"
@@ -4377,7 +4618,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2188
+#: ../top/top.1:2331
 msgid ""
 "The entries in the \\*(We rcfile would have a number for the `.name' element "
 "and the `help' entry would identify a shell script you've written explaining "
@@ -4387,14 +4628,14 @@
 
 #.  ----------------------------------------------------------------------
 #. type: SH
-#: ../top/top.1:2192
+#: ../top/top.1:2334
 #, no-wrap
 msgid "7. STUPID TRICKS Sampler"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:2197
+#: ../top/top.1:2339
 msgid ""
 "Many of these tricks work best when you give \\*(We a scheduling boost.  So "
 "plan on starting him with a nice value of -10, assuming you've got the "
@@ -4403,7 +4644,7 @@
 
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:2199
+#: ../top/top.1:2341
 #, no-wrap
 msgid "7a. Kernel Magic"
 msgstr ""
@@ -4412,12 +4653,12 @@
 #.  sorry, just can't help it -- don't ya love the sound of this?
 #.  ( apparently AM static was a potential concern )
 #. type: Plain text
-#: ../top/top.1:2204
+#: ../top/top.1:2346
 msgid "For these stupid tricks, \\*(We needs \\*(FM."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2211
+#: ../top/top.1:2353
 msgid ""
 "The user interface, through prompts and help, intentionally implies that the "
 "delay interval is limited to tenths of a second.  However, you're free to "
@@ -4426,14 +4667,14 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2214
+#: ../top/top.1:2356
 msgid ""
 "For this experiment, under x-windows open an xterm and maximize it.  Then do "
 "the following:"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2223
+#: ../top/top.1:2365
 #, no-wrap
 msgid ""
 "  . provide a scheduling boost and tiny delay via:\n"
@@ -4447,14 +4688,14 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2227
+#: ../top/top.1:2369
 msgid ""
 "What you'll see is a very busy Linux doing what he's always done for you, "
 "but there was no program available to illustrate this."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2233
+#: ../top/top.1:2375
 msgid ""
 "Under an xterm using `white-on-black' colors, on \\*(We's Color Mapping "
 "screen set the task color to black and be sure that task highlighting is set "
@@ -4462,14 +4703,14 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2236
+#: ../top/top.1:2378
 msgid ""
 "After bringing the most active processes into view, what you'll see are the "
 "ghostly images of just the currently running tasks."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2242
+#: ../top/top.1:2384
 msgid ""
 "Delete the existing rcfile, or create a new symlink.  Start this new version "
 "then type `T' (a secret key, \\*(Xt 4c. Task Area Commands, SORTING) "
@@ -4478,7 +4719,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2247
+#: ../top/top.1:2389
 msgid ""
 "Your display will be refreshed at three times the rate of the former \\*(We, "
 "a 300% speed advantage.  As \\*(We climbs the TIME ladder, be as patient as "
@@ -4488,19 +4729,19 @@
 
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:2249
+#: ../top/top.1:2391
 #, no-wrap
 msgid "7b. Bouncing Windows"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:2252
+#: ../top/top.1:2394
 msgid "For these stupid tricks, \\*(We needs \\*(AM."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2258
+#: ../top/top.1:2400
 msgid ""
 "With 3 or 4 \\*(TDs visible, pick any window other than the last and turn "
 "idle processes \\*F using the `i' \\*(CT.  Depending on where you applied "
@@ -4509,7 +4750,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2264
+#: ../top/top.1:2406
 msgid ""
 "Set each window's summary lines differently: one with no memory (`m'); "
 "another with no states (`t'); maybe one with nothing at all, just the "
@@ -4518,7 +4759,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2269
+#: ../top/top.1:2411
 msgid ""
 "Display all 4 windows and for each, in turn, set idle processes to \\*F "
 "using the `i' \\*(CT.  You've just entered the \"extreme bounce\" zone."
@@ -4526,19 +4767,19 @@
 
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:2271
+#: ../top/top.1:2413
 #, no-wrap
 msgid "7c. The Big Bird Window"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:2274
+#: ../top/top.1:2416
 msgid "This stupid trick also requires \\*(AM."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2279
+#: ../top/top.1:2421
 msgid ""
 "Display all 4 windows and make sure that 1:Def is the \\*(CW.  Then, keep "
 "increasing window size with the `n' \\*(CI until all the other \\*(TDs are "
@@ -4546,35 +4787,35 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2283
+#: ../top/top.1:2425
 msgid ""
 "When they've all been displaced, toggle between all visible/invisible "
 "windows using the `_' \\*(CT.  Then ponder this:"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2285
+#: ../top/top.1:2427
 #, no-wrap
 msgid "   is \\*(We fibbing or telling honestly your imposed truth?\n"
 msgstr ""
 
 #.  ......................................................................
 #. type: SS
-#: ../top/top.1:2287
+#: ../top/top.1:2429
 #, no-wrap
 msgid "7d. The Ol' Switcheroo"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:2291
+#: ../top/top.1:2433
 msgid ""
 "This stupid trick works best without \\*(AM, since justification is active "
 "on a per window basis."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2296
+#: ../top/top.1:2438
 msgid ""
 "Start \\*(We and make COMMAND the last (rightmost) column displayed.  If "
 "necessary, use the `c' \\*(CT to display command lines and ensure that "
@@ -4582,7 +4823,7 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2300
+#: ../top/top.1:2442
 msgid ""
 "Then use the up/down arrow keys to position the display so that some "
 "truncated command lines are shown (`+' in last position).  You may have to "
@@ -4590,12 +4831,12 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2302
+#: ../top/top.1:2444
 msgid "Lastly, use the `j' \\*(CT to make the COMMAND column right justified."
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2306
+#: ../top/top.1:2448
 msgid ""
 "Now use the right arrow key to reach the COMMAND column.  Continuing with "
 "the right arrow key, watch closely the direction of travel for the command "
@@ -4603,106 +4844,41 @@
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2309
+#: ../top/top.1:2451
 #, no-wrap
 msgid "   some lines travel left, while others travel right\n"
 msgstr ""
 
 #. type: Plain text
-#: ../top/top.1:2311
+#: ../top/top.1:2453
 #, no-wrap
 msgid "   eventually all lines will Switcheroo, and move right\n"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: SH
-#: ../top/top.1:2315
+#: ../top/top.1:2457
 #, no-wrap
 msgid "8. BUGS"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:2319
-#, no-wrap
-msgid ""
-"To report bugs, follow the instructions at:\n"
-"    http://www.debian.org/Bugs/Reporting\n"
-msgstr ""
-
-#.  ----------------------------------------------------------------------
-#. type: SH
-#: ../top/top.1:2321
-#, no-wrap
-msgid "9. HISTORY Former top"
-msgstr ""
-
-#.  ----------------------------------------------------------------------
-#. type: Plain text
-#: ../top/top.1:2325
-msgid ""
-"The original \\*(We was written by Roger Binns, based on Branko Lankester's "
-"E<lt>lankeste@fwi.uva.nlE<gt> ps program."
-msgstr ""
-
-#. type: Plain text
-#: ../top/top.1:2328
-msgid ""
-"Robert Nation E<lt>nation@rocket.sanders.lockheed.comE<gt> adapted it for "
-"the proc file system."
-msgstr ""
-
-#. type: Plain text
-#: ../top/top.1:2331
-msgid ""
-"Helmut Geyer E<lt>Helmut.Geyer@iwr.uni-heidelberg.deE<gt> added support for "
-"configurable fields."
-msgstr ""
-
-#. type: Plain text
-#: ../top/top.1:2333
-msgid "Plus many other individuals contributed over the years."
-msgstr ""
-
-#.  ----------------------------------------------------------------------
-#. type: SH
-#: ../top/top.1:2335
-#, no-wrap
-msgid "10. AUTHOR"
-msgstr ""
-
-#.  ----------------------------------------------------------------------
-#. type: Plain text
-#: ../top/top.1:2339
-#, no-wrap
-msgid ""
-"This entirely new and enhanced replacement was written by:\n"
-"    Jim Warner, E<lt>james.warner@comcast.netE<gt>\n"
-msgstr ""
-
-#.  Craig Small. <csmall-procps@enc.com.au>
-#.  Craig Small, <csmall@debian.org>
-#.  Craig Small, <csmall@small.dropbear.id.au>
-#. type: Plain text
-#: ../top/top.1:2351
-#, no-wrap
-msgid ""
-"With invaluable help from:\n"
-"    Craig Small, E<lt>csmall@enc.com.auE<gt>\n"
-"    Albert Cahalan, E<lt>albert@users.sf.netE<gt>\n"
+#: ../top/top.1:2462
+msgid "Please send bug reports to E<.UR procps@freelists.org> E<.UE .>"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: SH
-#: ../top/top.1:2353
+#: ../top/top.1:2464
 #, no-wrap
-msgid "11. SEE Also"
+msgid "9. SEE Also"
 msgstr ""
 
 #.  ----------------------------------------------------------------------
 #. type: Plain text
-#: ../top/top.1:2361
+#: ../top/top.1:2472
 msgid ""
 "B<free>(1), B<ps>(1), B<uptime>(1), B<atop>(1), B<slabtop>(1), B<vmstat>(8), "
-"B<w>(1)."
+"B<w>(1)"
 msgstr ""
diff -Nru procps-3.3.11/man-po/uk/man1/watch.1 procps-3.3.12/man-po/uk/man1/watch.1
--- procps-3.3.11/man-po/uk/man1/watch.1	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/man-po/uk/man1/watch.1	2016-07-10 06:40:26.000000000 +0000
@@ -3,17 +3,17 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH WATCH 1 "червень 2011 року" procps\-ng "Команди користувача"
+.TH WATCH 1 2016\-06\-03 procps\-ng "Команди користувача"
 .SH НАЗВА
 watch — програма для періодичного виконання інших програм з виведенням даних
 на весь екран
 .SH "КОРОТКИЙ ОПИС"
 \fBwatch\fP [\fIпараметри\fP] \fIкоманда\fP
 .SH ОПИС
-\fBwatch\fP виконує \fIкоманду\fP регулярно, показує виведені нею дані та
-повідомлення щодо помилок (перший екран). За \fBwatch\fP ви зможете
-спостерігати за змінами у виведених даних із часом. Типово, запуск програми
-відбуватиметься кожні 2 секунди, аж доки роботу \fBwatch\fP не буде перервано.
+\fBwatch\fP runs \fIcommand\fP repeatedly, displaying its output and errors (the
+first screenfull).  This allows you to watch the program output change over
+time.  By default, \fIcommand\fP is run every 2 seconds and \fBwatch\fP will run
+until interrupted.
 .SH ПАРАМЕТРИ
 .TP 
 \fB\-d\fP, \fB\-\-differences\fP [\fIpermanent\fP]
@@ -23,8 +23,9 @@
 запуску.
 .TP 
 \fB\-n\fP, \fB\-\-interval\fP \fIчисло\fP
-Визначити інтервал між запусками. Найменшим є інтервал у 0,1 секунди. Якщо
-ви вкажете менше значення, використовуватиметься інтервал у 0,1 секунди.
+Specify update interval.  The command will not allow quicker than 0.1 second
+interval, in which the smaller values are converted. Both '.' and ',' work
+for any locales.
 .TP 
 \fB\-p\fP, \fB\-\-precise\fP
 Наказати \fBwatch\fP запускати \fIcommand\fP кожні \fIінтервал\fP секунд. Спробуйте з
@@ -60,11 +61,70 @@
 .TP 
 \fB\-v\fP, \fB\-\-version\fP
 Вивести дані щодо версії і завершити роботу.
+.SH "СТАН ВИХОДУ"
+.PP
+.RS
+.PD 0
+.TP 
+\fB0\fP
+Успіх.
+.TP 
+\fB1\fP
+Різноманітні помилки.
+.TP 
+\fB2\fP
+Відгалуження процесу для спостереження зазнало невдачі.
+.TP 
+\fB3\fP
+Не вдалося замінити стандартне виведення дочірнього процесу на канал
+стороннього запису.
+.TP 
+\fB4\fP
+Помилка під час виконання команди.
+.TP 
+\fB5\fP
+Відгалуження процесу для спостереження зазнало невдачі.
+.TP 
+\fB7\fP
+Спроба створення каналу IPC зазнала невдачі.
+.TP 
+\fB8\fP
+Спроба отримання значення виходу дочірнього процесу за допомогою
+\fBwaitpid\fP(2) зазнала невдачі або команда завершила роботу повідомлення про
+помилку.
+.TP 
+\fBінший\fP
+watch передасть стан виходу команди як стан виходу дочірнього процесу.
 .SH ЗАУВАЖЕННЯ
-Зауважте, що використовується спосіб обробки параметрів POSIX (тобто обробка
-параметрів завершується на першому з аргументів, який не є параметром). Це
-означає, що параметри після \fIкоманди\fP не оброблятимуться самою програмою
-\fBwatch\fP.
+POSIX option processing is used (i.e., option processing stops at the first
+non\-option argument).  This means that flags after \fIcommand\fP don't get
+interpreted by \fBwatch\fP itself.
+.SH ВАДИ
+Після зміни розмірів вікна термінала, дані не буде належним чином
+переформатовано до наступного запланованого оновлення. Також буде втрачено
+усі позначення, отримані за допомогою параметра \fB\-\-differences\fP.
+
+Непридатні до виведення символи буде усунуто із даних, виведених
+програмою. Якщо ви хочете побачити ці символи, скористайтеся «cat \-v» у
+послідовності команд, створеній за допомогою символу каналу (|).
+
+Символи поєднання, які мало бути показано на позиції у останньому стовпчику
+на екрані, може бути показано на стовпчик раніше або взагалі не показано.
+
+Символи поєднання ніколи не враховуються під час визначення відмінностей,
+якщо використано параметр \fI\-\-differences\fP. До уваги беруться лише основні
+символи.
+
+Порожні рядки, розташовані безпосередньо після рядка, що завершує останній
+стовпчик, не буде показано.
+
+У режимі \fI\-\-precise\fP ще не передбачено технології розширеного викривлення
+часу для компенсації проблем із \fIкомандою\fP, виконання якої триває понад
+\fIінтервал\fP секунд. Крім того, \fBwatch\fP може перейти у режим, коли програма
+швидко намагається запустити якомога більше екземплярів \fIкоманди\fP для того,
+щоб «наздогнати» план за попередніми запусками, виконання яких тривало понад
+\fIінтервал\fP секунд (наприклад, виконання команди \fBnetstat\fP під час пошуку у
+DNS може тривати дуже довго).
 .SH ПРИКЛАДИ
 .PP
 Для спостереження за надходженням пошти можна скористатися такою командою:
@@ -102,93 +162,3 @@
 (Зауважте, що роботу з \fI\-p\fP під час перезавантаження не гарантовано,
 особливо з врахуванням використання \fBntpdate\fP та інших механізмів зміни
 часових даних.)
-.SH ВАДИ
-Після зміни розмірів вікна термінала, дані не буде належним чином
-переформатовано до наступного запланованого оновлення. Також буде втрачено
-усі позначення, отримані за допомогою параметра \fB\-\-differences\fP.
-.PP
-Непридатні до виведення символи буде усунуто із даних, виведених
-програмою. Якщо ви хочете побачити ці символи, скористайтеся «cat \-v» у
-послідовності команд, створеній за допомогою символу каналу (|).
-.PP
-Символи поєднання, які мало бути показано на позиції у останньому стовпчику
-на екрані, може бути показано на стовпчик раніше або взагалі не показано.
-.PP
-Символи поєднання ніколи не враховуються під час визначення відмінностей,
-якщо використано параметр \fI\-\-differences\fP. До уваги беруться лише основні
-символи.
-.PP
-Порожні рядки, розташовані безпосередньо після рядка, що завершує останній
-стовпчик, не буде показано.
-.PP
-У режимі \fI\-\-precise\fP ще не передбачено технології розширеного викривлення
-часу для компенсації проблем із \fIкомандою\fP, виконання якої триває понад
-\fIінтервал\fP секунд. Крім того, \fBwatch\fP може перейти у режим, коли програма
-швидко намагається запустити якомога більше екземплярів \fIкоманди\fP для того,
-щоб «наздогнати» план за попередніми запусками, виконання яких тривало понад
-\fIінтервал\fP секунд (наприклад, виконання команди \fBnetstat\fP під час пошуку у
-DNS може тривати дуже довго).
-.SH "СТАН ВИХОДУ"
-.PP
-.RS
-.PD 0
-.TP 
-\fB0\fP
-Успіх.
-.TP 
-\fB1\fP
-Різноманітні помилки.
-.TP 
-\fB2\fP
-Відгалуження процесу для спостереження зазнало невдачі.
-.TP 
-\fB3\fP
-Не вдалося замінити стандартне виведення дочірнього процесу на канал
-стороннього запису.
-.TP 
-\fB4\fP
-Помилка під час виконання команди.
-.TP 
-\fB5\fP
-Відгалуження процесу для спостереження зазнало невдачі.
-.TP 
-\fB7\fP
-Спроба створення каналу IPC зазнала невдачі.
-.TP 
-\fB8\fP
-Спроба отримання значення виходу дочірнього процесу за допомогою
-\fBwaitpid\fP(2) зазнала невдачі або команда завершила роботу повідомлення про
-помилку.
-.TP 
-\fBінший\fP
-watch передасть стан виходу команди як стан виходу дочірнього процесу.
-.SH АВТОРИ
-Початкову версію \fBwatch\fP було створено
-.UR rembo@\:unisoft.\:com
-Tony
-Rems
-.UE
-у 1991 році. Модифікації та виправлення цієї версії було
-зроблено Francois Pinard. Програму було перероблено з додаванням нових
-можливостей
-.UR mkc@\:acm.\:org
-Mike Coleman
-.UE
-у 1999 році. Обробку
-параметрів beep, exec та помилок було додано
-.UR morty@\:frakir.\:org
-Morty Abzug
-.UE
-у 2008 році.  Не дуже темної ночі та буремного ранку у
-березні 2003 року
-.UR asd@\:suespammers.\:org
-Anthony DeRobertis
-.UE
-,
-якого бісило те, що його годинники, значення на яких мало оновлюватися
-щохвилини, оновлювали значення за багато секунд після початку хвилини, додав
-рівень точності у мікросекунди. Підтримку Unicode було реалізовано у 2009
-році
-.UR procps@\:rrod.\:net
-Jarrod Lowe
-.UE
diff -Nru procps-3.3.11/man-po/zh_CN/man1/pkill.1 procps-3.3.12/man-po/zh_CN/man1/pkill.1
--- procps-3.3.11/man-po/zh_CN/man1/pkill.1	1970-01-01 00:00:00.000000000 +0000
+++ procps-3.3.12/man-po/zh_CN/man1/pkill.1	2016-07-10 06:40:26.000000000 +0000
@@ -0,0 +1 @@
+.so man1/pgrep.1
diff -Nru procps-3.3.11/man-po/zh_CN.po procps-3.3.12/man-po/zh_CN.po
--- procps-3.3.11/man-po/zh_CN.po	1970-01-01 00:00:00.000000000 +0000
+++ procps-3.3.12/man-po/zh_CN.po	2016-07-10 06:40:26.000000000 +0000
@@ -0,0 +1,3316 @@
+# procps-ng manpages in zh_CN
+# Copyright (C) 2015 Free Software Foundation, Inc.
+# This file is distributed under the same license as the procps-ng package.
+# Mingye Wang <arthur200126@gmail.com>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: procps-ng-man 3.3.10-rc3\n"
+"POT-Creation-Date: 2014-09-16 19:45+0300\n"
+"PO-Revision-Date: 2015-10-30 09:26-0400\n"
+"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.4\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. type: TH
+#: free.1:5
+#, no-wrap
+msgid "FREE"
+msgstr "FREE"
+
+#. type: TH
+#: free.1:5
+#, no-wrap
+msgid "July 2014"
+msgstr ""
+
+#. type: TH
+#: free.1:5 kill.1:8 pgrep.1:5 pmap.1:8 pwdx.1:6 skill.1:9 slabtop.1:5
+#: sysctl.8:9 sysctl.conf.5:9 tload.1:4 uptime.1:3 vmstat.8:3 w.1:3 watch.1:1
+#, no-wrap
+msgid "procps-ng"
+msgstr "procps-ng"
+
+#. type: TH
+#: free.1:5 kill.1:8 pgrep.1:5 pidof.1:18 pmap.1:8 pwdx.1:6 skill.1:9
+#: slabtop.1:5 tload.1:4 uptime.1:3 w.1:3 watch.1:1
+#, no-wrap
+msgid "User Commands"
+msgstr "用户命令"
+
+#. type: SH
+#: free.1:6 kill.1:9 pgrep.1:6 pidof.1:19 pmap.1:9 pwdx.1:7 skill.1:10
+#: slabtop.1:6 sysctl.8:10 sysctl.conf.5:10 tload.1:5 uptime.1:4 vmstat.8:4
+#: w.1:4 watch.1:2
+#, no-wrap
+msgid "NAME"
+msgstr "名称"
+
+#. type: Plain text
+#: free.1:8
+msgid "free - Display amount of free and used memory in the system"
+msgstr ""
+
+#. type: SH
+#: free.1:8 kill.1:11 pgrep.1:8 pidof.1:21 pmap.1:11 pwdx.1:9 skill.1:12
+#: slabtop.1:8 sysctl.8:12 tload.1:7 uptime.1:6 vmstat.8:6 w.1:6 watch.1:4
+#, no-wrap
+msgid "SYNOPSIS"
+msgstr "摘要"
+
+#. type: Plain text
+#: free.1:11
+msgid "B<free> [I<options>]"
+msgstr ""
+
+#. type: SH
+#: free.1:11 kill.1:14 pgrep.1:14 pidof.1:32 pmap.1:14 skill.1:22 slabtop.1:11
+#: sysctl.8:18 sysctl.conf.5:12 tload.1:10 uptime.1:9 vmstat.8:10 w.1:9
+#: watch.1:7
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr "描述"
+
+#. type: Plain text
+#: free.1:17
+msgid "B<free> displays the total amount of free and used physical and swap memory in the system, as well as the buffers and caches used by the kernel. The information is gathered by parsing /proc/meminfo. The displayed columns are:"
+msgstr ""
+
+#. type: TP
+#: free.1:17
+#, no-wrap
+msgid "B<total>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:20
+msgid "Total installed memory (MemTotal and SwapTotal in /proc/meminfo)"
+msgstr ""
+
+#. type: TP
+#: free.1:20
+#, no-wrap
+msgid "B<used>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:23
+msgid "Used memory (calculated as B<total> - B<free> - B<buffers> - B<cache>)"
+msgstr ""
+
+#. type: TP
+#: free.1:23
+#, no-wrap
+msgid "B<free>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:26
+msgid "Unused memory (MemFree and SwapFree in /proc/meminfo)"
+msgstr ""
+
+#. type: TP
+#: free.1:26
+#, no-wrap
+msgid "B<shared>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:30
+msgid "Memory used (mostly) by tmpfs (Shmem in /proc/meminfo, available on kernels 2.6.32, displayed as zero if not available)"
+msgstr ""
+
+#. type: TP
+#: free.1:30
+#, no-wrap
+msgid "B<buffers>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:33
+msgid "Memory used by kernel buffers (Buffers in /proc/meminfo)"
+msgstr ""
+
+#. type: TP
+#: free.1:33
+#, no-wrap
+msgid "B<cache>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:36
+msgid "Memory used by the page cache and slabs (Cached and Slab in /proc/meminfo)"
+msgstr ""
+
+#. type: TP
+#: free.1:36
+#, no-wrap
+msgid "B<buff/cache>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:39
+msgid "Sum of B<buffers> and B<cache>"
+msgstr ""
+
+#. type: TP
+#: free.1:39
+#, no-wrap
+msgid "B<available>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:48
+msgid "Estimation of how much memory is available for starting new applications, without swapping. Unlike the data provided by the B<cache> or B<free> fields, this field takes into account page cache and also that not all reclaimable memory slabs will be reclaimed due to items being in use (MemAvailable in /proc/meminfo, available on kernels 3.14, emulated on kernels 2.6.27+, otherwise the same as B<free>)"
+msgstr ""
+
+#. type: SH
+#: free.1:48 kill.1:30 pgrep.1:39 pidof.1:36 pmap.1:16 pwdx.1:12 skill.1:35
+#: slabtop.1:16 tload.1:15 uptime.1:26 vmstat.8:19 watch.1:17
+#, no-wrap
+msgid "OPTIONS"
+msgstr "选项"
+
+#. type: TP
+#: free.1:49
+#, no-wrap
+msgid "B<-b>, B<--bytes>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:52
+msgid "Display the amount of memory in bytes."
+msgstr ""
+
+#. type: TP
+#: free.1:52
+#, no-wrap
+msgid "B<-k>, B<--kilo>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:55
+msgid "Display the amount of memory in kilobytes.  This is the default."
+msgstr ""
+
+#. type: TP
+#: free.1:55
+#, no-wrap
+msgid "B<-m>, B<--mega>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:58
+msgid "Display the amount of memory in megabytes."
+msgstr ""
+
+#. type: TP
+#: free.1:58
+#, no-wrap
+msgid "B<-g>, B<--giga>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:61
+msgid "Display the amount of memory in gigabytes."
+msgstr ""
+
+#. type: TP
+#: free.1:61
+#, no-wrap
+msgid "B<--tera>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:64
+msgid "Display the amount of memory in terabytes."
+msgstr ""
+
+#. type: TP
+#: free.1:64
+#, no-wrap
+msgid "B<-h>, B<--human>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:68
+msgid "Show all output fields automatically scaled to shortest three digit unit and display the units of print out.  Following units are used."
+msgstr ""
+
+#. type: Plain text
+#: free.1:75
+#, no-wrap
+msgid ""
+"  B = bytes\n"
+"  K = kilos\n"
+"  M = megas\n"
+"  G = gigas\n"
+"  T = teras\n"
+msgstr ""
+
+#. type: Plain text
+#: free.1:79
+msgid "If unit is missing, and you have petabyte of RAM or swap, the number is in terabytes and columns might not be aligned with header."
+msgstr ""
+
+#. type: TP
+#: free.1:79 vmstat.8:79
+#, no-wrap
+msgid "B<-w>, B<--wide>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:84
+msgid "Switch to the wide mode. The wide mode produces lines longer than 80 characters. In this mode B<buffers> and B<cache> are reported in two separate columns."
+msgstr ""
+
+#. type: TP
+#: free.1:84
+#, no-wrap
+msgid "B<-c>, B<--count> I<count>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:91
+msgid "Display the result I<count> times.  Requires the B<-s> option."
+msgstr ""
+
+#. type: TP
+#: free.1:91
+#, no-wrap
+msgid "B<-l>, B<--lohi>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:94
+msgid "Show detailed low and high memory statistics."
+msgstr ""
+
+#. type: TP
+#: free.1:94
+#, no-wrap
+msgid "B<-s>, B<--seconds> I<seconds>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:102
+msgid "Continuously display the result delay I<seconds> apart.  You may actually specify any floating point number for I<delay>, B<usleep>(3)  is used for microsecond resolution delay times."
+msgstr ""
+
+#. type: TP
+#: free.1:102
+#, no-wrap
+msgid "B<--si>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:105
+msgid "Use power of 1000 not 1024."
+msgstr ""
+
+#. type: TP
+#: free.1:105
+#, no-wrap
+msgid "B<-t>, B<--total>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:108
+msgid "Display a line showing the column totals."
+msgstr ""
+
+#. type: TP
+#: free.1:108 w.1:48
+#, no-wrap
+msgid "B<--help>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:111
+msgid "Print help."
+msgstr ""
+
+#. type: TP
+#: free.1:111 pgrep.1:157 pmap.1:59 pwdx.1:13 skill.1:61 slabtop.1:35
+#: sysctl.8:122 tload.1:28 uptime.1:36 vmstat.8:84 w.1:54
+#, no-wrap
+msgid "B<-V>, B<--version>"
+msgstr ""
+
+#. type: Plain text
+#: free.1:114 skill.1:64 w.1:57
+msgid "Display version information."
+msgstr ""
+
+#. type: SH
+#: free.1:115 slabtop.1:76 sysctl.8:151 sysctl.conf.5:44 tload.1:32
+#: uptime.1:39 vmstat.8:199 w.1:70
+#, no-wrap
+msgid "FILES"
+msgstr "文件"
+
+#. type: TP
+#: free.1:116
+#, no-wrap
+msgid "/proc/meminfo"
+msgstr ""
+
+#. type: Plain text
+#: free.1:119
+msgid "memory information"
+msgstr ""
+
+#. type: SH
+#: free.1:120 kill.1:72 pgrep.1:231 pidof.1:58 pmap.1:77 pwdx.1:19 skill.1:102
+#: slabtop.1:80 sysctl.8:155 sysctl.conf.5:63 tload.1:35 uptime.1:56
+#: vmstat.8:206 w.1:77
+#, no-wrap
+msgid "SEE ALSO"
+msgstr "参见"
+
+#. type: Plain text
+#: free.1:125
+msgid "B<ps>(1), B<slabtop>(1), B<top>(1), B<vmstat>(8)."
+msgstr ""
+
+#. type: SH
+#: free.1:125 slabtop.1:95 tload.1:48 uptime.1:46 vmstat.8:216 w.1:84
+#: watch.1:184
+#, no-wrap
+msgid "AUTHORS"
+msgstr "作者"
+
+#. type: Plain text
+#: free.1:127
+msgid "Written by Brian Edmonds."
+msgstr ""
+
+#. type: SH
+#: free.1:127 kill.1:90 pgrep.1:248 pmap.1:82 pwdx.1:29 skill.1:118
+#: slabtop.1:101 sysctl.8:162 sysctl.conf.5:69 tload.1:56 uptime.1:61
+#: vmstat.8:226 w.1:94
+#, no-wrap
+msgid "REPORTING BUGS"
+msgstr "报告缺陷"
+
+#. type: Plain text
+#: kill.1:8 pgrep.1:5 pidof.1:18 pwdx.1:6 skill.1:9 slabtop.1:5 snice.1:1
+#: sysctl.conf.5:9 tload.1:4 uptime.1:3 vmstat.8:3 w.1:3 watch.1:1
+msgid "Please send bug reports to E<.UR procps@freelists.org> E<.UE>"
+msgstr ""
+
+#. type: TH
+#: kill.1:8
+#, no-wrap
+msgid "KILL"
+msgstr ""
+
+#. type: TH
+#: kill.1:8 skill.1:9
+#, no-wrap
+msgid "October 2011"
+msgstr ""
+
+#. type: Plain text
+#: kill.1:11
+msgid "kill - send a signal to a process"
+msgstr ""
+
+#. type: Plain text
+#: kill.1:14
+msgid "B<kill> [options] E<lt>pidE<gt> [...]"
+msgstr ""
+
+#. type: Plain text
+#: kill.1:30
+msgid "The default signal for kill is TERM.  Use B<-l> or B<-L> to list available signals.  Particularly useful signals include HUP, INT, KILL, STOP, CONT, and 0.  Alternate signals may be specified in three ways: B<-9>, B<-SIGKILL> or B<-KILL>.  Negative PID values may be used to choose whole process groups; see the PGID column in ps command output.  A PID of B<-1> is special; it indicates all processes except the kill process itself and init."
+msgstr ""
+
+#. type: TP
+#: kill.1:31
+#, no-wrap
+msgid "B<E<lt>pidE<gt> [...]>"
+msgstr ""
+
+#. type: Plain text
+#: kill.1:34
+msgid "Send signal to every E<lt>pidE<gt> listed."
+msgstr ""
+
+#. type: TP
+#: kill.1:34
+#, no-wrap
+msgid "B<-E<lt>signalE<gt>>"
+msgstr ""
+
+#. type: TQ
+#: kill.1:36
+#, no-wrap
+msgid "B<-s E<lt>signalE<gt>>"
+msgstr ""
+
+#. type: TQ
+#: kill.1:38
+#, no-wrap
+msgid "B<--signal E<lt>signalE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: kill.1:46
+msgid "Specify the B<signal> to be sent.  The signal can be specified by using name or number.  The behavior of signals is explained in B<signal>(7)  manual page."
+msgstr ""
+
+#. type: TP
+#: kill.1:46
+#, no-wrap
+msgid "B<-l>, B<--list> [I<signal>]"
+msgstr ""
+
+#. type: Plain text
+#: kill.1:50
+msgid "List signal names.  This option has optional argument, which will convert signal number to signal name, or other way round."
+msgstr ""
+
+#. type: TP
+#: kill.1:50 skill.1:45
+#, no-wrap
+msgid "B<-L>,B<\\ --table>"
+msgstr ""
+
+#. type: Plain text
+#: kill.1:53
+msgid "List signal names in a nice table."
+msgstr ""
+
+#. type: SH
+#: kill.1:55 pgrep.1:208 slabtop.1:85 vmstat.8:184
+#, no-wrap
+msgid "NOTES"
+msgstr "备注"
+
+#. type: Plain text
+#: kill.1:59
+msgid "Your shell (command line interpreter) may have a built-in kill command.  You may need to run the command described here as /bin/kill to solve the conflict."
+msgstr ""
+
+#. type: SH
+#: kill.1:59 pgrep.1:169 skill.1:92 sysctl.8:125 watch.1:79
+#, no-wrap
+msgid "EXAMPLES"
+msgstr "示例"
+
+#. type: TP
+#: kill.1:60
+#, no-wrap
+msgid "B<kill -9 -1>"
+msgstr ""
+
+#. type: Plain text
+#: kill.1:63
+msgid "Kill all processes you can kill."
+msgstr ""
+
+#. type: TP
+#: kill.1:63
+#, no-wrap
+msgid "B<kill -l 11>"
+msgstr ""
+
+#. type: Plain text
+#: kill.1:66
+msgid "Translate number 11 into a signal name."
+msgstr ""
+
+#. type: TP
+#: kill.1:66
+#, no-wrap
+msgid "B<kill -L>"
+msgstr ""
+
+#. type: Plain text
+#: kill.1:69
+msgid "List the available signal choices in a nice table."
+msgstr ""
+
+#. type: TP
+#: kill.1:69
+#, no-wrap
+msgid "B<kill 123 543 2341 3453>"
+msgstr ""
+
+#. type: Plain text
+#: kill.1:72
+msgid "Send the default signal, SIGTERM, to all those processes."
+msgstr ""
+
+#. type: Plain text
+#: kill.1:80
+msgid "B<kill>(2), B<killall>(1), B<nice>(1), B<pkill>(1), B<renice>(1), B<signal>(7), B<skill>(1)"
+msgstr ""
+
+#. type: SH
+#: kill.1:80 pgrep.1:239 pmap.1:80 pwdx.1:22 skill.1:110
+#, no-wrap
+msgid "STANDARDS"
+msgstr "标准"
+
+#. type: Plain text
+#: kill.1:84
+msgid "This command meets appropriate standards. The B<-L> flag is Linux-specific."
+msgstr ""
+
+#. type: SH
+#: kill.1:84 pgrep.1:244 pidof.1:61 pwdx.1:24 skill.1:112 sysctl.8:158
+#: sysctl.conf.5:65
+#, no-wrap
+msgid "AUTHOR"
+msgstr "作者"
+
+#. type: Plain text
+#: kill.1:90
+msgid "E<.UR albert@users.sf.net> Albert Cahalan E<.UE> wrote kill in 1999 to replace a bsdutils one that was not standards compliant.  The util-linux one might also work correctly."
+msgstr ""
+
+#. type: TH
+#: pgrep.1:5
+#, no-wrap
+msgid "PGREP"
+msgstr ""
+
+#. type: TH
+#: pgrep.1:5
+#, no-wrap
+msgid "October 2012"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:8
+msgid "pgrep, pkill - look up or signal processes based on name and other attributes"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:11
+msgid "B<pgrep> [options] pattern"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:14
+msgid "B<pkill> [options] pattern"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:19
+msgid "B<pgrep> looks through the currently running processes and lists the process IDs which match the selection criteria to stdout.  All the criteria have to match.  For example,"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:21
+msgid "$ pgrep -u root sshd"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:27
+msgid "will only list the processes called B<sshd> AND owned by B<root>.  On the other hand,"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:29
+msgid "$ pgrep -u root,daemon"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:34
+msgid "will list the processes owned by B<root> OR B<daemon>."
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:39
+msgid "B<pkill> will send the specified signal (by default B<SIGTERM>)  to each process instead of listing them on stdout."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:40
+#, no-wrap
+msgid "B<->I<signal>"
+msgstr ""
+
+#. type: TQ
+#: pgrep.1:42
+#, no-wrap
+msgid "B<--signal> I<signal>"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:48
+msgid "Defines the signal to send to each matched process.  Either the numeric or the symbolic signal name can be used.  (B<pkill> only.)"
+msgstr ""
+
+#. type: TP
+#: pgrep.1:48
+#, no-wrap
+msgid "B<-c>, B<--count>"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:53
+msgid "Suppress normal output; instead print a count of matching processes.  When count does not match anything, e.g. returns zero, the command will return non-zero value."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:53
+#, no-wrap
+msgid "B<-d>, B<--delimiter> I<delimiter>"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:59
+msgid "Sets the string used to delimit each process ID in the output (by default a newline).  (B<pgrep> only.)"
+msgstr ""
+
+#. type: TP
+#: pgrep.1:59
+#, no-wrap
+msgid "B<-f>, B<--full>"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:66
+msgid "The I<pattern> is normally only matched against the process name.  When B<-f> is set, the full command line is used."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:66
+#, no-wrap
+msgid "B<-g>, B<--pgroup> I<pgrp>,..."
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:74
+msgid "Only match processes in the process group IDs listed.  Process group 0 is translated into B<pgrep>'s or B<pkill>'s own process group."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:74
+#, no-wrap
+msgid "B<-G>, B<--group> I<gid>,..."
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:78
+msgid "Only match processes whose real group ID is listed.  Either the numerical or symbolical value may be used."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:78
+#, no-wrap
+msgid "B<-l>, B<--list-name>"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:83
+msgid "List the process name as well as the process ID.  (B<pgrep> only.)"
+msgstr ""
+
+#. type: TP
+#: pgrep.1:83
+#, no-wrap
+msgid "B<-a>, B<--list-full>"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:88
+msgid "List the full command line as well as the process ID.  (B<pgrep> only.)"
+msgstr ""
+
+#. type: TP
+#: pgrep.1:88
+#, no-wrap
+msgid "B<-n>, B<--newest>"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:91
+msgid "Select only the newest (most recently started) of the matching processes."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:91
+#, no-wrap
+msgid "B<-o>, B<--oldest>"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:94
+msgid "Select only the oldest (least recently started) of the matching processes."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:94
+#, no-wrap
+msgid "B<-P>, B<--parent> I<ppid>,..."
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:97
+msgid "Only match processes whose parent process ID is listed."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:97
+#, no-wrap
+msgid "B<-s>, B<--session> I<sid>,..."
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:105
+msgid "Only match processes whose process session ID is listed.  Session ID 0 is translated into B<pgrep>'s or B<pkill>'s own session ID."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:105
+#, no-wrap
+msgid "B<-t>, B<--terminal> I<term>,..."
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:109
+msgid "Only match processes whose controlling terminal is listed.  The terminal name should be specified without the \"/dev/\" prefix."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:109
+#, no-wrap
+msgid "B<-u>, B<--euid> I<euid>,..."
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:113
+msgid "Only match processes whose effective user ID is listed.  Either the numerical or symbolical value may be used."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:113
+#, no-wrap
+msgid "B<-U>, B<--uid> I<uid>,..."
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:117
+msgid "Only match processes whose real user ID is listed.  Either the numerical or symbolical value may be used."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:117
+#, no-wrap
+msgid "B<-v>, B<--inverse>"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:124
+msgid "Negates the matching.  This option is usually used in B<pgrep>'s context.  In B<pkill>'s context the short option is disabled to avoid accidental usage of the option."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:124
+#, no-wrap
+msgid "B<-w>, B<--lightweight>"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:131
+msgid "Shows all thread ids instead of pids in B<pgrep>'s context.  In B<pkill>'s context this option is disabled."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:131
+#, no-wrap
+msgid "B<-x>, B<--exact>"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:137
+msgid "Only match processes whose names (or command line if -f is specified)  B<exactly> match the I<pattern>."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:137
+#, no-wrap
+msgid "B<-F>, B<--pidfile> I<file>"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:145
+msgid "Read I<PID>'s from file.  This option is perhaps more useful for B<pkill> than B<pgrep>."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:145
+#, no-wrap
+msgid "B<-L>, B<--logpidfile>"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:148
+msgid "Fail if pidfile (see -F) not locked."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:148 skill.1:80
+#, no-wrap
+msgid "B<--ns >I<pid>"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:153
+msgid "Match processes that belong to the same namespaces. Required to run as root to match processes from other users. See --nslist for how to limit which namespaces to match."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:153
+#, no-wrap
+msgid "B<--nslist >I<name>B<,...>"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:157
+msgid "Match only the provided namespaces. Available namespaces: ipc, mnt, net, pid, user,uts."
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:160 pmap.1:62 slabtop.1:38 sysctl.8:125 tload.1:31 vmstat.8:87
+#: watch.1:72
+msgid "Display version information and exit."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:160 pmap.1:56 pwdx.1:16 skill.1:58 slabtop.1:38 sysctl.8:119
+#: tload.1:25 uptime.1:30 vmstat.8:87 watch.1:66
+#, no-wrap
+msgid "B<-h>, B<--help>"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:163 vmstat.8:90
+msgid "Display help and exit."
+msgstr ""
+
+#. type: SH
+#: pgrep.1:164
+#, no-wrap
+msgid "OPERANDS"
+msgstr ""
+
+#. type: TP
+#: pgrep.1:165
+#, no-wrap
+msgid "I<pattern>"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:169
+msgid "Specifies an Extended Regular Expression for matching against the process names or command lines."
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:173
+msgid "Example 1: Find the process ID of the B<named> daemon:"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:175
+msgid "$ pgrep -u root named"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:179
+msgid "Example 2: Make B<syslog> reread its configuration file:"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:181
+msgid "$ pkill -HUP syslogd"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:185
+msgid "Example 3: Give detailed information on all B<xterm> processes:"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:187
+msgid "$ ps -fp $(pgrep -d, -x xterm)"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:191
+msgid "Example 4: Make all B<netscape> processes run nicer:"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:193
+msgid "$ renice +4 $(pgrep netscape)"
+msgstr ""
+
+#. type: SH
+#: pgrep.1:193 pidof.1:50 pmap.1:62 watch.1:151
+#, no-wrap
+msgid "EXIT STATUS"
+msgstr "退出状态"
+
+#. type: TP
+#: pgrep.1:195
+#, no-wrap
+msgid "0"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:198
+msgid "One or more processes matched the criteria."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:198
+#, no-wrap
+msgid "1"
+msgstr "1"
+
+#. type: Plain text
+#: pgrep.1:201
+msgid "No processes matched."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:201
+#, no-wrap
+msgid "2"
+msgstr "2"
+
+#. type: Plain text
+#: pgrep.1:204
+msgid "Syntax error in the command line."
+msgstr ""
+
+#. type: TP
+#: pgrep.1:204
+#, no-wrap
+msgid "3"
+msgstr "3"
+
+#. type: Plain text
+#: pgrep.1:207
+msgid "Fatal error: out of memory etc."
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:212
+msgid "The process name used for matching is limited to the 15 characters present in the output of /proc/I<pid>/stat.  Use the -f option to match against the complete command line, /proc/I<pid>/cmdline."
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:219
+msgid "The running B<pgrep> or B<pkill> process will never report itself as a match."
+msgstr ""
+
+#. type: SH
+#: pgrep.1:219 tload.1:40 vmstat.8:214 watch.1:116
+#, no-wrap
+msgid "BUGS"
+msgstr "错误"
+
+#. type: Plain text
+#: pgrep.1:228
+msgid "The options B<-n> and B<-o> and B<-v> can not be combined.  Let me know if you need to do this."
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:230
+msgid "Defunct processes are reported."
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:239
+msgid "B<ps>(1), B<regex>(7), B<signal>(7), B<killall>(1), B<skill>(1), B<kill>(1), B<kill>(2)"
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:244
+msgid "B<pkill> and B<pgrep> were introduced in Sun's Solaris 7.  This implementation is fully compatible."
+msgstr ""
+
+#. type: Plain text
+#: pgrep.1:248
+msgid "E<.UR kjetilho@ifi.uio.no> Kjetil Torgrim Homme E<.UE>"
+msgstr ""
+
+#. type: TH
+#: pidof.1:18
+#, no-wrap
+msgid "PIDOF"
+msgstr ""
+
+#. type: TH
+#: pidof.1:18
+#, no-wrap
+msgid "24 Jul 2013"
+msgstr ""
+
+#. type: Plain text
+#: pidof.1:21
+msgid "pidof -- find the process ID of a running program."
+msgstr ""
+
+#. type: Plain text
+#: pidof.1:32
+msgid "B<pidof> [B<-s>] [B<-c>] [B<-x>] [B<-o> I<omitpid[,omitpid..]>] [B<-o> I<omitpid[,omitpid..]..>] B<program> [B<program..>]"
+msgstr ""
+
+#. type: Plain text
+#: pidof.1:36
+msgid "B<Pidof> finds the process id's (pids) of the named programs. It prints those id's on the standard output."
+msgstr ""
+
+#. type: IP
+#: pidof.1:37
+#, no-wrap
+msgid "-s"
+msgstr ""
+
+#. type: Plain text
+#: pidof.1:39
+msgid "Single shot - this instructs the program to only return one I<pid>."
+msgstr ""
+
+#. type: IP
+#: pidof.1:39
+#, no-wrap
+msgid "-c"
+msgstr ""
+
+#. type: Plain text
+#: pidof.1:43
+msgid "Only return process ids that are running with the same root directory.  This option is ignored for non-root users, as they will be unable to check the current root directory of processes they do not own."
+msgstr ""
+
+#. type: IP
+#: pidof.1:43
+#, no-wrap
+msgid "-x"
+msgstr ""
+
+#. type: Plain text
+#: pidof.1:46
+msgid "Scripts too - this causes the program to also return process id's of shells running the named scripts."
+msgstr ""
+
+#. type: IP
+#: pidof.1:46
+#, no-wrap
+msgid "-o I<omitpid>"
+msgstr ""
+
+#. type: Plain text
+#: pidof.1:50
+msgid "Tells I<pidof> to omit processes with that process id. The special pid B<%PPID> can be used to name the parent process of the I<pidof> program, in other words the calling shell or shell script."
+msgstr ""
+
+#. type: TP
+#: pidof.1:51 pmap.1:66 watch.1:155
+#, no-wrap
+msgid "B<0>"
+msgstr ""
+
+#. type: Plain text
+#: pidof.1:54
+msgid "At least one program was found with the requested name."
+msgstr ""
+
+#. type: TP
+#: pidof.1:54 pmap.1:69 watch.1:158
+#, no-wrap
+msgid "B<1>"
+msgstr ""
+
+#. type: Plain text
+#: pidof.1:57
+msgid "No program was found with the requested name."
+msgstr ""
+
+#. type: Plain text
+#: pidof.1:61
+msgid "B<pgrep>(1), B<pkill>(1)"
+msgstr ""
+
+#. type: Plain text
+#: pkill.1:1
+msgid "Jaromir Capik E<lt>jcapik@redhat.comE<gt>"
+msgstr ""
+
+#. type: TH
+#: pmap.1:8
+#, no-wrap
+msgid "PMAP"
+msgstr ""
+
+#. type: TH
+#: pmap.1:8
+#, no-wrap
+msgid "September 2012"
+msgstr ""
+
+#. type: Plain text
+#: pmap.1:11
+msgid "pmap - report memory map of a process"
+msgstr ""
+
+#. type: Plain text
+#: pmap.1:14
+msgid "B<pmap> [I<options>] I<pid> [...]"
+msgstr ""
+
+#. type: Plain text
+#: pmap.1:16
+msgid "The pmap command reports the memory map of a process or processes."
+msgstr ""
+
+#. type: TP
+#: pmap.1:17
+#, no-wrap
+msgid "B<-x>, B<--extended>"
+msgstr ""
+
+#. type: Plain text
+#: pmap.1:20
+msgid "Show the extended format."
+msgstr ""
+
+#. type: TP
+#: pmap.1:20
+#, no-wrap
+msgid "B<-d>, B<--device>"
+msgstr ""
+
+#. type: Plain text
+#: pmap.1:23
+msgid "Show the device format."
+msgstr ""
+
+#. type: TP
+#: pmap.1:23 sysctl.8:54
+#, no-wrap
+msgid "B<-q>, B<--quiet>"
+msgstr ""
+
+#. type: Plain text
+#: pmap.1:26
+msgid "Do not display some header or footer lines."
+msgstr ""
+
+#. type: TP
+#: pmap.1:26
+#, no-wrap
+msgid "B<-A>, B<--range> I<low>,I<high>"
+msgstr ""
+
+#. type: Plain text
+#: pmap.1:34
+msgid "Limit results to the given range to I<low> and I<high> address range.  Notice that the low and high arguments are single string separated with comma."
+msgstr ""
+
+#. type: TP
+#: pmap.1:34 sysctl.8:110
+#, no-wrap
+msgid "B<-X>"
+msgstr ""
+
+#. type: Plain text
+#: pmap.1:38
+msgid "Show even more details than the B<-x> option. WARNING: format changes according to I</proc/PID/smaps>"
+msgstr ""
+
+#. type: TP
+#: pmap.1:38
+#, no-wrap
+msgid "B<-XX>"
+msgstr ""
+
+#. type: Plain text
+#: pmap.1:41
+msgid "Show everything the kernel provides"
+msgstr ""
+
+#. type: TP
+#: pmap.1:41
+#, no-wrap
+msgid "B<-p>, B<--show-path>"
+msgstr ""
+
+#. type: Plain text
+#: pmap.1:44
+msgid "Show full path to files in the mapping column"
+msgstr ""
+
+#. type: TP
+#: pmap.1:44
+#, no-wrap
+msgid "B<-c>, B<--read-rc>"
+msgstr ""
+
+#. type: Plain text
+#: pmap.1:47
+msgid "Read the default configuration"
+msgstr ""
+
+#. type: TP
+#: pmap.1:47
+#, no-wrap
+msgid "B<-C>, B<--read-rc-from> I<file>"
+msgstr ""
+
+#. type: Plain text
+#: pmap.1:50
+msgid "Read the configuration from I<file>"
+msgstr ""
+
+#. type: TP
+#: pmap.1:50
+#, no-wrap
+msgid "B<-n>, B<--create-rc>"
+msgstr ""
+
+#. type: Plain text
+#: pmap.1:53
+msgid "Create new default configuration"
+msgstr ""
+
+#. type: TP
+#: pmap.1:53
+#, no-wrap
+msgid "B<-N>, B<--create-rc-to> I<file>"
+msgstr ""
+
+#. type: Plain text
+#: pmap.1:56
+msgid "Create new configuration to I<file>"
+msgstr ""
+
+#. type: Plain text
+#: pmap.1:59 skill.1:61 sysctl.8:122 w.1:51 watch.1:69
+msgid "Display help text and exit."
+msgstr ""
+
+#. type: Plain text
+#: pmap.1:69 watch.1:158
+msgid "Success."
+msgstr ""
+
+#. type: Plain text
+#: pmap.1:72
+msgid "Failure."
+msgstr ""
+
+#. type: TP
+#: pmap.1:72
+#, no-wrap
+msgid "B<42>"
+msgstr ""
+
+#. type: Plain text
+#: pmap.1:75
+msgid "Did not find all processes asked for."
+msgstr ""
+
+#. type: Plain text
+#: pmap.1:80 pwdx.1:22
+msgid "B<ps>(1), B<pgrep>(1)"
+msgstr ""
+
+#. type: Plain text
+#: pmap.1:82
+msgid "No standards apply, but pmap looks an awful lot like a SunOS command."
+msgstr ""
+
+#. type: TH
+#: pwdx.1:6
+#, no-wrap
+msgid "PWDX"
+msgstr ""
+
+#. type: TH
+#: pwdx.1:6 slabtop.1:5 tload.1:4 watch.1:1
+#, no-wrap
+msgid "June 2011"
+msgstr ""
+
+#. type: Plain text
+#: pwdx.1:9
+msgid "pwdx - report current working directory of a process"
+msgstr ""
+
+#. type: Plain text
+#: pwdx.1:12
+msgid "B<pwdx> [I<options>] I<pid> [...]"
+msgstr ""
+
+#. type: Plain text
+#: pwdx.1:16
+msgid "Output version information and exit."
+msgstr ""
+
+#. type: Plain text
+#: pwdx.1:19
+msgid "Output help screen and exit."
+msgstr ""
+
+#. type: Plain text
+#: pwdx.1:24
+msgid "No standards apply, but pwdx looks an awful lot like a SunOS command."
+msgstr ""
+
+#. type: Plain text
+#: pwdx.1:29
+msgid "E<.UR nmiell@gmail.com> Nicholas Miell E<.UE> wrote pwdx in 2004."
+msgstr ""
+
+#. type: TH
+#: skill.1:9
+#, no-wrap
+msgid "SKILL"
+msgstr ""
+
+#. type: Plain text
+#: skill.1:12
+msgid "skill, snice - send a signal or report process status"
+msgstr ""
+
+#. type: Plain text
+#: skill.1:17
+msgid "B<skill> [I<signal>] [I<options>] I<expression>"
+msgstr ""
+
+#. type: Plain text
+#: skill.1:22
+msgid "B<snice> [I<new priority>] [I<options>] I<expression>"
+msgstr ""
+
+#. type: Plain text
+#: skill.1:26
+msgid "These tools are obsolete and unportable.  The command syntax is poorly defined.  Consider using the killall, pkill, and pgrep commands instead."
+msgstr ""
+
+#. type: Plain text
+#: skill.1:31
+msgid "The default signal for skill is TERM.  Use -l or -L to list available signals.  Particularly useful signals include HUP, INT, KILL, STOP, CONT, and 0.  Alternate signals may be specified in three ways: -9 -SIGKILL -KILL."
+msgstr ""
+
+#. type: Plain text
+#: skill.1:35
+msgid "The default priority for snice is +4.  Priority numbers range from +20 (slowest) to -20 (fastest).  Negative priority numbers are restricted to administrative users."
+msgstr ""
+
+#. type: TP
+#: skill.1:36
+#, no-wrap
+msgid "B<-f>,B<\\ --fast>"
+msgstr ""
+
+#. type: Plain text
+#: skill.1:39
+msgid "Fast mode.  This option has not been implemented."
+msgstr ""
+
+#. type: TP
+#: skill.1:39
+#, no-wrap
+msgid "B<-i>,B<\\ --interactive>"
+msgstr ""
+
+#. type: Plain text
+#: skill.1:42
+msgid "Interactive use.  You will be asked to approve each action."
+msgstr ""
+
+#. type: TP
+#: skill.1:42
+#, no-wrap
+msgid "B<-l>,B<\\ --list>"
+msgstr ""
+
+#. type: Plain text
+#: skill.1:45
+msgid "List all signal names."
+msgstr ""
+
+#. type: Plain text
+#: skill.1:48
+msgid "List all signal names in a nice table."
+msgstr ""
+
+#. type: TP
+#: skill.1:48
+#, no-wrap
+msgid "B<-n>,B<\\ --no-action>"
+msgstr ""
+
+#. type: Plain text
+#: skill.1:52
+msgid "No action; perform a simulation of events that would occur but do not actually change the system."
+msgstr ""
+
+#. type: TP
+#: skill.1:52
+#, no-wrap
+msgid "B<-v>,B<\\ --verbose>"
+msgstr ""
+
+#. type: Plain text
+#: skill.1:55
+msgid "Verbose; explain what is being done."
+msgstr ""
+
+#. type: TP
+#: skill.1:55
+#, no-wrap
+msgid "B<-w>,B<\\ --warnings>"
+msgstr ""
+
+#. type: Plain text
+#: skill.1:58
+msgid "Enable warnings.  This option has not been implemented."
+msgstr ""
+
+#. type: SH
+#: skill.1:65
+#, no-wrap
+msgid "PROCESS SELECTION OPTIONS"
+msgstr ""
+
+#. type: Plain text
+#: skill.1:68
+msgid "Selection criteria can be: terminal, user, pid, command.  The options below may be used to ensure correct interpretation."
+msgstr ""
+
+#. type: TP
+#: skill.1:68
+#, no-wrap
+msgid "B<-t>, B<--tty> I<tty>"
+msgstr ""
+
+#. type: Plain text
+#: skill.1:71
+msgid "The next expression is a terminal (tty or pty)."
+msgstr ""
+
+#. type: TP
+#: skill.1:71
+#, no-wrap
+msgid "B<-u>, B<--user> I<user>"
+msgstr ""
+
+#. type: Plain text
+#: skill.1:74
+msgid "The next expression is a username."
+msgstr ""
+
+#. type: TP
+#: skill.1:74
+#, no-wrap
+msgid "B<-p>, B<--pid> I<pid>"
+msgstr ""
+
+#. type: Plain text
+#: skill.1:77
+msgid "The next expression is a process ID number."
+msgstr ""
+
+#. type: TP
+#: skill.1:77
+#, no-wrap
+msgid "B<-c>, B<--command> I<command>"
+msgstr ""
+
+#. type: Plain text
+#: skill.1:80
+msgid "The next expression is a command name."
+msgstr ""
+
+#. type: Plain text
+#: skill.1:83
+msgid "Match the processes that belong to the same namespace as pid."
+msgstr ""
+
+#. type: TP
+#: skill.1:83
+#, no-wrap
+msgid "B<--nslist >I<ns,...>"
+msgstr ""
+
+#. type: Plain text
+#: skill.1:87
+msgid "list which namespaces will be considered for the --ns option.  Available namespaces: ipc, mnt, net, pid, user, uts."
+msgstr ""
+
+#. type: SH
+#: skill.1:88
+#, no-wrap
+msgid "SIGNALS"
+msgstr ""
+
+#. type: Plain text
+#: skill.1:92
+msgid "The behavior of signals is explained in B<signal>(7)  manual page."
+msgstr ""
+
+#. type: TP
+#: skill.1:93
+#, no-wrap
+msgid "B<snice -c seti -c crack +7>"
+msgstr ""
+
+#. type: Plain text
+#: skill.1:96
+msgid "Slow down seti and crack commands."
+msgstr ""
+
+#. type: TP
+#: skill.1:96
+#, no-wrap
+msgid "B<skill -KILL -t /dev/pts/*>"
+msgstr ""
+
+#. type: Plain text
+#: skill.1:99
+msgid "Kill users on PTY devices."
+msgstr ""
+
+#. type: TP
+#: skill.1:99
+#, no-wrap
+msgid "B<skill -STOP -u viro -u lm -u davem>"
+msgstr ""
+
+#. type: Plain text
+#: skill.1:102
+msgid "Stop three users."
+msgstr ""
+
+#. type: Plain text
+#: skill.1:110
+msgid "B<kill>(1), B<kill>(2), B<killall>(1), B<nice>(1), B<pkill>(1), B<renice>(1), B<signal>(7)"
+msgstr ""
+
+#. type: Plain text
+#: skill.1:112
+msgid "No standards apply."
+msgstr ""
+
+#. type: Plain text
+#: skill.1:118
+msgid "E<.UR albert@users.sf.net> Albert Cahalan E<.UE> wrote skill and snice in 1999 as a replacement for a non-free version."
+msgstr ""
+
+#. type: TH
+#: slabtop.1:5
+#, no-wrap
+msgid "SLABTOP"
+msgstr ""
+
+#. type: Plain text
+#: slabtop.1:8
+msgid "slabtop - display kernel slab cache information in real time"
+msgstr ""
+
+#. type: Plain text
+#: slabtop.1:11
+msgid "B<slabtop> [I<options>]"
+msgstr ""
+
+#. type: Plain text
+#: slabtop.1:16
+msgid "B<slabtop> displays detailed kernel slab cache information in real time.  It displays a listing of the top caches sorted by one of the listed sort criteria.  It also displays a statistics header filled with slab layer information."
+msgstr ""
+
+#. type: Plain text
+#: slabtop.1:21
+msgid "Normal invocation of B<slabtop> does not require any options.  The behavior, however, can be fine-tuned by specifying one or more of the following flags:"
+msgstr ""
+
+#. type: TP
+#: slabtop.1:21
+#, no-wrap
+msgid "B<-d>, B<--delay>=I<N>"
+msgstr ""
+
+#. type: Plain text
+#: slabtop.1:29
+msgid "Refresh the display every I<n> in seconds.  By default, B<slabtop> refreshes the display every three seconds.  To exit the program, hit B<q.>"
+msgstr ""
+
+#. type: TP
+#: slabtop.1:29
+#, no-wrap
+msgid "B<-s>, B<--sort>=I<S>"
+msgstr ""
+
+#. type: Plain text
+#: slabtop.1:32
+msgid "Sort by I<S>, where I<S> is one of the sort criteria."
+msgstr ""
+
+#. type: TP
+#: slabtop.1:32
+#, no-wrap
+msgid "B<-o>, B<--once>"
+msgstr ""
+
+#. type: Plain text
+#: slabtop.1:35
+msgid "Display the output once and then exit."
+msgstr ""
+
+#. type: Plain text
+#: slabtop.1:41
+msgid "Display usage information and exit."
+msgstr ""
+
+#. type: SH
+#: slabtop.1:41
+#, no-wrap
+msgid "SORT CRITERIA"
+msgstr ""
+
+#. type: Plain text
+#: slabtop.1:45
+msgid "The following are valid sort criteria used to sort the individual slab caches and thereby determine what are the \"top\" slab caches to display.  The default sort criteria is to sort by the number of objects (\"o\")."
+msgstr ""
+
+#. type: Plain text
+#: slabtop.1:48
+msgid "The sort criteria can also be changed while slabtop is running by pressing the associated character."
+msgstr ""
+
+#. type: tbl table
+#: slabtop.1:50
+#, no-wrap
+msgid "B<character\tdescription\theader>\n"
+msgstr ""
+
+#. type: tbl table
+#: slabtop.1:51
+#, no-wrap
+msgid "a\tnumber of active objects\tACTIVE\n"
+msgstr ""
+
+#. type: tbl table
+#: slabtop.1:52
+#, no-wrap
+msgid "b\tobjects per slab\tOBJ/SLAB\n"
+msgstr ""
+
+#. type: tbl table
+#: slabtop.1:53
+#, no-wrap
+msgid "c\tcache size\tCACHE SIZE\n"
+msgstr ""
+
+#. type: tbl table
+#: slabtop.1:54
+#, no-wrap
+msgid "l\tnumber of slabs\tSLABS\n"
+msgstr ""
+
+#. type: tbl table
+#: slabtop.1:55
+#, no-wrap
+msgid "v\tnumber of active slabs\tN/A\n"
+msgstr ""
+
+#. type: tbl table
+#: slabtop.1:56
+#, no-wrap
+msgid "n\tname\tNAME\n"
+msgstr ""
+
+#. type: tbl table
+#: slabtop.1:57
+#, no-wrap
+msgid "o\tnumber of objects\tOBJS\n"
+msgstr ""
+
+#. type: tbl table
+#: slabtop.1:58
+#, no-wrap
+msgid "p\tpages per slab\tN/A\n"
+msgstr ""
+
+#. type: tbl table
+#: slabtop.1:59
+#, no-wrap
+msgid "s\tobject size\tOBJ SIZE\n"
+msgstr ""
+
+#. type: tbl table
+#: slabtop.1:60
+#, no-wrap
+msgid "u\tcache utilization\tUSE\n"
+msgstr ""
+
+#. type: SH
+#: slabtop.1:62
+#, no-wrap
+msgid "COMMANDS"
+msgstr "命令"
+
+#. type: Plain text
+#: slabtop.1:66
+msgid "B<slabtop> accepts keyboard commands from the user during use.  The following are supported.  In the case of letters, both cases are accepted."
+msgstr ""
+
+#. type: Plain text
+#: slabtop.1:70
+msgid "Each of the valid sort characters are also accepted, to change the sort routine. See the section B<SORT CRITERIA>."
+msgstr ""
+
+#. type: TP
+#: slabtop.1:70
+#, no-wrap
+msgid "B<E<lt>SPACEBARE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: slabtop.1:73
+msgid "Refresh the screen."
+msgstr ""
+
+#. type: TP
+#: slabtop.1:73
+#, no-wrap
+msgid "B<Q>"
+msgstr ""
+
+#. type: Plain text
+#: slabtop.1:76
+msgid "Quit the program."
+msgstr ""
+
+#. type: TP
+#: slabtop.1:77
+#, no-wrap
+msgid "I</proc/slabinfo>"
+msgstr ""
+
+#. type: Plain text
+#: slabtop.1:80
+msgid "slab information"
+msgstr ""
+
+#. type: Plain text
+#: slabtop.1:85
+msgid "B<free>(1), B<ps>(1), B<top>(1), B<vmstat>(8)"
+msgstr ""
+
+#. type: Plain text
+#: slabtop.1:91
+msgid "Currently, B<slabtop> requires a 2.4 or later kernel (specifically, a version 1.1 or later I</proc/slabinfo>).  Kernel 2.2 should be supported in the future."
+msgstr ""
+
+#. type: Plain text
+#: slabtop.1:95
+msgid "The slabtop statistic header is tracking how many bytes of slabs are being used and is not a measure of physical memory.  The 'Slab' field in the /proc/meminfo file is tracking information about used slab physical memory."
+msgstr ""
+
+#. type: Plain text
+#: slabtop.1:97
+msgid "Written by Chris Rivera and Robert Love."
+msgstr ""
+
+#. type: Plain text
+#: slabtop.1:101
+msgid "B<slabtop> was inspired by Martin Bligh's perl script, B<vmtop>."
+msgstr ""
+
+#. type: TH
+#: sysctl.8:9
+#, no-wrap
+msgid "SYSCTL"
+msgstr ""
+
+#. type: TH
+#: sysctl.8:9
+#, no-wrap
+msgid "Jan 2012"
+msgstr ""
+
+#. type: TH
+#: sysctl.8:9 vmstat.8:3
+#, no-wrap
+msgid "System Administration"
+msgstr "系统管理"
+
+#. type: Plain text
+#: sysctl.8:12
+msgid "sysctl - configure kernel parameters at runtime"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:15
+msgid "B<sysctl> [I<options>] [I<variable>[B<=>I<value>]] [...]"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:18
+msgid "B<sysctl -p> [I<file> or I<regexp>] [...]"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:26
+msgid "B<sysctl> is used to modify kernel parameters at runtime.  The parameters available are those listed under /proc/sys/.  Procfs is required for B<sysctl> support in Linux.  You can use B<sysctl> to both read and write sysctl data."
+msgstr ""
+
+#. type: SH
+#: sysctl.8:26
+#, no-wrap
+msgid "PARAMETERS"
+msgstr ""
+
+#. type: TP
+#: sysctl.8:27
+#, no-wrap
+msgid "I<variable>"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:31
+msgid "The name of a key to read from.  An example is kernel.ostype.  The '/' separator is also accepted in place of a '.'."
+msgstr ""
+
+#. type: TP
+#: sysctl.8:31
+#, no-wrap
+msgid "I<variable>=I<value>"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:44
+msgid "To set a key, use the form I<variable>=I<value> where I<variable> is the key and I<value> is the value to set it to.  If the value contains quotes or characters which are parsed by the shell, you may need to enclose the value in double quotes.  This requires the B<-w> parameter to use."
+msgstr ""
+
+#. type: TP
+#: sysctl.8:44
+#, no-wrap
+msgid "B<-n>, B<--values>"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:47
+msgid "Use this option to disable printing of the key name when printing values."
+msgstr ""
+
+#. type: TP
+#: sysctl.8:47
+#, no-wrap
+msgid "B<-e>, B<--ignore>"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:50
+msgid "Use this option to ignore errors about unknown keys."
+msgstr ""
+
+#. type: TP
+#: sysctl.8:50
+#, no-wrap
+msgid "B<-N>, B<--names>"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:54
+msgid "Use this option to only print the names.  It may be useful with shells that have programmable completion."
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:57
+msgid "Use this option to not display the values set to stdout."
+msgstr ""
+
+#. type: TP
+#: sysctl.8:57
+#, no-wrap
+msgid "B<-w>, B<--write>"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:60
+msgid "Use this option when you want to change a sysctl setting."
+msgstr ""
+
+#. type: TP
+#: sysctl.8:60
+#, no-wrap
+msgid "B<-p>[I<FILE>], B<--load>[=I<FILE>]"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:68
+msgid "Load in sysctl settings from the file specified or /etc/sysctl.conf if none given.  Specifying - as filename means reading data from standard input.  Using this option will mean arguments to B<sysctl> are files, which are read in the order they are specified.  The file argument may be specified as regular expression."
+msgstr ""
+
+#. type: TP
+#: sysctl.8:68
+#, no-wrap
+msgid "B<-a>, B<--all>"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:71
+msgid "Display all values currently available."
+msgstr ""
+
+#. type: TP
+#: sysctl.8:71
+#, no-wrap
+msgid "B<--deprecated>"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:76
+msgid "Include deprecated parameters to B<--all> values listing."
+msgstr ""
+
+#. type: TP
+#: sysctl.8:76
+#, no-wrap
+msgid "B<-b>, B<--binary>"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:79
+msgid "Print value without new line."
+msgstr ""
+
+#. type: TP
+#: sysctl.8:79
+#, no-wrap
+msgid "B<--system>"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:82
+msgid "Load settings from all system configuration files."
+msgstr ""
+
+#. type: TP
+#: sysctl.8:84 sysctl.conf.5:45
+#, no-wrap
+msgid "/run/sysctl.d/*.conf"
+msgstr ""
+
+#. type: TQ
+#: sysctl.8:86 sysctl.conf.5:47
+#, no-wrap
+msgid "/etc/sysctl.d/*.conf"
+msgstr ""
+
+#. type: TQ
+#: sysctl.8:88 sysctl.conf.5:49
+#, no-wrap
+msgid "/usr/local/lib/sysctl.d/*.conf"
+msgstr ""
+
+#. type: TQ
+#: sysctl.8:90 sysctl.conf.5:51
+#, no-wrap
+msgid "/usr/lib/sysctl.d/*.conf"
+msgstr ""
+
+#. type: TQ
+#: sysctl.8:92 sysctl.conf.5:53
+#, no-wrap
+msgid "/lib/sysctl.d/*.conf"
+msgstr ""
+
+#. type: TQ
+#: sysctl.8:94 sysctl.conf.5:55
+#, no-wrap
+msgid "/etc/sysctl.conf"
+msgstr ""
+
+#. type: TP
+#: sysctl.8:94
+#, no-wrap
+msgid "B<-r>, B<--pattern> I<pattern>"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:101
+msgid "Only apply settings that match I<pattern>.  The I<pattern> uses extended regular expression syntax."
+msgstr ""
+
+#. type: TP
+#: sysctl.8:101
+#, no-wrap
+msgid "B<-A>"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:104 sysctl.8:113
+msgid "Alias of B<-a>"
+msgstr ""
+
+#. type: TP
+#: sysctl.8:104
+#, no-wrap
+msgid "B<-d>"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:107
+msgid "Alias of B<-h>"
+msgstr ""
+
+#. type: TP
+#: sysctl.8:107
+#, no-wrap
+msgid "B<-f>"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:110
+msgid "Alias of B<-p>"
+msgstr ""
+
+#. type: TP
+#: sysctl.8:113
+#, no-wrap
+msgid "B<-o>"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:116 sysctl.8:119
+msgid "Does nothing, exists for BSD compatibility."
+msgstr ""
+
+#. type: TP
+#: sysctl.8:116
+#, no-wrap
+msgid "B<-x>"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:127
+msgid "/sbin/sysctl -a"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:129
+msgid "/sbin/sysctl -n kernel.hostname"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:131
+msgid "/sbin/sysctl -w kernel.domainname=\"example.com\""
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:133
+msgid "/sbin/sysctl -p/etc/sysctl.conf"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:135
+msgid "/sbin/sysctl -a --pattern forward"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:137
+msgid "/sbin/sysctl -a --pattern forward$"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:139
+msgid "/sbin/sysctl -a --pattern 'net.ipv4.conf.(eth|wlan)0.arp'"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:141
+msgid "/sbin/sysctl --system --pattern '^net.ipv6'"
+msgstr ""
+
+#. type: SH
+#: sysctl.8:141
+#, no-wrap
+msgid "DEPRECATED PARAMETERS"
+msgstr "已弃用参数"
+
+#. type: Plain text
+#: sysctl.8:149
+msgid "The B<base_reachable_time> and B<retrans_time> are deprecated.  The sysctl command does not allow changing values of these parameters.  Users who insist to use deprecated kernel interfaces should push values to /proc file system by other means.  For example:"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:151
+msgid "echo 256 E<gt> /proc/sys/net/ipv6/neigh/eth0/base_reachable_time"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:153
+msgid "I</proc/sys>"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:155
+msgid "I</etc/sysctl.conf>"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:158
+msgid "B<sysctl.conf>(5)  B<regex>(7)"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.8:162 sysctl.conf.5:69
+msgid "E<.UR staikos@0wned.org> George Staikos E<.UE>"
+msgstr ""
+
+#. type: TH
+#: sysctl.conf.5:9
+#, no-wrap
+msgid "SYSCTL.CONF"
+msgstr ""
+
+#. type: TH
+#: sysctl.conf.5:9
+#, no-wrap
+msgid "January 2012"
+msgstr ""
+
+#. type: TH
+#: sysctl.conf.5:9
+#, no-wrap
+msgid "File Formats"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.conf.5:12
+msgid "sysctl.conf - sysctl preload/configuration file"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.conf.5:17
+msgid "B<sysctl.conf> is a simple file containing sysctl values to be read in and set by B<sysctl>.  The syntax is simply as follows:"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.conf.5:23
+#, no-wrap
+msgid ""
+"# comment\n"
+"; comment\n"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.conf.5:25
+#, no-wrap
+msgid "token = value\n"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.conf.5:31
+msgid "Note that blank lines are ignored, and whitespace before and after a token or value is ignored, although a value can contain whitespace within.  Lines which begin with a # or ; are considered comments and ignored."
+msgstr ""
+
+#. type: SH
+#: sysctl.conf.5:31
+#, no-wrap
+msgid "EXAMPLE"
+msgstr "示例"
+
+#. type: Plain text
+#: sysctl.conf.5:41
+#, no-wrap
+msgid ""
+"# sysctl.conf sample\n"
+"#\n"
+"  kernel.domainname = example.com\n"
+"; this one has a space which will be written to the sysctl!\n"
+"  kernel.modprobe = /sbin/mod probe\n"
+msgstr ""
+
+#. type: Plain text
+#: sysctl.conf.5:63
+msgid "The paths where sysctl preload files usually exist.  See also sysctl option I<--system>."
+msgstr ""
+
+#. type: Plain text
+#: sysctl.conf.5:65
+msgid "B<sysctl>(8)"
+msgstr ""
+
+#. type: TH
+#: tload.1:4
+#, no-wrap
+msgid "TLOAD"
+msgstr ""
+
+#. type: Plain text
+#: tload.1:7
+msgid "tload - graphic representation of system load average"
+msgstr ""
+
+#. type: Plain text
+#: tload.1:10
+msgid "B<tload> [I<options>] [I<tty>]"
+msgstr ""
+
+#. type: Plain text
+#: tload.1:15
+msgid "B<tload> prints a graph of the current system load average to the specified I<tty> (or the tty of the tload process if none is specified)."
+msgstr ""
+
+#. type: TP
+#: tload.1:16
+#, no-wrap
+msgid "B<-s>, B<--scale> I<number>"
+msgstr ""
+
+#. type: Plain text
+#: tload.1:21
+msgid "The scale option allows a vertical scale to be specified for the display (in characters between graph ticks); thus, a smaller value represents a larger scale, and vice versa."
+msgstr ""
+
+#. type: TP
+#: tload.1:21
+#, no-wrap
+msgid "B<-d>, B<--delay> I<seconds>"
+msgstr ""
+
+#. type: Plain text
+#: tload.1:25
+msgid "The delay sets the delay between graph updates in I<seconds>."
+msgstr ""
+
+#. type: Plain text
+#: tload.1:28
+msgid "Display this help text."
+msgstr ""
+
+#. type: Plain text
+#: tload.1:35
+msgid "I</proc/loadavg> load average information"
+msgstr ""
+
+#. type: Plain text
+#: tload.1:40
+msgid "B<ps>(1), B<top>(1), B<uptime>(1), B<w>(1)"
+msgstr ""
+
+#. type: Plain text
+#: tload.1:48
+msgid "The B<-d>I< delay> option sets the time argument for an B<alarm>(2); if -d 0 is specified, the alarm is set to 0, which will never send the B<SIGALRM> and update the display."
+msgstr ""
+
+#. type: Plain text
+#: tload.1:56
+msgid "Branko Lankester, E<.UR david@\\:ods.\\:com> David Engel E<.UE , and> E<.UR johnsonm@\\:redhat.\\:com> Michael K. Johnson E<.UE .>"
+msgstr ""
+
+#. type: TH
+#: uptime.1:3
+#, no-wrap
+msgid "UPTIME"
+msgstr ""
+
+#. type: TH
+#: uptime.1:3
+#, no-wrap
+msgid "December 2012"
+msgstr "2012 年 12 月"
+
+#. type: Plain text
+#: uptime.1:6
+msgid "uptime - Tell how long the system has been running."
+msgstr ""
+
+#. type: Plain text
+#: uptime.1:9
+msgid "B<uptime> [I<options>]"
+msgstr ""
+
+#. type: Plain text
+#: uptime.1:14
+msgid "B<uptime> gives a one line display of the following information.  The current time, how long the system has been running, how many users are currently logged on, and the system load averages for the past 1, 5, and 15 minutes."
+msgstr ""
+
+#. type: Plain text
+#: uptime.1:17
+msgid "This is the same information contained in the header line displayed by B<w>(1)."
+msgstr ""
+
+#. type: Plain text
+#: uptime.1:26
+msgid "System load averages is the average number of processes that are either in a runnable or uninterruptable state.  A process in a runnable state is either using the CPU or waiting to use the CPU.  A process in uninterruptable state is waiting for some I/O access, eg waiting for disk.  The averages are taken over the three time intervals.  Load averages are not normalized for the number of CPUs in a system, so a load average of 1 means a single CPU system is loaded all the time while on a 4 CPU system it means it was idle 75% of the time."
+msgstr ""
+
+#. type: TP
+#: uptime.1:27
+#, no-wrap
+msgid "B<-p>, B<--pretty>"
+msgstr ""
+
+#. type: Plain text
+#: uptime.1:30
+msgid "show uptime in pretty format"
+msgstr ""
+
+#. type: Plain text
+#: uptime.1:33
+msgid "display this help text"
+msgstr ""
+
+#. type: TP
+#: uptime.1:33
+#, no-wrap
+msgid "B<-s>, B<--since>"
+msgstr ""
+
+#. type: Plain text
+#: uptime.1:36
+msgid "system up since, in yyyy-mm-dd HH:MM:SS format"
+msgstr ""
+
+#. type: Plain text
+#: uptime.1:39
+msgid "display version information and exit"
+msgstr ""
+
+#. type: TP
+#: uptime.1:40 w.1:71
+#, no-wrap
+msgid "I</var/run/utmp>"
+msgstr ""
+
+#. type: Plain text
+#: uptime.1:43 w.1:74
+msgid "information about who is currently logged on"
+msgstr ""
+
+#. type: TP
+#: uptime.1:43 w.1:74
+#, no-wrap
+msgid "I</proc>"
+msgstr ""
+
+#. type: Plain text
+#: uptime.1:46 w.1:77
+msgid "process information"
+msgstr ""
+
+#. type: Plain text
+#: uptime.1:56
+msgid "B<uptime> was written by E<.UR greenfie@gauss.\\:rutgers.\\:edu> Larry Greenfield E<.UE> and E<.UR johnsonm@sunsite.\\:unc.\\:edu> Michael K. Johnson E<.UE>"
+msgstr ""
+
+#. type: Plain text
+#: uptime.1:61
+msgid "B<ps>(1), B<top>(1), B<utmp>(5), B<w>(1)"
+msgstr ""
+
+#. type: TH
+#: vmstat.8:3
+#, no-wrap
+msgid "VMSTAT"
+msgstr ""
+
+#. type: TH
+#: vmstat.8:3
+#, no-wrap
+msgid "September 2011"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:6
+msgid "vmstat - Report virtual memory statistics"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:10
+msgid "B<vmstat> [options] [I<delay> [I<count>]]"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:14
+msgid "B<vmstat> reports information about processes, memory, paging, block IO, traps, disks and cpu activity."
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:19
+msgid "The first report produced gives averages since the last reboot.  Additional reports give information on a sampling period of length I<delay>.  The process and memory reports are instantaneous in either case."
+msgstr ""
+
+#. type: TP
+#: vmstat.8:20
+#, no-wrap
+msgid "I<delay>"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:27
+msgid "The I<delay> between updates in seconds.  If no I<delay> is specified, only one report is printed with the average values since boot."
+msgstr ""
+
+#. type: TP
+#: vmstat.8:27
+#, no-wrap
+msgid "I<count>"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:34
+msgid "Number of updates.  In absence of I<count>, when I<delay> is defined, default is infinite."
+msgstr ""
+
+#. type: TP
+#: vmstat.8:34
+#, no-wrap
+msgid "B<-a>, B<--active>"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:37
+msgid "Display active and inactive memory, given a 2.5.41 kernel or better."
+msgstr ""
+
+#. type: TP
+#: vmstat.8:37
+#, no-wrap
+msgid "B<-f>, B<--forks>"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:45
+msgid "The B<-f> switch displays the number of forks since boot.  This includes the fork, vfork, and clone system calls, and is equivalent to the total number of tasks created.  Each process is represented by one or more tasks, depending on thread usage.  This display does not repeat."
+msgstr ""
+
+#. type: TP
+#: vmstat.8:45
+#, no-wrap
+msgid "B<-m>, B<--slabs>"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:48
+msgid "Displays slabinfo."
+msgstr ""
+
+#. type: TP
+#: vmstat.8:48
+#, no-wrap
+msgid "B<-n>, B<--one-header>"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:51
+msgid "Display the header only once rather than periodically."
+msgstr ""
+
+#. type: TP
+#: vmstat.8:51
+#, no-wrap
+msgid "B<-s>, B<--stats>"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:55
+msgid "Displays a table of various event counters and memory statistics.  This display does not repeat."
+msgstr ""
+
+#. type: TP
+#: vmstat.8:55
+#, no-wrap
+msgid "B<-d>, B<--disk>"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:58
+msgid "Report disk statistics (2.5.70 or above required)."
+msgstr ""
+
+#. type: TP
+#: vmstat.8:58
+#, no-wrap
+msgid "B<-D>, B<--disk-sum>"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:61
+msgid "Report some summary statistics about disk activity."
+msgstr ""
+
+#. type: TP
+#: vmstat.8:61
+#, no-wrap
+msgid "B<-p>, B<--partition> I<device>"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:64
+msgid "Detailed statistics about partition (2.5.70 or above required)."
+msgstr ""
+
+#. type: TP
+#: vmstat.8:64
+#, no-wrap
+msgid "B<-S>, B<--unit> I<character>"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:76
+msgid "Switches outputs between 1000 (I<k>), 1024 (I<K>), 1000000 (I<m>), or 1048576 (I<M>)  bytes.  Note this does not change the swap (si/so) or block (bi/bo)  fields."
+msgstr ""
+
+#. type: TP
+#: vmstat.8:76
+#, no-wrap
+msgid "B<-t>, B<--timestamp>"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:79
+msgid "Append timestamp to each line"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:84
+msgid "Wide output mode (useful for systems with higher amount of memory, where the default output mode suffers from unwanted column breakage).  The output is wider than 80 characters per line."
+msgstr ""
+
+#. type: SH
+#: vmstat.8:91
+#, no-wrap
+msgid "FIELD DESCRIPTION FOR VM MODE"
+msgstr ""
+
+#. type: SS
+#: vmstat.8:92
+#, no-wrap
+msgid "Procs"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:97
+#, no-wrap
+msgid ""
+"r: The number of runnable processes (running or waiting for run time).\n"
+"b: The number of processes in uninterruptible sleep.\n"
+msgstr ""
+
+#. type: SS
+#: vmstat.8:99
+#, no-wrap
+msgid "Memory"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:108
+#, no-wrap
+msgid ""
+"swpd: the amount of virtual memory used.\n"
+"free: the amount of idle memory.\n"
+"buff: the amount of memory used as buffers.\n"
+"cache: the amount of memory used as cache.\n"
+"inact: the amount of inactive memory.  (-a option)\n"
+"active: the amount of active memory.  (-a option)\n"
+msgstr ""
+
+#. type: SS
+#: vmstat.8:110
+#, no-wrap
+msgid "Swap"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:115
+#, no-wrap
+msgid ""
+"si: Amount of memory swapped in from disk (/s).\n"
+"so: Amount of memory swapped to disk (/s).\n"
+msgstr ""
+
+#. type: SS
+#: vmstat.8:117 vmstat.8:161
+#, no-wrap
+msgid "IO"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:122
+#, no-wrap
+msgid ""
+"bi: Blocks received from a block device (blocks/s).\n"
+"bo: Blocks sent to a block device (blocks/s).\n"
+msgstr ""
+
+#. type: SS
+#: vmstat.8:124
+#, no-wrap
+msgid "System"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:129
+#, no-wrap
+msgid ""
+"in: The number of interrupts per second, including the clock.\n"
+"cs: The number of context switches per second.\n"
+msgstr ""
+
+#. type: SS
+#: vmstat.8:131
+#, no-wrap
+msgid "CPU"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:134
+msgid "These are percentages of total CPU time."
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:140
+#, no-wrap
+msgid ""
+"us: Time spent running non-kernel code.  (user time, including nice time)\n"
+"sy: Time spent running kernel code.  (system time)\n"
+"id: Time spent idle.  Prior to Linux 2.5.41, this includes IO-wait time.\n"
+"wa: Time spent waiting for IO.  Prior to Linux 2.5.41, included in idle.\n"
+"st: Time stolen from a virtual machine.  Prior to Linux 2.6.11, unknown.\n"
+msgstr ""
+
+#. type: SH
+#: vmstat.8:142
+#, no-wrap
+msgid "FIELD DESCRIPTION FOR DISK MODE"
+msgstr ""
+
+#. type: SS
+#: vmstat.8:143
+#, no-wrap
+msgid "Reads"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:150
+#, no-wrap
+msgid ""
+"total: Total reads completed successfully\n"
+"merged: grouped reads (resulting in one I/O)\n"
+"sectors: Sectors read successfully\n"
+"ms: milliseconds spent reading\n"
+msgstr ""
+
+#. type: SS
+#: vmstat.8:152
+#, no-wrap
+msgid "Writes"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:159
+#, no-wrap
+msgid ""
+"total: Total writes completed successfully\n"
+"merged: grouped writes (resulting in one I/O)\n"
+"sectors: Sectors written successfully\n"
+"ms: milliseconds spent writing\n"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:166
+#, no-wrap
+msgid ""
+"cur: I/O in progress\n"
+"s: seconds spent for I/O\n"
+msgstr ""
+
+#. type: SH
+#: vmstat.8:168
+#, no-wrap
+msgid "FIELD DESCRIPTION FOR DISK PARTITION MODE"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:174
+#, no-wrap
+msgid ""
+"reads: Total number of reads issued to this partition\n"
+"read sectors: Total read sectors for partition\n"
+"writes : Total number of writes issued to this partition\n"
+"requested writes: Total number of write requests made for partition\n"
+msgstr ""
+
+#. type: SH
+#: vmstat.8:176
+#, no-wrap
+msgid "FIELD DESCRIPTION FOR SLAB MODE"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:183
+#, no-wrap
+msgid ""
+"cache: Cache name\n"
+"num: Number of currently active objects\n"
+"total: Total number of available objects\n"
+"size: Size of each object\n"
+"pages: Number of pages with at least one active object\n"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:187
+msgid "B<vmstat > does not require special permissions."
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:191
+msgid "These reports are intended to help identify system bottlenecks.  Linux B<vmstat> does not count itself as a running process."
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:194
+msgid "All linux blocks are currently 1024 bytes.  Old kernels may report blocks as 512 bytes, 2048 bytes, or 4096 bytes."
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:197
+msgid "Since procps 3.1.9, vmstat lets you choose units (k, K, m, M).  Default is K (1024 bytes) in the default mode."
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:199
+msgid "vmstat uses slabinfo 1.1"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:205
+#, no-wrap
+msgid ""
+"/proc/meminfo\n"
+"/proc/stat\n"
+"/proc/*/stat\n"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:213
+msgid "B<free>(1), B<iostat>(1), B<mpstat>(1), B<ps>(1), B<sar>(1), B<top>(1)"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:216
+msgid "Does not tabulate the block io per device or count the number of system calls."
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:221
+msgid "Written by E<.UR al172@yfn.\\:ysu.\\:edu> Henry Ware E<.UE .>"
+msgstr ""
+
+#. type: Plain text
+#: vmstat.8:226
+msgid "E<.UR ffrederick@users.\\:sourceforge.\\:net> Fabian Fr\\('ed\\('erick E<.UE> (diskstat, slab, partitions...)"
+msgstr ""
+
+#. type: TH
+#: w.1:3
+#, no-wrap
+msgid "W"
+msgstr "W"
+
+#. type: TH
+#: w.1:3
+#, no-wrap
+msgid "May 2012"
+msgstr ""
+
+#. type: Plain text
+#: w.1:6
+msgid "w - Show who is logged on and what they are doing."
+msgstr ""
+
+#. type: Plain text
+#: w.1:9
+msgid "B<w> [I<options>] I<user> [...]"
+msgstr ""
+
+#. type: Plain text
+#: w.1:15
+msgid "B<w> displays information about the users currently on the machine, and their processes.  The header shows, in this order, the current time, how long the system has been running, how many users are currently logged on, and the system load averages for the past 1, 5, and 15 minutes."
+msgstr ""
+
+#. type: Plain text
+#: w.1:19
+msgid "The following entries are displayed for each user: login name, the tty name, the remote host, login time, idle time, JCPU, PCPU, and the command line of their current process."
+msgstr ""
+
+#. type: Plain text
+#: w.1:23
+msgid "The JCPU time is the time used by all processes attached to the tty.  It does not include past background jobs, but does include currently running background jobs."
+msgstr ""
+
+#. type: Plain text
+#: w.1:26
+msgid "The PCPU time is the time used by the current process, named in the \"what\" field."
+msgstr ""
+
+#. type: SH
+#: w.1:26
+#, no-wrap
+msgid "COMMAND-LINE OPTIONS"
+msgstr ""
+
+#. type: TP
+#: w.1:27
+#, no-wrap
+msgid "B<-h>, B<--no-header>"
+msgstr ""
+
+#. type: Plain text
+#: w.1:30
+msgid "Don't print the header."
+msgstr ""
+
+#. type: TP
+#: w.1:30
+#, no-wrap
+msgid "B<-u>, B<--no-current>"
+msgstr ""
+
+#. type: Plain text
+#: w.1:35
+msgid "Ignores the username while figuring out the current process and cpu times.  To demonstrate this, do a \"su\" and do a \"w\" and a \"w -u\"."
+msgstr ""
+
+#. type: TP
+#: w.1:35
+#, no-wrap
+msgid "B<-s>, B<--short>"
+msgstr ""
+
+#. type: Plain text
+#: w.1:38
+msgid "Use the short format.  Don't print the login time, JCPU or PCPU times."
+msgstr ""
+
+#. type: TP
+#: w.1:38
+#, no-wrap
+msgid "B<-f>, B<--from>"
+msgstr ""
+
+#. type: Plain text
+#: w.1:48
+msgid "Toggle printing the B<from> (remote hostname) field.  The default as released is for the B<from> field to not be printed, although your system administrator or distribution maintainer may have compiled a version in which the B<from> field is shown by default."
+msgstr ""
+
+#. type: TP
+#: w.1:51
+#, no-wrap
+msgid "B<-i>, B<--ip-addr>"
+msgstr ""
+
+#. type: Plain text
+#: w.1:54
+msgid "Display IP address instead of hostname for B<from> field."
+msgstr ""
+
+#. type: TP
+#: w.1:57
+#, no-wrap
+msgid "B<-o>, B<--old-style>"
+msgstr ""
+
+#. type: Plain text
+#: w.1:60
+msgid "Old style output.  Prints blank space for idle times less than one minute."
+msgstr ""
+
+#. type: TP
+#: w.1:60
+#, no-wrap
+msgid "B<user >"
+msgstr ""
+
+#. type: Plain text
+#: w.1:63
+msgid "Show information about the specified user only."
+msgstr ""
+
+#. type: SH
+#: w.1:63
+#, no-wrap
+msgid "ENVIRONMENT"
+msgstr "环境"
+
+#. type: TP
+#: w.1:64
+#, no-wrap
+msgid "PROCPS_USERLEN"
+msgstr ""
+
+#. type: Plain text
+#: w.1:67
+msgid "Override the default width of the username column.  Defaults to 8."
+msgstr ""
+
+#. type: TP
+#: w.1:67
+#, no-wrap
+msgid "PROCPS_FROMLEN"
+msgstr ""
+
+#. type: Plain text
+#: w.1:70
+msgid "Override the default width of the from column.  Defaults to 16."
+msgstr ""
+
+#. type: Plain text
+#: w.1:84
+msgid "B<free>(1), B<ps>(1), B<top>(1), B<uptime>(1), B<utmp>(5), B<who>(1)"
+msgstr ""
+
+#. type: Plain text
+#: w.1:94
+msgid "B<w> was re-written almost entirely by Charles Blake, based on the version by E<.UR greenfie@\\:gauss.\\:rutgers.\\:edu> Larry Greenfield E<.UE> and E<.UR johnsonm@\\:redhat.\\:com> Michael K. Johnson E<.UE>"
+msgstr ""
+
+#. type: TH
+#: watch.1:1
+#, no-wrap
+msgid "WATCH"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:4
+msgid "watch - execute a program periodically, showing output fullscreen"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:7
+msgid "B<watch> [I<options>] I<command>"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:17
+msgid "B<watch> runs I<command> repeatedly, displaying its output and errors (the first screenfull).  This allows you to watch the program output change over time.  By default, the program is run every 2 seconds.  By default, B<watch> will run until interrupted."
+msgstr ""
+
+#. type: TP
+#: watch.1:18
+#, no-wrap
+msgid "B<-d>, B<--differences> [I<permanent>]"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:23
+msgid "Highlight the differences between successive updates.  Option will read optional argument that changes highlight to be permanent, allowing to see what has changed at least once since first iteration."
+msgstr ""
+
+#. type: TP
+#: watch.1:23
+#, no-wrap
+msgid "B<-n>, B<--interval> I<seconds>"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:27
+msgid "Specify update interval.  The command will not allow quicker than 0.1 second interval, in which the smaller values are converted."
+msgstr ""
+
+#. type: TP
+#: watch.1:27
+#, no-wrap
+msgid "B<-p>, B<--precise>"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:39
+msgid "Make B<watch> attempt to run I<command> every I<interval> seconds. Try it with B<ntptime> and notice how the fractional seconds stays (nearly) the same, as opposed to normal mode where they continuously increase."
+msgstr ""
+
+#. type: TP
+#: watch.1:39
+#, no-wrap
+msgid "B<-t>, B<--no-title>"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:43
+msgid "Turn off the header showing the interval, command, and current time at the top of the display, as well as the following blank line."
+msgstr ""
+
+#. type: TP
+#: watch.1:43
+#, no-wrap
+msgid "B<-b>, B<--beep>"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:46
+msgid "Beep if command has a non-zero exit."
+msgstr ""
+
+#. type: TP
+#: watch.1:46
+#, no-wrap
+msgid "B<-e>, B<--errexit>"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:49
+msgid "Freeze updates on command error, and exit after a key press."
+msgstr ""
+
+#. type: TP
+#: watch.1:49
+#, no-wrap
+msgid "B<-g>, B<--chgexit>"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:54
+msgid "Exit when the output of I<command> changes."
+msgstr ""
+
+#. type: TP
+#: watch.1:54
+#, no-wrap
+msgid "B<-c>, B<--color>"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:57
+msgid "Interpret ANSI color and style sequences."
+msgstr ""
+
+#. type: TP
+#: watch.1:57
+#, no-wrap
+msgid "B<-x>, B<--exec>"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:66
+msgid "I<command> is given to B<sh -c> which means that you may need to use extra quoting to get the desired effect.  This with the --exec option, which passes the command to B<exec>(2)  instead."
+msgstr ""
+
+#. type: TP
+#: watch.1:69
+#, no-wrap
+msgid "B<-v>, B<--version>"
+msgstr ""
+
+#. type: SH
+#: watch.1:72
+#, no-wrap
+msgid "NOTE"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:79
+msgid "Note that POSIX option processing is used (i.e., option processing stops at the first non-option argument).  This means that flags after I<command> don't get interpreted by B<watch> itself."
+msgstr ""
+
+#. type: Plain text
+#: watch.1:82
+msgid "To watch for mail, you might do"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:84
+msgid "watch -n 60 from"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:86
+msgid "To watch the contents of a directory change, you could use"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:88
+msgid "watch -d ls -l"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:90
+msgid "If you're only interested in files owned by user joe, you might use"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:92
+msgid "watch -d 'ls -l | fgrep joe'"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:94
+msgid "To see the effects of quoting, try these out"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:96
+msgid "watch echo $$"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:98
+msgid "watch echo '$$'"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:100
+msgid "watch echo \"'\"'$$'\"'\""
+msgstr ""
+
+#. type: Plain text
+#: watch.1:104
+msgid "To see the effect of precision time keeping, try adding I<-p> to"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:106
+msgid "watch -n 10 sleep 1"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:108
+msgid "You can watch for your administrator to install the latest kernel with"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:110
+msgid "watch uname -r"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:116
+msgid "(Note that I<-p> isn't guaranteed to work across reboots, especially in the face of B<ntpdate> or other bootup time-changing mechanisms)"
+msgstr ""
+
+#. type: Plain text
+#: watch.1:121
+msgid "Upon terminal resize, the screen will not be correctly repainted until the next scheduled update.  All B<--differences> highlighting is lost on that update as well."
+msgstr ""
+
+#. type: Plain text
+#: watch.1:124
+msgid "Non-printing characters are stripped from program output.  Use \"cat -v\" as part of the command pipeline if you want to see them."
+msgstr ""
+
+#. type: Plain text
+#: watch.1:128
+msgid "Combining Characters that are supposed to display on the character at the last column on the screen may display one column early, or they may not display at all."
+msgstr ""
+
+#. type: Plain text
+#: watch.1:132
+msgid "Combining Characters never count as different in I<--differences> mode.  Only the base character counts."
+msgstr ""
+
+#. type: Plain text
+#: watch.1:135
+msgid "Blank lines directly after a line which ends in the last column do not display."
+msgstr ""
+
+#. type: Plain text
+#: watch.1:151
+msgid "I<--precise> mode doesn't yet have advanced temporal distortion technology to compensate for a I<command> that takes more than I<interval> seconds to execute.  B<watch> also can get into a state where it rapid-fires as many executions of I<command> as it can to catch up from a previous executions running longer than I<interval> (for example, B<netstat> taking ages on a DNS lookup)."
+msgstr ""
+
+#. type: Plain text
+#: watch.1:161
+msgid "Various failures."
+msgstr ""
+
+#. type: TP
+#: watch.1:161
+#, no-wrap
+msgid "B<2>"
+msgstr "B<2>"
+
+#. type: Plain text
+#: watch.1:164
+msgid "Forking the process to watch failed."
+msgstr ""
+
+#. type: TP
+#: watch.1:164
+#, no-wrap
+msgid "B<3>"
+msgstr "B<3>"
+
+#. type: Plain text
+#: watch.1:167
+msgid "Replacing child process stdout with write side pipe failed."
+msgstr ""
+
+#. type: TP
+#: watch.1:167
+#, no-wrap
+msgid "B<4>"
+msgstr "B<4>"
+
+#. type: Plain text
+#: watch.1:170
+msgid "Command execution failed."
+msgstr ""
+
+#. type: TP
+#: watch.1:170
+#, no-wrap
+msgid "B<5>"
+msgstr "B<5>"
+
+#. type: Plain text
+#: watch.1:173
+msgid "Closing child process write pipe failed."
+msgstr ""
+
+#. type: TP
+#: watch.1:173
+#, no-wrap
+msgid "B<7>"
+msgstr "B<7>"
+
+#. type: Plain text
+#: watch.1:176
+msgid "IPC pipe creation failed."
+msgstr ""
+
+#. type: TP
+#: watch.1:176
+#, no-wrap
+msgid "B<8>"
+msgstr "B<8>"
+
+#. type: Plain text
+#: watch.1:181
+msgid "Getting child process return value with B<waitpid>(2)  failed, or command exited up on error."
+msgstr ""
+
+#. type: TP
+#: watch.1:181
+#, no-wrap
+msgid "B<other>"
+msgstr "B<其他>"
+
+#. type: Plain text
+#: watch.1:184
+msgid "The watch will propagate command exit status as child exit status."
+msgstr ""
+
+#. type: Plain text
+#: watch.1:209
+msgid "The original B<watch> was written by E<.UR rembo@\\:unisoft.\\:com> Tony Rems E<.UE> in 1991, with mods and corrections by Francois Pinard.  It was reworked and new features added by E<.UR mkc@\\:acm.\\:org> Mike Coleman E<.UE> in 1999. The beep, exec, and error handling features were added by E<.UR morty@\\:frakir.\\:org> Morty Abzug E<.UE> in 2008.  On a not so dark and stormy morning in March of 2003, E<.UR asd@\\:suespammers.\\:org> Anthony DeRobertis E<.UE> got sick of his watches that should update every minute eventually updating many seconds after the minute started, and added microsecond precision.  Unicode support was added in 2009 by E<.UR procps@\\:rrod.\\:net> Jarrod Lowe E<.UE>"
+msgstr ""
diff -Nru procps-3.3.11/NEWS procps-3.3.12/NEWS
--- procps-3.3.11/NEWS	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/NEWS	2016-07-10 06:40:26.000000000 +0000
@@ -1,3 +1,34 @@
+procps-ng-3.3.12
+----------------
+  * libprocps API 6:0:0
+  * build: formerly optional --enable-oomem unconditional
+  * free: man document rewritten for shared                Debian #755233
+  * free: interpret intervals in non-locale way            Debian #692113
+  * kill: report error if cannot kill process              Debian #733172
+  * library: refine calculation of 'cached' memory
+  * library: find tty quicker                              Debian #770215
+  * library: eliminate threads display inconsistencies     Redhat #1284091
+  * pidof: check cmd if space found in argv0
+  * pmap: fixed detail parsing on long mapping lines
+  * pmap: fix occasional incorrect memory usage values     Redhat #1262864
+  * ps: sort by cgroup                                     Debian #692279
+  * ps: display control group name with -o cgname
+  * ps: fallback to attr/current for context               Debian #786956
+  * ps: enabled broken 'thcount' option                    Redhat #1174313
+  * tests: conditionally add prctl                         Debian #816237
+  * top: displays the 3 new linux-4.5 RES memory fields
+  * top: man page memory fields corrected + new narrative
+  * top: added display of CGNAME (control group name)
+  * top: is now more responsive to cpus brought online
+  * top: namespace cols use suppressible zero
+  * top: zero suppress ('0') includes out-of-memory & nice
+  * top: better 'i' toggle management when scrolled
+  * top: the '=' key now includes active locate requests
+  * vmstat: devices exceeding 15 chars now displayed       Redhat #586078
+  * watch: hostname added to header
+  * watch: better handling ANSI including esc[m            Debian #830313
+  * watch: use locale-independent float                    Debian #692113
+
 procps-ng-3.3.11
 ----------------
   * libprocps API 5:0:0
diff -Nru procps-3.3.11/pidof.c procps-3.3.12/pidof.c
--- procps-3.3.11/pidof.c	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/pidof.c	2016-07-10 06:40:26.000000000 +0000
@@ -210,6 +210,12 @@
 					match = 1;
 				}
 			}
+            /* If there is a space in arg0 then process probably has
+             * setproctitle so use the cmdline
+             */
+            if (!match && strchr(cmd_arg0, ' ')) {
+                match = (strcmp(program, task.cmd)==0);
+            }
 
 			safe_free(exe_link);
 
diff -Nru procps-3.3.11/pmap.c procps-3.3.12/pmap.c
--- procps-3.3.11/pmap.c	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/pmap.c	2016-07-10 06:40:26.000000000 +0000
@@ -201,7 +201,7 @@
 		perror(_("shared memory detach"));
 
 out_destroy:
-	if (shmctl(shmid, IPC_RMID, NULL))
+	if (shmctl(shmid, IPC_RMID, NULL) && errno != EINVAL)
 		perror(_("shared memory remove"));
 
 	return;
@@ -314,17 +314,17 @@
 	while (ret != NULL) {
 		/* === READ MAPPING === */
 		map_desc[0] = '\0';
-		c = '\n';
 		nfields = sscanf(mapbuf,
 				 "%"NUML"[0-9a-f]-%"NUML"[0-9a-f] "
 				 "%"DETL"s %"NUML"[0-9a-f] "
-				 "%63[0-9a-f:] %"NUML"s %127[^\n]%c",
+				 "%63[0-9a-f:] %"NUML"s %127[^\n]",
 				 start, end, perms, offset,
-				 dev, inode, map_desc, &c);
+				 dev, inode, map_desc);
 		/* Must read at least up to inode, else something has changed! */
 		if (nfields < 6)
 			xerrx(EXIT_FAILURE, _("Unknown format in smaps file!"));
 		/* If line too long we dump everything else. */
+		c = mapbuf[strlen(mapbuf) - 1];
 		while (c != '\n') {
 			ret = fgets(mapbuf, sizeof mapbuf, f);
 			c = mapbuf[strlen(mapbuf) - 1];
@@ -629,9 +629,9 @@
 					diff = 0;
 					continue;
 				}
-				/* Other keys */
-				continue;
 			}
+			/* Other keys or not a key-value pair */
+			continue;
 		}
 		sscanf(mapbuf, "%" KLF "x-%" KLF "x %31s %llx %x:%x %llu", &start,
 		       &end, perms, &file_offset, &dev_major, &dev_minor,
Binary files /tmp/tmpsmX0gC/RRPDCxm9wk/procps-3.3.11/po/de.gmo and /tmp/tmpsmX0gC/hzIsJzyyeF/procps-3.3.12/po/de.gmo differ
diff -Nru procps-3.3.11/po/de.po procps-3.3.12/po/de.po
--- procps-3.3.11/po/de.po	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/po/de.po	2016-07-10 06:40:26.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: procps-ng-3.3.10-rc1\n"
 "Report-Msgid-Bugs-To: procps@freelists.org\n"
-"POT-Creation-Date: 2015-08-09 15:59+1000\n"
+"POT-Creation-Date: 2016-07-10 08:19+1000\n"
 "PO-Revision-Date: 2014-09-10 20:18+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -18,7 +18,7 @@
 "X-Generator: Poedit 1.5.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: free.c:74 slabtop.c:189 uptime.c:59 w.c:449
+#: free.c:74 slabtop.c:189 uptime.c:59 w.c:453
 #, c-format
 msgid " %s [options]\n"
 msgstr " %s [OPTIONEN]\n"
@@ -106,7 +106,7 @@
 msgid " -w, --wide          wide output\n"
 msgstr " -w, --wide          breite Ausgabe\n"
 
-#: free.c:95 w.c:458
+#: free.c:95 w.c:462
 msgid "     --help     display this help and exit\n"
 msgstr "      --help     diese Hilfe anzeigen und beenden\n"
 
@@ -114,26 +114,21 @@
 msgid "Multiple unit options doesn't make sense."
 msgstr ""
 
-#: free.c:329
-#, c-format
-msgid "seconds argument `%s' failed"
-msgstr "Sekunden-Argument »%s« fehlgeschlagen "
-
-#: free.c:332
+#: free.c:330
 #, c-format
 msgid "seconds argument `%s' is not positive number"
 msgstr "Sekunden-Argument »%s« ist keine positive Zahl"
 
-#: free.c:338
+#: free.c:336
 msgid "failed to parse count argument"
 msgstr "Anzahl im Argument konnte nicht verarbeitet werden"
 
-#: free.c:341
+#: free.c:339
 #, c-format
 msgid "failed to parse count argument: '%s'"
 msgstr "Anzahl im Argument konnte nicht verarbeitet werden: »%s«"
 
-#: free.c:362
+#: free.c:360
 #, c-format
 msgid ""
 "              total        used        free      shared     buffers       "
@@ -142,7 +137,7 @@
 "              gesamt       benutzt     frei      gemeins.   Puffer        "
 "Cache   verfügbar"
 
-#: free.c:364
+#: free.c:362
 #, c-format
 msgid ""
 "              total        used        free      shared  buff/cache   "
@@ -151,23 +146,23 @@
 "              gesamt       benutzt     frei      gemns.  Puffer/Cache "
 "verfügbar"
 
-#: free.c:367
+#: free.c:365
 msgid "Mem:"
 msgstr "Speicher:"
 
-#: free.c:387
+#: free.c:385
 msgid "Low:"
 msgstr "Niedrig:"
 
-#: free.c:393
+#: free.c:391
 msgid "High:"
 msgstr "Hoch:"
 
-#: free.c:400
+#: free.c:398
 msgid "Swap:"
 msgstr "Swap:"
 
-#: free.c:407
+#: free.c:405
 msgid "Total:"
 msgstr "Gesamt:"
 
@@ -323,7 +318,7 @@
 msgid "Error reading reference namespace information\n"
 msgstr "Fehler beim Lesen der Informationen für den Referenz-Namensraum\n"
 
-#: pgrep.c:610 pidof.c:224 pidof.c:265 sysctl.c:643
+#: pgrep.c:610 pidof.c:230 pidof.c:271 sysctl.c:643
 msgid "internal error"
 msgstr "Interner Fehler"
 
@@ -399,7 +394,7 @@
 " -o, --omit-pid <PID, …>   Prozesse mit den angegebenen PID(s)\n"
 "                           auslassen\n"
 
-#: pidof.c:268
+#: pidof.c:274
 #, c-format
 msgid "illegal omit pid value (%s)!\n"
 msgstr "Ungültiger Wert für auszulassende PID (%s)!\n"
@@ -522,7 +517,7 @@
 msgid "  [ stack ]"
 msgstr "  [ stack ]"
 
-#: pmap.c:326
+#: pmap.c:325
 msgid "Unknown format in smaps file!"
 msgstr "Unbekanntes Format in smaps-Datei!"
 
@@ -553,8 +548,8 @@
 msgid " total %8ldK\n"
 msgstr " gesamt %8ldK\n"
 
-#: pmap.c:767 skill.c:500 skill.c:533 skill.c:620 tload.c:128 tload.c:133
-#: vmstat.c:959 vmstat.c:968 watch.c:708
+#: pmap.c:767 skill.c:500 skill.c:534 skill.c:621 tload.c:128 tload.c:133
+#: vmstat.c:959 vmstat.c:968 watch.c:726
 msgid "failed to parse argument"
 msgstr "Argument konnte nicht eingelesen werden"
 
@@ -644,8 +639,8 @@
 msgid "Signal %d (%s) caught by %s (%s).\n"
 msgstr "Signal %d (%s) empfangen von %s (%s).\n"
 
-#: ps/display.c:66 ps/display.c:271 ps/parser.c:509 ps/parser.c:756
-#: ps/select.c:95 ps/sortformat.c:550
+#: ps/display.c:66 ps/display.c:271 ps/parser.c:495 ps/parser.c:742
+#: ps/select.c:95 ps/sortformat.c:544
 msgid "please report this bug"
 msgstr "Bitte melden Sie diesen Fehler"
 
@@ -692,7 +687,7 @@
 #. .
 #. . It must be limited to 15 characters or less.
 #.
-#: ps/global.c:408
+#: ps/global.c:401
 msgid "help"
 msgstr "Hilfe"
 
@@ -1119,295 +1114,295 @@
 "\n"
 "Für weitere Informationen siehe ps(1).\n"
 
-#: ps/output.c:1971
+#: ps/output.c:1969
 #, c-format
 msgid "fix bigness error\n"
 msgstr ""
 
-#: ps/output.c:2046
+#: ps/output.c:2044
 #, c-format
 msgid "bad alignment code\n"
 msgstr "fehlerhafter Ausrichtungscode\n"
 
-#: ps/output.c:2108
+#: ps/output.c:2106
 #, c-format
 msgid "unknown page size (assume 4096)\n"
 msgstr "unbekannte Seitengröße (4096 wird angenommen)\n"
 
-#: ps/parser.c:58
+#: ps/parser.c:57
 msgid "the option is exclusive: "
 msgstr "die Option ist exklusiv"
 
-#: ps/parser.c:89
+#: ps/parser.c:87
 msgid "process ID list syntax error"
 msgstr "Syntaxfehler in Prozess-ID-Liste"
 
-#: ps/parser.c:90 ps/parser.c:91
+#: ps/parser.c:88 ps/parser.c:89
 msgid "process ID out of range"
 msgstr "Prozess-ID ist außerhalb des gültigen Bereichs"
 
-#: ps/parser.c:104
+#: ps/parser.c:102
 msgid "user name does not exist"
 msgstr "Benutzername existiert nicht"
 
-#: ps/parser.c:110
+#: ps/parser.c:108
 msgid "user ID out of range"
 msgstr "Benutzer-ID ist außerhalb des gültigen Bereichs"
 
-#: ps/parser.c:123
+#: ps/parser.c:121
 msgid "group name does not exist"
 msgstr "Gruppenname existiert nicht"
 
-#: ps/parser.c:129
+#: ps/parser.c:127
 msgid "group ID out of range"
 msgstr "Gruppen-ID ist außerhalb des gültigen Bereichs"
 
-#: ps/parser.c:145 ps/parser.c:169
+#: ps/parser.c:143 ps/parser.c:167
 msgid "TTY could not be found"
 msgstr "TTY wurde nicht gefunden"
 
-#: ps/parser.c:171
+#: ps/parser.c:169
 msgid "list member was not a TTY"
 msgstr "Listenelement war kein TTY"
 
-#: ps/parser.c:196
+#: ps/parser.c:194
 msgid "improper list"
 msgstr "ungültige Liste"
 
-#: ps/parser.c:256
+#: ps/parser.c:242
 msgid "list of command names must follow -C"
 msgstr "Liste von Befehlsnamen muss auf -C folgen"
 
-#: ps/parser.c:270
+#: ps/parser.c:256
 msgid "list of real groups must follow -G"
 msgstr "Liste von realen Gruppen muss auf -G folgen"
 
-#: ps/parser.c:283
+#: ps/parser.c:269
 msgid "list of jobs must follow -J"
 msgstr "Jobliste muss auf -J folgen"
 
-#: ps/parser.c:311
+#: ps/parser.c:297
 msgid "format or sort specification must follow -O"
 msgstr "Format- oder Sortierspezifikation muss auf -O folgen"
 
-#: ps/parser.c:322
+#: ps/parser.c:308
 msgid "list of PRM groups must follow -R"
 msgstr "Liste von PRM-Gruppen muss auf -R folgen"
 
-#: ps/parser.c:341
+#: ps/parser.c:327
 msgid "list of real users must follow -U"
 msgstr "Liste von realen Benutzern muss auf -U folgen"
 
-#: ps/parser.c:382
+#: ps/parser.c:368
 msgid "list of session leaders OR effective group names must follow -g"
 msgstr "Auf Liste der Session Leaders ODER effektiven Gruppe muss -g folgen"
 
-#: ps/parser.c:393
+#: ps/parser.c:379
 msgid "list of session leaders OR effective group IDs was invalid"
 msgstr "Liste der Session Leaders ODER effektiven Gruppen-IDs war ungültig"
 
-#: ps/parser.c:417
+#: ps/parser.c:403
 msgid "format specification must follow -o"
 msgstr "Formatspezifikation muss auf -o folgen"
 
-#: ps/parser.c:423
+#: ps/parser.c:409
 msgid "list of process IDs must follow -p"
 msgstr "Liste von Prozess-IDs muss auf -p folgen"
 
-#: ps/parser.c:440
+#: ps/parser.c:426
 msgid "the -r option is reserved"
 msgstr "die Option -r ist reserviert"
 
-#: ps/parser.c:446
+#: ps/parser.c:432
 msgid "list of session IDs must follow -s"
 msgstr "Liste von Sitzungs-IDs muss auf -s folgen"
 
-#: ps/parser.c:454
+#: ps/parser.c:440
 msgid "list of terminals (pty, tty...) must follow -t"
 msgstr "Auf Liste von Terminals (pty, tty …) muss -t folgen"
 
-#: ps/parser.c:462
+#: ps/parser.c:448
 msgid "list of users must follow -u"
 msgstr "Benutzerliste muss auf -u folgen"
 
-#: ps/parser.c:484
+#: ps/parser.c:470
 msgid "must set personality to get -x option"
 msgstr ""
 
-#: ps/parser.c:499
+#: ps/parser.c:485
 msgid "list of zones (contexts, labels, whatever?) must follow -z"
 msgstr ""
 
-#: ps/parser.c:506
+#: ps/parser.c:492
 msgid "embedded '-' among SysV options makes no sense"
 msgstr "in SysV-Optionen eingebettetes »-« ergibt keinen Sinn "
 
-#: ps/parser.c:512
+#: ps/parser.c:498
 msgid "unsupported SysV option"
 msgstr "nicht unterstützte SysV-Option"
 
-#: ps/parser.c:525
+#: ps/parser.c:511
 msgid "cannot happen - problem #1"
 msgstr "darf nicht passieren - Problem #1"
 
-#: ps/parser.c:529
+#: ps/parser.c:515
 msgid "cannot happen - problem #2"
 msgstr "darf nicht passieren - Problem #2"
 
-#: ps/parser.c:531
+#: ps/parser.c:517
 msgid "second chance parse failed, not BSD or SysV"
 msgstr "erneutes Einlesen ist fehlgeschlagen, weder BSD noch SysV"
 
-#: ps/parser.c:548
+#: ps/parser.c:534
 msgid "option A is reserved"
 msgstr "Option A ist reserviert"
 
-#: ps/parser.c:553
+#: ps/parser.c:539
 msgid "option C is reserved"
 msgstr "Option C ist reserviert"
 
-#: ps/parser.c:573
+#: ps/parser.c:559
 msgid "format or sort specification must follow O"
 msgstr "Format- oder Sortierspezifikation muss auf O folgen"
 
-#: ps/parser.c:598
+#: ps/parser.c:584
 msgid "list of users must follow U"
 msgstr "Benutzerliste muss auf U folgen"
 
-#: ps/parser.c:610
+#: ps/parser.c:596
 msgid "obsolete W option not supported (you have a /dev/drum?)"
 msgstr ""
 "die veraltete Option W wird nicht unterstützt (haben Sie ein /dev/drum?)"
 
-#: ps/parser.c:646 ps/parser.c:913 ps/parser.c:922
+#: ps/parser.c:632 ps/parser.c:899 ps/parser.c:908
 msgid "only one heading option may be specified"
 msgstr "Nur eine Heading-Option darf angegeben werden"
 
-#: ps/parser.c:661
+#: ps/parser.c:647
 msgid "long sort specification must follow 'k'"
 msgstr "lange Sortierspezifikation muss auf »k« folgen"
 
-#: ps/parser.c:689
+#: ps/parser.c:675
 msgid "format specification must follow o"
 msgstr "Formatspezifikation muss auf o folgen"
 
-#: ps/parser.c:695
+#: ps/parser.c:681
 msgid "list of process IDs must follow p"
 msgstr "Liste von Prozess-IDs muss auf p folgen"
 
-#: ps/parser.c:753
+#: ps/parser.c:739
 msgid "embedded '-' among BSD options makes no sense"
 msgstr "in BSD-Optionen eingebettetes »-« ergibt keinen Sinn "
 
-#: ps/parser.c:759
+#: ps/parser.c:745
 msgid "unsupported option (BSD syntax)"
 msgstr "nicht unterstützte Option (BSD-Syntax)"
 
-#: ps/parser.c:845 ps/parser.c:857
+#: ps/parser.c:831 ps/parser.c:843
 msgid "unknown gnu long option"
 msgstr "unbekannte lange GNU-Option"
 
-#: ps/parser.c:865
+#: ps/parser.c:851
 msgid "list of real groups must follow --Group"
 msgstr "Liste von realen Gruppen muss auf --Group folgen"
 
-#: ps/parser.c:873
+#: ps/parser.c:859
 msgid "list of real users must follow --User"
 msgstr "Liste von realen Benutzern muss auf --User folgen"
 
-#: ps/parser.c:892
+#: ps/parser.c:878
 msgid "number of columns must follow --cols, --width, or --columns"
 msgstr "Anzahl der Spalten muss auf --cols, --width oder --columns folgen"
 
-#: ps/parser.c:895
+#: ps/parser.c:881
 msgid "option --cumulative does not take an argument"
 msgstr "Option --cumulative akzeptiert kein Argument"
 
-#: ps/parser.c:900
+#: ps/parser.c:886
 msgid "option --deselect does not take an argument"
 msgstr "Option --deselect akzeptiert kein Argument"
 
-#: ps/parser.c:912
+#: ps/parser.c:898
 msgid "option --no-heading does not take an argument"
 msgstr "Option --no-heading akzeptiert kein Argument"
 
-#: ps/parser.c:921
+#: ps/parser.c:907
 msgid "option --heading does not take an argument"
 msgstr "Option --heading akzeptiert kein Argument"
 
-#: ps/parser.c:927
+#: ps/parser.c:913
 msgid "option --forest does not take an argument"
 msgstr "Option --forest akzeptiert kein Argument"
 
-#: ps/parser.c:933
+#: ps/parser.c:919
 msgid "format specification must follow --format"
 msgstr "Formatspezifikation muss auf --format folgen"
 
-#: ps/parser.c:939
+#: ps/parser.c:925
 msgid "list of effective groups must follow --group"
 msgstr "Liste von effektiven Gruppen muss auf --group folgen"
 
-#: ps/parser.c:957
+#: ps/parser.c:943
 msgid "list of process IDs must follow --pid"
 msgstr "Liste von Prozess-IDs muss auf --pid folgen"
 
-#: ps/parser.c:973
+#: ps/parser.c:959
 msgid "list of process IDs must follow --ppid"
 msgstr "Liste von Prozess-IDs muss auf --ppid folgen"
 
-#: ps/parser.c:991
+#: ps/parser.c:977
 msgid "number of rows must follow --rows or --lines"
 msgstr "Anzahl der Zeilen muss auf --rows oder --lines folgen"
 
-#: ps/parser.c:995
+#: ps/parser.c:981
 msgid "some sid thing(s) must follow --sid"
 msgstr ""
 
-#: ps/parser.c:1003
+#: ps/parser.c:989
 msgid "long sort specification must follow --sort"
 msgstr "lange Sortierspezifikation muss auf --sort folgen"
 
-#: ps/parser.c:1009
+#: ps/parser.c:995
 msgid "list of ttys must follow --tty"
 msgstr "Liste von Terminals muss auf -tty folgen"
 
-#: ps/parser.c:1017
+#: ps/parser.c:1003
 msgid "list of effective users must follow --user"
 msgstr "Liste von realen Benutzern muss auf --user folgen"
 
-#: ps/parser.c:1134
+#: ps/parser.c:1119
 msgid "way bad"
 msgstr ""
 
-#: ps/parser.c:1148
+#: ps/parser.c:1133
 msgid "garbage option"
 msgstr ""
 
-#: ps/parser.c:1152
+#: ps/parser.c:1137
 msgid "something broke"
 msgstr ""
 
-#: ps/parser.c:1172
+#: ps/parser.c:1157
 msgid "thread display conflicts with forest display"
 msgstr "Konflikt zwischen Thread- und Baumansicht"
 
-#: ps/parser.c:1177
+#: ps/parser.c:1162
 msgid "thread flags conflict; can't use H with m or -m"
 msgstr ""
 "Konflikt der Thread-Schalter; H kann nicht mit m oder -m verwendet werden"
 
-#: ps/parser.c:1179
+#: ps/parser.c:1164
 msgid "thread flags conflict; can't use both m and -m"
 msgstr ""
 "Konflikt der Thread-Schalter; m und -m können nicht zusammen verwendet werden"
 
-#: ps/parser.c:1181
+#: ps/parser.c:1166
 msgid "thread flags conflict; can't use both -L and -T"
 msgstr ""
 "Konflikt der Thread-Schalter; -L und -T können nicht zusammen verwendet "
 "werden"
 
-#: ps/parser.c:1255 ps/parser.c:1256
+#: ps/parser.c:1239 ps/parser.c:1240
 #, c-format
 msgid "error: %s\n"
 msgstr "Fehler: %s\n"
@@ -1416,137 +1411,137 @@
 msgid "process selection options conflict"
 msgstr "Optionen zur Prozessauswahl stehen im Konflikt"
 
-#: ps/sortformat.c:107 ps/sortformat.c:112
+#: ps/sortformat.c:106 ps/sortformat.c:111
 msgid "seriously crashing: goodbye cruel world"
 msgstr "Ernsthafter Absturz: Goodbye cruel world"
 
-#: ps/sortformat.c:147
+#: ps/sortformat.c:146
 msgid "improper AIX field descriptor"
 msgstr "ungültiger AIX-Felddeskriptor"
 
-#: ps/sortformat.c:168
+#: ps/sortformat.c:167
 msgid "unknown AIX field descriptor"
 msgstr "unbekannter AIX-Felddeskriptor"
 
-#: ps/sortformat.c:173
+#: ps/sortformat.c:172
 msgid "AIX field descriptor processing bug"
 msgstr ""
 
-#: ps/sortformat.c:290
+#: ps/sortformat.c:285
 #, c-format
 msgid "unknown user-defined format specifier \"%s\""
 msgstr "unbekannter benutzerdefinierter Formatbezeichner »%s«"
 
-#: ps/sortformat.c:316
+#: ps/sortformat.c:311
 msgid "empty format list"
 msgstr "leere Formatliste"
 
-#: ps/sortformat.c:317
+#: ps/sortformat.c:312
 msgid "improper format list"
 msgstr "unzulässige Formatliste"
 
-#: ps/sortformat.c:318
+#: ps/sortformat.c:313
 msgid "column widths must be unsigned decimal numbers"
 msgstr ""
 "Spaltenbreiten müssen in Dezimalzahlen ohne Vorzeichen angegeben werden"
 
-#: ps/sortformat.c:319
+#: ps/sortformat.c:314
 msgid "can not set width for a macro (multi-column) format specifier"
 msgstr ""
 "Breite kann für einen Makro- (mehrspaltigen) Formatbezeichner nicht gesetzt "
 "werden"
 
-#: ps/sortformat.c:372 ps/sortformat.c:388
+#: ps/sortformat.c:367 ps/sortformat.c:383
 msgid "improper sort list"
 msgstr "ungültige Sortierliste"
 
-#: ps/sortformat.c:383
+#: ps/sortformat.c:378
 msgid "empty sort list"
 msgstr "leere Sortierliste"
 
-#: ps/sortformat.c:404 ps/sortformat.c:482 ps/sortformat.c:484
+#: ps/sortformat.c:399 ps/sortformat.c:477 ps/sortformat.c:479
 msgid "unknown sort specifier"
 msgstr "unbekannter Sortierungsbezeichner"
 
-#: ps/sortformat.c:431 ps/sortformat.c:442 ps/sortformat.c:448
+#: ps/sortformat.c:426 ps/sortformat.c:437 ps/sortformat.c:443
 msgid "bad sorting code"
 msgstr "fehlerhafter Sortiercode"
 
-#: ps/sortformat.c:445
+#: ps/sortformat.c:440
 msgid "PPID sort and forest output conflict"
 msgstr "Konflikt zwischen PID-Sortierung und Baumansicht"
 
-#: ps/sortformat.c:520
+#: ps/sortformat.c:514
 msgid "option -O can not follow other format options"
 msgstr "Option -O kann nicht auf andere Formatoptionen folgen"
 
-#: ps/sortformat.c:527 ps/sortformat.c:545
+#: ps/sortformat.c:521 ps/sortformat.c:539
 msgid "multiple sort options"
 msgstr "mehrfache Sortieroptionen"
 
-#: ps/sortformat.c:535
+#: ps/sortformat.c:529
 msgid "option O is neither first format nor sort order"
 msgstr "Option O ist weder erstes Format noch Sortierreihenfolge"
 
-#: ps/sortformat.c:662
+#: ps/sortformat.c:656
 msgid "modifier -y without format -l makes no sense"
 msgstr "Modifikator -y ohne Format -l ergibt keinen Sinn"
 
-#: ps/sortformat.c:765
+#: ps/sortformat.c:756
 msgid "bug: must reset the list first"
 msgstr "Fehler: die Liste muss zuerst zurückgesetzt werden"
 
-#: ps/sortformat.c:803
+#: ps/sortformat.c:794
 msgid "tell <procps@freelists.org> what you expected"
 msgstr "Teilen Sie auf <procps@freelists.org> mit, was Sie erwartet haben."
 
-#: ps/sortformat.c:813
+#: ps/sortformat.c:804
 msgid ""
 "tell <procps@freelists.org> what you want (-L/-T, -m/m/H, and $PS_FORMAT)"
 msgstr ""
 "Teilen Sie auf <procps@freelists.org> mit, was Sie wollen (-L/-T, -m/m/H und "
 "$PS_FORMAT)."
 
-#: ps/sortformat.c:830
+#: ps/sortformat.c:821
 #, c-format
 msgid "warning: $PS_FORMAT ignored. (%s)\n"
 msgstr "Warnung: $PS_FORMAT wird ignoriert. (%s)\n"
 
-#: ps/sortformat.c:835 ps/sortformat.c:845
+#: ps/sortformat.c:826 ps/sortformat.c:836
 msgid "conflicting format options"
 msgstr "widersprüchliche Formatoptionen"
 
-#: ps/sortformat.c:836
+#: ps/sortformat.c:827
 msgid "can not use output modifiers with user-defined output"
 msgstr ""
 "Ausgabemodifikatoren können bei benutzerdefinierter Ausgabe nicht verwendet "
 "werden"
 
-#: ps/sortformat.c:837
+#: ps/sortformat.c:828
 msgid "-L/-T with H/m/-m and -o/-O/o/O is nonsense"
 msgstr "-L/-T mit H/m/-m und -o/-O/o/O ist Unsinn"
 
-#: ps/sortformat.c:895
+#: ps/sortformat.c:886
 msgid "internal error: no PID or PPID for -j option"
 msgstr "interner Fehler: keine PID oder PPID für Option -j"
 
-#: ps/sortformat.c:897
+#: ps/sortformat.c:888
 msgid "lost my PGID"
 msgstr "Prozessgruppen-ID verloren"
 
-#: ps/sortformat.c:910
+#: ps/sortformat.c:901
 msgid "internal error: no PRI for -c option"
 msgstr "interner Fehler: keine PRI für Option -c"
 
-#: ps/sortformat.c:913
+#: ps/sortformat.c:904
 msgid "lost my CLS"
 msgstr "CLS verloren"
 
-#: ps/sortformat.c:918
+#: ps/sortformat.c:909
 msgid "-T with H/-m/m but no PID for SPID to follow"
 msgstr "-T mit H/-m/m, aber keine PID für SPID zum Folgen"
 
-#: ps/sortformat.c:929
+#: ps/sortformat.c:920
 msgid "-L with H/-m/m but no PID/PGID/SID/SESS for NLWP to follow"
 msgstr "-L mit H/-m/m, aber keine PID/PGID/SID/SESS für NLWP zum Folgen"
 
@@ -1725,46 +1720,46 @@
 msgid "invalid argument %c"
 msgstr "ungültiges Argument %c"
 
-#: skill.c:513
+#: skill.c:514
 #, c-format
 msgid "something at line %d\n"
 msgstr "etwas in Zeile %d\n"
 
-#: skill.c:536
+#: skill.c:537
 #, c-format
 msgid "priority %lu out of range"
 msgstr "Priorität %lu ist außerhalb des Wertebereiches"
 
-#: skill.c:649
+#: skill.c:650
 #, c-format
 msgid "invalid pid number %s"
 msgstr "ungültige PID-Nummer %s"
 
-#: skill.c:653
+#: skill.c:654
 msgid "error reading reference namespace information"
 msgstr "Fehler beim Lesen der Informationen für Referenz-Namensraum"
 
-#: skill.c:661
+#: skill.c:662
 msgid "invalid namespace list"
 msgstr "Ungültige Namensraumliste"
 
-#: skill.c:699
+#: skill.c:700
 msgid "no process selection criteria"
 msgstr "Keine Kriterien zur Prozessauswahl"
 
-#: skill.c:702
+#: skill.c:703
 msgid "general flags may not be repeated"
 msgstr "Allgemeine Schalter dürfen nicht wiederholt angegeben werden"
 
-#: skill.c:705
+#: skill.c:706
 msgid "-i makes no sense with -v, -f, and -n"
 msgstr "-i ergibt keinen Sinn mit -v, -f und -n"
 
-#: skill.c:707
+#: skill.c:708
 msgid "-v makes no sense with -i and -f"
 msgstr "-v ergibt keinen Sinn mit -i und -f"
 
-#: skill.c:752
+#: skill.c:753
 #, c-format
 msgid "skill: \"%s\" is not supported\n"
 msgstr "skill: »%s« wird nicht unterstützt\n"
@@ -2120,7 +2115,7 @@
 msgstr "Effektive Benutzer‐ID"
 
 #. Translation Hint: maximum 'USER' = 7
-#: top/top_nls.c:133 w.c:587
+#: top/top_nls.c:133 w.c:591
 msgid "USER"
 msgstr "USER"
 
@@ -2444,125 +2439,172 @@
 msgid "Thread Group Id"
 msgstr "Threadgruppen-ID"
 
-#. Translation Hint: maximum 'Adj' = 3
-#: top/top_nls.c:242
-msgid "Adj"
-msgstr "Adj"
+#. Translation Hint: maximum 'OOMa' = 5
+#: top/top_nls.c:241
+msgid "OOMa"
+msgstr ""
 
-#: top/top_nls.c:243
-msgid "oom_adjustment (2^X)"
+#: top/top_nls.c:242
+msgid "OOMEM Adjustment"
 msgstr ""
 
-#. Translation Hint: maximum 'Badness' = 7
-#: top/top_nls.c:245
-msgid "Badness"
+#. Translation Hint: maximum 'OOMs' = 4
+#: top/top_nls.c:244
+msgid "OOMs"
 msgstr ""
 
-#: top/top_nls.c:246
-msgid "oom_score (badness)"
+#: top/top_nls.c:245
+msgid "OOMEM Score current"
 msgstr ""
 
 #. Translation Hint: maximum 'ENVIRON' = 7
-#: top/top_nls.c:249
+#: top/top_nls.c:247
 msgid "ENVIRON"
 msgstr ""
 
 #. Translation Hint: the abbreviation 'vars' below is shorthand for
 #. 'variables'
-#: top/top_nls.c:252
+#: top/top_nls.c:250
 msgid "Environment vars"
 msgstr "Umgebungsvariablen"
 
 #. Translation Hint: maximum 'vMj' = 3
-#: top/top_nls.c:254
+#: top/top_nls.c:252
 msgid "vMj"
 msgstr "vMj"
 
-#: top/top_nls.c:255
+#: top/top_nls.c:253
 msgid "Major Faults delta"
 msgstr ""
 
 #. Translation Hint: maximum 'vMn' = 3
-#: top/top_nls.c:257
+#: top/top_nls.c:255
 msgid "vMn"
 msgstr "vMn"
 
-#: top/top_nls.c:258
+#: top/top_nls.c:256
 msgid "Minor Faults delta"
 msgstr ""
 
 #. Translation Hint: maximum 'USED' = 4
-#: top/top_nls.c:260
+#: top/top_nls.c:258
 msgid "USED"
 msgstr "USED"
 
-#: top/top_nls.c:261
+#: top/top_nls.c:259
 msgid "Res+Swap Size (KiB)"
 msgstr ""
 
 #. Translation Hint: maximum 'nsIPC' = 7
-#: top/top_nls.c:263
+#: top/top_nls.c:261
 msgid "nsIPC"
 msgstr "nsIPC"
 
-#: top/top_nls.c:264
+#: top/top_nls.c:262
 msgid "IPC namespace Inode"
 msgstr "Inode für IPC-Namensraum"
 
 #. Translation Hint: maximum 'nsMNT' = 7
-#: top/top_nls.c:266
+#: top/top_nls.c:264
 msgid "nsMNT"
 msgstr "nsMNT"
 
-#: top/top_nls.c:267
+#: top/top_nls.c:265
 msgid "MNT namespace Inode"
 msgstr "Inode für MNT-Namensraum"
 
 #. Translation Hint: maximum 'nsNET' = 7
-#: top/top_nls.c:269
+#: top/top_nls.c:267
 msgid "nsNET"
 msgstr "nsNET"
 
-#: top/top_nls.c:270
+#: top/top_nls.c:268
 msgid "NET namespace Inode"
 msgstr "Inode für NET-Namensraum"
 
 #. Translation Hint: maximum 'nsPID' = 7
-#: top/top_nls.c:272
+#: top/top_nls.c:270
 msgid "nsPID"
 msgstr "nsPID"
 
-#: top/top_nls.c:273
+#: top/top_nls.c:271
 msgid "PID namespace Inode"
 msgstr "Inode für Prozess-ID-Namensraum"
 
 #. Translation Hint: maximum 'nsUSER' = 7
-#: top/top_nls.c:275
+#: top/top_nls.c:273
 msgid "nsUSER"
 msgstr "nsUSER"
 
-#: top/top_nls.c:276
+#: top/top_nls.c:274
 msgid "USER namespace Inode"
 msgstr "Inode für Benutzer-Namensraum"
 
 #. Translation Hint: maximum 'nsUTS' = 7
-#: top/top_nls.c:278
+#: top/top_nls.c:276
 msgid "nsUTS"
 msgstr "nsUTS"
 
-#: top/top_nls.c:279
+#: top/top_nls.c:277
 msgid "UTS namespace Inode"
 msgstr "Inode für UTS-Namensraum"
 
 #. Translation Hint: maximum 'LXC' = 7
-#: top/top_nls.c:281
+#: top/top_nls.c:279
 msgid "LXC"
 msgstr ""
 
-#: top/top_nls.c:282
+#: top/top_nls.c:280
 msgid "LXC container name"
 msgstr ""
 
+#. Translation Hint: maximum 'RSan' = 4
+#: top/top_nls.c:282
+msgid "RSan"
+msgstr ""
+
+#: top/top_nls.c:283
+msgid "RES Anonymous (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'RSfd' = 4
+#: top/top_nls.c:285
+msgid "RSfd"
+msgstr ""
+
+#: top/top_nls.c:286
+msgid "RES File-based (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'RSlk' = 4
+#: top/top_nls.c:288
+msgid "RSlk"
+msgstr ""
+
+#: top/top_nls.c:289
+msgid "RES Locked (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'RSsh' = 4
+#: top/top_nls.c:291
+msgid "RSsh"
+msgstr ""
+
+#: top/top_nls.c:292
+#, fuzzy
+msgid "RES Shared (KiB)"
+msgstr "Gemeinsam genutzter Speicher (KiB)"
+
+#. Translation Hint: maximum 'CGNAME' = 7
+#: top/top_nls.c:294
+msgid "CGNAME"
+msgstr ""
+
+#: top/top_nls.c:295
+#, fuzzy
+msgid "Control Group name"
+msgstr "Kontrollgruppen"
+
 #. Translation Notes ------------------------------------------------
 #. .  It is strongly recommend that the --no-wrap command line option
 #. .  be used with all supporting translation tools, when available.
@@ -2573,7 +2615,7 @@
 #. .  and should not be translated without also making corresponding
 #. .  c-code logic changes.
 #. .
-#: top/top_nls.c:302
+#: top/top_nls.c:315
 #, c-format
 msgid ""
 "\tsignal %d (%s) was caught by %s, please\n"
@@ -2582,7 +2624,7 @@
 "\tSignal %d (%s) wurde von %s empfangen,\n"
 "\tsiehe http://www.debian.org/Bugs/Reporting\n"
 
-#: top/top_nls.c:305
+#: top/top_nls.c:318
 #, c-format
 msgid ""
 "inappropriate '%s'\n"
@@ -2593,7 +2635,7 @@
 "Aufruf:\n"
 "  %s%s"
 
-#: top/top_nls.c:308
+#: top/top_nls.c:321
 #, c-format
 msgid ""
 "  %s\n"
@@ -2604,47 +2646,47 @@
 "Aufruf:\n"
 "  %s%s"
 
-#: top/top_nls.c:311
+#: top/top_nls.c:324
 #, c-format
 msgid "failed /proc/stat open: %s"
 msgstr "/proc/stat konnte nicht gelesen werden: %s"
 
-#: top/top_nls.c:312
+#: top/top_nls.c:325
 #, c-format
 msgid "failed openproc: %s"
 msgstr "openproc ist fehlgeschlagen: %s"
 
-#: top/top_nls.c:313
+#: top/top_nls.c:326
 #, c-format
 msgid "bad delay interval '%s'"
 msgstr "ungültiges Verzögerungsintervall »%s«"
 
-#: top/top_nls.c:314
+#: top/top_nls.c:327
 #, c-format
 msgid "bad iterations argument '%s'"
 msgstr "Falsches Argument »%s« für Iterationen"
 
-#: top/top_nls.c:315
+#: top/top_nls.c:328
 #, c-format
 msgid "pid limit (%d) exceeded"
 msgstr "PID-Begrenzung (%d) überschritten"
 
-#: top/top_nls.c:316
+#: top/top_nls.c:329
 #, c-format
 msgid "bad pid '%s'"
 msgstr "ungültige PID »%s«"
 
-#: top/top_nls.c:317
+#: top/top_nls.c:330
 #, c-format
 msgid "-%c requires argument"
 msgstr "-%c benötigt ein Argument"
 
-#: top/top_nls.c:318
+#: top/top_nls.c:331
 #, c-format
 msgid "bad width arg '%s'"
 msgstr "Falsches Breitenargument »%s«"
 
-#: top/top_nls.c:319
+#: top/top_nls.c:332
 #, c-format
 msgid ""
 "unknown option '%c'\n"
@@ -2655,317 +2697,317 @@
 "Aufruf:\n"
 "  %s%s"
 
-#: top/top_nls.c:322
+#: top/top_nls.c:335
 msgid "-d disallowed in \"secure\" mode"
 msgstr "-d ist im »sicheren« Modus deaktiviert"
 
-#: top/top_nls.c:323
+#: top/top_nls.c:336
 msgid "-d requires positive argument"
 msgstr "-d benötigt ein positives Argument"
 
-#: top/top_nls.c:324
+#: top/top_nls.c:337
 msgid "On"
 msgstr "An"
 
-#: top/top_nls.c:325
+#: top/top_nls.c:338
 msgid "Off"
 msgstr "Aus"
 
 #. Translation Hint: Only the following words should be translated
 #. .                 secs (seconds), max (maximum), user, field, cols (columns)
-#: top/top_nls.c:328
+#: top/top_nls.c:341
 msgid " -hv | -bcHiOSs -d secs -n max -u|U user -p pid(s) -o field -w [cols]"
 msgstr ""
 " -hv | -bcHiOSs -d Sekunden -n Max. -u|U Benutzer -p PID(s) -o Feld -w "
 "[Spalten]"
 
-#: top/top_nls.c:329
+#: top/top_nls.c:342
 msgid "failed /proc/stat read"
 msgstr "/proc/stat konnte nicht gelesen werden "
 
-#: top/top_nls.c:330
+#: top/top_nls.c:343
 #, c-format
 msgid "Forest mode %s"
 msgstr "Baum-Modus %s"
 
-#: top/top_nls.c:331
+#: top/top_nls.c:344
 msgid "failed tty get"
 msgstr ""
 
-#: top/top_nls.c:332
+#: top/top_nls.c:345
 #, c-format
 msgid "failed tty set: %s"
 msgstr "Setzen des TTY fehlgeschlagen: %s"
 
-#: top/top_nls.c:333
+#: top/top_nls.c:346
 msgid "Choose field group (1 - 4)"
 msgstr "Feldgruppe wählen (1-4)"
 
-#: top/top_nls.c:334
+#: top/top_nls.c:347
 msgid "Command disabled, 'A' mode required"
 msgstr "Befehl deaktiviert, der A-Modus ist erforderlich"
 
-#: top/top_nls.c:335
+#: top/top_nls.c:348
 #, c-format
 msgid "Command disabled, activate %s with '-' or '_'"
 msgstr "Befehl ist deaktiviert, aktivieren Sie %s mit »-« oder »_«"
 
-#: top/top_nls.c:336
+#: top/top_nls.c:349
 msgid "No colors to map!"
 msgstr "Keine anwendbaren Farben!"
 
-#: top/top_nls.c:337
+#: top/top_nls.c:350
 #, c-format
 msgid "Failed '%s' open: %s"
 msgstr "Öffnen von »%s« ist fehlgeschlagen: %s"
 
-#: top/top_nls.c:338
+#: top/top_nls.c:351
 #, c-format
 msgid "Wrote configuration to '%s'"
 msgstr "Konfiguration wurde nach »%s« geschrieben"
 
-#: top/top_nls.c:339
+#: top/top_nls.c:352
 #, c-format
 msgid "Change delay from %.1f to"
 msgstr ""
 
-#: top/top_nls.c:340
+#: top/top_nls.c:353
 #, c-format
 msgid "Show threads %s"
 msgstr ""
 
-#: top/top_nls.c:341
+#: top/top_nls.c:354
 #, c-format
 msgid "Irix mode %s"
 msgstr "Irix-Modus %s"
 
-#: top/top_nls.c:342
+#: top/top_nls.c:355
 #, c-format
 msgid "PID to signal/kill [default pid = %d]"
 msgstr ""
 
-#: top/top_nls.c:343
+#: top/top_nls.c:356
 #, c-format
 msgid "Send pid %d signal [%d/sigterm]"
 msgstr ""
 
-#: top/top_nls.c:344
+#: top/top_nls.c:357
 #, c-format
 msgid "Failed signal pid '%d' with '%d': %s"
 msgstr ""
 
-#: top/top_nls.c:345
+#: top/top_nls.c:358
 msgid "Invalid signal"
 msgstr "Ungültiges Signal"
 
-#: top/top_nls.c:346
+#: top/top_nls.c:359
 #, c-format
 msgid "PID to renice [default pid = %d]"
 msgstr ""
 
-#: top/top_nls.c:347
+#: top/top_nls.c:360
 #, c-format
 msgid "Renice PID %d to value"
 msgstr ""
 
-#: top/top_nls.c:348
+#: top/top_nls.c:361
 #, c-format
 msgid "Failed renice of PID %d to %d: %s"
 msgstr ""
 
-#: top/top_nls.c:349
+#: top/top_nls.c:362
 #, c-format
 msgid "Rename window '%s' to (1-3 chars)"
 msgstr ""
 
-#: top/top_nls.c:350
+#: top/top_nls.c:363
 #, c-format
 msgid "Cumulative time %s"
 msgstr "Kumulierte Zeit %s"
 
-#: top/top_nls.c:351
+#: top/top_nls.c:364
 #, c-format
 msgid "Maximum tasks = %d, change to (0 is unlimited)"
 msgstr ""
 
-#: top/top_nls.c:352
+#: top/top_nls.c:365
 msgid "Invalid maximum"
 msgstr "Ungültiges Maximum"
 
-#: top/top_nls.c:353
+#: top/top_nls.c:366
 msgid "Which user (blank for all)"
 msgstr "welcher Benutzer (leer lassen für alle)"
 
-#: top/top_nls.c:354
+#: top/top_nls.c:367
 msgid "Unknown command - try 'h' for help"
 msgstr "Ungültiger Befehl. Geben Sie »h« ein für Hilfe."
 
-#: top/top_nls.c:355
+#: top/top_nls.c:368
 #, c-format
 msgid "scroll coordinates: y = %d/%%d (tasks), x = %d/%d (fields)"
 msgstr "Bildlaufkoordinaten: y = %d/%%d (Prozesse), x = %d/%d (Felder)"
 
-#: top/top_nls.c:356
+#: top/top_nls.c:369
 msgid "failed memory allocate"
 msgstr "Speicherzuweisung ist fehlgeschlagen"
 
-#: top/top_nls.c:357
+#: top/top_nls.c:370
 msgid "failed memory re-allocate"
 msgstr "erneute Speicherzuweisung ist fehlgeschlagen"
 
-#: top/top_nls.c:358
+#: top/top_nls.c:371
 msgid "Unacceptable floating point"
 msgstr "Fließkommaausnahme"
 
-#: top/top_nls.c:359
+#: top/top_nls.c:372
 msgid "Invalid user"
 msgstr "Ungültiger Benutzer"
 
-#: top/top_nls.c:360
+#: top/top_nls.c:373
 msgid "forest view"
 msgstr "Baumansicht"
 
-#: top/top_nls.c:361
+#: top/top_nls.c:374
 msgid "failed pid maximum size test"
 msgstr "Test für maximale PID-Größe fehlgeschlagen"
 
-#: top/top_nls.c:362
+#: top/top_nls.c:375
 msgid "failed number of cpus test"
 msgstr "Überprüfung der CPU-Anzahl ist fehlgeschlagen"
 
-#: top/top_nls.c:363
+#: top/top_nls.c:376
 #, c-format
 msgid "incompatible rcfile, you should delete '%s'"
 msgstr "ungültige Konfigurationsdatei, Sie sollten »%s« löschen"
 
-#: top/top_nls.c:364
+#: top/top_nls.c:377
 #, c-format
 msgid "window entry #%d corrupt, please delete '%s'"
 msgstr "Fenstereintrag #%d beschädigt, bitte löschen Sie »%s«"
 
-#: top/top_nls.c:365
+#: top/top_nls.c:378
 msgid "Unavailable in secure mode"
 msgstr "im Sicherheitsmodus nicht verfügbar"
 
-#: top/top_nls.c:366
+#: top/top_nls.c:379
 msgid "Only 1 cpu detected"
 msgstr "nur eine CPU wurde erkannt"
 
-#: top/top_nls.c:367
+#: top/top_nls.c:380
 msgid "Unacceptable integer"
 msgstr "ungültige Ganzzahl"
 
-#: top/top_nls.c:368
+#: top/top_nls.c:381
 msgid "conflicting process selections (U/p/u)"
 msgstr "widersprüchliche Prozessauswahlen (U/p/u)"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 kibibytes (1024 bytes)
-#: top/top_nls.c:371
+#: top/top_nls.c:384
 msgid "KiB"
 msgstr "KiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 mebibytes (1,048,576 bytes)
-#: top/top_nls.c:374
+#: top/top_nls.c:387
 msgid "MiB"
 msgstr "MiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 gibibytes (1,073,741,824 bytes)
-#: top/top_nls.c:377
+#: top/top_nls.c:390
 msgid "GiB"
 msgstr "GiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 tebibytes (1,099,511,627,776 bytes)
-#: top/top_nls.c:380
+#: top/top_nls.c:393
 msgid "TiB"
 msgstr "TiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 pebibytes (1,024 tebibytes)
-#: top/top_nls.c:383
+#: top/top_nls.c:396
 msgid "PiB"
 msgstr "PiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 exbibytes (1,024 pebibytes)
-#: top/top_nls.c:386
+#: top/top_nls.c:399
 msgid "EiB"
 msgstr "EiB"
 
-#: top/top_nls.c:387
+#: top/top_nls.c:400
 msgid "Threads"
 msgstr "Threads"
 
-#: top/top_nls.c:388
+#: top/top_nls.c:401
 msgid "Tasks"
 msgstr "Tasks"
 
 #. Translation Hint: The following "word" is meant to represent either a single
 #. .                 cpu or all of the processors in a multi-processor computer
 #. .                 (should be exactly 6 characters, not counting the colon)
-#: top/top_nls.c:392
+#: top/top_nls.c:405
 msgid "Cpu(s):"
 msgstr "CPU(s):"
 
 #. Translation Hint: The following "word" is meant to represent a single processor
 #. .                 (should be exactly 3 characters)
-#: top/top_nls.c:395
+#: top/top_nls.c:408
 #, c-format
 msgid "Cpu%-3d:"
 msgstr "CPU%-3d:"
 
 #. Translation Hint: The following word "another" must have 1 trailing space
-#: top/top_nls.c:397
+#: top/top_nls.c:410
 msgid "another "
 msgstr ""
 
-#: top/top_nls.c:398
+#: top/top_nls.c:411
 msgid "Locate next inactive, use \"L\""
 msgstr ""
 
-#: top/top_nls.c:399
+#: top/top_nls.c:412
 msgid "Locate string"
 msgstr ""
 
-#: top/top_nls.c:400
+#: top/top_nls.c:413
 #, c-format
 msgid "%s\"%s\" not found"
 msgstr "%s»%s« nicht gefunden"
 
-#: top/top_nls.c:401
+#: top/top_nls.c:414
 #, c-format
 msgid "width incr is %d, change to (0 default, -1 auto)"
 msgstr ""
 
-#: top/top_nls.c:402
+#: top/top_nls.c:415
 msgid "Overwrite existing obsolete/corrupted rcfile?"
 msgstr "Veraltete/beschädigte Konfigurationsdatei löschen?"
 
-#: top/top_nls.c:403
+#: top/top_nls.c:416
 #, c-format
 msgid "unrecognized field name '%s'"
 msgstr "nicht erkannter Feldname »%s«"
 
-#: top/top_nls.c:404
+#: top/top_nls.c:417
 msgid "even using field names only, window is now too small"
 msgstr "selbst nur mit Feldnamen ist das Fenster jetzt zu klein"
 
-#: top/top_nls.c:406
+#: top/top_nls.c:419
 msgid "Open Files"
 msgstr "Offene Dateien"
 
-#: top/top_nls.c:407
+#: top/top_nls.c:420
 msgid "NUMA Info"
 msgstr "NUMA-Info"
 
-#: top/top_nls.c:408
+#: top/top_nls.c:421
 msgid "Log"
 msgstr "Protokoll"
 
-#: top/top_nls.c:409
+#: top/top_nls.c:422
 msgid ""
 "the '=' key will eventually show the actual file read or command(s) "
 "executed ..."
@@ -2973,11 +3015,11 @@
 "Die Taste »=« zeigt eventuell die tatsächlich gelesene Datei oder den/die "
 "ausgeführte(n) Befehl(e) …"
 
-#: top/top_nls.c:410
+#: top/top_nls.c:423
 msgid "demo"
 msgstr "Demo"
 
-#: top/top_nls.c:411
+#: top/top_nls.c:424
 #, c-format
 msgid ""
 "This is simulated output representing the contents of some file or the "
@@ -3072,104 +3114,104 @@
 "\n"
 "Viel Spaß!\n"
 
-#: top/top_nls.c:443
+#: top/top_nls.c:456
 msgid "to enable 'Y' press <Enter> then type 'W' and restart top"
 msgstr ""
 "Um »Y« zu aktivieren, drücken Sie die Eingabetaste, geben »W« ein und "
 "starten top neu."
 
-#: top/top_nls.c:445
+#: top/top_nls.c:458
 msgid "to enable 'Y' please consult the top man page (press Enter)"
 msgstr ""
 "Lesen Sie in der Handbuchseite zu top(1), wie Sie die Option »Y« aktivieren "
 "können (Eingabetaste drücken)"
 
-#: top/top_nls.c:447
+#: top/top_nls.c:460
 #, c-format
 msgid "Selection failed with: %s\n"
 msgstr "Auswahl fehlgeschlagen mit: %s\n"
 
-#: top/top_nls.c:448
+#: top/top_nls.c:461
 #, c-format
 msgid "unable to inspect, pid %d not found"
 msgstr "Untersuchung nicht möglich, PID %d nicht gefunden"
 
-#: top/top_nls.c:449
+#: top/top_nls.c:462
 #, c-format
 msgid "inspect at PID [default pid = %d]"
 msgstr ""
 
-#: top/top_nls.c:450
+#: top/top_nls.c:463
 #, c-format
 msgid "%s: %*d-%-*d lines, %*d-%*d columns, %lu bytes read"
 msgstr "%s: %*d-%-*d Zeilen, %*d-%*d Spalten, %lu Bytes gelesen"
 
-#: top/top_nls.c:451
+#: top/top_nls.c:464
 msgid "patience please, working..."
 msgstr "Bitte warten Sie, wird ausgeführt …"
 
 #. Translation Hint: Below are 2 abbreviations which can be as long as needed:
 #. .                 FLD = FIELD, VAL = VALUE
-#: top/top_nls.c:454
+#: top/top_nls.c:467
 #, c-format
 msgid "add filter #%d (%s) as: [!]FLD?VAL"
 msgstr "Filter #%d (%s) hinzufügen als: [!]FELD?WERT"
 
-#: top/top_nls.c:455
+#: top/top_nls.c:468
 msgid "ignoring case"
 msgstr "Groß-/Kleinschreibung ignorieren"
 
-#: top/top_nls.c:456
+#: top/top_nls.c:469
 msgid "case sensitive"
 msgstr "Groß-/Kleinschreibung"
 
-#: top/top_nls.c:457
+#: top/top_nls.c:470
 msgid "duplicate filter was ignored"
 msgstr "Filterduplikat wurde ignoriert"
 
-#: top/top_nls.c:458
+#: top/top_nls.c:471
 #, c-format
 msgid "'%s' filter delimiter is missing"
 msgstr "Filter-Trennzeichen »%s« fehlt"
 
-#: top/top_nls.c:459
+#: top/top_nls.c:472
 #, c-format
 msgid "'%s' filter value is missing"
 msgstr "Filterwert »%s« fehlt"
 
-#: top/top_nls.c:460
+#: top/top_nls.c:473
 msgid "include"
 msgstr "einschließen"
 
-#: top/top_nls.c:461
+#: top/top_nls.c:474
 msgid "exclude"
 msgstr "ausschließen"
 
-#: top/top_nls.c:462
+#: top/top_nls.c:475
 #, c-format
 msgid "<Enter> to resume, filters: %s"
 msgstr "<Eingabe> zum Fortsetzen, Filter: %s"
 
-#: top/top_nls.c:463
+#: top/top_nls.c:476
 msgid "none"
 msgstr ""
 
 #. Translation Hint: The following word 'Node' should be exactly 4 characters
-#: top/top_nls.c:465
+#: top/top_nls.c:478
 #, c-format
 msgid "Node%-2d:"
 msgstr "Node%-2d:"
 
-#: top/top_nls.c:466
+#: top/top_nls.c:479
 #, c-format
 msgid "expand which node (0-%d)"
 msgstr ""
 
-#: top/top_nls.c:467
+#: top/top_nls.c:480
 msgid "invalid node"
 msgstr "ungültiger Knoten"
 
-#: top/top_nls.c:468
+#: top/top_nls.c:481
 msgid "sorry, NUMA extensions unavailable"
 msgstr "Entschuldigung, NUMA-Erweiterungen sind nicht verfügbar"
 
@@ -3177,11 +3219,11 @@
 #. .                 'Swap' represents the linux swap file --
 #. .                 please make both translations exactly 4 characters,
 #. .                 padding with extra spaces as necessary
-#: top/top_nls.c:473
+#: top/top_nls.c:486
 msgid "Mem "
 msgstr "Spch"
 
-#: top/top_nls.c:474
+#: top/top_nls.c:487
 msgid "Swap"
 msgstr "Swap"
 
@@ -3209,7 +3251,7 @@
 #. .  please see the prologue to the show_special function in the top.c
 #. .  source file.
 #. .
-#: top/top_nls.c:508
+#: top/top_nls.c:521
 #, c-format
 msgid ""
 "Help for Interactive Commands~2 - %s\n"
@@ -3254,13 +3296,13 @@
 #. Translation Hint: As is true for the text above, the "keys" shown to the left and
 #. .                 also imbedded in the translatable text (along with escape seqs)
 #. .                 should never themselves be translated.
-#: top/top_nls.c:536
+#: top/top_nls.c:549
 msgid ""
 "  k,r       Manipulate tasks: '~1k~2' kill; '~1r~2' renice\n"
 "  d or s    Set update interval\n"
 msgstr ""
 
-#: top/top_nls.c:540
+#: top/top_nls.c:553
 #, c-format
 msgid ""
 "Help for Windows / Field Groups~2 - \"Current Window\" = ~1 %s ~6\n"
@@ -3330,7 +3372,7 @@
 #. .     --> "   0~2 = black,~1  1~2 = red,    ~1  2~2 = gree
 #. .     --> "   4~2 = blue, ~1  5~2 = magenta,~1  6~2 = cyan
 #. .
-#: top/top_nls.c:590
+#: top/top_nls.c:603
 #, c-format
 msgid ""
 "Help for color mapping~2 - %s\n"
@@ -3362,7 +3404,7 @@
 "   'a' or 'w' to commit & change another, <Enter> to commit and end "
 msgstr ""
 
-#: top/top_nls.c:616
+#: top/top_nls.c:629
 #, c-format
 msgid ""
 "Fields Management~2 for window ~1%s~6, whose current sort field is ~1%s~2\n"
@@ -3371,21 +3413,21 @@
 "   'd' or <Space> toggles display, 's' sets sort.  Use 'q' or <Esc> to end!\n"
 msgstr ""
 
-#: top/top_nls.c:621
+#: top/top_nls.c:634
 #, c-format
 msgid ""
 "%s:~3 %3u ~2total,~3 %3u ~2running,~3 %3u ~2sleeping,~3 %3u ~2stopped,~3 %3u "
 "~2zombie~3\n"
 msgstr ""
 
-#: top/top_nls.c:624
+#: top/top_nls.c:637
 #, c-format
 msgid ""
 "%%%s~3 %#5.1f  ~2user,~3 %#5.1f  ~2system,~3 %#5.1f  ~2nice,~3 %#5.1f  "
 "~2idle~3\n"
 msgstr ""
 
-#: top/top_nls.c:627
+#: top/top_nls.c:640
 #, c-format
 msgid ""
 "%%%s~3 %#5.1f  ~2user,~3 %#5.1f  ~2system,~3 %#5.1f  ~2nice,~3 %#5.1f  "
@@ -3395,7 +3437,7 @@
 #. Translation Hint: Only the following abbreviations need be translated
 #. .                 us = user, sy = system, ni = nice, id = idle, wa = wait,
 #. .                 hi hardware interrupt, si = software interrupt
-#: top/top_nls.c:633
+#: top/top_nls.c:646
 #, c-format
 msgid ""
 "%%%s~3 %#5.1f ~2us,~3 %#5.1f ~2sy,~3 %#5.1f ~2ni,~3 %#5.1f ~2id,~3 %#5.1f "
@@ -3405,21 +3447,21 @@
 #. Translation Hint: Only the following abbreviations need be translated
 #. .                 us = user, sy = system, ni = nice, id = idle, wa = wait,
 #. .                 hi hardware interrupt, si = software interrupt, st = steal time
-#: top/top_nls.c:639
+#: top/top_nls.c:652
 #, c-format
 msgid ""
 "%%%s~3%#5.1f ~2us,~3%#5.1f ~2sy,~3%#5.1f ~2ni,~3%#5.1f ~2id,~3%#5.1f ~2wa,"
 "~3%#5.1f ~2hi,~3%#5.1f ~2si,~3%#5.1f ~2st~3\n"
 msgstr ""
 
-#: top/top_nls.c:642
+#: top/top_nls.c:655
 #, c-format
 msgid ""
 "%s %s:~3 %9.9s~2total,~3 %9.9s~2free,~3 %9.9s~2used,~3 %9.9s~2buff/cache~3\n"
 "%s %s:~3 %9.9s~2total,~3 %9.9s~2free,~3 %9.9s~2used.~3 %9.9s~2avail %s~3\n"
 msgstr ""
 
-#: top/top_nls.c:646
+#: top/top_nls.c:659
 #, c-format
 msgid ""
 "Inspection~2 Pause at: pid ~1%d~6, running ~1%s~6\n"
@@ -3428,7 +3470,7 @@
 "Options~2: ~1%s\n"
 msgstr ""
 
-#: top/top_nls.c:651
+#: top/top_nls.c:664
 #, c-format
 msgid ""
 "Inspection~2 View at pid: ~1%s~3, running ~1%s~3.  Locating: ~1%s~6\n"
@@ -3991,104 +4033,109 @@
 msgid " -v, --version  output version information and exit\n"
 msgstr " -v, --version  Versionsinformation anzeigen und beenden\n"
 
-#: watch.c:376
+#: watch.c:384
 #, c-format
 msgid "Every %.1fs: "
 msgstr "Alle %.1fs: "
 
-#: watch.c:437
+#: watch.c:385
+#, c-format
+msgid "%s: %s"
+msgstr ""
+
+#: watch.c:456
 msgid "unable to create IPC pipes"
 msgstr "IPC-Pipes konnten nicht angelegt werden"
 
-#: watch.c:447
+#: watch.c:466
 msgid "unable to fork process"
 msgstr "Prozess kann nicht geforkt werden"
 
-#: watch.c:452
+#: watch.c:471
 msgid "dup2 failed"
 msgstr "dup2 fehlgeschlagen"
 
-#: watch.c:459
+#: watch.c:478
 #, c-format
 msgid "unable to execute '%s'"
 msgstr "»%s« kann nicht ausgeführt werden"
 
-#: watch.c:476
+#: watch.c:495
 msgid "fdopen"
 msgstr "fdopen"
 
-#: watch.c:622
+#: watch.c:641
 msgid "waitpid"
 msgstr "waitpid"
 
-#: watch.c:630
+#: watch.c:649
 msgid "command exit with a non-zero status, press a key to exit"
 msgstr ""
 "der Befehl wurde mit einem von Null verschiedenen Exit-Status beendet, "
 "drücken Sie eine Taste zum Beenden"
 
-#: watch.c:755
+#: watch.c:773
 #, c-format
 msgid "unicode handling error\n"
 msgstr "Unicode-Verarbeitungsfehler\n"
 
-#: watch.c:761
+#: watch.c:779
 #, c-format
 msgid "unicode handling error (malloc)\n"
 msgstr "Unicode-Verarbeitungsfehler (malloc)\n"
 
-#: w.c:241 w.c:256
+#: w.c:245 w.c:260
 #, c-format
 msgid " %2ludays"
 msgstr " %2lu Tage"
 
 #. Translation Hint: Minutes:Seconds
 #. Translation Hint: Hours:Minutes
-#: w.c:250 w.c:260
+#: w.c:254 w.c:264
 #, c-format
 msgid " %2lu:%02um"
 msgstr " %2lu:%02u m"
 
 #. Translation Hint: Seconds:Centiseconds
-#: w.c:268
+#: w.c:272
 #, c-format
 msgid " %2lu.%02us"
 msgstr " %2lu.%02u s"
 
-#: w.c:451
+#: w.c:455
 msgid " -h, --no-header     do not print header\n"
 msgstr " -h, --no-header     keinen Header ausgeben\n"
 
-#: w.c:452
+#: w.c:456
 msgid " -u, --no-current    ignore current process username\n"
 msgstr " -u, --no-current    Benutzername des aktuellen Prozesses ignorieren\n"
 
-#: w.c:453
+#: w.c:457
 msgid " -s, --short         short format\n"
 msgstr " -s, --short         Kurzformat\n"
 
-#: w.c:454
+#: w.c:458
 msgid " -f, --from          show remote hostname field\n"
 msgstr " -f, --from          Feld für entfernten Rechnernamen anzeigen\n"
 
-#: w.c:455
+#: w.c:459
 msgid " -o, --old-style     old style output\n"
 msgstr " -o, --old-style     Ausgabe im alten Stil\n"
 
-#: w.c:456
+#: w.c:460
 msgid ""
 " -i, --ip-addr       display IP address instead of hostname (if possible)\n"
 msgstr ""
 " -i, --ip-addr       IP-Adresse anstelle des Rechnernamens anzeigen\n"
 "                     (falls möglich)\n"
 
-#: w.c:553
+#: w.c:557
 #, c-format
 msgid ""
 "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n"
 msgstr ""
 
-#: w.c:563
+#: w.c:567
 #, c-format
 msgid ""
 "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n"
@@ -4096,21 +4143,21 @@
 
 #. Translation Hint: Following five uppercase messages are
 #. * headers. Try to keep alignment intact.
-#: w.c:587
+#: w.c:591
 #, c-format
 msgid "%-*s TTY      "
 msgstr "%-*s TTY      "
 
-#: w.c:589
+#: w.c:593
 msgid "FROM"
 msgstr "VON"
 
-#: w.c:591
+#: w.c:595
 #, c-format
 msgid "  LOGIN@   IDLE   JCPU   PCPU WHAT\n"
 msgstr ""
 
-#: w.c:593
+#: w.c:597
 #, c-format
 msgid "   IDLE WHAT\n"
 msgstr ""
@@ -4157,6 +4204,12 @@
 msgid "%s from %s\n"
 msgstr "%s von %s\n"
 
+#~ msgid "seconds argument `%s' failed"
+#~ msgstr "Sekunden-Argument »%s« fehlgeschlagen "
+
+#~ msgid "Adj"
+#~ msgstr "Adj"
+
 #~ msgid "%d column window is too narrow"
 #~ msgstr "Fenster mit %d Spalten ist zu klein"
 
Binary files /tmp/tmpsmX0gC/RRPDCxm9wk/procps-3.3.11/po/fr.gmo and /tmp/tmpsmX0gC/hzIsJzyyeF/procps-3.3.12/po/fr.gmo differ
diff -Nru procps-3.3.11/po/fr.po procps-3.3.12/po/fr.po
--- procps-3.3.11/po/fr.po	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/po/fr.po	2016-07-10 06:40:26.000000000 +0000
@@ -22,7 +22,7 @@
 msgstr ""
 "Project-Id-Version: procps-ng 3.3.10-rc1\n"
 "Report-Msgid-Bugs-To: procps@freelists.org\n"
-"POT-Creation-Date: 2015-08-09 15:59+1000\n"
+"POT-Creation-Date: 2016-07-10 08:19+1000\n"
 "PO-Revision-Date: 2015-03-22 11:32+0100\n"
 "Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -32,7 +32,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: free.c:74 slabtop.c:189 uptime.c:59 w.c:449
+#: free.c:74 slabtop.c:189 uptime.c:59 w.c:453
 #, c-format
 msgid " %s [options]\n"
 msgstr " %s [options]\n"
@@ -121,7 +121,7 @@
 msgid " -w, --wide          wide output\n"
 msgstr " -w, --wide          sortie large\n"
 
-#: free.c:95 w.c:458
+#: free.c:95 w.c:462
 msgid "     --help     display this help and exit\n"
 msgstr "     --help     afficher cette aide et termine\n"
 
@@ -129,26 +129,21 @@
 msgid "Multiple unit options doesn't make sense."
 msgstr ""
 
-#: free.c:329
-#, c-format
-msgid "seconds argument `%s' failed"
-msgstr "l'argument des secondes « %s » n'est pas valable"
-
-#: free.c:332
+#: free.c:330
 #, c-format
 msgid "seconds argument `%s' is not positive number"
 msgstr "l'argument des secondes « %s » n'est pas un nombre positif"
 
-#: free.c:338
+#: free.c:336
 msgid "failed to parse count argument"
 msgstr "l'argument du nombre de répétitions ne peut pas être décodé"
 
-#: free.c:341
+#: free.c:339
 #, c-format
 msgid "failed to parse count argument: '%s'"
 msgstr "échec du décodage de l'argument du nombre de répétitions: « %s »"
 
-#: free.c:362
+#: free.c:360
 #, c-format
 msgid ""
 "              total        used        free      shared     buffers       "
@@ -157,7 +152,7 @@
 "              total       utilisé      libre     partagé    tampons       "
 "cache   disponible"
 
-#: free.c:364
+#: free.c:362
 #, c-format
 msgid ""
 "              total        used        free      shared  buff/cache   "
@@ -166,23 +161,23 @@
 "              total       utilisé      libre     partagé tamp/cache   "
 "disponible"
 
-#: free.c:367
+#: free.c:365
 msgid "Mem:"
 msgstr "Mem:"
 
-#: free.c:387
+#: free.c:385
 msgid "Low:"
 msgstr "Basse:"
 
-#: free.c:393
+#: free.c:391
 msgid "High:"
 msgstr "Haute:"
 
-#: free.c:400
+#: free.c:398
 msgid "Swap:"
 msgstr "Partition d'échange:"
 
-#: free.c:407
+#: free.c:405
 msgid "Total:"
 msgstr "Total:"
 
@@ -344,7 +339,7 @@
 msgstr ""
 "Erreur lors de la lecture des informations de l'espace de nom de référence\n"
 
-#: pgrep.c:610 pidof.c:224 pidof.c:265 sysctl.c:643
+#: pgrep.c:610 pidof.c:230 pidof.c:271 sysctl.c:643
 msgid "internal error"
 msgstr "erreur interne"
 
@@ -418,7 +413,7 @@
 msgid " -o, --omit-pid <PID,...>  omit processes with PID\n"
 msgstr " -o, --omit-pid <PID,…>    omet les processus avec ce PID\n"
 
-#: pidof.c:268
+#: pidof.c:274
 #, c-format
 msgid "illegal omit pid value (%s)!\n"
 msgstr "valeur de pid à omettre invalide (%s) !\n"
@@ -539,7 +534,7 @@
 msgid "  [ stack ]"
 msgstr "  [ pile  ]"
 
-#: pmap.c:326
+#: pmap.c:325
 msgid "Unknown format in smaps file!"
 msgstr "Format inconnu dans le fichier smaps !"
 
@@ -570,8 +565,8 @@
 msgid " total %8ldK\n"
 msgstr " total %8ldK\n"
 
-#: pmap.c:767 skill.c:500 skill.c:533 skill.c:620 tload.c:128 tload.c:133
-#: vmstat.c:959 vmstat.c:968 watch.c:708
+#: pmap.c:767 skill.c:500 skill.c:534 skill.c:621 tload.c:128 tload.c:133
+#: vmstat.c:959 vmstat.c:968 watch.c:726
 msgid "failed to parse argument"
 msgstr "échec de l'analyse de l'argument"
 
@@ -654,8 +649,8 @@
 msgid "Signal %d (%s) caught by %s (%s).\n"
 msgstr "Signal %d (%s) intercepté par %s (%s).\n"
 
-#: ps/display.c:66 ps/display.c:271 ps/parser.c:509 ps/parser.c:756
-#: ps/select.c:95 ps/sortformat.c:550
+#: ps/display.c:66 ps/display.c:271 ps/parser.c:495 ps/parser.c:742
+#: ps/select.c:95 ps/sortformat.c:544
 msgid "please report this bug"
 msgstr "merci de rapporter ce bug"
 
@@ -700,7 +695,7 @@
 #. .
 #. . It must be limited to 15 characters or less.
 #.
-#: ps/global.c:408
+#: ps/global.c:401
 msgid "help"
 msgstr "aide"
 
@@ -1131,299 +1126,299 @@
 "\n"
 "Pour plus de détails, consultez ps(1).\n"
 
-#: ps/output.c:1971
+#: ps/output.c:1969
 #, c-format
 msgid "fix bigness error\n"
 msgstr "corriger l'erreur d'ordre des octets\n"
 
-#: ps/output.c:2046
+#: ps/output.c:2044
 #, c-format
 msgid "bad alignment code\n"
 msgstr "mauvais code d'alignement\n"
 
-#: ps/output.c:2108
+#: ps/output.c:2106
 #, c-format
 msgid "unknown page size (assume 4096)\n"
 msgstr "taille de page inconnue (4096 supposé)\n"
 
-#: ps/parser.c:58
+#: ps/parser.c:57
 msgid "the option is exclusive: "
 msgstr "l'option est exclusive: "
 
-#: ps/parser.c:89
+#: ps/parser.c:87
 msgid "process ID list syntax error"
 msgstr "erreur de syntaxe dans la liste des ID de processus"
 
-#: ps/parser.c:90 ps/parser.c:91
+#: ps/parser.c:88 ps/parser.c:89
 msgid "process ID out of range"
 msgstr "ID de processus hors limites"
 
-#: ps/parser.c:104
+#: ps/parser.c:102
 msgid "user name does not exist"
 msgstr "le nom d'utilisateur n'existe pas"
 
-#: ps/parser.c:110
+#: ps/parser.c:108
 msgid "user ID out of range"
 msgstr "ID utilisateur hors limites"
 
-#: ps/parser.c:123
+#: ps/parser.c:121
 msgid "group name does not exist"
 msgstr "le nom du groupe n'existe pas"
 
-#: ps/parser.c:129
+#: ps/parser.c:127
 msgid "group ID out of range"
 msgstr "ID du groupe hors limites"
 
-#: ps/parser.c:145 ps/parser.c:169
+#: ps/parser.c:143 ps/parser.c:167
 msgid "TTY could not be found"
 msgstr "le TTY n'a pu être trouvé"
 
-#: ps/parser.c:171
+#: ps/parser.c:169
 msgid "list member was not a TTY"
 msgstr "l'élément de la liste n'était pas un TTY"
 
-#: ps/parser.c:196
+#: ps/parser.c:194
 msgid "improper list"
 msgstr "liste incorrecte"
 
-#: ps/parser.c:256
+#: ps/parser.c:242
 msgid "list of command names must follow -C"
 msgstr "la liste des noms de commandes doit suivre -C"
 
-#: ps/parser.c:270
+#: ps/parser.c:256
 msgid "list of real groups must follow -G"
 msgstr "la liste des groupes réels doit suivre -G"
 
-#: ps/parser.c:283
+#: ps/parser.c:269
 msgid "list of jobs must follow -J"
 msgstr "la liste des tâches doit suivre -J"
 
-#: ps/parser.c:311
+#: ps/parser.c:297
 msgid "format or sort specification must follow -O"
 msgstr "la spécification de format ou de tri doit suivre -O"
 
-#: ps/parser.c:322
+#: ps/parser.c:308
 msgid "list of PRM groups must follow -R"
 msgstr "la liste des groupes PRM doit suivre -R"
 
-#: ps/parser.c:341
+#: ps/parser.c:327
 msgid "list of real users must follow -U"
 msgstr "la liste des utilisateurs réels doit suivre -U"
 
-#: ps/parser.c:382
+#: ps/parser.c:368
 msgid "list of session leaders OR effective group names must follow -g"
 msgstr ""
 "la liste des têtes de sessions OU des noms de groupes effectifs doit suivre -"
 "g"
 
-#: ps/parser.c:393
+#: ps/parser.c:379
 msgid "list of session leaders OR effective group IDs was invalid"
 msgstr ""
 "la liste des têtes de sessions OU des ID de groupes effectifs était invalide"
 
-#: ps/parser.c:417
+#: ps/parser.c:403
 msgid "format specification must follow -o"
 msgstr "le spécificateur de format doit suivre -o"
 
-#: ps/parser.c:423
+#: ps/parser.c:409
 msgid "list of process IDs must follow -p"
 msgstr "la liste des ID des processus doit suivre -p"
 
-#: ps/parser.c:440
+#: ps/parser.c:426
 msgid "the -r option is reserved"
 msgstr "l'option -r est réservée"
 
-#: ps/parser.c:446
+#: ps/parser.c:432
 msgid "list of session IDs must follow -s"
 msgstr "la liste des ID de sessions doit suivre -s"
 
-#: ps/parser.c:454
+#: ps/parser.c:440
 msgid "list of terminals (pty, tty...) must follow -t"
 msgstr "la liste des terminaux (pty, tty…) doit suivre -t"
 
-#: ps/parser.c:462
+#: ps/parser.c:448
 msgid "list of users must follow -u"
 msgstr "la liste des utilisateurs doit suivre -u"
 
-#: ps/parser.c:484
+#: ps/parser.c:470
 msgid "must set personality to get -x option"
 msgstr "la personnalité doit être définie pour avoir l'option -x"
 
-#: ps/parser.c:499
+#: ps/parser.c:485
 msgid "list of zones (contexts, labels, whatever?) must follow -z"
 msgstr ""
 "la liste des zones (contextes, étiquettes, quoi d'autre ?) doit suivre -z"
 
-#: ps/parser.c:506
+#: ps/parser.c:492
 msgid "embedded '-' among SysV options makes no sense"
 msgstr "un « - » incrusté dans les options SysV n'a pas de sens"
 
-#: ps/parser.c:512
+#: ps/parser.c:498
 msgid "unsupported SysV option"
 msgstr "option SysV non supportée"
 
-#: ps/parser.c:525
+#: ps/parser.c:511
 msgid "cannot happen - problem #1"
 msgstr "ne peut se produire – problème #1"
 
-#: ps/parser.c:529
+#: ps/parser.c:515
 msgid "cannot happen - problem #2"
 msgstr "ne peut se produire – problème #2"
 
-#: ps/parser.c:531
+#: ps/parser.c:517
 msgid "second chance parse failed, not BSD or SysV"
 msgstr "l'analyse de la seconde chance a échoué: pas BSD ni SysV"
 
-#: ps/parser.c:548
+#: ps/parser.c:534
 msgid "option A is reserved"
 msgstr "l'option A est réservée"
 
-#: ps/parser.c:553
+#: ps/parser.c:539
 msgid "option C is reserved"
 msgstr "l'option C est réservée"
 
-#: ps/parser.c:573
+#: ps/parser.c:559
 msgid "format or sort specification must follow O"
 msgstr "la spécification de format ou de tri doit suivre O"
 
-#: ps/parser.c:598
+#: ps/parser.c:584
 msgid "list of users must follow U"
 msgstr "la liste des utilisateurs doit suivre U"
 
-#: ps/parser.c:610
+#: ps/parser.c:596
 msgid "obsolete W option not supported (you have a /dev/drum?)"
 msgstr "l'option obsolète W n'est pas supportée (avez-vous un /dev/drum ?)"
 
-#: ps/parser.c:646 ps/parser.c:913 ps/parser.c:922
+#: ps/parser.c:632 ps/parser.c:899 ps/parser.c:908
 msgid "only one heading option may be specified"
 msgstr "une seule option d'en-tête peut être spécifiée"
 
-#: ps/parser.c:661
+#: ps/parser.c:647
 msgid "long sort specification must follow 'k'"
 msgstr "la spécification de tri long doit suivre « k »"
 
-#: ps/parser.c:689
+#: ps/parser.c:675
 msgid "format specification must follow o"
 msgstr "la spécification de format doit suivre o"
 
-#: ps/parser.c:695
+#: ps/parser.c:681
 msgid "list of process IDs must follow p"
 msgstr "la liste des ID de processus doit suivre p"
 
-#: ps/parser.c:753
+#: ps/parser.c:739
 msgid "embedded '-' among BSD options makes no sense"
 msgstr "un « - » incrusté dans les options BSD n'a pas de sens"
 
-#: ps/parser.c:759
+#: ps/parser.c:745
 msgid "unsupported option (BSD syntax)"
 msgstr "option non supportée (syntaxe BSD)"
 
-#: ps/parser.c:845 ps/parser.c:857
+#: ps/parser.c:831 ps/parser.c:843
 msgid "unknown gnu long option"
 msgstr "option longue gnu inconnue"
 
-#: ps/parser.c:865
+#: ps/parser.c:851
 msgid "list of real groups must follow --Group"
 msgstr "la liste des groupes réels doit suivre --Group"
 
-#: ps/parser.c:873
+#: ps/parser.c:859
 msgid "list of real users must follow --User"
 msgstr "la liste des utilisateurs réels doit suivre --User"
 
-#: ps/parser.c:892
+#: ps/parser.c:878
 msgid "number of columns must follow --cols, --width, or --columns"
 msgstr "le nombre de colonnes doit suivre --cols, --width ou --columns"
 
-#: ps/parser.c:895
+#: ps/parser.c:881
 msgid "option --cumulative does not take an argument"
 msgstr "l'option --cumulative ne prend pas d'argument"
 
-#: ps/parser.c:900
+#: ps/parser.c:886
 msgid "option --deselect does not take an argument"
 msgstr "l'option --deselect ne prend pas d'argument"
 
-#: ps/parser.c:912
+#: ps/parser.c:898
 msgid "option --no-heading does not take an argument"
 msgstr "l'option --no-heading ne prend pas d'argument"
 
-#: ps/parser.c:921
+#: ps/parser.c:907
 msgid "option --heading does not take an argument"
 msgstr "l'option --heading ne prend pas d'argument"
 
-#: ps/parser.c:927
+#: ps/parser.c:913
 msgid "option --forest does not take an argument"
 msgstr "l'option --forest ne prend pas d'argument"
 
-#: ps/parser.c:933
+#: ps/parser.c:919
 msgid "format specification must follow --format"
 msgstr "la spécification de format doit suivre --format"
 
-#: ps/parser.c:939
+#: ps/parser.c:925
 msgid "list of effective groups must follow --group"
 msgstr "la liste des groupes effectifs doit suivre --group"
 
-#: ps/parser.c:957
+#: ps/parser.c:943
 msgid "list of process IDs must follow --pid"
 msgstr "la liste des ID de processus doit suivre --pid"
 
-#: ps/parser.c:973
+#: ps/parser.c:959
 msgid "list of process IDs must follow --ppid"
 msgstr "la liste des ID de processus doit suivre --ppid"
 
-#: ps/parser.c:991
+#: ps/parser.c:977
 msgid "number of rows must follow --rows or --lines"
 msgstr "le nombre de lignes doit suivre --rows ou --lines"
 
-#: ps/parser.c:995
+#: ps/parser.c:981
 msgid "some sid thing(s) must follow --sid"
 msgstr "quelques choses sid doivent suivre --sid"
 
-#: ps/parser.c:1003
+#: ps/parser.c:989
 msgid "long sort specification must follow --sort"
 msgstr "la spécification de tri longue doit suivre --sort"
 
-#: ps/parser.c:1009
+#: ps/parser.c:995
 msgid "list of ttys must follow --tty"
 msgstr "la liste des tty doit suivre --tty"
 
-#: ps/parser.c:1017
+#: ps/parser.c:1003
 msgid "list of effective users must follow --user"
 msgstr "la liste des utilisateurs effectifs doit suivre --user"
 
-#: ps/parser.c:1134
+#: ps/parser.c:1119
 msgid "way bad"
 msgstr "très mauvais"
 
-#: ps/parser.c:1148
+#: ps/parser.c:1133
 msgid "garbage option"
 msgstr "option crasse"
 
-#: ps/parser.c:1152
+#: ps/parser.c:1137
 msgid "something broke"
 msgstr "quelque chose de cassé"
 
-#: ps/parser.c:1172
+#: ps/parser.c:1157
 msgid "thread display conflicts with forest display"
 msgstr "l'affichage par threads est en conflit avec l'affichage de type forêt"
 
-#: ps/parser.c:1177
+#: ps/parser.c:1162
 msgid "thread flags conflict; can't use H with m or -m"
 msgstr ""
 "conflit dans les fanions de threads: H ne peut être utilisé avec m ou -m"
 
-#: ps/parser.c:1179
+#: ps/parser.c:1164
 msgid "thread flags conflict; can't use both m and -m"
 msgstr ""
 "conflit dans les fanions de threads: m et -m ne peuvent être utilisés "
 "ensemble"
 
-#: ps/parser.c:1181
+#: ps/parser.c:1166
 msgid "thread flags conflict; can't use both -L and -T"
 msgstr ""
 "conflit dans les fanions de threads: -L et -T ne peuvent être utilisés "
 "ensemble"
 
-#: ps/parser.c:1255 ps/parser.c:1256
+#: ps/parser.c:1239 ps/parser.c:1240
 #, c-format
 msgid "error: %s\n"
 msgstr "erreur: %s\n"
@@ -1432,136 +1427,136 @@
 msgid "process selection options conflict"
 msgstr "conflit dans les options de sélection des processus"
 
-#: ps/sortformat.c:107 ps/sortformat.c:112
+#: ps/sortformat.c:106 ps/sortformat.c:111
 msgid "seriously crashing: goodbye cruel world"
 msgstr "plantage sérieux: adieu monde cruel"
 
-#: ps/sortformat.c:147
+#: ps/sortformat.c:146
 msgid "improper AIX field descriptor"
 msgstr "descripteur de champ AIX incorrect"
 
-#: ps/sortformat.c:168
+#: ps/sortformat.c:167
 msgid "unknown AIX field descriptor"
 msgstr "descripteur de champ AIX inconnu"
 
-#: ps/sortformat.c:173
+#: ps/sortformat.c:172
 msgid "AIX field descriptor processing bug"
 msgstr "bug dans le traitement du descripteur de champ AIX"
 
-#: ps/sortformat.c:290
+#: ps/sortformat.c:285
 #, c-format
 msgid "unknown user-defined format specifier \"%s\""
 msgstr "spécificateur de format défini par l'utilisateur « %s » inconnu"
 
-#: ps/sortformat.c:316
+#: ps/sortformat.c:311
 msgid "empty format list"
 msgstr "liste de format vide"
 
-#: ps/sortformat.c:317
+#: ps/sortformat.c:312
 msgid "improper format list"
 msgstr "liste de format incorrecte"
 
-#: ps/sortformat.c:318
+#: ps/sortformat.c:313
 msgid "column widths must be unsigned decimal numbers"
 msgstr "les largeurs de colonnes doivent être des nombres décimaux non signés"
 
-#: ps/sortformat.c:319
+#: ps/sortformat.c:314
 msgid "can not set width for a macro (multi-column) format specifier"
 msgstr ""
 "la largeur ne peut pas être définie pour une macro (multi colonne) de "
 "spécificateur de format"
 
-#: ps/sortformat.c:372 ps/sortformat.c:388
+#: ps/sortformat.c:367 ps/sortformat.c:383
 msgid "improper sort list"
 msgstr "liste de tri incorrecte"
 
-#: ps/sortformat.c:383
+#: ps/sortformat.c:378
 msgid "empty sort list"
 msgstr "liste de tri vide"
 
-#: ps/sortformat.c:404 ps/sortformat.c:482 ps/sortformat.c:484
+#: ps/sortformat.c:399 ps/sortformat.c:477 ps/sortformat.c:479
 msgid "unknown sort specifier"
 msgstr "spécificateur de tri inconnu"
 
-#: ps/sortformat.c:431 ps/sortformat.c:442 ps/sortformat.c:448
+#: ps/sortformat.c:426 ps/sortformat.c:437 ps/sortformat.c:443
 msgid "bad sorting code"
 msgstr "mauvais code de tri"
 
-#: ps/sortformat.c:445
+#: ps/sortformat.c:440
 msgid "PPID sort and forest output conflict"
 msgstr "conflit entre le tri de PPID et l'affichage de type forêt"
 
-#: ps/sortformat.c:520
+#: ps/sortformat.c:514
 msgid "option -O can not follow other format options"
 msgstr "l'option -O ne peut pas suivre d'autres options de format"
 
-#: ps/sortformat.c:527 ps/sortformat.c:545
+#: ps/sortformat.c:521 ps/sortformat.c:539
 msgid "multiple sort options"
 msgstr "options de tri multiples"
 
-#: ps/sortformat.c:535
+#: ps/sortformat.c:529
 msgid "option O is neither first format nor sort order"
 msgstr "l'option O n'est ni le premier format ni un ordre de tri"
 
-#: ps/sortformat.c:662
+#: ps/sortformat.c:656
 msgid "modifier -y without format -l makes no sense"
 msgstr "le modificateur -y sans le format -l n'a pas de sens"
 
-#: ps/sortformat.c:765
+#: ps/sortformat.c:756
 msgid "bug: must reset the list first"
 msgstr "bug: la liste doit être réinitialisée d'abord"
 
-#: ps/sortformat.c:803
+#: ps/sortformat.c:794
 msgid "tell <procps@freelists.org> what you expected"
 msgstr "dites à <procps@freelists.org> ce que vous attendiez"
 
-#: ps/sortformat.c:813
+#: ps/sortformat.c:804
 msgid ""
 "tell <procps@freelists.org> what you want (-L/-T, -m/m/H, and $PS_FORMAT)"
 msgstr ""
 "dites à <procps@freelists.org> ce que vous voulez (-L/-T, -m/m/H et "
 "$PS_FORMAT)"
 
-#: ps/sortformat.c:830
+#: ps/sortformat.c:821
 #, c-format
 msgid "warning: $PS_FORMAT ignored. (%s)\n"
 msgstr "attention: $PS_FORMAT est ignoré. (%s)\n"
 
-#: ps/sortformat.c:835 ps/sortformat.c:845
+#: ps/sortformat.c:826 ps/sortformat.c:836
 msgid "conflicting format options"
 msgstr "options de format en conflit"
 
-#: ps/sortformat.c:836
+#: ps/sortformat.c:827
 msgid "can not use output modifiers with user-defined output"
 msgstr ""
 "un modificateur de sortie ne peut pas être utilisé avec une sortie définie "
 "par l'utilisateur"
 
-#: ps/sortformat.c:837
+#: ps/sortformat.c:828
 msgid "-L/-T with H/m/-m and -o/-O/o/O is nonsense"
 msgstr "-L/-T avec H/m/-m et -o/-O/o/O n'a pas de sens"
 
-#: ps/sortformat.c:895
+#: ps/sortformat.c:886
 msgid "internal error: no PID or PPID for -j option"
 msgstr "erreur interne: pas de PID ou de PPID pour l'option -j"
 
-#: ps/sortformat.c:897
+#: ps/sortformat.c:888
 msgid "lost my PGID"
 msgstr "j'ai perdu mon PGID"
 
-#: ps/sortformat.c:910
+#: ps/sortformat.c:901
 msgid "internal error: no PRI for -c option"
 msgstr "erreur interne: pas de PRI pour l'option -c"
 
-#: ps/sortformat.c:913
+#: ps/sortformat.c:904
 msgid "lost my CLS"
 msgstr "j'ai perdu mon CLS"
 
-#: ps/sortformat.c:918
+#: ps/sortformat.c:909
 msgid "-T with H/-m/m but no PID for SPID to follow"
 msgstr "-T avec H/-m/m mais aucun PID à suivre pour SPID"
 
-#: ps/sortformat.c:929
+#: ps/sortformat.c:920
 msgid "-L with H/-m/m but no PID/PGID/SID/SESS for NLWP to follow"
 msgstr "-L comme H/-m/m mais sans PID/PGID/SID/SESS à suivre pour NLWP"
 
@@ -1742,47 +1737,47 @@
 msgid "invalid argument %c"
 msgstr "argument %c invalide"
 
-#: skill.c:513
+#: skill.c:514
 #, c-format
 msgid "something at line %d\n"
 msgstr "quelque chose à la ligne %d\n"
 
-#: skill.c:536
+#: skill.c:537
 #, c-format
 msgid "priority %lu out of range"
 msgstr "priorité %lu hors limites"
 
-#: skill.c:649
+#: skill.c:650
 #, c-format
 msgid "invalid pid number %s"
 msgstr "numéro de pid %s invalide"
 
-#: skill.c:653
+#: skill.c:654
 msgid "error reading reference namespace information"
 msgstr ""
 "erreur lors de la lecture de l'information de l'espace de nom de référence"
 
-#: skill.c:661
+#: skill.c:662
 msgid "invalid namespace list"
 msgstr "liste d'espace de noms invalide"
 
-#: skill.c:699
+#: skill.c:700
 msgid "no process selection criteria"
 msgstr "aucun critère de sélection de processus"
 
-#: skill.c:702
+#: skill.c:703
 msgid "general flags may not be repeated"
 msgstr "les fanions généraux ne peuvent pas être répétés"
 
-#: skill.c:705
+#: skill.c:706
 msgid "-i makes no sense with -v, -f, and -n"
 msgstr "-i n'a pas de sens avec -v, -f et -n"
 
-#: skill.c:707
+#: skill.c:708
 msgid "-v makes no sense with -i and -f"
 msgstr "-v n'a pas de sens avec -i et -f"
 
-#: skill.c:752
+#: skill.c:753
 #, c-format
 msgid "skill: \"%s\" is not supported\n"
 msgstr "compétence: « %s » n'est pas supporté\n"
@@ -2142,7 +2137,7 @@
 msgstr "ID util. effectif"
 
 #. Translation Hint: maximum 'USER' = 7
-#: top/top_nls.c:133 w.c:587
+#: top/top_nls.c:133 w.c:591
 msgid "USER"
 msgstr "UTIL."
 
@@ -2466,126 +2461,172 @@
 msgid "Thread Group Id"
 msgstr "ID group thread"
 
-#. Translation Hint: maximum 'Adj' = 3
+#. Translation Hint: maximum 'OOMa' = 5
+#: top/top_nls.c:241
+msgid "OOMa"
+msgstr ""
+
 #: top/top_nls.c:242
-msgid "Adj"
-msgstr "Adj"
+msgid "OOMEM Adjustment"
+msgstr ""
 
-#: top/top_nls.c:243
-msgid "oom_adjustment (2^X)"
-msgstr "oom_adjustment (2^X)"
+#. Translation Hint: maximum 'OOMs' = 4
+#: top/top_nls.c:244
+msgid "OOMs"
+msgstr ""
 
-# Quel terme utiliser pour désigner la probabilité que le process soit éliminé par le OOM killer ?
-#. Translation Hint: maximum 'Badness' = 7
 #: top/top_nls.c:245
-msgid "Badness"
-msgstr "OOM killer mediation"
-
-#: top/top_nls.c:246
-msgid "oom_score (badness)"
-msgstr "oom_score (badness)"
+msgid "OOMEM Score current"
+msgstr ""
 
 #. Translation Hint: maximum 'ENVIRON' = 7
-#: top/top_nls.c:249
+#: top/top_nls.c:247
 msgid "ENVIRON"
 msgstr "ENVIRON"
 
 #. Translation Hint: the abbreviation 'vars' below is shorthand for
 #. 'variables'
-#: top/top_nls.c:252
+#: top/top_nls.c:250
 msgid "Environment vars"
 msgstr "Var. d'environnement"
 
 #. Translation Hint: maximum 'vMj' = 3
-#: top/top_nls.c:254
+#: top/top_nls.c:252
 msgid "vMj"
 msgstr "vMj"
 
-#: top/top_nls.c:255
+#: top/top_nls.c:253
 msgid "Major Faults delta"
 msgstr "Delta fautes maj"
 
 #. Translation Hint: maximum 'vMn' = 3
-#: top/top_nls.c:257
+#: top/top_nls.c:255
 msgid "vMn"
 msgstr "vMn"
 
-#: top/top_nls.c:258
+#: top/top_nls.c:256
 msgid "Minor Faults delta"
 msgstr "Delta fautes min"
 
 #. Translation Hint: maximum 'USED' = 4
-#: top/top_nls.c:260
+#: top/top_nls.c:258
 msgid "USED"
 msgstr "UTIL"
 
-#: top/top_nls.c:261
+#: top/top_nls.c:259
 msgid "Res+Swap Size (KiB)"
 msgstr "Taille res+éch (Kio)"
 
 #. Translation Hint: maximum 'nsIPC' = 7
-#: top/top_nls.c:263
+#: top/top_nls.c:261
 msgid "nsIPC"
 msgstr "nsIPC"
 
-#: top/top_nls.c:264
+#: top/top_nls.c:262
 msgid "IPC namespace Inode"
 msgstr "Inode esp nom IPC"
 
 #. Translation Hint: maximum 'nsMNT' = 7
-#: top/top_nls.c:266
+#: top/top_nls.c:264
 msgid "nsMNT"
 msgstr "nsMNT"
 
-#: top/top_nls.c:267
+#: top/top_nls.c:265
 msgid "MNT namespace Inode"
 msgstr "Inode esp nom MNT"
 
 #. Translation Hint: maximum 'nsNET' = 7
-#: top/top_nls.c:269
+#: top/top_nls.c:267
 msgid "nsNET"
 msgstr "nsNET"
 
-#: top/top_nls.c:270
+#: top/top_nls.c:268
 msgid "NET namespace Inode"
 msgstr "Inode esp nom NET"
 
 #. Translation Hint: maximum 'nsPID' = 7
-#: top/top_nls.c:272
+#: top/top_nls.c:270
 msgid "nsPID"
 msgstr "nsPID"
 
-#: top/top_nls.c:273
+#: top/top_nls.c:271
 msgid "PID namespace Inode"
 msgstr "Inode esp nom PID"
 
 #. Translation Hint: maximum 'nsUSER' = 7
-#: top/top_nls.c:275
+#: top/top_nls.c:273
 msgid "nsUSER"
 msgstr "nsUSER"
 
-#: top/top_nls.c:276
+#: top/top_nls.c:274
 msgid "USER namespace Inode"
 msgstr "Inode esp nom USER"
 
 #. Translation Hint: maximum 'nsUTS' = 7
-#: top/top_nls.c:278
+#: top/top_nls.c:276
 msgid "nsUTS"
 msgstr "nsUTS"
 
-#: top/top_nls.c:279
+#: top/top_nls.c:277
 msgid "UTS namespace Inode"
 msgstr "Inode esp nom UTS"
 
 #. Translation Hint: maximum 'LXC' = 7
-#: top/top_nls.c:281
+#: top/top_nls.c:279
 msgid "LXC"
 msgstr ""
 
-#: top/top_nls.c:282
+#: top/top_nls.c:280
 msgid "LXC container name"
 msgstr ""
 
+#. Translation Hint: maximum 'RSan' = 4
+#: top/top_nls.c:282
+msgid "RSan"
+msgstr ""
+
+#: top/top_nls.c:283
+msgid "RES Anonymous (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'RSfd' = 4
+#: top/top_nls.c:285
+msgid "RSfd"
+msgstr ""
+
+#: top/top_nls.c:286
+msgid "RES File-based (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'RSlk' = 4
+#: top/top_nls.c:288
+msgid "RSlk"
+msgstr ""
+
+#: top/top_nls.c:289
+msgid "RES Locked (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'RSsh' = 4
+#: top/top_nls.c:291
+msgid "RSsh"
+msgstr ""
+
+#: top/top_nls.c:292
+#, fuzzy
+msgid "RES Shared (KiB)"
+msgstr "Mem partagée (Kio)"
+
+#. Translation Hint: maximum 'CGNAME' = 7
+#: top/top_nls.c:294
+msgid "CGNAME"
+msgstr ""
+
+#: top/top_nls.c:295
+#, fuzzy
+msgid "Control Group name"
+msgstr "Groups contrôle"
+
 #. Translation Notes ------------------------------------------------
 #. .  It is strongly recommend that the --no-wrap command line option
 #. .  be used with all supporting translation tools, when available.
@@ -2596,7 +2637,7 @@
 #. .  and should not be translated without also making corresponding
 #. .  c-code logic changes.
 #. .
-#: top/top_nls.c:302
+#: top/top_nls.c:315
 #, c-format
 msgid ""
 "\tsignal %d (%s) was caught by %s, please\n"
@@ -2605,7 +2646,7 @@
 "\tle signal %d (%s) a été intercepté par %s, veuillez\n"
 "\tconsulter http://www.debian.org/Bugs/Reporting\n"
 
-#: top/top_nls.c:305
+#: top/top_nls.c:318
 #, c-format
 msgid ""
 "inappropriate '%s'\n"
@@ -2616,7 +2657,7 @@
 "Usage:\n"
 "  %s%s"
 
-#: top/top_nls.c:308
+#: top/top_nls.c:321
 #, c-format
 msgid ""
 "  %s\n"
@@ -2627,47 +2668,47 @@
 "Usage:\n"
 "  %s%s"
 
-#: top/top_nls.c:311
+#: top/top_nls.c:324
 #, c-format
 msgid "failed /proc/stat open: %s"
 msgstr "échec à l'ouverture de /proc/stat: %s"
 
-#: top/top_nls.c:312
+#: top/top_nls.c:325
 #, c-format
 msgid "failed openproc: %s"
 msgstr "échec de openproc: %s"
 
-#: top/top_nls.c:313
+#: top/top_nls.c:326
 #, c-format
 msgid "bad delay interval '%s'"
 msgstr "mauvais intervalle de délai « %s »"
 
-#: top/top_nls.c:314
+#: top/top_nls.c:327
 #, c-format
 msgid "bad iterations argument '%s'"
 msgstr "mauvais argument d'interactions « %s »"
 
-#: top/top_nls.c:315
+#: top/top_nls.c:328
 #, c-format
 msgid "pid limit (%d) exceeded"
 msgstr "limite de pid (%d) dépassée"
 
-#: top/top_nls.c:316
+#: top/top_nls.c:329
 #, c-format
 msgid "bad pid '%s'"
 msgstr "mauvais pid « %s »"
 
-#: top/top_nls.c:317
+#: top/top_nls.c:330
 #, c-format
 msgid "-%c requires argument"
 msgstr "-%c exige un paramètre"
 
-#: top/top_nls.c:318
+#: top/top_nls.c:331
 #, c-format
 msgid "bad width arg '%s'"
 msgstr "mauvais param de largeur « %s »"
 
-#: top/top_nls.c:319
+#: top/top_nls.c:332
 #, c-format
 msgid ""
 "unknown option '%c'\n"
@@ -2678,317 +2719,317 @@
 "Usage:\n"
 "  %s%s"
 
-#: top/top_nls.c:322
+#: top/top_nls.c:335
 msgid "-d disallowed in \"secure\" mode"
 msgstr "-d interdit en mode « sure »"
 
-#: top/top_nls.c:323
+#: top/top_nls.c:336
 msgid "-d requires positive argument"
 msgstr "-d requiert un paramètre positif"
 
-#: top/top_nls.c:324
+#: top/top_nls.c:337
 msgid "On"
 msgstr "On"
 
-#: top/top_nls.c:325
+#: top/top_nls.c:338
 msgid "Off"
 msgstr "Off"
 
 #. Translation Hint: Only the following words should be translated
 #. .                 secs (seconds), max (maximum), user, field, cols (columns)
-#: top/top_nls.c:328
+#: top/top_nls.c:341
 msgid " -hv | -bcHiOSs -d secs -n max -u|U user -p pid(s) -o field -w [cols]"
 msgstr " -hv | -bcHiOSs -d sec -n max -u|U util -p pid(s) -o champ -w [col]"
 
-#: top/top_nls.c:329
+#: top/top_nls.c:342
 msgid "failed /proc/stat read"
 msgstr "échec lors de la lecture de /proc/stat"
 
-#: top/top_nls.c:330
+#: top/top_nls.c:343
 #, c-format
 msgid "Forest mode %s"
 msgstr "Mode forêt %s"
 
-#: top/top_nls.c:331
+#: top/top_nls.c:344
 msgid "failed tty get"
 msgstr "échec de get sur le tty"
 
-#: top/top_nls.c:332
+#: top/top_nls.c:345
 #, c-format
 msgid "failed tty set: %s"
 msgstr "échec de set sur le tty: %s"
 
-#: top/top_nls.c:333
+#: top/top_nls.c:346
 msgid "Choose field group (1 - 4)"
 msgstr "Choisissez le groupe du champ (1 à 4)"
 
-#: top/top_nls.c:334
+#: top/top_nls.c:347
 msgid "Command disabled, 'A' mode required"
 msgstr "Commande désactivée, mode « A » requis"
 
-#: top/top_nls.c:335
+#: top/top_nls.c:348
 #, c-format
 msgid "Command disabled, activate %s with '-' or '_'"
 msgstr "Commande désactivée, activez %s avec « - » ou « _ »"
 
-#: top/top_nls.c:336
+#: top/top_nls.c:349
 msgid "No colors to map!"
 msgstr "Pas de couleur dans la correspondance !"
 
-#: top/top_nls.c:337
+#: top/top_nls.c:350
 #, c-format
 msgid "Failed '%s' open: %s"
 msgstr "Échec à l'ouverture de « %s »: %s"
 
-#: top/top_nls.c:338
+#: top/top_nls.c:351
 #, c-format
 msgid "Wrote configuration to '%s'"
 msgstr "Configuration écrite dans  « %s »"
 
-#: top/top_nls.c:339
+#: top/top_nls.c:352
 #, c-format
 msgid "Change delay from %.1f to"
 msgstr "Change le délai de %.1f à"
 
-#: top/top_nls.c:340
+#: top/top_nls.c:353
 #, c-format
 msgid "Show threads %s"
 msgstr "Montre les threads %s"
 
-#: top/top_nls.c:341
+#: top/top_nls.c:354
 #, c-format
 msgid "Irix mode %s"
 msgstr "Mode Irix %s"
 
-#: top/top_nls.c:342
+#: top/top_nls.c:355
 #, c-format
 msgid "PID to signal/kill [default pid = %d]"
 msgstr "PID à signaler/tuer [pid par défaut = %d]"
 
-#: top/top_nls.c:343
+#: top/top_nls.c:356
 #, c-format
 msgid "Send pid %d signal [%d/sigterm]"
 msgstr "Envoyer au pid %d le signal [%d/sigterm]"
 
-#: top/top_nls.c:344
+#: top/top_nls.c:357
 #, c-format
 msgid "Failed signal pid '%d' with '%d': %s"
 msgstr "Échec à l'envoi du signal « %2$d » au pid « %1$d »: %3$s"
 
-#: top/top_nls.c:345
+#: top/top_nls.c:358
 msgid "Invalid signal"
 msgstr "Signal invalide"
 
-#: top/top_nls.c:346
+#: top/top_nls.c:359
 #, c-format
 msgid "PID to renice [default pid = %d]"
 msgstr "PID dont la courtoisie va changer [pid par défaut = %d]"
 
-#: top/top_nls.c:347
+#: top/top_nls.c:360
 #, c-format
 msgid "Renice PID %d to value"
 msgstr "Change la courtoisie du PID %d à la valeur"
 
-#: top/top_nls.c:348
+#: top/top_nls.c:361
 #, c-format
 msgid "Failed renice of PID %d to %d: %s"
 msgstr "La courtoisie du PID %d n'a pas pu être mise à %d: %s"
 
-#: top/top_nls.c:349
+#: top/top_nls.c:362
 #, c-format
 msgid "Rename window '%s' to (1-3 chars)"
 msgstr "Renomme la fenêtre « %s » en (1-3 caractères)"
 
-#: top/top_nls.c:350
+#: top/top_nls.c:363
 #, c-format
 msgid "Cumulative time %s"
 msgstr "Temps cumulé %s"
 
-#: top/top_nls.c:351
+#: top/top_nls.c:364
 #, c-format
 msgid "Maximum tasks = %d, change to (0 is unlimited)"
 msgstr "Tâches maximum = %d, change en (0 pour illimité)"
 
-#: top/top_nls.c:352
+#: top/top_nls.c:365
 msgid "Invalid maximum"
 msgstr "Maximum invalide"
 
-#: top/top_nls.c:353
+#: top/top_nls.c:366
 msgid "Which user (blank for all)"
 msgstr "Quel utilisateur (vide pour tous)"
 
-#: top/top_nls.c:354
+#: top/top_nls.c:367
 msgid "Unknown command - try 'h' for help"
 msgstr "Commande inconnue – essayez « h » pour l'aide"
 
-#: top/top_nls.c:355
+#: top/top_nls.c:368
 #, c-format
 msgid "scroll coordinates: y = %d/%%d (tasks), x = %d/%d (fields)"
 msgstr "coordonnées de défilement: y= %d/%%d (tâches), x = %d/%d (champs)"
 
-#: top/top_nls.c:356
+#: top/top_nls.c:369
 msgid "failed memory allocate"
 msgstr "échec de l'allocation de mémoire"
 
-#: top/top_nls.c:357
+#: top/top_nls.c:370
 msgid "failed memory re-allocate"
 msgstr "échec de la ré-allocation de mémoire"
 
-#: top/top_nls.c:358
+#: top/top_nls.c:371
 msgid "Unacceptable floating point"
 msgstr "Nombre décimal inacceptable"
 
-#: top/top_nls.c:359
+#: top/top_nls.c:372
 msgid "Invalid user"
 msgstr "Utilisateur invalide"
 
-#: top/top_nls.c:360
+#: top/top_nls.c:373
 msgid "forest view"
 msgstr "vue forêt"
 
-#: top/top_nls.c:361
+#: top/top_nls.c:374
 msgid "failed pid maximum size test"
 msgstr "le test du pid maximum a échoué"
 
-#: top/top_nls.c:362
+#: top/top_nls.c:375
 msgid "failed number of cpus test"
 msgstr "le test du nombre de CPU a échoué"
 
-#: top/top_nls.c:363
+#: top/top_nls.c:376
 #, c-format
 msgid "incompatible rcfile, you should delete '%s'"
 msgstr "fichier rcfile incompatible, vous devriez effacer « %s »"
 
-#: top/top_nls.c:364
+#: top/top_nls.c:377
 #, c-format
 msgid "window entry #%d corrupt, please delete '%s'"
 msgstr "l'entrée de fenêtre #%d est corrompue, veuillez effacer « %s »"
 
-#: top/top_nls.c:365
+#: top/top_nls.c:378
 msgid "Unavailable in secure mode"
 msgstr "Non disponible en mode sécurisé"
 
-#: top/top_nls.c:366
+#: top/top_nls.c:379
 msgid "Only 1 cpu detected"
 msgstr "Seulement 1 CPU détecté"
 
-#: top/top_nls.c:367
+#: top/top_nls.c:380
 msgid "Unacceptable integer"
 msgstr "Nombre entier inacceptable"
 
-#: top/top_nls.c:368
+#: top/top_nls.c:381
 msgid "conflicting process selections (U/p/u)"
 msgstr "sélections de processus conflictuelles (U/p/u)"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 kibibytes (1024 bytes)
-#: top/top_nls.c:371
+#: top/top_nls.c:384
 msgid "KiB"
 msgstr "KiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 mebibytes (1,048,576 bytes)
-#: top/top_nls.c:374
+#: top/top_nls.c:387
 msgid "MiB"
 msgstr "MiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 gibibytes (1,073,741,824 bytes)
-#: top/top_nls.c:377
+#: top/top_nls.c:390
 msgid "GiB"
 msgstr "GiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 tebibytes (1,099,511,627,776 bytes)
-#: top/top_nls.c:380
+#: top/top_nls.c:393
 msgid "TiB"
 msgstr "TiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 pebibytes (1,024 tebibytes)
-#: top/top_nls.c:383
+#: top/top_nls.c:396
 msgid "PiB"
 msgstr "PiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 exbibytes (1,024 pebibytes)
-#: top/top_nls.c:386
+#: top/top_nls.c:399
 msgid "EiB"
 msgstr "EiB"
 
-#: top/top_nls.c:387
+#: top/top_nls.c:400
 msgid "Threads"
 msgstr "Threads"
 
-#: top/top_nls.c:388
+#: top/top_nls.c:401
 msgid "Tasks"
 msgstr "Tâches"
 
 #. Translation Hint: The following "word" is meant to represent either a single
 #. .                 cpu or all of the processors in a multi-processor computer
 #. .                 (should be exactly 6 characters, not counting the colon)
-#: top/top_nls.c:392
+#: top/top_nls.c:405
 msgid "Cpu(s):"
 msgstr "Cpu(s):"
 
 #. Translation Hint: The following "word" is meant to represent a single processor
 #. .                 (should be exactly 3 characters)
-#: top/top_nls.c:395
+#: top/top_nls.c:408
 #, c-format
 msgid "Cpu%-3d:"
 msgstr "Cpu%-3d:"
 
 #. Translation Hint: The following word "another" must have 1 trailing space
-#: top/top_nls.c:397
+#: top/top_nls.c:410
 msgid "another "
 msgstr "autre "
 
-#: top/top_nls.c:398
+#: top/top_nls.c:411
 msgid "Locate next inactive, use \"L\""
 msgstr "Trouve le suivant inactif, utilisez « L »"
 
-#: top/top_nls.c:399
+#: top/top_nls.c:412
 msgid "Locate string"
 msgstr "Trouve chaîne"
 
-#: top/top_nls.c:400
+#: top/top_nls.c:413
 #, c-format
 msgid "%s\"%s\" not found"
 msgstr "%s« %s » pas trouvé"
 
-#: top/top_nls.c:401
+#: top/top_nls.c:414
 #, c-format
 msgid "width incr is %d, change to (0 default, -1 auto)"
 msgstr "largeur incr est %d, change à (0 défaut, -1 auto)"
 
-#: top/top_nls.c:402
+#: top/top_nls.c:415
 msgid "Overwrite existing obsolete/corrupted rcfile?"
 msgstr "Écraser le fichier rcfile existant qui est obsolète ou corrompu ?"
 
-#: top/top_nls.c:403
+#: top/top_nls.c:416
 #, c-format
 msgid "unrecognized field name '%s'"
 msgstr "nom de champ « %s » non reconnu"
 
-#: top/top_nls.c:404
+#: top/top_nls.c:417
 msgid "even using field names only, window is now too small"
 msgstr ""
 "même en n'utilisant que les noms de champs, la fenêtre est maintenant trop "
 "petite"
 
-#: top/top_nls.c:406
+#: top/top_nls.c:419
 msgid "Open Files"
 msgstr "Ouvrir fichiers"
 
-#: top/top_nls.c:407
+#: top/top_nls.c:420
 msgid "NUMA Info"
 msgstr "Info NUMA"
 
-#: top/top_nls.c:408
+#: top/top_nls.c:421
 msgid "Log"
 msgstr "Journal"
 
-#: top/top_nls.c:409
+#: top/top_nls.c:422
 msgid ""
 "the '=' key will eventually show the actual file read or command(s) "
 "executed ..."
@@ -2996,11 +3037,11 @@
 "la touche « = » montera le fichier réellement lu ou la/les commande(s) "
 "exécutée(s)…"
 
-#: top/top_nls.c:410
+#: top/top_nls.c:423
 msgid "demo"
 msgstr "démo"
 
-#: top/top_nls.c:411
+#: top/top_nls.c:424
 #, c-format
 msgid ""
 "This is simulated output representing the contents of some file or the "
@@ -3093,101 +3134,101 @@
 "\n"
 "Amusez-vous !\n"
 
-#: top/top_nls.c:443
+#: top/top_nls.c:456
 msgid "to enable 'Y' press <Enter> then type 'W' and restart top"
 msgstr ""
 "pour activer « Y », appuyez sur <Entrée> puis tapez « W » et redémarrez top"
 
-#: top/top_nls.c:445
+#: top/top_nls.c:458
 msgid "to enable 'Y' please consult the top man page (press Enter)"
 msgstr "pour activer « Y », consultez la page man de top (pressez Entrée)"
 
-#: top/top_nls.c:447
+#: top/top_nls.c:460
 #, c-format
 msgid "Selection failed with: %s\n"
 msgstr "La sélection a échoué avec: %s\n"
 
-#: top/top_nls.c:448
+#: top/top_nls.c:461
 #, c-format
 msgid "unable to inspect, pid %d not found"
 msgstr "impossible d'inspecter, pid %d pas trouvé"
 
-#: top/top_nls.c:449
+#: top/top_nls.c:462
 #, c-format
 msgid "inspect at PID [default pid = %d]"
 msgstr "inspection du PID [pid par défaut = %d]"
 
-#: top/top_nls.c:450
+#: top/top_nls.c:463
 #, c-format
 msgid "%s: %*d-%-*d lines, %*d-%*d columns, %lu bytes read"
 msgstr "%s: %*d-%-*d lignes, %*d-%*d colonnes, %lu octets lus"
 
-#: top/top_nls.c:451
+#: top/top_nls.c:464
 msgid "patience please, working..."
 msgstr "merci de patienter, travail en cours…"
 
 #. Translation Hint: Below are 2 abbreviations which can be as long as needed:
 #. .                 FLD = FIELD, VAL = VALUE
-#: top/top_nls.c:454
+#: top/top_nls.c:467
 #, c-format
 msgid "add filter #%d (%s) as: [!]FLD?VAL"
 msgstr "ajouter le filtre #%d (%s) comme: [!]FLD?VAL"
 
-#: top/top_nls.c:455
+#: top/top_nls.c:468
 msgid "ignoring case"
 msgstr "ignore les majuscules/minuscules"
 
-#: top/top_nls.c:456
+#: top/top_nls.c:469
 msgid "case sensitive"
 msgstr "sensible à la casse"
 
-#: top/top_nls.c:457
+#: top/top_nls.c:470
 msgid "duplicate filter was ignored"
 msgstr "le doublon dans les filtres a été ignoré"
 
-#: top/top_nls.c:458
+#: top/top_nls.c:471
 #, c-format
 msgid "'%s' filter delimiter is missing"
 msgstr "délimiteur manquant dans le filtre « %s »"
 
-#: top/top_nls.c:459
+#: top/top_nls.c:472
 #, c-format
 msgid "'%s' filter value is missing"
 msgstr "valeur manquante dans le filtre « %s »"
 
-#: top/top_nls.c:460
+#: top/top_nls.c:473
 msgid "include"
 msgstr "inclure"
 
-#: top/top_nls.c:461
+#: top/top_nls.c:474
 msgid "exclude"
 msgstr "exclure"
 
-#: top/top_nls.c:462
+#: top/top_nls.c:475
 #, c-format
 msgid "<Enter> to resume, filters: %s"
 msgstr "<Enter> pour continuer, filtres: %s"
 
-#: top/top_nls.c:463
+#: top/top_nls.c:476
 msgid "none"
 msgstr "aucun"
 
 #. Translation Hint: The following word 'Node' should be exactly 4 characters
-#: top/top_nls.c:465
+#: top/top_nls.c:478
 #, c-format
 msgid "Node%-2d:"
 msgstr "Nœud%-2d:"
 
-#: top/top_nls.c:466
+#: top/top_nls.c:479
 #, c-format
 msgid "expand which node (0-%d)"
 msgstr "Développer quel nœud (0-%d)"
 
-#: top/top_nls.c:467
+#: top/top_nls.c:480
 msgid "invalid node"
 msgstr "nœud invalide"
 
-#: top/top_nls.c:468
+#: top/top_nls.c:481
 msgid "sorry, NUMA extensions unavailable"
 msgstr "désolé, les extensions NUMA ne sont pas disponibles"
 
@@ -3195,11 +3236,11 @@
 #. .                 'Swap' represents the linux swap file --
 #. .                 please make both translations exactly 4 characters,
 #. .                 padding with extra spaces as necessary
-#: top/top_nls.c:473
+#: top/top_nls.c:486
 msgid "Mem "
 msgstr "Mem "
 
-#: top/top_nls.c:474
+#: top/top_nls.c:487
 msgid "Swap"
 msgstr "Éch "
 
@@ -3227,7 +3268,7 @@
 #. .  please see the prologue to the show_special function in the top.c
 #. .  source file.
 #. .
-#: top/top_nls.c:508
+#: top/top_nls.c:521
 #, c-format
 msgid ""
 "Help for Interactive Commands~2 - %s\n"
@@ -3309,7 +3350,7 @@
 #. Translation Hint: As is true for the text above, the "keys" shown to the left and
 #. .                 also imbedded in the translatable text (along with escape seqs)
 #. .                 should never themselves be translated.
-#: top/top_nls.c:536
+#: top/top_nls.c:549
 msgid ""
 "  k,r       Manipulate tasks: '~1k~2' kill; '~1r~2' renice\n"
 "  d or s    Set update interval\n"
@@ -3317,7 +3358,7 @@
 "  k,r       Manipuler les tâches: «~1k̃~2» tuer; «~1r~2» courtoisie\n"
 "  d ou s    Changer l'intervalle de mise à jour\n"
 
-#: top/top_nls.c:540
+#: top/top_nls.c:553
 #, c-format
 msgid ""
 "Help for Windows / Field Groups~2 - \"Current Window\" = ~1 %s ~6\n"
@@ -3432,7 +3473,7 @@
 #. .     --> "   0~2 = black,~1  1~2 = red,    ~1  2~2 = gree
 #. .     --> "   4~2 = blue, ~1  5~2 = magenta,~1  6~2 = cyan
 #. .
-#: top/top_nls.c:590
+#: top/top_nls.c:603
 #, c-format
 msgid ""
 "Help for color mapping~2 - %s\n"
@@ -3494,7 +3535,7 @@
 "   'a' ou 'w' pour valider et changer une autre, <Entrée> pour valider et "
 "terminer "
 
-#: top/top_nls.c:616
+#: top/top_nls.c:629
 #, c-format
 msgid ""
 "Fields Management~2 for window ~1%s~6, whose current sort field is ~1%s~2\n"
@@ -3508,7 +3549,7 @@
 "   'd' ou <Espace> bascule l'affichage, 's' change le tri. Utiliser 'q' ou "
 "<Echap> pour terminer !\n"
 
-#: top/top_nls.c:621
+#: top/top_nls.c:634
 #, c-format
 msgid ""
 "%s:~3 %3u ~2total,~3 %3u ~2running,~3 %3u ~2sleeping,~3 %3u ~2stopped,~3 %3u "
@@ -3517,7 +3558,7 @@
 "%s:~3 %3u ~2total,~3 %3u ~2en cours,~3 %3u ~2en veille,~3 %3u ~2arrêté,~3 "
 "%3u ~2zombie~3\n"
 
-#: top/top_nls.c:624
+#: top/top_nls.c:637
 #, c-format
 msgid ""
 "%%%s~3 %#5.1f  ~2user,~3 %#5.1f  ~2system,~3 %#5.1f  ~2nice,~3 %#5.1f  "
@@ -3526,7 +3567,7 @@
 "%%%s~3 %#5.1f ~2util.,~3 %#5.1f ~2système,~3 %#5.1f ~2courtoisie,~3 %#5.1f "
 "~2inactif~3\n"
 
-#: top/top_nls.c:627
+#: top/top_nls.c:640
 #, c-format
 msgid ""
 "%%%s~3 %#5.1f  ~2user,~3 %#5.1f  ~2system,~3 %#5.1f  ~2nice,~3 %#5.1f  "
@@ -3538,7 +3579,7 @@
 #. Translation Hint: Only the following abbreviations need be translated
 #. .                 us = user, sy = system, ni = nice, id = idle, wa = wait,
 #. .                 hi hardware interrupt, si = software interrupt
-#: top/top_nls.c:633
+#: top/top_nls.c:646
 #, c-format
 msgid ""
 "%%%s~3 %#5.1f ~2us,~3 %#5.1f ~2sy,~3 %#5.1f ~2ni,~3 %#5.1f ~2id,~3 %#5.1f "
@@ -3550,7 +3591,7 @@
 #. Translation Hint: Only the following abbreviations need be translated
 #. .                 us = user, sy = system, ni = nice, id = idle, wa = wait,
 #. .                 hi hardware interrupt, si = software interrupt, st = steal time
-#: top/top_nls.c:639
+#: top/top_nls.c:652
 #, c-format
 msgid ""
 "%%%s~3%#5.1f ~2us,~3%#5.1f ~2sy,~3%#5.1f ~2ni,~3%#5.1f ~2id,~3%#5.1f ~2wa,"
@@ -3559,7 +3600,7 @@
 "%%%s~3%#5.1f ~2ut,~3%#5.1f ~2sy,~3%#5.1f ~2ni,~3%#5.1f ~2id,~3%#5.1f ~2wa,"
 "~3%#5.1f ~2hi,~3%#5.1f ~2si,~3%#5.1f ~2st~3\n"
 
-#: top/top_nls.c:642
+#: top/top_nls.c:655
 #, c-format
 msgid ""
 "%s %s:~3 %9.9s~2total,~3 %9.9s~2free,~3 %9.9s~2used,~3 %9.9s~2buff/cache~3\n"
@@ -3568,7 +3609,7 @@
 "%s %s:~3 %9.9s~2total,~3 %9.9s~2libr,~3 %9.9s~2util,~3 %9.9s~2tamp/cache~3\n"
 "%s %s:~3 %9.9s~2total,~3 %9.9s~2libr,~3 %9.9s~2util.~3 %9.9s~2dispo %s~3\n"
 
-#: top/top_nls.c:646
+#: top/top_nls.c:659
 #, fuzzy, c-format
 msgid ""
 "Inspection~2 Pause at: pid ~1%d~6, running ~1%s~6\n"
@@ -3581,7 +3622,7 @@
 "'q' ou <Éch> pour ~1terminer~5 !\n"
 "Options~2: ~1%s\n"
 
-#: top/top_nls.c:651
+#: top/top_nls.c:664
 #, fuzzy, c-format
 msgid ""
 "Inspection~2 View at pid: ~1%s~3, running ~1%s~3.  Locating: ~1%s~6\n"
@@ -4142,99 +4183,104 @@
 msgid " -v, --version  output version information and exit\n"
 msgstr " -v, --version  affiche les informations de version et sort\n"
 
-#: watch.c:376
+#: watch.c:384
 #, c-format
 msgid "Every %.1fs: "
 msgstr "Toutes les %.1lfs: "
 
-#: watch.c:437
+#: watch.c:385
+#, c-format
+msgid "%s: %s"
+msgstr ""
+
+#: watch.c:456
 msgid "unable to create IPC pipes"
 msgstr "impossible de créer les tubes IPC"
 
-#: watch.c:447
+#: watch.c:466
 msgid "unable to fork process"
 msgstr "impossible de clôner le processus"
 
-#: watch.c:452
+#: watch.c:471
 msgid "dup2 failed"
 msgstr "dup2 a échoué"
 
-#: watch.c:459
+#: watch.c:478
 #, c-format
 msgid "unable to execute '%s'"
 msgstr "impossible d'exécuter « %s »"
 
-#: watch.c:476
+#: watch.c:495
 msgid "fdopen"
 msgstr "fdopen"
 
-#: watch.c:622
+#: watch.c:641
 msgid "waitpid"
 msgstr "waitpid"
 
-#: watch.c:630
+#: watch.c:649
 msgid "command exit with a non-zero status, press a key to exit"
 msgstr ""
 "la commande s'est terminée avec un statut non nul, pressez une touche pour "
 "terminer"
 
-#: watch.c:755
+#: watch.c:773
 #, c-format
 msgid "unicode handling error\n"
 msgstr "erreur de gestion de unicode\n"
 
-#: watch.c:761
+#: watch.c:779
 #, c-format
 msgid "unicode handling error (malloc)\n"
 msgstr "erreur de gestion de unicode (malloc)\n"
 
-#: w.c:241 w.c:256
+#: w.c:245 w.c:260
 #, c-format
 msgid " %2ludays"
 msgstr "%2lujours"
 
 #. Translation Hint: Minutes:Seconds
 #. Translation Hint: Hours:Minutes
-#: w.c:250 w.c:260
+#: w.c:254 w.c:264
 #, c-format
 msgid " %2lu:%02um"
 msgstr " %2lu:%02um"
 
 #. Translation Hint: Seconds:Centiseconds
-#: w.c:268
+#: w.c:272
 #, c-format
 msgid " %2lu.%02us"
 msgstr " %2lu.%02us"
 
-#: w.c:451
+#: w.c:455
 msgid " -h, --no-header     do not print header\n"
 msgstr " -h, --no-header     n'affiche pas l'en-tête\n"
 
-#: w.c:452
+#: w.c:456
 msgid " -u, --no-current    ignore current process username\n"
 msgstr ""
 " -u, --no-current    ignore le nom d'utilisateur du processus courant\n"
 
-#: w.c:453
+#: w.c:457
 msgid " -s, --short         short format\n"
 msgstr " -s, --short         format court\n"
 
-#: w.c:454
+#: w.c:458
 msgid " -f, --from          show remote hostname field\n"
 msgstr " -f, --from          montre le champ du nom d'hôte distant\n"
 
-#: w.c:455
+#: w.c:459
 msgid " -o, --old-style     old style output\n"
 msgstr " -o, --old-style     sortie dans l'ancien style\n"
 
-#: w.c:456
+#: w.c:460
 msgid ""
 " -i, --ip-addr       display IP address instead of hostname (if possible)\n"
 msgstr ""
 " -i, --ip-addr       affiche l'adresse IP au lieu du nom d'hôte (si "
 "possible)\n"
 
-#: w.c:553
+#: w.c:557
 #, c-format
 msgid ""
 "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n"
@@ -4242,7 +4288,7 @@
 "la longueur « utilisateur » dans l'environnement PROCPS_USERLEN doit être "
 "entre 8 et %i, ignoré.\n"
 
-#: w.c:563
+#: w.c:567
 #, c-format
 msgid ""
 "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n"
@@ -4252,21 +4298,21 @@
 
 #. Translation Hint: Following five uppercase messages are
 #. * headers. Try to keep alignment intact.
-#: w.c:587
+#: w.c:591
 #, c-format
 msgid "%-*s TTY      "
 msgstr "%-*s TTY      "
 
-#: w.c:589
+#: w.c:593
 msgid "FROM"
 msgstr "DE  "
 
-#: w.c:591
+#: w.c:595
 #, c-format
 msgid "  LOGIN@   IDLE   JCPU   PCPU WHAT\n"
 msgstr "  LOGIN@   IDLE   JCPU   PCPU QUOI\n"
 
-#: w.c:593
+#: w.c:597
 #, c-format
 msgid "   IDLE WHAT\n"
 msgstr "   IDLE QUOI\n"
@@ -4313,12 +4359,28 @@
 msgid "%s from %s\n"
 msgstr "%s de %s\n"
 
+#~ msgid "seconds argument `%s' failed"
+#~ msgstr "l'argument des secondes « %s » n'est pas valable"
+
 #~ msgid "alternate System.map file must follow -n"
 #~ msgstr "le fichier System.map alternatif doit suivre -n"
 
 #~ msgid "alternate System.map file must follow N"
 #~ msgstr "le fichier System.map alternatif doit suivre N"
 
+#~ msgid "Adj"
+#~ msgstr "Adj"
+
+#~ msgid "oom_adjustment (2^X)"
+#~ msgstr "oom_adjustment (2^X)"
+
+# Quel terme utiliser pour désigner la probabilité que le process soit éliminé par le OOM killer ?
+#~ msgid "Badness"
+#~ msgstr "OOM killer mediation"
+
+#~ msgid "oom_score (badness)"
+#~ msgstr "oom_score (badness)"
+
 #~ msgid "%d column window is too narrow"
 #~ msgstr "la fenêtre avec %d colonnes est trop étroite"
 
Binary files /tmp/tmpsmX0gC/RRPDCxm9wk/procps-3.3.11/po/pl.gmo and /tmp/tmpsmX0gC/hzIsJzyyeF/procps-3.3.12/po/pl.gmo differ
diff -Nru procps-3.3.11/po/pl.po procps-3.3.12/po/pl.po
--- procps-3.3.11/po/pl.po	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/po/pl.po	2016-07-10 06:40:26.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: procps-ng-3.3.10-rc1\n"
 "Report-Msgid-Bugs-To: procps@freelists.org\n"
-"POT-Creation-Date: 2015-08-09 15:59+1000\n"
+"POT-Creation-Date: 2016-07-10 08:19+1000\n"
 "PO-Revision-Date: 2015-01-23 23:06+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -16,7 +16,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: free.c:74 slabtop.c:189 uptime.c:59 w.c:449
+#: free.c:74 slabtop.c:189 uptime.c:59 w.c:453
 #, c-format
 msgid " %s [options]\n"
 msgstr " %s [opcje]\n"
@@ -103,7 +103,7 @@
 msgid " -w, --wide          wide output\n"
 msgstr " -w, --wide          szeroki format wyjścia\n"
 
-#: free.c:95 w.c:458
+#: free.c:95 w.c:462
 msgid "     --help     display this help and exit\n"
 msgstr "     --help     wyświetlenie tego opisu i zakończenie\n"
 
@@ -111,26 +111,21 @@
 msgid "Multiple unit options doesn't make sense."
 msgstr ""
 
-#: free.c:329
-#, c-format
-msgid "seconds argument `%s' failed"
-msgstr "niezrozumiały argument liczby sekund `%s'"
-
-#: free.c:332
+#: free.c:330
 #, c-format
 msgid "seconds argument `%s' is not positive number"
 msgstr "argument liczby sekund `%s' nie jest liczbą dodatnią"
 
-#: free.c:338
+#: free.c:336
 msgid "failed to parse count argument"
 msgstr "niezrozumiały argument liczby powtórzeń"
 
-#: free.c:341
+#: free.c:339
 #, c-format
 msgid "failed to parse count argument: '%s'"
 msgstr "niezrozumiały argument liczby powtórzeń: '%s'"
 
-#: free.c:362
+#: free.c:360
 #, c-format
 msgid ""
 "              total        used        free      shared     buffers       "
@@ -139,7 +134,7 @@
 "              razem       użyte       wolne    dzielone      bufory     w "
 "cache    dostępne"
 
-#: free.c:364
+#: free.c:362
 #, c-format
 msgid ""
 "              total        used        free      shared  buff/cache   "
@@ -148,23 +143,23 @@
 "              razem       użyte       wolne    dzielone   buf/cache    "
 "dostępne"
 
-#: free.c:367
+#: free.c:365
 msgid "Mem:"
 msgstr "Pamięć:"
 
-#: free.c:387
+#: free.c:385
 msgid "Low:"
 msgstr "Niska:"
 
-#: free.c:393
+#: free.c:391
 msgid "High:"
 msgstr "Wysoka:"
 
-#: free.c:400
+#: free.c:398
 msgid "Swap:"
 msgstr "Wymiana:"
 
-#: free.c:407
+#: free.c:405
 msgid "Total:"
 msgstr "Razem:"
 
@@ -322,7 +317,7 @@
 msgid "Error reading reference namespace information\n"
 msgstr "Błąd przy odczycie informacji o przestrzeni nazw odniesienia\n"
 
-#: pgrep.c:610 pidof.c:224 pidof.c:265 sysctl.c:643
+#: pgrep.c:610 pidof.c:230 pidof.c:271 sysctl.c:643
 msgid "internal error"
 msgstr "błąd wewnętrzny"
 
@@ -395,7 +390,7 @@
 msgid " -o, --omit-pid <PID,...>  omit processes with PID\n"
 msgstr " -o, --omit-pid <PID,...>  pominięcie procesów o podanych PID-ach\n"
 
-#: pidof.c:268
+#: pidof.c:274
 #, c-format
 msgid "illegal omit pid value (%s)!\n"
 msgstr "błędna wartość PID-u do pominięcia (%s)!\n"
@@ -517,7 +512,7 @@
 msgid "  [ stack ]"
 msgstr "  [ stos ]"
 
-#: pmap.c:326
+#: pmap.c:325
 msgid "Unknown format in smaps file!"
 msgstr "Nieznany format pliku smaps!"
 
@@ -548,8 +543,8 @@
 msgid " total %8ldK\n"
 msgstr " razem %8ldK\n"
 
-#: pmap.c:767 skill.c:500 skill.c:533 skill.c:620 tload.c:128 tload.c:133
-#: vmstat.c:959 vmstat.c:968 watch.c:708
+#: pmap.c:767 skill.c:500 skill.c:534 skill.c:621 tload.c:128 tload.c:133
+#: vmstat.c:959 vmstat.c:968 watch.c:726
 msgid "failed to parse argument"
 msgstr "niezrozumiały argument"
 
@@ -632,8 +627,8 @@
 msgid "Signal %d (%s) caught by %s (%s).\n"
 msgstr "Sygnał %d (%s) został złapany przez %s (%s).\n"
 
-#: ps/display.c:66 ps/display.c:271 ps/parser.c:509 ps/parser.c:756
-#: ps/select.c:95 ps/sortformat.c:550
+#: ps/display.c:66 ps/display.c:271 ps/parser.c:495 ps/parser.c:742
+#: ps/select.c:95 ps/sortformat.c:544
 msgid "please report this bug"
 msgstr "proszę zgłosić ten błąd"
 
@@ -679,7 +674,7 @@
 #. .
 #. . It must be limited to 15 characters or less.
 #.
-#: ps/global.c:408
+#: ps/global.c:401
 msgid "help"
 msgstr "pomoc"
 
@@ -1105,290 +1100,290 @@
 "\n"
 "Więcej szczegółów w ps(1).\n"
 
-#: ps/output.c:1971
+#: ps/output.c:1969
 #, c-format
 msgid "fix bigness error\n"
 msgstr "poprawić błąd z dużym rozmiarem\n"
 
-#: ps/output.c:2046
+#: ps/output.c:2044
 #, c-format
 msgid "bad alignment code\n"
 msgstr "niewłaściwy kod wyrównania\n"
 
-#: ps/output.c:2108
+#: ps/output.c:2106
 #, c-format
 msgid "unknown page size (assume 4096)\n"
 msgstr "nieznany rozmiar strony (przyjęto 4096)\n"
 
-#: ps/parser.c:58
+#: ps/parser.c:57
 msgid "the option is exclusive: "
 msgstr "opcja jest wyłączna: "
 
-#: ps/parser.c:89
+#: ps/parser.c:87
 msgid "process ID list syntax error"
 msgstr "błąd składni listy identyfikatorów procesów"
 
-#: ps/parser.c:90 ps/parser.c:91
+#: ps/parser.c:88 ps/parser.c:89
 msgid "process ID out of range"
 msgstr "identyfikator procesu spoza zakresu"
 
-#: ps/parser.c:104
+#: ps/parser.c:102
 msgid "user name does not exist"
 msgstr "użytkownik o tej nazwie nie istnieje"
 
-#: ps/parser.c:110
+#: ps/parser.c:108
 msgid "user ID out of range"
 msgstr "identyfikator użytkownika spoza zakresu"
 
-#: ps/parser.c:123
+#: ps/parser.c:121
 msgid "group name does not exist"
 msgstr "grupa o tej nazwie nie istnieje"
 
-#: ps/parser.c:129
+#: ps/parser.c:127
 msgid "group ID out of range"
 msgstr "identyfikator grupy spoza zakresu"
 
-#: ps/parser.c:145 ps/parser.c:169
+#: ps/parser.c:143 ps/parser.c:167
 msgid "TTY could not be found"
 msgstr "nie znaleziono TTY"
 
-#: ps/parser.c:171
+#: ps/parser.c:169
 msgid "list member was not a TTY"
 msgstr "element listy to nie TTY"
 
-#: ps/parser.c:196
+#: ps/parser.c:194
 msgid "improper list"
 msgstr "niewłaściwa lista"
 
-#: ps/parser.c:256
+#: ps/parser.c:242
 msgid "list of command names must follow -C"
 msgstr "po -C musi wystąpić lista nazw poleceń"
 
-#: ps/parser.c:270
+#: ps/parser.c:256
 msgid "list of real groups must follow -G"
 msgstr "po -G musi wystąpić lista grup rzeczywistych"
 
-#: ps/parser.c:283
+#: ps/parser.c:269
 msgid "list of jobs must follow -J"
 msgstr "po -J musi wystąpić lista zadań"
 
-#: ps/parser.c:311
+#: ps/parser.c:297
 msgid "format or sort specification must follow -O"
 msgstr "po -O musi wystąpić określenie formatu lub sortowania"
 
-#: ps/parser.c:322
+#: ps/parser.c:308
 msgid "list of PRM groups must follow -R"
 msgstr "po -R musi wystąpić lista grup PRM"
 
-#: ps/parser.c:341
+#: ps/parser.c:327
 msgid "list of real users must follow -U"
 msgstr "po -U musi wystąpić lista użytkowników rzeczywistych"
 
-#: ps/parser.c:382
+#: ps/parser.c:368
 msgid "list of session leaders OR effective group names must follow -g"
 msgstr "po -g musi wystąpić lista liderów sesji LUB nazw grup efektywnych"
 
-#: ps/parser.c:393
+#: ps/parser.c:379
 msgid "list of session leaders OR effective group IDs was invalid"
 msgstr "błędna lista liderów sesji LUB identyfikatorów grup efektywnych"
 
-#: ps/parser.c:417
+#: ps/parser.c:403
 msgid "format specification must follow -o"
 msgstr "po -o musi wystąpić określenie formatu"
 
-#: ps/parser.c:423
+#: ps/parser.c:409
 msgid "list of process IDs must follow -p"
 msgstr "po -p musi wystąpić lista identyfikatorów procesów"
 
-#: ps/parser.c:440
+#: ps/parser.c:426
 msgid "the -r option is reserved"
 msgstr "opcja -r jest zarezerwowana"
 
-#: ps/parser.c:446
+#: ps/parser.c:432
 msgid "list of session IDs must follow -s"
 msgstr "po -s musi wystąpić lista identyfikatorów sesji"
 
-#: ps/parser.c:454
+#: ps/parser.c:440
 msgid "list of terminals (pty, tty...) must follow -t"
 msgstr "po -t musi wystąpić lista terminali (pty, tty...)"
 
-#: ps/parser.c:462
+#: ps/parser.c:448
 msgid "list of users must follow -u"
 msgstr "po -u musi wystąpić lista użytkowników"
 
-#: ps/parser.c:484
+#: ps/parser.c:470
 msgid "must set personality to get -x option"
 msgstr "aby użyć opcji -x, należy ustawić osobowość"
 
-#: ps/parser.c:499
+#: ps/parser.c:485
 msgid "list of zones (contexts, labels, whatever?) must follow -z"
 msgstr "po -z musi wystąpić lista stref (kontekstów, etykiet, czegokolwiek?)"
 
-#: ps/parser.c:506
+#: ps/parser.c:492
 msgid "embedded '-' among SysV options makes no sense"
 msgstr "znak '-' osadzony wśród opcji SysV nie ma sensu"
 
-#: ps/parser.c:512
+#: ps/parser.c:498
 msgid "unsupported SysV option"
 msgstr "nie obsługiwana opcja SysV"
 
-#: ps/parser.c:525
+#: ps/parser.c:511
 msgid "cannot happen - problem #1"
 msgstr "to nie może się zdarzyć - problem #1"
 
-#: ps/parser.c:529
+#: ps/parser.c:515
 msgid "cannot happen - problem #2"
 msgstr "to nie może się zdarzyć - problem #2"
 
-#: ps/parser.c:531
+#: ps/parser.c:517
 msgid "second chance parse failed, not BSD or SysV"
 msgstr "analiza drugiej szansy nie powiodła się - ani BSD, ani SysV"
 
-#: ps/parser.c:548
+#: ps/parser.c:534
 msgid "option A is reserved"
 msgstr "opcja A jest zarezerwowana"
 
-#: ps/parser.c:553
+#: ps/parser.c:539
 msgid "option C is reserved"
 msgstr "opcja C jest zarezerwowana"
 
-#: ps/parser.c:573
+#: ps/parser.c:559
 msgid "format or sort specification must follow O"
 msgstr "po O musi wystąpić określenie formatu lub sortowania"
 
-#: ps/parser.c:598
+#: ps/parser.c:584
 msgid "list of users must follow U"
 msgstr "po U musi wystąpić lista użytkowników"
 
-#: ps/parser.c:610
+#: ps/parser.c:596
 msgid "obsolete W option not supported (you have a /dev/drum?)"
 msgstr "przestarzała opcja W nie jest obsługiwana (istnieje /dev/drum?)"
 
-#: ps/parser.c:646 ps/parser.c:913 ps/parser.c:922
+#: ps/parser.c:632 ps/parser.c:899 ps/parser.c:908
 msgid "only one heading option may be specified"
 msgstr "można podać tylko jedną opcję nagłówków"
 
-#: ps/parser.c:661
+#: ps/parser.c:647
 msgid "long sort specification must follow 'k'"
 msgstr "po 'k' musi wystąpić długie określenie sortowania"
 
-#: ps/parser.c:689
+#: ps/parser.c:675
 msgid "format specification must follow o"
 msgstr "po o musi wystąpić określenie formatu"
 
-#: ps/parser.c:695
+#: ps/parser.c:681
 msgid "list of process IDs must follow p"
 msgstr "po p musi wystąpić lista identyfikatorów procesów"
 
-#: ps/parser.c:753
+#: ps/parser.c:739
 msgid "embedded '-' among BSD options makes no sense"
 msgstr "znak '-' osadzony wśród opcji BSD nie ma sensu"
 
-#: ps/parser.c:759
+#: ps/parser.c:745
 msgid "unsupported option (BSD syntax)"
 msgstr "nie obsługiwana opcja (składnia BSD)"
 
-#: ps/parser.c:845 ps/parser.c:857
+#: ps/parser.c:831 ps/parser.c:843
 msgid "unknown gnu long option"
 msgstr "nieznana długa opcja GNU"
 
-#: ps/parser.c:865
+#: ps/parser.c:851
 msgid "list of real groups must follow --Group"
 msgstr "po --Group musi wystąpić lista grup rzeczywistych"
 
-#: ps/parser.c:873
+#: ps/parser.c:859
 msgid "list of real users must follow --User"
 msgstr "po --User musi wystąpić lista użytkowników rzeczywistych"
 
-#: ps/parser.c:892
+#: ps/parser.c:878
 msgid "number of columns must follow --cols, --width, or --columns"
 msgstr "po --cols, --width lub --columns musi wystąpić liczba kolumn"
 
-#: ps/parser.c:895
+#: ps/parser.c:881
 msgid "option --cumulative does not take an argument"
 msgstr "opcja --cumulative nie może mieć argumentu"
 
-#: ps/parser.c:900
+#: ps/parser.c:886
 msgid "option --deselect does not take an argument"
 msgstr "opcja --deselect nie może mieć argumentu"
 
-#: ps/parser.c:912
+#: ps/parser.c:898
 msgid "option --no-heading does not take an argument"
 msgstr "opcja --no-heading nie może mieć argumentu"
 
-#: ps/parser.c:921
+#: ps/parser.c:907
 msgid "option --heading does not take an argument"
 msgstr "opcja --heading nie może mieć argumentu"
 
-#: ps/parser.c:927
+#: ps/parser.c:913
 msgid "option --forest does not take an argument"
 msgstr "opcja --forest nie może mieć argumentu"
 
-#: ps/parser.c:933
+#: ps/parser.c:919
 msgid "format specification must follow --format"
 msgstr "po --format musi wystąpić określenie formatu"
 
-#: ps/parser.c:939
+#: ps/parser.c:925
 msgid "list of effective groups must follow --group"
 msgstr "po --group musi wystąpić lista grup efektywnych"
 
-#: ps/parser.c:957
+#: ps/parser.c:943
 msgid "list of process IDs must follow --pid"
 msgstr "po --pid musi wystąpić lista identyfikatorów procesów"
 
-#: ps/parser.c:973
+#: ps/parser.c:959
 msgid "list of process IDs must follow --ppid"
 msgstr "po --ppid musi wystąpić lista identyfikatorów procesów"
 
-#: ps/parser.c:991
+#: ps/parser.c:977
 msgid "number of rows must follow --rows or --lines"
 msgstr "po --rows lub --lines musi wystąpić liczba wierszy"
 
-#: ps/parser.c:995
+#: ps/parser.c:981
 msgid "some sid thing(s) must follow --sid"
 msgstr "po --sid musi wystąpić jakieś określenie identyfikujące sesję"
 
-#: ps/parser.c:1003
+#: ps/parser.c:989
 msgid "long sort specification must follow --sort"
 msgstr "po --sort musi wystąpić długie określenie sortowania"
 
-#: ps/parser.c:1009
+#: ps/parser.c:995
 msgid "list of ttys must follow --tty"
 msgstr "po --tty musi wystąpić lista terminali"
 
-#: ps/parser.c:1017
+#: ps/parser.c:1003
 msgid "list of effective users must follow --user"
 msgstr "po --user musi wystąpić lista użytkowników efektywnych"
 
-#: ps/parser.c:1134
+#: ps/parser.c:1119
 msgid "way bad"
 msgstr "zła droga"
 
-#: ps/parser.c:1148
+#: ps/parser.c:1133
 msgid "garbage option"
 msgstr "śmieciowa opcja"
 
-#: ps/parser.c:1152
+#: ps/parser.c:1137
 msgid "something broke"
 msgstr "coś się zepsuło"
 
-#: ps/parser.c:1172
+#: ps/parser.c:1157
 msgid "thread display conflicts with forest display"
 msgstr "wyświetlanie wątków jest w konflikcie z wyświetlaniem lasu"
 
-#: ps/parser.c:1177
+#: ps/parser.c:1162
 msgid "thread flags conflict; can't use H with m or -m"
 msgstr "konflikt flag wątków: nie można użyć H z m ani -m"
 
-#: ps/parser.c:1179
+#: ps/parser.c:1164
 msgid "thread flags conflict; can't use both m and -m"
 msgstr "konflikt flag wątków: nie można użyć jednocześnie m i -m"
 
-#: ps/parser.c:1181
+#: ps/parser.c:1166
 msgid "thread flags conflict; can't use both -L and -T"
 msgstr "konflikt flag wątków: nie można użyć jednocześnie -L i -T"
 
-#: ps/parser.c:1255 ps/parser.c:1256
+#: ps/parser.c:1239 ps/parser.c:1240
 #, c-format
 msgid "error: %s\n"
 msgstr "błąd: %s\n"
@@ -1397,137 +1392,137 @@
 msgid "process selection options conflict"
 msgstr "konflikt opcji wyboru procesów"
 
-#: ps/sortformat.c:107 ps/sortformat.c:112
+#: ps/sortformat.c:106 ps/sortformat.c:111
 msgid "seriously crashing: goodbye cruel world"
 msgstr "poważna awaria: żegnaj, okrutny świecie"
 
-#: ps/sortformat.c:147
+#: ps/sortformat.c:146
 msgid "improper AIX field descriptor"
 msgstr "niewłaściwy deskryptor pola AIX"
 
-#: ps/sortformat.c:168
+#: ps/sortformat.c:167
 msgid "unknown AIX field descriptor"
 msgstr "nieznany deskryptor pola AIX"
 
-#: ps/sortformat.c:173
+#: ps/sortformat.c:172
 msgid "AIX field descriptor processing bug"
 msgstr "błąd przetwarzania deskryptora pola AIX"
 
-#: ps/sortformat.c:290
+#: ps/sortformat.c:285
 #, c-format
 msgid "unknown user-defined format specifier \"%s\""
 msgstr "nieznane określenie formatu zdefiniowanego przez użytkownika \"%s\""
 
-#: ps/sortformat.c:316
+#: ps/sortformat.c:311
 msgid "empty format list"
 msgstr "pusta lista formatu"
 
-#: ps/sortformat.c:317
+#: ps/sortformat.c:312
 msgid "improper format list"
 msgstr "niewłaściwa lista formatu"
 
-#: ps/sortformat.c:318
+#: ps/sortformat.c:313
 msgid "column widths must be unsigned decimal numbers"
 msgstr "szerokości kolumn muszą być liczbami dziesiętnymi bez znaku"
 
-#: ps/sortformat.c:319
+#: ps/sortformat.c:314
 msgid "can not set width for a macro (multi-column) format specifier"
 msgstr ""
 "nie można ustawić szerokości dla (wielokolumnowego) makra określającego "
 "format"
 
-#: ps/sortformat.c:372 ps/sortformat.c:388
+#: ps/sortformat.c:367 ps/sortformat.c:383
 msgid "improper sort list"
 msgstr "niewłaściwa lista sortowania"
 
-#: ps/sortformat.c:383
+#: ps/sortformat.c:378
 msgid "empty sort list"
 msgstr "pusta lista sortowania"
 
-#: ps/sortformat.c:404 ps/sortformat.c:482 ps/sortformat.c:484
+#: ps/sortformat.c:399 ps/sortformat.c:477 ps/sortformat.c:479
 msgid "unknown sort specifier"
 msgstr "nieznane określenie sortowania"
 
-#: ps/sortformat.c:431 ps/sortformat.c:442 ps/sortformat.c:448
+#: ps/sortformat.c:426 ps/sortformat.c:437 ps/sortformat.c:443
 msgid "bad sorting code"
 msgstr "błędny kod sortujący"
 
-#: ps/sortformat.c:445
+#: ps/sortformat.c:440
 msgid "PPID sort and forest output conflict"
 msgstr "konflikt opcji sortowania wg PPID-u i lasu"
 
-#: ps/sortformat.c:520
+#: ps/sortformat.c:514
 msgid "option -O can not follow other format options"
 msgstr "opcja -O nie może wystąpić po innych opcjach formatu"
 
-#: ps/sortformat.c:527 ps/sortformat.c:545
+#: ps/sortformat.c:521 ps/sortformat.c:539
 msgid "multiple sort options"
 msgstr "wiele opcji sortowania"
 
-#: ps/sortformat.c:535
+#: ps/sortformat.c:529
 msgid "option O is neither first format nor sort order"
 msgstr "opcja O nie jest pierwszym formatem ani kolejnością sortowania"
 
-#: ps/sortformat.c:662
+#: ps/sortformat.c:656
 msgid "modifier -y without format -l makes no sense"
 msgstr "modyfikator -y bez formatu -l nie ma sensu"
 
-#: ps/sortformat.c:765
+#: ps/sortformat.c:756
 msgid "bug: must reset the list first"
 msgstr "błąd: trzeba najpierw wyzerować listę"
 
-#: ps/sortformat.c:803
+#: ps/sortformat.c:794
 msgid "tell <procps@freelists.org> what you expected"
 msgstr ""
 "proszę napisać na adres <procps@freelists.org>, co powinno być zrobione"
 
-#: ps/sortformat.c:813
+#: ps/sortformat.c:804
 msgid ""
 "tell <procps@freelists.org> what you want (-L/-T, -m/m/H, and $PS_FORMAT)"
 msgstr ""
 "proszę napisać na adres <procps@freelists.org>, o co chodzi (-L/-T, -m/m/H "
 "oraz $PS_FORMAT)"
 
-#: ps/sortformat.c:830
+#: ps/sortformat.c:821
 #, c-format
 msgid "warning: $PS_FORMAT ignored. (%s)\n"
 msgstr "uwaga: zignorowano $PS_FORMAT (%s).\n"
 
-#: ps/sortformat.c:835 ps/sortformat.c:845
+#: ps/sortformat.c:826 ps/sortformat.c:836
 msgid "conflicting format options"
 msgstr "konflikt opcji formatu"
 
-#: ps/sortformat.c:836
+#: ps/sortformat.c:827
 msgid "can not use output modifiers with user-defined output"
 msgstr ""
 "nie można używać modyfikatorów wyjścia dla wyjścia zdefiniowanego przez "
 "użytkownika"
 
-#: ps/sortformat.c:837
+#: ps/sortformat.c:828
 msgid "-L/-T with H/m/-m and -o/-O/o/O is nonsense"
 msgstr "-L/-T wraz z H/m/-m oraz -o/-O/o/O to nonsens"
 
-#: ps/sortformat.c:895
+#: ps/sortformat.c:886
 msgid "internal error: no PID or PPID for -j option"
 msgstr "błąd wewnętrzny: brak PID-u oraz PPID-u dla opcji -j"
 
-#: ps/sortformat.c:897
+#: ps/sortformat.c:888
 msgid "lost my PGID"
 msgstr "utracono własny PGID"
 
-#: ps/sortformat.c:910
+#: ps/sortformat.c:901
 msgid "internal error: no PRI for -c option"
 msgstr "błąd wewnętrzny: brak PRI dla opcji -c"
 
-#: ps/sortformat.c:913
+#: ps/sortformat.c:904
 msgid "lost my CLS"
 msgstr "utracono własny CLS"
 
-#: ps/sortformat.c:918
+#: ps/sortformat.c:909
 msgid "-T with H/-m/m but no PID for SPID to follow"
 msgstr "-T z H/-m/m, ale brak PID-u, po którym miałby być SPID"
 
-#: ps/sortformat.c:929
+#: ps/sortformat.c:920
 msgid "-L with H/-m/m but no PID/PGID/SID/SESS for NLWP to follow"
 msgstr ""
 "-L z H/-m/m, ale brak pola PID/PGID/SID/SESS, po którym miałoby być NLWP"
@@ -1702,46 +1697,46 @@
 msgid "invalid argument %c"
 msgstr "błędny argument %c"
 
-#: skill.c:513
+#: skill.c:514
 #, c-format
 msgid "something at line %d\n"
 msgstr "coś w linii %d\n"
 
-#: skill.c:536
+#: skill.c:537
 #, c-format
 msgid "priority %lu out of range"
 msgstr "priorytet %lu jest spoza zakresu"
 
-#: skill.c:649
+#: skill.c:650
 #, c-format
 msgid "invalid pid number %s"
 msgstr "błędny numer pid %s"
 
-#: skill.c:653
+#: skill.c:654
 msgid "error reading reference namespace information"
 msgstr "błąd odczytu informacji o przestrzeni nazw odniesienia"
 
-#: skill.c:661
+#: skill.c:662
 msgid "invalid namespace list"
 msgstr "błędna lista przestrzeni nazw"
 
-#: skill.c:699
+#: skill.c:700
 msgid "no process selection criteria"
 msgstr "nie podano kryteriów wyboru"
 
-#: skill.c:702
+#: skill.c:703
 msgid "general flags may not be repeated"
 msgstr "flag ogólnych nie można powtarzać"
 
-#: skill.c:705
+#: skill.c:706
 msgid "-i makes no sense with -v, -f, and -n"
 msgstr "-i nie ma sensu z -v, -f ani -n"
 
-#: skill.c:707
+#: skill.c:708
 msgid "-v makes no sense with -i and -f"
 msgstr "-v nie ma sensu z -i ani -f"
 
-#: skill.c:752
+#: skill.c:753
 #, c-format
 msgid "skill: \"%s\" is not supported\n"
 msgstr "skill: \"%s\" nie jest obsługiwany\n"
@@ -2097,7 +2092,7 @@
 msgstr "Id. użytkownika efektywnego"
 
 #. Translation Hint: maximum 'USER' = 7
-#: top/top_nls.c:133 w.c:587
+#: top/top_nls.c:133 w.c:591
 msgid "USER"
 msgstr "UŻYTK."
 
@@ -2421,125 +2416,172 @@
 msgid "Thread Group Id"
 msgstr "Id. grupy wątków"
 
-#. Translation Hint: maximum 'Adj' = 3
+#. Translation Hint: maximum 'OOMa' = 5
+#: top/top_nls.c:241
+msgid "OOMa"
+msgstr ""
+
 #: top/top_nls.c:242
-msgid "Adj"
-msgstr "Adj"
+msgid "OOMEM Adjustment"
+msgstr ""
 
-#: top/top_nls.c:243
-msgid "oom_adjustment (2^X)"
-msgstr "poprawka OOM (2^X)"
+#. Translation Hint: maximum 'OOMs' = 4
+#: top/top_nls.c:244
+msgid "OOMs"
+msgstr ""
 
-#. Translation Hint: maximum 'Badness' = 7
 #: top/top_nls.c:245
-msgid "Badness"
-msgstr "Badness"
-
-#: top/top_nls.c:246
-msgid "oom_score (badness)"
-msgstr "Punktacja OOM (badness)"
+msgid "OOMEM Score current"
+msgstr ""
 
 #. Translation Hint: maximum 'ENVIRON' = 7
-#: top/top_nls.c:249
+#: top/top_nls.c:247
 msgid "ENVIRON"
 msgstr "ZMIENNE"
 
 #. Translation Hint: the abbreviation 'vars' below is shorthand for
 #. 'variables'
-#: top/top_nls.c:252
+#: top/top_nls.c:250
 msgid "Environment vars"
 msgstr "Zmienne środowiskowe (ENV)"
 
 #. Translation Hint: maximum 'vMj' = 3
-#: top/top_nls.c:254
+#: top/top_nls.c:252
 msgid "vMj"
 msgstr "vMj"
 
-#: top/top_nls.c:255
+#: top/top_nls.c:253
 msgid "Major Faults delta"
 msgstr "Odstęp między twardymi błędami braku strony"
 
 #. Translation Hint: maximum 'vMn' = 3
-#: top/top_nls.c:257
+#: top/top_nls.c:255
 msgid "vMn"
 msgstr "vMn"
 
-#: top/top_nls.c:258
+#: top/top_nls.c:256
 msgid "Minor Faults delta"
 msgstr "Odstęp między miękkimi błędami braku strony"
 
 #. Translation Hint: maximum 'USED' = 4
-#: top/top_nls.c:260
+#: top/top_nls.c:258
 msgid "USED"
 msgstr "UŻ."
 
-#: top/top_nls.c:261
+#: top/top_nls.c:259
 msgid "Res+Swap Size (KiB)"
 msgstr "Rozmiar rezydentny+swap (KiB)"
 
 #. Translation Hint: maximum 'nsIPC' = 7
-#: top/top_nls.c:263
+#: top/top_nls.c:261
 msgid "nsIPC"
 msgstr "nsIPC"
 
-#: top/top_nls.c:264
+#: top/top_nls.c:262
 msgid "IPC namespace Inode"
 msgstr "I-węzeł przestrzeni nazw IPC"
 
 #. Translation Hint: maximum 'nsMNT' = 7
-#: top/top_nls.c:266
+#: top/top_nls.c:264
 msgid "nsMNT"
 msgstr "nsMNT"
 
-#: top/top_nls.c:267
+#: top/top_nls.c:265
 msgid "MNT namespace Inode"
 msgstr "I-węzeł przestrzeni nazw MNT"
 
 #. Translation Hint: maximum 'nsNET' = 7
-#: top/top_nls.c:269
+#: top/top_nls.c:267
 msgid "nsNET"
 msgstr "nsNET"
 
-#: top/top_nls.c:270
+#: top/top_nls.c:268
 msgid "NET namespace Inode"
 msgstr "I-węzeł przestrzeni nazw NET"
 
 #. Translation Hint: maximum 'nsPID' = 7
-#: top/top_nls.c:272
+#: top/top_nls.c:270
 msgid "nsPID"
 msgstr "nsPID"
 
-#: top/top_nls.c:273
+#: top/top_nls.c:271
 msgid "PID namespace Inode"
 msgstr "I-węzeł przestrzeni nazw PID"
 
 #. Translation Hint: maximum 'nsUSER' = 7
-#: top/top_nls.c:275
+#: top/top_nls.c:273
 msgid "nsUSER"
 msgstr "nsUSER"
 
-#: top/top_nls.c:276
+#: top/top_nls.c:274
 msgid "USER namespace Inode"
 msgstr "I-węzeł przestrzeni nazw użytkowników (USER)"
 
 #. Translation Hint: maximum 'nsUTS' = 7
-#: top/top_nls.c:278
+#: top/top_nls.c:276
 msgid "nsUTS"
 msgstr "nsUTS"
 
-#: top/top_nls.c:279
+#: top/top_nls.c:277
 msgid "UTS namespace Inode"
 msgstr "I-węzeł przestrzeni nazw UTS"
 
 #. Translation Hint: maximum 'LXC' = 7
-#: top/top_nls.c:281
+#: top/top_nls.c:279
 msgid "LXC"
 msgstr ""
 
-#: top/top_nls.c:282
+#: top/top_nls.c:280
 msgid "LXC container name"
 msgstr ""
 
+#. Translation Hint: maximum 'RSan' = 4
+#: top/top_nls.c:282
+msgid "RSan"
+msgstr ""
+
+#: top/top_nls.c:283
+msgid "RES Anonymous (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'RSfd' = 4
+#: top/top_nls.c:285
+msgid "RSfd"
+msgstr ""
+
+#: top/top_nls.c:286
+msgid "RES File-based (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'RSlk' = 4
+#: top/top_nls.c:288
+msgid "RSlk"
+msgstr ""
+
+#: top/top_nls.c:289
+msgid "RES Locked (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'RSsh' = 4
+#: top/top_nls.c:291
+msgid "RSsh"
+msgstr ""
+
+#: top/top_nls.c:292
+#, fuzzy
+msgid "RES Shared (KiB)"
+msgstr "Pamięć współdzielona (KiB)"
+
+#. Translation Hint: maximum 'CGNAME' = 7
+#: top/top_nls.c:294
+msgid "CGNAME"
+msgstr ""
+
+#: top/top_nls.c:295
+#, fuzzy
+msgid "Control Group name"
+msgstr "Grupy sterujące"
+
 #. Translation Notes ------------------------------------------------
 #. .  It is strongly recommend that the --no-wrap command line option
 #. .  be used with all supporting translation tools, when available.
@@ -2550,7 +2592,7 @@
 #. .  and should not be translated without also making corresponding
 #. .  c-code logic changes.
 #. .
-#: top/top_nls.c:302
+#: top/top_nls.c:315
 #, c-format
 msgid ""
 "\tsignal %d (%s) was caught by %s, please\n"
@@ -2559,7 +2601,7 @@
 "\tprogram %3$s otrzymał sygnał %1$d (%2$s), proszę\n"
 "\tzobaczyć http://www.debian.org/Bugs/Reporting\n"
 
-#: top/top_nls.c:305
+#: top/top_nls.c:318
 #, c-format
 msgid ""
 "inappropriate '%s'\n"
@@ -2570,7 +2612,7 @@
 "Składnia:\n"
 "  %s%s"
 
-#: top/top_nls.c:308
+#: top/top_nls.c:321
 #, c-format
 msgid ""
 "  %s\n"
@@ -2581,47 +2623,47 @@
 "Składnia:\n"
 "  %s%s"
 
-#: top/top_nls.c:311
+#: top/top_nls.c:324
 #, c-format
 msgid "failed /proc/stat open: %s"
 msgstr "nie udało się otworzyć /proc/stat: %s"
 
-#: top/top_nls.c:312
+#: top/top_nls.c:325
 #, c-format
 msgid "failed openproc: %s"
 msgstr "nie udało się wykonać openproc: %s"
 
-#: top/top_nls.c:313
+#: top/top_nls.c:326
 #, c-format
 msgid "bad delay interval '%s'"
 msgstr "błędny okres opóźnienia '%s'"
 
-#: top/top_nls.c:314
+#: top/top_nls.c:327
 #, c-format
 msgid "bad iterations argument '%s'"
 msgstr "błędna liczba iteracji '%s'"
 
-#: top/top_nls.c:315
+#: top/top_nls.c:328
 #, c-format
 msgid "pid limit (%d) exceeded"
 msgstr "przekroczony limit pid (%d)"
 
-#: top/top_nls.c:316
+#: top/top_nls.c:329
 #, c-format
 msgid "bad pid '%s'"
 msgstr "błędny pid '%s'"
 
-#: top/top_nls.c:317
+#: top/top_nls.c:330
 #, c-format
 msgid "-%c requires argument"
 msgstr "-%c wymaga argumentu"
 
-#: top/top_nls.c:318
+#: top/top_nls.c:331
 #, c-format
 msgid "bad width arg '%s'"
 msgstr "błędna szerokość '%s'"
 
-#: top/top_nls.c:319
+#: top/top_nls.c:332
 #, c-format
 msgid ""
 "unknown option '%c'\n"
@@ -2632,326 +2674,326 @@
 "Składnia:\n"
 "  %s%s"
 
-#: top/top_nls.c:322
+#: top/top_nls.c:335
 msgid "-d disallowed in \"secure\" mode"
 msgstr "-d nie jest dozwolone w trybie \"bezpiecznym\""
 
-#: top/top_nls.c:323
+#: top/top_nls.c:336
 msgid "-d requires positive argument"
 msgstr "-d wymaga argumentu będącego liczbą dodatnią"
 
-#: top/top_nls.c:324
+#: top/top_nls.c:337
 msgid "On"
 msgstr "Tak"
 
-#: top/top_nls.c:325
+#: top/top_nls.c:338
 msgid "Off"
 msgstr "Nie"
 
 #. Translation Hint: Only the following words should be translated
 #. .                 secs (seconds), max (maximum), user, field, cols (columns)
-#: top/top_nls.c:328
+#: top/top_nls.c:341
 msgid " -hv | -bcHiOSs -d secs -n max -u|U user -p pid(s) -o field -w [cols]"
 msgstr ""
 " -hv | -bcHiOSs -d sek -n max -u|U użytkownik -p pid(y) -o pole -w [kolumny]"
 
-#: top/top_nls.c:329
+#: top/top_nls.c:342
 msgid "failed /proc/stat read"
 msgstr "nie udało się odczytać /proc/stat"
 
-#: top/top_nls.c:330
+#: top/top_nls.c:343
 #, c-format
 msgid "Forest mode %s"
 msgstr "Tryb lasu %s"
 
-#: top/top_nls.c:331
+#: top/top_nls.c:344
 msgid "failed tty get"
 msgstr "nie udało się odczytać ustawienia terminala"
 
-#: top/top_nls.c:332
+#: top/top_nls.c:345
 #, c-format
 msgid "failed tty set: %s"
 msgstr "nie udało się ustawić terminala: %s"
 
-#: top/top_nls.c:333
+#: top/top_nls.c:346
 msgid "Choose field group (1 - 4)"
 msgstr "Wybór grupy pól (1 - 4)"
 
-#: top/top_nls.c:334
+#: top/top_nls.c:347
 msgid "Command disabled, 'A' mode required"
 msgstr "Polecenie wyłączone, wymagany tryb 'A'"
 
-#: top/top_nls.c:335
+#: top/top_nls.c:348
 #, c-format
 msgid "Command disabled, activate %s with '-' or '_'"
 msgstr "Polecenie wyłączone, można włączyć %s klawiszem '-' lub '_'"
 
-#: top/top_nls.c:336
+#: top/top_nls.c:349
 msgid "No colors to map!"
 msgstr "Brak kolorów do odwzorowania!"
 
-#: top/top_nls.c:337
+#: top/top_nls.c:350
 #, c-format
 msgid "Failed '%s' open: %s"
 msgstr "Nie udało się otworzyć '%s': %s"
 
-#: top/top_nls.c:338
+#: top/top_nls.c:351
 #, c-format
 msgid "Wrote configuration to '%s'"
 msgstr "Zapisano konfigurację do '%s'"
 
-#: top/top_nls.c:339
+#: top/top_nls.c:352
 #, c-format
 msgid "Change delay from %.1f to"
 msgstr "Zmiana opóźnienia z %.1f na"
 
-#: top/top_nls.c:340
+#: top/top_nls.c:353
 #, c-format
 msgid "Show threads %s"
 msgstr "Wyświetlanie wątków %s"
 
-#: top/top_nls.c:341
+#: top/top_nls.c:354
 #, c-format
 msgid "Irix mode %s"
 msgstr "Tryb Irix %s"
 
-#: top/top_nls.c:342
+#: top/top_nls.c:355
 #, c-format
 msgid "PID to signal/kill [default pid = %d]"
 msgstr "PID do zabicia/wysłania sygnału [domyślny pid = %d]"
 
-#: top/top_nls.c:343
+#: top/top_nls.c:356
 #, c-format
 msgid "Send pid %d signal [%d/sigterm]"
 msgstr "Wysłanie do pidu %d sygnału [%d/sigterm]"
 
-#: top/top_nls.c:344
+#: top/top_nls.c:357
 #, c-format
 msgid "Failed signal pid '%d' with '%d': %s"
 msgstr "Nie udało się wysłać do pidu '%d' sygnału '%d': %s"
 
-#: top/top_nls.c:345
+#: top/top_nls.c:358
 msgid "Invalid signal"
 msgstr "Błędny sygnał"
 
-#: top/top_nls.c:346
+#: top/top_nls.c:359
 #, c-format
 msgid "PID to renice [default pid = %d]"
 msgstr "PID do zmiany nice [domyślny pid = %d]"
 
-#: top/top_nls.c:347
+#: top/top_nls.c:360
 #, c-format
 msgid "Renice PID %d to value"
 msgstr "Zmiana nice PID-u %d na wartość"
 
-#: top/top_nls.c:348
+#: top/top_nls.c:361
 #, c-format
 msgid "Failed renice of PID %d to %d: %s"
 msgstr "Nie udało się zmienić nice PID-u %d na %d: %s"
 
-#: top/top_nls.c:349
+#: top/top_nls.c:362
 #, c-format
 msgid "Rename window '%s' to (1-3 chars)"
 msgstr "Zmiana nazwy okna '%s' na (1-3 znaki)"
 
-#: top/top_nls.c:350
+#: top/top_nls.c:363
 #, c-format
 msgid "Cumulative time %s"
 msgstr "Czas przyrostowy %s"
 
-#: top/top_nls.c:351
+#: top/top_nls.c:364
 #, c-format
 msgid "Maximum tasks = %d, change to (0 is unlimited)"
 msgstr "Maksymalna liczba zadań = %d, zmienić na (0=bez ograniczeń)"
 
-#: top/top_nls.c:352
+#: top/top_nls.c:365
 msgid "Invalid maximum"
 msgstr "Błędne maksimum"
 
-#: top/top_nls.c:353
+#: top/top_nls.c:366
 msgid "Which user (blank for all)"
 msgstr "Jaki użytkownik (puste - wszyscy)"
 
-#: top/top_nls.c:354
+#: top/top_nls.c:367
 msgid "Unknown command - try 'h' for help"
 msgstr "Nieznane polecenie - 'h' wyświetli pomoc"
 
-#: top/top_nls.c:355
+#: top/top_nls.c:368
 #, c-format
 msgid "scroll coordinates: y = %d/%%d (tasks), x = %d/%d (fields)"
 msgstr "współrzędne przewinięcia: y = %d/%%d (zadania), x = %d/%d (pola)"
 
-#: top/top_nls.c:356
+#: top/top_nls.c:369
 msgid "failed memory allocate"
 msgstr "nie udało się przydzielić pamięci"
 
-#: top/top_nls.c:357
+#: top/top_nls.c:370
 msgid "failed memory re-allocate"
 msgstr "nie udało się zmienić przydziału pamięci"
 
-#: top/top_nls.c:358
+#: top/top_nls.c:371
 msgid "Unacceptable floating point"
 msgstr "Niedozwolona liczba zmiennoprzecinkowa"
 
-#: top/top_nls.c:359
+#: top/top_nls.c:372
 msgid "Invalid user"
 msgstr "Błędny użytkownik"
 
-#: top/top_nls.c:360
+#: top/top_nls.c:373
 msgid "forest view"
 msgstr "widok lasu"
 
-#: top/top_nls.c:361
+#: top/top_nls.c:374
 msgid "failed pid maximum size test"
 msgstr "nie udało się sprawdzić maksymalnego rozmiaru PID-a"
 
-#: top/top_nls.c:362
+#: top/top_nls.c:375
 msgid "failed number of cpus test"
 msgstr "nie udało się sprawdzić liczby procesorów"
 
-#: top/top_nls.c:363
+#: top/top_nls.c:376
 #, c-format
 msgid "incompatible rcfile, you should delete '%s'"
 msgstr "niezgodny plik rc, należy usunąć '%s'"
 
-#: top/top_nls.c:364
+#: top/top_nls.c:377
 #, c-format
 msgid "window entry #%d corrupt, please delete '%s'"
 msgstr "wpis okna #%d uszkodzony, proszę usunąć '%s'"
 
-#: top/top_nls.c:365
+#: top/top_nls.c:378
 msgid "Unavailable in secure mode"
 msgstr "Niedostępne w trybie bezpiecznym"
 
-#: top/top_nls.c:366
+#: top/top_nls.c:379
 msgid "Only 1 cpu detected"
 msgstr "Wykryto tylko 1 procesor"
 
-#: top/top_nls.c:367
+#: top/top_nls.c:380
 msgid "Unacceptable integer"
 msgstr "Niedozwolona liczba całkowita"
 
-#: top/top_nls.c:368
+#: top/top_nls.c:381
 msgid "conflicting process selections (U/p/u)"
 msgstr "konflikt wyboru procesów (U/p/u)"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 kibibytes (1024 bytes)
-#: top/top_nls.c:371
+#: top/top_nls.c:384
 msgid "KiB"
 msgstr "KiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 mebibytes (1,048,576 bytes)
-#: top/top_nls.c:374
+#: top/top_nls.c:387
 msgid "MiB"
 msgstr "MiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 gibibytes (1,073,741,824 bytes)
-#: top/top_nls.c:377
+#: top/top_nls.c:390
 msgid "GiB"
 msgstr "GiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 tebibytes (1,099,511,627,776 bytes)
-#: top/top_nls.c:380
+#: top/top_nls.c:393
 msgid "TiB"
 msgstr "TiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 pebibytes (1,024 tebibytes)
-#: top/top_nls.c:383
+#: top/top_nls.c:396
 msgid "PiB"
 msgstr "PiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 exbibytes (1,024 pebibytes)
-#: top/top_nls.c:386
+#: top/top_nls.c:399
 msgid "EiB"
 msgstr "EiB"
 
-#: top/top_nls.c:387
+#: top/top_nls.c:400
 msgid "Threads"
 msgstr "Wątki"
 
-#: top/top_nls.c:388
+#: top/top_nls.c:401
 msgid "Tasks"
 msgstr "Zadania"
 
 #. Translation Hint: The following "word" is meant to represent either a single
 #. .                 cpu or all of the processors in a multi-processor computer
 #. .                 (should be exactly 6 characters, not counting the colon)
-#: top/top_nls.c:392
+#: top/top_nls.c:405
 msgid "Cpu(s):"
 msgstr "CPU:   "
 
 #. Translation Hint: The following "word" is meant to represent a single processor
 #. .                 (should be exactly 3 characters)
-#: top/top_nls.c:395
+#: top/top_nls.c:408
 #, c-format
 msgid "Cpu%-3d:"
 msgstr "CPU%-3d:"
 
 #. Translation Hint: The following word "another" must have 1 trailing space
-#: top/top_nls.c:397
+#: top/top_nls.c:410
 msgid "another "
 msgstr "kolejnego "
 
-#: top/top_nls.c:398
+#: top/top_nls.c:411
 msgid "Locate next inactive, use \"L\""
 msgstr "Odnalezienie następnego nieaktywnego, klawisz \"L\""
 
-#: top/top_nls.c:399
+#: top/top_nls.c:412
 msgid "Locate string"
 msgstr "Odnalezienie łańcucha"
 
-#: top/top_nls.c:400
+#: top/top_nls.c:413
 #, c-format
 msgid "%s\"%s\" not found"
 msgstr "nie znaleziono %s\"%s\""
 
-#: top/top_nls.c:401
+#: top/top_nls.c:414
 #, c-format
 msgid "width incr is %d, change to (0 default, -1 auto)"
 msgstr "zw. szerokości %d, zmiana na (0=domyślne, -1=auto)"
 
-#: top/top_nls.c:402
+#: top/top_nls.c:415
 msgid "Overwrite existing obsolete/corrupted rcfile?"
 msgstr "Nadpisać istniejący przestarzały/uszkodzony plik rc?"
 
-#: top/top_nls.c:403
+#: top/top_nls.c:416
 #, c-format
 msgid "unrecognized field name '%s'"
 msgstr "nierozpoznana nazwa pola '%s'"
 
-#: top/top_nls.c:404
+#: top/top_nls.c:417
 msgid "even using field names only, window is now too small"
 msgstr "nawet przy użyciu tylko nazw pól, okno jest teraz za małe"
 
-#: top/top_nls.c:406
+#: top/top_nls.c:419
 msgid "Open Files"
 msgstr "Otwarte pliki"
 
-#: top/top_nls.c:407
+#: top/top_nls.c:420
 msgid "NUMA Info"
 msgstr "Informacje NUMA"
 
-#: top/top_nls.c:408
+#: top/top_nls.c:421
 msgid "Log"
 msgstr "Log"
 
-#: top/top_nls.c:409
+#: top/top_nls.c:422
 msgid ""
 "the '=' key will eventually show the actual file read or command(s) "
 "executed ..."
 msgstr "klawisz '=' może pokazać czytany plik lub wykonywane polecenia..."
 
-#: top/top_nls.c:410
+#: top/top_nls.c:423
 msgid "demo"
 msgstr "demo"
 
-#: top/top_nls.c:411
+#: top/top_nls.c:424
 #, c-format
 msgid ""
 "This is simulated output representing the contents of some file or the "
@@ -3038,103 +3080,103 @@
 "\n"
 "Miłej zabawy!\n"
 
-#: top/top_nls.c:443
+#: top/top_nls.c:456
 msgid "to enable 'Y' press <Enter> then type 'W' and restart top"
 msgstr ""
 "aby włączyć 'Y', należy wcisnąć <Enter>, następnie 'W' i zrestartować topa"
 
-#: top/top_nls.c:445
+#: top/top_nls.c:458
 msgid "to enable 'Y' please consult the top man page (press Enter)"
 msgstr ""
 "aby włączyć 'Y', należy przeczytać stronę man programu top (teraz wcisnąć "
 "Enter)"
 
-#: top/top_nls.c:447
+#: top/top_nls.c:460
 #, c-format
 msgid "Selection failed with: %s\n"
 msgstr "Wybór nie powiódł się, błąd: %s\n"
 
-#: top/top_nls.c:448
+#: top/top_nls.c:461
 #, c-format
 msgid "unable to inspect, pid %d not found"
 msgstr "nie można zbadać, nie znaleziono pidu %d"
 
-#: top/top_nls.c:449
+#: top/top_nls.c:462
 #, c-format
 msgid "inspect at PID [default pid = %d]"
 msgstr "podgląd PID-u [domyślny = %d]"
 
-#: top/top_nls.c:450
+#: top/top_nls.c:463
 #, c-format
 msgid "%s: %*d-%-*d lines, %*d-%*d columns, %lu bytes read"
 msgstr "%s: odczytano linie: %*d-%-*d, kolumny %*d-%*d, bajtów: %lu"
 
-#: top/top_nls.c:451
+#: top/top_nls.c:464
 msgid "patience please, working..."
 msgstr "proszę czekać, przetwarzanie..."
 
 #. Translation Hint: Below are 2 abbreviations which can be as long as needed:
 #. .                 FLD = FIELD, VAL = VALUE
-#: top/top_nls.c:454
+#: top/top_nls.c:467
 #, c-format
 msgid "add filter #%d (%s) as: [!]FLD?VAL"
 msgstr "dodanie filtra #%d (%s) jako: [!]POLE?WARTOŚĆ"
 
-#: top/top_nls.c:455
+#: top/top_nls.c:468
 msgid "ignoring case"
 msgstr "ignorowanie wielkości liter"
 
-#: top/top_nls.c:456
+#: top/top_nls.c:469
 msgid "case sensitive"
 msgstr "rozróżnianie wielkości liter"
 
-#: top/top_nls.c:457
+#: top/top_nls.c:470
 msgid "duplicate filter was ignored"
 msgstr "zignorowano powtórzony filtr"
 
-#: top/top_nls.c:458
+#: top/top_nls.c:471
 #, c-format
 msgid "'%s' filter delimiter is missing"
 msgstr "brak ogranicznika filtra '%s'"
 
-#: top/top_nls.c:459
+#: top/top_nls.c:472
 #, c-format
 msgid "'%s' filter value is missing"
 msgstr "brak wartości filtra '%s'"
 
-#: top/top_nls.c:460
+#: top/top_nls.c:473
 msgid "include"
 msgstr "dodanie"
 
-#: top/top_nls.c:461
+#: top/top_nls.c:474
 msgid "exclude"
 msgstr "wykluczenie"
 
-#: top/top_nls.c:462
+#: top/top_nls.c:475
 #, c-format
 msgid "<Enter> to resume, filters: %s"
 msgstr "<Enter> wznawia, filtry: %s"
 
-#: top/top_nls.c:463
+#: top/top_nls.c:476
 msgid "none"
 msgstr "brak"
 
 #. Translation Hint: The following word 'Node' should be exactly 4 characters
-#: top/top_nls.c:465
+#: top/top_nls.c:478
 #, c-format
 msgid "Node%-2d:"
 msgstr "Węzeł%-2d:"
 
-#: top/top_nls.c:466
+#: top/top_nls.c:479
 #, c-format
 msgid "expand which node (0-%d)"
 msgstr "który węzeł rozwinąć (0-%d)"
 
-#: top/top_nls.c:467
+#: top/top_nls.c:480
 msgid "invalid node"
 msgstr "błędny węzeł"
 
-#: top/top_nls.c:468
+#: top/top_nls.c:481
 msgid "sorry, NUMA extensions unavailable"
 msgstr "niestety rozszerzenia NUMA nie są dostępne"
 
@@ -3142,11 +3184,11 @@
 #. .                 'Swap' represents the linux swap file --
 #. .                 please make both translations exactly 4 characters,
 #. .                 padding with extra spaces as necessary
-#: top/top_nls.c:473
+#: top/top_nls.c:486
 msgid "Mem "
 msgstr "RAM "
 
-#: top/top_nls.c:474
+#: top/top_nls.c:487
 msgid "Swap"
 msgstr "Swap"
 
@@ -3174,7 +3216,7 @@
 #. .  please see the prologue to the show_special function in the top.c
 #. .  source file.
 #. .
-#: top/top_nls.c:508
+#: top/top_nls.c:521
 #, c-format
 msgid ""
 "Help for Interactive Commands~2 - %s\n"
@@ -3256,7 +3298,7 @@
 #. Translation Hint: As is true for the text above, the "keys" shown to the left and
 #. .                 also imbedded in the translatable text (along with escape seqs)
 #. .                 should never themselves be translated.
-#: top/top_nls.c:536
+#: top/top_nls.c:549
 msgid ""
 "  k,r       Manipulate tasks: '~1k~2' kill; '~1r~2' renice\n"
 "  d or s    Set update interval\n"
@@ -3264,7 +3306,7 @@
 "  k,r       Operowanie zadaniami: '~1k~2' zabicie; '~1r~2' zmiana nice\n"
 "  d lub s   Ustawienie częstotliwości uaktualnień\n"
 
-#: top/top_nls.c:540
+#: top/top_nls.c:553
 #, c-format
 msgid ""
 "Help for Windows / Field Groups~2 - \"Current Window\" = ~1 %s ~6\n"
@@ -3376,7 +3418,7 @@
 #. .     --> "   0~2 = black,~1  1~2 = red,    ~1  2~2 = gree
 #. .     --> "   4~2 = blue, ~1  5~2 = magenta,~1  6~2 = cyan
 #. .
-#: top/top_nls.c:590
+#: top/top_nls.c:603
 #, c-format
 msgid ""
 "Help for color mapping~2 - %s\n"
@@ -3435,7 +3477,7 @@
 "   'q' porzuca zmiany w oknie '~1%s~2'\n"
 "   'a' lub 'w' zapisuje i zmienia inne, <Enter> zapisuje i kończy "
 
-#: top/top_nls.c:616
+#: top/top_nls.c:629
 #, c-format
 msgid ""
 "Fields Management~2 for window ~1%s~6, whose current sort field is ~1%s~2\n"
@@ -3450,7 +3492,7 @@
 "ustawia\n"
 "   sortowanie. Klawisz 'q' lub <Esc> kończy.\n"
 
-#: top/top_nls.c:621
+#: top/top_nls.c:634
 #, c-format
 msgid ""
 "%s:~3 %3u ~2total,~3 %3u ~2running,~3 %3u ~2sleeping,~3 %3u ~2stopped,~3 %3u "
@@ -3459,7 +3501,7 @@
 "%s:~2razem:~3 %3u~2, działających:~3 %3u~2, śpiących:~3 %3u~2, zatrzymanych:"
 "~3 %3u~2, zombie:~3 %3u\n"
 
-#: top/top_nls.c:624
+#: top/top_nls.c:637
 #, c-format
 msgid ""
 "%%%s~3 %#5.1f  ~2user,~3 %#5.1f  ~2system,~3 %#5.1f  ~2nice,~3 %#5.1f  "
@@ -3468,7 +3510,7 @@
 "%%%s~3 %#5.1f ~2użytk.,~3 %#5.1f ~2system,~3 %#5.1f ~2nice,~3 %#5.1f ~2bezcz."
 "~3\n"
 
-#: top/top_nls.c:627
+#: top/top_nls.c:640
 #, c-format
 msgid ""
 "%%%s~3 %#5.1f  ~2user,~3 %#5.1f  ~2system,~3 %#5.1f  ~2nice,~3 %#5.1f  "
@@ -3480,7 +3522,7 @@
 #. Translation Hint: Only the following abbreviations need be translated
 #. .                 us = user, sy = system, ni = nice, id = idle, wa = wait,
 #. .                 hi hardware interrupt, si = software interrupt
-#: top/top_nls.c:633
+#: top/top_nls.c:646
 #, c-format
 msgid ""
 "%%%s~3 %#5.1f ~2us,~3 %#5.1f ~2sy,~3 %#5.1f ~2ni,~3 %#5.1f ~2id,~3 %#5.1f "
@@ -3492,7 +3534,7 @@
 #. Translation Hint: Only the following abbreviations need be translated
 #. .                 us = user, sy = system, ni = nice, id = idle, wa = wait,
 #. .                 hi hardware interrupt, si = software interrupt, st = steal time
-#: top/top_nls.c:639
+#: top/top_nls.c:652
 #, c-format
 msgid ""
 "%%%s~3%#5.1f ~2us,~3%#5.1f ~2sy,~3%#5.1f ~2ni,~3%#5.1f ~2id,~3%#5.1f ~2wa,"
@@ -3501,7 +3543,7 @@
 "%%%s~3%#5.1f ~2uż,~3%#5.1f ~2sy,~3%#5.1f ~2ni,~3%#5.1f ~2be,~3%#5.1f ~2io,"
 "~3%#5.1f ~2hi,~3%#5.1f ~2si,~3%#5.1f ~2sk~3\n"
 
-#: top/top_nls.c:642
+#: top/top_nls.c:655
 #, c-format
 msgid ""
 "%s %s:~3 %9.9s~2total,~3 %9.9s~2free,~3 %9.9s~2used,~3 %9.9s~2buff/cache~3\n"
@@ -3510,7 +3552,7 @@
 "%s %s:~3 %9.9s~2razem,~3 %9.9s~2wolne,~3 %9.9s~2użyte,~3 %9.9s~2buf/cache~3\n"
 "%s %s:~3 %9.9s~2razem,~3 %9.9s~2wolne,~3 %9.9s~2użyte.~3 %9.9s~2dost. %s~3\n"
 
-#: top/top_nls.c:646
+#: top/top_nls.c:659
 #, fuzzy, c-format
 msgid ""
 "Inspection~2 Pause at: pid ~1%d~6, running ~1%s~6\n"
@@ -3523,7 +3565,7 @@
 "~1zakończyć~5.\n"
 "Opcje~2: ~1%s\n"
 
-#: top/top_nls.c:651
+#: top/top_nls.c:664
 #, fuzzy, c-format
 msgid ""
 "Inspection~2 View at pid: ~1%s~3, running ~1%s~3.  Locating: ~1%s~6\n"
@@ -4079,98 +4121,103 @@
 msgid " -v, --version  output version information and exit\n"
 msgstr " -v, --version  wypisanie informacji o wejściu i zakończenie\n"
 
-#: watch.c:376
+#: watch.c:384
 #, c-format
 msgid "Every %.1fs: "
 msgstr "Co %.1fs: "
 
-#: watch.c:437
+#: watch.c:385
+#, c-format
+msgid "%s: %s"
+msgstr ""
+
+#: watch.c:456
 msgid "unable to create IPC pipes"
 msgstr "nie można utworzyć potoków IPC"
 
-#: watch.c:447
+#: watch.c:466
 msgid "unable to fork process"
 msgstr "nie można rozgałęzić procesu"
 
-#: watch.c:452
+#: watch.c:471
 msgid "dup2 failed"
 msgstr "dup2 nie powiodło się"
 
-#: watch.c:459
+#: watch.c:478
 #, c-format
 msgid "unable to execute '%s'"
 msgstr "nie można uruchomić '%s'"
 
-#: watch.c:476
+#: watch.c:495
 msgid "fdopen"
 msgstr "fdopen"
 
-#: watch.c:622
+#: watch.c:641
 msgid "waitpid"
 msgstr "waitpid"
 
-#: watch.c:630
+#: watch.c:649
 msgid "command exit with a non-zero status, press a key to exit"
 msgstr ""
 "polecenie zakończyło się kodem błędnym; proszę nacisnąć klawisz, aby "
 "zakończyć"
 
-#: watch.c:755
+#: watch.c:773
 #, c-format
 msgid "unicode handling error\n"
 msgstr "błąd obsługi unikodu\n"
 
-#: watch.c:761
+#: watch.c:779
 #, c-format
 msgid "unicode handling error (malloc)\n"
 msgstr "błąd obsługi unikodu (malloc)\n"
 
-#: w.c:241 w.c:256
+#: w.c:245 w.c:260
 #, c-format
 msgid " %2ludays"
 msgstr " %2ludni"
 
 #. Translation Hint: Minutes:Seconds
 #. Translation Hint: Hours:Minutes
-#: w.c:250 w.c:260
+#: w.c:254 w.c:264
 #, c-format
 msgid " %2lu:%02um"
 msgstr " %2lu:%02um"
 
 #. Translation Hint: Seconds:Centiseconds
-#: w.c:268
+#: w.c:272
 #, c-format
 msgid " %2lu.%02us"
 msgstr " %2lu.%02us"
 
-#: w.c:451
+#: w.c:455
 msgid " -h, --no-header     do not print header\n"
 msgstr " -h, --no-header     bez wypisywania nagłówka\n"
 
-#: w.c:452
+#: w.c:456
 msgid " -u, --no-current    ignore current process username\n"
 msgstr " -u, --no-current    pominiecie użytkownika bieżącego procesu\n"
 
-#: w.c:453
+#: w.c:457
 msgid " -s, --short         short format\n"
 msgstr " -s, --short         format krótki\n"
 
-#: w.c:454
+#: w.c:458
 msgid " -f, --from          show remote hostname field\n"
 msgstr " -f, --from          wyświetlenie pola nazwy zdalnego hosta\n"
 
-#: w.c:455
+#: w.c:459
 msgid " -o, --old-style     old style output\n"
 msgstr " -o, --old-style     wyjście w starym stylu\n"
 
-#: w.c:456
+#: w.c:460
 msgid ""
 " -i, --ip-addr       display IP address instead of hostname (if possible)\n"
 msgstr ""
 " -i, --ip-addr       wyświetlanie adresów IP zamiast nazw (jeśli to "
 "możliwe)\n"
 
-#: w.c:553
+#: w.c:557
 #, c-format
 msgid ""
 "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n"
@@ -4178,7 +4225,7 @@
 "Zmienna długości użytkowników PROCS_USERLEN musi być pomiędzy 8 a %i, "
 "zignorowano.\n"
 
-#: w.c:563
+#: w.c:567
 #, c-format
 msgid ""
 "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n"
@@ -4188,21 +4235,21 @@
 
 #. Translation Hint: Following five uppercase messages are
 #. * headers. Try to keep alignment intact.
-#: w.c:587
+#: w.c:591
 #, c-format
 msgid "%-*s TTY      "
 msgstr "%-*s TTY      "
 
-#: w.c:589
+#: w.c:593
 msgid "FROM"
 msgstr "Z   "
 
-#: w.c:591
+#: w.c:595
 #, c-format
 msgid "  LOGIN@   IDLE   JCPU   PCPU WHAT\n"
 msgstr "  ZAL.OD   BEZCZ. JCPU   PCPU CO\n"
 
-#: w.c:593
+#: w.c:597
 #, c-format
 msgid "   IDLE WHAT\n"
 msgstr " BEZCZ. CO\n"
@@ -4249,12 +4296,27 @@
 msgid "%s from %s\n"
 msgstr "%s z pakietu %s\n"
 
+#~ msgid "seconds argument `%s' failed"
+#~ msgstr "niezrozumiały argument liczby sekund `%s'"
+
 #~ msgid "alternate System.map file must follow -n"
 #~ msgstr "po -n musi wystąpić alternatywny plik System.map"
 
 #~ msgid "alternate System.map file must follow N"
 #~ msgstr "po N musi wystąpić alternatywny plik System.map"
 
+#~ msgid "Adj"
+#~ msgstr "Adj"
+
+#~ msgid "oom_adjustment (2^X)"
+#~ msgstr "poprawka OOM (2^X)"
+
+#~ msgid "Badness"
+#~ msgstr "Badness"
+
+#~ msgid "oom_score (badness)"
+#~ msgstr "Punktacja OOM (badness)"
+
 #~ msgid "%d column window is too narrow"
 #~ msgstr "Okno o szerokości %d jest za wąskie"
 
diff -Nru procps-3.3.11/po/POTFILES.in procps-3.3.12/po/POTFILES.in
--- procps-3.3.11/po/POTFILES.in	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/po/POTFILES.in	2016-07-10 06:40:26.000000000 +0000
@@ -2,9 +2,11 @@
 lib/fileutils.c
 lib/nsutils.c
 lib/strutils.c
+lib/strverscmp.c
 lib/test_fileutils.c
 lib/test_nsutils.c
 lib/test_process.c
+lib/test_strtod_nol.c
 lib/test_strutils.c
 pgrep.c
 pidof.c
diff -Nru procps-3.3.11/po/procps-ng.pot procps-3.3.12/po/procps-ng.pot
--- procps-3.3.11/po/procps-ng.pot	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/po/procps-ng.pot	2016-07-10 06:40:26.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: procps@freelists.org\n"
-"POT-Creation-Date: 2015-08-09 15:59+1000\n"
+"POT-Creation-Date: 2016-07-10 08:19+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: free.c:74 slabtop.c:189 uptime.c:59 w.c:449
+#: free.c:74 slabtop.c:189 uptime.c:59 w.c:453
 #, c-format
 msgid " %s [options]\n"
 msgstr ""
@@ -94,7 +94,7 @@
 msgid " -w, --wide          wide output\n"
 msgstr ""
 
-#: free.c:95 w.c:458
+#: free.c:95 w.c:462
 msgid "     --help     display this help and exit\n"
 msgstr ""
 
@@ -102,52 +102,47 @@
 msgid "Multiple unit options doesn't make sense."
 msgstr ""
 
-#: free.c:329
-#, c-format
-msgid "seconds argument `%s' failed"
-msgstr ""
-
-#: free.c:332
+#: free.c:330
 #, c-format
 msgid "seconds argument `%s' is not positive number"
 msgstr ""
 
-#: free.c:338
+#: free.c:336
 msgid "failed to parse count argument"
 msgstr ""
 
-#: free.c:341
+#: free.c:339
 #, c-format
 msgid "failed to parse count argument: '%s'"
 msgstr ""
 
-#: free.c:362
+#: free.c:360
 #, c-format
 msgid "              total        used        free      shared     buffers       cache   available"
 msgstr ""
 
-#: free.c:364
+#: free.c:362
 #, c-format
 msgid "              total        used        free      shared  buff/cache   available"
 msgstr ""
 
-#: free.c:367
+#: free.c:365
 msgid "Mem:"
 msgstr ""
 
-#: free.c:387
+#: free.c:385
 msgid "Low:"
 msgstr ""
 
-#: free.c:393
+#: free.c:391
 msgid "High:"
 msgstr ""
 
-#: free.c:400
+#: free.c:398
 msgid "Swap:"
 msgstr ""
 
-#: free.c:407
+#: free.c:405
 msgid "Total:"
 msgstr ""
 
@@ -290,7 +285,7 @@
 msgid "Error reading reference namespace information\n"
 msgstr ""
 
-#: pgrep.c:610 pidof.c:224 pidof.c:265 sysctl.c:643
+#: pgrep.c:610 pidof.c:230 pidof.c:271 sysctl.c:643
 msgid "internal error"
 msgstr ""
 
@@ -353,7 +348,7 @@
 msgid " -o, --omit-pid <PID,...>  omit processes with PID\n"
 msgstr ""
 
-#: pidof.c:268
+#: pidof.c:274
 #, c-format
 msgid "illegal omit pid value (%s)!\n"
 msgstr ""
@@ -471,7 +466,7 @@
 msgid "  [ stack ]"
 msgstr ""
 
-#: pmap.c:326
+#: pmap.c:325
 msgid "Unknown format in smaps file!"
 msgstr ""
 
@@ -502,8 +497,8 @@
 msgid " total %8ldK\n"
 msgstr ""
 
-#: pmap.c:767 skill.c:500 skill.c:533 skill.c:620 tload.c:128 tload.c:133
-#: vmstat.c:959 vmstat.c:968 watch.c:708
+#: pmap.c:767 skill.c:500 skill.c:534 skill.c:621 tload.c:128 tload.c:133
+#: vmstat.c:959 vmstat.c:968 watch.c:726
 msgid "failed to parse argument"
 msgstr ""
 
@@ -586,8 +581,8 @@
 msgid "Signal %d (%s) caught by %s (%s).\n"
 msgstr ""
 
-#: ps/display.c:66 ps/display.c:271 ps/parser.c:509 ps/parser.c:756
-#: ps/select.c:95 ps/sortformat.c:550
+#: ps/display.c:66 ps/display.c:271 ps/parser.c:495 ps/parser.c:742
+#: ps/select.c:95 ps/sortformat.c:544
 msgid "please report this bug"
 msgstr ""
 
@@ -632,7 +627,7 @@
 #. .
 #. . It must be limited to 15 characters or less.
 #.
-#: ps/global.c:408
+#: ps/global.c:401
 msgid "help"
 msgstr ""
 
@@ -1016,290 +1011,290 @@
 "For more details see ps(1).\n"
 msgstr ""
 
-#: ps/output.c:1971
+#: ps/output.c:1969
 #, c-format
 msgid "fix bigness error\n"
 msgstr ""
 
-#: ps/output.c:2046
+#: ps/output.c:2044
 #, c-format
 msgid "bad alignment code\n"
 msgstr ""
 
-#: ps/output.c:2108
+#: ps/output.c:2106
 #, c-format
 msgid "unknown page size (assume 4096)\n"
 msgstr ""
 
-#: ps/parser.c:58
+#: ps/parser.c:57
 msgid "the option is exclusive: "
 msgstr ""
 
-#: ps/parser.c:89
+#: ps/parser.c:87
 msgid "process ID list syntax error"
 msgstr ""
 
-#: ps/parser.c:90 ps/parser.c:91
+#: ps/parser.c:88 ps/parser.c:89
 msgid "process ID out of range"
 msgstr ""
 
-#: ps/parser.c:104
+#: ps/parser.c:102
 msgid "user name does not exist"
 msgstr ""
 
-#: ps/parser.c:110
+#: ps/parser.c:108
 msgid "user ID out of range"
 msgstr ""
 
-#: ps/parser.c:123
+#: ps/parser.c:121
 msgid "group name does not exist"
 msgstr ""
 
-#: ps/parser.c:129
+#: ps/parser.c:127
 msgid "group ID out of range"
 msgstr ""
 
-#: ps/parser.c:145 ps/parser.c:169
+#: ps/parser.c:143 ps/parser.c:167
 msgid "TTY could not be found"
 msgstr ""
 
-#: ps/parser.c:171
+#: ps/parser.c:169
 msgid "list member was not a TTY"
 msgstr ""
 
-#: ps/parser.c:196
+#: ps/parser.c:194
 msgid "improper list"
 msgstr ""
 
-#: ps/parser.c:256
+#: ps/parser.c:242
 msgid "list of command names must follow -C"
 msgstr ""
 
-#: ps/parser.c:270
+#: ps/parser.c:256
 msgid "list of real groups must follow -G"
 msgstr ""
 
-#: ps/parser.c:283
+#: ps/parser.c:269
 msgid "list of jobs must follow -J"
 msgstr ""
 
-#: ps/parser.c:311
+#: ps/parser.c:297
 msgid "format or sort specification must follow -O"
 msgstr ""
 
-#: ps/parser.c:322
+#: ps/parser.c:308
 msgid "list of PRM groups must follow -R"
 msgstr ""
 
-#: ps/parser.c:341
+#: ps/parser.c:327
 msgid "list of real users must follow -U"
 msgstr ""
 
-#: ps/parser.c:382
+#: ps/parser.c:368
 msgid "list of session leaders OR effective group names must follow -g"
 msgstr ""
 
-#: ps/parser.c:393
+#: ps/parser.c:379
 msgid "list of session leaders OR effective group IDs was invalid"
 msgstr ""
 
-#: ps/parser.c:417
+#: ps/parser.c:403
 msgid "format specification must follow -o"
 msgstr ""
 
-#: ps/parser.c:423
+#: ps/parser.c:409
 msgid "list of process IDs must follow -p"
 msgstr ""
 
-#: ps/parser.c:440
+#: ps/parser.c:426
 msgid "the -r option is reserved"
 msgstr ""
 
-#: ps/parser.c:446
+#: ps/parser.c:432
 msgid "list of session IDs must follow -s"
 msgstr ""
 
-#: ps/parser.c:454
+#: ps/parser.c:440
 msgid "list of terminals (pty, tty...) must follow -t"
 msgstr ""
 
-#: ps/parser.c:462
+#: ps/parser.c:448
 msgid "list of users must follow -u"
 msgstr ""
 
-#: ps/parser.c:484
+#: ps/parser.c:470
 msgid "must set personality to get -x option"
 msgstr ""
 
-#: ps/parser.c:499
+#: ps/parser.c:485
 msgid "list of zones (contexts, labels, whatever?) must follow -z"
 msgstr ""
 
-#: ps/parser.c:506
+#: ps/parser.c:492
 msgid "embedded '-' among SysV options makes no sense"
 msgstr ""
 
-#: ps/parser.c:512
+#: ps/parser.c:498
 msgid "unsupported SysV option"
 msgstr ""
 
-#: ps/parser.c:525
+#: ps/parser.c:511
 msgid "cannot happen - problem #1"
 msgstr ""
 
-#: ps/parser.c:529
+#: ps/parser.c:515
 msgid "cannot happen - problem #2"
 msgstr ""
 
-#: ps/parser.c:531
+#: ps/parser.c:517
 msgid "second chance parse failed, not BSD or SysV"
 msgstr ""
 
-#: ps/parser.c:548
+#: ps/parser.c:534
 msgid "option A is reserved"
 msgstr ""
 
-#: ps/parser.c:553
+#: ps/parser.c:539
 msgid "option C is reserved"
 msgstr ""
 
-#: ps/parser.c:573
+#: ps/parser.c:559
 msgid "format or sort specification must follow O"
 msgstr ""
 
-#: ps/parser.c:598
+#: ps/parser.c:584
 msgid "list of users must follow U"
 msgstr ""
 
-#: ps/parser.c:610
+#: ps/parser.c:596
 msgid "obsolete W option not supported (you have a /dev/drum?)"
 msgstr ""
 
-#: ps/parser.c:646 ps/parser.c:913 ps/parser.c:922
+#: ps/parser.c:632 ps/parser.c:899 ps/parser.c:908
 msgid "only one heading option may be specified"
 msgstr ""
 
-#: ps/parser.c:661
+#: ps/parser.c:647
 msgid "long sort specification must follow 'k'"
 msgstr ""
 
-#: ps/parser.c:689
+#: ps/parser.c:675
 msgid "format specification must follow o"
 msgstr ""
 
-#: ps/parser.c:695
+#: ps/parser.c:681
 msgid "list of process IDs must follow p"
 msgstr ""
 
-#: ps/parser.c:753
+#: ps/parser.c:739
 msgid "embedded '-' among BSD options makes no sense"
 msgstr ""
 
-#: ps/parser.c:759
+#: ps/parser.c:745
 msgid "unsupported option (BSD syntax)"
 msgstr ""
 
-#: ps/parser.c:845 ps/parser.c:857
+#: ps/parser.c:831 ps/parser.c:843
 msgid "unknown gnu long option"
 msgstr ""
 
-#: ps/parser.c:865
+#: ps/parser.c:851
 msgid "list of real groups must follow --Group"
 msgstr ""
 
-#: ps/parser.c:873
+#: ps/parser.c:859
 msgid "list of real users must follow --User"
 msgstr ""
 
-#: ps/parser.c:892
+#: ps/parser.c:878
 msgid "number of columns must follow --cols, --width, or --columns"
 msgstr ""
 
-#: ps/parser.c:895
+#: ps/parser.c:881
 msgid "option --cumulative does not take an argument"
 msgstr ""
 
-#: ps/parser.c:900
+#: ps/parser.c:886
 msgid "option --deselect does not take an argument"
 msgstr ""
 
-#: ps/parser.c:912
+#: ps/parser.c:898
 msgid "option --no-heading does not take an argument"
 msgstr ""
 
-#: ps/parser.c:921
+#: ps/parser.c:907
 msgid "option --heading does not take an argument"
 msgstr ""
 
-#: ps/parser.c:927
+#: ps/parser.c:913
 msgid "option --forest does not take an argument"
 msgstr ""
 
-#: ps/parser.c:933
+#: ps/parser.c:919
 msgid "format specification must follow --format"
 msgstr ""
 
-#: ps/parser.c:939
+#: ps/parser.c:925
 msgid "list of effective groups must follow --group"
 msgstr ""
 
-#: ps/parser.c:957
+#: ps/parser.c:943
 msgid "list of process IDs must follow --pid"
 msgstr ""
 
-#: ps/parser.c:973
+#: ps/parser.c:959
 msgid "list of process IDs must follow --ppid"
 msgstr ""
 
-#: ps/parser.c:991
+#: ps/parser.c:977
 msgid "number of rows must follow --rows or --lines"
 msgstr ""
 
-#: ps/parser.c:995
+#: ps/parser.c:981
 msgid "some sid thing(s) must follow --sid"
 msgstr ""
 
-#: ps/parser.c:1003
+#: ps/parser.c:989
 msgid "long sort specification must follow --sort"
 msgstr ""
 
-#: ps/parser.c:1009
+#: ps/parser.c:995
 msgid "list of ttys must follow --tty"
 msgstr ""
 
-#: ps/parser.c:1017
+#: ps/parser.c:1003
 msgid "list of effective users must follow --user"
 msgstr ""
 
-#: ps/parser.c:1134
+#: ps/parser.c:1119
 msgid "way bad"
 msgstr ""
 
-#: ps/parser.c:1148
+#: ps/parser.c:1133
 msgid "garbage option"
 msgstr ""
 
-#: ps/parser.c:1152
+#: ps/parser.c:1137
 msgid "something broke"
 msgstr ""
 
-#: ps/parser.c:1172
+#: ps/parser.c:1157
 msgid "thread display conflicts with forest display"
 msgstr ""
 
-#: ps/parser.c:1177
+#: ps/parser.c:1162
 msgid "thread flags conflict; can't use H with m or -m"
 msgstr ""
 
-#: ps/parser.c:1179
+#: ps/parser.c:1164
 msgid "thread flags conflict; can't use both m and -m"
 msgstr ""
 
-#: ps/parser.c:1181
+#: ps/parser.c:1166
 msgid "thread flags conflict; can't use both -L and -T"
 msgstr ""
 
-#: ps/parser.c:1255 ps/parser.c:1256
+#: ps/parser.c:1239 ps/parser.c:1240
 #, c-format
 msgid "error: %s\n"
 msgstr ""
@@ -1308,129 +1303,129 @@
 msgid "process selection options conflict"
 msgstr ""
 
-#: ps/sortformat.c:107 ps/sortformat.c:112
+#: ps/sortformat.c:106 ps/sortformat.c:111
 msgid "seriously crashing: goodbye cruel world"
 msgstr ""
 
-#: ps/sortformat.c:147
+#: ps/sortformat.c:146
 msgid "improper AIX field descriptor"
 msgstr ""
 
-#: ps/sortformat.c:168
+#: ps/sortformat.c:167
 msgid "unknown AIX field descriptor"
 msgstr ""
 
-#: ps/sortformat.c:173
+#: ps/sortformat.c:172
 msgid "AIX field descriptor processing bug"
 msgstr ""
 
-#: ps/sortformat.c:290
+#: ps/sortformat.c:285
 #, c-format
 msgid "unknown user-defined format specifier \"%s\""
 msgstr ""
 
-#: ps/sortformat.c:316
+#: ps/sortformat.c:311
 msgid "empty format list"
 msgstr ""
 
-#: ps/sortformat.c:317
+#: ps/sortformat.c:312
 msgid "improper format list"
 msgstr ""
 
-#: ps/sortformat.c:318
+#: ps/sortformat.c:313
 msgid "column widths must be unsigned decimal numbers"
 msgstr ""
 
-#: ps/sortformat.c:319
+#: ps/sortformat.c:314
 msgid "can not set width for a macro (multi-column) format specifier"
 msgstr ""
 
-#: ps/sortformat.c:372 ps/sortformat.c:388
+#: ps/sortformat.c:367 ps/sortformat.c:383
 msgid "improper sort list"
 msgstr ""
 
-#: ps/sortformat.c:383
+#: ps/sortformat.c:378
 msgid "empty sort list"
 msgstr ""
 
-#: ps/sortformat.c:404 ps/sortformat.c:482 ps/sortformat.c:484
+#: ps/sortformat.c:399 ps/sortformat.c:477 ps/sortformat.c:479
 msgid "unknown sort specifier"
 msgstr ""
 
-#: ps/sortformat.c:431 ps/sortformat.c:442 ps/sortformat.c:448
+#: ps/sortformat.c:426 ps/sortformat.c:437 ps/sortformat.c:443
 msgid "bad sorting code"
 msgstr ""
 
-#: ps/sortformat.c:445
+#: ps/sortformat.c:440
 msgid "PPID sort and forest output conflict"
 msgstr ""
 
-#: ps/sortformat.c:520
+#: ps/sortformat.c:514
 msgid "option -O can not follow other format options"
 msgstr ""
 
-#: ps/sortformat.c:527 ps/sortformat.c:545
+#: ps/sortformat.c:521 ps/sortformat.c:539
 msgid "multiple sort options"
 msgstr ""
 
-#: ps/sortformat.c:535
+#: ps/sortformat.c:529
 msgid "option O is neither first format nor sort order"
 msgstr ""
 
-#: ps/sortformat.c:662
+#: ps/sortformat.c:656
 msgid "modifier -y without format -l makes no sense"
 msgstr ""
 
-#: ps/sortformat.c:765
+#: ps/sortformat.c:756
 msgid "bug: must reset the list first"
 msgstr ""
 
-#: ps/sortformat.c:803
+#: ps/sortformat.c:794
 msgid "tell <procps@freelists.org> what you expected"
 msgstr ""
 
-#: ps/sortformat.c:813
+#: ps/sortformat.c:804
 msgid "tell <procps@freelists.org> what you want (-L/-T, -m/m/H, and $PS_FORMAT)"
 msgstr ""
 
-#: ps/sortformat.c:830
+#: ps/sortformat.c:821
 #, c-format
 msgid "warning: $PS_FORMAT ignored. (%s)\n"
 msgstr ""
 
-#: ps/sortformat.c:835 ps/sortformat.c:845
+#: ps/sortformat.c:826 ps/sortformat.c:836
 msgid "conflicting format options"
 msgstr ""
 
-#: ps/sortformat.c:836
+#: ps/sortformat.c:827
 msgid "can not use output modifiers with user-defined output"
 msgstr ""
 
-#: ps/sortformat.c:837
+#: ps/sortformat.c:828
 msgid "-L/-T with H/m/-m and -o/-O/o/O is nonsense"
 msgstr ""
 
-#: ps/sortformat.c:895
+#: ps/sortformat.c:886
 msgid "internal error: no PID or PPID for -j option"
 msgstr ""
 
-#: ps/sortformat.c:897
+#: ps/sortformat.c:888
 msgid "lost my PGID"
 msgstr ""
 
-#: ps/sortformat.c:910
+#: ps/sortformat.c:901
 msgid "internal error: no PRI for -c option"
 msgstr ""
 
-#: ps/sortformat.c:913
+#: ps/sortformat.c:904
 msgid "lost my CLS"
 msgstr ""
 
-#: ps/sortformat.c:918
+#: ps/sortformat.c:909
 msgid "-T with H/-m/m but no PID for SPID to follow"
 msgstr ""
 
-#: ps/sortformat.c:929
+#: ps/sortformat.c:920
 msgid "-L with H/-m/m but no PID/PGID/SID/SESS for NLWP to follow"
 msgstr ""
 
@@ -1577,46 +1572,46 @@
 msgid "invalid argument %c"
 msgstr ""
 
-#: skill.c:513
+#: skill.c:514
 #, c-format
 msgid "something at line %d\n"
 msgstr ""
 
-#: skill.c:536
+#: skill.c:537
 #, c-format
 msgid "priority %lu out of range"
 msgstr ""
 
-#: skill.c:649
+#: skill.c:650
 #, c-format
 msgid "invalid pid number %s"
 msgstr ""
 
-#: skill.c:653
+#: skill.c:654
 msgid "error reading reference namespace information"
 msgstr ""
 
-#: skill.c:661
+#: skill.c:662
 msgid "invalid namespace list"
 msgstr ""
 
-#: skill.c:699
+#: skill.c:700
 msgid "no process selection criteria"
 msgstr ""
 
-#: skill.c:702
+#: skill.c:703
 msgid "general flags may not be repeated"
 msgstr ""
 
-#: skill.c:705
+#: skill.c:706
 msgid "-i makes no sense with -v, -f, and -n"
 msgstr ""
 
-#: skill.c:707
+#: skill.c:708
 msgid "-v makes no sense with -i and -f"
 msgstr ""
 
-#: skill.c:752
+#: skill.c:753
 #, c-format
 msgid "skill: \"%s\" is not supported\n"
 msgstr ""
@@ -1956,7 +1951,7 @@
 msgstr ""
 
 #. Translation Hint: maximum 'USER' = 7
-#: top/top_nls.c:133 w.c:587
+#: top/top_nls.c:133 w.c:591
 msgid "USER"
 msgstr ""
 
@@ -2280,125 +2275,170 @@
 msgid "Thread Group Id"
 msgstr ""
 
-#. Translation Hint: maximum 'Adj' = 3
-#: top/top_nls.c:242
-msgid "Adj"
+#. Translation Hint: maximum 'OOMa' = 5
+#: top/top_nls.c:241
+msgid "OOMa"
 msgstr ""
 
-#: top/top_nls.c:243
-msgid "oom_adjustment (2^X)"
+#: top/top_nls.c:242
+msgid "OOMEM Adjustment"
 msgstr ""
 
-#. Translation Hint: maximum 'Badness' = 7
-#: top/top_nls.c:245
-msgid "Badness"
+#. Translation Hint: maximum 'OOMs' = 4
+#: top/top_nls.c:244
+msgid "OOMs"
 msgstr ""
 
-#: top/top_nls.c:246
-msgid "oom_score (badness)"
+#: top/top_nls.c:245
+msgid "OOMEM Score current"
 msgstr ""
 
 #. Translation Hint: maximum 'ENVIRON' = 7
-#: top/top_nls.c:249
+#: top/top_nls.c:247
 msgid "ENVIRON"
 msgstr ""
 
 #. Translation Hint: the abbreviation 'vars' below is shorthand for
 #. 'variables'
-#: top/top_nls.c:252
+#: top/top_nls.c:250
 msgid "Environment vars"
 msgstr ""
 
 #. Translation Hint: maximum 'vMj' = 3
-#: top/top_nls.c:254
+#: top/top_nls.c:252
 msgid "vMj"
 msgstr ""
 
-#: top/top_nls.c:255
+#: top/top_nls.c:253
 msgid "Major Faults delta"
 msgstr ""
 
 #. Translation Hint: maximum 'vMn' = 3
-#: top/top_nls.c:257
+#: top/top_nls.c:255
 msgid "vMn"
 msgstr ""
 
-#: top/top_nls.c:258
+#: top/top_nls.c:256
 msgid "Minor Faults delta"
 msgstr ""
 
 #. Translation Hint: maximum 'USED' = 4
-#: top/top_nls.c:260
+#: top/top_nls.c:258
 msgid "USED"
 msgstr ""
 
-#: top/top_nls.c:261
+#: top/top_nls.c:259
 msgid "Res+Swap Size (KiB)"
 msgstr ""
 
 #. Translation Hint: maximum 'nsIPC' = 7
-#: top/top_nls.c:263
+#: top/top_nls.c:261
 msgid "nsIPC"
 msgstr ""
 
-#: top/top_nls.c:264
+#: top/top_nls.c:262
 msgid "IPC namespace Inode"
 msgstr ""
 
 #. Translation Hint: maximum 'nsMNT' = 7
-#: top/top_nls.c:266
+#: top/top_nls.c:264
 msgid "nsMNT"
 msgstr ""
 
-#: top/top_nls.c:267
+#: top/top_nls.c:265
 msgid "MNT namespace Inode"
 msgstr ""
 
 #. Translation Hint: maximum 'nsNET' = 7
-#: top/top_nls.c:269
+#: top/top_nls.c:267
 msgid "nsNET"
 msgstr ""
 
-#: top/top_nls.c:270
+#: top/top_nls.c:268
 msgid "NET namespace Inode"
 msgstr ""
 
 #. Translation Hint: maximum 'nsPID' = 7
-#: top/top_nls.c:272
+#: top/top_nls.c:270
 msgid "nsPID"
 msgstr ""
 
-#: top/top_nls.c:273
+#: top/top_nls.c:271
 msgid "PID namespace Inode"
 msgstr ""
 
 #. Translation Hint: maximum 'nsUSER' = 7
-#: top/top_nls.c:275
+#: top/top_nls.c:273
 msgid "nsUSER"
 msgstr ""
 
-#: top/top_nls.c:276
+#: top/top_nls.c:274
 msgid "USER namespace Inode"
 msgstr ""
 
 #. Translation Hint: maximum 'nsUTS' = 7
-#: top/top_nls.c:278
+#: top/top_nls.c:276
 msgid "nsUTS"
 msgstr ""
 
-#: top/top_nls.c:279
+#: top/top_nls.c:277
 msgid "UTS namespace Inode"
 msgstr ""
 
 #. Translation Hint: maximum 'LXC' = 7
-#: top/top_nls.c:281
+#: top/top_nls.c:279
 msgid "LXC"
 msgstr ""
 
-#: top/top_nls.c:282
+#: top/top_nls.c:280
 msgid "LXC container name"
 msgstr ""
 
+#. Translation Hint: maximum 'RSan' = 4
+#: top/top_nls.c:282
+msgid "RSan"
+msgstr ""
+
+#: top/top_nls.c:283
+msgid "RES Anonymous (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'RSfd' = 4
+#: top/top_nls.c:285
+msgid "RSfd"
+msgstr ""
+
+#: top/top_nls.c:286
+msgid "RES File-based (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'RSlk' = 4
+#: top/top_nls.c:288
+msgid "RSlk"
+msgstr ""
+
+#: top/top_nls.c:289
+msgid "RES Locked (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'RSsh' = 4
+#: top/top_nls.c:291
+msgid "RSsh"
+msgstr ""
+
+#: top/top_nls.c:292
+msgid "RES Shared (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'CGNAME' = 7
+#: top/top_nls.c:294
+msgid "CGNAME"
+msgstr ""
+
+#: top/top_nls.c:295
+msgid "Control Group name"
+msgstr ""
+
 #. Translation Notes ------------------------------------------------
 #. .  It is strongly recommend that the --no-wrap command line option
 #. .  be used with all supporting translation tools, when available.
@@ -2409,14 +2449,14 @@
 #. .  and should not be translated without also making corresponding
 #. .  c-code logic changes.
 #. .
-#: top/top_nls.c:302
+#: top/top_nls.c:315
 #, c-format
 msgid ""
 "\tsignal %d (%s) was caught by %s, please\n"
 "\tsee http://www.debian.org/Bugs/Reporting\n"
 msgstr ""
 
-#: top/top_nls.c:305
+#: top/top_nls.c:318
 #, c-format
 msgid ""
 "inappropriate '%s'\n"
@@ -2424,7 +2464,7 @@
 "  %s%s"
 msgstr ""
 
-#: top/top_nls.c:308
+#: top/top_nls.c:321
 #, c-format
 msgid ""
 "  %s\n"
@@ -2432,47 +2472,47 @@
 "  %s%s"
 msgstr ""
 
-#: top/top_nls.c:311
+#: top/top_nls.c:324
 #, c-format
 msgid "failed /proc/stat open: %s"
 msgstr ""
 
-#: top/top_nls.c:312
+#: top/top_nls.c:325
 #, c-format
 msgid "failed openproc: %s"
 msgstr ""
 
-#: top/top_nls.c:313
+#: top/top_nls.c:326
 #, c-format
 msgid "bad delay interval '%s'"
 msgstr ""
 
-#: top/top_nls.c:314
+#: top/top_nls.c:327
 #, c-format
 msgid "bad iterations argument '%s'"
 msgstr ""
 
-#: top/top_nls.c:315
+#: top/top_nls.c:328
 #, c-format
 msgid "pid limit (%d) exceeded"
 msgstr ""
 
-#: top/top_nls.c:316
+#: top/top_nls.c:329
 #, c-format
 msgid "bad pid '%s'"
 msgstr ""
 
-#: top/top_nls.c:317
+#: top/top_nls.c:330
 #, c-format
 msgid "-%c requires argument"
 msgstr ""
 
-#: top/top_nls.c:318
+#: top/top_nls.c:331
 #, c-format
 msgid "bad width arg '%s'"
 msgstr ""
 
-#: top/top_nls.c:319
+#: top/top_nls.c:332
 #, c-format
 msgid ""
 "unknown option '%c'\n"
@@ -2480,323 +2520,323 @@
 "  %s%s"
 msgstr ""
 
-#: top/top_nls.c:322
+#: top/top_nls.c:335
 msgid "-d disallowed in \"secure\" mode"
 msgstr ""
 
-#: top/top_nls.c:323
+#: top/top_nls.c:336
 msgid "-d requires positive argument"
 msgstr ""
 
-#: top/top_nls.c:324
+#: top/top_nls.c:337
 msgid "On"
 msgstr ""
 
-#: top/top_nls.c:325
+#: top/top_nls.c:338
 msgid "Off"
 msgstr ""
 
 #. Translation Hint: Only the following words should be translated
 #. .                 secs (seconds), max (maximum), user, field, cols (columns)
-#: top/top_nls.c:328
+#: top/top_nls.c:341
 msgid " -hv | -bcHiOSs -d secs -n max -u|U user -p pid(s) -o field -w [cols]"
 msgstr ""
 
-#: top/top_nls.c:329
+#: top/top_nls.c:342
 msgid "failed /proc/stat read"
 msgstr ""
 
-#: top/top_nls.c:330
+#: top/top_nls.c:343
 #, c-format
 msgid "Forest mode %s"
 msgstr ""
 
-#: top/top_nls.c:331
+#: top/top_nls.c:344
 msgid "failed tty get"
 msgstr ""
 
-#: top/top_nls.c:332
+#: top/top_nls.c:345
 #, c-format
 msgid "failed tty set: %s"
 msgstr ""
 
-#: top/top_nls.c:333
+#: top/top_nls.c:346
 msgid "Choose field group (1 - 4)"
 msgstr ""
 
-#: top/top_nls.c:334
+#: top/top_nls.c:347
 msgid "Command disabled, 'A' mode required"
 msgstr ""
 
-#: top/top_nls.c:335
+#: top/top_nls.c:348
 #, c-format
 msgid "Command disabled, activate %s with '-' or '_'"
 msgstr ""
 
-#: top/top_nls.c:336
+#: top/top_nls.c:349
 msgid "No colors to map!"
 msgstr ""
 
-#: top/top_nls.c:337
+#: top/top_nls.c:350
 #, c-format
 msgid "Failed '%s' open: %s"
 msgstr ""
 
-#: top/top_nls.c:338
+#: top/top_nls.c:351
 #, c-format
 msgid "Wrote configuration to '%s'"
 msgstr ""
 
-#: top/top_nls.c:339
+#: top/top_nls.c:352
 #, c-format
 msgid "Change delay from %.1f to"
 msgstr ""
 
-#: top/top_nls.c:340
+#: top/top_nls.c:353
 #, c-format
 msgid "Show threads %s"
 msgstr ""
 
-#: top/top_nls.c:341
+#: top/top_nls.c:354
 #, c-format
 msgid "Irix mode %s"
 msgstr ""
 
-#: top/top_nls.c:342
+#: top/top_nls.c:355
 #, c-format
 msgid "PID to signal/kill [default pid = %d]"
 msgstr ""
 
-#: top/top_nls.c:343
+#: top/top_nls.c:356
 #, c-format
 msgid "Send pid %d signal [%d/sigterm]"
 msgstr ""
 
-#: top/top_nls.c:344
+#: top/top_nls.c:357
 #, c-format
 msgid "Failed signal pid '%d' with '%d': %s"
 msgstr ""
 
-#: top/top_nls.c:345
+#: top/top_nls.c:358
 msgid "Invalid signal"
 msgstr ""
 
-#: top/top_nls.c:346
+#: top/top_nls.c:359
 #, c-format
 msgid "PID to renice [default pid = %d]"
 msgstr ""
 
-#: top/top_nls.c:347
+#: top/top_nls.c:360
 #, c-format
 msgid "Renice PID %d to value"
 msgstr ""
 
-#: top/top_nls.c:348
+#: top/top_nls.c:361
 #, c-format
 msgid "Failed renice of PID %d to %d: %s"
 msgstr ""
 
-#: top/top_nls.c:349
+#: top/top_nls.c:362
 #, c-format
 msgid "Rename window '%s' to (1-3 chars)"
 msgstr ""
 
-#: top/top_nls.c:350
+#: top/top_nls.c:363
 #, c-format
 msgid "Cumulative time %s"
 msgstr ""
 
-#: top/top_nls.c:351
+#: top/top_nls.c:364
 #, c-format
 msgid "Maximum tasks = %d, change to (0 is unlimited)"
 msgstr ""
 
-#: top/top_nls.c:352
+#: top/top_nls.c:365
 msgid "Invalid maximum"
 msgstr ""
 
-#: top/top_nls.c:353
+#: top/top_nls.c:366
 msgid "Which user (blank for all)"
 msgstr ""
 
-#: top/top_nls.c:354
+#: top/top_nls.c:367
 msgid "Unknown command - try 'h' for help"
 msgstr ""
 
-#: top/top_nls.c:355
+#: top/top_nls.c:368
 #, c-format
 msgid "scroll coordinates: y = %d/%%d (tasks), x = %d/%d (fields)"
 msgstr ""
 
-#: top/top_nls.c:356
+#: top/top_nls.c:369
 msgid "failed memory allocate"
 msgstr ""
 
-#: top/top_nls.c:357
+#: top/top_nls.c:370
 msgid "failed memory re-allocate"
 msgstr ""
 
-#: top/top_nls.c:358
+#: top/top_nls.c:371
 msgid "Unacceptable floating point"
 msgstr ""
 
-#: top/top_nls.c:359
+#: top/top_nls.c:372
 msgid "Invalid user"
 msgstr ""
 
-#: top/top_nls.c:360
+#: top/top_nls.c:373
 msgid "forest view"
 msgstr ""
 
-#: top/top_nls.c:361
+#: top/top_nls.c:374
 msgid "failed pid maximum size test"
 msgstr ""
 
-#: top/top_nls.c:362
+#: top/top_nls.c:375
 msgid "failed number of cpus test"
 msgstr ""
 
-#: top/top_nls.c:363
+#: top/top_nls.c:376
 #, c-format
 msgid "incompatible rcfile, you should delete '%s'"
 msgstr ""
 
-#: top/top_nls.c:364
+#: top/top_nls.c:377
 #, c-format
 msgid "window entry #%d corrupt, please delete '%s'"
 msgstr ""
 
-#: top/top_nls.c:365
+#: top/top_nls.c:378
 msgid "Unavailable in secure mode"
 msgstr ""
 
-#: top/top_nls.c:366
+#: top/top_nls.c:379
 msgid "Only 1 cpu detected"
 msgstr ""
 
-#: top/top_nls.c:367
+#: top/top_nls.c:380
 msgid "Unacceptable integer"
 msgstr ""
 
-#: top/top_nls.c:368
+#: top/top_nls.c:381
 msgid "conflicting process selections (U/p/u)"
 msgstr ""
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 kibibytes (1024 bytes)
-#: top/top_nls.c:371
+#: top/top_nls.c:384
 msgid "KiB"
 msgstr ""
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 mebibytes (1,048,576 bytes)
-#: top/top_nls.c:374
+#: top/top_nls.c:387
 msgid "MiB"
 msgstr ""
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 gibibytes (1,073,741,824 bytes)
-#: top/top_nls.c:377
+#: top/top_nls.c:390
 msgid "GiB"
 msgstr ""
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 tebibytes (1,099,511,627,776 bytes)
-#: top/top_nls.c:380
+#: top/top_nls.c:393
 msgid "TiB"
 msgstr ""
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 pebibytes (1,024 tebibytes)
-#: top/top_nls.c:383
+#: top/top_nls.c:396
 msgid "PiB"
 msgstr ""
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 exbibytes (1,024 pebibytes)
-#: top/top_nls.c:386
+#: top/top_nls.c:399
 msgid "EiB"
 msgstr ""
 
-#: top/top_nls.c:387
+#: top/top_nls.c:400
 msgid "Threads"
 msgstr ""
 
-#: top/top_nls.c:388
+#: top/top_nls.c:401
 msgid "Tasks"
 msgstr ""
 
 #. Translation Hint: The following "word" is meant to represent either a single
 #. .                 cpu or all of the processors in a multi-processor computer
 #. .                 (should be exactly 6 characters, not counting the colon)
-#: top/top_nls.c:392
+#: top/top_nls.c:405
 msgid "Cpu(s):"
 msgstr ""
 
 #. Translation Hint: The following "word" is meant to represent a single processor
 #. .                 (should be exactly 3 characters)
-#: top/top_nls.c:395
+#: top/top_nls.c:408
 #, c-format
 msgid "Cpu%-3d:"
 msgstr ""
 
 #. Translation Hint: The following word "another" must have 1 trailing space
-#: top/top_nls.c:397
+#: top/top_nls.c:410
 msgid "another "
 msgstr ""
 
-#: top/top_nls.c:398
+#: top/top_nls.c:411
 msgid "Locate next inactive, use \"L\""
 msgstr ""
 
-#: top/top_nls.c:399
+#: top/top_nls.c:412
 msgid "Locate string"
 msgstr ""
 
-#: top/top_nls.c:400
+#: top/top_nls.c:413
 #, c-format
 msgid "%s\"%s\" not found"
 msgstr ""
 
-#: top/top_nls.c:401
+#: top/top_nls.c:414
 #, c-format
 msgid "width incr is %d, change to (0 default, -1 auto)"
 msgstr ""
 
-#: top/top_nls.c:402
+#: top/top_nls.c:415
 msgid "Overwrite existing obsolete/corrupted rcfile?"
 msgstr ""
 
-#: top/top_nls.c:403
+#: top/top_nls.c:416
 #, c-format
 msgid "unrecognized field name '%s'"
 msgstr ""
 
-#: top/top_nls.c:404
+#: top/top_nls.c:417
 msgid "even using field names only, window is now too small"
 msgstr ""
 
-#: top/top_nls.c:406
+#: top/top_nls.c:419
 msgid "Open Files"
 msgstr ""
 
-#: top/top_nls.c:407
+#: top/top_nls.c:420
 msgid "NUMA Info"
 msgstr ""
 
-#: top/top_nls.c:408
+#: top/top_nls.c:421
 msgid "Log"
 msgstr ""
 
-#: top/top_nls.c:409
+#: top/top_nls.c:422
 msgid "the '=' key will eventually show the actual file read or command(s) executed ..."
 msgstr ""
 
-#: top/top_nls.c:410
+#: top/top_nls.c:423
 msgid "demo"
 msgstr ""
 
-#: top/top_nls.c:411
+#: top/top_nls.c:424
 #, c-format
 msgid ""
 "This is simulated output representing the contents of some file or the output\n"
@@ -2832,100 +2872,100 @@
 "Enjoy!\n"
 msgstr ""
 
-#: top/top_nls.c:443
+#: top/top_nls.c:456
 msgid "to enable 'Y' press <Enter> then type 'W' and restart top"
 msgstr ""
 
-#: top/top_nls.c:445
+#: top/top_nls.c:458
 msgid "to enable 'Y' please consult the top man page (press Enter)"
 msgstr ""
 
-#: top/top_nls.c:447
+#: top/top_nls.c:460
 #, c-format
 msgid "Selection failed with: %s\n"
 msgstr ""
 
-#: top/top_nls.c:448
+#: top/top_nls.c:461
 #, c-format
 msgid "unable to inspect, pid %d not found"
 msgstr ""
 
-#: top/top_nls.c:449
+#: top/top_nls.c:462
 #, c-format
 msgid "inspect at PID [default pid = %d]"
 msgstr ""
 
-#: top/top_nls.c:450
+#: top/top_nls.c:463
 #, c-format
 msgid "%s: %*d-%-*d lines, %*d-%*d columns, %lu bytes read"
 msgstr ""
 
-#: top/top_nls.c:451
+#: top/top_nls.c:464
 msgid "patience please, working..."
 msgstr ""
 
 #. Translation Hint: Below are 2 abbreviations which can be as long as needed:
 #. .                 FLD = FIELD, VAL = VALUE
-#: top/top_nls.c:454
+#: top/top_nls.c:467
 #, c-format
 msgid "add filter #%d (%s) as: [!]FLD?VAL"
 msgstr ""
 
-#: top/top_nls.c:455
+#: top/top_nls.c:468
 msgid "ignoring case"
 msgstr ""
 
-#: top/top_nls.c:456
+#: top/top_nls.c:469
 msgid "case sensitive"
 msgstr ""
 
-#: top/top_nls.c:457
+#: top/top_nls.c:470
 msgid "duplicate filter was ignored"
 msgstr ""
 
-#: top/top_nls.c:458
+#: top/top_nls.c:471
 #, c-format
 msgid "'%s' filter delimiter is missing"
 msgstr ""
 
-#: top/top_nls.c:459
+#: top/top_nls.c:472
 #, c-format
 msgid "'%s' filter value is missing"
 msgstr ""
 
-#: top/top_nls.c:460
+#: top/top_nls.c:473
 msgid "include"
 msgstr ""
 
-#: top/top_nls.c:461
+#: top/top_nls.c:474
 msgid "exclude"
 msgstr ""
 
-#: top/top_nls.c:462
+#: top/top_nls.c:475
 #, c-format
 msgid "<Enter> to resume, filters: %s"
 msgstr ""
 
-#: top/top_nls.c:463
+#: top/top_nls.c:476
 msgid "none"
 msgstr ""
 
 #. Translation Hint: The following word 'Node' should be exactly 4 characters
-#: top/top_nls.c:465
+#: top/top_nls.c:478
 #, c-format
 msgid "Node%-2d:"
 msgstr ""
 
-#: top/top_nls.c:466
+#: top/top_nls.c:479
 #, c-format
 msgid "expand which node (0-%d)"
 msgstr ""
 
-#: top/top_nls.c:467
+#: top/top_nls.c:480
 msgid "invalid node"
 msgstr ""
 
-#: top/top_nls.c:468
+#: top/top_nls.c:481
 msgid "sorry, NUMA extensions unavailable"
 msgstr ""
 
@@ -2933,11 +2973,11 @@
 #. .                 'Swap' represents the linux swap file --
 #. .                 please make both translations exactly 4 characters,
 #. .                 padding with extra spaces as necessary
-#: top/top_nls.c:473
+#: top/top_nls.c:486
 msgid "Mem "
 msgstr ""
 
-#: top/top_nls.c:474
+#: top/top_nls.c:487
 msgid "Swap"
 msgstr ""
 
@@ -2965,7 +3005,7 @@
 #. .  please see the prologue to the show_special function in the top.c
 #. .  source file.
 #. .
-#: top/top_nls.c:508
+#: top/top_nls.c:521
 #, c-format
 msgid ""
 "Help for Interactive Commands~2 - %s\n"
@@ -2995,13 +3035,13 @@
 #. Translation Hint: As is true for the text above, the "keys" shown to the left and
 #. .                 also imbedded in the translatable text (along with escape seqs)
 #. .                 should never themselves be translated.
-#: top/top_nls.c:536
+#: top/top_nls.c:549
 msgid ""
 "  k,r       Manipulate tasks: '~1k~2' kill; '~1r~2' renice\n"
 "  d or s    Set update interval\n"
 msgstr ""
 
-#: top/top_nls.c:540
+#: top/top_nls.c:553
 #, c-format
 msgid ""
 "Help for Windows / Field Groups~2 - \"Current Window\" = ~1 %s ~6\n"
@@ -3054,7 +3094,7 @@
 #. .     --> "   0~2 = black,~1  1~2 = red,    ~1  2~2 = gree
 #. .     --> "   4~2 = blue, ~1  5~2 = magenta,~1  6~2 = cyan
 #. .
-#: top/top_nls.c:590
+#: top/top_nls.c:603
 #, c-format
 msgid ""
 "Help for color mapping~2 - %s\n"
@@ -3083,7 +3123,7 @@
 "   'a' or 'w' to commit & change another, <Enter> to commit and end "
 msgstr ""
 
-#: top/top_nls.c:616
+#: top/top_nls.c:629
 #, c-format
 msgid ""
 "Fields Management~2 for window ~1%s~6, whose current sort field is ~1%s~2\n"
@@ -3091,17 +3131,17 @@
 "   'd' or <Space> toggles display, 's' sets sort.  Use 'q' or <Esc> to end!\n"
 msgstr ""
 
-#: top/top_nls.c:621
+#: top/top_nls.c:634
 #, c-format
 msgid "%s:~3 %3u ~2total,~3 %3u ~2running,~3 %3u ~2sleeping,~3 %3u ~2stopped,~3 %3u ~2zombie~3\n"
 msgstr ""
 
-#: top/top_nls.c:624
+#: top/top_nls.c:637
 #, c-format
 msgid "%%%s~3 %#5.1f  ~2user,~3 %#5.1f  ~2system,~3 %#5.1f  ~2nice,~3 %#5.1f  ~2idle~3\n"
 msgstr ""
 
-#: top/top_nls.c:627
+#: top/top_nls.c:640
 #, c-format
 msgid "%%%s~3 %#5.1f  ~2user,~3 %#5.1f  ~2system,~3 %#5.1f  ~2nice,~3 %#5.1f  ~2idle,~3 %#5.1f  ~2IO-wait~3\n"
 msgstr ""
@@ -3109,7 +3149,7 @@
 #. Translation Hint: Only the following abbreviations need be translated
 #. .                 us = user, sy = system, ni = nice, id = idle, wa = wait,
 #. .                 hi hardware interrupt, si = software interrupt
-#: top/top_nls.c:633
+#: top/top_nls.c:646
 #, c-format
 msgid "%%%s~3 %#5.1f ~2us,~3 %#5.1f ~2sy,~3 %#5.1f ~2ni,~3 %#5.1f ~2id,~3 %#5.1f ~2wa,~3 %#5.1f ~2hi,~3 %#5.1f ~2si~3\n"
 msgstr ""
@@ -3117,19 +3157,19 @@
 #. Translation Hint: Only the following abbreviations need be translated
 #. .                 us = user, sy = system, ni = nice, id = idle, wa = wait,
 #. .                 hi hardware interrupt, si = software interrupt, st = steal time
-#: top/top_nls.c:639
+#: top/top_nls.c:652
 #, c-format
 msgid "%%%s~3%#5.1f ~2us,~3%#5.1f ~2sy,~3%#5.1f ~2ni,~3%#5.1f ~2id,~3%#5.1f ~2wa,~3%#5.1f ~2hi,~3%#5.1f ~2si,~3%#5.1f ~2st~3\n"
 msgstr ""
 
-#: top/top_nls.c:642
+#: top/top_nls.c:655
 #, c-format
 msgid ""
 "%s %s:~3 %9.9s~2total,~3 %9.9s~2free,~3 %9.9s~2used,~3 %9.9s~2buff/cache~3\n"
 "%s %s:~3 %9.9s~2total,~3 %9.9s~2free,~3 %9.9s~2used.~3 %9.9s~2avail %s~3\n"
 msgstr ""
 
-#: top/top_nls.c:646
+#: top/top_nls.c:659
 #, c-format
 msgid ""
 "Inspection~2 Pause at: pid ~1%d~6, running ~1%s~6\n"
@@ -3137,7 +3177,7 @@
 "Options~2: ~1%s\n"
 msgstr ""
 
-#: top/top_nls.c:651
+#: top/top_nls.c:664
 #, c-format
 msgid ""
 "Inspection~2 View at pid: ~1%s~3, running ~1%s~3.  Locating: ~1%s~6\n"
@@ -3661,119 +3701,124 @@
 msgid " -v, --version  output version information and exit\n"
 msgstr ""
 
-#: watch.c:376
+#: watch.c:384
 #, c-format
 msgid "Every %.1fs: "
 msgstr ""
 
-#: watch.c:437
+#: watch.c:385
+#, c-format
+msgid "%s: %s"
+msgstr ""
+
+#: watch.c:456
 msgid "unable to create IPC pipes"
 msgstr ""
 
-#: watch.c:447
+#: watch.c:466
 msgid "unable to fork process"
 msgstr ""
 
-#: watch.c:452
+#: watch.c:471
 msgid "dup2 failed"
 msgstr ""
 
-#: watch.c:459
+#: watch.c:478
 #, c-format
 msgid "unable to execute '%s'"
 msgstr ""
 
-#: watch.c:476
+#: watch.c:495
 msgid "fdopen"
 msgstr ""
 
-#: watch.c:622
+#: watch.c:641
 msgid "waitpid"
 msgstr ""
 
-#: watch.c:630
+#: watch.c:649
 msgid "command exit with a non-zero status, press a key to exit"
 msgstr ""
 
-#: watch.c:755
+#: watch.c:773
 #, c-format
 msgid "unicode handling error\n"
 msgstr ""
 
-#: watch.c:761
+#: watch.c:779
 #, c-format
 msgid "unicode handling error (malloc)\n"
 msgstr ""
 
-#: w.c:241 w.c:256
+#: w.c:245 w.c:260
 #, c-format
 msgid " %2ludays"
 msgstr ""
 
 #. Translation Hint: Minutes:Seconds
 #. Translation Hint: Hours:Minutes
-#: w.c:250 w.c:260
+#: w.c:254 w.c:264
 #, c-format
 msgid " %2lu:%02um"
 msgstr ""
 
 #. Translation Hint: Seconds:Centiseconds
-#: w.c:268
+#: w.c:272
 #, c-format
 msgid " %2lu.%02us"
 msgstr ""
 
-#: w.c:451
+#: w.c:455
 msgid " -h, --no-header     do not print header\n"
 msgstr ""
 
-#: w.c:452
+#: w.c:456
 msgid " -u, --no-current    ignore current process username\n"
 msgstr ""
 
-#: w.c:453
+#: w.c:457
 msgid " -s, --short         short format\n"
 msgstr ""
 
-#: w.c:454
+#: w.c:458
 msgid " -f, --from          show remote hostname field\n"
 msgstr ""
 
-#: w.c:455
+#: w.c:459
 msgid " -o, --old-style     old style output\n"
 msgstr ""
 
-#: w.c:456
+#: w.c:460
 msgid " -i, --ip-addr       display IP address instead of hostname (if possible)\n"
 msgstr ""
 
-#: w.c:553
+#: w.c:557
 #, c-format
 msgid "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n"
 msgstr ""
 
-#: w.c:563
+#: w.c:567
 #, c-format
 msgid "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n"
 msgstr ""
 
 #. Translation Hint: Following five uppercase messages are
 #. * headers. Try to keep alignment intact.
-#: w.c:587
+#: w.c:591
 #, c-format
 msgid "%-*s TTY      "
 msgstr ""
 
-#: w.c:589
+#: w.c:593
 msgid "FROM"
 msgstr ""
 
-#: w.c:591
+#: w.c:595
 #, c-format
 msgid "  LOGIN@   IDLE   JCPU   PCPU WHAT\n"
 msgstr ""
 
-#: w.c:593
+#: w.c:597
 #, c-format
 msgid "   IDLE WHAT\n"
 msgstr ""
Binary files /tmp/tmpsmX0gC/RRPDCxm9wk/procps-3.3.11/po/uk.gmo and /tmp/tmpsmX0gC/hzIsJzyyeF/procps-3.3.12/po/uk.gmo differ
diff -Nru procps-3.3.11/po/uk.po procps-3.3.12/po/uk.po
--- procps-3.3.11/po/uk.po	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/po/uk.po	2016-07-10 06:40:26.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: procps-ng-3.3.10-rc1\n"
 "Report-Msgid-Bugs-To: procps@freelists.org\n"
-"POT-Creation-Date: 2015-08-09 15:59+1000\n"
+"POT-Creation-Date: 2016-07-10 08:19+1000\n"
 "PO-Revision-Date: 2014-09-10 07:37+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -19,7 +19,7 @@
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: free.c:74 slabtop.c:189 uptime.c:59 w.c:449
+#: free.c:74 slabtop.c:189 uptime.c:59 w.c:453
 #, c-format
 msgid " %s [options]\n"
 msgstr " %s [параметри]\n"
@@ -109,7 +109,7 @@
 msgid " -w, --wide          wide output\n"
 msgstr " -w, --wide          виведення у широкому форматі\n"
 
-#: free.c:95 w.c:458
+#: free.c:95 w.c:462
 msgid "     --help     display this help and exit\n"
 msgstr "     --help     показати цю довідку та вийти\n"
 
@@ -117,26 +117,21 @@
 msgid "Multiple unit options doesn't make sense."
 msgstr ""
 
-#: free.c:329
-#, c-format
-msgid "seconds argument `%s' failed"
-msgstr "помилка аргументу секунд, «%s»"
-
-#: free.c:332
+#: free.c:330
 #, c-format
 msgid "seconds argument `%s' is not positive number"
 msgstr "аргумент секунд, «%s», не є додатним числом"
 
-#: free.c:338
+#: free.c:336
 msgid "failed to parse count argument"
 msgstr "не вдалося обробити аргумент кількості"
 
-#: free.c:341
+#: free.c:339
 #, c-format
 msgid "failed to parse count argument: '%s'"
 msgstr "не вдалося обробити аргумент кількості: «%s»"
 
-#: free.c:362
+#: free.c:360
 #, c-format
 msgid ""
 "              total        used        free      shared     buffers       "
@@ -145,7 +140,7 @@
 "             загалом       використ.   вільна    спільна    буфери        "
 "кеш     дост."
 
-#: free.c:364
+#: free.c:362
 #, c-format
 msgid ""
 "              total        used        free      shared  buff/cache   "
@@ -153,23 +148,23 @@
 msgstr ""
 "             загалом       використ.   вільна    спільна буфери/кеш   дост."
 
-#: free.c:367
+#: free.c:365
 msgid "Mem:"
 msgstr "Пам.:"
 
-#: free.c:387
+#: free.c:385
 msgid "Low:"
 msgstr "Нижня:"
 
-#: free.c:393
+#: free.c:391
 msgid "High:"
 msgstr "Верхня:"
 
-#: free.c:400
+#: free.c:398
 msgid "Swap:"
 msgstr "Своп.:"
 
-#: free.c:407
+#: free.c:405
 msgid "Total:"
 msgstr "Загалом:"
 
@@ -336,7 +331,7 @@
 msgid "Error reading reference namespace information\n"
 msgstr "Помилка під час спроби читання даних щодо еталонного простору назв\n"
 
-#: pgrep.c:610 pidof.c:224 pidof.c:265 sysctl.c:643
+#: pgrep.c:610 pidof.c:230 pidof.c:271 sysctl.c:643
 msgid "internal error"
 msgstr "внутрішня помилка"
 
@@ -410,7 +405,7 @@
 msgid " -o, --omit-pid <PID,...>  omit processes with PID\n"
 msgstr " -o, --omit-pid <PID,...>  пропускати процеси із вказаним PID\n"
 
-#: pidof.c:268
+#: pidof.c:274
 #, c-format
 msgid "illegal omit pid value (%s)!\n"
 msgstr "некоректне значення pid для пропускання (%s)!\n"
@@ -531,7 +526,7 @@
 msgid "  [ stack ]"
 msgstr "  [ стек  ]"
 
-#: pmap.c:326
+#: pmap.c:325
 msgid "Unknown format in smaps file!"
 msgstr "Невідомий формат у файлі smaps!"
 
@@ -562,8 +557,8 @@
 msgid " total %8ldK\n"
 msgstr " загалом %8ld К\n"
 
-#: pmap.c:767 skill.c:500 skill.c:533 skill.c:620 tload.c:128 tload.c:133
-#: vmstat.c:959 vmstat.c:968 watch.c:708
+#: pmap.c:767 skill.c:500 skill.c:534 skill.c:621 tload.c:128 tload.c:133
+#: vmstat.c:959 vmstat.c:968 watch.c:726
 msgid "failed to parse argument"
 msgstr "не вдалося обробити аргумент"
 
@@ -647,8 +642,8 @@
 msgid "Signal %d (%s) caught by %s (%s).\n"
 msgstr "%3$s (%4$s) отримано сигнал %1$d (%2$s).\n"
 
-#: ps/display.c:66 ps/display.c:271 ps/parser.c:509 ps/parser.c:756
-#: ps/select.c:95 ps/sortformat.c:550
+#: ps/display.c:66 ps/display.c:271 ps/parser.c:495 ps/parser.c:742
+#: ps/select.c:95 ps/sortformat.c:544
 msgid "please report this bug"
 msgstr "будь ласка, повідомте про цю ваду"
 
@@ -694,7 +689,7 @@
 #. .
 #. . It must be limited to 15 characters or less.
 #.
-#: ps/global.c:408
+#: ps/global.c:401
 msgid "help"
 msgstr "help"
 
@@ -1120,294 +1115,294 @@
 "\n"
 "Докладніший опис можна знайти у ps(1).\n"
 
-#: ps/output.c:1971
+#: ps/output.c:1969
 #, c-format
 msgid "fix bigness error\n"
 msgstr "помилка з виправленням величини\n"
 
-#: ps/output.c:2046
+#: ps/output.c:2044
 #, c-format
 msgid "bad alignment code\n"
 msgstr "помилковий код вирівнювання\n"
 
-#: ps/output.c:2108
+#: ps/output.c:2106
 #, c-format
 msgid "unknown page size (assume 4096)\n"
 msgstr "невідомий розмір сторінки (припускаємо 4096)\n"
 
-#: ps/parser.c:58
+#: ps/parser.c:57
 msgid "the option is exclusive: "
 msgstr "параметр не можна використовувати з іншими: "
 
-#: ps/parser.c:89
+#: ps/parser.c:87
 msgid "process ID list syntax error"
 msgstr "синтаксична помилка у списку ідентифікаторів процесів"
 
-#: ps/parser.c:90 ps/parser.c:91
+#: ps/parser.c:88 ps/parser.c:89
 msgid "process ID out of range"
 msgstr "ідентифікатор процесу не належить до припустимого діапазону"
 
-#: ps/parser.c:104
+#: ps/parser.c:102
 msgid "user name does not exist"
 msgstr "такого імені користувача не існує"
 
-#: ps/parser.c:110
+#: ps/parser.c:108
 msgid "user ID out of range"
 msgstr "ідентифікатор користувача не належить до припустимого діапазону"
 
-#: ps/parser.c:123
+#: ps/parser.c:121
 msgid "group name does not exist"
 msgstr "назви групи не існує"
 
-#: ps/parser.c:129
+#: ps/parser.c:127
 msgid "group ID out of range"
 msgstr "ідентифікатор групи поза межами припустимого діапазону"
 
-#: ps/parser.c:145 ps/parser.c:169
+#: ps/parser.c:143 ps/parser.c:167
 msgid "TTY could not be found"
 msgstr "не вдалося знайти TTY"
 
-#: ps/parser.c:171
+#: ps/parser.c:169
 msgid "list member was not a TTY"
 msgstr "запис списку не був записом TTY"
 
-#: ps/parser.c:196
+#: ps/parser.c:194
 msgid "improper list"
 msgstr "неналежний список"
 
-#: ps/parser.c:256
+#: ps/parser.c:242
 msgid "list of command names must follow -C"
 msgstr "після -C має бути вказано список команд"
 
-#: ps/parser.c:270
+#: ps/parser.c:256
 msgid "list of real groups must follow -G"
 msgstr "після -G має бути вказано список справжніх груп"
 
-#: ps/parser.c:283
+#: ps/parser.c:269
 msgid "list of jobs must follow -J"
 msgstr "після списку завдань має бути вказано -J"
 
-#: ps/parser.c:311
+#: ps/parser.c:297
 msgid "format or sort specification must follow -O"
 msgstr "після -O має бути вказано формат або специфікацію впорядкування"
 
-#: ps/parser.c:322
+#: ps/parser.c:308
 msgid "list of PRM groups must follow -R"
 msgstr "після -R слід вказати список груп PRM"
 
-#: ps/parser.c:341
+#: ps/parser.c:327
 msgid "list of real users must follow -U"
 msgstr "після -U має бути вказано список справжніх користувачів"
 
-#: ps/parser.c:382
+#: ps/parser.c:368
 msgid "list of session leaders OR effective group names must follow -g"
 msgstr ""
 "після -g має бути вказано список лідерів сеансів або назв ефективних груп"
 
-#: ps/parser.c:393
+#: ps/parser.c:379
 msgid "list of session leaders OR effective group IDs was invalid"
 msgstr ""
 "список лідерів сеансів або ідентифікаторів ефективних груп виявився "
 "некоректним"
 
-#: ps/parser.c:417
+#: ps/parser.c:403
 msgid "format specification must follow -o"
 msgstr "після -o має бути вказано специфікацію формату"
 
-#: ps/parser.c:423
+#: ps/parser.c:409
 msgid "list of process IDs must follow -p"
 msgstr "після -p має бути вказано список ідентифікаторів процесів"
 
-#: ps/parser.c:440
+#: ps/parser.c:426
 msgid "the -r option is reserved"
 msgstr "параметр -r зарезервовано"
 
-#: ps/parser.c:446
+#: ps/parser.c:432
 msgid "list of session IDs must follow -s"
 msgstr "після -s має бути вказано список ідентифікаторів сеансів"
 
-#: ps/parser.c:454
+#: ps/parser.c:440
 msgid "list of terminals (pty, tty...) must follow -t"
 msgstr "після -t має бути вказано список терміналів (pty, tty...)"
 
-#: ps/parser.c:462
+#: ps/parser.c:448
 msgid "list of users must follow -u"
 msgstr "після -u має бути вказано список користувачів"
 
-#: ps/parser.c:484
+#: ps/parser.c:470
 msgid "must set personality to get -x option"
 msgstr "для отримання доступу до параметра -x слід встановити особистість"
 
-#: ps/parser.c:499
+#: ps/parser.c:485
 msgid "list of zones (contexts, labels, whatever?) must follow -z"
 msgstr "після -z слід вказати список зон (контекстів, міток, чогось іншого?)"
 
-#: ps/parser.c:506
+#: ps/parser.c:492
 msgid "embedded '-' among SysV options makes no sense"
 msgstr "вбудовування «-» до параметрів SysV не має сенсу"
 
-#: ps/parser.c:512
+#: ps/parser.c:498
 msgid "unsupported SysV option"
 msgstr "непідтримуваний параметр SysV"
 
-#: ps/parser.c:525
+#: ps/parser.c:511
 msgid "cannot happen - problem #1"
 msgstr "цього не мало статися — проблема 1"
 
-#: ps/parser.c:529
+#: ps/parser.c:515
 msgid "cannot happen - problem #2"
 msgstr "цього не мало статися — проблема 2"
 
-#: ps/parser.c:531
+#: ps/parser.c:517
 msgid "second chance parse failed, not BSD or SysV"
 msgstr "друга спроба обробки зазнала невдачі, не BSD або SysV"
 
-#: ps/parser.c:548
+#: ps/parser.c:534
 msgid "option A is reserved"
 msgstr "параметр A зарезервовано"
 
-#: ps/parser.c:553
+#: ps/parser.c:539
 msgid "option C is reserved"
 msgstr "параметр C зарезервовано"
 
-#: ps/parser.c:573
+#: ps/parser.c:559
 msgid "format or sort specification must follow O"
 msgstr "після O має бути вказано формат або специфікацію впорядкування"
 
-#: ps/parser.c:598
+#: ps/parser.c:584
 msgid "list of users must follow U"
 msgstr "після U має бути вказано список користувачів"
 
-#: ps/parser.c:610
+#: ps/parser.c:596
 msgid "obsolete W option not supported (you have a /dev/drum?)"
 msgstr "підтримки застарілого параметра W не передбачено (маєте /dev/drum?)"
 
-#: ps/parser.c:646 ps/parser.c:913 ps/parser.c:922
+#: ps/parser.c:632 ps/parser.c:899 ps/parser.c:908
 msgid "only one heading option may be specified"
 msgstr "має бути вказано лише один параметр заголовка"
 
-#: ps/parser.c:661
+#: ps/parser.c:647
 msgid "long sort specification must follow 'k'"
 msgstr "після k має бути вказано довгу специфікацію упорядковування"
 
-#: ps/parser.c:689
+#: ps/parser.c:675
 msgid "format specification must follow o"
 msgstr "після o має бути вказано специфікацію формату"
 
-#: ps/parser.c:695
+#: ps/parser.c:681
 msgid "list of process IDs must follow p"
 msgstr "після p має бути вказано список ідентифікаторів процесів"
 
-#: ps/parser.c:753
+#: ps/parser.c:739
 msgid "embedded '-' among BSD options makes no sense"
 msgstr "вбудовування «-» серед параметрів BSD не має сенсу"
 
-#: ps/parser.c:759
+#: ps/parser.c:745
 msgid "unsupported option (BSD syntax)"
 msgstr "непідтримуваний параметр (синтаксис BSD)"
 
-#: ps/parser.c:845 ps/parser.c:857
+#: ps/parser.c:831 ps/parser.c:843
 msgid "unknown gnu long option"
 msgstr "невідомий довгий параметр gnu"
 
-#: ps/parser.c:865
+#: ps/parser.c:851
 msgid "list of real groups must follow --Group"
 msgstr "після --Group має бути вказано список справжніх груп"
 
-#: ps/parser.c:873
+#: ps/parser.c:859
 msgid "list of real users must follow --User"
 msgstr "після --User має бути вказано список справжніх користувачів"
 
-#: ps/parser.c:892
+#: ps/parser.c:878
 msgid "number of columns must follow --cols, --width, or --columns"
 msgstr ""
 "після --cols, --width або --columns має бути вказано кількість стовпчиків"
 
-#: ps/parser.c:895
+#: ps/parser.c:881
 msgid "option --cumulative does not take an argument"
 msgstr "параметру --cumulative не передається жоден аргумент"
 
-#: ps/parser.c:900
+#: ps/parser.c:886
 msgid "option --deselect does not take an argument"
 msgstr "параметру --deselect не передається жоден аргумент"
 
-#: ps/parser.c:912
+#: ps/parser.c:898
 msgid "option --no-heading does not take an argument"
 msgstr "параметру --no-heading не передається жоден аргумент"
 
-#: ps/parser.c:921
+#: ps/parser.c:907
 msgid "option --heading does not take an argument"
 msgstr "параметру --heading не передається жоден аргумент"
 
-#: ps/parser.c:927
+#: ps/parser.c:913
 msgid "option --forest does not take an argument"
 msgstr "параметру --forest не передається жоден аргумент"
 
-#: ps/parser.c:933
+#: ps/parser.c:919
 msgid "format specification must follow --format"
 msgstr "після --format має бути вказано специфікацію формату"
 
-#: ps/parser.c:939
+#: ps/parser.c:925
 msgid "list of effective groups must follow --group"
 msgstr "після --group має бути вказано список ефективних груп"
 
-#: ps/parser.c:957
+#: ps/parser.c:943
 msgid "list of process IDs must follow --pid"
 msgstr "після --pid має бути вказано список ідентифікаторів процесів"
 
-#: ps/parser.c:973
+#: ps/parser.c:959
 msgid "list of process IDs must follow --ppid"
 msgstr "після --ppid має бути вказано список ідентифікаторів процесів"
 
-#: ps/parser.c:991
+#: ps/parser.c:977
 msgid "number of rows must follow --rows or --lines"
 msgstr "після --rows або --lines має бути вказано кількість рядків"
 
-#: ps/parser.c:995
+#: ps/parser.c:981
 msgid "some sid thing(s) must follow --sid"
 msgstr "після --sid має бути вказано щось пов’язане із sid"
 
-#: ps/parser.c:1003
+#: ps/parser.c:989
 msgid "long sort specification must follow --sort"
 msgstr "після --sort має бути вказано довгу специфікацію упорядковування"
 
-#: ps/parser.c:1009
+#: ps/parser.c:995
 msgid "list of ttys must follow --tty"
 msgstr "після --tty має бути вказано список tty"
 
-#: ps/parser.c:1017
+#: ps/parser.c:1003
 msgid "list of effective users must follow --user"
 msgstr "після --user має бути вказано ефективних користувачів"
 
-#: ps/parser.c:1134
+#: ps/parser.c:1119
 msgid "way bad"
 msgstr "погано"
 
-#: ps/parser.c:1148
+#: ps/parser.c:1133
 msgid "garbage option"
 msgstr "зайвий параметр"
 
-#: ps/parser.c:1152
+#: ps/parser.c:1137
 msgid "something broke"
 msgstr "щось поламалося"
 
-#: ps/parser.c:1172
+#: ps/parser.c:1157
 msgid "thread display conflicts with forest display"
 msgstr "показ гілки конфліктує з показом деревоподібної ієрархії"
 
-#: ps/parser.c:1177
+#: ps/parser.c:1162
 msgid "thread flags conflict; can't use H with m or -m"
 msgstr "конфлікт прапорців гілок; не можна використовувати H з m або -m"
 
-#: ps/parser.c:1179
+#: ps/parser.c:1164
 msgid "thread flags conflict; can't use both m and -m"
 msgstr "конфлікт прапорців гілок; не можна використовувати одразу m і -m"
 
-#: ps/parser.c:1181
+#: ps/parser.c:1166
 msgid "thread flags conflict; can't use both -L and -T"
 msgstr "конфлікт прапорців гілок; не можна використовувати одразу -L і -T"
 
-#: ps/parser.c:1255 ps/parser.c:1256
+#: ps/parser.c:1239 ps/parser.c:1240
 #, c-format
 msgid "error: %s\n"
 msgstr "помилка: %s\n"
@@ -1416,136 +1411,136 @@
 msgid "process selection options conflict"
 msgstr "конфлікт параметрів вибору процесів"
 
-#: ps/sortformat.c:107 ps/sortformat.c:112
+#: ps/sortformat.c:106 ps/sortformat.c:111
 msgid "seriously crashing: goodbye cruel world"
 msgstr "серйозна аварія: прощавай, жорстокий світе"
 
-#: ps/sortformat.c:147
+#: ps/sortformat.c:146
 msgid "improper AIX field descriptor"
 msgstr "неналежний дескриптор поля AIX"
 
-#: ps/sortformat.c:168
+#: ps/sortformat.c:167
 msgid "unknown AIX field descriptor"
 msgstr "невідомий дескриптор поля AIX"
 
-#: ps/sortformat.c:173
+#: ps/sortformat.c:172
 msgid "AIX field descriptor processing bug"
 msgstr "вада обробки дескриптора поля AIX"
 
-#: ps/sortformat.c:290
+#: ps/sortformat.c:285
 #, c-format
 msgid "unknown user-defined format specifier \"%s\""
 msgstr "невідомий визначений користувачем специфікатор формату «%s»"
 
-#: ps/sortformat.c:316
+#: ps/sortformat.c:311
 msgid "empty format list"
 msgstr "порожній список форматів"
 
-#: ps/sortformat.c:317
+#: ps/sortformat.c:312
 msgid "improper format list"
 msgstr "неналежний список форматів"
 
-#: ps/sortformat.c:318
+#: ps/sortformat.c:313
 msgid "column widths must be unsigned decimal numbers"
 msgstr "значеннями ширин стовпчиків мають бути додатні десяткові числа"
 
-#: ps/sortformat.c:319
+#: ps/sortformat.c:314
 msgid "can not set width for a macro (multi-column) format specifier"
 msgstr ""
 "не вдалося встановити ширину для специфікатора формату макросу "
 "(багатостовпчикового)"
 
-#: ps/sortformat.c:372 ps/sortformat.c:388
+#: ps/sortformat.c:367 ps/sortformat.c:383
 msgid "improper sort list"
 msgstr "неналежний список упорядковування"
 
-#: ps/sortformat.c:383
+#: ps/sortformat.c:378
 msgid "empty sort list"
 msgstr "порожній список упорядковування"
 
-#: ps/sortformat.c:404 ps/sortformat.c:482 ps/sortformat.c:484
+#: ps/sortformat.c:399 ps/sortformat.c:477 ps/sortformat.c:479
 msgid "unknown sort specifier"
 msgstr "невідомий специфікатор упорядковування"
 
-#: ps/sortformat.c:431 ps/sortformat.c:442 ps/sortformat.c:448
+#: ps/sortformat.c:426 ps/sortformat.c:437 ps/sortformat.c:443
 msgid "bad sorting code"
 msgstr "помилковий код упорядковування"
 
-#: ps/sortformat.c:445
+#: ps/sortformat.c:440
 msgid "PPID sort and forest output conflict"
 msgstr "конфлікт виведення упорядковування PPID та ієрархії"
 
-#: ps/sortformat.c:520
+#: ps/sortformat.c:514
 msgid "option -O can not follow other format options"
 msgstr "після параметра -O не може бути вказано інших параметрів форматування"
 
-#: ps/sortformat.c:527 ps/sortformat.c:545
+#: ps/sortformat.c:521 ps/sortformat.c:539
 msgid "multiple sort options"
 msgstr "варіанти упорядковування"
 
-#: ps/sortformat.c:535
+#: ps/sortformat.c:529
 msgid "option O is neither first format nor sort order"
 msgstr "параметр O не є ні першим форматом, ні упорядковуванням"
 
-#: ps/sortformat.c:662
+#: ps/sortformat.c:656
 msgid "modifier -y without format -l makes no sense"
 msgstr "модифікатор -y без формату -l позбавлений сенсу"
 
-#: ps/sortformat.c:765
+#: ps/sortformat.c:756
 msgid "bug: must reset the list first"
 msgstr "вада: спочатку слід скинути список"
 
-#: ps/sortformat.c:803
+#: ps/sortformat.c:794
 msgid "tell <procps@freelists.org> what you expected"
 msgstr "повідомте за адресою <procps@freelists.org> про очікувані результати"
 
-#: ps/sortformat.c:813
+#: ps/sortformat.c:804
 msgid ""
 "tell <procps@freelists.org> what you want (-L/-T, -m/m/H, and $PS_FORMAT)"
 msgstr ""
 "повідомте за адресою <procps@freelists.org> про очікувані результати (-L/-T, "
 "-m/m/H і $PS_FORMAT)"
 
-#: ps/sortformat.c:830
+#: ps/sortformat.c:821
 #, c-format
 msgid "warning: $PS_FORMAT ignored. (%s)\n"
 msgstr "попередження: $PS_FORMAT проігноровано. (%s)\n"
 
-#: ps/sortformat.c:835 ps/sortformat.c:845
+#: ps/sortformat.c:826 ps/sortformat.c:836
 msgid "conflicting format options"
 msgstr "конфлікт параметрів форматування"
 
-#: ps/sortformat.c:836
+#: ps/sortformat.c:827
 msgid "can not use output modifiers with user-defined output"
 msgstr ""
 "не можна використовувати модифікатори виведення з визначеним користувачем "
 "виведенням"
 
-#: ps/sortformat.c:837
+#: ps/sortformat.c:828
 msgid "-L/-T with H/m/-m and -o/-O/o/O is nonsense"
 msgstr "-L/-T з H/m/-m і -o/-O/o/O позбавлене сенсу"
 
-#: ps/sortformat.c:895
+#: ps/sortformat.c:886
 msgid "internal error: no PID or PPID for -j option"
 msgstr "внутрішня помилка: не вказано PID або PPID для параметра -j"
 
-#: ps/sortformat.c:897
+#: ps/sortformat.c:888
 msgid "lost my PGID"
 msgstr "втрачено наш PGID"
 
-#: ps/sortformat.c:910
+#: ps/sortformat.c:901
 msgid "internal error: no PRI for -c option"
 msgstr "внутрішня помилка: немає PRI для параметра -c"
 
-#: ps/sortformat.c:913
+#: ps/sortformat.c:904
 msgid "lost my CLS"
 msgstr "втрачено наш CLS"
 
-#: ps/sortformat.c:918
+#: ps/sortformat.c:909
 msgid "-T with H/-m/m but no PID for SPID to follow"
 msgstr "-T з H/-m/m, але без PID для використання з SPID"
 
-#: ps/sortformat.c:929
+#: ps/sortformat.c:920
 msgid "-L with H/-m/m but no PID/PGID/SID/SESS for NLWP to follow"
 msgstr "-L з H/-m/m, але немає PID/PGID/SID/SESS для використання з NLWP"
 
@@ -1721,46 +1716,46 @@
 msgid "invalid argument %c"
 msgstr "некоректний аргумент, %c"
 
-#: skill.c:513
+#: skill.c:514
 #, c-format
 msgid "something at line %d\n"
 msgstr "щось у рядку %d\n"
 
-#: skill.c:536
+#: skill.c:537
 #, c-format
 msgid "priority %lu out of range"
 msgstr "рівень пріоритетності %lu лежить поза межами припустимого діапазону"
 
-#: skill.c:649
+#: skill.c:650
 #, c-format
 msgid "invalid pid number %s"
 msgstr "некоректне число pid %s"
 
-#: skill.c:653
+#: skill.c:654
 msgid "error reading reference namespace information"
 msgstr "помилка під час спроби читання даних щодо еталонного простору назв"
 
-#: skill.c:661
+#: skill.c:662
 msgid "invalid namespace list"
 msgstr "некоректний список просторів назв"
 
-#: skill.c:699
+#: skill.c:700
 msgid "no process selection criteria"
 msgstr "немає критерію вибору процесу"
 
-#: skill.c:702
+#: skill.c:703
 msgid "general flags may not be repeated"
 msgstr "не можна повторювати загальні прапорці"
 
-#: skill.c:705
+#: skill.c:706
 msgid "-i makes no sense with -v, -f, and -n"
 msgstr "-i не має сенсу з -v, -f та -n"
 
-#: skill.c:707
+#: skill.c:708
 msgid "-v makes no sense with -i and -f"
 msgstr "-v не має сенсу з -i та -f"
 
-#: skill.c:752
+#: skill.c:753
 #, c-format
 msgid "skill: \"%s\" is not supported\n"
 msgstr "skill: підтримки «%s» не передбачено\n"
@@ -2117,7 +2112,7 @@
 msgstr "Ідентифікатор ефективного користувача"
 
 #. Translation Hint: maximum 'USER' = 7
-#: top/top_nls.c:133 w.c:587
+#: top/top_nls.c:133 w.c:591
 msgid "USER"
 msgstr "КОР."
 
@@ -2441,125 +2436,172 @@
 msgid "Thread Group Id"
 msgstr "Ідентифікатор групи потоку"
 
-#. Translation Hint: maximum 'Adj' = 3
+#. Translation Hint: maximum 'OOMa' = 5
+#: top/top_nls.c:241
+msgid "OOMa"
+msgstr ""
+
 #: top/top_nls.c:242
-msgid "Adj"
-msgstr "Adj"
+msgid "OOMEM Adjustment"
+msgstr ""
 
-#: top/top_nls.c:243
-msgid "oom_adjustment (2^X)"
-msgstr "oom_adjustment (2^X)"
+#. Translation Hint: maximum 'OOMs' = 4
+#: top/top_nls.c:244
+msgid "OOMs"
+msgstr ""
 
-#. Translation Hint: maximum 'Badness' = 7
 #: top/top_nls.c:245
-msgid "Badness"
-msgstr "Badness"
-
-#: top/top_nls.c:246
-msgid "oom_score (badness)"
-msgstr "oom_score (помилковість)"
+msgid "OOMEM Score current"
+msgstr ""
 
 #. Translation Hint: maximum 'ENVIRON' = 7
-#: top/top_nls.c:249
+#: top/top_nls.c:247
 msgid "ENVIRON"
 msgstr "ENVIRON"
 
 #. Translation Hint: the abbreviation 'vars' below is shorthand for
 #. 'variables'
-#: top/top_nls.c:252
+#: top/top_nls.c:250
 msgid "Environment vars"
 msgstr "Змінні середовища"
 
 #. Translation Hint: maximum 'vMj' = 3
-#: top/top_nls.c:254
+#: top/top_nls.c:252
 msgid "vMj"
 msgstr "vMj"
 
-#: top/top_nls.c:255
+#: top/top_nls.c:253
 msgid "Major Faults delta"
 msgstr "Приріст основних помилок"
 
 #. Translation Hint: maximum 'vMn' = 3
-#: top/top_nls.c:257
+#: top/top_nls.c:255
 msgid "vMn"
 msgstr "vMn"
 
-#: top/top_nls.c:258
+#: top/top_nls.c:256
 msgid "Minor Faults delta"
 msgstr "Приріст вторинних помилок"
 
 #. Translation Hint: maximum 'USED' = 4
-#: top/top_nls.c:260
+#: top/top_nls.c:258
 msgid "USED"
 msgstr "USED"
 
-#: top/top_nls.c:261
+#: top/top_nls.c:259
 msgid "Res+Swap Size (KiB)"
 msgstr "Розмір Res+Swap (у КіБ)"
 
 #. Translation Hint: maximum 'nsIPC' = 7
-#: top/top_nls.c:263
+#: top/top_nls.c:261
 msgid "nsIPC"
 msgstr "nsIPC"
 
-#: top/top_nls.c:264
+#: top/top_nls.c:262
 msgid "IPC namespace Inode"
 msgstr "Inode простору назв IPC"
 
 #. Translation Hint: maximum 'nsMNT' = 7
-#: top/top_nls.c:266
+#: top/top_nls.c:264
 msgid "nsMNT"
 msgstr "nsMNT"
 
-#: top/top_nls.c:267
+#: top/top_nls.c:265
 msgid "MNT namespace Inode"
 msgstr "Inode простору назв MNT"
 
 #. Translation Hint: maximum 'nsNET' = 7
-#: top/top_nls.c:269
+#: top/top_nls.c:267
 msgid "nsNET"
 msgstr "nsNET"
 
-#: top/top_nls.c:270
+#: top/top_nls.c:268
 msgid "NET namespace Inode"
 msgstr "Inode простору назв NET"
 
 #. Translation Hint: maximum 'nsPID' = 7
-#: top/top_nls.c:272
+#: top/top_nls.c:270
 msgid "nsPID"
 msgstr "nsPID"
 
-#: top/top_nls.c:273
+#: top/top_nls.c:271
 msgid "PID namespace Inode"
 msgstr "Inode простору назв PID"
 
 #. Translation Hint: maximum 'nsUSER' = 7
-#: top/top_nls.c:275
+#: top/top_nls.c:273
 msgid "nsUSER"
 msgstr "nsUSER"
 
-#: top/top_nls.c:276
+#: top/top_nls.c:274
 msgid "USER namespace Inode"
 msgstr "Inode простору назв USER"
 
 #. Translation Hint: maximum 'nsUTS' = 7
-#: top/top_nls.c:278
+#: top/top_nls.c:276
 msgid "nsUTS"
 msgstr "nsUTS"
 
-#: top/top_nls.c:279
+#: top/top_nls.c:277
 msgid "UTS namespace Inode"
 msgstr "Inode простору назв UTS"
 
 #. Translation Hint: maximum 'LXC' = 7
-#: top/top_nls.c:281
+#: top/top_nls.c:279
 msgid "LXC"
 msgstr ""
 
-#: top/top_nls.c:282
+#: top/top_nls.c:280
 msgid "LXC container name"
 msgstr ""
 
+#. Translation Hint: maximum 'RSan' = 4
+#: top/top_nls.c:282
+msgid "RSan"
+msgstr ""
+
+#: top/top_nls.c:283
+msgid "RES Anonymous (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'RSfd' = 4
+#: top/top_nls.c:285
+msgid "RSfd"
+msgstr ""
+
+#: top/top_nls.c:286
+msgid "RES File-based (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'RSlk' = 4
+#: top/top_nls.c:288
+msgid "RSlk"
+msgstr ""
+
+#: top/top_nls.c:289
+msgid "RES Locked (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'RSsh' = 4
+#: top/top_nls.c:291
+msgid "RSsh"
+msgstr ""
+
+#: top/top_nls.c:292
+#, fuzzy
+msgid "RES Shared (KiB)"
+msgstr "Спільна пам’ять (КіБ)"
+
+#. Translation Hint: maximum 'CGNAME' = 7
+#: top/top_nls.c:294
+msgid "CGNAME"
+msgstr ""
+
+#: top/top_nls.c:295
+#, fuzzy
+msgid "Control Group name"
+msgstr "Групи керування"
+
 #. Translation Notes ------------------------------------------------
 #. .  It is strongly recommend that the --no-wrap command line option
 #. .  be used with all supporting translation tools, when available.
@@ -2570,7 +2612,7 @@
 #. .  and should not be translated without also making corresponding
 #. .  c-code logic changes.
 #. .
-#: top/top_nls.c:302
+#: top/top_nls.c:315
 #, c-format
 msgid ""
 "\tsignal %d (%s) was caught by %s, please\n"
@@ -2579,7 +2621,7 @@
 "\t%3$s отримано сигнал %1$d (%2$s). Будь ласка,\n"
 "\tдив. http://www.debian.org/Bugs/Reporting\n"
 
-#: top/top_nls.c:305
+#: top/top_nls.c:318
 #, c-format
 msgid ""
 "inappropriate '%s'\n"
@@ -2590,7 +2632,7 @@
 "Користування:\n"
 "  %s%s"
 
-#: top/top_nls.c:308
+#: top/top_nls.c:321
 #, c-format
 msgid ""
 "  %s\n"
@@ -2601,47 +2643,47 @@
 "Користування:\n"
 "  %s%s"
 
-#: top/top_nls.c:311
+#: top/top_nls.c:324
 #, c-format
 msgid "failed /proc/stat open: %s"
 msgstr "не вдалося відкрити /proc/stat: %s"
 
-#: top/top_nls.c:312
+#: top/top_nls.c:325
 #, c-format
 msgid "failed openproc: %s"
 msgstr "помилка openproc: %s"
 
-#: top/top_nls.c:313
+#: top/top_nls.c:326
 #, c-format
 msgid "bad delay interval '%s'"
 msgstr "помилковий інтервал затримки, «%s»"
 
-#: top/top_nls.c:314
+#: top/top_nls.c:327
 #, c-format
 msgid "bad iterations argument '%s'"
 msgstr "помилковий аргумент ітерацій, «%s»"
 
-#: top/top_nls.c:315
+#: top/top_nls.c:328
 #, c-format
 msgid "pid limit (%d) exceeded"
 msgstr "перевищено обмеження pid (%d)"
 
-#: top/top_nls.c:316
+#: top/top_nls.c:329
 #, c-format
 msgid "bad pid '%s'"
 msgstr "помилковий pid, «%s»"
 
-#: top/top_nls.c:317
+#: top/top_nls.c:330
 #, c-format
 msgid "-%c requires argument"
 msgstr "-%c потребує аргументу"
 
-#: top/top_nls.c:318
+#: top/top_nls.c:331
 #, c-format
 msgid "bad width arg '%s'"
 msgstr "помилковий аргумент ширини, «%s»"
 
-#: top/top_nls.c:319
+#: top/top_nls.c:332
 #, c-format
 msgid ""
 "unknown option '%c'\n"
@@ -2652,317 +2694,317 @@
 "Користування:\n"
 "  %s%s"
 
-#: top/top_nls.c:322
+#: top/top_nls.c:335
 msgid "-d disallowed in \"secure\" mode"
 msgstr "-d заборонено використовувати у режимі «secure»"
 
-#: top/top_nls.c:323
+#: top/top_nls.c:336
 msgid "-d requires positive argument"
 msgstr "-d потребує додатного аргументу"
 
-#: top/top_nls.c:324
+#: top/top_nls.c:337
 msgid "On"
 msgstr "Увімкнено"
 
-#: top/top_nls.c:325
+#: top/top_nls.c:338
 msgid "Off"
 msgstr "Вимкнено"
 
 #. Translation Hint: Only the following words should be translated
 #. .                 secs (seconds), max (maximum), user, field, cols (columns)
-#: top/top_nls.c:328
+#: top/top_nls.c:341
 msgid " -hv | -bcHiOSs -d secs -n max -u|U user -p pid(s) -o field -w [cols]"
 msgstr ""
 " -hv | -bcHiOSs -d сек. -n макс. -u|U користувач -p pid -o поле -w "
 "[стовпчики]"
 
-#: top/top_nls.c:329
+#: top/top_nls.c:342
 msgid "failed /proc/stat read"
 msgstr "помилка читання /proc/stat"
 
-#: top/top_nls.c:330
+#: top/top_nls.c:343
 #, c-format
 msgid "Forest mode %s"
 msgstr "Режим лісу %s"
 
-#: top/top_nls.c:331
+#: top/top_nls.c:344
 msgid "failed tty get"
 msgstr "помилка отримання tty"
 
-#: top/top_nls.c:332
+#: top/top_nls.c:345
 #, c-format
 msgid "failed tty set: %s"
 msgstr "помилка встановлення tty: %s"
 
-#: top/top_nls.c:333
+#: top/top_nls.c:346
 msgid "Choose field group (1 - 4)"
 msgstr "Вибір групи поля (1 - 4)"
 
-#: top/top_nls.c:334
+#: top/top_nls.c:347
 msgid "Command disabled, 'A' mode required"
 msgstr "Команду вимкнено, потрібен режим «A»"
 
-#: top/top_nls.c:335
+#: top/top_nls.c:348
 #, c-format
 msgid "Command disabled, activate %s with '-' or '_'"
 msgstr "Команду вимкнено, задійте %s за допомогою «-» або «_»"
 
-#: top/top_nls.c:336
+#: top/top_nls.c:349
 msgid "No colors to map!"
 msgstr "Немає кольорів для прив’язки!"
 
-#: top/top_nls.c:337
+#: top/top_nls.c:350
 #, c-format
 msgid "Failed '%s' open: %s"
 msgstr "Не вдалося виконати відкриття «%s»: %s"
 
-#: top/top_nls.c:338
+#: top/top_nls.c:351
 #, c-format
 msgid "Wrote configuration to '%s'"
 msgstr "Записано налаштування до «%s»"
 
-#: top/top_nls.c:339
+#: top/top_nls.c:352
 #, c-format
 msgid "Change delay from %.1f to"
 msgstr "Змінити затримку з %.1f на"
 
-#: top/top_nls.c:340
+#: top/top_nls.c:353
 #, c-format
 msgid "Show threads %s"
 msgstr "Вивести потоки %s"
 
-#: top/top_nls.c:341
+#: top/top_nls.c:354
 #, c-format
 msgid "Irix mode %s"
 msgstr "Режим Irix %s"
 
-#: top/top_nls.c:342
+#: top/top_nls.c:355
 #, c-format
 msgid "PID to signal/kill [default pid = %d]"
 msgstr "PID для надсилання сигналу або завершення [типовий pid = %d]"
 
-#: top/top_nls.c:343
+#: top/top_nls.c:356
 #, c-format
 msgid "Send pid %d signal [%d/sigterm]"
 msgstr "Надіслати сигнал pid %d [%d/sigterm]"
 
-#: top/top_nls.c:344
+#: top/top_nls.c:357
 #, c-format
 msgid "Failed signal pid '%d' with '%d': %s"
 msgstr "Помилка сигналу pid «%d» з «%d»: %s"
 
-#: top/top_nls.c:345
+#: top/top_nls.c:358
 msgid "Invalid signal"
 msgstr "Некоректний сигнал"
 
-#: top/top_nls.c:346
+#: top/top_nls.c:359
 #, c-format
 msgid "PID to renice [default pid = %d]"
 msgstr "PID для зміни уподобаності [типовий pid = %d]"
 
-#: top/top_nls.c:347
+#: top/top_nls.c:360
 #, c-format
 msgid "Renice PID %d to value"
 msgstr "Змінити уподобаність PID %d до значення"
 
-#: top/top_nls.c:348
+#: top/top_nls.c:361
 #, c-format
 msgid "Failed renice of PID %d to %d: %s"
 msgstr "Не вдалося змінити уподобаність PID %d на %d: %s"
 
-#: top/top_nls.c:349
+#: top/top_nls.c:362
 #, c-format
 msgid "Rename window '%s' to (1-3 chars)"
 msgstr "Перейменувати вікно «%s» (1-3 символи)"
 
-#: top/top_nls.c:350
+#: top/top_nls.c:363
 #, c-format
 msgid "Cumulative time %s"
 msgstr "Накопичений час %s"
 
-#: top/top_nls.c:351
+#: top/top_nls.c:364
 #, c-format
 msgid "Maximum tasks = %d, change to (0 is unlimited)"
 msgstr "Максимальна кількість завдань = %d, змінити (0 — не обмежувати)"
 
-#: top/top_nls.c:352
+#: top/top_nls.c:365
 msgid "Invalid maximum"
 msgstr "Некоректний максимум"
 
-#: top/top_nls.c:353
+#: top/top_nls.c:366
 msgid "Which user (blank for all)"
 msgstr "Користувач (порожнє значення — усі)"
 
-#: top/top_nls.c:354
+#: top/top_nls.c:367
 msgid "Unknown command - try 'h' for help"
 msgstr "Невідома команда. Скористайтеся «h» для отримання довідки."
 
-#: top/top_nls.c:355
+#: top/top_nls.c:368
 #, c-format
 msgid "scroll coordinates: y = %d/%%d (tasks), x = %d/%d (fields)"
 msgstr "координати гортання: y = %d/%%d (завдання), x = %d/%d (поля)"
 
-#: top/top_nls.c:356
+#: top/top_nls.c:369
 msgid "failed memory allocate"
 msgstr "не вдалося розмістити у пам’яті"
 
-#: top/top_nls.c:357
+#: top/top_nls.c:370
 msgid "failed memory re-allocate"
 msgstr "не вдалося повторно розмістити у пам’яті"
 
-#: top/top_nls.c:358
+#: top/top_nls.c:371
 msgid "Unacceptable floating point"
 msgstr "Неприйнятна рухома крапка"
 
-#: top/top_nls.c:359
+#: top/top_nls.c:372
 msgid "Invalid user"
 msgstr "Некоректний користувач"
 
-#: top/top_nls.c:360
+#: top/top_nls.c:373
 msgid "forest view"
 msgstr "перегляд лісу"
 
-#: top/top_nls.c:361
+#: top/top_nls.c:374
 msgid "failed pid maximum size test"
 msgstr "не вдалося пройти перевірку на максимальний розмір pid"
 
-#: top/top_nls.c:362
+#: top/top_nls.c:375
 msgid "failed number of cpus test"
 msgstr "не вдалося пройти перевірку на кількість процесорів"
 
-#: top/top_nls.c:363
+#: top/top_nls.c:376
 #, c-format
 msgid "incompatible rcfile, you should delete '%s'"
 msgstr "несумісний файл rc, вам слід вилучити «%s»"
 
-#: top/top_nls.c:364
+#: top/top_nls.c:377
 #, c-format
 msgid "window entry #%d corrupt, please delete '%s'"
 msgstr "запис вікна %d пошкоджено, будь ласка, вилучіть «%s»"
 
-#: top/top_nls.c:365
+#: top/top_nls.c:378
 msgid "Unavailable in secure mode"
 msgstr "Недоступне у захищеному режимі"
 
-#: top/top_nls.c:366
+#: top/top_nls.c:379
 msgid "Only 1 cpu detected"
 msgstr "Виявлено лише 1 процесор"
 
-#: top/top_nls.c:367
+#: top/top_nls.c:380
 msgid "Unacceptable integer"
 msgstr "Неприйнятне ціле число"
 
-#: top/top_nls.c:368
+#: top/top_nls.c:381
 msgid "conflicting process selections (U/p/u)"
 msgstr "конфлікт вибору процесів (U/p/u)"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 kibibytes (1024 bytes)
-#: top/top_nls.c:371
+#: top/top_nls.c:384
 msgid "KiB"
 msgstr "КіБ"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 mebibytes (1,048,576 bytes)
-#: top/top_nls.c:374
+#: top/top_nls.c:387
 msgid "MiB"
 msgstr "МіБ"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 gibibytes (1,073,741,824 bytes)
-#: top/top_nls.c:377
+#: top/top_nls.c:390
 msgid "GiB"
 msgstr "ГіБ"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 tebibytes (1,099,511,627,776 bytes)
-#: top/top_nls.c:380
+#: top/top_nls.c:393
 msgid "TiB"
 msgstr "ТіБ"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 pebibytes (1,024 tebibytes)
-#: top/top_nls.c:383
+#: top/top_nls.c:396
 msgid "PiB"
 msgstr "ПіБ"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 exbibytes (1,024 pebibytes)
-#: top/top_nls.c:386
+#: top/top_nls.c:399
 msgid "EiB"
 msgstr "ЕіБ"
 
-#: top/top_nls.c:387
+#: top/top_nls.c:400
 msgid "Threads"
 msgstr "Потоки"
 
-#: top/top_nls.c:388
+#: top/top_nls.c:401
 msgid "Tasks"
 msgstr "Завдання"
 
 #. Translation Hint: The following "word" is meant to represent either a single
 #. .                 cpu or all of the processors in a multi-processor computer
 #. .                 (should be exactly 6 characters, not counting the colon)
-#: top/top_nls.c:392
+#: top/top_nls.c:405
 msgid "Cpu(s):"
 msgstr "Процесор:"
 
 #. Translation Hint: The following "word" is meant to represent a single processor
 #. .                 (should be exactly 3 characters)
-#: top/top_nls.c:395
+#: top/top_nls.c:408
 #, c-format
 msgid "Cpu%-3d:"
 msgstr "Проц%-3d:"
 
 #. Translation Hint: The following word "another" must have 1 trailing space
-#: top/top_nls.c:397
+#: top/top_nls.c:410
 msgid "another "
 msgstr "інші "
 
-#: top/top_nls.c:398
+#: top/top_nls.c:411
 msgid "Locate next inactive, use \"L\""
 msgstr "Знайти наступний неактивний, скористайтеся «L»"
 
-#: top/top_nls.c:399
+#: top/top_nls.c:412
 msgid "Locate string"
 msgstr "Знайти рядок"
 
-#: top/top_nls.c:400
+#: top/top_nls.c:413
 #, c-format
 msgid "%s\"%s\" not found"
 msgstr "%s«%s» не знайдено"
 
-#: top/top_nls.c:401
+#: top/top_nls.c:414
 #, c-format
 msgid "width incr is %d, change to (0 default, -1 auto)"
 msgstr "крок збільшення ширини, %d, змінити (0 — типовий, -1 — автоматичний)"
 
-#: top/top_nls.c:402
+#: top/top_nls.c:415
 msgid "Overwrite existing obsolete/corrupted rcfile?"
 msgstr "Перезаписати наявний застарілий або пошкоджений файл rc?"
 
-#: top/top_nls.c:403
+#: top/top_nls.c:416
 #, c-format
 msgid "unrecognized field name '%s'"
 msgstr "нерозпізнана назва поля, «%s»"
 
-#: top/top_nls.c:404
+#: top/top_nls.c:417
 msgid "even using field names only, window is now too small"
 msgstr "навіть за використання лише назв полів, вікно є зараз надто малим"
 
-#: top/top_nls.c:406
+#: top/top_nls.c:419
 msgid "Open Files"
 msgstr "Відкрити файли"
 
-#: top/top_nls.c:407
+#: top/top_nls.c:420
 msgid "NUMA Info"
 msgstr "Дані щодо NUMA"
 
-#: top/top_nls.c:408
+#: top/top_nls.c:421
 msgid "Log"
 msgstr "Журнал"
 
-#: top/top_nls.c:409
+#: top/top_nls.c:422
 msgid ""
 "the '=' key will eventually show the actual file read or command(s) "
 "executed ..."
@@ -2970,11 +3012,11 @@
 "нарешті, ключ «=» покаже справжнє читання даних з файла або виконану "
 "команду..."
 
-#: top/top_nls.c:410
+#: top/top_nls.c:423
 msgid "demo"
 msgstr "демо"
 
-#: top/top_nls.c:411
+#: top/top_nls.c:424
 #, c-format
 msgid ""
 "This is simulated output representing the contents of some file or the "
@@ -3069,103 +3111,103 @@
 "\n"
 "Приємного користування!\n"
 
-#: top/top_nls.c:443
+#: top/top_nls.c:456
 msgid "to enable 'Y' press <Enter> then type 'W' and restart top"
 msgstr ""
 "щоб увімкнути «Y», натисніть <Enter>, потім введіть «W» і перезапустіть top"
 
-#: top/top_nls.c:445
+#: top/top_nls.c:458
 msgid "to enable 'Y' please consult the top man page (press Enter)"
 msgstr ""
 "щоб увімкнути «Y», будь ласка, ознайомтеся зі сторінкою підручника з top "
 "(натисніть Enter)"
 
-#: top/top_nls.c:447
+#: top/top_nls.c:460
 #, c-format
 msgid "Selection failed with: %s\n"
 msgstr "Помилка вибору: %s\n"
 
-#: top/top_nls.c:448
+#: top/top_nls.c:461
 #, c-format
 msgid "unable to inspect, pid %d not found"
 msgstr "не вдалося виконати інспекцію, pid %d не знайдено"
 
-#: top/top_nls.c:449
+#: top/top_nls.c:462
 #, c-format
 msgid "inspect at PID [default pid = %d]"
 msgstr "виконати інспекцію PID [типовий pid = %d]"
 
-#: top/top_nls.c:450
+#: top/top_nls.c:463
 #, c-format
 msgid "%s: %*d-%-*d lines, %*d-%*d columns, %lu bytes read"
 msgstr "%s: %*d-%-*d рядків, %*d-%*d стовпчиків, прочитано %lu байтів"
 
-#: top/top_nls.c:451
+#: top/top_nls.c:464
 msgid "patience please, working..."
 msgstr "зачекайте, будь ласка, виконуємо обробку..."
 
 #. Translation Hint: Below are 2 abbreviations which can be as long as needed:
 #. .                 FLD = FIELD, VAL = VALUE
-#: top/top_nls.c:454
+#: top/top_nls.c:467
 #, c-format
 msgid "add filter #%d (%s) as: [!]FLD?VAL"
 msgstr "додати фільтрування %d (%s) у форматі: [!]ПОЛЕ?ЗНАЧЕННЯ"
 
-#: top/top_nls.c:455
+#: top/top_nls.c:468
 msgid "ignoring case"
 msgstr "не враховувати регістр"
 
-#: top/top_nls.c:456
+#: top/top_nls.c:469
 msgid "case sensitive"
 msgstr "з врахуванням регістру"
 
-#: top/top_nls.c:457
+#: top/top_nls.c:470
 msgid "duplicate filter was ignored"
 msgstr "дублікат фільтра проігноровано"
 
-#: top/top_nls.c:458
+#: top/top_nls.c:471
 #, c-format
 msgid "'%s' filter delimiter is missing"
 msgstr "не вистачає роздільника фільтрування «%s»"
 
-#: top/top_nls.c:459
+#: top/top_nls.c:472
 #, c-format
 msgid "'%s' filter value is missing"
 msgstr "не вистачає значення фільтрування «%s»"
 
-#: top/top_nls.c:460
+#: top/top_nls.c:473
 msgid "include"
 msgstr "включити"
 
-#: top/top_nls.c:461
+#: top/top_nls.c:474
 msgid "exclude"
 msgstr "виключити"
 
-#: top/top_nls.c:462
+#: top/top_nls.c:475
 #, c-format
 msgid "<Enter> to resume, filters: %s"
 msgstr "<Enter>, щоб поновити, фільтри: %s"
 
-#: top/top_nls.c:463
+#: top/top_nls.c:476
 msgid "none"
 msgstr "немає"
 
 #. Translation Hint: The following word 'Node' should be exactly 4 characters
-#: top/top_nls.c:465
+#: top/top_nls.c:478
 #, c-format
 msgid "Node%-2d:"
 msgstr "Вузол%-2d:"
 
-#: top/top_nls.c:466
+#: top/top_nls.c:479
 #, c-format
 msgid "expand which node (0-%d)"
 msgstr "вузол для розгортання (0-%d)"
 
-#: top/top_nls.c:467
+#: top/top_nls.c:480
 msgid "invalid node"
 msgstr "некоректний вузол"
 
-#: top/top_nls.c:468
+#: top/top_nls.c:481
 msgid "sorry, NUMA extensions unavailable"
 msgstr "вибачте, немає доступу до розширень NUMA"
 
@@ -3173,11 +3215,11 @@
 #. .                 'Swap' represents the linux swap file --
 #. .                 please make both translations exactly 4 characters,
 #. .                 padding with extra spaces as necessary
-#: top/top_nls.c:473
+#: top/top_nls.c:486
 msgid "Mem "
 msgstr "Пам "
 
-#: top/top_nls.c:474
+#: top/top_nls.c:487
 msgid "Swap"
 msgstr "Своп"
 
@@ -3205,7 +3247,7 @@
 #. .  please see the prologue to the show_special function in the top.c
 #. .  source file.
 #. .
-#: top/top_nls.c:508
+#: top/top_nls.c:521
 #, c-format
 msgid ""
 "Help for Interactive Commands~2 - %s\n"
@@ -3287,7 +3329,7 @@
 #. Translation Hint: As is true for the text above, the "keys" shown to the left and
 #. .                 also imbedded in the translatable text (along with escape seqs)
 #. .                 should never themselves be translated.
-#: top/top_nls.c:536
+#: top/top_nls.c:549
 msgid ""
 "  k,r       Manipulate tasks: '~1k~2' kill; '~1r~2' renice\n"
 "  d or s    Set update interval\n"
@@ -3296,7 +3338,7 @@
 "пріоритетність\n"
 "  d або s   Встановити інтервал оновлення\n"
 
-#: top/top_nls.c:540
+#: top/top_nls.c:553
 #, c-format
 msgid ""
 "Help for Windows / Field Groups~2 - \"Current Window\" = ~1 %s ~6\n"
@@ -3404,7 +3446,7 @@
 #. .     --> "   0~2 = black,~1  1~2 = red,    ~1  2~2 = gree
 #. .     --> "   4~2 = blue, ~1  5~2 = magenta,~1  6~2 = cyan
 #. .
-#: top/top_nls.c:590
+#: top/top_nls.c:603
 #, c-format
 msgid ""
 "Help for color mapping~2 - %s\n"
@@ -3466,7 +3508,7 @@
 "   a або w — внести зміни і перейти до внесення інших змін, <Enter> — внести "
 "зміни і завершити "
 
-#: top/top_nls.c:616
+#: top/top_nls.c:629
 #, c-format
 msgid ""
 "Fields Management~2 for window ~1%s~6, whose current sort field is ~1%s~2\n"
@@ -3480,7 +3522,7 @@
 "   «d» або <Пробіл> перемикає показ, «s» встановлює упорядкування.\n"
 "   Щоб завершити роботу, скористайтеся «q» або <Esc>!\n"
 
-#: top/top_nls.c:621
+#: top/top_nls.c:634
 #, c-format
 msgid ""
 "%s:~3 %3u ~2total,~3 %3u ~2running,~3 %3u ~2sleeping,~3 %3u ~2stopped,~3 %3u "
@@ -3489,7 +3531,7 @@
 "%s:~3 %3u ~2загалом,~3 %3u ~2працює,~3 %3u ~2приспано,~3 %3u ~2зупинено,~3 "
 "%3u ~2зомбі~3\n"
 
-#: top/top_nls.c:624
+#: top/top_nls.c:637
 #, c-format
 msgid ""
 "%%%s~3 %#5.1f  ~2user,~3 %#5.1f  ~2system,~3 %#5.1f  ~2nice,~3 %#5.1f  "
@@ -3498,7 +3540,7 @@
 "%%%s~3 %#5.1f  ~2кор.,~3 %#5.1f  ~2система,~3 %#5.1f  ~2упод.,~3 %#5.1f  "
 "~2безд.~3\n"
 
-#: top/top_nls.c:627
+#: top/top_nls.c:640
 #, c-format
 msgid ""
 "%%%s~3 %#5.1f  ~2user,~3 %#5.1f  ~2system,~3 %#5.1f  ~2nice,~3 %#5.1f  "
@@ -3510,7 +3552,7 @@
 #. Translation Hint: Only the following abbreviations need be translated
 #. .                 us = user, sy = system, ni = nice, id = idle, wa = wait,
 #. .                 hi hardware interrupt, si = software interrupt
-#: top/top_nls.c:633
+#: top/top_nls.c:646
 #, c-format
 msgid ""
 "%%%s~3 %#5.1f ~2us,~3 %#5.1f ~2sy,~3 %#5.1f ~2ni,~3 %#5.1f ~2id,~3 %#5.1f "
@@ -3522,7 +3564,7 @@
 #. Translation Hint: Only the following abbreviations need be translated
 #. .                 us = user, sy = system, ni = nice, id = idle, wa = wait,
 #. .                 hi hardware interrupt, si = software interrupt, st = steal time
-#: top/top_nls.c:639
+#: top/top_nls.c:652
 #, c-format
 msgid ""
 "%%%s~3%#5.1f ~2us,~3%#5.1f ~2sy,~3%#5.1f ~2ni,~3%#5.1f ~2id,~3%#5.1f ~2wa,"
@@ -3531,7 +3573,7 @@
 "%%%s~3%#5.1f ~2us,~3%#5.1f ~2sy,~3%#5.1f ~2ni,~3%#5.1f ~2id,~3%#5.1f ~2wa,"
 "~3%#5.1f ~2hi,~3%#5.1f ~2si,~3%#5.1f ~2st~3\n"
 
-#: top/top_nls.c:642
+#: top/top_nls.c:655
 #, c-format
 msgid ""
 "%s %s:~3 %9.9s~2total,~3 %9.9s~2free,~3 %9.9s~2used,~3 %9.9s~2buff/cache~3\n"
@@ -3540,7 +3582,7 @@
 "%s %s:~3 %9.9s~2загал,~3 %9.9s~2вільн,~3 %9.9s~2вик,~3 %9.9s~2буф/кеш~3\n"
 "%s %s:~3 %9.9s~2загал,~3 %9.9s~2вільн,~3 %9.9s~2вик.~3 %9.9s~2дост %s~3\n"
 
-#: top/top_nls.c:646
+#: top/top_nls.c:659
 #, fuzzy, c-format
 msgid ""
 "Inspection~2 Pause at: pid ~1%d~6, running ~1%s~6\n"
@@ -3553,7 +3595,7 @@
 "для ~1завершення~5 !\n"
 "Пункти~2: ~1%s\n"
 
-#: top/top_nls.c:651
+#: top/top_nls.c:664
 #, fuzzy, c-format
 msgid ""
 "Inspection~2 View at pid: ~1%s~3, running ~1%s~3.  Locating: ~1%s~6\n"
@@ -4117,97 +4159,102 @@
 msgid " -v, --version  output version information and exit\n"
 msgstr " -v, --version  вивести інформацію про версію та вийти\n"
 
-#: watch.c:376
+#: watch.c:384
 #, c-format
 msgid "Every %.1fs: "
 msgstr "Кожні %.1f с: "
 
-#: watch.c:437
+#: watch.c:385
+#, c-format
+msgid "%s: %s"
+msgstr ""
+
+#: watch.c:456
 msgid "unable to create IPC pipes"
 msgstr "не вдалося створити канали IPC"
 
-#: watch.c:447
+#: watch.c:466
 msgid "unable to fork process"
 msgstr "не вдалося розгалузити процес"
 
-#: watch.c:452
+#: watch.c:471
 msgid "dup2 failed"
 msgstr "помилка dup2"
 
-#: watch.c:459
+#: watch.c:478
 #, c-format
 msgid "unable to execute '%s'"
 msgstr "не вдалося виконати «%s»"
 
-#: watch.c:476
+#: watch.c:495
 msgid "fdopen"
 msgstr "fdopen"
 
-#: watch.c:622
+#: watch.c:641
 msgid "waitpid"
 msgstr "waitpid"
 
-#: watch.c:630
+#: watch.c:649
 msgid "command exit with a non-zero status, press a key to exit"
 msgstr ""
 "виконання команди завершено з ненульовим повідомлення щодо стану, натисніть "
 "клавішу, щоб завершити роботу"
 
-#: watch.c:755
+#: watch.c:773
 #, c-format
 msgid "unicode handling error\n"
 msgstr "помилка обробки unicode\n"
 
-#: watch.c:761
+#: watch.c:779
 #, c-format
 msgid "unicode handling error (malloc)\n"
 msgstr "помилка обробки unicode (malloc)\n"
 
-#: w.c:241 w.c:256
+#: w.c:245 w.c:260
 #, c-format
 msgid " %2ludays"
 msgstr " %2lu днів"
 
 #. Translation Hint: Minutes:Seconds
 #. Translation Hint: Hours:Minutes
-#: w.c:250 w.c:260
+#: w.c:254 w.c:264
 #, c-format
 msgid " %2lu:%02um"
 msgstr " %2lu:%02um"
 
 #. Translation Hint: Seconds:Centiseconds
-#: w.c:268
+#: w.c:272
 #, c-format
 msgid " %2lu.%02us"
 msgstr " %2lu,%02us"
 
-#: w.c:451
+#: w.c:455
 msgid " -h, --no-header     do not print header\n"
 msgstr " -h, --no-header     не виводити заголовок\n"
 
-#: w.c:452
+#: w.c:456
 msgid " -u, --no-current    ignore current process username\n"
 msgstr " -u, --no-current    ігнорувати ім’я користувача поточного процесу\n"
 
-#: w.c:453
+#: w.c:457
 msgid " -s, --short         short format\n"
 msgstr " -s, --short         скорочений формат\n"
 
-#: w.c:454
+#: w.c:458
 msgid " -f, --from          show remote hostname field\n"
 msgstr " -f, --from          вивести поле назви віддаленого вузла\n"
 
-#: w.c:455
+#: w.c:459
 msgid " -o, --old-style     old style output\n"
 msgstr " -o, --old-style     виведення даних у застарілому форматі\n"
 
-#: w.c:456
+#: w.c:460
 msgid ""
 " -i, --ip-addr       display IP address instead of hostname (if possible)\n"
 msgstr ""
 " -i, --ip-addr       виводити IP-адресу замість назви вузла (якщо можна)\n"
 
-#: w.c:553
+#: w.c:557
 #, c-format
 msgid ""
 "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n"
@@ -4215,7 +4262,7 @@
 "Значення довжини для середовища користувача, PROCPS_USERLEN, має належати "
 "діапазону від 8 до %i, ігноруємо.\n"
 
-#: w.c:563
+#: w.c:567
 #, c-format
 msgid ""
 "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n"
@@ -4225,21 +4272,21 @@
 
 #. Translation Hint: Following five uppercase messages are
 #. * headers. Try to keep alignment intact.
-#: w.c:587
+#: w.c:591
 #, c-format
 msgid "%-*s TTY      "
 msgstr "%-*s TTY      "
 
-#: w.c:589
+#: w.c:593
 msgid "FROM"
 msgstr "З"
 
-#: w.c:591
+#: w.c:595
 #, c-format
 msgid "  LOGIN@   IDLE   JCPU   PCPU WHAT\n"
 msgstr "  LOGIN@   IDLE   JCPU   PCPU WHAT\n"
 
-#: w.c:593
+#: w.c:597
 #, c-format
 msgid "   IDLE WHAT\n"
 msgstr "   IDLE WHAT\n"
@@ -4286,12 +4333,27 @@
 msgid "%s from %s\n"
 msgstr "%s з %s\n"
 
+#~ msgid "seconds argument `%s' failed"
+#~ msgstr "помилка аргументу секунд, «%s»"
+
 #~ msgid "alternate System.map file must follow -n"
 #~ msgstr "після -n має бути вказано альтернативний файл System.map"
 
 #~ msgid "alternate System.map file must follow N"
 #~ msgstr "після N має бути вказано альтернативний файл System.map"
 
+#~ msgid "Adj"
+#~ msgstr "Adj"
+
+#~ msgid "oom_adjustment (2^X)"
+#~ msgstr "oom_adjustment (2^X)"
+
+#~ msgid "Badness"
+#~ msgstr "Badness"
+
+#~ msgid "oom_score (badness)"
+#~ msgstr "oom_score (помилковість)"
+
 #~ msgid "%d column window is too narrow"
 #~ msgstr "вікно у %d стовпчиків є надто вузьким"
 
Binary files /tmp/tmpsmX0gC/RRPDCxm9wk/procps-3.3.11/po/vi.gmo and /tmp/tmpsmX0gC/hzIsJzyyeF/procps-3.3.12/po/vi.gmo differ
diff -Nru procps-3.3.11/po/vi.po procps-3.3.12/po/vi.po
--- procps-3.3.11/po/vi.po	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/po/vi.po	2016-07-10 06:40:26.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: procps-ng 3.3.10-rc1\n"
 "Report-Msgid-Bugs-To: procps@freelists.org\n"
-"POT-Creation-Date: 2015-08-09 15:59+1000\n"
+"POT-Creation-Date: 2016-07-10 08:19+1000\n"
 "PO-Revision-Date: 2014-09-13 08:57+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -19,7 +19,7 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-Basepath: ../\n"
 
-#: free.c:74 slabtop.c:189 uptime.c:59 w.c:449
+#: free.c:74 slabtop.c:189 uptime.c:59 w.c:453
 #, c-format
 msgid " %s [options]\n"
 msgstr " %s [các tùy chọn]\n"
@@ -105,7 +105,7 @@
 msgid " -w, --wide          wide output\n"
 msgstr " -w, --wide          kết xuất rộng\n"
 
-#: free.c:95 w.c:458
+#: free.c:95 w.c:462
 msgid "     --help     display this help and exit\n"
 msgstr "     --help     hiển thị trợ giúp này rồi thoát\n"
 
@@ -113,26 +113,21 @@
 msgid "Multiple unit options doesn't make sense."
 msgstr ""
 
-#: free.c:329
-#, c-format
-msgid "seconds argument `%s' failed"
-msgstr "đối số thứ hai “%s” bị lỗi"
-
-#: free.c:332
+#: free.c:330
 #, c-format
 msgid "seconds argument `%s' is not positive number"
 msgstr "đối số thứ hai “%s” không phải là số nguyên dương"
 
-#: free.c:338
+#: free.c:336
 msgid "failed to parse count argument"
 msgstr "gặp lỗi khi phân tích số lượng đối số"
 
-#: free.c:341
+#: free.c:339
 #, c-format
 msgid "failed to parse count argument: '%s'"
 msgstr "gặp lỗi khi phân tích số lượng đối số: “%s”"
 
-#: free.c:362
+#: free.c:360
 #, c-format
 msgid ""
 "              total        used        free      shared     buffers       "
@@ -141,7 +136,7 @@
 "               tổng        dùng       trống        chsẻ         đệm     nhớ "
 "tạm    sẵn sàng"
 
-#: free.c:364
+#: free.c:362
 #, c-format
 msgid ""
 "              total        used        free      shared  buff/cache   "
@@ -150,23 +145,23 @@
 "               tổng        dùng       trống        chsẻ     đệm/tạm    sẵn "
 "sàng"
 
-#: free.c:367
+#: free.c:365
 msgid "Mem:"
 msgstr "BNhớ:"
 
-#: free.c:387
+#: free.c:385
 msgid "Low:"
 msgstr "Thấp:"
 
-#: free.c:393
+#: free.c:391
 msgid "High:"
 msgstr "Cao:"
 
-#: free.c:400
+#: free.c:398
 msgid "Swap:"
 msgstr "Tráo đổi:"
 
-#: free.c:407
+#: free.c:405
 msgid "Total:"
 msgstr "Tổng:"
 
@@ -320,7 +315,7 @@
 msgid "Error reading reference namespace information\n"
 msgstr "Gặp lỗi khi đọc thông tin tham chiếu không gian tên\n"
 
-#: pgrep.c:610 pidof.c:224 pidof.c:265 sysctl.c:643
+#: pgrep.c:610 pidof.c:230 pidof.c:271 sysctl.c:643
 msgid "internal error"
 msgstr "lỗi nội bộ"
 
@@ -392,7 +387,7 @@
 msgid " -o, --omit-pid <PID,...>  omit processes with PID\n"
 msgstr " -o, --omit-pid <PID,...>  bỏ qua các tiến trình có mã số này\n"
 
-#: pidof.c:268
+#: pidof.c:274
 #, c-format
 msgid "illegal omit pid value (%s)!\n"
 msgstr "giá trị mã số tiến trình bỏ qua không hợp lệ (%s)!\n"
@@ -510,7 +505,7 @@
 msgid "  [ stack ]"
 msgstr "  [ ngăn xếp ]"
 
-#: pmap.c:326
+#: pmap.c:325
 msgid "Unknown format in smaps file!"
 msgstr "Không hiểu định dạng trong tập tin smaps!"
 
@@ -541,8 +536,8 @@
 msgid " total %8ldK\n"
 msgstr " tổng %8ldK\n"
 
-#: pmap.c:767 skill.c:500 skill.c:533 skill.c:620 tload.c:128 tload.c:133
-#: vmstat.c:959 vmstat.c:968 watch.c:708
+#: pmap.c:767 skill.c:500 skill.c:534 skill.c:621 tload.c:128 tload.c:133
+#: vmstat.c:959 vmstat.c:968 watch.c:726
 msgid "failed to parse argument"
 msgstr "gặp lỗi khi phân tích đối số"
 
@@ -625,8 +620,8 @@
 msgid "Signal %d (%s) caught by %s (%s).\n"
 msgstr "Tín hiệu %d (%s) bắt bởi %s (%s).\n"
 
-#: ps/display.c:66 ps/display.c:271 ps/parser.c:509 ps/parser.c:756
-#: ps/select.c:95 ps/sortformat.c:550
+#: ps/display.c:66 ps/display.c:271 ps/parser.c:495 ps/parser.c:742
+#: ps/select.c:95 ps/sortformat.c:544
 msgid "please report this bug"
 msgstr "hãy thông báo lỗi này"
 
@@ -671,7 +666,7 @@
 #. .
 #. . It must be limited to 15 characters or less.
 #.
-#: ps/global.c:408
+#: ps/global.c:401
 msgid "help"
 msgstr "trợ_giúp"
 
@@ -1097,292 +1092,292 @@
 "\n"
 "Để có thêm thông tin vui lòng xem ps(1).\n"
 
-#: ps/output.c:1971
+#: ps/output.c:1969
 #, c-format
 msgid "fix bigness error\n"
 msgstr "sửa lỗi lớn\n"
 
-#: ps/output.c:2046
+#: ps/output.c:2044
 #, c-format
 msgid "bad alignment code\n"
 msgstr "mã căn chỉnh sai\n"
 
-#: ps/output.c:2108
+#: ps/output.c:2106
 #, c-format
 msgid "unknown page size (assume 4096)\n"
 msgstr "không hiểu cỡ trang (coi là 4096)\n"
 
-#: ps/parser.c:58
+#: ps/parser.c:57
 msgid "the option is exclusive: "
 msgstr "tùy chọn bị loại trừ:"
 
-#: ps/parser.c:89
+#: ps/parser.c:87
 msgid "process ID list syntax error"
 msgstr "lỗi cú pháp danh sách mã số tiến trình"
 
-#: ps/parser.c:90 ps/parser.c:91
+#: ps/parser.c:88 ps/parser.c:89
 msgid "process ID out of range"
 msgstr "mã số tiến trình nằm ngoài phạm vi"
 
-#: ps/parser.c:104
+#: ps/parser.c:102
 msgid "user name does not exist"
 msgstr "tên người dùng không tồn tại"
 
-#: ps/parser.c:110
+#: ps/parser.c:108
 msgid "user ID out of range"
 msgstr "mã số người dùng nằm ngoài phạm vi"
 
-#: ps/parser.c:123
+#: ps/parser.c:121
 msgid "group name does not exist"
 msgstr "tên nhóm không tồn tại"
 
-#: ps/parser.c:129
+#: ps/parser.c:127
 msgid "group ID out of range"
 msgstr "mã số nhóm nằm ngoài phạm vi"
 
-#: ps/parser.c:145 ps/parser.c:169
+#: ps/parser.c:143 ps/parser.c:167
 msgid "TTY could not be found"
 msgstr "không thể tìm thấy TTY"
 
-#: ps/parser.c:171
+#: ps/parser.c:169
 msgid "list member was not a TTY"
 msgstr "liệt kê các thành viên không phải là TTY"
 
-#: ps/parser.c:196
+#: ps/parser.c:194
 msgid "improper list"
 msgstr "danh sách không thích hợp"
 
-#: ps/parser.c:256
+#: ps/parser.c:242
 msgid "list of command names must follow -C"
 msgstr "danh sách các tên lệnh phải theo sau -C"
 
-#: ps/parser.c:270
+#: ps/parser.c:256
 msgid "list of real groups must follow -G"
 msgstr "danh sách các nhóm thật phải theo sau -G"
 
-#: ps/parser.c:283
+#: ps/parser.c:269
 msgid "list of jobs must follow -J"
 msgstr "danh sách công việc phải theo sau -j"
 
-#: ps/parser.c:311
+#: ps/parser.c:297
 msgid "format or sort specification must follow -O"
 msgstr "định dạng hay đặc tả sắp xếp phải theo sau -O"
 
-#: ps/parser.c:322
+#: ps/parser.c:308
 msgid "list of PRM groups must follow -R"
 msgstr "danh sách nhóm PRM phải theo sau -R"
 
-#: ps/parser.c:341
+#: ps/parser.c:327
 msgid "list of real users must follow -U"
 msgstr "danh sách người dùng thật phải theo sau -U"
 
-#: ps/parser.c:382
+#: ps/parser.c:368
 msgid "list of session leaders OR effective group names must follow -g"
 msgstr ""
 "danh sách dẫn đầu phiên HOẶC các tên nhóm chịu ảnh hưởng phải theo sau -g"
 
-#: ps/parser.c:393
+#: ps/parser.c:379
 msgid "list of session leaders OR effective group IDs was invalid"
 msgstr "danh sách dẫn đầu phiên HOẶC các mã số nhóm chịu ảnh không hợp lệ"
 
-#: ps/parser.c:417
+#: ps/parser.c:403
 msgid "format specification must follow -o"
 msgstr "đặc tả định dạng phải theo sau -o"
 
-#: ps/parser.c:423
+#: ps/parser.c:409
 msgid "list of process IDs must follow -p"
 msgstr "danh sách các mã số tiến trình phải theo sau -p"
 
-#: ps/parser.c:440
+#: ps/parser.c:426
 msgid "the -r option is reserved"
 msgstr "tùy chọn -r chưa dùng"
 
-#: ps/parser.c:446
+#: ps/parser.c:432
 msgid "list of session IDs must follow -s"
 msgstr "danh sách các mã phiên làm việc phải theo sau -s"
 
-#: ps/parser.c:454
+#: ps/parser.c:440
 msgid "list of terminals (pty, tty...) must follow -t"
 msgstr "danh sách thiết bị cuối  (pty, tty...) phải theo sau -t"
 
-#: ps/parser.c:462
+#: ps/parser.c:448
 msgid "list of users must follow -u"
 msgstr "danh sách người dùng phải theo sau -u"
 
-#: ps/parser.c:484
+#: ps/parser.c:470
 msgid "must set personality to get -x option"
 msgstr "phải đặt “cá nhân” để lấy tùy chọn -x"
 
-#: ps/parser.c:499
+#: ps/parser.c:485
 msgid "list of zones (contexts, labels, whatever?) must follow -z"
 msgstr ""
 "danh sách vùng (ngữ cảnh, nhãn, cái nào đi chăng nữa?) cũng phải theo sau -z"
 
-#: ps/parser.c:506
+#: ps/parser.c:492
 msgid "embedded '-' among SysV options makes no sense"
 msgstr "nhúng “-” cùng với các tùy chọn SysV là không có lý"
 
-#: ps/parser.c:512
+#: ps/parser.c:498
 msgid "unsupported SysV option"
 msgstr "không hỗ trợ tùy chọn SysV"
 
-#: ps/parser.c:525
+#: ps/parser.c:511
 msgid "cannot happen - problem #1"
 msgstr "không thể xảy ra - vấn đề #1"
 
-#: ps/parser.c:529
+#: ps/parser.c:515
 msgid "cannot happen - problem #2"
 msgstr "không thể xảy ra - vấn đề #2"
 
-#: ps/parser.c:531
+#: ps/parser.c:517
 msgid "second chance parse failed, not BSD or SysV"
 msgstr "phân tích thay đổi thứ hai gặp lỗi, chẳng phải BSD cũng không SysV"
 
-#: ps/parser.c:548
+#: ps/parser.c:534
 msgid "option A is reserved"
 msgstr "tùy chọn A chưa dùng"
 
-#: ps/parser.c:553
+#: ps/parser.c:539
 msgid "option C is reserved"
 msgstr "tùy chọn C chưa dùng"
 
-#: ps/parser.c:573
+#: ps/parser.c:559
 msgid "format or sort specification must follow O"
 msgstr "đặc tả định dạng hay sắp xếp phải theo sau O"
 
-#: ps/parser.c:598
+#: ps/parser.c:584
 msgid "list of users must follow U"
 msgstr "danh sách người dùng phải theo sau U"
 
-#: ps/parser.c:610
+#: ps/parser.c:596
 msgid "obsolete W option not supported (you have a /dev/drum?)"
 msgstr "không hỗ trợ tùy chọn cũ W (bạn có /dev/drum?)"
 
-#: ps/parser.c:646 ps/parser.c:913 ps/parser.c:922
+#: ps/parser.c:632 ps/parser.c:899 ps/parser.c:908
 msgid "only one heading option may be specified"
 msgstr "chỉ được chỉ ra một tùy chọn về phần đầu"
 
-#: ps/parser.c:661
+#: ps/parser.c:647
 msgid "long sort specification must follow 'k'"
 msgstr "đặc tả sắp xếp dài phải theo sau “k”"
 
-#: ps/parser.c:689
+#: ps/parser.c:675
 msgid "format specification must follow o"
 msgstr "đặc tả định dạng phải theo sau o"
 
-#: ps/parser.c:695
+#: ps/parser.c:681
 msgid "list of process IDs must follow p"
 msgstr "danh sách mã số tiến trình phải theo sau p"
 
-#: ps/parser.c:753
+#: ps/parser.c:739
 msgid "embedded '-' among BSD options makes no sense"
 msgstr "nhúng “-” giữa những tùy chọn BSD là không hợp lý"
 
-#: ps/parser.c:759
+#: ps/parser.c:745
 msgid "unsupported option (BSD syntax)"
 msgstr "tùy chọn không được hỗ trợ (cú pháp BSD)"
 
-#: ps/parser.c:845 ps/parser.c:857
+#: ps/parser.c:831 ps/parser.c:843
 msgid "unknown gnu long option"
 msgstr "không hiểu tùy chọn dạng dài gnu"
 
-#: ps/parser.c:865
+#: ps/parser.c:851
 msgid "list of real groups must follow --Group"
 msgstr "danh sách nhóm thật phải theo sau --Group"
 
-#: ps/parser.c:873
+#: ps/parser.c:859
 msgid "list of real users must follow --User"
 msgstr "danh sách người dùng thật phải theo sau --User"
 
-#: ps/parser.c:892
+#: ps/parser.c:878
 msgid "number of columns must follow --cols, --width, or --columns"
 msgstr "số lượng cột phải theo sau --cols, --width, hay --columns"
 
-#: ps/parser.c:895
+#: ps/parser.c:881
 msgid "option --cumulative does not take an argument"
 msgstr "tùy chọn --cumulative không nhận đối số"
 
-#: ps/parser.c:900
+#: ps/parser.c:886
 msgid "option --deselect does not take an argument"
 msgstr "tùy chọn --deselect không nhận đối số"
 
-#: ps/parser.c:912
+#: ps/parser.c:898
 msgid "option --no-heading does not take an argument"
 msgstr "tùy chọn --no-heading không nhận đối số"
 
-#: ps/parser.c:921
+#: ps/parser.c:907
 msgid "option --heading does not take an argument"
 msgstr "tùy chọn --heading không nhận đối số"
 
-#: ps/parser.c:927
+#: ps/parser.c:913
 msgid "option --forest does not take an argument"
 msgstr "tùy chọn --forest không nhận đối số"
 
-#: ps/parser.c:933
+#: ps/parser.c:919
 msgid "format specification must follow --format"
 msgstr "đặc tả định dạng phải theo sau --format"
 
-#: ps/parser.c:939
+#: ps/parser.c:925
 msgid "list of effective groups must follow --group"
 msgstr "danh sách nhóm chịu ảnh hưởng phải theo sau --group"
 
-#: ps/parser.c:957
+#: ps/parser.c:943
 msgid "list of process IDs must follow --pid"
 msgstr "danh sách mã số tiến trình phải theo sau --pid"
 
-#: ps/parser.c:973
+#: ps/parser.c:959
 msgid "list of process IDs must follow --ppid"
 msgstr "danh sách mã số tiến trình phải theo sau --ppid"
 
-#: ps/parser.c:991
+#: ps/parser.c:977
 msgid "number of rows must follow --rows or --lines"
 msgstr "số dòng phải theo sau --rows hay --lines"
 
-#: ps/parser.c:995
+#: ps/parser.c:981
 msgid "some sid thing(s) must follow --sid"
 msgstr "một số thứ sid phải theo sau --sid"
 
-#: ps/parser.c:1003
+#: ps/parser.c:989
 msgid "long sort specification must follow --sort"
 msgstr "đặc tả sắp xếp dài phải theo sau --sort"
 
-#: ps/parser.c:1009
+#: ps/parser.c:995
 msgid "list of ttys must follow --tty"
 msgstr "danh sách tty phải theo sau --tty"
 
-#: ps/parser.c:1017
+#: ps/parser.c:1003
 msgid "list of effective users must follow --user"
 msgstr "danh sách người dùng chịu ảnh hưởng phải theo sau --user"
 
-#: ps/parser.c:1134
+#: ps/parser.c:1119
 msgid "way bad"
 msgstr "sai đường"
 
-#: ps/parser.c:1148
+#: ps/parser.c:1133
 msgid "garbage option"
 msgstr "tùy chọn rác"
 
-#: ps/parser.c:1152
+#: ps/parser.c:1137
 msgid "something broke"
 msgstr "có cái gì đó hỏng"
 
-#: ps/parser.c:1172
+#: ps/parser.c:1157
 msgid "thread display conflicts with forest display"
 msgstr "hiển thị tuyến trình xung đột với forest"
 
-#: ps/parser.c:1177
+#: ps/parser.c:1162
 msgid "thread flags conflict; can't use H with m or -m"
 msgstr "xung đột cờ tuyến trình; không thể dùng H cùng với m hay -m"
 
-#: ps/parser.c:1179
+#: ps/parser.c:1164
 msgid "thread flags conflict; can't use both m and -m"
 msgstr "xung đột cờ tuyến trình; không thể dùng cả m và -m"
 
-#: ps/parser.c:1181
+#: ps/parser.c:1166
 msgid "thread flags conflict; can't use both -L and -T"
 msgstr "xung đột cờ tuyến trình; không thể dùng cả -L và -T"
 
-#: ps/parser.c:1255 ps/parser.c:1256
+#: ps/parser.c:1239 ps/parser.c:1240
 #, c-format
 msgid "error: %s\n"
 msgstr "lỗi: %s\n"
@@ -1391,133 +1386,133 @@
 msgid "process selection options conflict"
 msgstr "tùy chọn chọn tiến trình xung đột"
 
-#: ps/sortformat.c:107 ps/sortformat.c:112
+#: ps/sortformat.c:106 ps/sortformat.c:111
 msgid "seriously crashing: goodbye cruel world"
 msgstr "đổ vỡ nghiêm trọng: chào tạm biệt thế giới phũ phàng"
 
-#: ps/sortformat.c:147
+#: ps/sortformat.c:146
 msgid "improper AIX field descriptor"
 msgstr "bộ mô tả trường AIX không thích hợp"
 
-#: ps/sortformat.c:168
+#: ps/sortformat.c:167
 msgid "unknown AIX field descriptor"
 msgstr "không hiểu bộ mô tả trường AIX"
 
-#: ps/sortformat.c:173
+#: ps/sortformat.c:172
 msgid "AIX field descriptor processing bug"
 msgstr "tiến trình bộ mô tả trường AIX lỗi"
 
-#: ps/sortformat.c:290
+#: ps/sortformat.c:285
 #, c-format
 msgid "unknown user-defined format specifier \"%s\""
 msgstr "không hiểu chỉ định định dạng người dùng định nghĩa \"%s\""
 
-#: ps/sortformat.c:316
+#: ps/sortformat.c:311
 msgid "empty format list"
 msgstr "danh sách định dạng trống"
 
-#: ps/sortformat.c:317
+#: ps/sortformat.c:312
 msgid "improper format list"
 msgstr "danh sách định dạng không thích hợp"
 
-#: ps/sortformat.c:318
+#: ps/sortformat.c:313
 msgid "column widths must be unsigned decimal numbers"
 msgstr "độ rộng cột phải là số thập phân không dấu"
 
-#: ps/sortformat.c:319
+#: ps/sortformat.c:314
 msgid "can not set width for a macro (multi-column) format specifier"
 msgstr "không thể đặt độ rộng cho một chỉ định định dạng macro (đa cột)"
 
-#: ps/sortformat.c:372 ps/sortformat.c:388
+#: ps/sortformat.c:367 ps/sortformat.c:383
 msgid "improper sort list"
 msgstr "danh sách sắp xếp không thích hợp"
 
-#: ps/sortformat.c:383
+#: ps/sortformat.c:378
 msgid "empty sort list"
 msgstr "danh sách sắp xếp trống rỗng"
 
-#: ps/sortformat.c:404 ps/sortformat.c:482 ps/sortformat.c:484
+#: ps/sortformat.c:399 ps/sortformat.c:477 ps/sortformat.c:479
 msgid "unknown sort specifier"
 msgstr "không hiểu chỉ định sắp xếp"
 
-#: ps/sortformat.c:431 ps/sortformat.c:442 ps/sortformat.c:448
+#: ps/sortformat.c:426 ps/sortformat.c:437 ps/sortformat.c:443
 msgid "bad sorting code"
 msgstr "mã sắp xếp sai"
 
-#: ps/sortformat.c:445
+#: ps/sortformat.c:440
 msgid "PPID sort and forest output conflict"
 msgstr "kết xuât forest và sắp xếp PPID xung đột nhau"
 
-#: ps/sortformat.c:520
+#: ps/sortformat.c:514
 msgid "option -O can not follow other format options"
 msgstr "tùy chọn -O không thể theo các tùy chọn định dạng khác"
 
-#: ps/sortformat.c:527 ps/sortformat.c:545
+#: ps/sortformat.c:521 ps/sortformat.c:539
 msgid "multiple sort options"
 msgstr "đã chỉ ra nhiều tùy chọn sắp xếp"
 
-#: ps/sortformat.c:535
+#: ps/sortformat.c:529
 msgid "option O is neither first format nor sort order"
 msgstr ""
 "tùy chọn O không phải là định dạng đầu cũng không phải là thứ tự sắp xếp"
 
-#: ps/sortformat.c:662
+#: ps/sortformat.c:656
 msgid "modifier -y without format -l makes no sense"
 msgstr "-y chỉnh sửa mà không có -l định dạng là không hợp lý"
 
-#: ps/sortformat.c:765
+#: ps/sortformat.c:756
 msgid "bug: must reset the list first"
 msgstr "lỗi: phải đặt lại danh sách trước"
 
-#: ps/sortformat.c:803
+#: ps/sortformat.c:794
 msgid "tell <procps@freelists.org> what you expected"
 msgstr "gửi thư cho <procps@freelists.org> là cái bạn cần"
 
-#: ps/sortformat.c:813
+#: ps/sortformat.c:804
 msgid ""
 "tell <procps@freelists.org> what you want (-L/-T, -m/m/H, and $PS_FORMAT)"
 msgstr ""
 "gửi thư cho <procps@freelists.org> là cái bạn cần (-L/-T, -m/m/H, và "
 "$PS_FORMAT)"
 
-#: ps/sortformat.c:830
+#: ps/sortformat.c:821
 #, c-format
 msgid "warning: $PS_FORMAT ignored. (%s)\n"
 msgstr "cảnh báo: $PS_FORMAT bị bỏ qua. (%s)\n"
 
-#: ps/sortformat.c:835 ps/sortformat.c:845
+#: ps/sortformat.c:826 ps/sortformat.c:836
 msgid "conflicting format options"
 msgstr "có xung đột trong các tùy chọn định dạng"
 
-#: ps/sortformat.c:836
+#: ps/sortformat.c:827
 msgid "can not use output modifiers with user-defined output"
 msgstr "không thể dùng bộ chỉnh sửa với kết xuất người dùng định nghĩa"
 
-#: ps/sortformat.c:837
+#: ps/sortformat.c:828
 msgid "-L/-T with H/m/-m and -o/-O/o/O is nonsense"
 msgstr "-L/-T với H/m/-m và -o/-O/o/O là không hợp lý"
 
-#: ps/sortformat.c:895
+#: ps/sortformat.c:886
 msgid "internal error: no PID or PPID for -j option"
 msgstr "lỗi nội tại: không có PID hay PPID cho tùy chọn -j"
 
-#: ps/sortformat.c:897
+#: ps/sortformat.c:888
 msgid "lost my PGID"
 msgstr "mất mã số tiến trình nhóm cha"
 
-#: ps/sortformat.c:910
+#: ps/sortformat.c:901
 msgid "internal error: no PRI for -c option"
 msgstr "lỗi nội bộ: không PRI cho tùy chọn -c"
 
-#: ps/sortformat.c:913
+#: ps/sortformat.c:904
 msgid "lost my CLS"
 msgstr "mất CLS của tôi"
 
-#: ps/sortformat.c:918
+#: ps/sortformat.c:909
 msgid "-T with H/-m/m but no PID for SPID to follow"
 msgstr "-T với H/-m/m nhưng lại không có mã số tiến trình cho SPID để theo"
 
-#: ps/sortformat.c:929
+#: ps/sortformat.c:920
 msgid "-L with H/-m/m but no PID/PGID/SID/SESS for NLWP to follow"
 msgstr "-L với H/-m/m nhưng không có PID/PGID/SID/SESS cho NLWP để theo"
 
@@ -1690,46 +1685,46 @@
 msgid "invalid argument %c"
 msgstr "đối số %c không hợp lệ"
 
-#: skill.c:513
+#: skill.c:514
 #, c-format
 msgid "something at line %d\n"
 msgstr "cái gì đó tại dòng %d\n"
 
-#: skill.c:536
+#: skill.c:537
 #, c-format
 msgid "priority %lu out of range"
 msgstr "mức ưu tiên %lu nằm ngoài phạm vi"
 
-#: skill.c:649
+#: skill.c:650
 #, c-format
 msgid "invalid pid number %s"
 msgstr "mã số tiến trình không hợp lệ %s"
 
-#: skill.c:653
+#: skill.c:654
 msgid "error reading reference namespace information"
 msgstr "lỗi đọc thông tin không gian tên tham chiếu"
 
-#: skill.c:661
+#: skill.c:662
 msgid "invalid namespace list"
 msgstr "danh sách không gian tên không hợp lệ"
 
-#: skill.c:699
+#: skill.c:700
 msgid "no process selection criteria"
 msgstr "chưa có tiêu chí chọn tiến trình"
 
-#: skill.c:702
+#: skill.c:703
 msgid "general flags may not be repeated"
 msgstr "các cờ chung không thể lặp lại"
 
-#: skill.c:705
+#: skill.c:706
 msgid "-i makes no sense with -v, -f, and -n"
 msgstr "-i không hợp lý với -v, -f, và -n"
 
-#: skill.c:707
+#: skill.c:708
 msgid "-v makes no sense with -i and -f"
 msgstr "-v không hợp lý với -i và -f"
 
-#: skill.c:752
+#: skill.c:753
 #, c-format
 msgid "skill: \"%s\" is not supported\n"
 msgstr "skill: \"%s\" không được hỗ trợ\n"
@@ -2081,7 +2076,7 @@
 msgstr "Mã số người dùng chịu tác động"
 
 #. Translation Hint: maximum 'USER' = 7
-#: top/top_nls.c:133 w.c:587
+#: top/top_nls.c:133 w.c:591
 msgid "USER"
 msgstr "NG_DÙNG"
 
@@ -2405,125 +2400,172 @@
 msgid "Thread Group Id"
 msgstr "Mã số nhóm tuyến trình"
 
-#. Translation Hint: maximum 'Adj' = 3
+#. Translation Hint: maximum 'OOMa' = 5
+#: top/top_nls.c:241
+msgid "OOMa"
+msgstr ""
+
 #: top/top_nls.c:242
-msgid "Adj"
-msgstr "Sửa"
+msgid "OOMEM Adjustment"
+msgstr ""
 
-#: top/top_nls.c:243
-msgid "oom_adjustment (2^X)"
-msgstr "oom_adjustment (2^X)"
+#. Translation Hint: maximum 'OOMs' = 4
+#: top/top_nls.c:244
+msgid "OOMs"
+msgstr ""
 
-#. Translation Hint: maximum 'Badness' = 7
 #: top/top_nls.c:245
-msgid "Badness"
-msgstr "Tồi"
-
-#: top/top_nls.c:246
-msgid "oom_score (badness)"
-msgstr "oom_score (tồi)"
+msgid "OOMEM Score current"
+msgstr ""
 
 #. Translation Hint: maximum 'ENVIRON' = 7
-#: top/top_nls.c:249
+#: top/top_nls.c:247
 msgid "ENVIRON"
 msgstr "BIẾN_MT"
 
 #. Translation Hint: the abbreviation 'vars' below is shorthand for
 #. 'variables'
-#: top/top_nls.c:252
+#: top/top_nls.c:250
 msgid "Environment vars"
 msgstr "Các biến môi trường"
 
 #. Translation Hint: maximum 'vMj' = 3
-#: top/top_nls.c:254
+#: top/top_nls.c:252
 msgid "vMj"
 msgstr "vMj"
 
-#: top/top_nls.c:255
+#: top/top_nls.c:253
 msgid "Major Faults delta"
 msgstr "Vùng lỗi lớn"
 
 #. Translation Hint: maximum 'vMn' = 3
-#: top/top_nls.c:257
+#: top/top_nls.c:255
 msgid "vMn"
 msgstr "vMn"
 
-#: top/top_nls.c:258
+#: top/top_nls.c:256
 msgid "Minor Faults delta"
 msgstr "Vùng lỗi nhỏ"
 
 #. Translation Hint: maximum 'USED' = 4
-#: top/top_nls.c:260
+#: top/top_nls.c:258
 msgid "USED"
 msgstr "DÙNG"
 
-#: top/top_nls.c:261
+#: top/top_nls.c:259
 msgid "Res+Swap Size (KiB)"
 msgstr "Tài nguyên+Cỡ Swap (KiB)"
 
 #. Translation Hint: maximum 'nsIPC' = 7
-#: top/top_nls.c:263
+#: top/top_nls.c:261
 msgid "nsIPC"
 msgstr "nsIPC"
 
-#: top/top_nls.c:264
+#: top/top_nls.c:262
 msgid "IPC namespace Inode"
 msgstr "Nút không gian tên IPC"
 
 #. Translation Hint: maximum 'nsMNT' = 7
-#: top/top_nls.c:266
+#: top/top_nls.c:264
 msgid "nsMNT"
 msgstr "nsMNT"
 
-#: top/top_nls.c:267
+#: top/top_nls.c:265
 msgid "MNT namespace Inode"
 msgstr "Nút không gian tên MNT"
 
 #. Translation Hint: maximum 'nsNET' = 7
-#: top/top_nls.c:269
+#: top/top_nls.c:267
 msgid "nsNET"
 msgstr "nsNET"
 
-#: top/top_nls.c:270
+#: top/top_nls.c:268
 msgid "NET namespace Inode"
 msgstr "Nút không gian tên NET"
 
 #. Translation Hint: maximum 'nsPID' = 7
-#: top/top_nls.c:272
+#: top/top_nls.c:270
 msgid "nsPID"
 msgstr "nsPID"
 
-#: top/top_nls.c:273
+#: top/top_nls.c:271
 msgid "PID namespace Inode"
 msgstr "Nút không gian tên PID"
 
 #. Translation Hint: maximum 'nsUSER' = 7
-#: top/top_nls.c:275
+#: top/top_nls.c:273
 msgid "nsUSER"
 msgstr "nsUSER"
 
-#: top/top_nls.c:276
+#: top/top_nls.c:274
 msgid "USER namespace Inode"
 msgstr "Nút không gian tên USER"
 
 #. Translation Hint: maximum 'nsUTS' = 7
-#: top/top_nls.c:278
+#: top/top_nls.c:276
 msgid "nsUTS"
 msgstr "nsUTS"
 
-#: top/top_nls.c:279
+#: top/top_nls.c:277
 msgid "UTS namespace Inode"
 msgstr "Nút không gian tên UTS"
 
 #. Translation Hint: maximum 'LXC' = 7
-#: top/top_nls.c:281
+#: top/top_nls.c:279
 msgid "LXC"
 msgstr ""
 
-#: top/top_nls.c:282
+#: top/top_nls.c:280
 msgid "LXC container name"
 msgstr ""
 
+#. Translation Hint: maximum 'RSan' = 4
+#: top/top_nls.c:282
+msgid "RSan"
+msgstr ""
+
+#: top/top_nls.c:283
+msgid "RES Anonymous (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'RSfd' = 4
+#: top/top_nls.c:285
+msgid "RSfd"
+msgstr ""
+
+#: top/top_nls.c:286
+msgid "RES File-based (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'RSlk' = 4
+#: top/top_nls.c:288
+msgid "RSlk"
+msgstr ""
+
+#: top/top_nls.c:289
+msgid "RES Locked (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'RSsh' = 4
+#: top/top_nls.c:291
+msgid "RSsh"
+msgstr ""
+
+#: top/top_nls.c:292
+#, fuzzy
+msgid "RES Shared (KiB)"
+msgstr "Bộ nhớ chia sẻ (KiB)"
+
+#. Translation Hint: maximum 'CGNAME' = 7
+#: top/top_nls.c:294
+msgid "CGNAME"
+msgstr ""
+
+#: top/top_nls.c:295
+#, fuzzy
+msgid "Control Group name"
+msgstr "Nhóm điều khiển"
+
 #. Translation Notes ------------------------------------------------
 #. .  It is strongly recommend that the --no-wrap command line option
 #. .  be used with all supporting translation tools, when available.
@@ -2534,7 +2576,7 @@
 #. .  and should not be translated without also making corresponding
 #. .  c-code logic changes.
 #. .
-#: top/top_nls.c:302
+#: top/top_nls.c:315
 #, c-format
 msgid ""
 "\tsignal %d (%s) was caught by %s, please\n"
@@ -2543,7 +2585,7 @@
 "\ttín hiệu %d (%s) đã bị bắt bởi %s, vui lòng\n"
 "\txem http://www.debian.org/Bugs/Reporting\n"
 
-#: top/top_nls.c:305
+#: top/top_nls.c:318
 #, c-format
 msgid ""
 "inappropriate '%s'\n"
@@ -2554,7 +2596,7 @@
 "Cách dùng:\n"
 "  %s%s"
 
-#: top/top_nls.c:308
+#: top/top_nls.c:321
 #, c-format
 msgid ""
 "  %s\n"
@@ -2565,47 +2607,47 @@
 "Cách dùng:\n"
 "  %s%s"
 
-#: top/top_nls.c:311
+#: top/top_nls.c:324
 #, c-format
 msgid "failed /proc/stat open: %s"
 msgstr "gặp lỗi khi mở /proc/stat: %s"
 
-#: top/top_nls.c:312
+#: top/top_nls.c:325
 #, c-format
 msgid "failed openproc: %s"
 msgstr "gặp lỗi khi openproc: %s"
 
-#: top/top_nls.c:313
+#: top/top_nls.c:326
 #, c-format
 msgid "bad delay interval '%s'"
 msgstr "khoảng nhịp trễ sai “%s”"
 
-#: top/top_nls.c:314
+#: top/top_nls.c:327
 #, c-format
 msgid "bad iterations argument '%s'"
 msgstr "đối số lặp lại sai “%s”"
 
-#: top/top_nls.c:315
+#: top/top_nls.c:328
 #, c-format
 msgid "pid limit (%d) exceeded"
 msgstr "đã tới giới hạn mã số tiến trình (%d)"
 
-#: top/top_nls.c:316
+#: top/top_nls.c:329
 #, c-format
 msgid "bad pid '%s'"
 msgstr "mã số tiến trình sai “%s”"
 
-#: top/top_nls.c:317
+#: top/top_nls.c:330
 #, c-format
 msgid "-%c requires argument"
 msgstr "-%c cần đối số"
 
-#: top/top_nls.c:318
+#: top/top_nls.c:331
 #, c-format
 msgid "bad width arg '%s'"
 msgstr "đối số độ rộng sai “%s”"
 
-#: top/top_nls.c:319
+#: top/top_nls.c:332
 #, c-format
 msgid ""
 "unknown option '%c'\n"
@@ -2616,328 +2658,328 @@
 "Cách dùng:\n"
 " %s%s"
 
-#: top/top_nls.c:322
+#: top/top_nls.c:335
 msgid "-d disallowed in \"secure\" mode"
 msgstr "-d không cho phép trong chế độ \"secure\""
 
-#: top/top_nls.c:323
+#: top/top_nls.c:336
 msgid "-d requires positive argument"
 msgstr "tùy chọn -d cần đối số dương"
 
-#: top/top_nls.c:324
+#: top/top_nls.c:337
 msgid "On"
 msgstr "Bật"
 
-#: top/top_nls.c:325
+#: top/top_nls.c:338
 msgid "Off"
 msgstr "Tắt"
 
 #. Translation Hint: Only the following words should be translated
 #. .                 secs (seconds), max (maximum), user, field, cols (columns)
-#: top/top_nls.c:328
+#: top/top_nls.c:341
 msgid " -hv | -bcHiOSs -d secs -n max -u|U user -p pid(s) -o field -w [cols]"
 msgstr ""
 " -hv | -bcHiOSs -d giây -n t.đa -u|U người_dùng -p (các)_mã_số_tiến_trình -o "
 "trường -w [cột]"
 
-#: top/top_nls.c:329
+#: top/top_nls.c:342
 msgid "failed /proc/stat read"
 msgstr "gặp lỗi khi đọc /proc/stat"
 
-#: top/top_nls.c:330
+#: top/top_nls.c:343
 #, c-format
 msgid "Forest mode %s"
 msgstr "Chế độ forest %s"
 
-#: top/top_nls.c:331
+#: top/top_nls.c:344
 msgid "failed tty get"
 msgstr "gặp lỗi khi lấy tty"
 
-#: top/top_nls.c:332
+#: top/top_nls.c:345
 #, c-format
 msgid "failed tty set: %s"
 msgstr "gặp lỗi khi đặt tty: %s"
 
-#: top/top_nls.c:333
+#: top/top_nls.c:346
 msgid "Choose field group (1 - 4)"
 msgstr "Chọn nhóm trường (1 - 4)"
 
-#: top/top_nls.c:334
+#: top/top_nls.c:347
 msgid "Command disabled, 'A' mode required"
 msgstr "Lệnh bị tắt, cần chế độ “A”"
 
-#: top/top_nls.c:335
+#: top/top_nls.c:348
 #, c-format
 msgid "Command disabled, activate %s with '-' or '_'"
 msgstr "Lệnh bị tắt, kích hoạt %s bằng “-” or “_”"
 
-#: top/top_nls.c:336
+#: top/top_nls.c:349
 msgid "No colors to map!"
 msgstr "Không có màu để ánh xạ!"
 
-#: top/top_nls.c:337
+#: top/top_nls.c:350
 #, c-format
 msgid "Failed '%s' open: %s"
 msgstr "Gặp lỗi khi mở “%s”: %s"
 
-#: top/top_nls.c:338
+#: top/top_nls.c:351
 #, c-format
 msgid "Wrote configuration to '%s'"
 msgstr "Ghi cấu hình vào “%s”"
 
-#: top/top_nls.c:339
+#: top/top_nls.c:352
 #, c-format
 msgid "Change delay from %.1f to"
 msgstr "Đổi độ trễ từ %.1f thành"
 
-#: top/top_nls.c:340
+#: top/top_nls.c:353
 #, c-format
 msgid "Show threads %s"
 msgstr "Hiển thị tiến trình %s"
 
-#: top/top_nls.c:341
+#: top/top_nls.c:354
 #, c-format
 msgid "Irix mode %s"
 msgstr "chế độ Irix %s"
 
-#: top/top_nls.c:342
+#: top/top_nls.c:355
 #, c-format
 msgid "PID to signal/kill [default pid = %d]"
 msgstr "Mã số tiến trình để signal/kill [mặc định mã số tiến trình = %d]"
 
-#: top/top_nls.c:343
+#: top/top_nls.c:356
 #, c-format
 msgid "Send pid %d signal [%d/sigterm]"
 msgstr "Gửi tín hiệu mã số tiến trình %d [%d/sigterm]"
 
-#: top/top_nls.c:344
+#: top/top_nls.c:357
 #, c-format
 msgid "Failed signal pid '%d' with '%d': %s"
 msgstr "Gặp lỗi khi signal mã số tiên strinhf “%d” với “%d”: %s"
 
-#: top/top_nls.c:345
+#: top/top_nls.c:358
 msgid "Invalid signal"
 msgstr "Tín hiệu không hợp lệ"
 
-#: top/top_nls.c:346
+#: top/top_nls.c:359
 #, c-format
 msgid "PID to renice [default pid = %d]"
 msgstr "mã số tiến trình cần renice [mặc định pid = %d]"
 
-#: top/top_nls.c:347
+#: top/top_nls.c:360
 #, c-format
 msgid "Renice PID %d to value"
 msgstr "Renice mã số tiến trình %d thành giá trị"
 
-#: top/top_nls.c:348
+#: top/top_nls.c:361
 #, c-format
 msgid "Failed renice of PID %d to %d: %s"
 msgstr "Gặp lỗi khi renice mã số tiến trình %d thành %d: %s"
 
-#: top/top_nls.c:349
+#: top/top_nls.c:362
 #, c-format
 msgid "Rename window '%s' to (1-3 chars)"
 msgstr "Đổi tên cửa sổ “%s” thành (1-3 ký tự)"
 
-#: top/top_nls.c:350
+#: top/top_nls.c:363
 #, c-format
 msgid "Cumulative time %s"
 msgstr "Tổng thời gian %s"
 
-#: top/top_nls.c:351
+#: top/top_nls.c:364
 #, c-format
 msgid "Maximum tasks = %d, change to (0 is unlimited)"
 msgstr "Nhiệm vụ tối đa = %d, đổi thành (0 là không giới hạn)"
 
-#: top/top_nls.c:352
+#: top/top_nls.c:365
 msgid "Invalid maximum"
 msgstr "Số tối đa không hợp lệ"
 
-#: top/top_nls.c:353
+#: top/top_nls.c:366
 msgid "Which user (blank for all)"
 msgstr "Người dùng nào (để trống là tất cả)"
 
-#: top/top_nls.c:354
+#: top/top_nls.c:367
 msgid "Unknown command - try 'h' for help"
 msgstr "Không hiểu lệnh - hãy thử “h” để xem trợ giúp"
 
-#: top/top_nls.c:355
+#: top/top_nls.c:368
 #, c-format
 msgid "scroll coordinates: y = %d/%%d (tasks), x = %d/%d (fields)"
 msgstr "hệ tọa độ cuộn: y = %d/%%d (nhiệm vụ), x = %d/%d (trường)"
 
-#: top/top_nls.c:356
+#: top/top_nls.c:369
 msgid "failed memory allocate"
 msgstr "gặp lỗi khi tái cấp phát bộ nhớ"
 
-#: top/top_nls.c:357
+#: top/top_nls.c:370
 msgid "failed memory re-allocate"
 msgstr "gặp lỗi tái cấp phát bộ nhớ"
 
-#: top/top_nls.c:358
+#: top/top_nls.c:371
 msgid "Unacceptable floating point"
 msgstr "Không chấp nhận số thực dấu chấm động"
 
-#: top/top_nls.c:359
+#: top/top_nls.c:372
 msgid "Invalid user"
 msgstr "Người dùng không hợp lệ"
 
-#: top/top_nls.c:360
+#: top/top_nls.c:373
 msgid "forest view"
 msgstr "hiển thị dạng cây"
 
-#: top/top_nls.c:361
+#: top/top_nls.c:374
 msgid "failed pid maximum size test"
 msgstr "gặp lỗi khi kiểm tra cỡ tối đa mã số tiến trình"
 
-#: top/top_nls.c:362
+#: top/top_nls.c:375
 msgid "failed number of cpus test"
 msgstr "gặp lỗi khi kiểm tra số lượng bộ vi xử lý"
 
-#: top/top_nls.c:363
+#: top/top_nls.c:376
 #, c-format
 msgid "incompatible rcfile, you should delete '%s'"
 msgstr "tập tin tài nguyên không tương thích, bạn nên xóa “%s”"
 
-#: top/top_nls.c:364
+#: top/top_nls.c:377
 #, c-format
 msgid "window entry #%d corrupt, please delete '%s'"
 msgstr "mục tin cửa sổ #%d sai hỏng, vui lòng xóa “%s”"
 
-#: top/top_nls.c:365
+#: top/top_nls.c:378
 msgid "Unavailable in secure mode"
 msgstr "Không sẵn sàng trong chế độ an ninh"
 
-#: top/top_nls.c:366
+#: top/top_nls.c:379
 msgid "Only 1 cpu detected"
 msgstr "Chỉ tìm thấy một cpu"
 
-#: top/top_nls.c:367
+#: top/top_nls.c:380
 msgid "Unacceptable integer"
 msgstr "Không thể chấp nhận số nguyên"
 
-#: top/top_nls.c:368
+#: top/top_nls.c:381
 msgid "conflicting process selections (U/p/u)"
 msgstr "chọn tiến trình xung đột (U/p/u)"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 kibibytes (1024 bytes)
-#: top/top_nls.c:371
+#: top/top_nls.c:384
 msgid "KiB"
 msgstr "KiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 mebibytes (1,048,576 bytes)
-#: top/top_nls.c:374
+#: top/top_nls.c:387
 msgid "MiB"
 msgstr "MiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 gibibytes (1,073,741,824 bytes)
-#: top/top_nls.c:377
+#: top/top_nls.c:390
 msgid "GiB"
 msgstr "GiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 tebibytes (1,099,511,627,776 bytes)
-#: top/top_nls.c:380
+#: top/top_nls.c:393
 msgid "TiB"
 msgstr "TiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 pebibytes (1,024 tebibytes)
-#: top/top_nls.c:383
+#: top/top_nls.c:396
 msgid "PiB"
 msgstr "PiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 exbibytes (1,024 pebibytes)
-#: top/top_nls.c:386
+#: top/top_nls.c:399
 msgid "EiB"
 msgstr "EiB"
 
-#: top/top_nls.c:387
+#: top/top_nls.c:400
 msgid "Threads"
 msgstr "Tuyến trình"
 
-#: top/top_nls.c:388
+#: top/top_nls.c:401
 msgid "Tasks"
 msgstr "Tác vụ"
 
 #. Translation Hint: The following "word" is meant to represent either a single
 #. .                 cpu or all of the processors in a multi-processor computer
 #. .                 (should be exactly 6 characters, not counting the colon)
-#: top/top_nls.c:392
+#: top/top_nls.c:405
 msgid "Cpu(s):"
 msgstr "Cpu(s):"
 
 #. Translation Hint: The following "word" is meant to represent a single processor
 #. .                 (should be exactly 3 characters)
-#: top/top_nls.c:395
+#: top/top_nls.c:408
 #, c-format
 msgid "Cpu%-3d:"
 msgstr "Cpu%-3d:"
 
 #. Translation Hint: The following word "another" must have 1 trailing space
-#: top/top_nls.c:397
+#: top/top_nls.c:410
 msgid "another "
 msgstr "cái khác"
 
-#: top/top_nls.c:398
+#: top/top_nls.c:411
 msgid "Locate next inactive, use \"L\""
 msgstr "Vị trí không hoạt động tiếp theo, dùng \"L\""
 
-#: top/top_nls.c:399
+#: top/top_nls.c:412
 msgid "Locate string"
 msgstr "Chuỗi định vị"
 
-#: top/top_nls.c:400
+#: top/top_nls.c:413
 #, c-format
 msgid "%s\"%s\" not found"
 msgstr "không tìm thấy %s\"%s\""
 
-#: top/top_nls.c:401
+#: top/top_nls.c:414
 #, c-format
 msgid "width incr is %d, change to (0 default, -1 auto)"
 msgstr "độ rộng của incr là %d, thay đổi thành (mặc định là 0, -1 là tự động)"
 
-#: top/top_nls.c:402
+#: top/top_nls.c:415
 msgid "Overwrite existing obsolete/corrupted rcfile?"
 msgstr "Đè lên tập tin tài nguyên cũ/hỏng không?"
 
-#: top/top_nls.c:403
+#: top/top_nls.c:416
 #, c-format
 msgid "unrecognized field name '%s'"
 msgstr "không thừa nhận tên trường “%s”"
 
-#: top/top_nls.c:404
+#: top/top_nls.c:417
 msgid "even using field names only, window is now too small"
 msgstr "ngay cả khi chỉ dùng tên trường, cửa sổ bây giờ cũng quá nhỏ"
 
-#: top/top_nls.c:406
+#: top/top_nls.c:419
 msgid "Open Files"
 msgstr "Tập tin đang mở"
 
-#: top/top_nls.c:407
+#: top/top_nls.c:420
 msgid "NUMA Info"
 msgstr "Thông tin NUMA"
 
-#: top/top_nls.c:408
+#: top/top_nls.c:421
 msgid "Log"
 msgstr "Nhật ký"
 
-#: top/top_nls.c:409
+#: top/top_nls.c:422
 msgid ""
 "the '=' key will eventually show the actual file read or command(s) "
 "executed ..."
 msgstr ""
 "phím “=” sẽ đưa ra tập tin thực đọc cuối cùng hoặc lệnh đã thực hiện ..."
 
-#: top/top_nls.c:410
+#: top/top_nls.c:423
 msgid "demo"
 msgstr "thử"
 
-#: top/top_nls.c:411
+#: top/top_nls.c:424
 #, c-format
 msgid ""
 "This is simulated output representing the contents of some file or the "
@@ -3030,100 +3072,100 @@
 "\n"
 "Chúc vui!\n"
 
-#: top/top_nls.c:443
+#: top/top_nls.c:456
 msgid "to enable 'Y' press <Enter> then type 'W' and restart top"
 msgstr "để bật “Y” nhấn <Enter> sau đó gõ “W” và khởi động lại top"
 
-#: top/top_nls.c:445
+#: top/top_nls.c:458
 msgid "to enable 'Y' please consult the top man page (press Enter)"
 msgstr "để bật “Y” hãy xem trang hướng dẫn lệnh top (nhấn Enter)"
 
-#: top/top_nls.c:447
+#: top/top_nls.c:460
 #, c-format
 msgid "Selection failed with: %s\n"
 msgstr "Việc chọn gặp lỗi với: %s\n"
 
-#: top/top_nls.c:448
+#: top/top_nls.c:461
 #, c-format
 msgid "unable to inspect, pid %d not found"
 msgstr "không thể điều tra, không tìm thấy mã số tiến trình %d"
 
-#: top/top_nls.c:449
+#: top/top_nls.c:462
 #, c-format
 msgid "inspect at PID [default pid = %d]"
 msgstr "điều tra tại PID [mặc định mã số tiến trình = %d]"
 
-#: top/top_nls.c:450
+#: top/top_nls.c:463
 #, c-format
 msgid "%s: %*d-%-*d lines, %*d-%*d columns, %lu bytes read"
 msgstr "%s: %*d-%-*d dòng, %*d-%*d cột, đọc %lu byte"
 
-#: top/top_nls.c:451
+#: top/top_nls.c:464
 msgid "patience please, working..."
 msgstr "hãy nhẫn nại, đang chạy..."
 
 #. Translation Hint: Below are 2 abbreviations which can be as long as needed:
 #. .                 FLD = FIELD, VAL = VALUE
-#: top/top_nls.c:454
+#: top/top_nls.c:467
 #, c-format
 msgid "add filter #%d (%s) as: [!]FLD?VAL"
 msgstr "thêm bộ lọc #%d (%s) như: [!]FLD?VAL"
 
-#: top/top_nls.c:455
+#: top/top_nls.c:468
 msgid "ignoring case"
 msgstr "không phân biệt HOA/thường"
 
-#: top/top_nls.c:456
+#: top/top_nls.c:469
 msgid "case sensitive"
 msgstr "phân biệt HOA/thường"
 
-#: top/top_nls.c:457
+#: top/top_nls.c:470
 msgid "duplicate filter was ignored"
 msgstr "bộ lọc bị trùng sẽ bỏ qua"
 
-#: top/top_nls.c:458
+#: top/top_nls.c:471
 #, c-format
 msgid "'%s' filter delimiter is missing"
 msgstr "“%s” thiếu bộ phân cách bộ lọc"
 
-#: top/top_nls.c:459
+#: top/top_nls.c:472
 #, c-format
 msgid "'%s' filter value is missing"
 msgstr "“%s” thiếu giá trị lọc"
 
-#: top/top_nls.c:460
+#: top/top_nls.c:473
 msgid "include"
 msgstr "bao gồm"
 
-#: top/top_nls.c:461
+#: top/top_nls.c:474
 msgid "exclude"
 msgstr "loại trừ"
 
-#: top/top_nls.c:462
+#: top/top_nls.c:475
 #, c-format
 msgid "<Enter> to resume, filters: %s"
 msgstr "Bấm <Enter> để phục hồi, các bộ lọc: %s"
 
-#: top/top_nls.c:463
+#: top/top_nls.c:476
 msgid "none"
 msgstr "không"
 
 #. Translation Hint: The following word 'Node' should be exactly 4 characters
-#: top/top_nls.c:465
+#: top/top_nls.c:478
 #, c-format
 msgid "Node%-2d:"
 msgstr "Nút %-2d:"
 
-#: top/top_nls.c:466
+#: top/top_nls.c:479
 #, c-format
 msgid "expand which node (0-%d)"
 msgstr "mở rộng nút nào (0-%d)"
 
-#: top/top_nls.c:467
+#: top/top_nls.c:480
 msgid "invalid node"
 msgstr "nút không hợp lệ"
 
-#: top/top_nls.c:468
+#: top/top_nls.c:481
 msgid "sorry, NUMA extensions unavailable"
 msgstr "rất tiếc, phần mở rộng NUMA không sẵn có"
 
@@ -3131,11 +3173,11 @@
 #. .                 'Swap' represents the linux swap file --
 #. .                 please make both translations exactly 4 characters,
 #. .                 padding with extra spaces as necessary
-#: top/top_nls.c:473
+#: top/top_nls.c:486
 msgid "Mem "
 msgstr "BNhớ"
 
-#: top/top_nls.c:474
+#: top/top_nls.c:487
 msgid "Swap"
 msgstr "TĐổi"
 
@@ -3163,7 +3205,7 @@
 #. .  please see the prologue to the show_special function in the top.c
 #. .  source file.
 #. .
-#: top/top_nls.c:508
+#: top/top_nls.c:521
 #, c-format
 msgid ""
 "Help for Interactive Commands~2 - %s\n"
@@ -3244,7 +3286,7 @@
 #. Translation Hint: As is true for the text above, the "keys" shown to the left and
 #. .                 also imbedded in the translatable text (along with escape seqs)
 #. .                 should never themselves be translated.
-#: top/top_nls.c:536
+#: top/top_nls.c:549
 msgid ""
 "  k,r       Manipulate tasks: '~1k~2' kill; '~1r~2' renice\n"
 "  d or s    Set update interval\n"
@@ -3252,7 +3294,7 @@
 "  k,r       Thao tác với các nhiệm vụ: “~1k~2” kill; “~1r~2” renice\n"
 "  d hay s   Đặt thời gian cập nhật\n"
 
-#: top/top_nls.c:540
+#: top/top_nls.c:553
 #, c-format
 msgid ""
 "Help for Windows / Field Groups~2 - \"Current Window\" = ~1 %s ~6\n"
@@ -3363,7 +3405,7 @@
 #. .     --> "   0~2 = black,~1  1~2 = red,    ~1  2~2 = gree
 #. .     --> "   4~2 = blue, ~1  5~2 = magenta,~1  6~2 = cyan
 #. .
-#: top/top_nls.c:590
+#: top/top_nls.c:603
 #, c-format
 msgid ""
 "Help for color mapping~2 - %s\n"
@@ -3422,7 +3464,7 @@
 "   “a” hay “w” để chuyển giao & thay đổi khác, <Enter> để chuyển giao và kết "
 "thúc "
 
-#: top/top_nls.c:616
+#: top/top_nls.c:629
 #, c-format
 msgid ""
 "Fields Management~2 for window ~1%s~6, whose current sort field is ~1%s~2\n"
@@ -3437,7 +3479,7 @@
 "   “d” hay <Phím cách> để bật tắt hiển thị, “s” đặt sắp xếp.  Dùng “q” hay "
 "<Esc> để kết thúc!\n"
 
-#: top/top_nls.c:621
+#: top/top_nls.c:634
 #, c-format
 msgid ""
 "%s:~3 %3u ~2total,~3 %3u ~2running,~3 %3u ~2sleeping,~3 %3u ~2stopped,~3 %3u "
@@ -3445,7 +3487,7 @@
 msgstr ""
 "%s:~3 %3u ~2tổng,~3 %3u ~2chạy,~3 %3u ~2ngủ,~3 %3u ~2dừng,~3 %3u ~2ma~3\n"
 
-#: top/top_nls.c:624
+#: top/top_nls.c:637
 #, c-format
 msgid ""
 "%%%s~3 %#5.1f  ~2user,~3 %#5.1f  ~2system,~3 %#5.1f  ~2nice,~3 %#5.1f  "
@@ -3454,7 +3496,7 @@
 "%%%s~3 %#5.1f  ~2ngdùng,~3 %#5.1f  ~2hthống,~3 %#5.1f  ~2nice,~3 %#5.1f  "
 "~2nghỉ~3\n"
 
-#: top/top_nls.c:627
+#: top/top_nls.c:640
 #, c-format
 msgid ""
 "%%%s~3 %#5.1f  ~2user,~3 %#5.1f  ~2system,~3 %#5.1f  ~2nice,~3 %#5.1f  "
@@ -3466,7 +3508,7 @@
 #. Translation Hint: Only the following abbreviations need be translated
 #. .                 us = user, sy = system, ni = nice, id = idle, wa = wait,
 #. .                 hi hardware interrupt, si = software interrupt
-#: top/top_nls.c:633
+#: top/top_nls.c:646
 #, c-format
 msgid ""
 "%%%s~3 %#5.1f ~2us,~3 %#5.1f ~2sy,~3 %#5.1f ~2ni,~3 %#5.1f ~2id,~3 %#5.1f "
@@ -3478,7 +3520,7 @@
 #. Translation Hint: Only the following abbreviations need be translated
 #. .                 us = user, sy = system, ni = nice, id = idle, wa = wait,
 #. .                 hi hardware interrupt, si = software interrupt, st = steal time
-#: top/top_nls.c:639
+#: top/top_nls.c:652
 #, c-format
 msgid ""
 "%%%s~3%#5.1f ~2us,~3%#5.1f ~2sy,~3%#5.1f ~2ni,~3%#5.1f ~2id,~3%#5.1f ~2wa,"
@@ -3487,7 +3529,7 @@
 "%%%s~3%#5.1f ~2us,~3%#5.1f ~2sy,~3%#5.1f ~2ni,~3%#5.1f ~2id,~3%#5.1f ~2wa,"
 "~3%#5.1f ~2hi,~3%#5.1f ~2si,~3%#5.1f ~2st~3\n"
 
-#: top/top_nls.c:642
+#: top/top_nls.c:655
 #, c-format
 msgid ""
 "%s %s:~3 %9.9s~2total,~3 %9.9s~2free,~3 %9.9s~2used,~3 %9.9s~2buff/cache~3\n"
@@ -3496,7 +3538,7 @@
 "%s %s:~3 %9.9s~2tổng,~3 %9.9s~2trống,~3 %9.9s~2dùng,~3 %9.9s~2bộđệm/tạm~3\n"
 "%s %s:~3 %9.9s~2tổng,~3 %9.9s~2trống,~3 %9.9s~2dùng.~3 %9.9s~2%s sẵnsàng~3\n"
 
-#: top/top_nls.c:646
+#: top/top_nls.c:659
 #, fuzzy, c-format
 msgid ""
 "Inspection~2 Pause at: pid ~1%d~6, running ~1%s~6\n"
@@ -3510,7 +3552,7 @@
 "“q” hay <Esc> để ~1thoát~5 !\n"
 "Tùy chọn~2: ~1%s\n"
 
-#: top/top_nls.c:651
+#: top/top_nls.c:664
 #, fuzzy, c-format
 msgid ""
 "Inspection~2 View at pid: ~1%s~3, running ~1%s~3.  Locating: ~1%s~6\n"
@@ -4059,94 +4101,99 @@
 msgid " -v, --version  output version information and exit\n"
 msgstr " -v, --version  hiển thị thông tin phiên bản rồi thoát\n"
 
-#: watch.c:376
+#: watch.c:384
 #, c-format
 msgid "Every %.1fs: "
 msgstr "Mỗi %.1fs: "
 
-#: watch.c:437
+#: watch.c:385
+#, c-format
+msgid "%s: %s"
+msgstr ""
+
+#: watch.c:456
 msgid "unable to create IPC pipes"
 msgstr "không thể tạo đường ống IPC"
 
-#: watch.c:447
+#: watch.c:466
 msgid "unable to fork process"
 msgstr "không thể rẽ nhánh tiến trình"
 
-#: watch.c:452
+#: watch.c:471
 msgid "dup2 failed"
 msgstr "dup2 bị lỗi"
 
-#: watch.c:459
+#: watch.c:478
 #, c-format
 msgid "unable to execute '%s'"
 msgstr "không thể thực hiện “%s”"
 
-#: watch.c:476
+#: watch.c:495
 msgid "fdopen"
 msgstr "fdopen"
 
-#: watch.c:622
+#: watch.c:641
 msgid "waitpid"
 msgstr "waitpid"
 
-#: watch.c:630
+#: watch.c:649
 msgid "command exit with a non-zero status, press a key to exit"
 msgstr "lệnh kết thúc với mã thoát khác không, hãy bấm phím bất kỳ để thoát"
 
-#: watch.c:755
+#: watch.c:773
 #, c-format
 msgid "unicode handling error\n"
 msgstr "xử lý unicode gặp lỗi\n"
 
-#: watch.c:761
+#: watch.c:779
 #, c-format
 msgid "unicode handling error (malloc)\n"
 msgstr "xử lý unicode gặp lỗi (malloc)\n"
 
-#: w.c:241 w.c:256
+#: w.c:245 w.c:260
 #, c-format
 msgid " %2ludays"
 msgstr " %2lungày"
 
 #. Translation Hint: Minutes:Seconds
 #. Translation Hint: Hours:Minutes
-#: w.c:250 w.c:260
+#: w.c:254 w.c:264
 #, c-format
 msgid " %2lu:%02um"
 msgstr " %2lu:%02uphút"
 
 #. Translation Hint: Seconds:Centiseconds
-#: w.c:268
+#: w.c:272
 #, c-format
 msgid " %2lu.%02us"
 msgstr " %2lu.%02ugiây"
 
-#: w.c:451
+#: w.c:455
 msgid " -h, --no-header     do not print header\n"
 msgstr " -h, --no-header     không in phần đầu\n"
 
-#: w.c:452
+#: w.c:456
 msgid " -u, --no-current    ignore current process username\n"
 msgstr " -u, --no-current    bỏ qua tiến trình từ người dùng hiện tại\n"
 
-#: w.c:453
+#: w.c:457
 msgid " -s, --short         short format\n"
 msgstr " -s, --short         định dạng ngắn gọn\n"
 
-#: w.c:454
+#: w.c:458
 msgid " -f, --from          show remote hostname field\n"
 msgstr " -f, --from          hiển thị trường tên máy chủ\n"
 
-#: w.c:455
+#: w.c:459
 msgid " -o, --old-style     old style output\n"
 msgstr " -o, --old-style     hiển thị kiểu cũ\n"
 
-#: w.c:456
+#: w.c:460
 msgid ""
 " -i, --ip-addr       display IP address instead of hostname (if possible)\n"
 msgstr " -i, --ip-addr       hiển thị địa chỉ IP thay cho tên máy (nếu được)\n"
 
-#: w.c:553
+#: w.c:557
 #, c-format
 msgid ""
 "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n"
@@ -4154,7 +4201,7 @@
 "“chiều dài biến môi trường của người dùng” PROCPS_USERLEN phải nằm giữa 8 và "
 "%d, nên bỏ qua\n"
 
-#: w.c:563
+#: w.c:567
 #, c-format
 msgid ""
 "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n"
@@ -4164,21 +4211,21 @@
 
 #. Translation Hint: Following five uppercase messages are
 #. * headers. Try to keep alignment intact.
-#: w.c:587
+#: w.c:591
 #, c-format
 msgid "%-*s TTY      "
 msgstr "%-*s TTY      "
 
-#: w.c:589
+#: w.c:593
 msgid "FROM"
 msgstr "TỪ"
 
-#: w.c:591
+#: w.c:595
 #, c-format
 msgid "  LOGIN@   IDLE   JCPU   PCPU WHAT\n"
 msgstr " ĐNHẬP@      NGHỈ   JCPU   PCPU   GÌ\n"
 
-#: w.c:593
+#: w.c:597
 #, c-format
 msgid "   IDLE WHAT\n"
 msgstr "   NGHỈ GÌ\n"
@@ -4225,12 +4272,27 @@
 msgid "%s from %s\n"
 msgstr "%s nằm trong gói phần mềm “%s”.\n"
 
+#~ msgid "seconds argument `%s' failed"
+#~ msgstr "đối số thứ hai “%s” bị lỗi"
+
 #~ msgid "alternate System.map file must follow -n"
 #~ msgstr "tập tin System.map thay thế phải theo sau -n"
 
 #~ msgid "alternate System.map file must follow N"
 #~ msgstr "tập tin System.map thay thế phải theo sau N"
 
+#~ msgid "Adj"
+#~ msgstr "Sửa"
+
+#~ msgid "oom_adjustment (2^X)"
+#~ msgstr "oom_adjustment (2^X)"
+
+#~ msgid "Badness"
+#~ msgstr "Tồi"
+
+#~ msgid "oom_score (badness)"
+#~ msgstr "oom_score (tồi)"
+
 #~ msgid "%d column window is too narrow"
 #~ msgstr "cửa sổ %d cột là quá hẹp"
 
Binary files /tmp/tmpsmX0gC/RRPDCxm9wk/procps-3.3.11/po/zh_CN.gmo and /tmp/tmpsmX0gC/hzIsJzyyeF/procps-3.3.12/po/zh_CN.gmo differ
diff -Nru procps-3.3.11/po/zh_CN.po procps-3.3.12/po/zh_CN.po
--- procps-3.3.11/po/zh_CN.po	1970-01-01 00:00:00.000000000 +0000
+++ procps-3.3.12/po/zh_CN.po	2016-07-10 06:40:26.000000000 +0000
@@ -0,0 +1,4263 @@
+# procps-ng in zh_CN
+# Copyright (C) 2015 Free Software Foundation, Inc.
+# This file is distributed under the same license as the procps-ng package.
+# Mingye Wang <arthur200126@gmail.com>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: procps-ng 3.3.10-rc1\n"
+"Report-Msgid-Bugs-To: procps@freelists.org\n"
+"POT-Creation-Date: 2016-07-10 08:19+1000\n"
+"PO-Revision-Date: 2015-10-30 09:39-0400\n"
+"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.4\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: free.c:74 slabtop.c:189 uptime.c:59 w.c:453
+#, c-format
+msgid " %s [options]\n"
+msgstr " %s [选项]\n"
+
+#: free.c:76
+msgid " -b, --bytes         show output in bytes\n"
+msgstr " -b, --bytes         以字节显示输出\n"
+
+#: free.c:77
+#, fuzzy
+msgid "     --kilo          show output in kilobytes\n"
+msgstr " -k, --kilo          以千字节显示输出\n"
+
+#: free.c:78
+#, fuzzy
+msgid "     --mega          show output in megabytes\n"
+msgstr " -m, --mega          以兆字节显示输出\n"
+
+#: free.c:79
+#, fuzzy
+msgid "     --giga          show output in gigabytes\n"
+msgstr " -g, --giga          以吉字节显示输出\n"
+
+#: free.c:80
+msgid "     --tera          show output in terabytes\n"
+msgstr ""
+
+#: free.c:81
+#, fuzzy
+msgid "     --peta          show output in petabytes\n"
+msgstr " -m, --mega          以兆字节显示输出\n"
+
+#: free.c:82
+#, fuzzy
+msgid " -k, --kibi          show output in kibibytes\n"
+msgstr " -k, --kilo          以千字节显示输出\n"
+
+#: free.c:83
+#, fuzzy
+msgid " -m, --mebi          show output in mebibytes\n"
+msgstr " -m, --mega          以兆字节显示输出\n"
+
+#: free.c:84
+#, fuzzy
+msgid " -g, --gibi          show output in gibibytes\n"
+msgstr " -g, --giga          以吉字节显示输出\n"
+
+#: free.c:85
+#, fuzzy
+msgid "     --tebi          show output in tebibytes\n"
+msgstr " -b, --bytes         以字节显示输出\n"
+
+#: free.c:86
+#, fuzzy
+msgid "     --pebi          show output in pebibytes\n"
+msgstr " -k, --kilo          以千字节显示输出\n"
+
+#: free.c:87
+msgid " -h, --human         show human-readable output\n"
+msgstr ""
+
+#: free.c:88
+msgid "     --si            use powers of 1000 not 1024\n"
+msgstr ""
+
+#: free.c:89
+msgid " -l, --lohi          show detailed low and high memory statistics\n"
+msgstr ""
+
+#: free.c:90
+msgid " -t, --total         show total for RAM + swap\n"
+msgstr ""
+
+#: free.c:91
+msgid " -s N, --seconds N   repeat printing every N seconds\n"
+msgstr ""
+
+#: free.c:92
+msgid " -c N, --count N     repeat printing N times, then exit\n"
+msgstr ""
+
+#: free.c:93
+msgid " -w, --wide          wide output\n"
+msgstr " -w, --wide          宽版输出\n"
+
+#: free.c:95 w.c:462
+#, fuzzy
+msgid "     --help     display this help and exit\n"
+msgstr "      --help\t\t显示此帮助信息并退出\n"
+
+#: free.c:198
+msgid "Multiple unit options doesn't make sense."
+msgstr ""
+
+#: free.c:330
+#, fuzzy, c-format
+msgid "seconds argument `%s' is not positive number"
+msgstr "无效的秒数：%s"
+
+#: free.c:336
+#, fuzzy
+msgid "failed to parse count argument"
+msgstr "模板实参表语法错误"
+
+#: free.c:339
+#, fuzzy, c-format
+msgid "failed to parse count argument: '%s'"
+msgstr "查询 spec 文件 %s 失败，无法解析\n"
+
+#: free.c:360
+#, c-format
+msgid ""
+"              total        used        free      shared     buffers       "
+"cache   available"
+msgstr ""
+"              总计         已用        空闲      共享       缓冲          缓"
+"存    可用"
+
+#: free.c:362
+#, c-format
+msgid ""
+"              total        used        free      shared  buff/cache   "
+"available"
+msgstr ""
+"              总计         已用        空闲      共享    缓冲/缓存    可用"
+
+#: free.c:365
+msgid "Mem:"
+msgstr "内存："
+
+#: free.c:385
+msgid "Low:"
+msgstr "低："
+
+#: free.c:391
+msgid "High:"
+msgstr "高："
+
+#: free.c:398
+msgid "Swap:"
+msgstr "交换："
+
+#: free.c:405
+msgid "Total:"
+msgstr "总量："
+
+#: lib/fileutils.c:38
+msgid "write error"
+msgstr "写入错误"
+
+#: pgrep.c:103
+#, fuzzy, c-format
+msgid " %s [options] <pattern>\n"
+msgstr "通配符模式用于排除"
+
+#: pgrep.c:106
+msgid " -d, --delimiter <string>  specify output delimiter\n"
+msgstr ""
+
+#: pgrep.c:107
+msgid " -l, --list-name           list PID and process name\n"
+msgstr ""
+
+#: pgrep.c:108
+msgid " -a, --list-full           list PID and full command line\n"
+msgstr ""
+
+#: pgrep.c:109
+#, fuzzy
+msgid " -v, --inverse             negates the matching\n"
+msgstr "对%<%T::%s(%A)%#V%>的调用没有匹配的函数"
+
+#: pgrep.c:110
+msgid " -w, --lightweight         list all TID\n"
+msgstr ""
+
+#: pgrep.c:113
+msgid " -<sig>, --signal <sig>    signal to send (either number or name)\n"
+msgstr ""
+
+#: pgrep.c:114
+msgid " -e, --echo                display what is killed\n"
+msgstr ""
+
+#: pgrep.c:116
+#, fuzzy
+msgid " -c, --count               count of matching processes\n"
+msgstr "只印出各文件匹配列的计数"
+
+#: pgrep.c:117
+msgid " -f, --full                use full process name to match\n"
+msgstr ""
+
+#: pgrep.c:118
+msgid " -g, --pgroup <PGID,...>   match listed process group IDs\n"
+msgstr ""
+
+#: pgrep.c:119
+msgid " -G, --group <GID,...>     match real group IDs\n"
+msgstr ""
+
+#: pgrep.c:120
+msgid " -i, --ignore-case         match case insensitively\n"
+msgstr ""
+
+#: pgrep.c:121
+msgid " -n, --newest              select most recently started\n"
+msgstr ""
+
+#: pgrep.c:122
+msgid " -o, --oldest              select least recently started\n"
+msgstr ""
+
+#: pgrep.c:123
+msgid ""
+" -P, --parent <PPID,...>   match only child processes of the given parent\n"
+msgstr ""
+
+#: pgrep.c:124
+msgid " -s, --session <SID,...>   match session IDs\n"
+msgstr ""
+
+#: pgrep.c:125
+msgid " -t, --terminal <tty,...>  match by controlling terminal\n"
+msgstr ""
+
+#: pgrep.c:126
+msgid " -u, --euid <ID,...>       match by effective IDs\n"
+msgstr ""
+
+#: pgrep.c:127
+msgid " -U, --uid <ID,...>        match by real IDs\n"
+msgstr ""
+
+#: pgrep.c:128
+msgid " -x, --exact               match exactly with the command name\n"
+msgstr ""
+
+#: pgrep.c:129
+msgid " -F, --pidfile <file>      read PIDs from file\n"
+msgstr ""
+
+#: pgrep.c:130
+msgid " -L, --logpidfile          fail if PID file is not locked\n"
+msgstr ""
+
+#: pgrep.c:131
+msgid ""
+" --ns <PID>                match the processes that belong to the same\n"
+"                           namespace as <pid>\n"
+msgstr ""
+
+#: pgrep.c:133
+msgid ""
+" --nslist <ns,...>         list which namespaces will be considered for\n"
+"                           the --ns option.\n"
+"                           Available namespaces: ipc, mnt, net, pid, user, "
+"uts\n"
+msgstr ""
+
+#: pgrep.c:274
+#, fuzzy, c-format
+msgid "invalid user name: %s"
+msgstr "无用户名: %s\n"
+
+#: pgrep.c:291
+#, fuzzy, c-format
+msgid "invalid group name: %s"
+msgstr "无效的组列表%s"
+
+#: pgrep.c:302
+#, fuzzy, c-format
+msgid "invalid process group: %s"
+msgstr "无效的组：%s"
+
+#: pgrep.c:314
+#, fuzzy, c-format
+msgid "invalid session id: %s"
+msgstr "%s：无效的进程号"
+
+#: pgrep.c:326
+#, fuzzy, c-format
+msgid "not a number: %s"
+msgstr "%s：错误的编号：%s"
+
+#: pgrep.c:507
+msgid "Error reading reference namespace information\n"
+msgstr ""
+
+#: pgrep.c:610 pidof.c:230 pidof.c:271 sysctl.c:643
+#, fuzzy
+msgid "internal error"
+msgstr "内部错误"
+
+#: pgrep.c:876
+#, c-format
+msgid ""
+"-L without -F makes no sense\n"
+"Try `%s --help' for more information."
+msgstr ""
+
+#: pgrep.c:883
+#, fuzzy, c-format
+msgid ""
+"pidfile not valid\n"
+"Try `%s --help' for more information."
+msgstr "尝试“%s --help”以获得更多信息。\n"
+
+#: pgrep.c:891
+#, c-format
+msgid ""
+"only one pattern can be provided\n"
+"Try `%s --help' for more information."
+msgstr ""
+
+#: pgrep.c:895
+#, c-format
+msgid ""
+"no matching criteria specified\n"
+"Try `%s --help' for more information."
+msgstr ""
+
+#: pgrep.c:922
+#, fuzzy, c-format
+msgid "%s killed (pid %lu)\n"
+msgstr "%s：第%lu 次，共%lu 次 (%s)..."
+
+#: pgrep.c:928
+#, c-format
+msgid "killing pid %ld failed"
+msgstr ""
+
+#: pidof.c:61
+#, fuzzy, c-format
+msgid " %s [options] [program [...]]\n"
+msgstr "  %s 的选项：\n"
+
+#: pidof.c:63
+msgid " -s, --single-shot         return one PID only\n"
+msgstr ""
+
+#: pidof.c:64
+msgid " -c, --check-root          omit processes with different root\n"
+msgstr ""
+
+#: pidof.c:65
+msgid " -x                        also find shells running the named scripts\n"
+msgstr ""
+
+#: pidof.c:66
+msgid " -o, --omit-pid <PID,...>  omit processes with PID\n"
+msgstr ""
+
+#: pidof.c:274
+#, c-format
+msgid "illegal omit pid value (%s)!\n"
+msgstr ""
+
+#: pmap.c:61
+msgid "Address"
+msgstr "住址"
+
+#: pmap.c:62
+#, fuzzy
+msgid "Offset"
+msgstr "字符偏移量为零"
+
+#: pmap.c:63
+#, fuzzy
+msgid "Device"
+msgstr "<设备>"
+
+#: pmap.c:64
+#, fuzzy
+msgid "Mapping"
+msgstr "内核不支持 loop-AES 兼容映射。\n"
+
+#: pmap.c:68
+msgid "Perm"
+msgstr ""
+
+#: pmap.c:69
+#, fuzzy
+msgid "Inode"
+msgstr "设备：%Dh/%dd\tInode：%-10i  硬链接：%h\n"
+
+#: pmap.c:72
+msgid "Kbytes"
+msgstr ""
+
+#: pmap.c:73
+#, fuzzy
+msgid "Mode"
+msgstr ""
+"  -m, --mode=模式   \t设置权限模式(类似chmod)，而不是rwxrwxrwx 减umask\n"
+
+#: pmap.c:74
+#, fuzzy
+msgid "RSS"
+msgstr ""
+"内存\n"
+"  Vsize：      %-10s\n"
+"  RSS：        %-10s\t\t RSS 限制：%s\n"
+"  程序开始：   %#-10lx\t\t 程序停止： %#-10lx\n"
+"  堆栈开始：   %#-10lx\n"
+"  堆栈指针 (ESP)：%#10lx\t 指令指针 (EIP)：%#10lx\n"
+
+#: pmap.c:75
+msgid "Dirty"
+msgstr ""
+
+#: pmap.c:109
+#, fuzzy, c-format
+msgid " %s [options] PID [PID ...]\n"
+msgstr "%*s 用户     进程号 权限   命令\n"
+
+#: pmap.c:111
+msgid " -x, --extended              show details\n"
+msgstr ""
+
+#: pmap.c:112
+msgid " -X                          show even more details\n"
+msgstr ""
+
+#: pmap.c:113
+msgid "            WARNING: format changes according to /proc/PID/smaps\n"
+msgstr ""
+
+#: pmap.c:114
+msgid " -XX                         show everything the kernel provides\n"
+msgstr ""
+
+#: pmap.c:115
+msgid " -c, --read-rc               read the default rc\n"
+msgstr ""
+
+#: pmap.c:116
+msgid " -C, --read-rc-from=<file>   read the rc from file\n"
+msgstr ""
+
+#: pmap.c:117
+msgid " -n, --create-rc             create new default rc\n"
+msgstr ""
+
+#: pmap.c:118
+msgid " -N, --create-rc-to=<file>   create new rc to file\n"
+msgstr ""
+
+#: pmap.c:119
+msgid "            NOTE: pid arguments are not allowed with -n, -N\n"
+msgstr ""
+
+#: pmap.c:120
+#, fuzzy
+msgid " -d, --device                show the device format\n"
+msgstr "显示设备状态"
+
+#: pmap.c:121
+msgid " -q, --quiet                 do not display header and footer\n"
+msgstr ""
+
+#: pmap.c:122
+msgid " -p, --show-path             show path in the mapping\n"
+msgstr ""
+
+#: pmap.c:123
+msgid " -A, --range=<low>[,<high>]  limit results to the given range\n"
+msgstr ""
+
+#: pmap.c:201
+#, fuzzy
+msgid "shared memory detach"
+msgstr "共享内存对象"
+
+#: pmap.c:205
+#, fuzzy
+msgid "shared memory remove"
+msgstr "共享内存对象"
+
+#: pmap.c:238
+msgid "  [ anon ]"
+msgstr ""
+
+#: pmap.c:240
+#, fuzzy
+msgid "  [ stack ]"
+msgstr "栈错误"
+
+#: pmap.c:325
+#, fuzzy
+msgid "Unknown format in smaps file!"
+msgstr "未知的格式类型“%s”"
+
+#: pmap.c:368
+msgid "inconsistent detail field in smaps file, line:\n"
+msgstr ""
+
+#: pmap.c:714
+#, fuzzy
+msgid "total kB"
+msgstr "总用量"
+
+#: pmap.c:725
+#, c-format
+msgid "mapped: %ldK    writeable/private: %ldK    shared: %ldK\n"
+msgstr ""
+
+#. Translation Hint: keep total string length
+#. * as 24 characters. Adjust %16 if needed
+#: pmap.c:734
+#, fuzzy, c-format
+msgid " total %16ldK\n"
+msgstr "总用量"
+
+#. Translation Hint: keep total string length
+#. * as 16 characters. Adjust %8 if needed
+#: pmap.c:740
+#, fuzzy, c-format
+msgid " total %8ldK\n"
+msgstr "总用量"
+
+#: pmap.c:767 skill.c:500 skill.c:534 skill.c:621 tload.c:128 tload.c:133
+#: vmstat.c:959 vmstat.c:968 watch.c:726
+#, fuzzy
+msgid "failed to parse argument"
+msgstr "模板实参表语法错误"
+
+#: pmap.c:811
+#, fuzzy, c-format
+msgid "config line too long - line %d"
+msgstr "输入行太长"
+
+#: pmap.c:836
+#, c-format
+msgid "unsupported section found in the config - line %d"
+msgstr ""
+
+#: pmap.c:839 pmap.c:850 pmap.c:861 pmap.c:880 pmap.c:892
+#, fuzzy, c-format
+msgid "syntax error found in the config - line %d"
+msgstr "脚本“%s”: 语法错误发生于第 %d 列 %s%s\n"
+
+#: pmap.c:911
+msgid "the file already exists - delete or rename it first"
+msgstr ""
+
+#: pmap.c:974
+#, fuzzy
+msgid "HOME variable undefined"
+msgstr "TY 中未定义的变量"
+
+#: pmap.c:982
+#, fuzzy
+msgid "memory allocation failed"
+msgstr "内存分配失败"
+
+#: pmap.c:1034
+#, fuzzy
+msgid "option -r is ignored as SunOS compatibility"
+msgstr "为 GCC 链接器选项兼容性忽略"
+
+#: pmap.c:1081
+msgid "options -c, -C, -d, -n, -N, -x, -X are mutually exclusive"
+msgstr ""
+
+#: pmap.c:1084
+msgid "options -p, -q are mutually exclusive with -n, -N"
+msgstr ""
+
+#: pmap.c:1087
+msgid "too many arguments"
+msgstr "实参太多"
+
+#: pmap.c:1091
+msgid "rc file successfully created, feel free to edit the content"
+msgstr ""
+
+#: pmap.c:1094
+#, fuzzy
+msgid "couldn't create the rc file"
+msgstr "无法创建临时文件"
+
+#: pmap.c:1106
+#, c-format
+msgid "~/.%src file successfully created, feel free to edit the content"
+msgstr ""
+
+#: pmap.c:1109
+#, fuzzy, c-format
+msgid "couldn't create ~/.%src"
+msgstr "无法为 %s建立管道： %m\n"
+
+#: pmap.c:1114
+#, fuzzy
+msgid "argument missing"
+msgstr "%2$q+#D的第 %1$P 个形参缺少默认实参"
+
+#: pmap.c:1128
+#, fuzzy
+msgid "couldn't read the rc file"
+msgstr "%s：无法读取区块 %llu\n"
+
+#: pmap.c:1130
+#, fuzzy, c-format
+msgid "couldn't read ~/.%src"
+msgstr "%s：无法读取区块 %llu\n"
+
+#: ps/display.c:54
+#, fuzzy, c-format
+msgid "Signal %d (%s) caught by %s (%s).\n"
+msgstr "%s(%s%d) 被信号 %d 杀死\n"
+
+#: ps/display.c:66 ps/display.c:271 ps/parser.c:495 ps/parser.c:742
+#: ps/select.c:95 ps/sortformat.c:544
+#, fuzzy
+msgid "please report this bug"
+msgstr "请报告该 BUG。\n"
+
+#: ps/display.c:356
+#, fuzzy, c-format
+msgid "error: not enough memory\n"
+msgstr "没有足够的内存进行重定位排序"
+
+#: ps/display.c:367 ps/display.c:542
+#, c-format
+msgid "error: can not access /proc\n"
+msgstr ""
+
+#: ps/display.c:417
+#, fuzzy, c-format
+msgid "could not find start_time\n"
+msgstr "找不到类%qE"
+
+#: ps/display.c:428
+#, fuzzy, c-format
+msgid "could not find ppid\n"
+msgstr "找不到类%qE"
+
+#: ps/global.c:169
+#, c-format
+msgid "your %dx%d screen size is bogus. expect trouble\n"
+msgstr ""
+
+#: ps/global.c:242 ps/global.c:254
+#, fuzzy
+msgid "environment specified an unknown personality"
+msgstr "初始值设定项里有未知的字段%qE"
+
+#: ps/global.c:246
+#, fuzzy, c-format
+msgid "cannot strdup() personality text\n"
+msgstr "无法推断 CD-Text 文件名"
+
+#. Translation Note:
+#. . The following translatable word will be used to recognize the
+#. . user's request for help text.  In other words, the translation
+#. . you provide will alter program behavior.
+#. .
+#. . It must be limited to 15 characters or less.
+#.
+#: ps/global.c:401
+msgid "help"
+msgstr "help"
+
+#. Translation Notes for ps Help #1 ---------------------------------
+#. .  This next group of lines represents 6 pairs of words + abbreviations
+#. .  which are the basis of the 'ps' program help text.
+#. .
+#. .  The words and abbreviations you provide will alter program behavior.
+#. .  They will also appear in the help usage summary associated with the
+#. .  "Notes for ps Help #2" below.
+#. .
+#. .  In their English form, help text would look like this:
+#. .      Try 'ps --help <simple|list|output|threads|misc|all>'
+#. .       or 'ps --help <s|l|o|t|m|a>'
+#. .      for additional help text.
+#. .
+#. .  When translating these 6 pairs you may choose any appropriate
+#. .  language equivalents and the only requirement is the abbreviated
+#. .  representations must be unique.
+#. .
+#. .  By default, those abbreviations are single characters.  However,
+#. .  they are not limited to only one character after translation.
+#. .
+#. Translation Hint, Pair #1
+#: ps/help.c:63
+#, fuzzy
+msgid "simple"
+msgstr "简单的 IF"
+
+#: ps/help.c:63
+msgid "s"
+msgstr "s"
+
+#. Translation Hint, Pair #2
+#: ps/help.c:65
+#, fuzzy
+msgid "list"
+msgstr "LIST"
+
+#: ps/help.c:65
+#, fuzzy
+msgid "l"
+msgstr "L"
+
+#. Translation Hint, Pair #3
+#: ps/help.c:67
+#, fuzzy
+msgid "output"
+msgstr "输出"
+
+#: ps/help.c:67
+#, fuzzy
+msgid "o"
+msgstr "%s%s 预期为 %#o 却找到 %#o"
+
+#. Translation Hint, Pair #4
+#: ps/help.c:69
+#, fuzzy
+msgid "threads"
+msgstr "不能同时使用 mthreads 和 mlegacy-threads"
+
+#: ps/help.c:69
+#, fuzzy
+msgid "t"
+msgstr "二"
+
+#. Translation Hint, Pair #5
+#: ps/help.c:71
+#, fuzzy
+msgid "misc"
+msgstr "杂项             "
+
+#: ps/help.c:71
+#, fuzzy
+msgid "m"
+msgstr "M"
+
+#. Translation Hint, Pair #6
+#: ps/help.c:73
+#, fuzzy
+msgid "all"
+msgstr "所有"
+
+#: ps/help.c:73
+msgid "a"
+msgstr ""
+
+#: ps/help.c:94
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr "用法：%s [选项]... main类名 [输出文件]\n"
+
+#: ps/help.c:99
+#, fuzzy
+msgid ""
+"\n"
+"Basic options:\n"
+msgstr " 选项为：\n"
+
+#: ps/help.c:100
+#, fuzzy
+msgid " -A, -e               all processes\n"
+msgstr "未发现进程。\n"
+
+#: ps/help.c:101
+msgid " -a                   all with tty, except session leaders\n"
+msgstr ""
+
+#: ps/help.c:102
+msgid "  a                   all with tty, including other users\n"
+msgstr ""
+
+#: ps/help.c:103
+msgid " -d                   all except session leaders\n"
+msgstr ""
+
+#: ps/help.c:104
+#, fuzzy
+msgid " -N, --deselect       negate selection\n"
+msgstr "N  使用文件名选择窗口..................."
+
+#: ps/help.c:105
+#, fuzzy
+msgid "  r                   only running processes\n"
+msgstr "“u”只在使用“r”选项的时候才有意义。"
+
+#: ps/help.c:106
+msgid "  T                   all processes on this terminal\n"
+msgstr ""
+
+#: ps/help.c:107
+msgid "  x                   processes without controlling ttys\n"
+msgstr ""
+
+#: ps/help.c:110
+#, fuzzy
+msgid ""
+"\n"
+"Selection by list:\n"
+msgstr "需要选择语句"
+
+#: ps/help.c:111
+#, fuzzy
+msgid " -C <command>         command name\n"
+msgstr "标准命令"
+
+#: ps/help.c:112
+msgid " -G, --Group <GID>    real group id or name\n"
+msgstr ""
+
+#: ps/help.c:113
+msgid " -g, --group <group>  session or effective group name\n"
+msgstr ""
+
+#: ps/help.c:114
+msgid " -p, p, --pid <PID>   process id\n"
+msgstr ""
+
+#: ps/help.c:115
+msgid "        --ppid <PID>  parent process id\n"
+msgstr ""
+
+#: ps/help.c:116
+msgid ""
+" -q, q, --quick-pid <PID>\n"
+"                      process id (quick mode)\n"
+msgstr ""
+
+#: ps/help.c:118
+msgid " -s, --sid <session>  session id\n"
+msgstr ""
+
+#: ps/help.c:119
+msgid " -t, t, --tty <tty>   terminal\n"
+msgstr ""
+
+#: ps/help.c:120
+msgid " -u, U, --user <UID>  effective user id or name\n"
+msgstr ""
+
+#: ps/help.c:121
+msgid " -U, --User <UID>     real user id or name\n"
+msgstr ""
+
+#: ps/help.c:122
+msgid ""
+"\n"
+"  The selection options take as their argument either:\n"
+"    a comma-separated list e.g. '-u root,nobody' or\n"
+"    a blank-separated list e.g. '-p 123 4567'\n"
+msgstr ""
+
+#: ps/help.c:128
+#, fuzzy
+msgid ""
+"\n"
+"Output formats:\n"
+msgstr "警告：输入和输出格式不兼容"
+
+#: ps/help.c:129
+#, fuzzy
+msgid " -F                   extra full\n"
+msgstr "    -F, --fullname                      打印全名\n"
+
+#: ps/help.c:130
+msgid " -f                   full-format, including command lines\n"
+msgstr ""
+
+#: ps/help.c:131
+msgid "  f, --forest         ascii art process tree\n"
+msgstr ""
+
+#: ps/help.c:132
+#, fuzzy
+msgid " -H                   show process hierarchy\n"
+msgstr "显示处理钥匙圈"
+
+#: ps/help.c:133
+#, fuzzy
+msgid " -j                   jobs format\n"
+msgstr "发布寻求协助"
+
+#: ps/help.c:134
+msgid "  j                   BSD job control format\n"
+msgstr ""
+
+#: ps/help.c:135
+#, fuzzy
+msgid " -l                   long format\n"
+msgstr ""
+"\n"
+"  -l\t对指定用户输出完整的长格式信息\n"
+"  -b\t在长格式中省略用户主目录以及登录 shell\n"
+"  -h\t在长格式中省略用户的项目文件\n"
+"  -p\t在长格式中省略用户的计划文件\n"
+"  -s\t输出短格式信息(默认)\n"
+
+#: ps/help.c:136
+#, fuzzy
+msgid "  l                   BSD long format\n"
+msgstr "%s 出现在%L处的格式字符串中"
+
+#: ps/help.c:137
+msgid " -M, Z                add security data (for SELinux)\n"
+msgstr ""
+
+#: ps/help.c:138
+msgid " -O <format>          preloaded with default columns\n"
+msgstr ""
+
+#: ps/help.c:139
+msgid "  O <format>          as -O, with BSD personality\n"
+msgstr ""
+
+#: ps/help.c:140
+msgid ""
+" -o, o, --format <format>\n"
+"                      user-defined format\n"
+msgstr ""
+
+#: ps/help.c:142
+#, fuzzy
+msgid "  s                   signal format\n"
+msgstr "%s：无效的信号"
+
+#: ps/help.c:143
+msgid "  u                   user-oriented format\n"
+msgstr ""
+
+#: ps/help.c:144
+msgid "  v                   virtual memory format\n"
+msgstr ""
+
+#: ps/help.c:145
+#, fuzzy
+msgid "  X                   register format\n"
+msgstr "注册"
+
+#: ps/help.c:146
+msgid ""
+" -y                   do not show flags, show rss vs. addr (used with -l)\n"
+msgstr ""
+
+#: ps/help.c:147
+#, fuzzy
+msgid "     --context        display security context (for SELinux)\n"
+msgstr "正在更改%s 的安全环境\n"
+
+#: ps/help.c:148
+msgid "     --headers        repeat header lines, one per page\n"
+msgstr ""
+
+#: ps/help.c:149
+msgid "     --no-headers     do not print header at all\n"
+msgstr ""
+
+#: ps/help.c:150
+msgid ""
+"     --cols, --columns, --width <num>\n"
+"                      set screen width\n"
+msgstr ""
+
+#: ps/help.c:152
+msgid ""
+"     --rows, --lines <num>\n"
+"                      set screen height\n"
+msgstr ""
+
+#: ps/help.c:156
+#, fuzzy
+msgid ""
+"\n"
+"Show threads:\n"
+msgstr "[显示]S"
+
+#: ps/help.c:157
+#, fuzzy
+msgid "  H                   as if they were processes\n"
+msgstr "未发现进程。\n"
+
+#: ps/help.c:158
+msgid " -L                   possibly with LWP and NLWP columns\n"
+msgstr ""
+
+#: ps/help.c:159
+#, fuzzy
+msgid " -m, m                after processes\n"
+msgstr "‘m’标记"
+
+#: ps/help.c:160
+msgid " -T                   possibly with SPID column\n"
+msgstr ""
+
+#: ps/help.c:163
+#, fuzzy
+msgid ""
+"\n"
+"Miscellaneous options:\n"
+msgstr "杂项（未分类）"
+
+#: ps/help.c:164
+msgid " -c                   show scheduling class with -l option\n"
+msgstr ""
+
+#: ps/help.c:165
+msgid "  c                   show true command name\n"
+msgstr ""
+
+#: ps/help.c:166
+msgid "  e                   show the environment after command\n"
+msgstr ""
+
+#: ps/help.c:167
+msgid ""
+"  k,    --sort        specify sort order as: [+|-]key[,[+|-]key[,...]]\n"
+msgstr ""
+
+#: ps/help.c:168
+#, fuzzy
+msgid "  L                   show format specifiers\n"
+msgstr "%s 出现在%L处的格式字符串中"
+
+#: ps/help.c:169
+msgid "  n                   display numeric uid and wchan\n"
+msgstr ""
+
+#: ps/help.c:170
+msgid "  S,    --cumulative  include some dead child process data\n"
+msgstr ""
+
+#: ps/help.c:171
+msgid " -y                   do not show flags, show rss (only with -l)\n"
+msgstr ""
+
+#: ps/help.c:172
+#, fuzzy
+msgid " -V, V, --version     display version information and exit\n"
+msgstr ""
+"\n"
+"  -v, --version              显示程序版本然后离开"
+
+#: ps/help.c:173
+msgid " -w, w                unlimited output width\n"
+msgstr ""
+
+#: ps/help.c:174
+#, c-format
+msgid ""
+"\n"
+"        --%s <%s|%s|%s|%s|%s|%s>\n"
+"                      display help and exit\n"
+msgstr ""
+
+#. Translation Notes for ps Help #2 ---------------------------------
+#. .  Most of the following c-format string is derived from the 6
+#. .  pairs of words + chars mentioned above in "Notes for ps Help #1".
+#. .
+#. .  In its full English form, help text would look like this:
+#. .      Try 'ps --help <simple|list|output|threads|misc|all>'
+#. .       or 'ps --help <s|l|o|t|m|a>'
+#. .      for additional help text.
+#. .
+#. .  The word for "help" will be translated elsewhere.  Thus, the only
+#. .  translations below will be: "Try", "or" and "for additional...".
+#. .
+#: ps/help.c:195
+#, c-format
+msgid ""
+"\n"
+" Try '%s --%s <%s|%s|%s|%s|%s|%s>'\n"
+"  or '%s --%s <%s|%s|%s|%s|%s|%s>'\n"
+" for additional help text.\n"
+msgstr ""
+
+#: ps/help.c:208
+#, c-format
+msgid ""
+"\n"
+"For more details see ps(1).\n"
+msgstr ""
+
+#: ps/output.c:1969
+#, fuzzy, c-format
+msgid "fix bigness error\n"
+msgstr "修正"
+
+#: ps/output.c:2044
+#, fuzzy, c-format
+msgid "bad alignment code\n"
+msgstr "错误的条件码"
+
+#: ps/output.c:2106
+#, c-format
+msgid "unknown page size (assume 4096)\n"
+msgstr ""
+
+#: ps/parser.c:57
+#, fuzzy
+msgid "the option is exclusive: "
+msgstr "排他"
+
+#: ps/parser.c:87
+#, fuzzy
+msgid "process ID list syntax error"
+msgstr "%C处的参数列表语法错误"
+
+#: ps/parser.c:88 ps/parser.c:89
+#, fuzzy
+msgid "process ID out of range"
+msgstr "未指定进程号"
+
+#: ps/parser.c:102
+#, fuzzy
+msgid "user name does not exist"
+msgstr "用户%s 不存在 - 使用root\n"
+
+#: ps/parser.c:108
+#, fuzzy
+msgid "user ID out of range"
+msgstr "设置用户ID 失败"
+
+#: ps/parser.c:121
+#, fuzzy
+msgid "group name does not exist"
+msgstr "群组%s 不存在 - 使用root\n"
+
+#: ps/parser.c:127
+#, fuzzy
+msgid "group ID out of range"
+msgstr "设置组ID 失败"
+
+#: ps/parser.c:143 ps/parser.c:167
+#, fuzzy
+msgid "TTY could not be found"
+msgstr "不是一个 tty"
+
+#: ps/parser.c:169
+#, fuzzy
+msgid "list member was not a TTY"
+msgstr "项目成员列表"
+
+#: ps/parser.c:194
+#, fuzzy
+msgid "improper list"
+msgstr "LIST"
+
+#: ps/parser.c:242
+msgid "list of command names must follow -C"
+msgstr ""
+
+#: ps/parser.c:256
+msgid "list of real groups must follow -G"
+msgstr ""
+
+#: ps/parser.c:269
+msgid "list of jobs must follow -J"
+msgstr ""
+
+#: ps/parser.c:297
+msgid "format or sort specification must follow -O"
+msgstr ""
+
+#: ps/parser.c:308
+msgid "list of PRM groups must follow -R"
+msgstr ""
+
+#: ps/parser.c:327
+msgid "list of real users must follow -U"
+msgstr ""
+
+#: ps/parser.c:368
+msgid "list of session leaders OR effective group names must follow -g"
+msgstr ""
+
+#: ps/parser.c:379
+msgid "list of session leaders OR effective group IDs was invalid"
+msgstr ""
+
+#: ps/parser.c:403
+msgid "format specification must follow -o"
+msgstr ""
+
+#: ps/parser.c:409
+msgid "list of process IDs must follow -p"
+msgstr ""
+
+#: ps/parser.c:426
+#, fuzzy
+msgid "the -r option is reserved"
+msgstr "保留"
+
+#: ps/parser.c:432
+msgid "list of session IDs must follow -s"
+msgstr ""
+
+#: ps/parser.c:440
+msgid "list of terminals (pty, tty...) must follow -t"
+msgstr ""
+
+#: ps/parser.c:448
+msgid "list of users must follow -u"
+msgstr ""
+
+#: ps/parser.c:470
+msgid "must set personality to get -x option"
+msgstr ""
+
+#: ps/parser.c:485
+msgid "list of zones (contexts, labels, whatever?) must follow -z"
+msgstr ""
+
+#: ps/parser.c:492
+msgid "embedded '-' among SysV options makes no sense"
+msgstr ""
+
+#: ps/parser.c:498
+#, fuzzy
+msgid "unsupported SysV option"
+msgstr "=选项"
+
+#: ps/parser.c:511
+msgid "cannot happen - problem #1"
+msgstr ""
+
+#: ps/parser.c:515
+msgid "cannot happen - problem #2"
+msgstr ""
+
+#: ps/parser.c:517
+msgid "second chance parse failed, not BSD or SysV"
+msgstr ""
+
+#: ps/parser.c:534
+#, fuzzy
+msgid "option A is reserved"
+msgstr "保留"
+
+#: ps/parser.c:539
+#, fuzzy
+msgid "option C is reserved"
+msgstr "无效的选项“-%c”\n"
+
+#: ps/parser.c:559
+msgid "format or sort specification must follow O"
+msgstr ""
+
+#: ps/parser.c:584
+msgid "list of users must follow U"
+msgstr ""
+
+#: ps/parser.c:596
+msgid "obsolete W option not supported (you have a /dev/drum?)"
+msgstr ""
+
+#: ps/parser.c:632 ps/parser.c:899 ps/parser.c:908
+#, fuzzy
+msgid "only one heading option may be specified"
+msgstr "只能指定一个设备"
+
+#: ps/parser.c:647
+msgid "long sort specification must follow 'k'"
+msgstr ""
+
+#: ps/parser.c:675
+msgid "format specification must follow o"
+msgstr ""
+
+#: ps/parser.c:681
+msgid "list of process IDs must follow p"
+msgstr ""
+
+#: ps/parser.c:739
+msgid "embedded '-' among BSD options makes no sense"
+msgstr ""
+
+#: ps/parser.c:745
+#, fuzzy
+msgid "unsupported option (BSD syntax)"
+msgstr "不支持旧语法：%s\n"
+
+#: ps/parser.c:831 ps/parser.c:843
+#, fuzzy
+msgid "unknown gnu long option"
+msgstr "%s：不明选项 -%c\n"
+
+#: ps/parser.c:851
+msgid "list of real groups must follow --Group"
+msgstr ""
+
+#: ps/parser.c:859
+msgid "list of real users must follow --User"
+msgstr ""
+
+#: ps/parser.c:878
+msgid "number of columns must follow --cols, --width, or --columns"
+msgstr ""
+
+#: ps/parser.c:881
+msgid "option --cumulative does not take an argument"
+msgstr ""
+
+#: ps/parser.c:886
+msgid "option --deselect does not take an argument"
+msgstr ""
+
+#: ps/parser.c:898
+msgid "option --no-heading does not take an argument"
+msgstr ""
+
+#: ps/parser.c:907
+msgid "option --heading does not take an argument"
+msgstr ""
+
+#: ps/parser.c:913
+msgid "option --forest does not take an argument"
+msgstr ""
+
+#: ps/parser.c:919
+#, fuzzy
+msgid "format specification must follow --format"
+msgstr "%C处重复的格式规格"
+
+#: ps/parser.c:925
+msgid "list of effective groups must follow --group"
+msgstr ""
+
+#: ps/parser.c:943
+msgid "list of process IDs must follow --pid"
+msgstr ""
+
+#: ps/parser.c:959
+msgid "list of process IDs must follow --ppid"
+msgstr ""
+
+#: ps/parser.c:977
+msgid "number of rows must follow --rows or --lines"
+msgstr ""
+
+#: ps/parser.c:981
+msgid "some sid thing(s) must follow --sid"
+msgstr ""
+
+#: ps/parser.c:989
+msgid "long sort specification must follow --sort"
+msgstr ""
+
+#: ps/parser.c:995
+msgid "list of ttys must follow --tty"
+msgstr ""
+
+#: ps/parser.c:1003
+msgid "list of effective users must follow --user"
+msgstr ""
+
+#: ps/parser.c:1119
+#, fuzzy
+msgid "way bad"
+msgstr "错误的寄存器名"
+
+#: ps/parser.c:1133
+#, fuzzy
+msgid "garbage option"
+msgstr "(} 之后的无用数据)"
+
+#: ps/parser.c:1137
+msgid "something broke"
+msgstr ""
+
+#: ps/parser.c:1157
+msgid "thread display conflicts with forest display"
+msgstr ""
+
+#: ps/parser.c:1162
+msgid "thread flags conflict; can't use H with m or -m"
+msgstr ""
+
+#: ps/parser.c:1164
+msgid "thread flags conflict; can't use both m and -m"
+msgstr ""
+
+#: ps/parser.c:1166
+msgid "thread flags conflict; can't use both -L and -T"
+msgstr ""
+
+#: ps/parser.c:1239 ps/parser.c:1240
+#, fuzzy, c-format
+msgid "error: %s\n"
+msgstr "%K调用%qs，声明有错误属性：%s"
+
+#: ps/select.c:71
+msgid "process selection options conflict"
+msgstr ""
+
+#: ps/sortformat.c:106 ps/sortformat.c:111
+msgid "seriously crashing: goodbye cruel world"
+msgstr ""
+
+#: ps/sortformat.c:146
+msgid "improper AIX field descriptor"
+msgstr ""
+
+#: ps/sortformat.c:167
+#, fuzzy
+msgid "unknown AIX field descriptor"
+msgstr "初始值设定项里有未知的字段%qE"
+
+#: ps/sortformat.c:172
+msgid "AIX field descriptor processing bug"
+msgstr ""
+
+#: ps/sortformat.c:285
+#, c-format
+msgid "unknown user-defined format specifier \"%s\""
+msgstr ""
+
+#: ps/sortformat.c:311
+#, fuzzy
+msgid "empty format list"
+msgstr "空白标签格式"
+
+#: ps/sortformat.c:312
+#, fuzzy
+msgid "improper format list"
+msgstr "LIST"
+
+#: ps/sortformat.c:313
+msgid "column widths must be unsigned decimal numbers"
+msgstr ""
+
+#: ps/sortformat.c:314
+msgid "can not set width for a macro (multi-column) format specifier"
+msgstr ""
+
+#: ps/sortformat.c:367 ps/sortformat.c:383
+#, fuzzy
+msgid "improper sort list"
+msgstr "排序"
+
+#: ps/sortformat.c:378
+#, fuzzy
+msgid "empty sort list"
+msgstr "排序"
+
+#: ps/sortformat.c:399 ps/sortformat.c:477 ps/sortformat.c:479
+#, fuzzy
+msgid "unknown sort specifier"
+msgstr "排序"
+
+#: ps/sortformat.c:426 ps/sortformat.c:437 ps/sortformat.c:443
+#, fuzzy
+msgid "bad sorting code"
+msgstr "错误的内建代码"
+
+#: ps/sortformat.c:440
+msgid "PPID sort and forest output conflict"
+msgstr ""
+
+#: ps/sortformat.c:514
+msgid "option -O can not follow other format options"
+msgstr ""
+
+#: ps/sortformat.c:521 ps/sortformat.c:539
+#, fuzzy
+msgid "multiple sort options"
+msgstr "排序"
+
+#: ps/sortformat.c:529
+msgid "option O is neither first format nor sort order"
+msgstr ""
+
+#: ps/sortformat.c:656
+msgid "modifier -y without format -l makes no sense"
+msgstr ""
+
+#: ps/sortformat.c:756
+msgid "bug: must reset the list first"
+msgstr ""
+
+#: ps/sortformat.c:794
+msgid "tell <procps@freelists.org> what you expected"
+msgstr ""
+
+#: ps/sortformat.c:804
+msgid ""
+"tell <procps@freelists.org> what you want (-L/-T, -m/m/H, and $PS_FORMAT)"
+msgstr ""
+
+#: ps/sortformat.c:821
+#, fuzzy, c-format
+msgid "warning: $PS_FORMAT ignored. (%s)\n"
+msgstr "%s 和 %s 出现在 %s 格式字符串中时被忽略"
+
+#: ps/sortformat.c:826 ps/sortformat.c:836
+#, fuzzy
+msgid "conflicting format options"
+msgstr "格式"
+
+#: ps/sortformat.c:827
+msgid "can not use output modifiers with user-defined output"
+msgstr ""
+
+#: ps/sortformat.c:828
+msgid "-L/-T with H/m/-m and -o/-O/o/O is nonsense"
+msgstr ""
+
+#: ps/sortformat.c:886
+msgid "internal error: no PID or PPID for -j option"
+msgstr ""
+
+#: ps/sortformat.c:888
+#, fuzzy
+msgid "lost my PGID"
+msgstr "资源丢失"
+
+#: ps/sortformat.c:901
+#, fuzzy
+msgid "internal error: no PRI for -c option"
+msgstr "内部错误 -- 该选项尚未实现"
+
+#: ps/sortformat.c:904
+#, fuzzy
+msgid "lost my CLS"
+msgstr "资源丢失"
+
+#: ps/sortformat.c:909
+msgid "-T with H/-m/m but no PID for SPID to follow"
+msgstr ""
+
+#: ps/sortformat.c:920
+msgid "-L with H/-m/m but no PID/PGID/SID/SESS for NLWP to follow"
+msgstr ""
+
+#: pwdx.c:37
+#, fuzzy, c-format
+msgid " %s [options] pid...\n"
+msgstr "%*s 用户     进程号 权限   命令\n"
+
+#: pwdx.c:113
+#, fuzzy, c-format
+msgid "invalid process id: %s"
+msgstr "%s：无效的进程号"
+
+#: skill.c:185
+#, fuzzy, c-format
+msgid "cannot open file %s"
+msgstr "无法打开协议文件 \"%s\": %s\n"
+
+#: skill.c:326
+#, fuzzy, c-format
+msgid " %s [options] <pid> [...]\n"
+msgstr "%*s 用户     进程号 权限   命令\n"
+
+#: skill.c:328
+msgid " <pid> [...]            send signal to every <pid> listed\n"
+msgstr ""
+
+#: skill.c:329
+msgid ""
+" -<signal>, -s, --signal <signal>\n"
+"                        specify the <signal> to be sent\n"
+msgstr ""
+
+#: skill.c:331
+msgid ""
+" -l, --list=[<signal>]  list all signal names, or convert one to a name\n"
+msgstr ""
+
+#: skill.c:332
+msgid " -L, --table            list all signal names in a nice table\n"
+msgstr ""
+
+#: skill.c:347
+#, fuzzy, c-format
+msgid " %s [signal] [options] <expression>\n"
+msgstr "  %s 的选项：\n"
+
+#: skill.c:351
+#, c-format
+msgid " %s [new priority] [options] <expression>\n"
+msgstr ""
+
+#: skill.c:355
+msgid " -f, --fast         fast mode (not implemented)\n"
+msgstr ""
+
+#: skill.c:356
+msgid " -i, --interactive  interactive\n"
+msgstr ""
+
+#: skill.c:357
+#, fuzzy
+msgid " -l, --list         list all signal names\n"
+msgstr ""
+"      killall -l, --list\n"
+"      killall -V, --version\n"
+"\n"
+"  -e,--exact          对长名字需要严格匹配\n"
+"  -I,--ignore-case    匹配进程名时忽略大小写\n"
+"  -g,--process-group  杀死进程组而不是进程\n"
+"  -y,--younger-than   杀死比 时间 年轻的进程\n"
+"  -o,--older-than     杀死比 时间 年老的进程\n"
+"  -i,--interactive    在杀死进程前要求确认\n"
+"  -l,--list           显示所有的信号名\n"
+"  -q,--quiet          不要打印抱怨信息\n"
+"  -r,--regexp         将 \"进程名\" 视为扩展正则表达式\n"
+"  -s,--signal 信号    发送 \"信号\" 而不是 SIGTERM\n"
+"  -u,--user 用户      仅杀死 \"用户\" 的进程\n"
+"  -v,--verbose        信号成功送出时打印信息\n"
+"  -V,--version        显示版本信息\n"
+"  -w,--wait           等待进程死亡\n"
+
+#: skill.c:358
+msgid " -L, --table        list all signal names in a nice table\n"
+msgstr ""
+
+#: skill.c:359
+msgid ""
+" -n, --no-action    do not actually kill processes; just print what would "
+"happen\n"
+msgstr ""
+
+#: skill.c:360
+#, fuzzy
+msgid " -v, --verbose      explain what is being done\n"
+msgstr ""
+"  -u, --update\t\t\t只在源文件比目标文件新，或目标文件\n"
+"\t\t\t\t\t不存在时才进行复制\n"
+"  -v, --verbose\t\t显示详细的进行步骤\n"
+"  -x, --one-file-system\t不跨越文件系统进行操作\n"
+
+#: skill.c:361
+#, fuzzy
+msgid " -w, --warnings     enable warnings (not implemented)\n"
+msgstr "启用所有关于“XX未使用”的警告"
+
+#: skill.c:363
+msgid ""
+"Expression can be: terminal, user, pid, command.\n"
+"The options below may be used to ensure correct interpretation.\n"
+msgstr ""
+
+#: skill.c:365
+#, fuzzy
+msgid " -c, --command <command>  expression is a command name\n"
+msgstr "用法：%s [选项]... [-] [名称=值]... [命令 [参数]...]\n"
+
+#: skill.c:366
+msgid " -p, --pid <pid>          expression is a process id number\n"
+msgstr ""
+
+#: skill.c:367
+msgid " -t, --tty <tty>          expression is a terminal\n"
+msgstr ""
+
+#: skill.c:368
+#, fuzzy
+msgid " -u, --user <username>    expression is a username\n"
+msgstr "设置 USER 作为代理服务器用户名。"
+
+#: skill.c:370
+msgid "Alternatively, expression can be:\n"
+msgstr ""
+
+#: skill.c:371
+msgid ""
+" --ns <pid>               match the processes that belong to the same\n"
+"                          namespace as <pid>\n"
+msgstr ""
+
+#: skill.c:373
+msgid ""
+" --nslist <ns,...>        list which namespaces will be considered for\n"
+"                          the --ns option; available namespaces are\n"
+":                          ipc, mnt, net, pid, user, uts\n"
+msgstr ""
+
+#: skill.c:383
+#, c-format
+msgid ""
+"\n"
+"The default signal is TERM. Use -l or -L to list available signals.\n"
+"Particularly useful signals include HUP, INT, KILL, STOP, CONT, and 0.\n"
+"Alternate signals may be specified in three ways: -SIGKILL -KILL -9\n"
+msgstr ""
+
+#: skill.c:390
+#, c-format
+msgid ""
+"\n"
+"The default priority is +4. (snice +4 ...)\n"
+"Priority numbers range from +20 (slowest) to -20 (fastest).\n"
+"Negative priority numbers are restricted to administrative users.\n"
+msgstr ""
+
+#: skill.c:457
+#, fuzzy, c-format
+msgid "unknown signal name %s"
+msgstr "未知的寄存器名：%s"
+
+#: skill.c:477
+#, fuzzy, c-format
+msgid "invalid argument %c"
+msgstr "(无效的参数)"
+
+#: skill.c:514
+#, fuzzy, c-format
+msgid "something at line %d\n"
+msgstr "行 %d：第二个 %%prep\n"
+
+#: skill.c:537
+#, fuzzy, c-format
+msgid "priority %lu out of range"
+msgstr "请求的 init_priority 越界"
+
+#: skill.c:650
+#, fuzzy, c-format
+msgid "invalid pid number %s"
+msgstr "无效的区块编号%s"
+
+#: skill.c:654
+msgid "error reading reference namespace information"
+msgstr ""
+
+#: skill.c:662
+#, fuzzy
+msgid "invalid namespace list"
+msgstr "无效的命名空间名"
+
+#: skill.c:700
+#, fuzzy
+msgid "no process selection criteria"
+msgstr "需要选择语句"
+
+#: skill.c:703
+msgid "general flags may not be repeated"
+msgstr ""
+
+#: skill.c:706
+msgid "-i makes no sense with -v, -f, and -n"
+msgstr ""
+
+#: skill.c:708
+msgid "-v makes no sense with -i and -f"
+msgstr ""
+
+#: skill.c:753
+#, fuzzy, c-format
+msgid "skill: \"%s\" is not supported\n"
+msgstr "%s：不支持"
+
+#: slabtop.c:191
+#, fuzzy
+msgid " -d, --delay <secs>  delay updates\n"
+msgstr " D - 换行 tx 延迟 (ms)\t:"
+
+#: slabtop.c:192
+msgid " -o, --once          only display once, then exit\n"
+msgstr ""
+
+#: slabtop.c:193
+msgid " -s, --sort <char>   specify sort criteria by character (see below)\n"
+msgstr ""
+
+#: slabtop.c:198
+msgid ""
+"\n"
+"The following are valid sort criteria:\n"
+msgstr ""
+
+#: slabtop.c:199
+msgid " a: sort by number of active objects\n"
+msgstr ""
+
+#: slabtop.c:200
+msgid " b: sort by objects per slab\n"
+msgstr ""
+
+#: slabtop.c:201
+#, fuzzy
+msgid " c: sort by cache size\n"
+msgstr "一级缓存列长度"
+
+#: slabtop.c:202
+#, fuzzy
+msgid " l: sort by number of slabs\n"
+msgstr "在%L处把一个无穷大或非数转换为 INTEGER"
+
+#: slabtop.c:203
+msgid " v: sort by number of active slabs\n"
+msgstr ""
+
+#: slabtop.c:204
+#, fuzzy
+msgid " n: sort by name\n"
+msgstr "  [N]          - 使用名称的实例 [数量]\n"
+
+#: slabtop.c:205
+msgid " o: sort by number of objects (the default)\n"
+msgstr ""
+
+#: slabtop.c:206
+msgid " p: sort by pages per slab\n"
+msgstr ""
+
+#: slabtop.c:207
+msgid " s: sort by object size\n"
+msgstr ""
+
+#: slabtop.c:208
+msgid " u: sort by cache utilization\n"
+msgstr ""
+
+#: slabtop.c:317
+#, fuzzy
+msgid "illegal delay"
+msgstr "<非法的精度>"
+
+#: slabtop.c:320 tload.c:135 vmstat.c:961
+#, fuzzy
+msgid "delay must be positive integer"
+msgstr "“N”的值必须是正数。"
+
+#: slabtop.c:342
+#, fuzzy
+msgid "terminal setting retrieval"
+msgstr "设置检索配额为 NUMBER。"
+
+#. Translation Hint: Next five strings must not
+#. * exceed 35 length in characters.
+#: slabtop.c:381
+#, fuzzy, no-c-format
+msgid "Active / Total Objects (% used)"
+msgstr "局部对象的总大小太大"
+
+#: slabtop.c:385
+#, no-c-format
+msgid "Active / Total Slabs (% used)"
+msgstr ""
+
+#: slabtop.c:389
+#, no-c-format
+msgid "Active / Total Caches (% used)"
+msgstr ""
+
+#: slabtop.c:393
+#, fuzzy, no-c-format
+msgid "Active / Total Size (% used)"
+msgstr "局部对象的总大小太大"
+
+#: slabtop.c:396
+#, fuzzy
+msgid "Minimum / Average / Maximum Object"
+msgstr "默认 %d 最小 %d 最大 %d"
+
+#. Translation Hint: Please keep alignment of the
+#. * following intact.
+#: slabtop.c:405
+msgid "  OBJS ACTIVE  USE OBJ SIZE  SLABS OBJ/SLAB CACHE SIZE NAME"
+msgstr ""
+
+#: sysctl.c:86
+#, fuzzy, c-format
+msgid "separators should not be repeated: %s"
+msgstr "格式字符串中有重复的 %s"
+
+#: sysctl.c:105
+#, fuzzy, c-format
+msgid " %s [options] [variable[=value] ...]\n"
+msgstr "  %s 的选项：\n"
+
+#: sysctl.c:108
+#, fuzzy
+msgid "  -a, --all            display all variables\n"
+msgstr "所有变量默认位于 near 节中"
+
+#: sysctl.c:109
+#, fuzzy
+msgid "  -A                   alias of -a\n"
+msgstr "-fmit-class-file 的别名"
+
+#: sysctl.c:110
+#, fuzzy
+msgid "  -X                   alias of -a\n"
+msgstr "-fmit-class-file 的别名"
+
+#: sysctl.c:111
+msgid "      --deprecated     include deprecated parameters to listing\n"
+msgstr ""
+
+#: sysctl.c:112
+msgid "  -b, --binary         print value without new line\n"
+msgstr ""
+
+#: sysctl.c:113
+msgid "  -e, --ignore         ignore unknown variables errors\n"
+msgstr ""
+
+#: sysctl.c:114
+msgid "  -N, --names          print variable names without values\n"
+msgstr ""
+
+#: sysctl.c:115
+msgid "  -n, --values         print only values of a variables\n"
+msgstr ""
+
+#: sysctl.c:116
+msgid "  -p, --load[=<file>]  read values from file\n"
+msgstr ""
+
+#: sysctl.c:117
+#, fuzzy
+msgid "  -f                   alias of -p\n"
+msgstr "(p)"
+
+#: sysctl.c:118
+msgid "      --system         read values from all system directories\n"
+msgstr ""
+
+#: sysctl.c:119
+msgid ""
+"  -r, --pattern <expression>\n"
+"                       select setting that match expression\n"
+msgstr ""
+
+#: sysctl.c:121
+msgid "  -q, --quiet          do not echo variable set\n"
+msgstr ""
+
+#: sysctl.c:122
+msgid "  -w, --write          enable writing a value to variable\n"
+msgstr ""
+
+#: sysctl.c:123
+#, fuzzy
+msgid "  -o                   does nothing\n"
+msgstr "不起作用。为向前兼容保留的选项。"
+
+#: sysctl.c:124
+#, fuzzy
+msgid "  -x                   does nothing\n"
+msgstr "不起作用。为向前兼容保留的选项。"
+
+#: sysctl.c:125
+#, fuzzy
+msgid "  -d                   alias of -h\n"
+msgstr "栏位别名"
+
+#: sysctl.c:171 sysctl.c:222 sysctl.c:431
+#, fuzzy, c-format
+msgid "\"%s\" is an unknown key"
+msgstr "%s: 不是带装甲的(armored)公钥。\n"
+
+#: sysctl.c:194 sysctl.c:333 sysctl.c:409
+#, c-format
+msgid "cannot stat %s"
+msgstr "无法获取%s 的文件状态(stat)"
+
+#: sysctl.c:227 sysctl.c:265 sysctl.c:436
+#, fuzzy, c-format
+msgid "permission denied on key '%s'"
+msgstr "无法格式化设备 %s，权限被拒绝。\n"
+
+#: sysctl.c:231 sysctl.c:279
+#, fuzzy, c-format
+msgid "reading key \"%s\""
+msgstr "读取%s 时出错"
+
+#: sysctl.c:317
+#, fuzzy, c-format
+msgid "unable to open directory \"%s\""
+msgstr "无法打开 %s。"
+
+#: sysctl.c:374
+#, fuzzy, c-format
+msgid "\"%s\" must be of the form name=value"
+msgstr "%s：--param 实参的形式应该为“名字=值”"
+
+#: sysctl.c:383
+#, fuzzy, c-format
+msgid "malformed setting \"%s\""
+msgstr "设置%s 的权限"
+
+#: sysctl.c:403
+#, fuzzy, c-format
+msgid "%s is deprecated, value not set"
+msgstr "必须为 %s 设置一个值\n"
+
+#: sysctl.c:416 sysctl.c:421 sysctl.c:440 sysctl.c:449
+#, fuzzy, c-format
+msgid "setting key \"%s\""
+msgstr "设置%s 的权限"
+
+#: sysctl.c:514
+#, c-format
+msgid ""
+"GLOB_TILDE is not supported on your platform, the tilde in \"%s\" won't be "
+"expanded."
+msgstr ""
+
+#: sysctl.c:520
+#, fuzzy
+msgid "glob failed"
+msgstr "不使用 glob 参数"
+
+#: sysctl.c:526
+#, fuzzy, c-format
+msgid "cannot open \"%s\""
+msgstr "无法打开 %s！"
+
+#: sysctl.c:542 sysctl.c:554
+#, fuzzy, c-format
+msgid "%s(%d): invalid syntax, continuing..."
+msgstr "定位“%s”时语法无效。"
+
+#: sysctl.c:653 sysctl.c:660
+#, c-format
+msgid "* Applying %s ...\n"
+msgstr ""
+
+#: sysctl.c:810
+#, fuzzy, c-format
+msgid ""
+"no variables specified\n"
+"Try `%s --help' for more information."
+msgstr "尝试“%s --help”以获得更多信息。\n"
+
+#: sysctl.c:814
+#, c-format
+msgid ""
+"options -N and -q cannot coexist\n"
+"Try `%s --help' for more information."
+msgstr ""
+
+#: tload.c:89
+#, fuzzy, c-format
+msgid " %s [options] [tty]\n"
+msgstr "不是一个 tty"
+
+#: tload.c:91
+msgid " -d, --delay <secs>  update delay in seconds\n"
+msgstr ""
+
+#: tload.c:92
+msgid " -s, --scale <num>   vertical scale\n"
+msgstr ""
+
+#: tload.c:130
+#, fuzzy
+msgid "scale cannot be negative"
+msgstr "淡青色密度比例"
+
+#: tload.c:137 vmstat.c:963
+#, fuzzy
+msgid "too large delay value"
+msgstr "制表符限长过大"
+
+#: tload.c:152
+#, fuzzy
+msgid "can not open tty"
+msgstr "不是一个 tty"
+
+#: tload.c:211 tload.c:213
+#, fuzzy
+msgid "writing to tty failed"
+msgstr " TTY"
+
+#. Translation Notes ------------------------------------------------
+#. .  It is strongly recommend that the --no-wrap command line option
+#. .  be used with all supporting translation tools, when available.
+#. .
+#. .  The following line pairs contain only plain text and consist of:
+#. .     1) a field name/column header - mostly upper case
+#. .     2) the related description    - both upper and lower case
+#. .
+#. .  To avoid truncation at runtime, each column header is noted with
+#. .  its maximum size and the following description must not exceed
+#. .  20 characters.  Fewer characters are ok.
+#. .
+#. .
+#. Translation Hint: maximum 'PID' = 5
+#: top/top_nls.c:124
+msgid "PID"
+msgstr "进程号"
+
+#: top/top_nls.c:125
+#, fuzzy
+msgid "Process Id"
+msgstr "%s：无效的进程号"
+
+#. Translation Hint: maximum 'PPID' = 5
+#: top/top_nls.c:127
+msgid "PPID"
+msgstr ""
+
+#: top/top_nls.c:128
+#, fuzzy
+msgid "Parent Process pid"
+msgstr "具有 pid %d 的进程不存在。\n"
+
+#. Translation Hint: maximum 'UID' = 5
+#: top/top_nls.c:130
+#, fuzzy
+msgid "UID"
+msgstr "getUname：过多的 uid\n"
+
+#: top/top_nls.c:131
+#, fuzzy
+msgid "Effective User Id"
+msgstr ""
+"显示与当前的有效用户ID 相关联的用户名。\n"
+"与id -un 相同。\n"
+"\n"
+
+#. Translation Hint: maximum 'USER' = 7
+#: top/top_nls.c:133 w.c:591
+msgid "USER"
+msgstr "USER"
+
+#: top/top_nls.c:134
+msgid "Effective User Name"
+msgstr ""
+
+#. Translation Hint: maximum 'RUID' = 5
+#: top/top_nls.c:136
+msgid "RUID"
+msgstr ""
+
+#: top/top_nls.c:137
+#, fuzzy
+msgid "Real User Id"
+msgstr "设置用户ID 失败"
+
+#. Translation Hint: maximum 'RUSER' = 7
+#: top/top_nls.c:139
+msgid "RUSER"
+msgstr ""
+
+#: top/top_nls.c:140
+#, fuzzy
+msgid "Real User Name"
+msgstr "无用户名: %s\n"
+
+#. Translation Hint: maximum 'SUID' = 5
+#: top/top_nls.c:142
+msgid "SUID"
+msgstr ""
+
+#: top/top_nls.c:143
+#, fuzzy
+msgid "Saved User Id"
+msgstr "设置用户ID 失败"
+
+#. Translation Hint: maximum 'SUSER' = 7
+#: top/top_nls.c:145
+msgid "SUSER"
+msgstr ""
+
+#: top/top_nls.c:146
+#, fuzzy
+msgid "Saved User Name"
+msgstr "无用户名: %s\n"
+
+#. Translation Hint: maximum 'GID' = 5
+#: top/top_nls.c:148
+#, fuzzy
+msgid "GID"
+msgstr "getGname：过多的 gid\n"
+
+#: top/top_nls.c:149
+#, fuzzy
+msgid "Group Id"
+msgstr "无法找到ID 为%lu 的用户的属组"
+
+#. Translation Hint: maximum 'GROUP' = 7
+#: top/top_nls.c:151
+msgid "GROUP"
+msgstr "GROUP"
+
+#: top/top_nls.c:152
+#, fuzzy
+msgid "Group Name"
+msgstr "为了使用dns，群组名称不能包含底线"
+
+#. Translation Hint: maximum 'PGRP' = 5
+#: top/top_nls.c:154
+msgid "PGRP"
+msgstr ""
+
+#: top/top_nls.c:155
+msgid "Process Group Id"
+msgstr ""
+
+#. Translation Hint: maximum 'TTY' = 7
+#: top/top_nls.c:157
+#, fuzzy
+msgid "TTY"
+msgstr " TTY"
+
+#: top/top_nls.c:158
+#, fuzzy
+msgid "Controlling Tty"
+msgstr "不是一个 tty"
+
+#. Translation Hint: maximum 'TPGID' = 5
+#: top/top_nls.c:160
+msgid "TPGID"
+msgstr ""
+
+#: top/top_nls.c:161
+#, fuzzy
+msgid "Tty Process Grp Id"
+msgstr "%s：无效的进程号"
+
+#. Translation Hint: maximum 'SID' = 5
+#: top/top_nls.c:163
+msgid "SID"
+msgstr ""
+
+#: top/top_nls.c:164
+#, fuzzy
+msgid "Session Id"
+msgstr ""
+"进程、群组和运行阶段识别码\n"
+"    进程识别号：%d\t\t     上层识别号：%d\n"
+"    群组识别号：%d\t\t 运行阶段识别码：%d\n"
+"  T 群组识别号：%d\n"
+"\n"
+
+#. Translation Hint: maximum 'PR' = 3
+#: top/top_nls.c:166
+msgid "PR"
+msgstr "PR"
+
+#: top/top_nls.c:167
+msgid "Priority"
+msgstr "优先级"
+
+#. Translation Hint: maximum 'NI' = 3
+#: top/top_nls.c:169
+msgid "NI"
+msgstr ""
+
+#: top/top_nls.c:170
+#, fuzzy
+msgid "Nice Value"
+msgstr "值"
+
+#. Translation Hint: maximum 'nTH' = 3
+#: top/top_nls.c:172
+msgid "nTH"
+msgstr ""
+
+#: top/top_nls.c:173
+#, fuzzy
+msgid "Number of Threads"
+msgstr "编号"
+
+#. Translation Hint: maximum 'P' = 1
+#: top/top_nls.c:175
+#, fuzzy
+msgid "P"
+msgstr "(p)"
+
+#: top/top_nls.c:176
+#, fuzzy
+msgid "Last Used Cpu (SMP)"
+msgstr "%<%%%>约束用于最后一个操作数"
+
+#. Translation Hint: maximum '%CPU' = 4
+#: top/top_nls.c:178
+#, fuzzy, c-format
+msgid "%CPU"
+msgstr "CPU              "
+
+#: top/top_nls.c:179
+#, fuzzy
+msgid "CPU Usage"
+msgstr "CPU              "
+
+#. Translation Hint: maximum '' = 6
+#: top/top_nls.c:181
+msgid "TIME"
+msgstr "时间"
+
+#: top/top_nls.c:182
+#, fuzzy
+msgid "CPU Time"
+msgstr "CPU 时间超时"
+
+#. Translation Hint: maximum 'TIME+' = 7
+#: top/top_nls.c:184
+#, fuzzy
+msgid "TIME+"
+msgstr "时间"
+
+#: top/top_nls.c:185
+#, fuzzy
+msgid "CPU Time, hundredths"
+msgstr "CPU 时间超时"
+
+#. Translation Hint: maximum '%MEM' = 4
+#: top/top_nls.c:187
+#, fuzzy
+msgid "%MEM"
+msgstr "为循环启用预取时最小的指令/内存操作比"
+
+#: top/top_nls.c:188
+#, fuzzy
+msgid "Memory Usage (RES)"
+msgstr "内存\n"
+
+#. Translation Hint: maximum 'VIRT' = 5
+#: top/top_nls.c:190
+#, fuzzy
+msgid "VIRT"
+msgstr ""
+"\n"
+"  virt            识别虚拟化 ASE 指令。\n"
+
+#: top/top_nls.c:191
+#, fuzzy
+msgid "Virtual Image (KiB)"
+msgstr "%s: 未提供映像名称 ('--image')"
+
+#. Translation Hint: maximum 'SWAP' = 4
+#: top/top_nls.c:193
+#, fuzzy
+msgid "SWAP"
+msgstr "交换"
+
+#: top/top_nls.c:194
+#, fuzzy
+msgid "Swapped Size (KiB)"
+msgstr "大小"
+
+#. Translation Hint: maximum 'RES' = 4
+#: top/top_nls.c:196
+#, fuzzy
+msgid "RES"
+msgstr ""
+"FORMAT 是 rc、res 或 coff 之一，在未指定时根据文件的扩展名进行判断。\n"
+"单个文件名被认为是输入文件。没有输入文件时就使用标准输入，默认格式\n"
+"为 rc。没有输出文件时就使用标准输出，默认格式为 rc。\n"
+
+#: top/top_nls.c:197
+#, fuzzy
+msgid "Resident Size (KiB)"
+msgstr "页面尺寸"
+
+#. Translation Hint: maximum 'CODE' = 4
+#: top/top_nls.c:199
+#, fuzzy
+msgid "CODE"
+msgstr "编码"
+
+#: top/top_nls.c:200
+#, fuzzy
+msgid "Code Size (KiB)"
+msgstr "代码大小：小、中或大"
+
+#. Translation Hint: maximum 'DATA' = 4
+#: top/top_nls.c:202
+#, fuzzy
+msgid "DATA"
+msgstr "没有资料"
+
+#: top/top_nls.c:203
+#, fuzzy
+msgid "Data+Stack (KiB)"
+msgstr "栈上溢出"
+
+#. Translation Hint: maximum 'SHR' = 4
+#: top/top_nls.c:205
+msgid "SHR"
+msgstr ""
+
+#: top/top_nls.c:206
+#, fuzzy
+msgid "Shared Memory (KiB)"
+msgstr "共享内存对象"
+
+#. Translation Hint: maximum 'nMaj' = 4
+#: top/top_nls.c:208
+msgid "nMaj"
+msgstr ""
+
+#: top/top_nls.c:209
+msgid "Major Page Faults"
+msgstr ""
+
+#. Translation Hint: maximum 'nMin' = 4
+#: top/top_nls.c:211
+msgid "nMin"
+msgstr ""
+
+#: top/top_nls.c:212
+msgid "Minor Page Faults"
+msgstr ""
+
+#. Translation Hint: maximum 'nDRT' = 4
+#: top/top_nls.c:214
+msgid "nDRT"
+msgstr ""
+
+#: top/top_nls.c:215
+#, fuzzy
+msgid "Dirty Pages Count"
+msgstr "已本地化的手册页"
+
+#. Translation Hint: maximum 'S' = 1
+#: top/top_nls.c:217
+msgid "S"
+msgstr "日"
+
+#: top/top_nls.c:218
+#, fuzzy
+msgid "Process Status"
+msgstr "killall: 无法从进程状态获取用户ID(UID)\n"
+
+#. Translation Hint: maximum 'COMMAND' = 7
+#: top/top_nls.c:220
+msgid "COMMAND"
+msgstr "COMMAND"
+
+#: top/top_nls.c:221
+#, fuzzy
+msgid "Command Name/Line"
+msgstr "<命令行>"
+
+#. Translation Hint: maximum 'WCHAN' = 7
+#: top/top_nls.c:223
+msgid "WCHAN"
+msgstr ""
+
+#: top/top_nls.c:224
+#, fuzzy
+msgid "Sleeping in Function"
+msgstr "暂停中"
+
+#. Translation Hint: maximum 'Flags' = 7
+#: top/top_nls.c:226
+msgid "Flags"
+msgstr "标志"
+
+#: top/top_nls.c:227
+#, fuzzy
+msgid "Task Flags <sched.h>"
+msgstr "根据任务"
+
+#. Translation Hint: maximum 'CGROUPS' = 7
+#: top/top_nls.c:229
+msgid "CGROUPS"
+msgstr ""
+
+#: top/top_nls.c:230
+#, fuzzy
+msgid "Control Groups"
+msgstr " 组="
+
+#. Translation Hint: maximum 'SUPGIDS' = 7
+#: top/top_nls.c:232
+msgid "SUPGIDS"
+msgstr ""
+
+#: top/top_nls.c:233
+#, fuzzy
+msgid "Supp Groups IDs"
+msgstr " 组="
+
+#. Translation Hint: maximum 'SUPGRPS' = 7
+#: top/top_nls.c:235
+msgid "SUPGRPS"
+msgstr ""
+
+#: top/top_nls.c:236
+#, fuzzy
+msgid "Supp Groups Names"
+msgstr " 组="
+
+#. Translation Hint: maximum 'TGID' = 5
+#: top/top_nls.c:238
+msgid "TGID"
+msgstr ""
+
+#: top/top_nls.c:239
+#, fuzzy
+msgid "Thread Group Id"
+msgstr "设置组ID 失败"
+
+#. Translation Hint: maximum 'OOMa' = 5
+#: top/top_nls.c:241
+msgid "OOMa"
+msgstr ""
+
+#: top/top_nls.c:242
+msgid "OOMEM Adjustment"
+msgstr ""
+
+#. Translation Hint: maximum 'OOMs' = 4
+#: top/top_nls.c:244
+msgid "OOMs"
+msgstr ""
+
+#: top/top_nls.c:245
+msgid "OOMEM Score current"
+msgstr ""
+
+#. Translation Hint: maximum 'ENVIRON' = 7
+#: top/top_nls.c:247
+msgid "ENVIRON"
+msgstr ""
+
+#. Translation Hint: the abbreviation 'vars' below is shorthand for
+#. 'variables'
+#: top/top_nls.c:250
+#, fuzzy
+msgid "Environment vars"
+msgstr "__io 变量默认为 volatile"
+
+#. Translation Hint: maximum 'vMj' = 3
+#: top/top_nls.c:252
+msgid "vMj"
+msgstr ""
+
+#: top/top_nls.c:253
+msgid "Major Faults delta"
+msgstr ""
+
+#. Translation Hint: maximum 'vMn' = 3
+#: top/top_nls.c:255
+msgid "vMn"
+msgstr ""
+
+#: top/top_nls.c:256
+msgid "Minor Faults delta"
+msgstr ""
+
+#. Translation Hint: maximum 'USED' = 4
+#: top/top_nls.c:258
+#, fuzzy
+msgid "USED"
+msgstr "已用"
+
+#: top/top_nls.c:259
+msgid "Res+Swap Size (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'nsIPC' = 7
+#: top/top_nls.c:261
+msgid "nsIPC"
+msgstr ""
+
+#: top/top_nls.c:262
+#, fuzzy
+msgid "IPC namespace Inode"
+msgstr "%qT不是一个命名空间"
+
+#. Translation Hint: maximum 'nsMNT' = 7
+#: top/top_nls.c:264
+msgid "nsMNT"
+msgstr ""
+
+#: top/top_nls.c:265
+#, fuzzy
+msgid "MNT namespace Inode"
+msgstr "%qT不是一个命名空间"
+
+#. Translation Hint: maximum 'nsNET' = 7
+#: top/top_nls.c:267
+msgid "nsNET"
+msgstr ""
+
+#: top/top_nls.c:268
+#, fuzzy
+msgid "NET namespace Inode"
+msgstr "网络共享"
+
+#. Translation Hint: maximum 'nsPID' = 7
+#: top/top_nls.c:270
+msgid "nsPID"
+msgstr ""
+
+#: top/top_nls.c:271
+#, fuzzy
+msgid "PID namespace Inode"
+msgstr "警告：此系统不支持--pid=PID"
+
+#. Translation Hint: maximum 'nsUSER' = 7
+#: top/top_nls.c:273
+msgid "nsUSER"
+msgstr ""
+
+#: top/top_nls.c:274
+#, fuzzy
+msgid "USER namespace Inode"
+msgstr "USER"
+
+#. Translation Hint: maximum 'nsUTS' = 7
+#: top/top_nls.c:276
+msgid "nsUTS"
+msgstr ""
+
+#: top/top_nls.c:277
+#, fuzzy
+msgid "UTS namespace Inode"
+msgstr "%qT不是一个命名空间"
+
+#. Translation Hint: maximum 'LXC' = 7
+#: top/top_nls.c:279
+msgid "LXC"
+msgstr ""
+
+#: top/top_nls.c:280
+msgid "LXC container name"
+msgstr ""
+
+#. Translation Hint: maximum 'RSan' = 4
+#: top/top_nls.c:282
+msgid "RSan"
+msgstr ""
+
+#: top/top_nls.c:283
+msgid "RES Anonymous (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'RSfd' = 4
+#: top/top_nls.c:285
+msgid "RSfd"
+msgstr ""
+
+#: top/top_nls.c:286
+msgid "RES File-based (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'RSlk' = 4
+#: top/top_nls.c:288
+msgid "RSlk"
+msgstr ""
+
+#: top/top_nls.c:289
+msgid "RES Locked (KiB)"
+msgstr ""
+
+#. Translation Hint: maximum 'RSsh' = 4
+#: top/top_nls.c:291
+msgid "RSsh"
+msgstr ""
+
+#: top/top_nls.c:292
+#, fuzzy
+msgid "RES Shared (KiB)"
+msgstr "共享内存对象"
+
+#. Translation Hint: maximum 'CGNAME' = 7
+#: top/top_nls.c:294
+msgid "CGNAME"
+msgstr ""
+
+#: top/top_nls.c:295
+#, fuzzy
+msgid "Control Group name"
+msgstr " 组="
+
+#. Translation Notes ------------------------------------------------
+#. .  It is strongly recommend that the --no-wrap command line option
+#. .  be used with all supporting translation tools, when available.
+#. .
+#. .  This group of lines contains both plain text and c-format strings.
+#. .
+#. .  Some strings reflect switches used to affect the running program
+#. .  and should not be translated without also making corresponding
+#. .  c-code logic changes.
+#. .
+#: top/top_nls.c:315
+#, c-format
+msgid ""
+"\tsignal %d (%s) was caught by %s, please\n"
+"\tsee http://www.debian.org/Bugs/Reporting\n"
+msgstr ""
+
+#: top/top_nls.c:318
+#, fuzzy, c-format
+msgid ""
+"inappropriate '%s'\n"
+"Usage:\n"
+"  %s%s"
+msgstr "用法：%s [选项] 输入文件\n"
+
+#: top/top_nls.c:321
+#, fuzzy, c-format
+msgid ""
+"  %s\n"
+"Usage:\n"
+"  %s%s"
+msgstr "用法：%s [选项] 输入文件\n"
+
+#: top/top_nls.c:324
+#, fuzzy, c-format
+msgid "failed /proc/stat open: %s"
+msgstr "无法打开 /proc 目录: %s\n"
+
+#: top/top_nls.c:325
+#, fuzzy, c-format
+msgid "failed openproc: %s"
+msgstr "%s: 打开失败：%s\n"
+
+#: top/top_nls.c:326
+#, fuzzy, c-format
+msgid "bad delay interval '%s'"
+msgstr "无效的时间间隔%s"
+
+#: top/top_nls.c:327
+#, fuzzy, c-format
+msgid "bad iterations argument '%s'"
+msgstr "错误的正则表达式: %s\n"
+
+#: top/top_nls.c:328
+#, fuzzy, c-format
+msgid "pid limit (%d) exceeded"
+msgstr "CPU 时间超时"
+
+#: top/top_nls.c:329
+#, fuzzy, c-format
+msgid "bad pid '%s'"
+msgstr "%*s 用户     进程号 权限   命令\n"
+
+#: top/top_nls.c:330
+#, fuzzy, c-format
+msgid "-%c requires argument"
+msgstr "%s：选项需要一个参数 --“%c”\n"
+
+#: top/top_nls.c:331
+#, fuzzy, c-format
+msgid "bad width arg '%s'"
+msgstr "行 %d：%%setup 中存在坏的参数：%s\n"
+
+#: top/top_nls.c:332
+#, fuzzy, c-format
+msgid ""
+"unknown option '%c'\n"
+"Usage:\n"
+"  %s%s"
+msgstr "%s：不明选项 -%c\n"
+
+#: top/top_nls.c:335
+#, fuzzy
+msgid "-d disallowed in \"secure\" mode"
+msgstr "程序错误，转换模式 %d 无效\n"
+
+#: top/top_nls.c:336
+#, fuzzy
+msgid "-d requires positive argument"
+msgstr "命名空间选项需要一个参数"
+
+#: top/top_nls.c:337
+msgid "On"
+msgstr ""
+
+#: top/top_nls.c:338
+#, fuzzy
+msgid "Off"
+msgstr "关闭"
+
+#. Translation Hint: Only the following words should be translated
+#. .                 secs (seconds), max (maximum), user, field, cols (columns)
+#: top/top_nls.c:341
+msgid " -hv | -bcHiOSs -d secs -n max -u|U user -p pid(s) -o field -w [cols]"
+msgstr ""
+
+#: top/top_nls.c:342
+#, fuzzy
+msgid "failed /proc/stat read"
+msgstr "获取文件状态失败(stat)"
+
+#: top/top_nls.c:343
+#, fuzzy, c-format
+msgid "Forest mode %s"
+msgstr "spec 文件权限不好：%s(%s)\n"
+
+#: top/top_nls.c:344
+#, fuzzy
+msgid "failed tty get"
+msgstr "无法取得%s 的属性"
+
+#: top/top_nls.c:345
+#, fuzzy, c-format
+msgid "failed tty set: %s"
+msgstr "设置新用户%s 失败"
+
+#: top/top_nls.c:346
+msgid "Choose field group (1 - 4)"
+msgstr ""
+
+#: top/top_nls.c:347
+msgid "Command disabled, 'A' mode required"
+msgstr ""
+
+#: top/top_nls.c:348
+#, fuzzy, c-format
+msgid "Command disabled, activate %s with '-' or '_'"
+msgstr "用法：%s [选项] 命令\n"
+
+#: top/top_nls.c:349
+#, fuzzy
+msgid "No colors to map!"
+msgstr "优先权颜色"
+
+#: top/top_nls.c:350
+#, fuzzy, c-format
+msgid "Failed '%s' open: %s"
+msgstr "%s：打开 %s 时失败：%s\n"
+
+#: top/top_nls.c:351
+#, fuzzy, c-format
+msgid "Wrote configuration to '%s'"
+msgstr "已写至：%s\n"
+
+#: top/top_nls.c:352
+#, c-format
+msgid "Change delay from %.1f to"
+msgstr ""
+
+#: top/top_nls.c:353
+#, fuzzy, c-format
+msgid "Show threads %s"
+msgstr "%<num_threads%>值必须为正"
+
+#: top/top_nls.c:354
+#, fuzzy, c-format
+msgid "Irix mode %s"
+msgstr "spec 文件权限不好：%s(%s)\n"
+
+#: top/top_nls.c:355
+#, c-format
+msgid "PID to signal/kill [default pid = %d]"
+msgstr ""
+
+#: top/top_nls.c:356
+#, c-format
+msgid "Send pid %d signal [%d/sigterm]"
+msgstr ""
+
+#: top/top_nls.c:357
+#, fuzzy, c-format
+msgid "Failed signal pid '%d' with '%d': %s"
+msgstr "%s(%s) 短脚本运行失败，信号 %d\n"
+
+#: top/top_nls.c:358
+#, fuzzy
+msgid "Invalid signal"
+msgstr "%s：无效的信号"
+
+#: top/top_nls.c:359
+#, fuzzy, c-format
+msgid "PID to renice [default pid = %d]"
+msgstr "具有 pid %d 的进程不存在。\n"
+
+#: top/top_nls.c:360
+#, fuzzy, c-format
+msgid "Renice PID %d to value"
+msgstr "具有 pid %d 的进程不存在。\n"
+
+#: top/top_nls.c:361
+#, fuzzy, c-format
+msgid "Failed renice of PID %d to %d: %s"
+msgstr "无法打开 pid %d (%s) 的 stat 文件\n"
+
+#: top/top_nls.c:362
+#, c-format
+msgid "Rename window '%s' to (1-3 chars)"
+msgstr ""
+
+#: top/top_nls.c:363
+#, fuzzy, c-format
+msgid "Cumulative time %s"
+msgstr "累积的项目"
+
+#: top/top_nls.c:364
+#, c-format
+msgid "Maximum tasks = %d, change to (0 is unlimited)"
+msgstr ""
+
+#: top/top_nls.c:365
+#, fuzzy
+msgid "Invalid maximum"
+msgstr "目录最大深度%s 无效"
+
+#: top/top_nls.c:366
+msgid "Which user (blank for all)"
+msgstr ""
+
+#: top/top_nls.c:367
+msgid "Unknown command - try 'h' for help"
+msgstr ""
+
+#: top/top_nls.c:368
+#, c-format
+msgid "scroll coordinates: y = %d/%%d (tasks), x = %d/%d (fields)"
+msgstr ""
+
+#: top/top_nls.c:369
+#, fuzzy
+msgid "failed memory allocate"
+msgstr "%s：配置分区区块时失败\n"
+
+#: top/top_nls.c:370
+#, fuzzy
+msgid "failed memory re-allocate"
+msgstr "无法为已找到的进程分配内存: %s\n"
+
+#: top/top_nls.c:371
+#, fuzzy
+msgid "Unacceptable floating point"
+msgstr "使用硬件浮点单元"
+
+#: top/top_nls.c:372
+#, fuzzy
+msgid "Invalid user"
+msgstr "无效的用户"
+
+#: top/top_nls.c:373
+#, fuzzy
+msgid "forest view"
+msgstr "浏览者："
+
+#: top/top_nls.c:374
+msgid "failed pid maximum size test"
+msgstr ""
+
+#: top/top_nls.c:375
+msgid "failed number of cpus test"
+msgstr ""
+
+#: top/top_nls.c:376
+#, c-format
+msgid "incompatible rcfile, you should delete '%s'"
+msgstr ""
+
+#: top/top_nls.c:377
+#, c-format
+msgid "window entry #%d corrupt, please delete '%s'"
+msgstr ""
+
+#: top/top_nls.c:378
+msgid "Unavailable in secure mode"
+msgstr ""
+
+#: top/top_nls.c:379
+#, fuzzy
+msgid "Only 1 cpu detected"
+msgstr "%s 只接受 1 个参数"
+
+#: top/top_nls.c:380
+#, fuzzy
+msgid "Unacceptable integer"
+msgstr "整数溢出"
+
+#: top/top_nls.c:381
+msgid "conflicting process selections (U/p/u)"
+msgstr ""
+
+#. Translation Hint: This is an abbreviation (limit 3 characters) for:
+#. .                 kibibytes (1024 bytes)
+#: top/top_nls.c:384
+msgid "KiB"
+msgstr "KiB"
+
+#. Translation Hint: This is an abbreviation (limit 3 characters) for:
+#. .                 mebibytes (1,048,576 bytes)
+#: top/top_nls.c:387
+msgid "MiB"
+msgstr "MiB"
+
+#. Translation Hint: This is an abbreviation (limit 3 characters) for:
+#. .                 gibibytes (1,073,741,824 bytes)
+#: top/top_nls.c:390
+msgid "GiB"
+msgstr "GiB"
+
+#. Translation Hint: This is an abbreviation (limit 3 characters) for:
+#. .                 tebibytes (1,099,511,627,776 bytes)
+#: top/top_nls.c:393
+msgid "TiB"
+msgstr "TiB"
+
+#. Translation Hint: This is an abbreviation (limit 3 characters) for:
+#. .                 pebibytes (1,024 tebibytes)
+#: top/top_nls.c:396
+msgid "PiB"
+msgstr "PiB"
+
+#. Translation Hint: This is an abbreviation (limit 3 characters) for:
+#. .                 exbibytes (1,024 pebibytes)
+#: top/top_nls.c:399
+msgid "EiB"
+msgstr "EiB"
+
+#: top/top_nls.c:400
+#, fuzzy
+msgid "Threads"
+msgstr "不能同时使用 mthreads 和 mlegacy-threads"
+
+#: top/top_nls.c:401
+msgid "Tasks"
+msgstr "任务"
+
+#. Translation Hint: The following "word" is meant to represent either a single
+#. .                 cpu or all of the processors in a multi-processor computer
+#. .                 (should be exactly 6 characters, not counting the colon)
+#: top/top_nls.c:405
+#, fuzzy
+msgid "Cpu(s):"
+msgstr "CPU              "
+
+#. Translation Hint: The following "word" is meant to represent a single processor
+#. .                 (should be exactly 3 characters)
+#: top/top_nls.c:408
+#, fuzzy, c-format
+msgid "Cpu%-3d:"
+msgstr ""
+"进程：  %-14s\t\t状态：%c (%s)\n"
+"  CPU#: %-3d\t\tTTY：%s\t线程：%ld\n"
+
+#. Translation Hint: The following word "another" must have 1 trailing space
+#: top/top_nls.c:410
+#, fuzzy
+msgid "another "
+msgstr "当一个局部变量掩盖了另一个局部变量时给出警告"
+
+#: top/top_nls.c:411
+msgid "Locate next inactive, use \"L\""
+msgstr ""
+
+#: top/top_nls.c:412
+#, fuzzy
+msgid "Locate string"
+msgstr "(不是字符串)"
+
+#: top/top_nls.c:413
+#, fuzzy, c-format
+msgid "%s\"%s\" not found"
+msgstr "%s%s 预期为 %s 却找到 %s\n"
+
+#: top/top_nls.c:414
+#, c-format
+msgid "width incr is %d, change to (0 default, -1 auto)"
+msgstr ""
+
+#: top/top_nls.c:415
+msgid "Overwrite existing obsolete/corrupted rcfile?"
+msgstr ""
+
+#: top/top_nls.c:416
+#, fuzzy, c-format
+msgid "unrecognized field name '%s'"
+msgstr "无法识别的节名%qE"
+
+#: top/top_nls.c:417
+msgid "even using field names only, window is now too small"
+msgstr ""
+
+#: top/top_nls.c:419
+#, fuzzy
+msgid "Open Files"
+msgstr "无法打开 %%files 的文件 %s: %s\n"
+
+#: top/top_nls.c:420
+#, fuzzy
+msgid "NUMA Info"
+msgstr "无信息"
+
+#: top/top_nls.c:421
+#, fuzzy
+msgid "Log"
+msgstr "登录"
+
+#: top/top_nls.c:422
+msgid ""
+"the '=' key will eventually show the actual file read or command(s) "
+"executed ..."
+msgstr ""
+
+#: top/top_nls.c:423
+msgid "demo"
+msgstr ""
+
+#: top/top_nls.c:424
+#, c-format
+msgid ""
+"This is simulated output representing the contents of some file or the "
+"output\n"
+"from some command.  Exactly which commands and/or files are solely up to "
+"you.\n"
+"\n"
+"Although this text is for information purposes only, it can still be "
+"scrolled\n"
+"and searched like real output will be.  You are encouraged to experiment "
+"with\n"
+"those features as explained in the prologue above.\n"
+"\n"
+"To enable real Inspect functionality, entries must be added to the end of "
+"the\n"
+"top personal personal configuration file.  You could use your favorite "
+"editor\n"
+"to accomplish this, taking care not to disturb existing entries.\n"
+"\n"
+"Another way to add entries is illustrated below, but it risks overwriting "
+"the\n"
+"rcfile.  Redirected echoes must not replace (>) but append (>>) to that "
+"file.\n"
+"\n"
+"  /bin/echo -e \"pipe\\tOpen Files\\tlsof -P -p %d 2>&1\" >> ~/.toprc\n"
+"  /bin/echo -e \"file\\tNUMA Info\\t/proc/%d/numa_maps\" >> ~/.toprc\n"
+"  /bin/echo -e \"pipe\\tLog\\ttail -n200 /var/log/syslog | sort -Mr\" >> ~/."
+"toprc\n"
+"\n"
+"If you don't know the location or name of the top rcfile, use the 'W' "
+"command\n"
+"and note those details.  After backing up the current rcfile, try issuing "
+"the\n"
+"above echoes exactly as shown, replacing '.toprc' as appropriate.  The "
+"safest\n"
+"approach would be to use copy then paste to avoid any typing mistakes.\n"
+"\n"
+"Finally, restart top to reveal what actual Inspect entries combined with "
+"this\n"
+"new command can offer.  The possibilities are endless, especially "
+"considering\n"
+"that 'pipe' type entries can include shell scripts too!\n"
+"\n"
+"For additional important information, please consult the top documentation.\n"
+"Then enhance top with your very own customized 'file' and 'pipe' entries.\n"
+"\n"
+"Enjoy!\n"
+msgstr ""
+
+#: top/top_nls.c:456
+msgid "to enable 'Y' press <Enter> then type 'W' and restart top"
+msgstr ""
+
+#: top/top_nls.c:458
+msgid "to enable 'Y' please consult the top man page (press Enter)"
+msgstr ""
+
+#: top/top_nls.c:460
+#, fuzzy, c-format
+msgid "Selection failed with: %s\n"
+msgstr "需要选择语句"
+
+#: top/top_nls.c:461
+#, fuzzy, c-format
+msgid "unable to inspect, pid %d not found"
+msgstr "无法打开 pid %d (%s) 的 stat 文件\n"
+
+#: top/top_nls.c:462
+#, fuzzy, c-format
+msgid "inspect at PID [default pid = %d]"
+msgstr "具有 pid %d 的进程不存在。\n"
+
+#: top/top_nls.c:463
+#, c-format
+msgid "%s: %*d-%-*d lines, %*d-%*d columns, %lu bytes read"
+msgstr ""
+
+#: top/top_nls.c:464
+#, fuzzy
+msgid "patience please, working..."
+msgstr "无法记录目前的工作目录"
+
+#. Translation Hint: Below are 2 abbreviations which can be as long as needed:
+#. .                 FLD = FIELD, VAL = VALUE
+#: top/top_nls.c:467
+#, c-format
+msgid "add filter #%d (%s) as: [!]FLD?VAL"
+msgstr ""
+
+#: top/top_nls.c:468
+#, fuzzy
+msgid "ignoring case"
+msgstr "(未知的案例)"
+
+#: top/top_nls.c:469
+#, fuzzy
+msgid "case sensitive"
+msgstr "(未知的案例)"
+
+#: top/top_nls.c:470
+#, fuzzy
+msgid "duplicate filter was ignored"
+msgstr "忽略"
+
+#: top/top_nls.c:471
+#, fuzzy, c-format
+msgid "'%s' filter delimiter is missing"
+msgstr "%s：分界符后应该跟随整数"
+
+#: top/top_nls.c:472
+#, fuzzy, c-format
+msgid "'%s' filter value is missing"
+msgstr "%2$s %3$s 中丢失 %1$s\n"
+
+#: top/top_nls.c:473
+#, fuzzy
+msgid "include"
+msgstr "#include \"...\" 搜索从这里开始：\n"
+
+#: top/top_nls.c:474
+#, fuzzy
+msgid "exclude"
+msgstr "被排除的路径必须以 / 开头"
+
+#: top/top_nls.c:475
+#, fuzzy, c-format
+msgid "<Enter> to resume, filters: %s"
+msgstr "设备 %s 不支持恢复。\n"
+
+#: top/top_nls.c:476
+#, fuzzy
+msgid "none"
+msgstr "无"
+
+#. Translation Hint: The following word 'Node' should be exactly 4 characters
+#: top/top_nls.c:478
+#, fuzzy, c-format
+msgid "Node%-2d:"
+msgstr "verify_cgraph_node 失败"
+
+#: top/top_nls.c:479
+#, c-format
+msgid "expand which node (0-%d)"
+msgstr ""
+
+#: top/top_nls.c:480
+#, fuzzy
+msgid "invalid node"
+msgstr "verify_cgraph_node 失败"
+
+#: top/top_nls.c:481
+msgid "sorry, NUMA extensions unavailable"
+msgstr ""
+
+#. Translation Hint: 'Mem ' is an abbreviation for physical memory/ram
+#. .                 'Swap' represents the linux swap file --
+#. .                 please make both translations exactly 4 characters,
+#. .                 padding with extra spaces as necessary
+#: top/top_nls.c:486
+#, fuzzy
+msgid "Mem "
+msgstr "为循环启用预取时最小的指令/内存操作比"
+
+#: top/top_nls.c:487
+#, fuzzy
+msgid "Swap"
+msgstr "交换"
+
+#. Translation Notes ------------------------------------------------
+#. .  It is strongly recommend that the --no-wrap command line option
+#. .  be used with all supporting translation tools, when available.
+#. .
+#. .  The next several text groups contain special escape sequences
+#. .  representing values used to index a table at run-time.
+#. .
+#. .  Each such sequence consists of a tilde (~) followed by an ascii
+#. .  number in the range of '1' - '8'.  Examples are '~2', '~8', etc.
+#. .  These escape sequences must never themselves be translated but
+#. .  could be deleted.
+#. .
+#. .  If you remove these escape sequences (both tilde and number) it
+#. .  would make translation easier.  However, the ability to display
+#. .  colors and bold text at run-time will have been lost.
+#. .
+#. .  Additionally, each of these text groups was designed to display
+#. .  in a 80x24 terminal window.  Hopefully, any translations will
+#. .  adhere to that goal lest the translated text be truncated.
+#. .
+#. .  If you would like additional information regarding these strings,
+#. .  please see the prologue to the show_special function in the top.c
+#. .  source file.
+#. .
+#: top/top_nls.c:521
+#, c-format
+msgid ""
+"Help for Interactive Commands~2 - %s\n"
+"Window ~1%s~6: ~1Cumulative mode ~3%s~2.  ~1System~6: ~1Delay ~3%.1f secs~2; "
+"~1Secure mode ~3%s~2.\n"
+"\n"
+"  Z~5,~1B~5,E,e   Global: '~1Z~2' colors; '~1B~2' bold; '~1E~2'/'~1e~2' "
+"summary/task memory scale\n"
+"  l,t,m     Toggle Summary: '~1l~2' load avg; '~1t~2' task/cpu stats; "
+"'~1m~2' memory info\n"
+"  0,1,2,3,I Toggle: '~10~2' zeros; '~11~2/~12~2/~13~2' cpus or numa node "
+"views; '~1I~2' Irix mode\n"
+"  f,F,X     Fields: '~1f~2'/'~1F~2' add/remove/order/sort; '~1X~2' increase "
+"fixed-width\n"
+"\n"
+"  L,&,<,> . Locate: '~1L~2'/'~1&~2' find/again; Move sort column: "
+"'~1<~2'/'~1>~2' left/right\n"
+"  R,H,V,J . Toggle: '~1R~2' Sort; '~1H~2' Threads; '~1V~2' Forest view; "
+"'~1J~2' Num justify\n"
+"  c,i,S,j . Toggle: '~1c~2' Cmd name/line; '~1i~2' Idle; '~1S~2' Time; "
+"'~1j~2' Str justify\n"
+"  x~5,~1y~5     . Toggle highlights: '~1x~2' sort field; '~1y~2' running "
+"tasks\n"
+"  z~5,~1b~5     . Toggle: '~1z~2' color/mono; '~1b~2' bold/reverse (only if "
+"'x' or 'y')\n"
+"  u,U,o,O . Filter by: '~1u~2'/'~1U~2' effective/any user; '~1o~2'/'~1O~2' "
+"other criteria\n"
+"  n,#,^O  . Set: '~1n~2'/'~1#~2' max tasks displayed; Show: ~1Ctrl~2+'~1O~2' "
+"other filter(s)\n"
+"  C,...   . Toggle scroll coordinates msg for: ~1up~2,~1down~2,~1left~2,"
+"~1right~2,~1home~2,~1end~2\n"
+"\n"
+"%s  W,Y       Write configuration file '~1W~2'; Inspect other output "
+"'~1Y~2'\n"
+"  q         Quit\n"
+"          ( commands shown with '.' require a ~1visible~2 task display "
+"~1window~2 ) \n"
+"Press '~1h~2' or '~1?~2' for help with ~1Windows~2,\n"
+"Type 'q' or <Esc> to continue "
+msgstr ""
+
+#. Translation Hint: As is true for the text above, the "keys" shown to the left and
+#. .                 also imbedded in the translatable text (along with escape seqs)
+#. .                 should never themselves be translated.
+#: top/top_nls.c:549
+msgid ""
+"  k,r       Manipulate tasks: '~1k~2' kill; '~1r~2' renice\n"
+"  d or s    Set update interval\n"
+msgstr ""
+
+#: top/top_nls.c:553
+#, c-format
+msgid ""
+"Help for Windows / Field Groups~2 - \"Current Window\" = ~1 %s ~6\n"
+"\n"
+". Use multiple ~1windows~2, each with separate config opts (color,fields,"
+"sort,etc)\n"
+". The 'current' window controls the ~1Summary Area~2 and responds to your "
+"~1Commands~2\n"
+"  . that window's ~1task display~2 can be turned ~1Off~2 & ~1On~2, growing/"
+"shrinking others\n"
+"  . with ~1NO~2 task display, some commands will be ~1disabled~2 "
+"('i','R','n','c', etc)\n"
+"    until a ~1different window~2 has been activated, making it the 'current' "
+"window\n"
+". You ~1change~2 the 'current' window by: ~1 1~2) cycling forward/backward;"
+"~1 2~2) choosing\n"
+"  a specific field group; or~1 3~2) exiting the color mapping or fields "
+"screens\n"
+". Commands ~1available anytime   -------------~2\n"
+"    A       . Alternate display mode toggle, show ~1Single~2 / ~1Multiple~2 "
+"windows\n"
+"    g       . Choose another field group and make it 'current', or change "
+"now\n"
+"              by selecting a number from: ~1 1~2 =%s;~1 2~2 =%s;~1 3~2 =%s; "
+"or~1 4~2 =%s\n"
+". Commands ~1requiring~2 '~1A~2' mode~1  -------------~2\n"
+"    G       . Change the ~1Name~5 of the 'current' window/field group\n"
+" ~1*~4  a , w   . Cycle through all four windows:  '~1a~5' Forward; '~1w~5' "
+"Backward\n"
+" ~1*~4  - , _   . Show/Hide:  '~1-~5' ~1Current~2 window; '~1_~5' all "
+"~1Visible~2/~1Invisible~2\n"
+"  The screen will be divided evenly between task displays.  But you can "
+"make\n"
+"  some ~1larger~2 or ~1smaller~2, using '~1n~2' and '~1i~2' commands.  Then "
+"later you could:\n"
+" ~1*~4  = , +   . Rebalance tasks:  '~1=~5' ~1Current~2 window; '~1+~5' "
+"~1Every~2 window\n"
+"              (this also forces the ~1current~2 or ~1every~2 window to "
+"become visible)\n"
+"\n"
+"In '~1A~2' mode, '~1*~4' keys are your ~1essential~2 commands.  Please try "
+"the '~1a~2' and '~1w~2'\n"
+"commands plus the 'g' sub-commands NOW.  Press <Enter> to make 'Current' "
+msgstr ""
+
+#. Translation Notes ------------------------------------------------
+#. .  The following 'Help for color mapping' simulated screen should
+#. .  probably NOT be translated.  It is terribly hard to follow in
+#. .  this form and any translation could produce unpleasing results
+#. .  that are unlikely to parallel the running top program.
+#. .
+#. .  If you decide to proceed with translation, do the following
+#. .  lines only, taking care not to disturbe the tilde + number.
+#. .
+#. .  Simulated screen excerpt:
+#. .     --> "   Tasks:~3  64 ~2total,~3   2 ~3running,~3  62
+#. .     --> "   %%Cpu(s):~3  76.5 ~2user,~3  11.2 ~2system,~
+#. .     --> "   ~1 Nasty Message! ~4  -or-  ~1Input Prompt~5
+#. .
+#. .     --> "   available toggles: ~1B~2 =disable bold globa
+#. .     --> "       ~1z~2 =color/mono (~1%s~2), ~1b~2 =tasks
+#. .
+#. .     --> "Select ~1target~2 as upper case letter:\n"
+#. .     --> "   S~2 = Summary Data,~1  M~2 = Messages/Prompt
+#. .     --> "   H~2 = Column Heads,~1  T~2 = Task Informatio
+#. .     --> "Select ~1color~2 as number:\n"
+#. .     --> "   0~2 = black,~1  1~2 = red,    ~1  2~2 = gree
+#. .     --> "   4~2 = blue, ~1  5~2 = magenta,~1  6~2 = cyan
+#. .
+#: top/top_nls.c:603
+#, c-format
+msgid ""
+"Help for color mapping~2 - %s\n"
+"current window: ~1%s~6\n"
+"\n"
+"   color - 04:25:44 up 8 days, 50 min,  7 users,  load average:\n"
+"   Tasks:~3  64 ~2total,~3   2 ~3running,~3  62 ~2sleeping,~3   0 ~2stopped,"
+"~3\n"
+"   %%Cpu(s):~3  76.5 ~2user,~3  11.2 ~2system,~3   0.0 ~2nice,~3  12.3 "
+"~2idle~3\n"
+"   ~1 Nasty Message! ~4  -or-  ~1Input Prompt~5\n"
+"   ~1  PID TTY     PR  NI %%CPU    TIME+   VIRT SWAP S COMMAND    ~6\n"
+"   17284 ~8pts/2  ~7  8   0  0.0   0:00.75  1380    0 S /bin/bash   ~8\n"
+"   ~1 8601 pts/1    7 -10  0.4   0:00.03   916    0 R color -b -z~7\n"
+"   11005 ~8?      ~7  9   0  0.0   0:02.50  2852 1008 S amor -sessi~8\n"
+"   available toggles: ~1B~2 =disable bold globally (~1%s~2),\n"
+"       ~1z~2 =color/mono (~1%s~2), ~1b~2 =tasks \"bold\"/reverse (~1%s~2)\n"
+"\n"
+"1) Select a ~1target~2 as an upper case letter, ~1current target~2 is ~1 %c "
+"~4:\n"
+"   S~2 = Summary Data,~1  M~2 = Messages/Prompts,\n"
+"   H~2 = Column Heads,~1  T~2 = Task Information\n"
+"2) Select a ~1color~2 as a number, ~1current color~2 is ~1 %d ~4:\n"
+"   0~2 = black,~1  1~2 = red,    ~1  2~2 = green,~1  3~2 = yellow,\n"
+"   4~2 = blue, ~1  5~2 = magenta,~1  6~2 = cyan, ~1  7~2 = white\n"
+"\n"
+"3) Then use these keys when finished:\n"
+"   'q' to abort changes to window '~1%s~2'\n"
+"   'a' or 'w' to commit & change another, <Enter> to commit and end "
+msgstr ""
+
+#: top/top_nls.c:629
+#, c-format
+msgid ""
+"Fields Management~2 for window ~1%s~6, whose current sort field is ~1%s~2\n"
+"   Navigate with Up/Dn, Right selects for move then <Enter> or Left "
+"commits,\n"
+"   'd' or <Space> toggles display, 's' sets sort.  Use 'q' or <Esc> to end!\n"
+msgstr ""
+
+#: top/top_nls.c:634
+#, c-format
+msgid ""
+"%s:~3 %3u ~2total,~3 %3u ~2running,~3 %3u ~2sleeping,~3 %3u ~2stopped,~3 %3u "
+"~2zombie~3\n"
+msgstr ""
+
+#: top/top_nls.c:637
+#, c-format
+msgid ""
+"%%%s~3 %#5.1f  ~2user,~3 %#5.1f  ~2system,~3 %#5.1f  ~2nice,~3 %#5.1f  "
+"~2idle~3\n"
+msgstr ""
+
+#: top/top_nls.c:640
+#, c-format
+msgid ""
+"%%%s~3 %#5.1f  ~2user,~3 %#5.1f  ~2system,~3 %#5.1f  ~2nice,~3 %#5.1f  "
+"~2idle,~3 %#5.1f  ~2IO-wait~3\n"
+msgstr ""
+
+#. Translation Hint: Only the following abbreviations need be translated
+#. .                 us = user, sy = system, ni = nice, id = idle, wa = wait,
+#. .                 hi hardware interrupt, si = software interrupt
+#: top/top_nls.c:646
+#, c-format
+msgid ""
+"%%%s~3 %#5.1f ~2us,~3 %#5.1f ~2sy,~3 %#5.1f ~2ni,~3 %#5.1f ~2id,~3 %#5.1f "
+"~2wa,~3 %#5.1f ~2hi,~3 %#5.1f ~2si~3\n"
+msgstr ""
+
+#. Translation Hint: Only the following abbreviations need be translated
+#. .                 us = user, sy = system, ni = nice, id = idle, wa = wait,
+#. .                 hi hardware interrupt, si = software interrupt, st = steal time
+#: top/top_nls.c:652
+#, c-format
+msgid ""
+"%%%s~3%#5.1f ~2us,~3%#5.1f ~2sy,~3%#5.1f ~2ni,~3%#5.1f ~2id,~3%#5.1f ~2wa,"
+"~3%#5.1f ~2hi,~3%#5.1f ~2si,~3%#5.1f ~2st~3\n"
+msgstr ""
+
+#: top/top_nls.c:655
+#, c-format
+msgid ""
+"%s %s:~3 %9.9s~2total,~3 %9.9s~2free,~3 %9.9s~2used,~3 %9.9s~2buff/cache~3\n"
+"%s %s:~3 %9.9s~2total,~3 %9.9s~2free,~3 %9.9s~2used.~3 %9.9s~2avail %s~3\n"
+msgstr ""
+
+#: top/top_nls.c:659
+#, c-format
+msgid ""
+"Inspection~2 Pause at: pid ~1%d~6, running ~1%s~6\n"
+"Use~2:  left/right then <Enter> to ~1select~5 an option; 'q' or <Esc> to "
+"~1end~5 !\n"
+"Options~2: ~1%s\n"
+msgstr ""
+
+#: top/top_nls.c:664
+#, c-format
+msgid ""
+"Inspection~2 View at pid: ~1%s~3, running ~1%s~3.  Locating: ~1%s~6\n"
+"Use~2:  left/right/up/down/etc to ~1navigate~5 the output; 'L'/'&' to "
+"~1locate~5/~1next~5.\n"
+"Or~2:   <Enter> to ~1select another~5; 'q' or <Esc> to ~1end~5 !\n"
+msgstr ""
+
+#: uptime.c:61
+msgid " -p, --pretty   show uptime in pretty format\n"
+msgstr ""
+
+#: uptime.c:63
+#, fuzzy
+msgid " -s, --since    system up since\n"
+msgstr "跳过%s，因为它位于不同的设备上"
+
+#: vmstat.c:93
+#, fuzzy, c-format
+msgid " %s [options] [delay [count]]\n"
+msgstr "%s：在%s 处的计数无效"
+
+#: vmstat.c:96
+#, fuzzy
+msgid " -a, --active           active/inactive memory\n"
+msgstr "帐号未启用"
+
+#: vmstat.c:97
+msgid " -f, --forks            number of forks since boot\n"
+msgstr ""
+
+#: vmstat.c:98
+#, fuzzy
+msgid " -m, --slabs            slabinfo\n"
+msgstr "‘m’标记"
+
+#: vmstat.c:99
+msgid " -n, --one-header       do not redisplay header\n"
+msgstr ""
+
+#: vmstat.c:100
+msgid " -s, --stats            event counter statistics\n"
+msgstr ""
+
+#: vmstat.c:101
+#, fuzzy
+msgid " -d, --disk             disk statistics\n"
+msgstr "不明的磁盘旗标，%d。"
+
+#: vmstat.c:102
+msgid " -D, --disk-sum         summarize disk statistics\n"
+msgstr ""
+
+#: vmstat.c:103
+msgid " -p, --partition <dev>  partition specific statistics\n"
+msgstr ""
+
+#: vmstat.c:104
+msgid " -S, --unit <char>      define display unit\n"
+msgstr ""
+
+#: vmstat.c:105
+#, fuzzy
+msgid " -w, --wide             wide output\n"
+msgstr "格式字符串是一个宽字符串"
+
+#: vmstat.c:106
+#, fuzzy
+msgid " -t, --timestamp        show timestamp\n"
+msgstr "正在更新 armap 时间戳"
+
+#: vmstat.c:195
+msgid ""
+"procs -----------memory---------- ---swap-- -----io---- -system-- ------"
+"cpu-----"
+msgstr ""
+
+#: vmstat.c:197
+msgid ""
+"procs -----------------------memory---------------------- ---swap-- -----"
+"io---- -system-- --------cpu--------"
+msgstr ""
+
+#: vmstat.c:198 vmstat.c:523
+#, fuzzy
+msgid " -----timestamp-----"
+msgstr "关闭时间戳记"
+
+#. Translation Hint: max 2 chars
+#: vmstat.c:217
+#, fuzzy
+msgid "r"
+msgstr " R - 调制解调器有 DCD 线 ....."
+
+#. Translation Hint: max 2 chars
+#: vmstat.c:219
+#, fuzzy
+msgid "b"
+msgstr "B<2>"
+
+#. Translation Hint: max 6 chars
+#: vmstat.c:221
+msgid "swpd"
+msgstr "交换"
+
+#. Translation Hint: max 6 chars
+#: vmstat.c:223
+msgid "free"
+msgstr "空闲"
+
+#. Translation Hint: max 6 chars
+#: vmstat.c:225
+msgid "inact"
+msgstr "不活动"
+
+#. Translation Hint: max 6 chars
+#: vmstat.c:227
+msgid "buff"
+msgstr "缓冲"
+
+#. Translation Hint: max 6 chars
+#: vmstat.c:229
+msgid "active"
+msgstr "活动"
+
+#. Translation Hint: max 6 chars
+#: vmstat.c:231
+msgid "cache"
+msgstr "缓存"
+
+#. Translation Hint: max 4 chars
+#: vmstat.c:233
+msgid "si"
+msgstr ""
+
+#. Translation Hint: max 4 chars
+#: vmstat.c:235
+msgid "so"
+msgstr ""
+
+#. Translation Hint: max 5 chars
+#: vmstat.c:237
+msgid "bi"
+msgstr ""
+
+#. Translation Hint: max 5 chars
+#: vmstat.c:239
+msgid "bo"
+msgstr ""
+
+#. Translation Hint: max 4 chars
+#: vmstat.c:241
+msgid "in"
+msgstr ""
+
+#. Translation Hint: max 4 chars
+#: vmstat.c:243
+msgid "cs"
+msgstr ""
+
+#. Translation Hint: max 2 chars
+#: vmstat.c:245
+msgid "us"
+msgstr ""
+
+#. Translation Hint: max 2 chars
+#: vmstat.c:247
+msgid "sy"
+msgstr ""
+
+#. Translation Hint: max 2 chars
+#: vmstat.c:249
+msgid "id"
+msgstr ""
+
+#. Translation Hint: max 2 chars
+#: vmstat.c:251
+msgid "wa"
+msgstr ""
+
+#. Translation Hint: max 2 chars
+#: vmstat.c:253
+msgid "st"
+msgstr ""
+
+#. Translation Hint: Translating folloging disk partition
+#. * header fields that follow (marked with max x chars) might
+#. * not work, unless manual page is translated as well.
+#. Translation Hint: max 10 chars. The word is
+#. * expected to be centralized, use spaces at the end
+#. * to do that.
+#: vmstat.c:436
+msgid "reads  "
+msgstr "读取   "
+
+#. Translation Hint: max 10 chars
+#: vmstat.c:438
+#, fuzzy
+msgid "read sectors"
+msgstr "扇区"
+
+#. Translation Hint: max 10 chars. The word is
+#. * expected to be centralized, use spaces at the end
+#. * to do that.
+#: vmstat.c:442
+msgid "writes   "
+msgstr "写入   "
+
+#. Translation Hint: max 10 chars
+#: vmstat.c:444
+#, fuzzy
+msgid "requested writes"
+msgstr "要求的对齐边界太大"
+
+#: vmstat.c:458
+msgid "your kernel does not support diskstat. (2.5.70 or above required)"
+msgstr ""
+
+#: vmstat.c:520
+msgid ""
+"disk- ------------reads------------ ------------writes----------- -----"
+"IO------"
+msgstr ""
+
+#: vmstat.c:522
+msgid ""
+"disk- -------------------reads------------------- -------------------"
+"writes------------------ ------IO-------"
+msgstr ""
+
+#. Translation Hint: max 6 chars
+#: vmstat.c:541 vmstat.c:549
+msgid "total"
+msgstr "总用量"
+
+#. Translation Hint: max 6 chars
+#: vmstat.c:543 vmstat.c:551
+msgid "merged"
+msgstr ""
+
+#. Translation Hint: max 7 chars
+#: vmstat.c:545 vmstat.c:553
+msgid "sectors"
+msgstr "扇区"
+
+#. Translation Hint: max 7 chars
+#: vmstat.c:547 vmstat.c:555
+msgid "ms"
+msgstr ""
+
+#. Translation Hint: max 6 chars
+#: vmstat.c:557
+msgid "cur"
+msgstr ""
+
+#. Translation Hint: max 6 chars
+#: vmstat.c:559
+msgid "sec"
+msgstr ""
+
+#: vmstat.c:669
+msgid "your kernel does not support diskstat (2.5.70 or above required)"
+msgstr ""
+
+#. Translation Hint: Translating folloging slab fields that
+#. * follow (marked with max x chars) might not work, unless
+#. * manual page is translated as well.
+#. Translation Hint: max 24 chars
+#: vmstat.c:679
+#, fuzzy
+msgid "Cache"
+msgstr "以 KB 表示的软件数据缓存的大小"
+
+#. Translation Hint: max 6 chars
+#: vmstat.c:681
+#, fuzzy
+msgid "Num"
+msgstr "NUM"
+
+#. Translation Hint: max 6 chars
+#: vmstat.c:683
+msgid "Total"
+msgstr "总共"
+
+#. Translation Hint: max 6 chars
+#: vmstat.c:685
+msgid "Size"
+msgstr "大小"
+
+#. Translation Hint: max 6 chars
+#: vmstat.c:687
+#, fuzzy
+msgid "Pages"
+msgstr "用于生成简单的手册页的实用程序"
+
+#: vmstat.c:699
+msgid ""
+"your kernel does not support slabinfo or your permissions are insufficient"
+msgstr ""
+
+#: vmstat.c:751
+#, c-format
+msgid "%13d disks \n"
+msgstr ""
+
+#: vmstat.c:752
+#, fuzzy, c-format
+msgid "%13d partitions \n"
+msgstr "主分区过多。"
+
+#: vmstat.c:768
+#, fuzzy, c-format
+msgid "%13lu total reads\n"
+msgstr "总用量"
+
+#: vmstat.c:769
+#, c-format
+msgid "%13lu merged reads\n"
+msgstr ""
+
+#: vmstat.c:770
+#, fuzzy, c-format
+msgid "%13lu read sectors\n"
+msgstr "扇区"
+
+#: vmstat.c:771
+#, fuzzy, c-format
+msgid "%13lu milli reading\n"
+msgstr "读取宏"
+
+#: vmstat.c:772
+#, c-format
+msgid "%13lu writes\n"
+msgstr ""
+
+#: vmstat.c:773
+#, c-format
+msgid "%13lu merged writes\n"
+msgstr ""
+
+#: vmstat.c:774
+#, fuzzy, c-format
+msgid "%13lu written sectors\n"
+msgstr "扇区"
+
+#: vmstat.c:775
+#, fuzzy, c-format
+msgid "%13lu milli writing\n"
+msgstr "写入%qs时错误"
+
+#: vmstat.c:776
+#, fuzzy, c-format
+msgid "%13lu inprogress IO\n"
+msgstr "错误的 IO 基类型(%d)"
+
+#: vmstat.c:777
+#, c-format
+msgid "%13lu milli spent IO\n"
+msgstr ""
+
+#: vmstat.c:798
+#, fuzzy, c-format
+msgid "%13lu %s total memory\n"
+msgstr "脚本“%s”: 内存耗尽%s\n"
+
+#: vmstat.c:799
+#, fuzzy, c-format
+msgid "%13lu %s used memory\n"
+msgstr "脚本“%s”: 内存耗尽%s\n"
+
+#: vmstat.c:800
+#, fuzzy, c-format
+msgid "%13lu %s active memory\n"
+msgstr "设备 %s 未激活。\n"
+
+#: vmstat.c:801
+#, fuzzy, c-format
+msgid "%13lu %s inactive memory\n"
+msgstr "脚本“%s”: 内存耗尽%s\n"
+
+#: vmstat.c:802
+#, fuzzy, c-format
+msgid "%13lu %s free memory\n"
+msgstr "脚本“%s”: 内存耗尽%s\n"
+
+#: vmstat.c:803
+#, fuzzy, c-format
+msgid "%13lu %s buffer memory\n"
+msgstr "内存节 %s+%x"
+
+#: vmstat.c:804
+#, fuzzy, c-format
+msgid "%13lu %s swap cache\n"
+msgstr "无法丢弃缓存：%s"
+
+#: vmstat.c:805
+#, c-format
+msgid "%13lu %s total swap\n"
+msgstr ""
+
+#: vmstat.c:806
+#, fuzzy, c-format
+msgid "%13lu %s used swap\n"
+msgstr "%s 与%<%%%c%>%s 格式并用"
+
+#: vmstat.c:807
+#, c-format
+msgid "%13lu %s free swap\n"
+msgstr ""
+
+#: vmstat.c:808
+#, c-format
+msgid "%13lld non-nice user cpu ticks\n"
+msgstr ""
+
+#: vmstat.c:809
+#, c-format
+msgid "%13lld nice user cpu ticks\n"
+msgstr ""
+
+#: vmstat.c:810
+#, c-format
+msgid "%13lld system cpu ticks\n"
+msgstr ""
+
+#: vmstat.c:811
+#, c-format
+msgid "%13lld idle cpu ticks\n"
+msgstr ""
+
+#: vmstat.c:812
+#, c-format
+msgid "%13lld IO-wait cpu ticks\n"
+msgstr ""
+
+#: vmstat.c:813
+#, c-format
+msgid "%13lld IRQ cpu ticks\n"
+msgstr ""
+
+#: vmstat.c:814
+#, c-format
+msgid "%13lld softirq cpu ticks\n"
+msgstr ""
+
+#: vmstat.c:815
+#, c-format
+msgid "%13lld stolen cpu ticks\n"
+msgstr ""
+
+#: vmstat.c:816
+#, fuzzy, c-format
+msgid "%13lu pages paged in\n"
+msgstr "已本地化的手册页"
+
+#: vmstat.c:817
+#, c-format
+msgid "%13lu pages paged out\n"
+msgstr ""
+
+#: vmstat.c:818
+#, fuzzy, c-format
+msgid "%13lu pages swapped in\n"
+msgstr "用于生成简单的手册页的实用程序"
+
+#: vmstat.c:819
+#, c-format
+msgid "%13lu pages swapped out\n"
+msgstr ""
+
+#: vmstat.c:820
+#, c-format
+msgid "%13u interrupts\n"
+msgstr ""
+
+#: vmstat.c:821
+#, c-format
+msgid "%13u CPU context switches\n"
+msgstr ""
+
+#: vmstat.c:822
+#, fuzzy, c-format
+msgid "%13u boot time\n"
+msgstr "无法获取启动时间"
+
+#: vmstat.c:823 vmstat.c:838
+#, c-format
+msgid "%13u forks\n"
+msgstr ""
+
+#. Translation Hint: do not change argument characters
+#: vmstat.c:940
+msgid "-S requires k, K, m or M (default is KiB)"
+msgstr ""
+
+#: vmstat.c:991
+#, fuzzy, c-format
+msgid "partition was not found\n"
+msgstr "找不到有效的分区映射。"
+
+#: watch.c:90
+#, fuzzy, c-format
+msgid " %s [options] command\n"
+msgstr "用法：%s [选项] 命令\n"
+
+#: watch.c:92
+msgid "  -b, --beep             beep if command has a non-zero exit\n"
+msgstr ""
+
+#: watch.c:93
+msgid "  -c, --color            interpret ANSI color and style sequences\n"
+msgstr ""
+
+#: watch.c:94
+msgid ""
+"  -d, --differences[=<permanent>]\n"
+"                         highlight changes between updates\n"
+msgstr ""
+
+#: watch.c:96
+msgid "  -e, --errexit          exit if command has a non-zero exit\n"
+msgstr ""
+
+#: watch.c:97
+msgid "  -g, --chgexit          exit when output from command changes\n"
+msgstr ""
+
+#: watch.c:98
+msgid "  -n, --interval <secs>  seconds to wait between updates\n"
+msgstr ""
+
+#: watch.c:99
+msgid "  -p, --precise          attempt run command in precise intervals\n"
+msgstr ""
+
+#: watch.c:100
+msgid "  -t, --no-title         turn off header\n"
+msgstr ""
+
+#: watch.c:101
+msgid "  -x, --exec             pass command to exec instead of \"sh -c\"\n"
+msgstr ""
+
+#: watch.c:104
+#, fuzzy
+msgid " -v, --version  output version information and exit\n"
+msgstr ""
+"将分区表的变更通报操作系统。\n"
+"\n"
+"  -d, --dry-run    并非真的通报操作系统\n"
+"  -s, --summary    印出内容的概要\n"
+"  -h, --help       显示这个说明然后离开\n"
+"  -v, --version    输出版本信息然后离开\n"
+
+#: watch.c:384
+#, fuzzy, c-format
+msgid "Every %.1fs: "
+msgstr "每秒时间戳记列"
+
+#: watch.c:385
+#, c-format
+msgid "%s: %s"
+msgstr ""
+
+#: watch.c:456
+#, fuzzy
+msgid "unable to create IPC pipes"
+msgstr "无法创建不可改变的头区。\n"
+
+#: watch.c:466
+#, fuzzy
+msgid "unable to fork process"
+msgstr "创建系统进程(fork)出错"
+
+#: watch.c:471
+#, fuzzy
+msgid "dup2 failed"
+msgstr " 失败 - "
+
+#: watch.c:478
+#, fuzzy, c-format
+msgid "unable to execute '%s'"
+msgstr "无法执行“%s”：%s"
+
+#: watch.c:495
+msgid "fdopen"
+msgstr "fdopen"
+
+#: watch.c:641
+#, fuzzy
+msgid "waitpid"
+msgstr "waitpid 失败"
+
+#: watch.c:649
+msgid "command exit with a non-zero status, press a key to exit"
+msgstr "命令以非零状态退出，按任意键退出"
+
+#: watch.c:773
+#, fuzzy, c-format
+msgid "unicode handling error\n"
+msgstr "以 null 终止的 unicode 字符串"
+
+#: watch.c:779
+#, c-format
+msgid "unicode handling error (malloc)\n"
+msgstr "unicode 处理错误 (malloc)\n"
+
+#: w.c:245 w.c:260
+#, c-format
+msgid " %2ludays"
+msgstr ""
+
+#. Translation Hint: Minutes:Seconds
+#. Translation Hint: Hours:Minutes
+#: w.c:254 w.c:264
+#, c-format
+msgid " %2lu:%02um"
+msgstr ""
+
+#. Translation Hint: Seconds:Centiseconds
+#: w.c:272
+#, c-format
+msgid " %2lu.%02us"
+msgstr ""
+
+#: w.c:455
+#, fuzzy
+msgid " -h, --no-header     do not print header\n"
+msgstr "打印使用到的头文件名"
+
+#: w.c:456
+msgid " -u, --no-current    ignore current process username\n"
+msgstr ""
+
+#: w.c:457
+#, fuzzy
+msgid " -s, --short         short format\n"
+msgstr "%<short%>对%qs无效"
+
+#: w.c:458
+msgid " -f, --from          show remote hostname field\n"
+msgstr ""
+
+#: w.c:459
+#, fuzzy
+msgid " -o, --old-style     old style output\n"
+msgstr "旧式的函数定义"
+
+#: w.c:460
+msgid ""
+" -i, --ip-addr       display IP address instead of hostname (if possible)\n"
+msgstr ""
+
+#: w.c:557
+#, c-format
+msgid ""
+"User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n"
+msgstr ""
+
+#: w.c:567
+#, c-format
+msgid ""
+"from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n"
+msgstr ""
+
+#. Translation Hint: Following five uppercase messages are
+#. * headers. Try to keep alignment intact.
+#: w.c:591
+#, c-format
+msgid "%-*s TTY      "
+msgstr "%-*s TTY      "
+
+#: w.c:593
+msgid "FROM"
+msgstr "来自"
+
+#: w.c:595
+#, fuzzy, c-format
+msgid "  LOGIN@   IDLE   JCPU   PCPU WHAT\n"
+msgstr "  登陆于   空闲   JCPU   PCPU WHAT\n"
+
+#: w.c:597
+#, c-format
+msgid "   IDLE WHAT\n"
+msgstr "   空闲等待\n"
+
+#: include/c.h:153
+msgid ""
+"\n"
+"Usage:\n"
+msgstr ""
+"\n"
+"用法：\n"
+
+#: include/c.h:154
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"选项：\n"
+
+#: include/c.h:155
+msgid "\n"
+msgstr ""
+
+#: include/c.h:156
+msgid " -h, --help     display this help and exit\n"
+msgstr " -h, --help     显示此帮助然后离开\n"
+
+#: include/c.h:157
+msgid " -V, --version  output version information and exit\n"
+msgstr " -V, --version  显示程序版本然后离开\n"
+
+#: include/c.h:158
+#, c-format
+msgid ""
+"\n"
+"For more details see %s.\n"
+msgstr ""
+"\n"
+"欲了解更多详细信息，请参见 %s。\n"
+
+#: include/c.h:160
+#, c-format
+msgid "%s from %s\n"
+msgstr ""
+
+#, fuzzy
+#~ msgid "seconds argument `%s' failed"
+#~ msgstr "无效的秒数：%s"
+
+#, fuzzy
+#~ msgid "oom_adjustment (2^X)"
+#~ msgstr " X: 2             R: 7-E-1\n"
+
+#, fuzzy
+#~ msgid "warning: screen width %d suboptimal"
+#~ msgstr "警告：无效的宽度值%lu，已使用%d 代替"
diff -Nru procps-3.3.11/proc/devname.c procps-3.3.12/proc/devname.c
--- procps-3.3.11/proc/devname.c	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/proc/devname.c	2016-07-10 06:40:26.000000000 +0000
@@ -133,9 +133,12 @@
   }
   sprintf(buf, "/dev/%s%d", tmn->name, min);  /* like "/dev/ttyZZ255" */
   if(stat(buf, &sbuf) < 0){
-    if(tmn->devfs_type) return 0;
-    sprintf(buf, "/dev/%s", tmn->name);  /* like "/dev/ttyZZ255" */
-    if(stat(buf, &sbuf) < 0) return 0;
+    sprintf(buf, "/dev/%s/%d", tmn->name, min);  /* like "/dev/pts/255" */
+    if(stat(buf, &sbuf) < 0){
+      if(tmn->devfs_type) return 0;
+      sprintf(buf, "/dev/%s", tmn->name);  /* like "/dev/ttyZZ255" */
+      if(stat(buf, &sbuf) < 0) return 0;
+    }
   }
   if(min != MINOR_OF(sbuf.st_rdev)) return 0;
   if(maj != MAJOR_OF(sbuf.st_rdev)) return 0;
diff -Nru procps-3.3.11/proc/libprocps.sym procps-3.3.12/proc/libprocps.sym
--- procps-3.3.11/proc/libprocps.sym	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/proc/libprocps.sym	2016-07-10 06:40:26.000000000 +0000
@@ -58,7 +58,7 @@
 	tty_to_dev;
 	unix_print_signals;
 	uptime;
-	user_from_uid;
+	pwcache_get_user;
 	procps_linux_version;
 local:
 	*;
diff -Nru procps-3.3.11/proc/pwcache.c procps-3.3.12/proc/pwcache.c
--- procps-3.3.11/proc/pwcache.c	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/proc/pwcache.c	2016-07-10 06:40:26.000000000 +0000
@@ -41,7 +41,7 @@
     char name[P_G_SZ];
 } *pwhash[HASHSIZE];
 
-char *user_from_uid(uid_t uid) {
+char *pwcache_get_user(uid_t uid) {
     struct pwbuf **p;
     struct passwd *pw;
 
@@ -69,7 +69,7 @@
     char name[P_G_SZ];
 } *grphash[HASHSIZE];
 
-char *group_from_gid(gid_t gid) {
+char *pwcache_get_group(gid_t gid) {
     struct grpbuf **g;
     struct group *gr;
 
diff -Nru procps-3.3.11/proc/pwcache.h procps-3.3.12/proc/pwcache.h
--- procps-3.3.11/proc/pwcache.h	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/proc/pwcache.h	2016-07-10 06:40:26.000000000 +0000
@@ -9,8 +9,8 @@
 // used in pwcache and in readproc to set size of username or groupname
 #define P_G_SZ 33
 
-extern char *user_from_uid(uid_t uid);
-extern char *group_from_gid(gid_t gid);
+char *pwcache_get_user(uid_t uid);
+char *pwcache_get_group(gid_t gid);
 
 EXTERN_C_END
 
diff -Nru procps-3.3.11/proc/readproc.c procps-3.3.12/proc/readproc.c
--- procps-3.3.11/proc/readproc.c	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/proc/readproc.c	2016-07-10 06:40:26.000000000 +0000
@@ -93,9 +93,9 @@
         if (p->environ)  free((void*)*p->environ);
         if (p->cmdline)  free((void*)*p->cmdline);
         if (p->cgroup)   free((void*)*p->cgroup);
+        if (p->cgname)   free(p->cgname);
         if (p->supgid)   free(p->supgid);
         if (p->supgrp)   free(p->supgrp);
-#ifdef WITH_SYSTEMD
         if (p->sd_mach)  free(p->sd_mach);
         if (p->sd_ouid)  free(p->sd_ouid);
         if (p->sd_seat)  free(p->sd_seat);
@@ -103,7 +103,6 @@
         if (p->sd_slice) free(p->sd_slice);
         if (p->sd_unit)  free(p->sd_unit);
         if (p->sd_uunit) free(p->sd_uunit);
-#endif
 #ifdef QUICK_THREADS
     }
 #endif
@@ -113,7 +112,7 @@
 ///////////////////////////////////////////////////////////////////////////
 
 typedef struct status_table_struct {
-    unsigned char name[7];        // /proc/*/status field name
+    unsigned char name[8];        // /proc/*/status field name
     unsigned char len;            // name length
 #ifdef LABEL_OFFSET
     long offset;                  // jump address offset
@@ -129,8 +128,11 @@
 #endif
 #define NUL  {"", 0, 0},
 
+#define GPERF_TABLE_SIZE 128
+
 // Derived from:
 // gperf -7 --language=ANSI-C --key-positions=1,3,4 -C -n -c <if-not-piped>
+// ( --key-positions verified by omission & reported "Computed positions" )
 //
 // Suggested method:
 // Grep this file for "case_", then strip those down to the name.
@@ -144,8 +146,8 @@
 // the F macro and replacing empty strings with the NUL define.
 //
 // In the status_table_struct watch out for name size (grrr, expanding)
-// and the number of entries (we mask with 63 for now). The table
-// must be padded out to 64 entries, maybe 128 in the future.
+// and the number of entries. Currently, the table is padded to 128
+// entries and we therefore mask with 127.
 
 static void status2proc(char *S, proc_t *restrict P, int is_proc){
     long Threads = 0;
@@ -155,78 +157,76 @@
   // 128 entries because we trust the kernel to use ASCII names
   static const unsigned char asso[] =
     {
-      64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-      64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-      64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-      64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-      64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-      64, 64, 64, 64, 64, 64, 64, 64, 28, 64,
-      64, 64, 64, 64, 64, 64,  8, 25, 23, 25,
-       6, 25,  0,  3, 64, 64,  3, 64, 25, 64,
-      20,  1,  1,  5,  0, 30,  0,  0, 64, 64,
-      64, 64, 64, 64, 64, 64, 64,  3, 64,  0,
-       0, 18, 64, 10, 64, 10, 64, 64, 64, 20,
-      64, 20,  0, 64, 25, 64,  3, 15, 64,  0,
-      30, 64, 64, 64, 64, 64, 64, 64
+      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+      101, 101, 101, 101, 101, 101, 101, 101,   6, 101,
+      101, 101, 101, 101, 101,  45,  55,  25,  31,  50,
+       50,  10,   0,  35, 101, 101,  21, 101,  30, 101,
+       20,  36,   0,   5,   0,  40,   0,   0, 101, 101,
+      101, 101, 101, 101, 101, 101, 101,  30, 101,  15,
+        0,   1, 101,  10, 101,  10, 101, 101, 101,  25,
+      101,  40,   0, 101,   0,  50,   6,  40, 101,   1,
+       35, 101, 101, 101, 101, 101, 101, 101
     };
 
-    static const status_table_struct table[] = {
+    static const status_table_struct table[GPERF_TABLE_SIZE] = {
       F(VmHWM)
-      NUL NUL
-      F(VmLck)
-      NUL
-      F(VmSwap)
+      F(Threads)
+      NUL NUL NUL
       F(VmRSS)
-      NUL
-      F(VmStk)
-      NUL
+      F(VmSwap)
+      NUL NUL NUL
       F(Tgid)
-      F(State)
-      NUL
-      F(VmLib)
-      NUL
+      F(VmStk)
+      NUL NUL NUL
       F(VmSize)
-      F(SigQ)
-      NUL
-      F(SigIgn)
-      NUL
+      F(Gid)
+      NUL NUL NUL
       F(VmPTE)
-      F(FDSize)
-      NUL
-      F(SigBlk)
-      NUL
+      F(VmPeak)
+      NUL NUL NUL
       F(ShdPnd)
-      F(VmData)
-      NUL
-      F(CapInh)
-      NUL
+      F(Pid)
+      NUL NUL NUL
       F(PPid)
-      NUL NUL
-      F(CapBnd)
-      NUL
+      F(VmLib)
+      NUL NUL NUL
       F(SigPnd)
-      NUL NUL
-      F(VmPeak)
-      NUL
+      F(VmLck)
+      NUL NUL NUL
       F(SigCgt)
-      NUL NUL
-      F(Threads)
-      NUL
+      F(State)
+      NUL NUL NUL
       F(CapPrm)
-      NUL NUL
-      F(Pid)
-      NUL
+      F(Uid)
+      NUL NUL NUL
+      F(SigIgn)
+      F(SigQ)
+      NUL NUL NUL
+      F(RssShmem)
+      F(Name)
+      NUL NUL NUL
+      F(CapInh)
+      F(VmData)
+      NUL NUL NUL
+      F(FDSize)
+      NUL NUL NUL NUL
+      F(SigBlk)
+      NUL NUL NUL NUL
       F(CapEff)
-      NUL NUL
-      F(Gid)
-      NUL
+      NUL NUL NUL NUL
+      F(CapBnd)
+      NUL NUL NUL NUL
       F(VmExe)
-      NUL NUL
-      F(Uid)
-      NUL
+      NUL NUL NUL NUL
       F(Groups)
-      NUL NUL
-      F(Name)
+      NUL NUL NUL NUL
+      F(RssAnon)
+      NUL NUL NUL NUL
+      F(RssFile)
     };
 
 #undef F
@@ -248,7 +248,7 @@
         // examine a field name (hash and compare)
     base:
         if(unlikely(!*S)) break;
-        entry = table[63 & (asso[(int)S[3]] + asso[(int)S[2]] + asso[(int)S[0]])];
+        entry = table[(GPERF_TABLE_SIZE -1) & (asso[(int)S[3]] + asso[(int)S[2]] + asso[(int)S[0]])];
         colon = strchr(S, ':');
         if(unlikely(!colon)) break;
         if(unlikely(colon[1]!='\t')) break;
@@ -361,6 +361,15 @@
     case_VmRSS:
         P->vm_rss = strtol(S,&S,10);
         continue;
+    case_RssAnon:       // subset of VmRSS, linux-4.5
+        P->vm_rss_anon = strtol(S,&S,10);
+        continue;
+    case_RssFile:       // subset of VmRSS, linux-4.5
+        P->vm_rss_file = strtol(S,&S,10);
+        continue;
+    case_RssShmem:      // subset of VmRSS, linux-4.5
+        P->vm_rss_shared = strtol(S,&S,10);
+        continue;
     case_VmSize:
         P->vm_size = strtol(S,&S,10);
         continue;
@@ -436,6 +445,7 @@
 
 LEAVE(0x220);
 }
+#undef GPERF_TABLE_SIZE
 
 static void supgrps_from_supgids (proc_t *p) {
     char *g, *s;
@@ -449,14 +459,13 @@
     t = 0;
     do {
         if (',' == *s) ++s;
-        g = group_from_gid((uid_t)strtol(s, &s, 10));
+        g = pwcache_get_group((uid_t)strtol(s, &s, 10));
         p->supgrp = xrealloc(p->supgrp, P_G_SZ+t+2);
         t += snprintf(p->supgrp+t, P_G_SZ+2, "%s%s", t ? "," : "", g);
     } while (*s);
 }
 
 ///////////////////////////////////////////////////////////////////////
-#ifdef OOMEM_ENABLE
 static void oomscore2proc(const char* S, proc_t *restrict P)
 {
     sscanf(S, "%d", &P->oom_score);
@@ -466,7 +475,6 @@
 {
     sscanf(S, "%d", &P->oom_adj);
 }
-#endif
 ///////////////////////////////////////////////////////////////////////
 
 static const char *ns_names[] = {
@@ -509,8 +517,8 @@
     }
 }
 
-#ifdef WITH_SYSTEMD
 static void sd2proc(proc_t *restrict p) {
+#ifdef WITH_SYSTEMD
     char buf[64];
     uid_t uid;
 
@@ -523,7 +531,6 @@
         snprintf(buf, sizeof(buf), "%d", (int)uid);
         p->sd_ouid = strdup(buf);
     }
-
     if (0 > sd_pid_get_session(p->tid, &p->sd_sess)) {
         p->sd_sess = strdup("-");
         p->sd_seat = strdup("-");
@@ -531,17 +538,22 @@
         if (0 > sd_session_get_seat(p->sd_sess, &p->sd_seat))
             p->sd_seat = strdup("-");
     }
-
     if (0 > sd_pid_get_slice(p->tid, &p->sd_slice))
         p->sd_slice = strdup("-");
-
     if (0 > sd_pid_get_unit(p->tid, &p->sd_unit))
         p->sd_unit = strdup("-");
-
     if (0 > sd_pid_get_user_unit(p->tid, &p->sd_uunit))
         p->sd_uunit = strdup("-");
-}
+#else
+    p->sd_mach  = strdup("?");
+    p->sd_ouid  = strdup("?");
+    p->sd_seat  = strdup("?");
+    p->sd_sess  = strdup("?");
+    p->sd_slice = strdup("?");
+    p->sd_unit  = strdup("?");
+    p->sd_uunit = strdup("?");
 #endif
+}
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -571,11 +583,11 @@
        "%c "
        "%d %d %d %d %d "
        "%lu %lu %lu %lu %lu "
-       "%Lu %Lu %Lu %Lu "  /* utime stime cutime cstime */
+       "%llu %llu %llu %llu "  /* utime stime cutime cstime */
        "%ld %ld "
        "%d "
        "%ld "
-       "%Lu "  /* start_time */
+       "%llu "  /* start_time */
        "%lu "
        "%ld "
        "%lu %"KLF"u %"KLF"u %"KLF"u %"KLF"u %"KLF"u "
@@ -762,7 +774,7 @@
     // the data into a single string represented as a single vector.
 static void fill_cgroup_cvt (const char* directory, proc_t *restrict p) {
  #define vMAX ( MAX_BUFSZ - (int)(dst - dst_buffer) )
-    char *src, *dst, *grp, *eob;
+    char *src, *dst, *grp, *eob, *name;
     int tot, x, whackable_int = MAX_BUFSZ;
 
     *(dst = dst_buffer) = '\0';                  // empty destination
@@ -779,6 +791,10 @@
         dst += escape_str(dst, grp, vMAX, &whackable_int);
     }
     p->cgroup = vectorize_this_str(dst_buffer[0] ? dst_buffer : "-");
+
+    name = strstr(p->cgroup[0], ":name=");
+    if (name && *(name+6)) name += 6; else name = p->cgroup[0];
+    p->cgname = strdup(name);
  #undef vMAX
 }
 
@@ -939,21 +955,21 @@
 
     /* some number->text resolving which is time consuming */
     if (flags & PROC_FILLUSR){
-        memcpy(p->euser, user_from_uid(p->euid), sizeof p->euser);
+        memcpy(p->euser, pwcache_get_user(p->euid), sizeof p->euser);
         if(flags & PROC_FILLSTATUS) {
-            memcpy(p->ruser, user_from_uid(p->ruid), sizeof p->ruser);
-            memcpy(p->suser, user_from_uid(p->suid), sizeof p->suser);
-            memcpy(p->fuser, user_from_uid(p->fuid), sizeof p->fuser);
+            memcpy(p->ruser, pwcache_get_user(p->ruid), sizeof p->ruser);
+            memcpy(p->suser, pwcache_get_user(p->suid), sizeof p->suser);
+            memcpy(p->fuser, pwcache_get_user(p->fuid), sizeof p->fuser);
         }
     }
 
     /* some number->text resolving which is time consuming */
     if (flags & PROC_FILLGRP){
-        memcpy(p->egroup, group_from_gid(p->egid), sizeof p->egroup);
+        memcpy(p->egroup, pwcache_get_group(p->egid), sizeof p->egroup);
         if(flags & PROC_FILLSTATUS) {
-            memcpy(p->rgroup, group_from_gid(p->rgid), sizeof p->rgroup);
-            memcpy(p->sgroup, group_from_gid(p->sgid), sizeof p->sgroup);
-            memcpy(p->fgroup, group_from_gid(p->fgid), sizeof p->fgroup);
+            memcpy(p->rgroup, pwcache_get_group(p->rgid), sizeof p->rgroup);
+            memcpy(p->sgroup, pwcache_get_group(p->sgid), sizeof p->sgroup);
+            memcpy(p->fgroup, pwcache_get_group(p->fgid), sizeof p->fgroup);
         }
     }
 
@@ -962,41 +978,34 @@
             fill_environ_cvt(path, p);
         else
             p->environ = file2strvec(path, "environ");
-    } else
-        p->environ = NULL;
+    }
 
     if (flags & (PROC_FILLCOM|PROC_FILLARG)) {  // read /proc/#/cmdline
         if (flags & PROC_EDITCMDLCVT)
             fill_cmdline_cvt(path, p);
         else
             p->cmdline = file2strvec(path, "cmdline");
-    } else
-        p->cmdline = NULL;
+    }
 
     if ((flags & PROC_FILLCGROUP)) {            // read /proc/#/cgroup
         if (flags & PROC_EDITCGRPCVT)
             fill_cgroup_cvt(path, p);
         else
             p->cgroup = file2strvec(path, "cgroup");
-    } else
-        p->cgroup = NULL;
+    }
 
-#ifdef OOMEM_ENABLE
     if (unlikely(flags & PROC_FILLOOM)) {
         if (likely(file2str(path, "oom_score", &ub) != -1))
             oomscore2proc(ub.buf, p);
         if (likely(file2str(path, "oom_adj", &ub) != -1))
             oomadj2proc(ub.buf, p);
     }
-#endif
 
     if (unlikely(flags & PROC_FILLNS))          // read /proc/#/ns/*
         ns2proc(path, p);
 
-#ifdef WITH_SYSTEMD
     if (unlikely(flags & PROC_FILLSYSTEMD))     // get sd-login.h stuff
         sd2proc(p);
-#endif
 
     if (unlikely(flags & PROC_FILL_LXC))        // value the lxc name
         p->lxcname = lxc_containers(path);
@@ -1053,21 +1062,21 @@
 
     /* some number->text resolving which is time consuming */
     if (flags & PROC_FILLUSR){
-        memcpy(t->euser, user_from_uid(t->euid), sizeof t->euser);
+        memcpy(t->euser, pwcache_get_user(t->euid), sizeof t->euser);
         if(flags & PROC_FILLSTATUS) {
-            memcpy(t->ruser, user_from_uid(t->ruid), sizeof t->ruser);
-            memcpy(t->suser, user_from_uid(t->suid), sizeof t->suser);
-            memcpy(t->fuser, user_from_uid(t->fuid), sizeof t->fuser);
+            memcpy(t->ruser, pwcache_get_user(t->ruid), sizeof t->ruser);
+            memcpy(t->suser, pwcache_get_user(t->suid), sizeof t->suser);
+            memcpy(t->fuser, pwcache_get_user(t->fuid), sizeof t->fuser);
         }
     }
 
     /* some number->text resolving which is time consuming */
     if (flags & PROC_FILLGRP){
-        memcpy(t->egroup, group_from_gid(t->egid), sizeof t->egroup);
+        memcpy(t->egroup, pwcache_get_group(t->egid), sizeof t->egroup);
         if(flags & PROC_FILLSTATUS) {
-            memcpy(t->rgroup, group_from_gid(t->rgid), sizeof t->rgroup);
-            memcpy(t->sgroup, group_from_gid(t->sgid), sizeof t->sgroup);
-            memcpy(t->fgroup, group_from_gid(t->fgid), sizeof t->fgroup);
+            memcpy(t->rgroup, pwcache_get_group(t->rgid), sizeof t->rgroup);
+            memcpy(t->sgroup, pwcache_get_group(t->sgid), sizeof t->sgroup);
+            memcpy(t->fgroup, pwcache_get_group(t->fgid), sizeof t->fgroup);
         }
     }
 
@@ -1085,29 +1094,24 @@
                 fill_environ_cvt(path, t);
             else
                 t->environ = file2strvec(path, "environ");
-        } else
-            t->environ = NULL;
+        }
 
         if (flags & (PROC_FILLCOM|PROC_FILLARG)) {      // read /proc/#/task/#/cmdline
             if (flags & PROC_EDITCMDLCVT)
                 fill_cmdline_cvt(path, t);
             else
                 t->cmdline = file2strvec(path, "cmdline");
-        } else
-            t->cmdline = NULL;
+        }
 
         if ((flags & PROC_FILLCGROUP)) {                // read /proc/#/task/#/cgroup
             if (flags & PROC_EDITCGRPCVT)
                 fill_cgroup_cvt(path, t);
             else
                 t->cgroup = file2strvec(path, "cgroup");
-        } else
-            t->cgroup = NULL;
+        }
 
-#ifdef WITH_SYSTEMD
         if (unlikely(flags & PROC_FILLSYSTEMD))         // get sd-login.h stuff
             sd2proc(t);
-#endif
 
         if (unlikely(flags & PROC_FILL_LXC))            // value the lxc name
             t->lxcname = lxc_containers(path);
@@ -1123,11 +1127,11 @@
         t->dt       = p->dt;
         t->cmdline  = p->cmdline;  // better not free these until done with all threads!
         t->environ  = p->environ;
+        t->cgname   = p->cgname;
         t->cgroup   = p->cgroup;
         if (t->supgid) free(t->supgid);
         t->supgid   = p->supgid;
         t->supgrp   = p->supgrp;
-#ifdef WITH_SYSTEMD
         t->sd_mach  = p->sd_mach;
         t->sd_ouid  = p->sd_ouid;
         t->sd_seat  = p->sd_seat;
@@ -1135,20 +1139,17 @@
         t->sd_slice = p->sd_slice;
         t->sd_unit  = p->sd_unit;
         t->sd_uunit = p->sd_uunit;
-#endif
         t->lxcname = p->lxcname;
         MK_THREAD(t);
     }
 #endif
 
-#ifdef OOMEM_ENABLE
     if (unlikely(flags & PROC_FILLOOM)) {
         if (likely(file2str(path, "oom_score", &ub) != -1))
             oomscore2proc(ub.buf, t);
         if (likely(file2str(path, "oom_adj", &ub) != -1))
             oomadj2proc(ub.buf, t);
     }
-#endif
 
     if (unlikely(flags & PROC_FILLNS))                  // read /proc/#/task/#/ns/*
         ns2proc(path, t);
@@ -1169,7 +1170,7 @@
   char *restrict const path = PT->path;
   for (;;) {
     ent = readdir(PT->procfs);
-    if(unlikely(unlikely(!ent) || unlikely(!ent->d_name))) return 0;
+    if(unlikely(unlikely(!ent) || unlikely(!ent->d_name[0]))) return 0;
     if(likely(likely(*ent->d_name > '0') && likely(*ent->d_name <= '9'))) break;
   }
   p->tgid = strtoul(ent->d_name, NULL, 10);
@@ -1196,7 +1197,7 @@
   }
   for (;;) {
     ent = readdir(PT->taskdir);
-    if(unlikely(unlikely(!ent) || unlikely(!ent->d_name))) return 0;
+    if(unlikely(unlikely(!ent) || unlikely(!ent->d_name[0]))) return 0;
     if(likely(likely(*ent->d_name > '0') && likely(*ent->d_name <= '9'))) break;
   }
   t->tid = strtoul(ent->d_name, NULL, 10);
diff -Nru procps-3.3.11/proc/readproc.h procps-3.3.12/proc/readproc.h
--- procps-3.3.11/proc/readproc.h	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/proc/readproc.h	2016-07-10 06:40:26.000000000 +0000
@@ -14,7 +14,7 @@
 #include "pwcache.h"
 
 #define SIGNAL_STRING
-#define QUICK_THREADS        /* copy (vs. read) some thread info from parent proc_t */
+//#define QUICK_THREADS        /* copy (vs. read) some thread info from parent proc_t */
 
 EXTERN_C_BEGIN
 
@@ -116,6 +116,9 @@
 	vm_size,        // status          equals 'size' (as kb)
 	vm_lock,        // status          locked pages (as kb)
 	vm_rss,         // status          equals 'rss' and/or 'resident' (as kb)
+	vm_rss_anon,    // status          the 'anonymous' portion of vm_rss (as kb)
+	vm_rss_file,    // status          the 'file-backed' portion of vm_rss (as kb)
+	vm_rss_shared,  // status          the 'shared' portion of vm_rss (as kb)
 	vm_data,        // status          data only size (as kb)
 	vm_stack,       // status          stack only size (as kb)
 	vm_swap,        // status          based on linux-2.6.34 "swap ents" (as kb)
@@ -134,6 +137,7 @@
         **environ,      // (special)       environment string vector (/proc/#/environ)
         **cmdline,      // (special)       command line string vector (/proc/#/cmdline)
         **cgroup,       // (special)       cgroup string vector (/proc/#/cgroup)
+         *cgname,       // (special)       name portion of above (if possible)
          *supgid,       // status          supplementary gids as comma delimited str
          *supgrp;       // supp grp names as comma delimited str, derived from supgid
     char
@@ -164,14 +168,11 @@
 	tpgid,		// stat            terminal process group id
 	exit_signal,	// stat            might not be SIGCHLD
 	processor;      // stat            current (or most recent?) CPU
-#ifdef OOMEM_ENABLE
     int
         oom_score,      // oom_score       (badness for OOM killer)
         oom_adj;        // oom_adj         (adjustment to OOM score)
-#endif
     long
         ns[NUM_NS];     // (ns subdir)     inode number of namespaces
-#ifdef WITH_SYSTEMD
     char
         *sd_mach,       // n/a             systemd vm/container name
         *sd_ouid,       // n/a             systemd session owner uid
@@ -180,7 +181,6 @@
         *sd_slice,      // n/a             systemd slice unit
         *sd_unit,       // n/a             systemd system unit id
         *sd_uunit;      // n/a             systemd user unit id
-#endif
     const char
         *lxcname;       // n/a             lxc container name
 } proc_t;
diff -Nru procps-3.3.11/proc/slab.c procps-3.3.12/proc/slab.c
--- procps-3.3.11/proc/slab.c	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/proc/slab.c	2016-07-10 06:40:26.000000000 +0000
@@ -179,7 +179,7 @@
 		curr->cache_size = (unsigned long)curr->nr_slabs * curr->pages_per_slab * page_size;
 
 		if (curr->nr_objs) {
-			curr->use = 100 * curr->nr_active_objs / curr->nr_objs;
+			curr->use = 100 * (curr->nr_active_objs / curr->nr_objs);
 			stats->nr_active_caches++;
 		} else
 			curr->use = 0;
diff -Nru procps-3.3.11/proc/sysinfo.c procps-3.3.12/proc/sysinfo.c
--- procps-3.3.11/proc/sysinfo.c	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/proc/sysinfo.c	2016-07-10 06:40:26.000000000 +0000
@@ -198,7 +198,7 @@
     FILE_TO_BUF(UPTIME_FILE,uptime_fd);  sscanf(buf, "%lf", &up_1);
     /* uptime(&up_1, NULL); */
     FILE_TO_BUF(STAT_FILE,stat_fd);
-    sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", &user_j, &nice_j, &sys_j, &other_j, &wait_j, &hirq_j, &sirq_j, &stol_j);
+    sscanf(buf, "cpu %llu %llu %llu %llu %llu %llu %llu %llu", &user_j, &nice_j, &sys_j, &other_j, &wait_j, &hirq_j, &sirq_j, &stol_j);
     FILE_TO_BUF(UPTIME_FILE,uptime_fd);  sscanf(buf, "%lf", &up_2);
     /* uptime(&up_2, NULL); */
   } while((long long)( (up_2-up_1)*1000.0/up_1 )); /* want under 0.1% error */
@@ -326,7 +326,7 @@
     new_z = 0;
 
     FILE_TO_BUF(STAT_FILE,stat_fd);
-    sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", &new_u, &new_n, &new_s, &new_i, &new_w, &new_x, &new_y, &new_z);
+    sscanf(buf, "cpu %llu %llu %llu %llu %llu %llu %llu %llu", &new_u, &new_n, &new_s, &new_i, &new_w, &new_x, &new_y, &new_z);
     ticks_past = (new_u+new_n+new_s+new_i+new_w+new_x+new_y+new_z)-(old_u+old_n+old_s+old_i+old_w+old_x+old_y+old_z);
     if(ticks_past){
       scale = 100.0 / (double)ticks_past;
@@ -466,7 +466,7 @@
   *czzz = 0;  /* not separated out until the 2.6.11 kernel */
 
   b = strstr(buff, "cpu ");
-  if(b) sscanf(b,  "cpu  %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", cuse, cice, csys, cide, ciow, cxxx, cyyy, czzz);
+  if(b) sscanf(b,  "cpu  %llu %llu %llu %llu %llu %llu %llu %llu", cuse, cice, csys, cide, ciow, cxxx, cyyy, czzz);
 
   b = strstr(buff, "page ");
   if(b) sscanf(b,  "page %lu %lu", pin, pout);
@@ -477,11 +477,11 @@
   else need_vmstat_file = 1;
 
   b = strstr(buff, "intr ");
-  if(b) sscanf(b,  "intr %Lu", &llbuf);
+  if(b) sscanf(b,  "intr %llu", &llbuf);
   *intr = llbuf;
 
   b = strstr(buff, "ctxt ");
-  if(b) sscanf(b,  "ctxt %Lu", &llbuf);
+  if(b) sscanf(b,  "ctxt %llu", &llbuf);
   *ctxt = llbuf;
 
   b = strstr(buff, "btime ");
@@ -704,7 +704,7 @@
   if(kb_inactive==~0UL){
     kb_inactive = kb_inact_dirty + kb_inact_clean + kb_inact_laundry;
   }
-  kb_main_cached = kb_page_cache + kb_slab;
+  kb_main_cached = kb_page_cache + kb_slab_reclaimable;
   kb_swap_used = kb_swap_total - kb_swap_free;
 
   /* if kb_main_available is greater than kb_main_total or our calculation of
@@ -951,7 +951,7 @@
   int cPartition = 0;
   int fields;
   unsigned dummy;
-  char devname[32];
+  char devname[35];
 
   *disks = NULL;
   *partitions = NULL;
@@ -964,10 +964,10 @@
       fclose(fd);
       break;
     }
-    fields = sscanf(buff, " %*d %*d %15s %*u %*u %*u %*u %*u %*u %*u %*u %*u %*u %u", devname, &dummy);
+    fields = sscanf(buff, " %*d %*d %34s %*u %*u %*u %*u %*u %*u %*u %*u %*u %*u %u", devname, &dummy);
     if (fields == 2 && is_disk(devname)){
       (*disks) = xrealloc(*disks, (cDisk+1)*sizeof(struct disk_stat));
-      sscanf(buff,  "   %*d    %*d %15s %u %u %llu %u %u %u %llu %u %u %u %u",
+      sscanf(buff,  "   %*d    %*d %31s %u %u %llu %u %u %u %llu %u %u %u %u",
         //&disk_major,
         //&disk_minor,
         (*disks)[cDisk].disk_name,
@@ -989,8 +989,8 @@
       (*partitions) = xrealloc(*partitions, (cPartition+1)*sizeof(struct partition_stat));
       fflush(stdout);
       sscanf(buff,  (fields == 2)
-          ? "   %*d    %*d %15s %u %*u %llu %*u %u %*u %llu %*u %*u %*u %*u"
-          : "   %*d    %*d %15s %u %llu %u %llu",
+          ? "   %*d    %*d %34s %u %*u %llu %*u %u %*u %llu %*u %*u %*u %*u"
+          : "   %*d    %*d %34s %u %llu %u %llu",
         //&part_major,
         //&part_minor,
         (*partitions)[cPartition].partition_name,
diff -Nru procps-3.3.11/proc/sysinfo.h procps-3.3.12/proc/sysinfo.h
--- procps-3.3.11/proc/sysinfo.h	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/proc/sysinfo.h	2016-07-10 06:40:26.000000000 +0000
@@ -101,7 +101,7 @@
 typedef struct disk_stat{
 	unsigned long long reads_sectors;
 	unsigned long long written_sectors;
-	char               disk_name [16];
+	char               disk_name [32];
 	unsigned           inprogress_IO;
 	unsigned           merged_reads;
 	unsigned           merged_writes;
@@ -115,7 +115,7 @@
 }disk_stat;
 
 typedef struct partition_stat{
-	char partition_name [16];
+	char partition_name [35];
 	unsigned long long reads_sectors;
 	unsigned           parent_disk;  // index into a struct disk_stat array
 	unsigned           reads;
diff -Nru procps-3.3.11/ps/common.h procps-3.3.12/ps/common.h
--- procps-3.3.11/ps/common.h	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/ps/common.h	2016-07-10 06:40:26.000000000 +0000
@@ -322,7 +322,7 @@
 
 /* sortformat.c */
 extern int defer_sf_option(const char *arg, int source);
-extern const char *process_sf_options(int localbroken);
+extern const char *process_sf_options();
 extern void reset_sortformat(void);
 
 /* select.c */
diff -Nru procps-3.3.11/ps/global.c procps-3.3.12/ps/global.c
--- procps-3.3.11/ps/global.c	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/ps/global.c	2016-07-10 06:40:26.000000000 +0000
@@ -285,14 +285,7 @@
     return NULL;
 
   case_default: /* use defaults for ps, ignoring other environment variables */
-    return NULL;
-
   case_unknown: /* defaults, but also check inferior environment variables */
-    if(
-      getenv("UNIX95")     /* Irix */
-      || getenv("POSIXLY_CORRECT")  /* most gnu stuff */
-      || (getenv("POSIX2") && !strcmp(getenv("POSIX2"), "on")) /* Unixware 7 */
-    ) personality = PER_BROKEN_o;
     return NULL;
 
   case_aix:
@@ -334,8 +327,9 @@
   case_irix:
   case_sgi:
     s = getenv("_XPG");
-    if(s && s[0]>'0' && s[0]<='9') personality = PER_BROKEN_o;
-    else personality = PER_IRIX_l;
+    if(s && s[0]>'0' && s[0]<='9')
+        return NULL;
+    personality = PER_IRIX_l;
     return NULL;
 
   case_os390:  /* IBM's OS/390 OpenEdition on the S/390 mainframe */
@@ -346,13 +340,13 @@
 
   case_hp:
   case_hpux:
-    personality = PER_BROKEN_o | PER_HPUX_x;
+    personality = PER_HPUX_x;
     return NULL;
 
   case_svr4:
   case_sysv:
   case_sco:
-    personality = PER_BROKEN_o | PER_SVR4_x;
+    personality = PER_SVR4_x;
     return NULL;
 
   case_posix:
@@ -360,7 +354,6 @@
   case_unix95:
   case_unix98:
   case_unix:
-    personality = PER_BROKEN_o;
     return NULL;
 }
 
diff -Nru procps-3.3.11/ps/output.c procps-3.3.12/ps/output.c
--- procps-3.3.11/ps/output.c	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/ps/output.c	2016-07-10 06:40:26.000000000 +0000
@@ -96,6 +96,14 @@
   return 0;
 }
 
+static int sr_cgroup(const proc_t* a, const proc_t* b)
+{
+    /* This is a "vector" of one */
+    if (*a->cgroup == NULL || *b->cgroup == NULL)
+        return 0;
+    return strcmp(*a->cgroup, *b->cgroup);
+}
+
 #define CMP_STR(NAME) \
 static int sr_ ## NAME(const proc_t* P, const proc_t* Q) { \
     return strcmp(P->NAME, Q->NAME); \
@@ -227,6 +235,7 @@
 CMP_NS(utsns, UTSNS);
 
 CMP_STR(lxcname)
+CMP_STR(cgname)
 
 /* approximation to: kB of address space that could end up in swap */
 static int sr_swapable(const proc_t* P, const proc_t* Q) {
@@ -436,6 +445,13 @@
   return max_rightward-rightward;
 }
 
+static int pr_cgname(char *restrict const outbuf, const proc_t *restrict const pp){
+  int rightward = max_rightward;
+
+  escaped_copy(outbuf, pp->cgname, OUTBUF_SIZE, &rightward);
+  return max_rightward-rightward;
+}
+
 static int pr_cgroup(char *restrict const outbuf,const proc_t *restrict const pp) {
   int rightward = max_rightward;
 
@@ -1185,7 +1201,6 @@
   return snprintf(outbuf, COLWID, "*");
 }
 
-#ifdef WITH_SYSTEMD
 /************************* Systemd stuff ********************************/
 static int pr_sd_unit(char *restrict const outbuf, const proc_t *restrict const pp){
   return snprintf(outbuf, COLWID, "%s", pp->sd_unit);
@@ -1214,7 +1229,6 @@
 static int pr_sd_slice(char *restrict const outbuf, const proc_t *restrict const pp){
   return snprintf(outbuf, COLWID, "%s", pp->sd_slice);
 }
-#endif
 /************************ Linux namespaces ******************************/
 
 #define _pr_ns(NAME, ID)\
@@ -1239,67 +1253,69 @@
 /****************** FLASK & seLinux security stuff **********************/
 // move the bulk of this to libproc sometime
 
-#if !ENABLE_LIBSELINUX
-
-static int pr_context(char *restrict const outbuf, const proc_t *restrict const pp){
-  char filename[48];
-  size_t len;
-  ssize_t num_read;
-  int fd;
-
-// wchan file is suitable for testing
-//snprintf(filename, sizeof filename, "/proc/%d/wchan", pp->tgid);
-snprintf(filename, sizeof filename, "/proc/%d/attr/current", pp->tgid);
-
-  fd = open(filename, O_RDONLY, 0);
-  if(likely(fd==-1)) goto fail;
-  num_read = read(fd, outbuf, 666);
-  close(fd);
-  if(unlikely(num_read<=0)) goto fail;
-  outbuf[num_read] = '\0';
-
-  len = 0;
-  while(outbuf[len]>' ' && outbuf[len]<='~') len++;
-  outbuf[len] = '\0';
-  if(len) return len;
-
-fail:
-  outbuf[0] = '-';
-  outbuf[1] = '\0';
-  return 1;
-}
-
-#else
-
 // This needs more study, considering:
 // 1. the static linking option (maybe disable this in that case)
 // 2. the -z and -Z option issue
 // 3. width of output
 static int pr_context(char *restrict const outbuf, const proc_t *restrict const pp){
+  static void (*ps_freecon)(char*) = 0;
   static int (*ps_getpidcon)(pid_t pid, char **context) = 0;
+  static int (*ps_is_selinux_enabled)(void) = 0;
   static int tried_load = 0;
+  static int selinux_enabled = 0;
   size_t len;
   char *context;
 
+#if ENABLE_LIBSELINUX
   if(!ps_getpidcon && !tried_load){
     void *handle = dlopen("libselinux.so.1", RTLD_NOW);
     if(handle){
+      ps_freecon = dlsym(handle, "freecon");
+      if(dlerror())
+        ps_freecon = 0;
       dlerror();
       ps_getpidcon = dlsym(handle, "getpidcon");
       if(dlerror())
         ps_getpidcon = 0;
+      ps_is_selinux_enabled = dlsym(handle, "is_selinux_enabled");
+      if(dlerror())
+        ps_is_selinux_enabled = 0;
+      else
+        selinux_enabled = ps_is_selinux_enabled();
     }
     tried_load++;
   }
-  if(ps_getpidcon && !ps_getpidcon(pp->tgid, &context)){
+#endif
+  if(ps_getpidcon && selinux_enabled && !ps_getpidcon(pp->tgid, &context)){
     size_t max_len = OUTBUF_SIZE-1;
     len = strlen(context);
     if(len > max_len) len = max_len;
     memcpy(outbuf, context, len);
     if (outbuf[len-1] == '\n') --len;
     outbuf[len] = '\0';
-    free(context);
+    ps_freecon(context);
   }else{
+    char filename[48];
+    ssize_t num_read;
+    int fd;
+
+// wchan file is suitable for testing
+//snprintf(filename, sizeof filename, "/proc/%d/wchan", pp->tgid);
+    snprintf(filename, sizeof filename, "/proc/%d/attr/current", pp->tgid);
+
+    if ((fd = open(filename, O_RDONLY, 0)) != -1) {
+      num_read = read(fd, outbuf, OUTBUF_SIZE-1);
+      close(fd);
+      if (num_read > 0) {
+        outbuf[num_read] = '\0';
+        len = 0;
+        while(isprint(outbuf[len]))
+          len++;
+        outbuf[len] = '\0';
+        if(len)
+          return len;
+      }
+    }
     outbuf[0] = '-';
     outbuf[1] = '\0';
     len = 1;
@@ -1307,9 +1323,6 @@
   return len;
 }
 
-#endif
-
-
 ////////////////////////////// Test code /////////////////////////////////
 
 // like "args"
@@ -1398,9 +1411,7 @@
 #define GRP PROC_FILLGRP     /* gid_t -> group names */
 #define NS  PROC_FILLNS      /* read namespace information */
 #define LXC PROC_FILL_LXC    /* value the lxc name field */
-#ifdef WITH_SYSTEMD
 #define SD  PROC_FILLSYSTEMD /* retrieve systemd stuff */
-#endif
 #define SGRP PROC_FILLSTATUS | PROC_FILLSUPGRP  /* supgid -> supgrp (names) */
 #define CGRP PROC_FILLCGROUP | PROC_EDITCGRPCVT /* read cgroup */
 
@@ -1439,7 +1450,8 @@
 {"bsdtime",   "TIME",    pr_bsdtime,  sr_nop,     6,   0,    LNX, ET|RIGHT},
 {"c",         "C",       pr_c,        sr_pcpu,    2,   0,    SUN, ET|RIGHT},
 {"caught",    "CAUGHT",  pr_sigcatch, sr_nop,     9,   0,    BSD, TO|SIGNAL}, /*sigcatch*/
-{"cgroup",    "CGROUP",  pr_cgroup,   sr_nop,    27,CGRP,    LNX, PO|UNLIMITED},
+{"cgname",    "CGNAME",  pr_cgname,   sr_cgname, 27,CGRP,    LNX, PO|UNLIMITED},
+{"cgroup",    "CGROUP",  pr_cgroup,   sr_cgroup, 27,CGRP,    LNX, PO|UNLIMITED},
 {"class",     "CLS",     pr_class,    sr_sched,   3,   0,    XXX, TO|LEFT},
 {"cls",       "CLS",     pr_class,    sr_sched,   3,   0,    HPU, TO|RIGHT}, /*says HPUX or RT*/
 {"cmaj_flt",  "-",       pr_nop,      sr_cmaj_flt, 1,  0,    LNX, AN|RIGHT},
@@ -1499,9 +1511,7 @@
 {"login",     "LOGNAME", pr_nop,      sr_nop,     8,   0,    BSD, AN|LEFT}, /*logname*/   /* double check */
 {"logname",   "LOGNAME", pr_nop,      sr_nop,     8,   0,    XXX, AN|LEFT}, /*login*/
 {"longtname", "TTY",     pr_tty8,     sr_tty,     8,   0,    DEC, PO|LEFT},
-#ifdef WITH_SYSTEMD
 {"lsession",  "SESSION", pr_sd_session, sr_nop,  11,  SD,    LNX, ET|LEFT},
-#endif
 {"lstart",    "STARTED", pr_lstart,   sr_nop,    24,   0,    XXX, ET|RIGHT},
 {"luid",      "LUID",    pr_nop,      sr_nop,     5,   0,    LNX, ET|RIGHT}, /* login ID */
 {"luser",     "LUSER",   pr_nop,      sr_nop,     8, USR,    LNX, ET|USER}, /* login USER */
@@ -1515,9 +1525,7 @@
 {"m_size",    "SIZE",    pr_size,     sr_size,    5, MEM,    LNX, PO|RIGHT},
 {"m_swap",    "SWAP",    pr_nop,      sr_nop,     5,   0,    LNx, PO|RIGHT},
 {"m_trs",     "TRS",     pr_trs,      sr_trs,     5, MEM,    LNx, PO|RIGHT},
-#ifdef WITH_SYSTEMD
 {"machine",   "MACHINE", pr_sd_machine, sr_nop,  31,  SD,    LNX, ET|LEFT},
-#endif
 {"maj_flt",   "MAJFL",   pr_majflt,   sr_maj_flt, 6,   0,    LNX, AN|RIGHT},
 {"majflt",    "MAJFLT",  pr_majflt,   sr_maj_flt, 6,   0,    XXX, AN|RIGHT},
 {"min_flt",   "MINFL",   pr_minflt,   sr_min_flt, 6,   0,    LNX, AN|RIGHT},
@@ -1540,9 +1548,7 @@
 {"osz",       "SZ",      pr_nop,      sr_nop,     2,   0,    SUN, PO|RIGHT},
 {"oublk",     "OUBLK",   pr_nop,      sr_nop,     5,   0,    BSD, AN|RIGHT}, /*oublock*/
 {"oublock",   "OUBLK",   pr_nop,      sr_nop,     5,   0,    DEC, AN|RIGHT}, /*oublk*/
-#ifdef WITH_SYSTEMD
 {"ouid",      "OWNER",   pr_sd_ouid,  sr_nop,     5,  SD,    LNX, ET|LEFT},
-#endif
 {"p_ru",      "P_RU",    pr_nop,      sr_nop,     6,   0,    BSD, AN|RIGHT},
 {"paddr",     "PADDR",   pr_nop,      sr_nop,     6,   0,    BSD, AN|RIGHT},
 {"pagein",    "PAGEIN",  pr_majflt,   sr_maj_flt, 6,   0,    XXX, AN|RIGHT},
@@ -1584,9 +1590,7 @@
 {"sched",     "SCH",     pr_sched,    sr_sched,   3,   0,    AIX, TO|RIGHT},
 {"scnt",      "SCNT",    pr_nop,      sr_nop,     4,   0,    DEC, AN|RIGHT},  /* man page misspelling of scount? */
 {"scount",    "SC",      pr_nop,      sr_nop,     4,   0,    AIX, AN|RIGHT},  /* scnt==scount, DEC claims both */
-#ifdef WITH_SYSTEMD
 {"seat",      "SEAT",    pr_sd_seat,  sr_nop,    11,  SD,    LNX, ET|LEFT},
-#endif
 {"sess",      "SESS",    pr_sess,     sr_session, 5,   0,    XXX, PO|PIDMAX|RIGHT},
 {"session",   "SESS",    pr_sess,     sr_session, 5,   0,    LNX, PO|PIDMAX|RIGHT},
 {"sgi_p",     "P",       pr_sgi_p,    sr_nop,     1,   0,    LNX, TO|RIGHT}, /* "cpu" number */
@@ -1605,9 +1609,7 @@
 {"sigmask",   "BLOCKED", pr_sigmask,  sr_nop,     9,   0,    XXX, TO|SIGNAL}, /*blocked*/
 {"size",      "SIZE",    pr_swapable, sr_swapable, 5,  0,    SCO, PO|RIGHT},
 {"sl",        "SL",      pr_nop,      sr_nop,     3,   0,    XXX, AN|RIGHT},
-#ifdef WITH_SYSTEMD
 {"slice",      "SLICE",  pr_sd_slice, sr_nop,    31,  SD,    LNX, ET|LEFT},
-#endif
 {"spid",      "SPID",    pr_tasks,    sr_tasks,   5,   0,    SGI, TO|PIDMAX|RIGHT},
 {"stackp",    "STACKP",  pr_stackp,   sr_start_stack, 8, 0,  LNX, PO|RIGHT}, /*start_stack*/
 {"start",     "STARTED", pr_start,    sr_nop,     8,   0,    XXX, ET|RIGHT},
@@ -1630,8 +1632,8 @@
 {"sz",        "SZ",      pr_sz,       sr_nop,     5,   0,    HPU, PO|RIGHT},
 {"taskid",    "TASKID",  pr_nop,      sr_nop,     5,   0,    SUN, TO|PIDMAX|RIGHT}, // is this a thread ID?
 {"tdev",      "TDEV",    pr_nop,      sr_nop,     4,   0,    XXX, AN|RIGHT},
-{"thcount",   "THCNT",   pr_nlwp,     sr_nlwp,    5,   0,    AIX, PO|RIGHT},
 {"tgid",      "TGID",    pr_procs,    sr_procs,   5,   0,    LNX, PO|PIDMAX|RIGHT},
+{"thcount",   "THCNT",   pr_nlwp,     sr_nlwp,    5,   0,    AIX, PO|RIGHT},
 {"tid",       "TID",     pr_tasks,    sr_tasks,   5,   0,    AIX, TO|PIDMAX|RIGHT},
 {"time",      "TIME",    pr_time,     sr_time,    8,   0,    U98, ET|RIGHT}, /*cputime*/ /* was 6 wide */
 {"timeout",   "TMOUT",   pr_nop,      sr_nop,     5,   0,    LNX, AN|RIGHT}, // 2.0.xx era
@@ -1656,9 +1658,7 @@
 {"uid_hack",  "UID",     pr_euser,    sr_euser,   8, USR,    XXX, ET|USER},
 {"umask",     "UMASK",   pr_nop,      sr_nop,     5,   0,    DEC, AN|RIGHT},
 {"uname",     "USER",    pr_euser,    sr_euser,   8, USR,    DEC, ET|USER}, /* man page misspelling of user? */
-#ifdef WITH_SYSTEMD
 {"unit",      "UNIT",    pr_sd_unit,  sr_nop,    31,  SD,    LNX, ET|LEFT},
-#endif
 {"upr",       "UPR",     pr_nop,      sr_nop,     3,   0,    BSD, TO|RIGHT}, /*usrpri*/
 {"uprocp",    "UPROCP",  pr_nop,      sr_nop,     8,   0,    BSD, AN|RIGHT},
 {"user",      "USER",    pr_euser,    sr_euser,   8, USR,    U98, ET|USER}, /* BSD n forces this to UID */
@@ -1668,9 +1668,7 @@
 {"util",      "C",       pr_c,        sr_pcpu,    2,   0,    SGI, ET|RIGHT}, // not sure about "C"
 {"utime",     "UTIME",   pr_nop,      sr_utime,   6,   0,    LNx, ET|RIGHT},
 {"utsns",     "UTSNS",   pr_utsns,    sr_utsns,  10,  NS,    LNX, ET|RIGHT},
-#ifdef WITH_SYSTEMD
 {"uunit",     "UUNIT",   pr_sd_uunit, sr_nop,    31,  SD,    LNX, ET|LEFT},
-#endif
 {"vm_data",   "DATA",    pr_nop,      sr_vm_data, 5,   0,    LNx, PO|RIGHT},
 {"vm_exe",    "EXE",     pr_nop,      sr_vm_exe,  5,   0,    LNx, PO|RIGHT},
 {"vm_lib",    "LIB",     pr_nop,      sr_vm_lib,  5,   0,    LNx, PO|RIGHT},
diff -Nru procps-3.3.11/ps/parser.c procps-3.3.12/ps/parser.c
--- procps-3.3.11/ps/parser.c	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/ps/parser.c	2016-07-10 06:40:26.000000000 +0000
@@ -51,7 +51,6 @@
 static char **ps_argv; /* global argv */
 static int thisarg;    /* index into ps_argv */
 static char *flagptr;  /* current location in ps_argv[thisarg] */
-static int not_pure_unix = 0;  /* set by BSD and GNU options */
 static int force_bsd = 0;  /* set when normal parsing fails */
 
 #define exclusive(x) if((ps_argc != 2) || strcmp(ps_argv[1],x)) \
@@ -71,7 +70,6 @@
  */
 static const char *get_opt_arg(void){
   if(*(flagptr+1)){     /* argument is part of ps_argv[thisarg] */
-    not_pure_unix = 1;
     return flagptr+1;
   }
   if(thisarg+2 > ps_argc) return NULL;   /* there is nothing left */
@@ -233,18 +231,6 @@
 
   flagptr = ps_argv[thisarg];
   while(*++flagptr){
-    // Find any excuse to ignore stupid Unix98 misfeatures.
-    //
-    // This list of options is ONLY for those defined by the
-    // "IEEE Std 1003.1, 2004 Edition", "ISO/IEC 9945:2003",
-    // or "Version 2 of the Single Unix Specification".
-    //
-    // It may be time to re-think the existence of this list.
-    // In the meantime, please do not add to it. The list is
-    // intended to ONLY contain flags defined by the POSIX and UNIX
-    // standards published by The Open Group, IEEE, and ISO.
-    if(!strchr("aAdefgGlnoptuU", *flagptr)) not_pure_unix = 1;  // dude, -Z ain't in POSIX
-
     switch(*flagptr){
     case 'A':
       trace("-A selects all processes\n");
@@ -415,7 +401,7 @@
       trace("-o user-defined format\n");
       arg=get_opt_arg();
       if(!arg) return _("format specification must follow -o");
-      not_pure_unix |= defer_sf_option(arg, SF_U_o);
+      defer_sf_option(arg, SF_U_o);
       return NULL; /* can't have any more options */
     case 'p': /* end */
       trace("-p select by PID\n");
@@ -1121,7 +1107,6 @@
   trace("parse_all_options calling arg_type for \"%s\"\n", ps_argv[thisarg]);
     at = arg_type(ps_argv[thisarg]);
     trace("ps_argv[thisarg] is %s\n", ps_argv[thisarg]);
-    if(at != ARG_SYSV) not_pure_unix = 1;
     switch(at){
     case ARG_GNU:
       err = parse_gnu_option();
@@ -1212,7 +1197,7 @@
   if(err) goto try_bsd;
   err = thread_option_check();
   if(err) goto try_bsd;
-  err = process_sf_options(!not_pure_unix);
+  err = process_sf_options();
   if(err) goto try_bsd;
   err = select_bits_setup();
   if(err) goto try_bsd;
@@ -1231,7 +1216,6 @@
   ps_argv = argv;
   thisarg = 0;
   /* no need to reset flagptr */
-  not_pure_unix=1;
   force_bsd=1;
   prefer_bsd_defaults=1;
   if(!( (PER_OLD_m|PER_BSD_m) & personality )) /* if default m setting... */
@@ -1242,7 +1226,7 @@
   if(err2) goto total_failure;
   err2 = thread_option_check();
   if(err2) goto total_failure;
-  err2 = process_sf_options(!not_pure_unix);
+  err2 = process_sf_options();
   if(err2) goto total_failure;
   err2 = select_bits_setup();
   if(err2) goto total_failure;
diff -Nru procps-3.3.11/ps/ps.1 procps-3.3.12/ps/ps.1
--- procps-3.3.11/ps/ps.1	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/ps/ps.1	2016-07-10 06:40:26.000000000 +0000
@@ -4,7 +4,7 @@
 .\" Quick hack conversion by Albert Cahalan, 1998.
 .\" Licensed under version 2 of the Gnu General Public License.
 .\"
-.TH PS 1 "June 2015" "procps-ng" "User Commands"
+.TH PS 1 "August 2015" "procps-ng" "User Commands"
 .\"
 .\" To render this page:
 .\"    groff -t -b -man -X -P-resolution -P100 -Tps ps.1 &
@@ -1080,6 +1080,10 @@
 .BR sig_catch , \ sigcatch ).
 T}
 
+cgname	CGNAME	T{
+display name of control groups to which the process belongs.
+T}
+
 cgroup	CGROUP	T{
 display control groups to which the process belongs.
 T}
diff -Nru procps-3.3.11/ps/sortformat.c procps-3.3.12/ps/sortformat.c
--- procps-3.3.11/ps/sortformat.c	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/ps/sortformat.c	2016-07-10 06:40:26.000000000 +0000
@@ -31,7 +31,6 @@
 #include "common.h"
 
 static sf_node *sf_list = NULL;         /* deferred sorting and formatting */
-static int broken;                      /* use gross Unix98 parsing? */
 static int have_gnu_sort = 0;           /* if true, "O" must be format */
 static int already_parsed_sort = 0;     /* redundantly set in & out of fn */
 static int already_parsed_format = 0;
@@ -205,7 +204,6 @@
 /***************************************************************
  * Used to parse option O lists. Option O is shared between
  * sorting and formatting. Users may expect one or the other.
- * The "broken" flag enables a really bad Unix98 misfeature.
  * Put each completed format_node onto the list starting at ->f_cooked
  */
 static const char *format_parse(sf_node *sfn){
@@ -235,9 +233,6 @@
       }
       need_item=1;
       break;
-    case '=':
-      if(broken) goto out;
-      /* fall through */
     default:
       if(need_item) items++;
       need_item=0;
@@ -499,7 +494,6 @@
 /*
  * Used to parse option O lists. Option O is shared between
  * sorting and formatting. Users may expect one or the other.
- * The "broken" flag enables a really bad Unix98 misfeature.
  * Recursion is to preserve original order.
  */
 static const char *parse_O_option(sf_node *sfn){
@@ -750,12 +744,9 @@
  * sorting and formatting. Users may expect one or the other.
  * The "broken" flag enables a really bad Unix98 misfeature.
  */
-const char *process_sf_options(int localbroken){
+const char *process_sf_options(void){
   sf_node *sf_walk;
 
-  if(personality & PER_BROKEN_o) localbroken = 1;
-  if(personality & PER_GOOD_o)   localbroken = 0;
-  broken = localbroken;
   if(sf_list){
     const char *err;
     err = parse_O_option(sf_list);
diff -Nru procps-3.3.11/skill.c procps-3.3.12/skill.c
--- procps-3.3.11/skill.c	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/skill.c	2016-07-10 06:40:26.000000000 +0000
@@ -43,7 +43,7 @@
 #include "proc/pwcache.h"
 #include "proc/sig.h"
 #include "proc/devname.h"
-#include "proc/procps.h"	/* char *user_from_uid(uid_t uid) */
+#include "proc/procps.h"	/* char *pwcache_get_user(uid_t uid) */
 #include "proc/readproc.h"
 #include "proc/version.h"	/* procps_version */
 #include "rpmatch.h"
@@ -134,7 +134,7 @@
 		char *buf;
 		size_t len = 0;
 		fprintf(stderr, "%-8s %-8s %5d %-16.16s   ? ",
-			(char *)dn_buf, user_from_uid(uid), pid, cmd);
+			(char *)dn_buf, pwcache_get_user(uid), pid, cmd);
 		fflush (stdout);
 		if (getline(&buf, &len, stdin) == -1)
 			return;
@@ -152,7 +152,7 @@
 		failed = setpriority(PRIO_PROCESS, pid, sig_or_pri);
 	if ((run_time->warnings && failed) || run_time->debugging || run_time->verbose) {
 		fprintf(stderr, "%-8s %-8s %5d %-16.16s   ",
-			(char *)dn_buf, user_from_uid(uid), pid, cmd);
+			(char *)dn_buf, pwcache_get_user(uid), pid, cmd);
 		perror("");
 		return;
 	}
@@ -479,7 +479,7 @@
 			} else {
 			    /* Special case for signal digit negative
 			     * PIDs */
-			    pid = (long)('0' - optopt);
+			    pid = atoi(argv[optind]);
 			    if (kill((pid_t)pid, signo) != 0)
 				exitvalue = EXIT_FAILURE;
 			    exit(exitvalue);
@@ -500,6 +500,7 @@
 		pid = strtol_or_err(argv[i], _("failed to parse argument"));
 		if (!kill((pid_t) pid, signo))
 			continue;
+        error(0, errno, "(%ld)", pid);
 		exitvalue = EXIT_FAILURE;
 		continue;
 	}
diff -Nru procps-3.3.11/.tarball-version procps-3.3.12/.tarball-version
--- procps-3.3.11/.tarball-version	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/.tarball-version	2016-07-10 06:40:26.000000000 +0000
@@ -1 +1 @@
-3.3.11
+3.3.12
diff -Nru procps-3.3.11/test-driver procps-3.3.12/test-driver
--- procps-3.3.11/test-driver	1970-01-01 00:00:00.000000000 +0000
+++ procps-3.3.12/test-driver	2016-07-10 06:40:26.000000000 +0000
@@ -0,0 +1,148 @@
+#! /bin/sh
+# test-driver - basic testsuite driver script.
+
+scriptversion=2013-07-13.22; # UTC
+
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+usage_error ()
+{
+  echo "$0: $*" >&2
+  print_usage >&2
+  exit 2
+}
+
+print_usage ()
+{
+  cat <<END
+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 [TEST-SCRIPT-ARGUMENTS]
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+END
+}
+
+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.
+expect_failure=no
+color_tests=no
+enable_hard_errors=yes
+while test $# -gt 0; do
+  case $1 in
+  --help) print_usage; exit $?;;
+  --version) echo "test-driver $scriptversion"; exit $?;;
+  --test-name) test_name=$2; shift;;
+  --log-file) log_file=$2; shift;;
+  --trs-file) trs_file=$2; shift;;
+  --color-tests) color_tests=$2; shift;;
+  --expect-failure) expect_failure=$2; shift;;
+  --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='' # Red.
+  grn='' # Green.
+  lgn='' # Light green.
+  blu='' # Blue.
+  mgn='' # Magenta.
+  std=''     # No color.
+else
+  red= grn= lgn= blu= mgn= std=
+fi
+
+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
+trap "st=129; $do_exit" 1
+trap "st=130; $do_exit" 2
+trap "st=141; $do_exit" 13
+trap "st=143; $do_exit" 15
+
+# Test script is run here.
+"$@" >$log_file 2>&1
+estatus=$?
+
+if test $enable_hard_errors = no && test $estatus -eq 99; then
+  tweaked_estatus=1
+else
+  tweaked_estatus=$estatus
+fi
+
+case $tweaked_estatus:$expect_failure in
+  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
+  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
+  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
+  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
+  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
+esac
+
+# Report the test outcome and exit status in the logs, so that one can
+# know whether the test passed or failed simply by looking at the '.log'
+# file, without the need of also peaking into the corresponding '.trs'
+# file (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" >>$log_file
+
+# Report outcome to console.
+echo "${col}${res}${std}: $test_name"
+
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs_file
+echo ":global-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -Nru procps-3.3.11/testsuite/kill.test/kill.exp procps-3.3.12/testsuite/kill.test/kill.exp
--- procps-3.3.11/testsuite/kill.test/kill.exp	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/testsuite/kill.test/kill.exp	2016-07-10 06:40:26.000000000 +0000
@@ -14,11 +14,11 @@
 
 set test "kill list signal names"
 spawn $kill -l
-expect_pass "$test" "^\(\[A-Z12\]\\s*\)+$"
+expect_pass "$test" "^\(\[A-Z12+-\]\\s*\)+$"
 
 set test "kill list signal names in table"
 spawn $kill -L
-expect_pass "$test" "^\(\\s+\\d+ \[A-Z12\]+\)+\\s*$"
+expect_pass "$test" "^\(\\s+\\d+ \[A-Z12+-\]+\)+\\s*$"
 
 set test "kill convert signal name to number"
 spawn  $kill -lHUP
diff -Nru procps-3.3.11/testsuite/lib.test/fileutils_badfd.sh procps-3.3.12/testsuite/lib.test/fileutils_badfd.sh
--- procps-3.3.11/testsuite/lib.test/fileutils_badfd.sh	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/testsuite/lib.test/fileutils_badfd.sh	2016-07-10 06:40:26.000000000 +0000
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-BASEDIR=$(dirname ${0})
-${BASEDIR}/../../lib/test_fileutils >&-
+TESTPROG=${1}
+${TESTPROG} >&-
diff -Nru procps-3.3.11/testsuite/lib.test/fileutils.exp procps-3.3.12/testsuite/lib.test/fileutils.exp
--- procps-3.3.11/testsuite/lib.test/fileutils.exp	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/testsuite/lib.test/fileutils.exp	2016-07-10 06:40:26.000000000 +0000
@@ -2,18 +2,19 @@
 # Testsuite for lib/fileutils program
 #
 
-set noarg "${topdir}lib/test_fileutils"
+set testprog "${topdir}lib/test_fileutils"
+set scriptdir [file dirname [ info script ]]
 
 set test "without argument"
-spawn $noarg
+spawn $testprog
 expect_pass "$test" "Hello, World!"
 
-set badfd "${topdir}testsuite/lib.test/fileutils_badfd.sh"
+set badfd "${scriptdir}/fileutils_badfd.sh"
 set test "test bad file descriptor"
-spawn $badfd
+spawn $badfd $testprog
 expect_pass "$test" "test_fileutils: write error: Bad file descriptor"
 
-set full "${topdir}testsuite/lib.test/fileutils_full.sh"
+set full "${scriptdir}/fileutils_full.sh"
 set test "test no space left on device"
-spawn $full
+spawn $full $testprog
 expect_pass "$test" "test_fileutils: write error: No space left on device"
diff -Nru procps-3.3.11/testsuite/lib.test/fileutils_full.sh procps-3.3.12/testsuite/lib.test/fileutils_full.sh
--- procps-3.3.11/testsuite/lib.test/fileutils_full.sh	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/testsuite/lib.test/fileutils_full.sh	2016-07-10 06:40:26.000000000 +0000
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-BASEDIR=$(dirname ${0})
-${BASEDIR}/../../lib/test_fileutils > /dev/full
+TESTPROG=${1}
+${TESTPROG} >/dev/full
diff -Nru procps-3.3.11/testsuite/Makefile.in procps-3.3.12/testsuite/Makefile.in
--- procps-3.3.11/testsuite/Makefile.in	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/testsuite/Makefile.in	2016-07-10 06:40:26.000000000 +0000
@@ -215,10 +215,6 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEJAGNU = @DEJAGNU@
@@ -253,6 +249,7 @@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -300,7 +297,6 @@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -339,6 +335,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff -Nru procps-3.3.11/top/top.1 procps-3.3.12/top/top.1
--- procps-3.3.11/top/top.1	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/top/top.1	2016-07-10 06:40:26.000000000 +0000
@@ -42,7 +42,7 @@
 .ds KA arrow key
 .ds KS scrolling key
 .ds MP physical memory
-.ds MS shared memory
+.ds MS swap file
 .ds MV virtual memory
 .ds NT \fBNote\fR:
 .ds PU CPU
@@ -65,10 +65,11 @@
 .ds Xc see the
 .ds XT See topic
 .ds Xt see topic
+.ds XX See `OVERVIEW, Linux Memory Types' for additional details
 .
 .\" Document /////////////////////////////////////////////////////////////
 .\" ----------------------------------------------------------------------
-.TH TOP 1 "June 2015" "procps-ng" "User Commands"
+.TH TOP 1 "July 2016" "procps-ng" "User Commands"
 .\" ----------------------------------------------------------------------
 
 .\" ----------------------------------------------------------------------
@@ -81,7 +82,6 @@
 .\" ----------------------------------------------------------------------
 \*(WE \*(CL
 
-
 The traditional switches `\-' and whitespace are optional.
 
 .\" ----------------------------------------------------------------------
@@ -111,6 +111,10 @@
 The remaining Table of Contents
 
 .nf
+    OVERVIEW
+       Operation
+       Startup Defaults
+       Linux Memory Types
     1. COMMAND\-LINE Options
     2. SUMMARY Display
        a. UPTIME and LOAD Averages
@@ -143,7 +147,7 @@
        b. Bouncing Windows
        c. The Big Bird Window
        d. The Ol' Switcheroo
-    8. BUGS, 9. HISTORY Former top, 10. AUTHOR, 11. SEE Also
+    8. BUGS, 9. SEE Also
 .fi
 
 .\" ......................................................................
@@ -265,6 +269,76 @@
        z \- color/mono       On  (show colors)
 .fi
 
+.\" ......................................................................
+.SS Linux Memory Types
+.\" ----------------------------------------------------------------------
+For our purposes there are three types of memory, and one is optional.
+First is \*(MP, a limited resource where code and data must
+reside when executed or referenced.
+Next is the optional \*(MS, where modified (dirty) memory can be saved
+and later retrieved if too many demands are made on \*(MP.
+Lastly we have \*(MV, a nearly unlimited resource serving the
+following goals:
+
+.nf
+   1. abstraction, free from physical memory addresses/limits
+   2. isolation, every process in a separate address space
+   3. sharing, a single mapping can serve multiple needs
+   4. flexibility, assign a virtual address to a file
+.fi
+
+Regardless of which of these forms memory may take, all are managed as
+pages (typically 4096 bytes) but expressed by default in \*(We as
+KiB (kibibyte).
+The memory discussed under topic `2c. MEMORY Usage' deals with \*(MP
+and the \*(MS for the system as a whole.
+The memory reviewed in topic `3. FIELDS / Columns Display'
+embraces all three memory types, but for individual processes.
+
+For each such process, every memory page is restricted to a single
+quadrant from the table below.
+Both \*(MP and \*(MV can include any of the four, while the \*(MS only
+includes #1 through #3.
+The memory in quadrant #4, when modified, acts as its own dedicated \*(MS.
+
+.nf
+                              \fBPrivate\fR | \fBShared\fR
+                          \fB1\fR           |          \fB2\fR
+     \fBAnonymous\fR  . stack               |
+                . malloc()            |
+                . brk()/sbrk()        | . POSIX shm*
+                . mmap(PRIVATE, ANON) | . mmap(SHARED, ANON)
+               -----------------------+----------------------
+                . mmap(PRIVATE, fd)   | . mmap(SHARED, fd)
+   \fBFile-backed\fR  . pgms/shared libs    |
+                          \fB3\fR           |          \fB4\fR
+.fi
+
+The following may help in interpreting process level memory values displayed
+as scalable columns and discussed under topic `3a. DESCRIPTIONS of Fields'.
+
+.nf
+   %MEM \- simply RES divided by total \*(MP
+   CODE \- the `pgms' portion of quadrant \fB3\fR
+   DATA \- the entire quadrant \fB1\fR portion of VIRT plus all
+          explicit mmap file-backed pages of quadrant \fB3\fR
+   RES  \- anything occupying \*(MP which, beginning with
+          Linux-4.5, is the sum of the following three fields:
+          RSan \- quadrant \fB1\fR pages, which include any
+                 former quadrant \fB3\fR pages if modified
+          RSfd \- quadrant \fB3\fR and quadrant \fB4\fR pages
+          RSsh \- quadrant \fB2\fR pages
+   RSlk \- subset of RES which cannot be swapped out (any quadrant)
+   SHR  \- subset of RES (excludes \fB1\fR, includes all \fB2\fR & \fB4\fR, some \fB3\fR)
+   SWAP \- potentially any quadrant except \fB4\fR
+   USED \- simply the sum of RES and SWAP
+   VIRT \- everything in-use and/or reserved (all quadrants)
+.fi
+
+\*(NT Even though program images and shared libraries are considered
+\fIprivate\fR to a process, they will be accounted for as \fIshared\fR
+(SHR) by the kernel.
+
 .\" ----------------------------------------------------------------------
 .SH 1. COMMAND-LINE Options
 .\" ----------------------------------------------------------------------
@@ -552,10 +626,21 @@
 
 .TP 4
  2.\fB %MEM \*(Em Memory Usage (RES) \fR
-A task's currently used share of available \*(MP.
+A task's currently resident share of available \*(MP.
+
+\*(XX.
 
 .TP 4
- 3.\fB CGROUPS \*(Em Control Groups \fR
+ 3.\fB CGNAME \*(Em Control Group Name \fR
+The name of the control group to which a process belongs,
+or `\-' if not applicable for that process.
+
+This will typically be the last entry in the full list of control
+groups as shown under the next heading (CGROUPS).
+And as is true there, this field is also variable width.
+
+.TP 4
+ 4.\fB CGROUPS \*(Em Control Groups \fR
 The names of the control group(s) to which a process belongs,
 or `\-' if not applicable for that process.
 
@@ -576,12 +661,14 @@
 any truncated data.
 
 .TP 4
- 4.\fB CODE \*(Em Code Size (KiB) \fR
-The amount of \*(MP devoted to executable code, also known as
-the Text Resident Set size or TRS.
+ 5.\fB CODE \*(Em Code Size (KiB) \fR
+The amount of \*(MP currently devoted to executable code, also known
+as the Text Resident Set size or TRS.
+
+\*(XX.
 
 .TP 4
- 5.\fB COMMAND \*(Em Command\fB Name\fR or Command\fB Line \fR
+ 6.\fB COMMAND \*(Em Command\fB Name\fR or Command\fB Line \fR
 Display the command line used to start a task or the name of the associated
 program.
 You toggle between command\fI line\fR and\fI name\fR with `c', which is both
@@ -605,12 +692,16 @@
 any truncated data.
 
 .TP 4
- 6.\fB DATA \*(Em Data + Stack Size (KiB) \fR
-The amount of \*(MP devoted to other than executable code, also known as
-the Data Resident Set size or DRS.
+ 7.\fB DATA \*(Em Data + Stack Size (KiB) \fR
+The amount of private memory \fIreserved\fR by a process.
+It is also known as the Data Resident Set or DRS.
+Such memory may not yet be mapped to \*(MP (RES) but will always be
+included in the \*(MV (VIRT) amount.
+
+\*(XX.
 
 .TP 4
- 7.\fB ENVIRON \*(Em Environment variables \fR
+ 8.\fB ENVIRON \*(Em Environment variables \fR
 Display all of the environment variables, if any, as seen by the
 respective processes.
 These variables will be displayed in their raw native order, not the
@@ -625,26 +716,26 @@
 any truncated data.
 
 .TP 4
- 8.\fB Flags \*(Em Task Flags \fR
+ 9.\fB Flags \*(Em Task Flags \fR
 This column represents the task's current scheduling flags which are
 expressed in hexadecimal notation and with zeros suppressed.
 These flags are officially documented in <linux/sched.h>.
 
 .TP 4
- 9.\fB GID \*(Em Group Id \fR
+10.\fB GID \*(Em Group Id \fR
 The\fI effective\fR group ID.
 
 .TP 4
-10.\fB GROUP \*(Em Group Name \fR
+11.\fB GROUP \*(Em Group Name \fR
 The\fI effective\fR group name.
 
 .TP 4
-11.\fB LXC \*(Em Lxc Container Name \fR
+12.\fB LXC \*(Em Lxc Container Name \fR
 The name of the lxc container within which a task is running.
 If a process is not running inside a container, a dash (`\-') will be shown.
 
 .TP 4
-12.\fB NI \*(Em Nice Value \fR
+13.\fB NI \*(Em Nice Value \fR
 The nice value of the task.
 A negative nice value means higher priority, whereas a positive nice value
 means lower priority.
@@ -652,7 +743,19 @@
 a task's dispatch-ability.
 
 .TP 4
-13.\fB P \*(Em Last used \*(PU (SMP) \fR
+14.\fB OOMa \*(Em Out of Memory Adjustment Factor \fR
+The value, ranging from -1000 to +1000, added to the current out of memory
+score (OOMs) which is then used to determine which task to kill when memory
+is exhausted.
+
+.TP 4
+15.\fB OOMs \*(Em Out of Memory Score \fR
+The value, ranging from 0 to +1000, used to select task(s) to kill when memory
+is exhausted.
+Zero translates to `never kill' whereas 1000 means `always kill'.
+
+.TP 4
+16.\fB P \*(Em Last used \*(PU (SMP) \fR
 A number representing the last used processor.
 In a true SMP environment this will likely change frequently since the kernel
 intentionally uses weak affinity.
@@ -661,7 +764,7 @@
 \*(Pu time).
 
 .TP 4
-14.\fB PGRP \*(Em Process Group Id \fR
+17.\fB PGRP \*(Em Process Group Id \fR
 Every process is member of a unique process group which is used for
 distribution of signals and by terminals to arbitrate requests for their
 input and output.
@@ -671,7 +774,7 @@
 member of a process group, called the process group leader.
 
 .TP 4
-15.\fB PID \*(Em Process Id \fR
+18.\fB PID \*(Em Process Id \fR
 The task's unique process ID, which periodically wraps, though never
 restarting at zero.
 In kernel terms, it is a dispatchable entity defined by a task_struct.
@@ -682,11 +785,11 @@
 and a TTY process group ID for the process group leader (\*(Xa TPGID).
 
 .TP 4
-16.\fB PPID \*(Em Parent Process Id \fR
+19.\fB PPID \*(Em Parent Process Id \fR
 The process ID (pid) of a task's parent.
 
 .TP 4
-17.\fB PR \*(Em Priority \fR
+20.\fB PR \*(Em Priority \fR
 The scheduling priority of the task.
 If you see `rt' in this field, it means the task is running
 under real time scheduling priority.
@@ -696,19 +799,50 @@
 And while the 2.6 kernel can be made mostly preemptible, it is not always so.
 
 .TP 4
-18.\fB RES \*(Em Resident Memory Size (KiB) \fR
-The non-swapped \*(MP a task is using.
+21.\fB RES \*(Em Resident Memory Size (KiB) \fR
+A subset of the virtual address space (VIRT) representing the non-swapped
+\*(MP a task is currently using.
+It is also the sum of the RSan, RSfd and RSsh fields.
+
+It can include private anonymous pages, private pages mapped to files
+(including program images and shared libraries) plus shared anonymous pages.
+All such memory is backed by the \*(MS represented separately under SWAP.
+
+Lastly, this field may also include shared file-backed pages which, when
+modified, act as a dedicated \*(MS and thus will never impact SWAP.
+
+\*(XX.
+
+.TP 4
+22.\fB RSan \*(Em Resident Anonymous Memory Size (KiB) \fR
+A subset of resident memory (RES) representing private pages not
+mapped to a file.
+
+.TP 4
+23.\fB RSfd \*(Em Resident File-Backed Memory Size (KiB) \fR
+A subset of resident memory (RES) representing the implicitly shared
+pages supporting program images and shared libraries.
+It also includes explicit file mappings, both private and shared.
+
+.TP 4
+24.\fB RSlk \*(Em Resident Locked Memory Size (KiB) \fR
+A subset of resident memory (RES) which cannot be swapped out.
 
 .TP 4
-19.\fB RUID \*(Em Real User Id \fR
+25.\fB RSsh \*(Em Resident Shared Memory Size (KiB) \fR
+A subset of resident memory (RES) representing the explicitly shared
+anonymous shm*/mmap pages.
+
+.TP 4
+26.\fB RUID \*(Em Real User Id \fR
 The\fI real\fR user ID.
 
 .TP 4
-20.\fB RUSER \*(Em Real User Name \fR
+27.\fB RUSER \*(Em Real User Name \fR
 The\fI real\fR user name.
 
 .TP 4
-21.\fB S \*(Em Process Status \fR
+28.\fB S \*(Em Process Status \fR
 The status of the task which can be one of:
     \fBD\fR = uninterruptible sleep
     \fBR\fR = running
@@ -723,14 +857,16 @@
 depending on \*(We's delay interval and nice value.
 
 .TP 4
-22.\fB SHR \*(Em Shared Memory Size (KiB) \fR
-The amount of \*(MS available to a task, not all of which is
-typically resident.
-It simply reflects memory that could be potentially shared with
-other processes.
+29.\fB SHR \*(Em Shared Memory Size (KiB) \fR
+A subset of resident memory (RES) that may be used by other processes.
+It will include shared anonymous pages and shared file-backed pages.
+It also includes private pages mapped to files representing
+program images and shared libraries.
+
+\*(XX.
 
 .TP 4
-23.\fB SID \*(Em Session Id \fR
+30.\fB SID \*(Em Session Id \fR
 A session is a collection of process groups (\*(Xa PGRP),
 usually established by the login shell.
 A newly forked process joins the session of its creator.
@@ -739,11 +875,11 @@
 login shell.
 
 .TP 4
-24.\fB SUID \*(Em Saved User Id \fR
+31.\fB SUID \*(Em Saved User Id \fR
 The\fI saved\fR user ID.
 
 .TP 4
-25.\fB SUPGIDS \*(Em Supplementary Group IDs \fR
+32.\fB SUPGIDS \*(Em Supplementary Group IDs \fR
 The IDs of any supplementary group(s) established at login or
 inherited from a task's parent.
 They are displayed in a comma delimited list.
@@ -756,7 +892,7 @@
 any truncated data.
 
 .TP 4
-26.\fB SUPGRPS \*(Em Supplementary Group Names \fR
+33.\fB SUPGRPS \*(Em Supplementary Group Names \fR
 The names of any supplementary group(s) established at login or
 inherited from a task's parent.
 They are displayed in a comma delimited list.
@@ -769,21 +905,24 @@
 any truncated data.
 
 .TP 4
-27.\fB SUSER \*(Em Saved User Name \fR
+34.\fB SUSER \*(Em Saved User Name \fR
 The\fI saved\fR user name.
 
 .TP 4
-28.\fB SWAP \*(Em Swapped Size (KiB) \fR
-The non-resident portion of a task's address space.
+35.\fB SWAP \*(Em Swapped Size (KiB) \fR
+The formerly resident portion of a task's address space written
+to the \*(MS when \*(MP becomes over committed.
+
+\*(XX.
 
 .TP 4
-29.\fB TGID \*(Em Thread Group Id \fR
+36.\fB TGID \*(Em Thread Group Id \fR
 The ID of the thread group to which a task belongs.
 It is the PID of the thread group leader.
 In kernel terms, it represents those tasks that share an mm_struct.
 
 .TP 4
-30.\fB TIME \*(Em \*(PU Time \fR
+37.\fB TIME \*(Em \*(PU Time \fR
 Total \*(PU time the task has used since it started.
 When Cumulative mode is \*O, each process is listed with the \*(Pu
 time that it and its dead children have used.
@@ -791,19 +930,19 @@
 \*(XC `S' \*(CI for additional information regarding this mode.
 
 .TP 4
-31.\fB TIME+ \*(Em \*(PU Time, hundredths \fR
+38.\fB TIME+ \*(Em \*(PU Time, hundredths \fR
 The same as TIME, but reflecting more granularity through hundredths
 of a second.
 
 .TP 4
-32.\fB TPGID \*(Em Tty Process Group Id \fR
+39.\fB TPGID \*(Em Tty Process Group Id \fR
 The process group ID of the foreground process for the connected tty,
 or \-1 if a process is not connected to a terminal.
 By convention, this value equals the process ID (\*(Xa PID) of the
 process group leader (\*(Xa PGRP).
 
 .TP 4
-33.\fB TTY \*(Em Controlling Tty \fR
+40.\fB TTY \*(Em Controlling Tty \fR
 The name of the controlling terminal.
 This is usually the device (serial port, pty, etc.) from which the
 process was started, and which it uses for input or output.
@@ -811,39 +950,43 @@
 you'll see `?' displayed.
 
 .TP 4
-34.\fB UID \*(Em User Id \fR
+41.\fB UID \*(Em User Id \fR
 The\fI effective\fR user ID of the task's owner.
 
 .TP 4
-35.\fB USED \*(Em Memory in Use (KiB) \fR
-This field represents the non-swapped \*(MP a task has used (RES) plus
-the non-resident portion of its address space (SWAP).
+42.\fB USED \*(Em Memory in Use (KiB) \fR
+This field represents the non-swapped \*(MP a task is using (RES) plus
+the swapped out portion of its address space (SWAP).
+
+\*(XX.
 
 .TP 4
-36.\fB USER \*(Em User Name \fR
+43.\fB USER \*(Em User Name \fR
 The\fI effective\fR user name of the task's owner.
 
 .TP 4
-37.\fB VIRT \*(Em Virtual Memory Size (KiB) \fR
+44.\fB VIRT \*(Em Virtual Memory Size (KiB) \fR
 The total amount of \*(MV used by the task.
 It includes all code, data and shared libraries plus pages that have been
 swapped out and pages that have been mapped but not used.
 
+\*(XX.
+
 .TP 4
-38.\fB WCHAN \*(Em Sleeping in Function \fR
+45.\fB WCHAN \*(Em Sleeping in Function \fR
 This field will show the name of the kernel function in which the task
 is currently sleeping.
 Running tasks will display a dash (`\-') in this column.
 
 .TP 4
-39.\fB nDRT \*(Em Dirty Pages Count \fR
+46.\fB nDRT \*(Em Dirty Pages Count \fR
 The number of pages that have been modified since they were last
 written to \*(AS.
 Dirty pages must be written to \*(AS before the corresponding physical
 memory location can be used for some other virtual page.
 
 .TP 4
-40.\fB nMaj \*(Em Major Page Fault Count \fR
+47.\fB nMaj \*(Em Major Page Fault Count \fR
 The number of\fB major\fR page faults that have occurred for a task.
 A page fault occurs when a process attempts to read from or write to a
 virtual page that is not currently present in its address space.
@@ -851,7 +994,7 @@
 page available.
 
 .TP 4
-41.\fB nMin \*(Em Minor Page Fault count \fR
+48.\fB nMin \*(Em Minor Page Fault count \fR
 The number of\fB minor\fR page faults that have occurred for a task.
 A page fault occurs when a process attempts to read from or write to a
 virtual page that is not currently present in its address space.
@@ -859,54 +1002,53 @@
 page available.
 
 .TP 4
-42.\fB nTH \*(Em Number of Threads \fR
+48.\fB nTH \*(Em Number of Threads \fR
 The number of threads associated with a process.
 
 .TP 4
-43.\fB nsIPC \*(Em IPC namespace \fR
+50.\fB nsIPC \*(Em IPC namespace \fR
 The Inode of the namespace used to isolate interprocess communication (IPC)
 resources such as System V IPC objects and POSIX message queues.
 
 .TP 4
-44.\fB nsMNT \*(Em MNT namespace \fR
+51.\fB nsMNT \*(Em MNT namespace \fR
 The Inode of the namespace used to isolate filesystem mount points thus
 offering different views of the filesystem hierarchy.
 
 .TP 4
-45.\fB nsNET \*(Em NET namespace \fR
+52.\fB nsNET \*(Em NET namespace \fR
 The Inode of the namespace used to isolate resources such as network devices,
 IP addresses, IP routing, port numbers, etc.
 
 .TP 4
-46.\fB nsPID \*(Em PID namespace \fR
+53.\fB nsPID \*(Em PID namespace \fR
 The Inode of the namespace used to isolate process ID numbers
 meaning they need not remain unique.
 Thus, each such namespace could have its own `init/systemd' (PID #1) to
 manage various initialization tasks and reap orphaned child processes.
 
 .TP 4
-47.\fB nsUSER \*(Em USER namespace \fR
+54.\fB nsUSER \*(Em USER namespace \fR
 The Inode of the namespace used to isolate the user and group ID numbers.
 Thus, a process could have a normal unprivileged user ID outside a user
 namespace while having a user ID of 0, with full root privileges, inside
 that namespace.
 
 .TP 4
-48.\fB nsUTS \*(Em UTS namespace \fR
+55.\fB nsUTS \*(Em UTS namespace \fR
 The Inode of the namespace used to isolate hostname and NIS domain name.
 UTS simply means "UNIX Time-sharing System".
 
 .TP 4
-49.\fB vMj \*(Em Major Page Fault Count Delta\fR
+56.\fB vMj \*(Em Major Page Fault Count Delta\fR
 The number of\fB major\fR page faults that have occurred since the
 last update (see nMaj).
 
 .TP 4
-50.\fB vMn \*(Em Minor Page Fault Count Delta\fR
+57.\fB vMn \*(Em Minor Page Fault Count Delta\fR
 The number of\fB minor\fR page faults that have occurred since the
 last update (see nMin).
 
-
 .\" ......................................................................
 .SS 3b. MANAGING Fields
 .\" ----------------------------------------------------------------------
@@ -1019,10 +1161,11 @@
 Removes restrictions on which tasks are shown.
 This command will reverse any `i' (idle tasks) and `n' (max tasks)
 commands that might be active.
-It also provides for an exit from PID monitoring, User filtering
-and Other filtering.
+It also provides for an exit from PID monitoring, User filtering,
+Other filtering and Locate processing.
 See the `\-p' \*(CO for a discussion of PID monitoring, the `U' or `u'
-\*(CIs for User filtering and the `O' or `o' \*(CIs for Other filtering.
+\*(CIs for User filtering the `O' or `o' \*(CIs for Other filtering
+and `L' or `&' \*(CIs for Locate processing.
 
 Additionally, any window that has been scrolled will be reset with
 this command.
@@ -1631,8 +1774,8 @@
 .TP 7
 *\ \ \fB=\fR | \fB+\fR\ \ :\fIEqualize-(reinitialize)-Window(s) \fR
 The `=' key forces the \*(CW's \*(TD to be visible.
-It also reverses any `i' (idle tasks), `n' (max tasks), `u/U' (user filter)
-and `o/O' (other filter) commands that might be active.
+It also reverses any `i' (idle tasks), `n' (max tasks), `u/U' (user filter),
+\`o/O' (other filter) and 'L' (locate) commands that might be active.
 Also, if the window had been scrolled, it will be reset with this command.
 \*(XT 5c. SCROLLING a Window for additional information regarding vertical
 and horizontal scrolling.
@@ -1641,7 +1784,7 @@
 The four \*(TDs will reappear, evenly balanced.
 They will also have retained any customizations you had previously
 applied, except for the `i' (idle tasks), `n' (max tasks), `u/U'
-(user filter), `o/O' (other filter) and scrolling \*(CIs.
+(user filter), `o/O' (other filter), `L' (locate) and scrolling \*(CIs.
 
 .TP 7
 *\ \ \fBA\fR\ \ :\fIAlternate-Display-Mode\fR toggle \fR
@@ -2185,7 +2328,6 @@
 the `help' entry would identify a shell script you've written explaining what
 those numbered selections actually mean.
 In that way, many more choices can be made visible.
-
 .PP
 
 .\" ----------------------------------------------------------------------
@@ -2314,43 +2456,12 @@
 .\" ----------------------------------------------------------------------
 .SH 8. BUGS
 .\" ----------------------------------------------------------------------
-To report bugs, follow the instructions at:
-    http://www.debian.org/Bugs/Reporting
-
-.\" ----------------------------------------------------------------------
-.SH 9. HISTORY Former top
-.\" ----------------------------------------------------------------------
-The original \*(We was written by Roger Binns,
-based on Branko Lankester's <lankeste@fwi.uva.nl> ps program.
-
-Robert Nation <nation@rocket.sanders.lockheed.com>
-adapted it for the proc file system.
-
-Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de>
-added support for configurable fields.
-
-Plus many other individuals contributed over the years.
-
-.\" ----------------------------------------------------------------------
-.SH 10. AUTHOR
-.\" ----------------------------------------------------------------------
-This entirely new and enhanced replacement was written by:
-    Jim Warner, <james.warner@comcast.net>
-.ig
-   ( as a means to learn Linux, can you believe it? )
-   ( & he accidentally learned a little groff, too! )
-   ( then after ten years he did it all over again! )
-..
-
-With invaluable help from:
-    Craig Small, <csmall@enc.com.au>
-.\" Craig Small. <csmall-procps@enc.com.au>
-.\" Craig Small, <csmall@debian.org>
-.\" Craig Small, <csmall@small.dropbear.id.au>
-    Albert Cahalan, <albert@users.sf.net>
+Please send bug reports to
+.UR procps@freelists.org
+.UE .
 
  \" ----------------------------------------------------------------------
-.SH 11. SEE Also
+.SH 9. SEE Also
 .\" ----------------------------------------------------------------------
 .BR free (1),
 .BR ps (1),
@@ -2358,4 +2469,4 @@
 .BR atop (1),
 .BR slabtop (1),
 .BR vmstat (8),
-.BR w (1).
+.BR w (1)
diff -Nru procps-3.3.11/top/top.c procps-3.3.12/top/top.c
--- procps-3.3.11/top/top.c	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/top/top.c	2016-07-10 06:40:26.000000000 +0000
@@ -252,6 +252,7 @@
          * routine may serve more than one column.
          */
 
+SCB_STRS(CGN, cgname)
 SCB_STRS(CGR, cgroup[0])
 SCB_STRV(CMD, Frame_cmdlin, cmdline, cmd)
 SCB_NUM1(COD, trs)
@@ -275,15 +276,17 @@
 SCB_NUM1(NS4, ns[PIDNS])
 SCB_NUM1(NS5, ns[USERNS])
 SCB_NUM1(NS6, ns[UTSNS])
-#ifdef OOMEM_ENABLE
 SCB_NUM1(OOA, oom_adj)
 SCB_NUM1(OOM, oom_score)
-#endif
 SCB_NUMx(PGD, pgrp)
 SCB_NUMx(PID, tid)
 SCB_NUMx(PPD, ppid)
 SCB_NUMx(PRI, priority)
 SCB_NUM1(RES, vm_rss)                  // also serves MEM !
+SCB_NUM1(RZA, vm_rss_anon)
+SCB_NUM1(RZF, vm_rss_file)
+SCB_NUM1(RZL, vm_lock)
+SCB_NUM1(RZS, vm_rss_shared)
 SCB_STRX(SGD, supgid)
 SCB_STRS(SGN, supgrp)
 SCB_NUM1(SHR, share)
@@ -530,7 +533,7 @@
             "\t -----\n"
             "\t %5d total entries occupied\n", cross_foot);
 
-         if (maxdepth_sav) {
+         if (maxdepth_sav > 1) {
             fprintf(stderr, "\nPIDs at max depth: ");
             for (i = 0; i < HHASH_SIZ; i++)
                if (depths[i] == maxdepth_sav) {
@@ -575,21 +578,6 @@
 
 
         /*
-         * Handle library errors ourselves rather than accept a default
-         * fprintf to stderr (since we've mucked with the termios struct) */
-static void library_err (const char *fmts, ...) NORETURN;
-static void library_err (const char *fmts, ...) {
-   static char tmp[MEDBUFSIZ];
-   va_list va;
-
-   va_start(va, fmts);
-   vsnprintf(tmp, sizeof(tmp), fmts, va);
-   va_end(va);
-   error_exit(tmp);
-} // end: library_err
-
-
-        /*
          * Catches all remaining signals not otherwise handled */
 static void sig_abexit (int sig) {
    sigset_t ss;
@@ -765,7 +753,11 @@
 static int show_pmt (const char *str) {
    int rc;
 
+#ifdef PRETENDNOCAP
+   PUTT("\n%s%s%.*s %s%s%s"
+#else
    PUTT("%s%s%.*s %s%s%s"
+#endif
       , tg2(0, Msg_row)
       , Curwin->capclr_pmt
       , Screen_cols - 2
@@ -993,7 +985,7 @@
    // it may have been the beginning of a lengthy escape sequence
    tcflush(STDIN_FILENO, TCIFLUSH);
 
-   // note: we do NOT produce a vaid 'string'
+   // note: we do NOT produce a valid 'string'
    return rc;
 } // end: ioch
 
@@ -1507,13 +1499,18 @@
         /*
          * Make and then justify an integer NOT subject to scaling,
          * and include a visual clue should tuncation be necessary. */
-static inline const char *make_num (long num, int width, int justr, int col) {
+static inline const char *make_num (long num, int width, int justr, int col, int noz) {
    static char buf[SMLBUFSIZ];
 
+   buf[0] = '\0';
+   if (noz && Rc.zero_suppress && 0 == num)
+      goto end_justifies;
+
    if (width < snprintf(buf, sizeof(buf), "%ld", num)) {
       buf[width-1] = COLPLUSCH;
       AUTOX_COL(col);
    }
+end_justifies:
    return justify_pad(buf, width, justr);
 } // end: make_num
 
@@ -1691,6 +1688,7 @@
 #define L_SUPGRP   PROC_FILLSTATUS | PROC_FILLSUPGRP
 #define L_NS       PROC_FILLNS
 #define L_LXC      PROC_FILL_LXC
+#define L_OOM      PROC_FILLOOM
    // make 'none' non-zero (used to be important to Frames_libflags)
 #define L_NONE     PROC_SPARE_1
    // from either 'stat' or 'status' (preferred), via bits not otherwise used
@@ -1771,12 +1769,8 @@
    {    -1,     -1,  A_left,   SF(SGD),  L_status  },
    {    -1,     -1,  A_left,   SF(SGN),  L_SUPGRP  },
    {     0,     -1,  A_right,  SF(TGD),  L_status  },
-#ifdef OOMEM_ENABLE
-#define L_oom      PROC_FILLOOM
-   {     3,     -1,  A_right,  SF(OOA),  L_oom     },
-   {     8,     -1,  A_right,  SF(OOM),  L_oom     },
-#undef L_oom
-#endif
+   {     5,     -1,  A_right,  SF(OOA),  L_OOM     },
+   {     4,     -1,  A_right,  SF(OOM),  L_OOM     },
    {    -1,     -1,  A_left,   SF(ENV),  L_ENVIRON },
    {     3,     -1,  A_right,  SF(FV1),  L_stat    },
    {     3,     -1,  A_right,  SF(FV2),  L_stat    },
@@ -1791,7 +1785,19 @@
    {    10,     -1,  A_right,  SF(NS4),  L_NS      }, // PIDNS
    {    10,     -1,  A_right,  SF(NS5),  L_NS      }, // USERNS
    {    10,     -1,  A_right,  SF(NS6),  L_NS      }, // UTSNS
-   {     8,     -1,  A_left,   SF(LXC),  L_LXC     }
+   {     8,     -1,  A_left,   SF(LXC),  L_LXC     },
+#ifndef NOBOOST_MEMS
+   {     6,  SK_Kb,  A_right,  SF(RZA),  L_status  },
+   {     6,  SK_Kb,  A_right,  SF(RZF),  L_status  },
+   {     6,  SK_Kb,  A_right,  SF(RZL),  L_status  },
+   {     6,  SK_Kb,  A_right,  SF(RZS),  L_status  },
+#else
+   {     4,  SK_Kb,  A_right,  SF(RZA),  L_status  },
+   {     4,  SK_Kb,  A_right,  SF(RZF),  L_status  },
+   {     4,  SK_Kb,  A_right,  SF(RZL),  L_status  },
+   {     4,  SK_Kb,  A_right,  SF(RZS),  L_status  },
+#endif
+   {    -1,     -1,  A_left,   SF(CGN),  L_CGROUP  }
  #undef SF
  #undef A_left
  #undef A_right
@@ -2331,7 +2337,9 @@
    Fieldstab[EU_VRT].scale = Fieldstab[EU_SWP].scale
       = Fieldstab[EU_RES].scale = Fieldstab[EU_COD].scale
       = Fieldstab[EU_DAT].scale = Fieldstab[EU_SHR].scale
-      = Fieldstab[EU_USE].scale = Rc.task_mscale;
+      = Fieldstab[EU_USE].scale = Fieldstab[EU_RZA].scale
+      = Fieldstab[EU_RZF].scale = Fieldstab[EU_RZL].scale
+      = Fieldstab[EU_RZS].scale = Rc.task_mscale;
 
    // lastly, ensure we've got proper column headers...
    calibrate_fields();
@@ -2400,7 +2408,7 @@
    sum_ptr = &cpus[sumSLOT];
    memcpy(&sum_ptr->sav, &sum_ptr->cur, sizeof(CT_t));
    // then value the last slot with the cpu summary line
-   if (4 > sscanf(bp, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu"
+   if (4 > sscanf(bp, "cpu %llu %llu %llu %llu %llu %llu %llu %llu"
       , &sum_ptr->cur.u, &sum_ptr->cur.n, &sum_ptr->cur.s
       , &sum_ptr->cur.i, &sum_ptr->cur.w, &sum_ptr->cur.x
       , &sum_ptr->cur.y, &sum_ptr->cur.z))
@@ -2431,7 +2439,7 @@
       bp = 1 + strchr(bp, '\n');
       // remember from last time around
       memcpy(&cpu_ptr->sav, &cpu_ptr->cur, sizeof(CT_t));
-      if (4 > sscanf(bp, "cpu%d %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", &cpu_ptr->id
+      if (4 > sscanf(bp, "cpu%d %llu %llu %llu %llu %llu %llu %llu %llu", &cpu_ptr->id
          , &cpu_ptr->cur.u, &cpu_ptr->cur.n, &cpu_ptr->cur.s
          , &cpu_ptr->cur.i, &cpu_ptr->cur.w, &cpu_ptr->cur.x
          , &cpu_ptr->cur.y, &cpu_ptr->cur.z)) {
@@ -2687,30 +2695,26 @@
          * portion of libproc.  In support of those hotpluggable resources,
          * the sampling frequencies are reduced so as to minimize overhead. */
 static void sysinfo_refresh (int forced) {
-   static time_t mem_secs, cpu_secs;
+   static time_t sav_secs;
    time_t cur_secs;
 
    if (forced)
-      mem_secs = cpu_secs = 0;
-   time(&cur_secs);
+      sav_secs = 0;
+   cur_secs = time(NULL);
 
    /*** hotplug_acclimated ***/
-   if (3 <= cur_secs - mem_secs) {
+   if (3 <= cur_secs - sav_secs) {
       meminfo();
-      mem_secs = cur_secs;
-   }
 #ifndef PRETEND8CPUS
-   /*** hotplug_acclimated ***/
-   if (60 <= cur_secs - cpu_secs) {
       cpuinfo();
       Cpu_faux_tot = smp_num_cpus;
-      cpu_secs = cur_secs;
 #ifndef NUMA_DISABLE
       if (Libnuma_handle)
          Numa_node_tot = Numa_max_node() + 1;
 #endif
-   }
 #endif
+      sav_secs = cur_secs;
+   }
 } // end: sysinfo_refresh
 
 /*######  Inspect Other Output  ##########################################*/
@@ -3001,7 +3005,6 @@
    int fr, to, ofs;
    int hicap = 0;
 
-   capNO;
    if (col < INSP_RLEN(row))
       memcpy(tline, Insp_p[row] + col, sizeof(tline));
    else tline[0] = '\n';
@@ -3373,11 +3376,7 @@
     #undef old_Show_THREAD
    };
    static const char fields_src[] = CVT_FIELDS;
-#ifdef OOMEM_ENABLE
    char fields_dst[PFLAGSSIZ], *p1, *p2;
-#else
-   char fields_dst[PFLAGSSIZ];
-#endif
    int i, j, x;
 
    // first we'll touch up this window's winflags...
@@ -3396,14 +3395,12 @@
    if (j > CVT_FLDMAX)
       return 1;
    strcpy(fields_dst, fields_src);
-#ifdef OOMEM_ENABLE
    /* all other fields represent the 'on' state with a capitalized version
       of a particular qwerty key.  for the 2 additional suse out-of-memory
       fields it makes perfect sense to do the exact opposite, doesn't it?
       in any case, we must turn them 'off' temporarily... */
    if ((p1 = strchr(q->rc.fieldscur, '[')))  *p1 = '{';
    if ((p2 = strchr(q->rc.fieldscur, '\\'))) *p2 = '|';
-#endif
    for (i = 0; i < j; i++) {
       int c = q->rc.fieldscur[i];
       x = tolower(c) - 'a';
@@ -3413,11 +3410,9 @@
       if (isupper(c))
          FLDon(fields_dst[i]);
    }
-#ifdef OOMEM_ENABLE
    // if we turned any suse only fields off, turn 'em back on OUR way...
    if (p1) FLDon(fields_dst[p1 - q->rc.fieldscur]);
    if (p2) FLDon(fields_dst[p2 - q->rc.fieldscur]);
-#endif
    strcpy(q->rc.fieldscur, fields_dst);
 
    // lastly, we must adjust the old sort field enum...
@@ -3867,6 +3862,11 @@
 #endif
          Monpidsidx = 0;
          osel_clear(q);
+         q->findstr[0] = '\0';
+#ifndef USE_X_COLHDR
+         // NOHISEL_xxx is redundant (already turned off by osel_clear)
+         OFFw(q, NOHIFND_xxx | NOHISEL_xxx);
+#endif
 } // end: win_reset
 
 
@@ -4669,7 +4669,8 @@
             TOGw(w, Show_HICOLS);
             capsmk(w);
 #else
-            if (ENUviz(w, w->rc.sortindx)) {
+            if (ENUviz(w, w->rc.sortindx)
+            && !CHKw(w, NOHIFND_xxx | NOHISEL_xxx)) {
                TOGw(w, Show_HICOLS);
                if (ENUpos(w, w->rc.sortindx) < w->begpflg) {
                   if (CHKw(w, Show_HICOLS)) w->begpflg += 2;
@@ -4739,10 +4740,10 @@
          }
          break;
       case kbd_UP:
-         if (VIZCHKw(w)) if (0 < w->begtask) w->begtask -= 1;
+         if (VIZCHKw(w)) if (CHKw(w, Show_IDLEPS) && 0 < w->begtask) w->begtask -= 1;
          break;
       case kbd_DOWN:
-         if (VIZCHKw(w)) if (w->begtask < Frame_maxtask - 1) w->begtask += 1;
+         if (VIZCHKw(w)) if (CHKw(w, Show_IDLEPS) && (w->begtask < Frame_maxtask - 1)) w->begtask += 1;
          break;
 #ifdef USE_X_COLHDR // ------------------------------------
       case kbd_LEFT:
@@ -5338,6 +5339,9 @@
             }
             break;
 #endif
+         case EU_CGN:
+            makeVAR(p->cgname);
+            break;
          case EU_CGR:
             makeVAR(p->cgroup[0]);
             break;
@@ -5348,7 +5352,7 @@
             cp = scale_mem(S, pages2K(p->trs), W, Jn);
             break;
          case EU_CPN:
-            cp = make_num(p->processor, W, Jn, AUTOX_NO);
+            cp = make_num(p->processor, W, Jn, AUTOX_NO, 0);
             break;
          case EU_CPU:
          {  float u = (float)p->pcpu * Frame_etscale;
@@ -5384,7 +5388,7 @@
             cp = scale_num(p->min_delta, W, Jn);
             break;
          case EU_GID:
-            cp = make_num(p->egid, W, Jn, EU_GID);
+            cp = make_num(p->egid, W, Jn, EU_GID, 0);
             break;
          case EU_GRP:
             cp = make_str(p->egroup, W, Js, EU_GRP);
@@ -5396,7 +5400,7 @@
             cp = scale_pcnt((float)p->vm_rss * 100 / kb_main_total, W, Jn);
             break;
          case EU_NCE:
-            cp = make_num(p->nice, W, Jn, AUTOX_NO);
+            cp = make_num(p->nice, W, Jn, AUTOX_NO, 1);
             break;
          case EU_NS1:  // IPCNS
          case EU_NS2:  // MNTNS
@@ -5405,36 +5409,45 @@
          case EU_NS5:  // USERNS
          case EU_NS6:  // UTSNS
          {  long ino = p->ns[i - EU_NS1];
-            if (ino > 0) cp = make_num(ino, W, Jn, i);
-            else cp = make_str("-", W, Js, i);
+            cp = make_num(ino, W, Jn, i, 1);
          }
             break;
-#ifdef OOMEM_ENABLE
          case EU_OOA:
-            cp = make_num(p->oom_adj, W, Jn, AUTOX_NO);
+            cp = make_num(p->oom_adj, W, Jn, AUTOX_NO, 1);
             break;
          case EU_OOM:
-            cp = make_num(p->oom_score, W, Jn, AUTOX_NO);
+            cp = make_num(p->oom_score, W, Jn, AUTOX_NO, 1);
             break;
-#endif
          case EU_PGD:
-            cp = make_num(p->pgrp, W, Jn, AUTOX_NO);
+            cp = make_num(p->pgrp, W, Jn, AUTOX_NO, 0);
             break;
          case EU_PID:
-            cp = make_num(p->tid, W, Jn, AUTOX_NO);
+            cp = make_num(p->tid, W, Jn, AUTOX_NO, 0);
             break;
          case EU_PPD:
-            cp = make_num(p->ppid, W, Jn, AUTOX_NO);
+            cp = make_num(p->ppid, W, Jn, AUTOX_NO, 0);
             break;
          case EU_PRI:
             if (-99 > p->priority || 999 < p->priority) {
                cp = make_str("rt", W, Jn, AUTOX_NO);
             } else
-               cp = make_num(p->priority, W, Jn, AUTOX_NO);
+               cp = make_num(p->priority, W, Jn, AUTOX_NO, 0);
             break;
          case EU_RES:
             cp = scale_mem(S, p->vm_rss, W, Jn);
             break;
+         case EU_RZA:
+            cp = scale_mem(S, p->vm_rss_anon, W, Jn);
+            break;
+         case EU_RZF:
+            cp = scale_mem(S, p->vm_rss_file, W, Jn);
+            break;
+         case EU_RZL:
+            cp = scale_mem(S, p->vm_lock, W, Jn);
+            break;
+         case EU_RZS:
+            cp = scale_mem(S, p->vm_rss_shared, W, Jn);
+            break;
          case EU_SGD:
             makeVAR(p->supgid);
             break;
@@ -5445,7 +5458,7 @@
             cp = scale_mem(S, pages2K(p->share), W, Jn);
             break;
          case EU_SID:
-            cp = make_num(p->session, W, Jn, AUTOX_NO);
+            cp = make_num(p->session, W, Jn, AUTOX_NO, 0);
             break;
          case EU_STA:
             cp = make_chr(p->state, W, Js);
@@ -5454,10 +5467,10 @@
             cp = scale_mem(S, p->vm_swap, W, Jn);
             break;
          case EU_TGD:
-            cp = make_num(p->tgid, W, Jn, AUTOX_NO);
+            cp = make_num(p->tgid, W, Jn, AUTOX_NO, 0);
             break;
          case EU_THD:
-            cp = make_num(p->nlwp, W, Jn, AUTOX_NO);
+            cp = make_num(p->nlwp, W, Jn, AUTOX_NO, 0);
             break;
          case EU_TM2:
          case EU_TME:
@@ -5467,7 +5480,7 @@
          }
             break;
          case EU_TPG:
-            cp = make_num(p->tpgid, W, Jn, AUTOX_NO);
+            cp = make_num(p->tpgid, W, Jn, AUTOX_NO, 0);
             break;
          case EU_TTY:
          {  char tmp[SMLBUFSIZ];
@@ -5476,19 +5489,19 @@
          }
             break;
          case EU_UED:
-            cp = make_num(p->euid, W, Jn, EU_UED);
+            cp = make_num(p->euid, W, Jn, EU_UED, 0);
             break;
          case EU_UEN:
             cp = make_str(p->euser, W, Js, EU_UEN);
             break;
          case EU_URD:
-            cp = make_num(p->ruid, W, Jn, EU_URD);
+            cp = make_num(p->ruid, W, Jn, EU_URD, 0);
             break;
          case EU_URN:
             cp = make_str(p->ruser, W, Js, EU_URN);
             break;
          case EU_USD:
-            cp = make_num(p->suid, W, Jn, EU_USD);
+            cp = make_num(p->suid, W, Jn, EU_USD, 0);
             break;
          case EU_USE:
             cp = scale_mem(S, (p->vm_swap + p->vm_rss), W, Jn);
diff -Nru procps-3.3.11/top/top.h procps-3.3.12/top/top.h
--- procps-3.3.11/top/top.h	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/top/top.h	2016-07-10 06:40:26.000000000 +0000
@@ -26,7 +26,6 @@
 //#define BOOST_PERCNT            /* enable extra precision for two % fields */
 //#define NOBOOST_MEMS            /* disable extra precision for mem fields  */
 //#define NUMA_DISABLE            /* disable summary area NUMA/Nodes display */
-//#define OOMEM_ENABLE            /* enable the SuSE out-of-memory additions */
 //#define ORIG_TOPDEFS            /* with no rcfile retain original defaults */
 //#define SIGNALS_LESS            /* favor reduced signal load over response */
 
@@ -198,14 +197,14 @@
    EU_FL1, EU_FL2, EU_DRT,
    EU_STA, EU_CMD, EU_WCH, EU_FLG, EU_CGR,
    EU_SGD, EU_SGN, EU_TGD,
-#ifdef OOMEM_ENABLE
    EU_OOA, EU_OOM,
-#endif
    EU_ENV,
    EU_FV1, EU_FV2,
    EU_USE,
    EU_NS1, EU_NS2, EU_NS3, EU_NS4, EU_NS5, EU_NS6,
    EU_LXC,
+   EU_RZA, EU_RZF, EU_RZL, EU_RZS,
+   EU_CGN,
 #ifdef USE_X_COLHDR
    // not really pflags, used with tbl indexing
    EU_MAXPFLGS
@@ -607,16 +606,11 @@
 #define JOB_FIELDS  "�����(��Ļ�@<��)*+,-./012568>?ABCFGHIJKLMNOPQRSTUVWXYZ[" RCF_PLUS_H
 #define MEM_FIELDS  "���<�����MBN�D34��&'()*+,-./0125689FGHIJKLOPQRSTUVWXYZ[" RCF_PLUS_H
 #define USR_FIELDS  "�����������)+,-./1234568;<=>?@ABCFGHIJKLMNOPQRSTUVWXYZ[" RCF_PLUS_H
-#ifdef OOMEM_ENABLE
-        // the suse old top fields ( 'a'-'z' + '{|' ) in positions 0-27
-        // ( the extra chars above represent the 'off' state )
+        // old top fields ( 'a'-'z' ) in positions 0-25
+        // other suse old top fields ( '{|' ) in positions 26-27
 #define CVT_FIELDS  "%&*'(-0346789:;<=>?@ACDEFGML)+,./125BHIJKNOPQRSTUVWXYZ["
 #define CVT_FLDMAX  28
-#else
-        // other old top fields ( 'a'-'z' ) in positions 0-25
-#define CVT_FIELDS  "%&*'(-0346789:;<=>?@ACDEFG)+,./125BHIJKLMNOPQRSTUVWXYZ["
-#define CVT_FLDMAX  26
-#endif
+
 
         /* The default values for the local config file */
 #define DEF_RCFILE { \
@@ -682,7 +676,6 @@
 //atic void          at_eoj (void);
 //atic void          bye_bye (const char *str);
 //atic void          error_exit (const char *str);
-//atic void          library_err (const char *fmts, ...);
 //atic void          sig_abexit (int sig);
 //atic void          sig_endpgm (int dont_care_sig);
 //atic void          sig_paused (int dont_care_sig);
@@ -714,7 +707,7 @@
 /*------  Basic Formatting support  --------------------------------------*/
 //atic inline const char *justify_pad (const char *str, int width, int justr);
 //atic inline const char *make_chr (const char ch, int width, int justr);
-//atic inline const char *make_num (long num, int width, int justr, int col);
+//atic inline const char *make_num (long num, int width, int justr, int col, int noz);
 //atic inline const char *make_str (const char *str, int width, int justr, int col);
 //atic const char   *scale_mem (int target, unsigned long num, int width, int justr);
 //atic const char   *scale_num (unsigned long num, int width, int justr);
diff -Nru procps-3.3.11/top/top_nls.c procps-3.3.12/top/top_nls.c
--- procps-3.3.11/top/top_nls.c	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/top/top_nls.c	2016-07-10 06:40:26.000000000 +0000
@@ -237,14 +237,12 @@
 /* Translation Hint: maximum 'TGID' = 5 */
    Head_nlstab[EU_TGD] = _("TGID");
    Desc_nlstab[EU_TGD] = _("Thread Group Id");
-#ifdef OOMEM_ENABLE
-/* Translation Hint: maximum 'Adj' = 3 */
-   Head_nlstab[EU_OOA] = _("Adj");
-   Desc_nlstab[EU_OOA] = _("oom_adjustment (2^X)");
-/* Translation Hint: maximum 'Badness' = 7 */
-   Head_nlstab[EU_OOM] = _("Badness");
-   Desc_nlstab[EU_OOM] = _("oom_score (badness)");
-#endif
+/* Translation Hint: maximum 'OOMa' = 5 */
+   Head_nlstab[EU_OOA] = _("OOMa");
+   Desc_nlstab[EU_OOA] = _("OOMEM Adjustment");
+/* Translation Hint: maximum 'OOMs' = 4 */
+   Head_nlstab[EU_OOM] = _("OOMs");
+   Desc_nlstab[EU_OOM] = _("OOMEM Score current");
 /* Translation Hint: maximum 'ENVIRON' = 7 */
    Head_nlstab[EU_ENV] = _("ENVIRON");
 /* Translation Hint: the abbreviation 'vars' below is shorthand for
@@ -280,6 +278,21 @@
 /* Translation Hint: maximum 'LXC' = 7 */
    Head_nlstab[EU_LXC] = _("LXC");
    Desc_nlstab[EU_LXC] = _("LXC container name");
+/* Translation Hint: maximum 'RSan' = 4 */
+   Head_nlstab[EU_RZA] = _("RSan");
+   Desc_nlstab[EU_RZA] = _("RES Anonymous (KiB)");
+/* Translation Hint: maximum 'RSfd' = 4 */
+   Head_nlstab[EU_RZF] = _("RSfd");
+   Desc_nlstab[EU_RZF] = _("RES File-based (KiB)");
+/* Translation Hint: maximum 'RSlk' = 4 */
+   Head_nlstab[EU_RZL] = _("RSlk");
+   Desc_nlstab[EU_RZL] = _("RES Locked (KiB)");
+/* Translation Hint: maximum 'RSsh' = 4 */
+   Head_nlstab[EU_RZS] = _("RSsh");
+   Desc_nlstab[EU_RZS] = _("RES Shared (KiB)");
+/* Translation Hint: maximum 'CGNAME' = 7 */
+   Head_nlstab[EU_CGN] = _("CGNAME");
+   Desc_nlstab[EU_CGN] = _("Control Group name");
 }
 
 
diff -Nru procps-3.3.11/.version procps-3.3.12/.version
--- procps-3.3.11/.version	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/.version	2016-07-10 06:40:26.000000000 +0000
@@ -1 +1 @@
-3.3.10.64-3600
+3.3.11.81-2f5e
diff -Nru procps-3.3.11/watch.1 procps-3.3.12/watch.1
--- procps-3.3.11/watch.1	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/watch.1	2016-07-10 06:40:26.000000000 +0000
@@ -1,4 +1,4 @@
-.TH WATCH "1" "June 2011" "procps-ng" "User Commands"
+.TH WATCH 1 "2016-06-03" "procps-ng" "User Commands"
 .SH NAME
 watch \- execute a program periodically, showing output fullscreen
 .SH SYNOPSIS
@@ -9,11 +9,8 @@
 runs
 .I command
 repeatedly, displaying its output and errors (the first screenfull).  This
-allows you to watch the program output change over time.  By default, the
-program is run every 2 seconds.
-By default,
-.B watch
-will run until interrupted.
+allows you to watch the program output change over time.  By default,
+\fIcommand\fR is run every 2 seconds and \fBwatch\fR will run until interrupted.
 .SH OPTIONS
 .TP
 \fB\-d\fR, \fB\-\-differences\fR [\fIpermanent\fR]
@@ -23,7 +20,8 @@
 .TP
 \fB\-n\fR, \fB\-\-interval\fR \fIseconds\fR
 Specify update interval.  The command will not allow quicker than 0.1 second
-interval, in which the smaller values are converted.
+interval, in which the smaller values are converted. Both '.' and ',' work
+for any locales.
 .TP
 \fB\-p\fR, \fB\-\-precise\fR
 Make
@@ -69,13 +67,81 @@
 .TP
 \fB\-v\fR, \fB\-\-version\fR
 Display version information and exit.
-.SH NOTE
-Note that POSIX option processing is used (i.e., option processing stops at
+.SH "EXIT STATUS"
+.PP
+.RS
+.PD 0
+.TP
+.B 0
+Success.
+.TP
+.B 1
+Various failures.
+.TP
+.B 2
+Forking the process to watch failed.
+.TP
+.B 3
+Replacing child process stdout with write side pipe failed.
+.TP
+.B 4
+Command execution failed.
+.TP
+.B 5
+Closing child process write pipe failed.
+.TP
+.B 7
+IPC pipe creation failed.
+.TP
+.B 8
+Getting child process return value with
+.BR waitpid (2)
+failed, or command exited up on error.
+.TP
+.B other
+The watch will propagate command exit status as child exit status.
+.SH NOTES
+POSIX option processing is used (i.e., option processing stops at
 the first non\-option argument).  This means that flags after
 .I command
 don't get interpreted by
 .BR watch
 itself.
+.SH BUGS
+Upon terminal resize, the screen will not be correctly repainted until the
+next scheduled update.  All
+.B \-\-differences
+highlighting is lost on that update as well.
+
+Non-printing characters are stripped from program output.  Use "cat -v" as
+part of the command pipeline if you want to see them.
+
+Combining Characters that are supposed to display on the character at the
+last column on the screen may display one column early, or they may not
+display at all.
+
+Combining Characters never count as different in
+.I \-\-differences
+mode.  Only the base character counts.
+
+Blank lines directly after a line which ends in the last column do not
+display.
+
+.I \-\-precise
+mode doesn't yet have advanced temporal distortion technology to compensate
+for a
+.I command
+that takes more than
+.I interval
+seconds to execute.
+.B watch
+also can get into a state where it rapid-fires as many executions of
+.I command
+as it can to catch up from a previous executions running longer than
+.I interval
+(for example,
+.B netstat
+taking ages on a DNS lookup).
 .SH EXAMPLES
 .PP
 To watch for mail, you might do
@@ -113,97 +179,3 @@
 isn't guaranteed to work across reboots, especially in the face of
 .B ntpdate
 or other bootup time-changing mechanisms)
-.SH BUGS
-Upon terminal resize, the screen will not be correctly repainted until the
-next scheduled update.  All
-.B \-\-differences
-highlighting is lost on that update as well.
-.PP
-Non-printing characters are stripped from program output.  Use "cat -v" as
-part of the command pipeline if you want to see them.
-.PP
-Combining Characters that are supposed to display on the character at the
-last column on the screen may display one column early, or they may not
-display at all.
-.PP
-Combining Characters never count as different in
-.I \-\-differences
-mode.  Only the base character counts.
-.PP
-Blank lines directly after a line which ends in the last column do not
-display.
-.PP
-.I \-\-precise
-mode doesn't yet have advanced temporal distortion technology to compensate
-for a
-.I command
-that takes more than
-.I interval
-seconds to execute.
-.B watch
-also can get into a state where it rapid-fires as many executions of
-.I command
-as it can to catch up from a previous executions running longer than
-.I interval
-(for example,
-.B netstat
-taking ages on a DNS lookup).
-.SH "EXIT STATUS"
-.PP
-.RS
-.PD 0
-.TP
-.B 0
-Success.
-.TP
-.B 1
-Various failures.
-.TP
-.B 2
-Forking the process to watch failed.
-.TP
-.B 3
-Replacing child process stdout with write side pipe failed.
-.TP
-.B 4
-Command execution failed.
-.TP
-.B 5
-Closing child process write pipe failed.
-.TP
-.B 7
-IPC pipe creation failed.
-.TP
-.B 8
-Getting child process return value with
-.BR waitpid (2)
-failed, or command exited up on error.
-.TP
-.B other
-The watch will propagate command exit status as child exit status.
-.SH AUTHORS
-The original
-.B watch
-was written by
-.UR rembo@\:unisoft.\:com
-Tony Rems
-.UE
-in 1991, with mods and
-corrections by Francois Pinard.  It was reworked and new features added by
-.UR mkc@\:acm.\:org
-Mike Coleman
-.UE
-in 1999. The beep, exec, and error handling features were added by
-.UR morty@\:frakir.\:org
-Morty Abzug
-.UE
-in 2008.  On a not so dark and stormy morning in March of 2003,
-.UR asd@\:suespammers.\:org
-Anthony DeRobertis
-.UE
-got sick of his watches that should update every minute eventually updating
-many seconds after the minute started, and added microsecond precision.
-Unicode support was added in 2009 by
-.UR procps@\:rrod.\:net
-Jarrod Lowe
-.UE
diff -Nru procps-3.3.11/watch.c procps-3.3.12/watch.c
--- procps-3.3.11/watch.c	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/watch.c	2016-07-10 06:40:26.000000000 +0000
@@ -136,7 +136,7 @@
 }
 
 
-static void set_ansi_attribute(const int attrib)
+static int set_ansi_attribute(const int attrib)
 {
 	switch (attrib) {
 	case -1:	/* restore last settings */
@@ -189,10 +189,12 @@
 			fg_col = attrib - 30 + 1;
 		} else if (attrib >= 40 && attrib <= 47) { /* set background color */
 			bg_col = attrib - 40 + 1;
+		} else {
+			return 0; /* Not understood */
 		}
 	}
-
 	attrset(attributes | COLOR_PAIR(bg_col * nr_of_colors + fg_col + 1));
+    return 1;
 }
 
 static void process_ansi(FILE * fp)
@@ -213,9 +215,7 @@
 			buf[i] = '\0';
 			break;
 		}
-		if (c < '0' && c > '9' && c != ';') {
-			while (--i >= 0)
-				ungetc(buf[i], fp);
+		if ((c < '0' || c > '9') && c != ';') {
 			return;
 		}
 		buf[i] = (char)c;
@@ -228,10 +228,14 @@
 	 * attributes to apply, but typically there are between 1 and 3.
 	 */
 
-	if (*endptr == '\0') set_ansi_attribute(0); /* [m treated as [0m */
-
-	for (endptr = numstart = buf; *endptr != '\0'; numstart = endptr + 1)
-		set_ansi_attribute(strtol(numstart, &endptr, 10));
+    /* Special case of <ESC>[m */
+    if (buf[0] == '\0')
+        set_ansi_attribute(0);
+
+	for (endptr = numstart = buf; *endptr != '\0'; numstart = endptr + 1) {
+		if (!set_ansi_attribute(strtol(numstart, &endptr, 10)))
+            break;
+    }
 }
 
 static void __attribute__ ((__noreturn__)) do_exit(int status)
@@ -359,66 +363,81 @@
 #endif	/* WITH_WATCH8BIT */
 
 #ifdef WITH_WATCH8BIT
-static void output_header(wchar_t *restrict wcommand, int wcommand_columns, int wcommand_characters, double interval)
+static void output_header(wchar_t *restrict wcommand, int wcommand_characters, double interval)
 #else
 static void output_header(char *restrict command, double interval)
 #endif	/* WITH_WATCH8BIT */
 {
 	time_t t = time(NULL);
 	char *ts = ctime(&t);
-	int tsl = strlen(ts);
 	char *header;
+	char *right_header;
+	char hostname[HOST_NAME_MAX + 1];
+	int command_columns = 0;	/* not including final \0 */
+
+	gethostname(hostname, sizeof(hostname));
 
 	/*
-	 * left justify interval and command, right justify time,
+	 * left justify interval and command, right justify hostname and time,
 	 * clipping all to fit window width
 	 */
 	int hlen = asprintf(&header, _("Every %.1fs: "), interval);
+	int rhlen = asprintf(&right_header, _("%s: %s"), hostname, ts);
 
 	/*
 	 * the rules:
-	 *   width < tsl : print nothing
-	 *   width < tsl + hlen + 1: print ts
-	 *   width = tsl + hlen + 1: print header, ts
-	 *   width < tsl + hlen + 4: print header, ..., ts
-	 *   width < tsl + hlen +    wcommand_columns: print header,
-	 *                           truncated wcommand, ..., ts
-	 *   width > "": print header, wcomand, ts
+	 *   width < rhlen : print nothing
+	 *   width < rhlen + hlen + 1: print hostname, ts
+	 *   width = rhlen + hlen + 1: print header, hostname, ts
+	 *   width < rhlen + hlen + 4: print header, ..., hostname, ts
+	 *   width < rhlen + hlen + wcommand_columns: print header,
+	 *                           truncated wcommand, ..., hostname, ts
+	 *   width > "": print header, wcomand, hostname, ts
 	 * this is slightly different from how it used to be
 	 */
-	if (width < tsl) {
+	if (width < rhlen) {
 		free(header);
+		free(right_header);
 		return;
 	}
-	if (tsl + hlen + 1 <= width) {
+	if (rhlen + hlen + 1 <= width) {
 		mvaddstr(0, 0, header);
-		if (tsl + hlen + 2 <= width) {
-			if (width < tsl + hlen + 4) {
-				mvaddstr(0, width - tsl - 4, "... ");
+		if (rhlen + hlen + 2 <= width) {
+			if (width < rhlen + hlen + 4) {
+				mvaddstr(0, width - rhlen - 4, "... ");
 			} else {
 #ifdef WITH_WATCH8BIT
-				if (width < tsl + hlen + wcommand_columns) {
+	            command_columns = wcswidth(wcommand, -1);
+				if (width < rhlen + hlen + command_columns) {
 					/* print truncated */
-					int available = width - tsl - hlen;
-					int in_use = wcommand_columns;
+					int available = width - rhlen - hlen;
+					int in_use = command_columns;
 					int wcomm_len = wcommand_characters;
 					while (available - 4 < in_use) {
 						wcomm_len--;
 						in_use = wcswidth(wcommand, wcomm_len);
 					}
 					mvaddnwstr(0, hlen, wcommand, wcomm_len);
-					mvaddstr(0, width - tsl - 4, "... ");
+					mvaddstr(0, width - rhlen - 4, "... ");
 				} else {
 					mvaddwstr(0, hlen, wcommand);
 				}
 #else
-				mvaddnstr(0, hlen, command, width - tsl - hlen);
+                command_columns = strlen(command);
+                if (width < rhlen + hlen + command_columns) {
+                    /* print truncated */
+                    mvaddnstr(0, hlen, command, width - rhlen - hlen - 4);
+                    mvaddstr(0, width - rhlen - 4, "... ");
+                } else {
+                    mvaddnstr(0, hlen, command, width - rhlen - hlen);
+                }
 #endif	/* WITH_WATCH8BIT */
 			}
 		}
 	}
-	mvaddstr(0, width - tsl + 1, ts);
+	mvaddstr(0, width - rhlen + 1, right_header);
 	free(header);
+	free(right_header);
 	return;
 }
 
@@ -650,7 +669,6 @@
 				 * keeping only */
 #ifdef WITH_WATCH8BIT
 	wchar_t *wcommand = NULL;
-	int wcommand_columns = 0;	/* not including final \0 */
 	int wcommand_characters = 0;	/* not including final \0 */
 #endif	/* WITH_WATCH8BIT */
 
@@ -705,7 +723,7 @@
 			flags |= WATCH_EXEC;
 			break;
 		case 'n':
-			interval = strtod_or_err(optarg, _("failed to parse argument"));
+			interval = strtod_nol_or_err(optarg, _("failed to parse argument"));
 			if (interval < 0.1)
 				interval = 0.1;
 			if (interval > UINT_MAX)
@@ -762,7 +780,6 @@
 		exit(EXIT_FAILURE);
 	}
 	mbstowcs(wcommand, command, wcommand_characters + 1);
-	wcommand_columns = wcswidth(wcommand, -1);
 #endif	/* WITH_WATCH8BIT */
 
 	get_terminal_size();
@@ -805,7 +822,7 @@
 
 		if (show_title)
 #ifdef WITH_WATCH8BIT
-			output_header(wcommand, wcommand_columns, wcommand_characters, interval);
+			output_header(wcommand, wcommand_characters, interval);
 #else
 			output_header(command, interval);
 #endif	/* WITH_WATCH8BIT */
diff -Nru procps-3.3.11/w.c procps-3.3.12/w.c
--- procps-3.3.11/w.c	2015-08-09 12:57:10.000000000 +0000
+++ procps-3.3.12/w.c	2016-07-10 06:40:26.000000000 +0000
@@ -187,6 +187,7 @@
 	char buf[fromlen + 1];
 	char buf_ipv6[INET6_ADDRSTRLEN];
 	int len;
+#ifndef __CYGWIN__
 	int32_t ut_addr_v6[4];      /* IP address of the remote host */
 
 	if (ip_addresses) { /* -i switch used */
@@ -224,6 +225,9 @@
 	} else {  /* -i switch NOT used */
 		print_host(u->ut_host, UT_HOSTSIZE, fromlen);
 	}
+#else
+	print_host(u->ut_host, UT_HOSTSIZE, fromlen);
+#endif
 }