Request 5112 (accepted)

Overview

Request 5112 (accepted)

update to 4.1.1

Created by Aloysius over 4 years ago
In state accepted
Package maintainers: bitstreamout and enzokiel

Submit grip

Submit package home:Aloysius:branches:Multimedia / grip to package Multimedia / grip

grip.changes Changed

grip.spec Changed

9c91b8.patch Deleted

grip-3.10.1.tar.gz/compile Deleted

@@ -1,347 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand '-c -o'.
-
-scriptversion=2012-10-14.11; # UTC
-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.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, 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>.
-
-nl='
-'
-
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent tools from complaining about whitespace usage.
-IFS=" ""	$nl"
-
-file_conv=
-
-# func_file_conv build_file lazy
-# Convert a $build file to $host form and store it in $file
-# Currently only supports Windows hosts. If the determined conversion
-# type is listed in (the comma separated) LAZY, no conversion will
-# take place.
-func_file_conv ()
-{
-  file=$1
-  case $file in
-    / | /[!/]*) # absolute file, and not a UNC file
-      if test -z "$file_conv"; then
-	# lazily determine how to convert abs files
-	case `uname -s` in
-	  MINGW*)
-	    file_conv=mingw
-	    ;;
-	  CYGWIN*)
-	    file_conv=cygwin
-	    ;;
-	  *)
-	    file_conv=wine
-	    ;;
-	esac
-      fi
-      case $file_conv/,$2, in
-	*,$file_conv,*)
-	  ;;
-	mingw/*)
-	  file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'`
-	  ;;
-	cygwin/*)
-	  file=`cygpath -m "$file" || echo "$file"`
-	  ;;
-	wine/*)
-	  file=`winepath -w "$file" || echo "$file"`
-	  ;;
-      esac
-      ;;
-  esac
-}
-
-# func_cl_dashL linkdir
-# Make cl look for libraries in LINKDIR
-func_cl_dashL ()
-{
-  func_file_conv "$1"
-  if test -z "$lib_path"; then
-    lib_path=$file
-  else
-    lib_path="$lib_path;$file"
-  fi
-  linker_opts="$linker_opts -LIBPATH:$file"
-}
-
-# func_cl_dashl library
-# Do a library search-path lookup for cl
-func_cl_dashl ()
-{
-  lib=$1
-  found=no
-  save_IFS=$IFS
-  IFS=';'
-  for dir in $lib_path $LIB
-  do
-    IFS=$save_IFS
-    if $shared && test -f "$dir/$lib.dll.lib"; then
-      found=yes
-      lib=$dir/$lib.dll.lib
-      break
-    fi
-    if test -f "$dir/$lib.lib"; then
-      found=yes
-      lib=$dir/$lib.lib
-      break
-    fi
-    if test -f "$dir/lib$lib.a"; then
-      found=yes
-      lib=$dir/lib$lib.a
-      break
-    fi
-  done
-  IFS=$save_IFS
-
-  if test "$found" != yes; then
-    lib=$lib.lib
-  fi
-}
-
-# func_cl_wrapper cl arg...
-# Adjust compile command to suit cl
-func_cl_wrapper ()
-{
-  # Assume a capable shell
-  lib_path=
-  shared=:
-  linker_opts=
-  for arg
-  do
-    if test -n "$eat"; then
-      eat=
-    else
-      case $1 in
-	-o)
-	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
-	  eat=1
-	  case $2 in
-	    *.o | *.[oO][bB][jJ])
-	      func_file_conv "$2"
-	      set x "$@" -Fo"$file"
-	      shift
-	      ;;
-	    *)
-	      func_file_conv "$2"
-	      set x "$@" -Fe"$file"
-	      shift
-	      ;;
-	  esac
-	  ;;
-	-I)
-	  eat=1
-	  func_file_conv "$2" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-I*)
-	  func_file_conv "${1#-I}" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-l)
-	  eat=1
-	  func_cl_dashl "$2"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-l*)
-	  func_cl_dashl "${1#-l}"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-L)
-	  eat=1
-	  func_cl_dashL "$2"
-	  ;;
-	-L*)
-	  func_cl_dashL "${1#-L}"
-	  ;;
-	-static)
-	  shared=false
-	  ;;
-	-Wl,*)
-	  arg=${1#-Wl,}
-	  save_ifs="$IFS"; IFS=','
-	  for flag in $arg; do
-	    IFS="$save_ifs"
-	    linker_opts="$linker_opts $flag"
-	  done
-	  IFS="$save_ifs"
-	  ;;
-	-Xlinker)
-	  eat=1
-	  linker_opts="$linker_opts $2"
-	  ;;
-	-*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
-	  func_file_conv "$1"
-	  set x "$@" -Tp"$file"
-	  shift
-	  ;;
-	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
-	  func_file_conv "$1" mingw
-	  set x "$@" "$file"
-	  shift
-	  ;;
-	*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-      esac
-    fi
-    shift
-  done
-  if test -n "$linker_opts"; then
-    linker_opts="-link$linker_opts"
-  fi
-  exec "$@" $linker_opts
-  exit 1
-}
-
-eat=
-
-case $1 in
-  '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand '-c -o'.
-Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file 'INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
-    func_cl_wrapper "$@"      # Doesn't return...
-    ;;
-esac
-
-ofile=
-cfile=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as 'compile cc -o foo foo.c'.
-	# So we strip '-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no '-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # '.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use '[/\\:.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:

grip-3.10.1.tar.gz/config.guess Deleted

@@ -1,1371 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
-
-timestamp='2001-04-20'
-
-# 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
-# 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.
-
-# Written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
-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."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script.
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c
-	for c in cc gcc c89 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
-	  if test $? = 0 ; then
-	     CC_FOR_BUILD="$c"; break
-	  fi
-	done
-	rm -f $dummy.c $dummy.o $dummy.rel
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 8/24/94.)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# Netbsd (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	# Determine the machine/vendor (is the vendor relevant).
-	case "${UNAME_MACHINE}" in
-	    amiga) machine=m68k-unknown ;;
-	    arm32) machine=arm-unknown ;;
-	    atari*) machine=m68k-atari ;;
-	    sun3*) machine=m68k-sun ;;
-	    mac68k) machine=m68k-apple ;;
-	    macppc) machine=powerpc-apple ;;
-	    hp3[0-9][05]) machine=m68k-hp ;;
-	    ibmrt|romp-ibm) machine=romp-ibm ;;
-	    *) machine=${UNAME_MACHINE}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE}" in
-	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
-	# 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.
-	cat <<EOF >$dummy.s
-	.data
-\$Lformat:
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
-	.globl main
-	.align 4
-	.ent main
-main:
-	.frame \$30,16,\$26,0
-	ldgp \$29,0(\$27)
-	.prologue 1
-	.long 0x47e03d80 # implver \$0
-	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
-	lda \$16,\$Lformat
-	mov \$0,\$17
-	not \$1,\$18
-	jsr \$26,printf
-	ldgp \$29,0(\$26)
-	mov 0,\$16
-	jsr \$26,exit
-	.end main
-EOF
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		case `./$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit 0;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    arc64:OpenBSD:*:*)
-	echo mips64el-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hkmips:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
-    sun3*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy \
-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` \
-	  && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-		rm -f $dummy.c $dummy
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-              case "${HPUX_REV}" in
-                11.[0-9][0-9])
-                  if [ -x /usr/bin/getconf ]; then
-                    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
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-                        esac ;;
-                    esac
-                  fi ;;
-              esac
-              if [ "${HP_ARCH}" = "" ]; then
-              sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-	rm -f $dummy.c $dummy
-	fi ;;
-	esac
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    *9??*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    hppa*:OpenBSD:*:*)
-	echo hppa-unknown-openbsd
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*X-MP:*:*:*)
-	echo xmp-cray-unicos
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE}
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*$[A-Z]90$/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY-2:*:*:*)
-	echo cray2-cray-unicos
-        exit 0 ;;
-    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_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i386-pc-interix
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	cat >$dummy.c <<EOF
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-int main (int argc, char *argv[]) {
-#else
-int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __MIPSEB__
-  printf ("%s-unknown-linux-gnu\n", argv[1]);
-#endif
-#ifdef __MIPSEL__
-  printf ("%sel-unknown-linux-gnu\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	;;
-    ppc:Linux:*:*)
-	# Determine Lib Version
-	cat >$dummy.c <<EOF
-#include <features.h>
-#if defined(__GLIBC__)
-extern char __libc_version[];
-extern char __libc_release[];
-#endif
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
-#if defined(__GLIBC__)
-  printf("%s %s\n", __libc_version, __libc_release);
-#else
-  printf("unknown\n");
-#endif
-  return 0;
-}
-EOF
-	LIBC=""
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		./$dummy | grep 1\.99 > /dev/null
-		if test "$?" = 0 ; then LIBC="libc1" ; fi
-	fi
-	rm -f $dummy.c $dummy
-	echo powerpc-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    alpha:Linux:*:*)
-	cat <<EOF >$dummy.s
-	  .data
-	  \$Lformat:
-		.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-	   .text
-		.globl main
-		.align 4
-		.ent main
-	    main:
-		.frame \$30,16,\$26,0
-		ldgp \$29,0(\$27)
-		.prologue 1
-		.long 0x47e03d80 # implver \$0
-		lda \$2,-1
-		.long 0x47e20c21 # amask \$2,\$1
-		lda \$16,\$Lformat
-		mov \$0,\$17
-		not \$1,\$18
-		jsr \$26,printf
-		ldgp \$29,0(\$26)
-		mov 0,\$16
-		jsr \$26,exit
-		.end main
-EOF
-	LIBC=""
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		case `./$dummy` in
-		0-0)	UNAME_MACHINE="alpha" ;;
-		1-0)	UNAME_MACHINE="alphaev5" ;;
-		1-1)    UNAME_MACHINE="alphaev56" ;;
-		1-101)	UNAME_MACHINE="alphapca56" ;;
-		2-303)	UNAME_MACHINE="alphaev6" ;;
-		2-307)	UNAME_MACHINE="alphaev67" ;;
-		esac
-		objdump --private-headers $dummy | \
-		  grep ld.so.1 > /dev/null
-		if test "$?" = 0 ; then
-			LIBC="libc1"
-		fi
-	fi
-	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	ld_supported_emulations=`cd /; ld --help 2>&1 \
-			 | sed -ne '/supported emulations:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported emulations: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_emulations" in
-	  i*86linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0
-		;;
-	  elf_i*86)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  i*86coff)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0
-		;;
-	esac
-	# Either a pre-BFD a.out linker (linux-gnuoldld)
-	# or one that does not give us useful --help.
-	# GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
-	# If ld does not provide *any* "supported emulations:"
-	# that means it is gnuoldld.
-	test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-	case "${UNAME_MACHINE}" in
-	i*86)
-	  VENDOR=pc;
-	  ;;
-	*)
-	  VENDOR=unknown;
-	  ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	cat >$dummy.c <<EOF
-#include <features.h>
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __ELF__
-# ifdef __GLIBC__
-#  if __GLIBC__ >= 2
-    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
-#  else
-    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
-#  endif
-# else
-   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
-# endif
-#else
-  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
-# are messed up and put the nodename in both sysname and nodename.
-    i*86:DYNIX/ptx:4*:*)
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit 0 ;;
-    i*86:*:5:7*)
-        # Fixed at (any) Pentium or better
-        UNAME_MACHINE=i586
-        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
-	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
-	else
-	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
-	fi
-	exit 0 ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    M68*:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                           # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit 0 ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit 0 ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit 0 ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Darwin:*:*)
-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	if test "${UNAME_MACHINE}" = "x86pc"; then
-		UNAME_MACHINE=pc
-	fi
-	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-[KW]:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "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
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach $[0-9]*$.*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-    ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

grip-3.10.1.tar.gz/config.sub Deleted

@@ -1,1362 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
-
-timestamp='2001-04-20'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# 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
-# 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.
-
-# 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.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-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."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
-	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
-		| pyramid | mn10200 | mn10300 | tron | a29k \
-		| 580 | i960 | h8300 \
-		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
-		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-		| hppa64 \
-		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
-		| alphaev6[78] \
-		| we32k | ns16k | clipper | i370 | sh | sh[34] \
-		| powerpc | powerpcle \
-		| 1750a | dsp16xx | pdp10 | pdp11 \
-		| mips16 | mips64 | mipsel | mips64el \
-		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
-		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-		| mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
-		| v850 | c4x \
-		| thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
-		| pj | pjl | h8500)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	# FIXME: clean up the formatting here.
-	vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
-	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
-	      | xmp-* | ymp-* \
-	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
-	      | hppa2.0n-* | hppa64-* \
-	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
-	      | alphaev6[78]-* \
-	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
-	      | clipper-* | orion-* \
-	      | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
-	      | mips16-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-* \
-	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
-	      | mipstx39-* | mipstx39el-* | mcore-* \
-	      | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
-	      | [cjt]90-* \
-	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
-	      | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
-		;;
-	[cjt]90)
-		basic_machine=${basic_machine}-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mipsel*-linux*)
-		basic_machine=mipsel-unknown
-		os=-linux-gnu
-		;;
-	mips*-linux*)
-		basic_machine=mips-unknown
-		os=-linux-gnu
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-        pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexgen)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2)
-		basic_machine=i686-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-	        ;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-	        ;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sparclite-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=t3e-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
-		;;
-        xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	mips)
-		if [ x$os = x-linux-gnu ]; then
-			basic_machine=mips-unknown
-		else
-			basic_machine=mips-mips
-		fi
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh3 | sh4)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
-		basic_machine=sparc-sun
-		;;
-        cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto*)
-		os=-nto-qnx
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-ns2 )
-	        os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-	        os=-mint
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	pdp10-*)
-		os=-tops20
-		;;
-        pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-        *-gould)
-		os=-sysv
-		;;
-        *-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-        *-sgi)
-		os=-irix
-		;;
-        *-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-vxsim* | -vxworks*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

grip-3.10.1.tar.gz/depcomp Deleted

@@ -1,464 +0,0 @@
-#! /bin/sh
-
-# depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 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, 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.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-# `libtool' can also be set to `yes' or `no'.
-
-if test -z "$depfile"; then
-   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.$[^.]*$$,.P\1,'`
-   dir=`echo "$object" | sed 's,/.*$,/,'`
-   if test "$dir" = "$object"; then
-      dir=
-   fi
-   # FIXME: should be _deps on DOS.
-   depfile="$dir.deps/$base"
-fi
-
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.$[^.]*$$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  This file always lives in the current directory.
-  # Also, the AIX compiler puts `$object:' at the start of each line;
-  # $object doesn't have directory information.
-  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/$.*$\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  outname="$stripped.o"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: $.*$$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Must come before tru64.
-
-  # Intel's C compiler understands `-MD -MF file'.  However
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  sed -e "s,^[^:]*: $.*$$,\1:," < "$tmpdepfile" >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir.libs/$base.d"
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1="$dir$base.o.d"
-      tmpdepfile2="$dir$base.d"
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2"
-      exit $stat
-   fi
-
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   else
-      tmpdepfile="$tmpdepfile2"
-   fi
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a space and a tab in the [].
-      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n '/^# [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^$.*$$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^$.*$$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0

grip-3.10.1.tar.gz/install-sh Deleted

@@ -1,251 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0

grip-3.10.1.tar.gz/ltconfig Deleted

@@ -1,3114 +0,0 @@
-#! /bin/sh
-
-# ltconfig - Create a system-specific libtool.
-# Copyright (C) 1996-1999 Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# 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
-# 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.
-
-# A lot of this script is taken from autoconf-2.10.
-
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-echo=echo
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec "$SHELL" "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit 0
-fi
-
-# Find the correct PATH separator.  Usually this is `:', but
-# DJGPP uses `;' like DOS.
-if test "X${PATH_SEPARATOR+set}" != Xset; then
-  UNAME=${UNAME-`uname 2>/dev/null`}
-  case X$UNAME in
-    *-DOS) PATH_SEPARATOR=';' ;;
-    *)     PATH_SEPARATOR=':' ;;
-  esac
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-if test "X${echo_test_string+set}" != Xset; then
-  # find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null; then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" != 'X\t' ||
-   test "X`($echo "$echo_test_string") 2>/dev/null`" != X"$echo_test_string"; then
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-  for dir in $PATH /usr/ucb; do
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       test "X`($dir/echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       test "X`(print -r "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running ltconfig again with it.
-      ORIGINAL_CONFIG_SHELL="${CONFIG_SHELL-/bin/sh}"
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"}
-    else
-      # Try using printf.
-      echo='printf "%s\n"'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 test "X`($echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' &&
-	   test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-	CONFIG_SHELL="$ORIGINAL_CONFIG_SHELL"
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      elif test "X`("$CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' &&
-	   test "X`("$CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null; then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "$0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec "${ORIGINAL_CONFIG_SHELL}" "$0" ${1+"$@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
-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'
-
-# The name of this program.
-progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
-
-# Constants:
-PROGRAM=ltconfig
-PACKAGE=libtool
-VERSION=1.3.5
-TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)"
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-rm="rm -f"
-
-help="Try \`$progname --help' for more information."
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-enable_shared=yes
-# All known linkers require a `.a' archive for static linking (except M$VC,
-# which needs '.lib').
-enable_static=yes
-enable_fast_install=yes
-enable_dlopen=unknown
-enable_win32_dll=no
-ltmain=
-silent=
-srcdir=
-ac_config_guess=
-ac_config_sub=
-host=
-nonopt=
-ofile="$default_ofile"
-verify_host=yes
-with_gcc=no
-with_gnu_ld=no
-need_locks=yes
-ac_ext=c
-objext=o
-libext=a
-exeext=
-cache_file=
-
-old_AR="$AR"
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-old_CPPFLAGS="$CPPFLAGS"
-old_LDFLAGS="$LDFLAGS"
-old_LD="$LD"
-old_LN_S="$LN_S"
-old_LIBS="$LIBS"
-old_NM="$NM"
-old_RANLIB="$RANLIB"
-old_DLLTOOL="$DLLTOOL"
-old_OBJDUMP="$OBJDUMP"
-old_AS="$AS"
-
-# Parse the command line options.
-args=
-prev=
-for option
-do
-  case "$option" in
-  -*=*) optarg=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    eval "$prev=\$option"
-    prev=
-    continue
-  fi
-
-  case "$option" in
-  --help) cat <<EOM
-Usage: $progname [OPTION]... [HOST [LTMAIN]]
-
-Generate a system-specific libtool script.
-
-    --debug                enable verbose shell tracing
-    --disable-shared       do not build shared libraries
-    --disable-static       do not build static libraries
-    --disable-fast-install do not optimize for fast installation
-    --enable-dlopen        enable dlopen support
-    --enable-win32-dll     enable building dlls on win32 hosts
-    --help                 display this help and exit
-    --no-verify            do not verify that HOST is a valid host type
--o, --output=FILE          specify the output file [default=$default_ofile]
-    --quiet                same as \`--silent'
-    --silent               do not print informational messages
-    --srcdir=DIR           find \`config.guess' in DIR
-    --version              output version information and exit
-    --with-gcc             assume that the GNU C compiler will be used
-    --with-gnu-ld          assume that the C compiler uses the GNU linker
-    --disable-lock         disable file locking
-    --cache-file=FILE      configure cache file
-
-LTMAIN is the \`ltmain.sh' shell script fragment or \`ltmain.c' program
-that provides basic libtool functionality.
-
-HOST is the canonical host system name [default=guessed].
-EOM
-  exit 0
-  ;;
-
-  --debug)
-    echo "$progname: enabling shell trace mode"
-    set -x
-    ;;
-
-  --disable-shared) enable_shared=no ;;
-
-  --disable-static) enable_static=no ;;
-
-  --disable-fast-install) enable_fast_install=no ;;
-
-  --enable-dlopen) enable_dlopen=yes ;;
-
-  --enable-win32-dll) enable_win32_dll=yes ;;
-
-  --quiet | --silent) silent=yes ;;
-
-  --srcdir) prev=srcdir ;;
-  --srcdir=*) srcdir="$optarg" ;;
-
-  --no-verify) verify_host=no ;;
-
-  --output | -o) prev=ofile ;;
-  --output=*) ofile="$optarg" ;;
-
-  --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"; exit 0 ;;
-
-  --with-gcc) with_gcc=yes ;;
-  --with-gnu-ld) with_gnu_ld=yes ;;
-
-  --disable-lock) need_locks=no ;;
-
-  --cache-file=*) cache_file="$optarg" ;;
-
-  -*)
-    echo "$progname: unrecognized option \`$option'" 1>&2
-    echo "$help" 1>&2
-    exit 1
-    ;;
-
-  *)
-    if test -z "$ltmain"; then
-      ltmain="$option"
-    elif test -z "$host"; then
-# This generates an unnecessary warning for sparc-sun-solaris4.1.3_U1
-#      if test -n "`echo $option| sed 's/[-a-z0-9.]//g'`"; then
-#        echo "$progname: warning \`$option' is not a valid host type" 1>&2
-#      fi
-      host="$option"
-    else
-      echo "$progname: too many arguments" 1>&2
-      echo "$help" 1>&2
-      exit 1
-    fi ;;
-  esac
-done
-
-if test -z "$ltmain"; then
-  echo "$progname: you must specify a LTMAIN file" 1>&2
-  echo "$help" 1>&2
-  exit 1
-fi
-
-if test ! -f "$ltmain"; then
-  echo "$progname: \`$ltmain' does not exist" 1>&2
-  echo "$help" 1>&2
-  exit 1
-fi
-
-# Quote any args containing shell metacharacters.
-ltconfig_args=
-for arg
-do
-  case "$arg" in
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\{\}\\\|\;\<\>\?]*)
-  ltconfig_args="$ltconfig_args '$arg'" ;;
-  *) ltconfig_args="$ltconfig_args $arg" ;;
-  esac
-done
-
-# A relevant subset of AC_INIT.
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 5 compiler messages saved in config.log
-# 6 checking for... messages and results
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>>./config.log
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-if test "X${LC_ALL+set}" = Xset; then LC_ALL=C; export LC_ALL; fi
-if test "X${LANG+set}"   = Xset; then LANG=C;   export LANG;   fi
-
-if test -n "$cache_file" && test -r "$cache_file"; then
-  echo "loading cache $cache_file within ltconfig"
-  . $cache_file
-fi
-
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-if test -z "$srcdir"; then
-  # Assume the source directory is the same one as the path to LTMAIN.
-  srcdir=`$echo "X$ltmain" | $Xsed -e 's%/[^/]*$%%'`
-  test "$srcdir" = "$ltmain" && srcdir=.
-fi
-
-trap "$rm conftest*; exit 1" 1 2 15
-if test "$verify_host" = yes; then
-  # Check for config.guess and config.sub.
-  ac_aux_dir=
-  for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-    if test -f $ac_dir/config.guess; then
-      ac_aux_dir=$ac_dir
-      break
-    fi
-  done
-  if test -z "$ac_aux_dir"; then
-    echo "$progname: cannot find config.guess in $srcdir $srcdir/.. $srcdir/../.." 1>&2
-    echo "$help" 1>&2
-    exit 1
-  fi
-  ac_config_guess=$ac_aux_dir/config.guess
-  ac_config_sub=$ac_aux_dir/config.sub
-
-  # Make sure we can run config.sub.
-  if $SHELL $ac_config_sub sun4 >/dev/null 2>&1; then :
-  else
-    echo "$progname: cannot run $ac_config_sub" 1>&2
-    echo "$help" 1>&2
-    exit 1
-  fi
-
-  echo $ac_n "checking host system type""... $ac_c" 1>&6
-
-  host_alias=$host
-  case "$host_alias" in
-  "")
-    if host_alias=`$SHELL $ac_config_guess`; then :
-    else
-      echo "$progname: cannot guess host type; you must specify one" 1>&2
-      echo "$help" 1>&2
-      exit 1
-    fi ;;
-  esac
-  host=`$SHELL $ac_config_sub $host_alias`
-  echo "$ac_t$host" 1>&6
-
-  # Make sure the host verified.
-  test -z "$host" && exit 1
-
-elif test -z "$host"; then
-  echo "$progname: you must specify a host type if you use \`--no-verify'" 1>&2
-  echo "$help" 1>&2
-  exit 1
-else
-  host_alias=$host
-fi
-
-# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
-case "$host_os" in
-linux-gnu*) ;;
-linux*) host=`echo $host | sed 's/^$.*-.*-linux$$.*$$/\1-gnu\2/'`
-esac
-
-host_cpu=`echo $host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\1/'`
-host_vendor=`echo $host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\2/'`
-host_os=`echo $host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\3/'`
-
-case "$host_os" in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR cru $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-# Set a sane default for `AR'.
-test -z "$AR" && AR=ar
-
-# Set a sane default for `OBJDUMP'.
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-# If RANLIB is not set, then run the test.
-if test "${RANLIB+set}" != "set"; then
-  result=no
-
-  echo $ac_n "checking for ranlib... $ac_c" 1>&6
-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-  for dir in $PATH; do
-    test -z "$dir" && dir=.
-    if test -f $dir/ranlib || test -f $dir/ranlib$ac_exeext; then
-      RANLIB="ranlib"
-      result="ranlib"
-      break
-    fi
-  done
-  IFS="$save_ifs"
-
-  echo "$ac_t$result" 1>&6
-fi
-
-if test -n "$RANLIB"; then
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-fi
-
-# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$AS" && AS=as
-
-# Check to see if we are using GCC.
-if test "$with_gcc" != yes || test -z "$CC"; then
-  # If CC is not set, then try to find GCC or a usable CC.
-  if test -z "$CC"; then
-    echo $ac_n "checking for gcc... $ac_c" 1>&6
-    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-    for dir in $PATH; do
-      test -z "$dir" && dir=.
-      if test -f $dir/gcc || test -f $dir/gcc$ac_exeext; then
-	CC="gcc"
-	break
-      fi
-    done
-    IFS="$save_ifs"
-
-    if test -n "$CC"; then
-      echo "$ac_t$CC" 1>&6
-    else
-      echo "$ac_t"no 1>&6
-    fi
-  fi
-
-  # Not "gcc", so try "cc", rejecting "/usr/ucb/cc".
-  if test -z "$CC"; then
-    echo $ac_n "checking for cc... $ac_c" 1>&6
-    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-    cc_rejected=no
-    for dir in $PATH; do
-      test -z "$dir" && dir=.
-      if test -f $dir/cc || test -f $dir/cc$ac_exeext; then
-	if test "$dir/cc" = "/usr/ucb/cc"; then
-	  cc_rejected=yes
-	  continue
-	fi
-	CC="cc"
-	break
-      fi
-    done
-    IFS="$save_ifs"
-    if test $cc_rejected = yes; then
-      # We found a bogon in the path, so make sure we never use it.
-      set dummy $CC
-      shift
-      if test $# -gt 0; then
-	# We chose a different compiler from the bogus one.
-	# However, it has the same name, so the bogon will be chosen
-	# first if we set CC to just the name; use the full file name.
-	shift
-	set dummy "$dir/cc" "$@"
-	shift
-	CC="$@"
-      fi
-    fi
-
-    if test -n "$CC"; then
-      echo "$ac_t$CC" 1>&6
-    else
-      echo "$ac_t"no 1>&6
-    fi
-
-    if test -z "$CC"; then
-      echo "$progname: error: no acceptable cc found in \$PATH" 1>&2
-      exit 1
-    fi
-  fi
-
-  # Now see if the compiler is really GCC.
-  with_gcc=no
-  echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
-  echo "$progname:581: checking whether we are using GNU C" >&5
-
-  $rm conftest.c
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-  if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-    with_gcc=yes
-  fi
-  $rm conftest.c
-  echo "$ac_t$with_gcc" 1>&6
-fi
-
-# Allow CC to be a program name with arguments.
-set dummy $CC
-compiler="$2"
-
-echo $ac_n "checking for object suffix... $ac_c" 1>&6
-$rm conftest*
-echo 'int i = 1;' > conftest.c
-echo "$progname:603: checking for object suffix" >& 5
-if { (eval echo $progname:604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
-  # Append any warnings to the config.log.
-  cat conftest.err 1>&5
-
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  cat conftest.err 1>&5
-  echo "$progname: failed program was:" >&5
-  cat conftest.c >&5
-fi
-$rm conftest*
-echo "$ac_t$objext" 1>&6
-
-echo $ac_n "checking for executable suffix... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_cv_exeext="no"
-  $rm conftest*
-  echo 'main () { return 0; }' > conftest.c
-  echo "$progname:629: checking for executable suffix" >& 5
-  if { (eval echo $progname:630: \"$ac_link\") 1>&5; (eval $ac_link) 2>conftest.err; }; then
-    # Append any warnings to the config.log.
-    cat conftest.err 1>&5
-
-    for ac_file in conftest.*; do
-      case $ac_file in
-      *.c | *.err | *.$objext ) ;;
-      *) ac_cv_exeext=.`echo $ac_file | sed -e s/conftest.//` ;;
-      esac
-    done
-  else
-    cat conftest.err 1>&5
-    echo "$progname: failed program was:" >&5
-    cat conftest.c >&5
-  fi
-  $rm conftest*
-fi
-if test "X$ac_cv_exeext" = Xno; then
-  exeext=""
-else
-  exeext="$ac_cv_exeext"
-fi
-echo "$ac_t$ac_cv_exeext" 1>&6
-
-echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
-pic_flag=
-special_shlib_compile_flags=
-wl=
-link_static_flag=
-no_builtin_flag=
-
-if test "$with_gcc" = yes; then
-  wl='-Wl,'
-  link_static_flag='-static'
-
-  case "$host_os" in
-  beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
-    # PIC is the default for these OSes.
-    ;;
-  aix*)
-    # Below there is a dirty hack to force normal static linking with -ldl
-    # The problem is because libdl dynamically linked with both libc and
-    # libC (AIX C++ library), which obviously doesn't included in libraries
-    # list by gcc. This cause undefined symbols with -static flags.
-    # This hack allows C programs to be linked with "-static -ldl", but
-    # we not sure about C++ programs.
-    link_static_flag="$link_static_flag ${wl}-lC"
-    ;;
-  cygwin* | mingw* | os2*)
-    # We can build DLLs from non-PIC.
-    ;;
-  amigaos*)
-    # FIXME: we need at least 68020 code to build shared libraries, but
-    # adding the `-m68020' flag to GCC prevents building anything better,
-    # like `-m68040'.
-    pic_flag='-m68020 -resident32 -malways-restore-a4'
-    ;;
-  sysv4*MP*)
-    if test -d /usr/nec; then
-       pic_flag=-Kconform_pic
-    fi
-    ;;
-  *)
-    pic_flag='-fPIC'
-    ;;
-  esac
-else
-  # PORTME Check for PIC flags for the system compiler.
-  case "$host_os" in
-  aix3* | aix4*)
-    # All AIX code is PIC.
-    link_static_flag='-bnso -bI:/lib/syscalls.exp'
-    ;;
-
-  hpux9* | hpux10* | hpux11*)
-    # Is there a better link_static_flag that works with the bundled CC?
-    wl='-Wl,'
-    link_static_flag="${wl}-a ${wl}archive"
-    pic_flag='+Z'
-    ;;
-
-  irix5* | irix6*)
-    wl='-Wl,'
-    link_static_flag='-non_shared'
-    # PIC (with -KPIC) is the default.
-    ;;
-
-  cygwin* | mingw* | os2*)
-    # We can build DLLs from non-PIC.
-    ;;
-
-  osf3* | osf4* | osf5*)
-    # All OSF/1 code is PIC.
-    wl='-Wl,'
-    link_static_flag='-non_shared'
-    ;;
-
-  sco3.2v5*)
-    pic_flag='-Kpic'
-    link_static_flag='-dn'
-    special_shlib_compile_flags='-belf'
-    ;;
-
-  solaris*)
-    pic_flag='-KPIC'
-    link_static_flag='-Bstatic'
-    wl='-Wl,'
-    ;;
-
-  sunos4*)
-    pic_flag='-PIC'
-    link_static_flag='-Bstatic'
-    wl='-Qoption ld '
-    ;;
-
-  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-    pic_flag='-KPIC'
-    link_static_flag='-Bstatic'
-    wl='-Wl,'
-    ;;
-
-  uts4*)
-    pic_flag='-pic'
-    link_static_flag='-Bstatic'
-    ;;
-  sysv4*MP*)
-    if test -d /usr/nec ;then
-      pic_flag='-Kconform_pic'
-      link_static_flag='-Bstatic'
-    fi
-    ;;
-  *)
-    can_build_shared=no
-    ;;
-  esac
-fi
-
-if test -n "$pic_flag"; then
-  echo "$ac_t$pic_flag" 1>&6
-
-  # Check to make sure the pic_flag actually works.
-  echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6
-  $rm conftest*
-  echo "int some_variable = 0;" > conftest.c
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $pic_flag -DPIC"
-  echo "$progname:776: checking if $compiler PIC flag $pic_flag works" >&5
-  if { (eval echo $progname:777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
-    # Append any warnings to the config.log.
-    cat conftest.err 1>&5
-    
-    case "$host_os" in
-    hpux9* | hpux10* | hpux11*)
-      # On HP-UX, both CC and GCC only warn that PIC is supported... then they
-      # create non-PIC objects.  So, if there were any warnings, we assume that
-      # PIC is not supported.
-      if test -s conftest.err; then
-	echo "$ac_t"no 1>&6
-	can_build_shared=no
-	pic_flag=
-      else
-	echo "$ac_t"yes 1>&6
-	pic_flag=" $pic_flag"
-      fi
-      ;;
-    *)
-      echo "$ac_t"yes 1>&6
-      pic_flag=" $pic_flag"
-      ;;
-    esac
-  else
-    # Append any errors to the config.log.
-    cat conftest.err 1>&5
-    can_build_shared=no
-    pic_flag=
-    echo "$ac_t"no 1>&6
-  fi
-  CFLAGS="$save_CFLAGS"
-  $rm conftest*
-else
-  echo "$ac_t"none 1>&6
-fi
-
-# Check to see if options -o and -c are simultaneously supported by compiler
-echo $ac_n "checking if $compiler supports -c -o file.o... $ac_c" 1>&6
-$rm -r conftest 2>/dev/null
-mkdir conftest
-cd conftest
-$rm conftest*
-echo "int some_variable = 0;" > conftest.c
-mkdir out
-# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-# that will create temporary files in the current directory regardless of
-# the output directory.  Thus, making CWD read-only will cause this test
-# to fail, enabling locking or at least warning the user not to do parallel
-# builds.
-chmod -w .
-save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -o out/conftest2.o"
-echo "$progname:829: checking if $compiler supports -c -o file.o" >&5
-if { (eval echo $progname:830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then
-
-  # The compiler can only warn and ignore the option if not recognized
-  # So say no if there are warnings
-    if test -s out/conftest.err; then
-      echo "$ac_t"no 1>&6
-      compiler_c_o=no
-    else
-      echo "$ac_t"yes 1>&6
-      compiler_c_o=yes
-    fi
-else
-  # Append any errors to the config.log.
-  cat out/conftest.err 1>&5
-  compiler_c_o=no
-  echo "$ac_t"no 1>&6
-fi
-CFLAGS="$save_CFLAGS"
-chmod u+w .
-$rm conftest* out/*
-rmdir out
-cd ..
-rmdir conftest
-$rm -r conftest 2>/dev/null
-
-if test x"$compiler_c_o" = x"yes"; then
-  # Check to see if we can write to a .lo
-  echo $ac_n "checking if $compiler supports -c -o file.lo... $ac_c" 1>&6
-  $rm conftest*
-  echo "int some_variable = 0;" > conftest.c
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -c -o conftest.lo"
-  echo "$progname:862: checking if $compiler supports -c -o file.lo" >&5
-if { (eval echo $progname:863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
-
-    # The compiler can only warn and ignore the option if not recognized
-    # So say no if there are warnings
-      if test -s conftest.err; then
-	echo "$ac_t"no 1>&6
-	compiler_o_lo=no
-      else
-	echo "$ac_t"yes 1>&6
-	compiler_o_lo=yes
-      fi
-  else
-    # Append any errors to the config.log.
-    cat conftest.err 1>&5
-    compiler_o_lo=no
-    echo "$ac_t"no 1>&6
-  fi
-  CFLAGS="$save_CFLAGS"
-  $rm conftest*
-else
-  compiler_o_lo=no
-fi
-
-# Check to see if we can do hard links to lock some files if needed
-hard_links="nottested"
-if test "$compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  echo $ac_n "checking if we can lock with hard links... $ac_c" 1>&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
-  echo "$ac_t$hard_links" 1>&6
-  $rm conftest*
-  if test "$hard_links" = no; then
-    echo "*** WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-if test "$with_gcc" = yes; then
-  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
-  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions ... $ac_c" 1>&6
-  $rm conftest*
-  echo "int some_variable = 0;" > conftest.c
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c"
-  echo "$progname:914: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-  if { (eval echo $progname:915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
-
-    # The compiler can only warn and ignore the option if not recognized
-    # So say no if there are warnings
-      if test -s conftest.err; then
-	echo "$ac_t"no 1>&6
-	compiler_rtti_exceptions=no
-      else
-	echo "$ac_t"yes 1>&6
-	compiler_rtti_exceptions=yes
-      fi
-  else
-    # Append any errors to the config.log.
-    cat conftest.err 1>&5
-    compiler_rtti_exceptions=no
-    echo "$ac_t"no 1>&6
-  fi
-  CFLAGS="$save_CFLAGS"
-  $rm conftest*
-
-  if test "$compiler_rtti_exceptions" = "yes"; then
-    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
-  else
-    no_builtin_flag=' -fno-builtin'
-  fi
-  
-fi
-
-# Check for any special shared library compilation flags.
-if test -n "$special_shlib_compile_flags"; then
-  echo "$progname: warning: \`$CC' requires \`$special_shlib_compile_flags' to build shared libraries" 1>&2
-  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$special_shlib_compile_flags[ 	]" >/dev/null; then :
-  else
-    echo "$progname: add \`$special_shlib_compile_flags' to the CC or CFLAGS env variable and reconfigure" 1>&2
-    can_build_shared=no
-  fi
-fi
-
-echo $ac_n "checking if $compiler static flag $link_static_flag works... $ac_c" 1>&6
-$rm conftest*
-echo 'main(){return(0);}' > conftest.c
-save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $link_static_flag"
-echo "$progname:958: checking if $compiler static flag $link_static_flag works" >&5
-if { (eval echo $progname:959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  echo "$ac_t$link_static_flag" 1>&6
-else
-  echo "$ac_t"none 1>&6
-  link_static_flag=
-fi
-LDFLAGS="$save_LDFLAGS"
-$rm conftest*
-
-if test -z "$LN_S"; then
-  # Check to see if we can use ln -s, or we need hard links.
-  echo $ac_n "checking whether ln -s works... $ac_c" 1>&6
-  $rm conftest.dat
-  if ln -s X conftest.dat 2>/dev/null; then
-    $rm conftest.dat
-    LN_S="ln -s"
-  else
-    LN_S=ln
-  fi
-  if test "$LN_S" = "ln -s"; then
-    echo "$ac_t"yes 1>&6
-  else
-    echo "$ac_t"no 1>&6
-  fi
-fi
-
-# Make sure LD is an absolute path.
-if test -z "$LD"; then
-  ac_prog=ld
-  if test "$with_gcc" = yes; then
-    # Check if gcc -print-prog-name=ld gives a path.
-    echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
-    echo "$progname:991: checking for ld used by GCC" >&5
-    ac_prog=`($CC -print-prog-name=ld) 2>&5`
-    case "$ac_prog" in
-    # Accept absolute paths.
-    [\\/]* | [A-Za-z]:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the path 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 are not 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
-    echo $ac_n "checking for GNU ld... $ac_c" 1>&6
-    echo "$progname:1015: checking for GNU ld" >&5
-  else
-    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-    echo "$progname:1018: checking for non-GNU ld" >&5
-  fi
-
-  if test -z "$LD"; then
-    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-    for ac_dir in $PATH; do
-      test -z "$ac_dir" && ac_dir=.
-      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-	LD="$ac_dir/$ac_prog"
-	# Check to see if the program is GNU ld.  I'd rather use --version,
-	# but apparently some GNU ld's only accept -v.
-	# Break only if it was the GNU/non-GNU ld that we prefer.
-	if "$LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	  test "$with_gnu_ld" != no && break
-	else
-	  test "$with_gnu_ld" != yes && break
-	fi
-      fi
-    done
-    IFS="$ac_save_ifs"
-  fi
-
-  if test -n "$LD"; then
-    echo "$ac_t$LD" 1>&6
-  else
-    echo "$ac_t"no 1>&6
-  fi
-
-  if test -z "$LD"; then
-    echo "$progname: error: no acceptable ld found in \$PATH" 1>&2
-    exit 1
-  fi
-fi
-
-# Check to see if it really is or is not GNU ld.
-echo $ac_n "checking if the linker ($LD) is GNU ld... $ac_c" 1>&6
-# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-echo "$ac_t$with_gnu_ld" 1>&6
-
-# See if the linker supports building shared libraries.
-echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6
-
-allow_undefined_flag=
-no_undefined_flag=
-need_lib_prefix=unknown
-need_version=unknown
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-archive_cmds=
-archive_expsym_cmds=
-old_archive_from_new_cmds=
-export_dynamic_flag_spec=
-whole_archive_flag_spec=
-thread_safe_flag_spec=
-hardcode_libdir_flag_spec=
-hardcode_libdir_separator=
-hardcode_direct=no
-hardcode_minus_L=no
-hardcode_shlibpath_var=unsupported
-runpath_var=
-always_export_symbols=no
-export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
-# include_expsyms should be a list of space-separated symbols to be *always*
-# included in the symbol list
-include_expsyms=
-# exclude_expsyms can be an egrep regular expression 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_"
-# 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.
-
-case "$host_os" in
-cygwin* | mingw*)
-  # 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 "$with_gcc" != yes; then
-    with_gnu_ld=no
-  fi
-  ;;
-
-esac
-
-ld_shlibs=yes
-if test "$with_gnu_ld" = yes; then
-  # If archive_cmds runs LD, not CC, wlarc should be empty
-  wlarc='${wl}'
-
-  # See if GNU ld supports shared libraries.
-  case "$host_os" in
-  aix3* | aix4*)
-    # On AIX, the GNU linker is very broken
-    ld_shlibs=no
-    cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, 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 modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-    ;;
-
-  amigaos*)
-    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_minus_L=yes
-
-    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-    # that the semantics of dynamic libraries on AmigaOS, at least up
-    # to version 4, is to share data among multiple programs linked
-    # with the same dynamic library.  Since this doesn't match the
-    # behavior of shared libraries on other platforms, we can use
-    # them.
-    ld_shlibs=no
-    ;;
-
-  beos*)
-    if $LD --help 2>&1 | egrep ': 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 $linkopts ${wl}-soname $wl$soname -o $lib'
-    else
-      ld_shlibs=no
-    fi
-    ;;
-
-  cygwin* | mingw*)
-    # hardcode_libdir_flag_spec is actually meaningless, as there is
-    # no search path for DLLs.
-    hardcode_libdir_flag_spec='-L$libdir'
-    allow_undefined_flag=unsupported
-    always_export_symbols=yes
-
-    # Extract the symbol export list from an `--export-all' def file,
-    # then regenerate the def file from the symbol export list, so that
-    # the compiled dll only exports the symbol export list.
-    # Be careful not to strip the DATA tag left by newer dlltools.
-    export_symbols_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
-      test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
-      $DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def  $objdir/$soname-ltdll.$objext $libobjs $convenience~
-      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $objdir/$soname-def > $export_symbols'
-
-    # If DATA tags from a recent dlltool are present, honour them!
-    archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~
-      _lt_hint=1;
-      cat $export_symbols | while read symbol; do
-        set dummy \$symbol;
-        case \$# in
-          2) echo "	\$2 @ \$_lt_hint ; " >> $objdir/$soname-def;;
-          *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $objdir/$soname-def;;
-        esac;
-	_lt_hint=`expr 1 + \$_lt_hint`;
-      done~
-      test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
-      test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
-      $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
-      $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
-      $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts'
-
-      old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a' 
-    ;;
-
-  netbsd*)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-    else
-      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-      # can we support soname and/or expsyms with a.out? -oliva
-    fi
-    ;;
-
-  solaris* | sysv5*)
-    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
-      ld_shlibs=no
-      cat <<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.
-
-EOF
-    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-    else
-      ld_shlibs=no
-    fi
-    ;;      
-
-  sunos4*)
-    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts'
-    wlarc=
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  *)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-    else
-      ld_shlibs=no
-    fi
-    ;;
-  esac
-
-  if test "$ld_shlibs" = yes; then
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
-    case $host_os in
-    cygwin* | mingw*)
-      # dlltool doesn't understand --whole-archive et. al.
-      whole_archive_flag_spec=
-      ;;
-    *)
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
-        whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-        whole_archive_flag_spec=
-      fi
-      ;;
-    esac
-  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 $objdir/$soname $libobjs $deplibs $linkopts -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname'
-    # Note: this linker hardcodes the directories in LIBPATH if there
-    # are no directories specified by -L.
-    hardcode_minus_L=yes
-    if test "$with_gcc" = yes && test -z "$link_static_flag"; then
-      # Neither direct hardcoding nor static linking is supported with a
-      # broken collect2.
-      hardcode_direct=unsupported
-    fi
-    ;;
-
-  aix4*)
-    hardcode_libdir_flag_spec='${wl}-b ${wl}nolibpath ${wl}-b ${wl}libpath:$libdir:/usr/lib:/lib'
-    hardcode_libdir_separator=':'
-    if test "$with_gcc" = yes; then
-      collect2name=`${CC} -print-prog-name=collect2`
-      if test -f "$collect2name" && \
-	 strings "$collect2name" | grep resolve_lib_name >/dev/null
-      then
-	# We have reworked collect2
-	hardcode_direct=yes
-      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
-      shared_flag='-shared'
-    else
-      shared_flag='${wl}-bM:SRE'
-      hardcode_direct=yes
-    fi
-    allow_undefined_flag=' ${wl}-berok'
-    archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}'
-    archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
-    case "$host_os" in aix4.[01]|aix4.[01].*)
-      # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on
-      always_export_symbols=yes ;;
-    esac
-   ;;
-
-  amigaos*)
-    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_minus_L=yes
-    # see comment about different semantics on the GNU ld section
-    ld_shlibs=no
-    ;;
-
-  cygwin* | mingw*)
-    # 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.
-    hardcode_libdir_flag_spec=' '
-    allow_undefined_flag=unsupported
-    # Tell ltmain to make .lib files, not .a files.
-    libext=lib
-    # FIXME: Setting linknames here is a bad hack.
-    archive_cmds='$CC -o $lib $libobjs $linkopts `echo "$deplibs" | sed -e '\''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'
-    fix_srcfile_path='`cygpath -w $srcfile`'
-    ;;
-
-  freebsd1*)
-    ld_shlibs=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 $linkopts /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 $linkopts'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-  freebsd*)
-    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  hpux9* | hpux10* | hpux11*)
-    case "$host_os" in
-    hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
-    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linkopts' ;;
-    esac
-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-    hardcode_libdir_separator=:
-    hardcode_direct=yes
-    hardcode_minus_L=yes # Not in the search PATH, but as the default
-			 # location of the library.
-    export_dynamic_flag_spec='${wl}-E'
-    ;;
-
-  irix5* | irix6*)
-    if test "$with_gcc" = yes; then
-      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-    else
-      archive_cmds='$LD -shared $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-    fi
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator=:
-    ;;
-
-  netbsd*)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'  # a.out
-    else
-      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linkopts'      # ELF
-    fi
-    hardcode_libdir_flag_spec='${wl}-R$libdir'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  openbsd*)
-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  os2*)
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_minus_L=yes
-    allow_undefined_flag=unsupported
-    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $linkopts $objdir/$libname.def'
-    old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def'
-    ;;
-
-  osf3*)
-    if test "$with_gcc" = yes; then
-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-    else
-      allow_undefined_flag=' -expect_unresolved \*'
-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-    fi
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator=:
-    ;;
-
-  osf4* | osf5*)  # As osf3* with the addition of the -msym flag
-    if test "$with_gcc" = yes; then
-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-    else
-      allow_undefined_flag=' -expect_unresolved \*'
-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-    fi
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator=:
-    ;;
-  rhapsody*)
-    archive_cmds='$CC -bundle -undefined suppress -o $lib $libobjs $deplibs $linkopts'
-    hardcode_libdir_flags_spec='-L$libdir'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-                                       
-  sco3.2v5*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-    hardcode_shlibpath_var=no
-    runpath_var=LD_RUN_PATH
-    hardcode_runpath_var=yes
-    ;;
-
-  solaris*)
-    no_undefined_flag=' -z text'
-    # $CC -shared without GNU ld will not create a library from C++
-    # object files and a static libstdc++, better avoid it by now
-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
-    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 $linkopts~$rm $lib.exp'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_shlibpath_var=no
-    case "$host_os" in
-    solaris2.[0-5] | solaris2.[0-5].*) ;;
-    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-    esac
-    ;;
-
-  sunos4*)
-    archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  sysv4)
-    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 $linkopts'
-    else
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-    fi
-    runpath_var='LD_RUN_PATH'
-    hardcode_shlibpath_var=no
-    hardcode_direct=no #Motorola manual says yes, but my tests say they lie 
-    ;;  
-
-  sysv4.3*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-    hardcode_shlibpath_var=no
-    export_dynamic_flag_spec='-Bexport'
-    ;;
-
-  sysv5*)
-    no_undefined_flag=' -z text'
-    # $CC -shared without GNU ld will not create a library from C++
-    # object files and a static libstdc++, better avoid it by now
-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
-    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 $linkopts~$rm $lib.exp'
-    hardcode_libdir_flag_spec=
-    hardcode_shlibpath_var=no
-    runpath_var='LD_RUN_PATH'
-    ;;
-
-  uts4*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_shlibpath_var=no
-    ;;
-
-  dgux*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_shlibpath_var=no
-    ;;
-
-  sysv4*MP*)
-    if test -d /usr/nec; then
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-      hardcode_shlibpath_var=no
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ld_shlibs=yes
-    fi
-    ;;
-
-  sysv4.2uw2*)
-    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linkopts'
-    hardcode_direct=yes
-    hardcode_minus_L=no
-    hardcode_shlibpath_var=no
-    hardcode_runpath_var=yes
-    runpath_var=LD_RUN_PATH
-    ;;
-
-  unixware7*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-    runpath_var='LD_RUN_PATH'
-    hardcode_shlibpath_var=no
-    ;;
-
-  *)
-    ld_shlibs=no
-    ;;
-  esac
-fi
-echo "$ac_t$ld_shlibs" 1>&6
-test "$ld_shlibs" = no && can_build_shared=no
-
-if test -z "$NM"; then
-  echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6
-  case "$NM" in
-  [\\/]* | [A-Za-z]:[\\/]*) ;; # Let the user override the test with a path.
-  *)
-    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-    for ac_dir in $PATH /usr/ucb /usr/ccs/bin /bin; do
-      test -z "$ac_dir" && ac_dir=.
-      if test -f $ac_dir/nm || test -f $ac_dir/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
-	if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	  NM="$ac_dir/nm -B"
-	  break
-	elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	  NM="$ac_dir/nm -p"
-	  break
-	else
-	  NM=${NM="$ac_dir/nm"} # keep the first match, but
-	  continue # so that we can try to find one that supports BSD flags
-	fi
-      fi
-    done
-    IFS="$ac_save_ifs"
-    test -z "$NM" && NM=nm
-    ;;
-  esac
-  echo "$ac_t$NM" 1>&6
-fi
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-echo $ac_n "checking command to parse $NM output... $ac_c" 1>&6
-
-# 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]*$'
-
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
-# Transform an extracted symbol line into a proper C declaration
-global_symbol_to_cdecl="sed -n -e 's/^. .* $.*$$/extern char \1;/p'"
-
-# Define system-specific variables.
-case "$host_os" in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern char \1();/p' -e 's/^. .* $.*$$/extern char \1;/p'"
-  ;;
-irix*)
-  symcode='[BCDEGRST]'
-  ;;
-solaris*)
-  symcode='[BDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-  symcode='[ABCDGISTW]'
-fi
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Write the raw and C identifiers.
-  global_symbol_pipe="sed -n -e 's/^.*[ 	]$$symcode$[ 	][ 	]*$$ac_symprfx$$sympat$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-  $rm conftest*
-  cat > conftest.c <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-  echo "$progname:1653: checking if global_symbol_pipe works" >&5
-  if { (eval echo $progname:1654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { echo "$progname:1657: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
-
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
-	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.c
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$global_symbol_to_cdecl"' < "$nlist" >> conftest.c'
-
-	  cat <<EOF >> conftest.c
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[] =
-{
-EOF
-	  sed 's/^. $.*$ $.*$$/  {"\2", (lt_ptr_t) \&\2},/' < "$nlist" >> conftest.c
-	  cat <<\EOF >> conftest.c
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$objext conftstm.$objext
-	  save_LIBS="$LIBS"
-	  save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$objext"
-	  CFLAGS="$CFLAGS$no_builtin_flag"
-	  if { (eval echo $progname:1709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-	    pipe_works=yes
-	  else
-	    echo "$progname: failed program was:" >&5
-	    cat conftest.c >&5
-	  fi
-	  LIBS="$save_LIBS"
-	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 $global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.c >&5
-  fi
-  $rm conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    global_symbol_pipe=
-  fi
-done
-if test "$pipe_works" = yes; then
-  echo "${ac_t}ok" 1>&6
-else
-  echo "${ac_t}failed" 1>&6
-fi
-
-if test -z "$global_symbol_pipe"; then
-  global_symbol_to_cdecl=
-fi
-
-# Check hardcoding attributes.
-echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
-   test -n "$runpath_var"; then
-
-  # We can hardcode non-existant 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 "$hardcode_shlibpath_var" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  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
-echo "$ac_t$hardcode_action" 1>&6
-
-
-reload_flag=
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6
-# PORTME Some linkers may need a different reload flag.
-reload_flag='-r'
-echo "$ac_t$reload_flag" 1>&6
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-
-# PORTME Fill in your ld.so characteristics
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-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"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-file_magic_cmd=
-file_magic_test_file=
-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 egrep 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.
-echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
-case "$host_os" in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}.so$major'
-  ;;
-
-aix4*)
-  version_type=linux
-  # AIX 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.
-  # We preserve .a as extension for shared libraries though AIX4.2
-  # and later linker supports .so
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.a'
-  shlibpath_var=LIBPATH
-  deplibs_check_method=pass_all
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/$[^/]*$\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}.so'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  deplibs_check_method=pass_all
-  lt_cv_dlopen="load_add_on"
-  lt_cv_dlopen_libs=
-  lt_cv_dlopen_self=yes
-  ;;
-
-bsdi4*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  file_magic_cmd=/usr/bin/file
-  file_magic_test_file=/shlib/libc.so
-  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"
-  export_dynamic_flag_spec=-rdynamic
-  # 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*)
-  version_type=windows
-  need_version=no
-  need_lib_prefix=no
-  if test "$with_gcc" = yes; then
-    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.a'
-  else
-    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
-  fi
-  dynamic_linker='Win32 ld.exe'
-  deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  file_magic_cmd='${OBJDUMP} -f'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  lt_cv_dlopen="LoadLibrary"
-  lt_cv_dlopen_libs=
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-  
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=freebsd-$objformat
-  case "$version_type" in
-    freebsd-elf*)
-      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-      file_magic_cmd=/usr/bin/file
-      file_magic_test_file=`echo /usr/lib/libc.so*`
-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      deplibs_check_method=unknown
-      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case "$host_os" in
-  freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  dynamic_linker="$host_os dld.sl"
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  shlibpath_var=SHLIB_PATH
-  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
-  soname_spec='${libname}${release}.sl$major'
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  case "$host_os" in
-  hpux10.20*)
-    # TODO:  Does this work for hpux-11 too?
-    deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    file_magic_cmd=/usr/bin/file
-    file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  version_type=irix
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}.so.$major'
-  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
-  case "$host_os" in
-  irix5*)
-    libsuff= shlibsuff=
-    # this will be overridden with pass_all, but let us keep it just in case
-    deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case "$LD" in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 ") 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}"
-  file_magic_cmd=/usr/bin/file
-  file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  deplibs_check_method='pass_all'
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  deplibs_check_method=pass_all
-
-  if test -f /lib/ld.so.1; then
-    dynamic_linker='GNU ld.so'
-  else
-    # Only the GNU ld.so supports shared libraries on MkLinux.
-    case "$host_cpu" in
-    powerpc*) dynamic_linker=no ;;
-    *) dynamic_linker='Linux ld.so' ;;
-    esac
-  fi
-  ;;
-
-netbsd*)
-  version_type=sunos
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-    soname_spec='${libname}${release}.so$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-openbsd*)
-  version_type=sunos
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-    need_version=no
-  fi
-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-os2*)
-  libname_spec='$name'
-  need_lib_prefix=no
-  library_names_spec='$libname.dll $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_version=no
-  soname_spec='${libname}${release}.so'
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  # this will be overridden with pass_all, but let us keep it just in case
-  deplibs_check_method='file_magic COFF format alpha shared library'
-  file_magic_cmd=/usr/bin/file
-  file_magic_test_file=/shlib/libc.so
-  deplibs_check_method='pass_all'
-  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"
-  ;;
-
-rhapsody*)
-  version_type=sunos
-  library_names_spec='${libname}.so'
-  soname_spec='${libname}.so'
-  shlibpath_var=DYLD_LIBRARY_PATH
-  deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}.so$major'
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  deplibs_check_method="file_magic ELF [0-9][0-9]-bit [LM]SB dynamic lib"
-  file_magic_cmd=/usr/bin/file
-  file_magic_test_file=/lib/libc.so
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case "$host_vendor" in
-    sequent)
-      file_magic_cmd='/bin/file'
-      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-      ;;
-    ncr)
-      deplibs_check_method='pass_all'
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      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]'
-      file_magic_cmd=/usr/bin/file
-      file_magic_test_file=`echo /usr/lib/libc.so*`
-      ;;
-  esac
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
-    soname_spec='$libname.so.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$ac_t$dynamic_linker" 1>&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-# Report the final consequences.
-echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6
-
-# Only try to build win32 dlls if AC_LIBTOOL_WIN32_DLL was used in
-# configure.in, otherwise build static only libraries.
-case "$host_os" in
-cygwin* | mingw* | os2*)
-  if test x$can_build_shared = xyes; then
-    test x$enable_win32_dll = xno && can_build_shared=no
-    echo "checking if package supports dlls... $can_build_shared" 1>&6
-  fi
-;;
-esac
-
-if test -n "$file_magic_test_file" && test -n "$file_magic_cmd"; then
-  case "$deplibs_check_method" in
-  "file_magic "*)
-    file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic $.*$\"`"
-    if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-       egrep "$file_magic_regex" > /dev/null; then
-      :
-    else
-      cat <<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
-
-EOF
-    fi ;;
-  esac
-fi
-
-echo $ac_n "checking whether to build shared libraries... $ac_c" 1>&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
-  ;;
-
-aix4*)
-  test "$enable_shared" = yes && enable_static=no
-  ;;
-esac
-
-echo "$ac_t$enable_shared" 1>&6
-
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-
-echo "checking whether to build static libraries... $enable_static" 1>&6
-
-if test "$hardcode_action" = relink; 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
-
-echo $ac_n "checking for objdir... $ac_c" 1>&6
-rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-echo "$ac_t$objdir" 1>&6
-
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then
-  lt_cv_dlopen=no lt_cv_dlopen_libs=
-echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "$progname:2248: checking for dlopen in -ldl" >&5
-ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2256 "ltconfig"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen();
-
-int main() {
-dlopen()
-; return 0; }
-EOF
-if { (eval echo $progname:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "$progname:2288: checking for dlopen" >&5
-if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2293 "ltconfig"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-dlopen();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo $progname:2318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_dlopen=yes"
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_dlopen=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="dlopen"
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-echo "$progname:2335: checking for dld_link in -ldld" >&5
-ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2343 "ltconfig"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link();
-
-int main() {
-dld_link()
-; return 0; }
-EOF
-if { (eval echo $progname:2356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "$progname:2375: checking for shl_load" >&5
-if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2380 "ltconfig"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-shl_load();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo $progname:2405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_shl_load=yes"
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_shl_load=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="shl_load"
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "$progname:2423: checking for shl_load in -ldld" >&5
-ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2431 "ltconfig"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load();
-
-int main() {
-shl_load()
-; return 0; }
-EOF
-if { (eval echo $progname:2445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-fi
-
-    
-fi
-
-  
-fi
-
-
-fi
-
-fi
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  fi
-
-  case "$lt_cv_dlopen" in
-  dlopen)
-for ac_hdr in dlfcn.h; do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "$progname:2488: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2493 "ltconfig"
-#include <$ac_hdr>
-int fnord = 0;
-EOF
-ac_try="$ac_compile >/dev/null 2>conftest.out"
-{ (eval echo $progname:2498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-    if test "x$ac_cv_header_dlfcn_h" = xyes; then
-      CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-    fi
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-  echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-echo "$progname:2526: checking whether a program can dlopen itself" >&5
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-    lt_cv_dlopen_self=cross
-  else
-    cat > conftest.c <<EOF
-#line 2534 "ltconfig"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LTDL_GLOBAL	RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-#  define LTDL_GLOBAL	DL_GLOBAL
-# else
-#  define LTDL_GLOBAL	0
-# endif
-#endif
-
-/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LTDL_LAZY_OR_NOW
-# ifdef RTLD_LAZY
-#  define LTDL_LAZY_OR_NOW	RTLD_LAZY
-# else
-#  ifdef DL_LAZY
-#   define LTDL_LAZY_OR_NOW	DL_LAZY
-#  else
-#   ifdef RTLD_NOW
-#    define LTDL_LAZY_OR_NOW	RTLD_NOW
-#   else
-#    ifdef DL_NOW
-#     define LTDL_LAZY_OR_NOW	DL_NOW
-#    else
-#     define LTDL_LAZY_OR_NOW	0
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-fnord() { int i=42;}
-main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
-    if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
-	       if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
-
-EOF
-if { (eval echo $progname:2580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  lt_cv_dlopen_self=yes
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  lt_cv_dlopen_self=no
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$lt_cv_dlopen_self" 1>&6
-
-  if test "$lt_cv_dlopen_self" = yes; then
-    LDFLAGS="$LDFLAGS $link_static_flag"
-  echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-echo "$progname:2599: checking whether a statically linked program can dlopen itself" >&5
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-    lt_cv_dlopen_self_static=cross
-  else
-    cat > conftest.c <<EOF
-#line 2607 "ltconfig"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LTDL_GLOBAL	RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-#  define LTDL_GLOBAL	DL_GLOBAL
-# else
-#  define LTDL_GLOBAL	0
-# endif
-#endif
-
-/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LTDL_LAZY_OR_NOW
-# ifdef RTLD_LAZY
-#  define LTDL_LAZY_OR_NOW	RTLD_LAZY
-# else
-#  ifdef DL_LAZY
-#   define LTDL_LAZY_OR_NOW	DL_LAZY
-#  else
-#   ifdef RTLD_NOW
-#    define LTDL_LAZY_OR_NOW	RTLD_NOW
-#   else
-#    ifdef DL_NOW
-#     define LTDL_LAZY_OR_NOW	DL_NOW
-#    else
-#     define LTDL_LAZY_OR_NOW	0
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-fnord() { int i=42;}
-main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
-    if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
-    if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
-
-EOF
-if { (eval echo $progname:2653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  lt_cv_dlopen_self_static=yes
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  lt_cv_dlopen_self_static=no
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
-fi
-    ;;
-  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
-
-# Copy echo and quote the copy, instead of the original, because it is
-# used later.
-ltecho="$echo"
-if test "X$ltecho" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   ltecho="$CONFIG_SHELL \$0 --fallback-echo"
-fi
-LTSHELL="$SHELL"
-
-LTCONFIG_VERSION="$VERSION"
-
-# Only quote variables if we're using ltmain.sh.
-case "$ltmain" in
-*.sh)
-  # Now quote all the things that may contain metacharacters.
-  for var in ltecho old_CC old_CFLAGS old_CPPFLAGS \
-    old_LD old_LDFLAGS old_LIBS \
-    old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS \
-    AR CC LD LN_S NM LTSHELL LTCONFIG_VERSION \
-    reload_flag reload_cmds wl \
-    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
-    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
-    library_names_spec soname_spec \
-    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
-    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds postuninstall_cmds \
-    file_magic_cmd export_symbols_cmds deplibs_check_method allow_undefined_flag no_undefined_flag \
-    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
-    hardcode_libdir_flag_spec hardcode_libdir_separator  \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
-
-    case "$var" in
-    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case "$ltecho" in
-  *'\$0 --fallback-echo"')
-    ltecho=`$echo "X$ltecho" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-  trap "$rm \"$ofile\"; exit 1" 1 2 15
-  echo "creating $ofile"
-  $rm "$ofile"
-  cat <<EOF > "$ofile"
-#! $SHELL
-
-# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
-#
-# Copyright (C) 1996-1999 Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="sed -e s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-### BEGIN LIBTOOL CONFIG
-EOF
-  cfgfile="$ofile"
-  ;;
-
-*)
-  # Double-quote the variables that need it (for aesthetics).
-  for var in old_CC old_CFLAGS old_CPPFLAGS \
-    old_LD old_LDFLAGS old_LIBS \
-    old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS; do
-    eval "$var=\\\"\$var\\\""
-  done
-
-  # Just create a config file.
-  cfgfile="$ofile.cfg"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  echo "creating $cfgfile"
-  $rm "$cfgfile"
-  cat <<EOF > "$cfgfile"
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Libtool configuration file.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-EOF
-  ;;
-esac
-
-cat <<EOF >> "$cfgfile"
-# Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# CC=$old_CC CFLAGS=$old_CFLAGS CPPFLAGS=$old_CPPFLAGS \\
-# LD=$old_LD LDFLAGS=$old_LDFLAGS LIBS=$old_LIBS \\
-# NM=$old_NM RANLIB=$old_RANLIB LN_S=$old_LN_S \\
-# DLLTOOL=$old_DLLTOOL OBJDUMP=$old_OBJDUMP AS=$old_AS \\
-#   $0$ltconfig_args
-#
-# Compiler and other test output produced by $progname, useful for
-# debugging $progname, is in ./config.log if it exists.
-
-# The version of $progname that generated this script.
-LTCONFIG_VERSION=$LTCONFIG_VERSION
-
-# Shell to use when invoking shell scripts.
-SHELL=$LTSHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$ltecho
-
-# The archiver.
-AR=$AR
-
-# The default C compiler.
-CC=$CC
-
-# The linker used to build libraries.
-LD=$LD
-
-# Whether we need hard or soft links.
-LN_S=$LN_S
-
-# A BSD-compatible nm program.
-NM=$NM
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$reload_flag
-reload_cmds=$reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$wl
-
-# Object file suffix (normally "o").
-objext="$objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$pic_flag
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$compiler_c_o
-
-# Can we write directly to a .lo ?
-compiler_o_lo=$compiler_o_lo
-
-# Must we lock files when doing compilation ?
-need_locks=$need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$link_static_flag
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$no_builtin_flag
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$whole_archive_flag_spec
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$thread_safe_flag_spec
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$RANLIB
-old_archive_cmds=$old_archive_cmds
-old_postinstall_cmds=$old_postinstall_cmds
-old_postuninstall_cmds=$old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$old_archive_from_new_cmds
-
-# Commands used to build and install a shared archive.
-archive_cmds=$archive_cmds
-archive_expsym_cmds=$archive_expsym_cmds
-postinstall_cmds=$postinstall_cmds
-postuninstall_cmds=$postuninstall_cmds
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$allow_undefined_flag
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$no_undefined_flag
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$global_symbol_to_cdecl
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$hardcode_libdir_flag_spec
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$hardcode_libdir_separator
-
-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$export_symbols_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$include_expsyms
-
-EOF
-
-case "$ltmain" in
-*.sh)
-  echo '### END LIBTOOL CONFIG' >> "$ofile"
-  echo >> "$ofile"
-  case "$host_os" in
-  aix3*)
-    cat <<\EOF >> "$ofile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-    ;;
-  esac
-
-  # Append the ltmain.sh script.
-  sed '$q' "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-
-  chmod +x "$ofile"
-  ;;
-
-*)
-  # Compile the libtool program.
-  echo "FIXME: would compile $ltmain"
-  ;;
-esac
-
-test -n "$cache_file" || exit 0
-
-# AC_CACHE_SAVE
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\$[a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\$=\$.*\$/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^$[a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*$=$.*$/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-exit 0
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:

grip-3.10.1.tar.gz/ltmain.sh Deleted

@@ -1,9675 +0,0 @@
-
-# libtool (GNU libtool) 2.4.2
-# 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.
-# 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 the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# 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
-#         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
-TIMESTAMP=""
-package_revision=1.3337
-
-# define SED for historic ltconfig's generated by Libtool 1.3
-test -z "$SED" && SED=sed
-
-# Be Bourne compatible
-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
-  # 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
-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
-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\"
-	fi"
-done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
-
-$lt_unset CDPATH
-
-
-# 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"
-
-
-
-: ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${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
-
-
-# func_basename file
-func_basename ()
-{
-    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
-
-
-# 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
-
-
-# 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
-
-
-# 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,/*$,/,'
-
-# 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
-}
-
-# 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
-
-  # 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
-
-  # 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
-}
-
-# The name of this program:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
-
-# Make sure we have an absolute path for reexecution:
-case $progpath in
-  [\\/]*|[A-Za-z]:\\*) ;;
-  *[\\/]*)
-     progdir=$func_dirname_result
-     progdir=`cd "$progdir" && pwd`
-     progpath="$progdir/$progname"
-     ;;
-  *)
-     save_IFS="$IFS"
-     IFS=${PATH_SEPARATOR-:}
-     for progdir in $PATH; do
-       IFS="$save_IFS"
-       test -x "$progdir/$progname" && break
-     done
-     IFS="$save_IFS"
-     test -n "$progdir" || progdir=`pwd`
-     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:
-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+"$@"}
-
-    # 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_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
-}
-
-# 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
-
-    # 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_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
-
-
-# func_grep expression filename
-# Check whether EXPRESSION matches any line of FILENAME, without output.
-func_grep ()
-{
-    $GREP "$1" "$2" >/dev/null 2>&1
-}
-
-
-# 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=
-
-    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
-
-      # Protect directory names starting with `-'
-      case $my_directory_path in
-        -*) my_directory_path="./$my_directory_path" ;;
-      esac
-
-      # While some portion of DIR does not yet exist...
-      while test ! -d "$my_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"
-
-        # If the last portion added has no slash in it, the list is done
-        case $my_directory_path in */*) ;; *) break ;; esac
-
-        # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
-      done
-      my_dir_list=`$ECHO "$my_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
-        # try to create one of the directories concurrently.  Don't
-        # stop in that case!
-        $MKDIR "$my_dir" 2>/dev/null || :
-      done
-      IFS="$save_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'"
-    fi
-}
-
-
-# func_mktempdir [string]
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
-func_mktempdir ()
-{
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
-
-    if test "$opt_dry_run" = ":"; then
-      # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
-    else
-
-      # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-
-      if test ! -d "$my_tmpdir"; then
-        # Failing that, at least try and use $RANDOM to avoid a race
-        my_tmpdir="${my_template}-${RANDOM-0}$$"
-
-        save_mktempdir_umask=`umask`
-        umask 0077
-        $MKDIR "$my_tmpdir"
-        umask $save_mktempdir_umask
-      fi
-
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || \
-        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-    fi
-
-    $ECHO "$my_tmpdir"
-}
-
-
-# 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 ()
-{
-    case $1 in
-      *[\\\`\"\$]*)
-	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
-      *)
-        func_quote_for_eval_unquoted_result="$1" ;;
-    esac
-
-    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
-}
-
-
-# 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 ()
-{
-    case $1 in
-      *[\\\`\"]*)
-	my_arg=`$ECHO "$1" | $SED \
-	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
-      *)
-        my_arg="$1" ;;
-    esac
-
-    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_quote_for_expand_result="$my_arg"
-}
-
-
-# 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-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    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
-}
-
-
-# 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 ()
-{
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    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_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
-}
-
-
-# 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 $?
-}
-
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
-{
-    $opt_debug
-
-    $SED -n '/^# Usage:/,/^#  *.*--help/ {
-        s/^# //
-	s/^# *$//
-	s/\$progname/'$progname'/
-	p
-    }' < "$progpath"
-    echo
-    $ECHO "run \`$progname --help | more' for full usage"
-    exit $?
-}
-
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
-func_help ()
-{
-    $opt_debug
-
-    $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_missing_arg argname
-# Echo program name prefixed message to standard error and set global
-# exit_cmd.
-func_missing_arg ()
-{
-    $opt_debug
-
-    func_error "missing argument for $1."
-    exit_cmd=exit
-}
-
-
-# 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 ()
-{
-    my_sed_short_opt='1s/^$..$.*$/\1/;q'
-    my_sed_short_rest='1s/^..$.*$$/\1/;q'
-
-    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_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 ()
-{
-    my_sed_long_opt='1s/^$--[^=]*$=.*/\1/;q'
-    my_sed_long_arg='1s/^--[^=]*=//'
-
-    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
-
-exit_cmd=:
-
-
-
-
-
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
-
-# Global variables.
-nonopt=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-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=
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-    eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
-
-# 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
-
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-    func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
-
-
-# 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
-
-
-# func_lo2o object
-func_lo2o ()
-{
-    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
-
-
-# func_xform libobj-or-source
-func_xform ()
-{
-    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
-
-
-# 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_config
-# Display the configuration for all the tags in this script.
-func_config ()
-{
-    re_begincf='^# ### BEGIN LIBTOOL'
-    re_endcf='^# ### END LIBTOOL'
-
-    # Default configuration.
-    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
-
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
-    done
-
-    exit $?
-}
-
-# func_features
-# Display the features supported by this script.
-func_features ()
-{
-    echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      echo "enable shared libraries"
-    else
-      echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      echo "enable static libraries"
-    else
-      echo "disable static libraries"
-    fi
-
-    exit $?
-}
-
-# 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"
-
-  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) ;;
-    *)
-      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
-}
-
-# 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
-$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
-$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
-$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
-
-    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
-
-
-
-# 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
-
-
-# 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:
-
-  # save first non-option argument
-  if test "$#" -gt 0; then
-    nonopt="$opt"
-    shift
-  fi
-
-  # preserve --debug
-  test "$opt_debug" = : || func_append preserve_args " --debug"
-
-  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
-
-    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
-    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
-}
-
-
-
-
-## ----------- ##
-##    Main.    ##
-## ----------- ##
-
-# func_lalib_p 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
-}
-
-# func_lalib_unsafe_p 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.
-func_lalib_unsafe_p ()
-{
-    lalib_p=no
-    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
-	for lalib_p_l in 1 2 3 4
-	do
-	    read lalib_p_line
-	    case "$lalib_p_line" in
-		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
-	    esac
-	done
-	exec 0<&5 5<&-
-    fi
-    test "$lalib_p" = yes
-}
-
-# func_ltwrapper_script_p file
-# True iff FILE is a libtool wrapper script
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_script_p ()
-{
-    func_lalib_p "$1"
-}
-
-# func_ltwrapper_executable_p file
-# True iff FILE is a libtool wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_executable_p ()
-{
-    func_ltwrapper_exec_suffix=
-    case $1 in
-    *.exe) ;;
-    *) func_ltwrapper_exec_suffix=.exe ;;
-    esac
-    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
-}
-
-# func_ltwrapper_scriptname file
-# Assumes file is an ltwrapper_executable
-# uses $file to determine the appropriate filename for a
-# temporary ltwrapper_script.
-func_ltwrapper_scriptname ()
-{
-    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_p file
-# True iff FILE is a libtool wrapper script or wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_p ()
-{
-    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
-}
-
-
-# func_execute_cmds commands fail_cmd
-# Execute tilde-delimited COMMANDS.
-# If FAIL_CMD is given, eval that upon failure.
-# FAIL_CMD may read-access the current command in variable CMD!
-func_execute_cmds ()
-{
-    $opt_debug
-    save_ifs=$IFS; IFS='~'
-    for cmd in $1; do
-      IFS=$save_ifs
-      eval cmd=\"$cmd\"
-      func_show_eval "$cmd" "${2-:}"
-    done
-    IFS=$save_ifs
-}
-
-
-# func_source file
-# Source FILE, adding directory component if necessary.
-# 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.
-func_source ()
-{
-    $opt_debug
-    case $1 in
-    */* | *\\*)	. "$1" ;;
-    *)		. "./$1" ;;
-    esac
-}
-
-
-# func_resolve_sysroot PATH
-# Replace a leading = in PATH with a sysroot.  Store the result into
-# func_resolve_sysroot_result
-func_resolve_sysroot ()
-{
-  func_resolve_sysroot_result=$1
-  case $func_resolve_sysroot_result in
-  =*)
-    func_stripname '=' '' "$func_resolve_sysroot_result"
-    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
-    ;;
-  esac
-}
-
-# func_replace_sysroot PATH
-# If PATH begins with the sysroot, replace it with = and
-# store the result into func_replace_sysroot_result.
-func_replace_sysroot ()
-{
-  case "$lt_sysroot:$1" in
-  ?*:"$lt_sysroot"*)
-    func_stripname "$lt_sysroot" '' "$1"
-    func_replace_sysroot_result="=$func_stripname_result"
-    ;;
-  *)
-    # Including no sysroot.
-    func_replace_sysroot_result=$1
-    ;;
-  esac
-}
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    $opt_debug
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	func_append_quoted CC_quoted "$arg"
-      done
-      CC_expanded=`func_echo_all $CC`
-      CC_quoted_expanded=`func_echo_all $CC_quoted`
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	      # Double-quote args containing other shell metacharacters.
-	      func_append_quoted CC_quoted "$arg"
-	    done
-	    CC_expanded=`func_echo_all $CC`
-	    CC_quoted_expanded=`func_echo_all $CC_quoted`
-	    case "$@ " in
-	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  func_echo "unable to infer tagged configuration"
-	  func_fatal_error "specify a tag with \`--tag'"
-#	else
-#	  func_verbose "using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-
-# func_write_libtool_object output_name pic_name nonpic_name
-# Create a libtool object file (analogous to a ".la" file),
-# 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}\'
-    else
-      write_lobj=none
-    fi
-
-    if test "$build_old_libs" = yes; then
-      write_oldobj=\'${3}\'
-    else
-      write_oldobj=none
-    fi
-
-    $opt_dry_run || {
-      cat >${write_libobj}T <<EOF
-# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object=$write_lobj
-
-# Name of the non-PIC object
-non_pic_object=$write_oldobj
-
-EOF
-      $MV "${write_libobj}T" "${write_libobj}"
-    }
-}
-
-
-##################################################
-# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
-##################################################
-
-# func_convert_core_file_wine_to_w32 ARG
-# Helper function used by file name conversion functions when $build is *nix,
-# and $host is mingw, cygwin, or some other w32 environment. Relies on a
-# correctly configured wine environment available, with the winepath program
-# in $build's $PATH.
-#
-# ARG is the $build file name to be converted to w32 format.
-# Result is available in $func_convert_core_file_wine_to_w32_result, and will
-# 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"
-  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
-    # command is not found, the shell will set an exit code of 127 and print
-    # *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
-      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-        $SED -e "$lt_sed_naive_backslashify"`
-    else
-      func_convert_core_file_wine_to_w32_result=
-    fi
-  fi
-}
-# end: func_convert_core_file_wine_to_w32
-
-
-# func_convert_core_path_wine_to_w32 ARG
-# Helper function used by path conversion functions when $build is *nix, and
-# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
-# configured wine environment available, with the winepath program in $build's
-# $PATH. Assumes ARG has no leading or trailing path separator characters.
-#
-# ARG is path to be converted from $build format to win32.
-# Result is available in $func_convert_core_path_wine_to_w32_result.
-# Unconvertible file (directory) names in ARG are skipped; if no directory names
-# are convertible, then the result may be empty.
-func_convert_core_path_wine_to_w32 ()
-{
-  $opt_debug
-  # unfortunately, winepath doesn't convert paths, only file names
-  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 -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"
-        else
-          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
-        fi
-      fi
-    done
-    IFS=$oldIFS
-  fi
-}
-# end: func_convert_core_path_wine_to_w32
-
-
-# func_cygpath ARGS...
-# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
-# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
-# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
-# (2), returns the Cygwin file name or path in func_cygpath_result (input
-# file name or path is assumed to be in w32 format, as previously converted
-# from $build's *nix or MSYS format). In case (3), returns the w32 file name
-# or path in func_cygpath_result (input file name or path is assumed to be in
-# Cygwin format). Returns an empty string on error.
-#
-# ARGS are passed to cygpath, with the last one being the file name or path to
-# be converted.
-#
-# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
-# environment variable; do not put it in $PATH.
-func_cygpath ()
-{
-  $opt_debug
-  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
-    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
-    if test "$?" -ne 0; then
-      # on failure, ensure result is empty
-      func_cygpath_result=
-    fi
-  else
-    func_cygpath_result=
-    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
-  fi
-}
-#end: func_cygpath
-
-
-# func_convert_core_msys_to_w32 ARG
-# Convert file name or path ARG from MSYS format to w32 format.  Return
-# result in func_convert_core_msys_to_w32_result.
-func_convert_core_msys_to_w32 ()
-{
-  $opt_debug
-  # 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"`
-}
-#end: func_convert_core_msys_to_w32
-
-
-# func_convert_file_check ARG1 ARG2
-# Verify that ARG1 (a file name in $build format) was converted to $host
-# format in ARG2. Otherwise, emit an error message, but continue (resetting
-# func_to_host_file_result to ARG1).
-func_convert_file_check ()
-{
-  $opt_debug
-  if test -z "$2" && test -n "$1" ; then
-    func_error "Could not determine host file name corresponding to"
-    func_error "  \`$1'"
-    func_error "Continuing, but uninstalled executables may not work."
-    # Fallback:
-    func_to_host_file_result="$1"
-  fi
-}
-# end func_convert_file_check
-
-
-# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
-# Verify that FROM_PATH (a path in $build format) was converted to $host
-# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
-# func_to_host_file_result to a simplistic fallback value (see below).
-func_convert_path_check ()
-{
-  $opt_debug
-  if test -z "$4" && test -n "$3"; then
-    func_error "Could not determine the host path corresponding to"
-    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.
-    if test "x$1" != "x$2"; then
-      lt_replace_pathsep_chars="s|$1|$2|g"
-      func_to_host_path_result=`echo "$3" |
-        $SED -e "$lt_replace_pathsep_chars"`
-    else
-      func_to_host_path_result="$3"
-    fi
-  fi
-}
-# end func_convert_path_check
-
-
-# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
-# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
-# and appending REPL if ORIG matches BACKPAT.
-func_convert_path_front_back_pathsep ()
-{
-  $opt_debug
-  case $4 in
-  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
-    ;;
-  esac
-  case $4 in
-  $2 ) func_append func_to_host_path_result "$3"
-    ;;
-  esac
-}
-# end func_convert_path_front_back_pathsep
-
-
-##################################################
-# $build to $host FILE NAME CONVERSION FUNCTIONS #
-##################################################
-# 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.
-
-
-# func_to_host_file ARG
-# Converts the file name ARG from $build format to $host format. Return result
-# in func_to_host_file_result.
-func_to_host_file ()
-{
-  $opt_debug
-  $to_host_file_cmd "$1"
-}
-# end func_to_host_file
-
-
-# func_to_tool_file ARG LAZY
-# converts the file name ARG from $build format to toolchain format. Return
-# result in func_to_tool_file_result.  If the conversion in use is listed
-# in (the comma separated) LAZY, no conversion takes place.
-func_to_tool_file ()
-{
-  $opt_debug
-  case ,$2, in
-    *,"$to_tool_file_cmd",*)
-      func_to_tool_file_result=$1
-      ;;
-    *)
-      $to_tool_file_cmd "$1"
-      func_to_tool_file_result=$func_to_host_file_result
-      ;;
-  esac
-}
-# end func_to_tool_file
-
-
-# func_convert_file_noop ARG
-# Copy ARG to func_to_host_file_result.
-func_convert_file_noop ()
-{
-  func_to_host_file_result="$1"
-}
-# end func_convert_file_noop
-
-
-# func_convert_file_msys_to_w32 ARG
-# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_file_result.
-func_convert_file_msys_to_w32 ()
-{
-  $opt_debug
-  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"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_w32
-
-
-# func_convert_file_cygwin_to_w32 ARG
-# Convert file name ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_file_cygwin_to_w32 ()
-{
-  $opt_debug
-  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.
-    func_to_host_file_result=`cygpath -m "$1"`
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_cygwin_to_w32
-
-
-# func_convert_file_nix_to_w32 ARG
-# Convert file name ARG from *nix to w32 format.  Requires a wine environment
-# 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"
-  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"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_w32
-
-
-# func_convert_file_msys_to_cygwin ARG
-# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_file_msys_to_cygwin ()
-{
-  $opt_debug
-  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"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_cygwin
-
-
-# func_convert_file_nix_to_cygwin ARG
-# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
-# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
-# in func_to_host_file_result.
-func_convert_file_nix_to_cygwin ()
-{
-  $opt_debug
-  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"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_cygwin
-
-
-#############################################
-# $build to $host PATH CONVERSION FUNCTIONS #
-#############################################
-# 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.
-#
-# Path separators are also converted from $build format to $host format.  If
-# ARG begins or ends with a path separator character, it is preserved (but
-# converted to $host format) on output.
-#
-# All path conversion functions are named using the following convention:
-#   file name conversion function    : func_convert_file_X_to_Y ()
-#   path conversion function         : func_convert_path_X_to_Y ()
-# where, for any given $build/$host combination the 'X_to_Y' value is the
-# same.  If conversion functions are added for new $build/$host combinations,
-# the two new functions must follow this pattern, or func_init_to_host_path_cmd
-# will break.
-
-
-# func_init_to_host_path_cmd
-# Ensures that function "pointer" variable $to_host_path_cmd is set to the
-# appropriate value, based on the value of $to_host_file_cmd.
-to_host_path_cmd=
-func_init_to_host_path_cmd ()
-{
-  $opt_debug
-  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}"
-  fi
-}
-
-
-# func_to_host_path ARG
-# Converts the path ARG from $build format to $host format. Return result
-# in func_to_host_path_result.
-func_to_host_path ()
-{
-  $opt_debug
-  func_init_to_host_path_cmd
-  $to_host_path_cmd "$1"
-}
-# end func_to_host_path
-
-
-# func_convert_path_noop ARG
-# Copy ARG to func_to_host_path_result.
-func_convert_path_noop ()
-{
-  func_to_host_path_result="$1"
-}
-# end func_convert_path_noop
-
-
-# func_convert_path_msys_to_w32 ARG
-# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_path_result.
-func_convert_path_msys_to_w32 ()
-{
-  $opt_debug
-  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 ';.';
-    # and winepath ignores them completely.
-    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_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_msys_to_w32
-
-
-# func_convert_path_cygwin_to_w32 ARG
-# Convert path ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_path_cygwin_to_w32 ()
-{
-  $opt_debug
-  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_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_cygwin_to_w32
-
-
-# func_convert_path_nix_to_w32 ARG
-# Convert path ARG from *nix to w32 format.  Requires a wine environment and
-# 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"
-  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_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_nix_to_w32
-
-
-# func_convert_path_msys_to_cygwin ARG
-# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_path_msys_to_cygwin ()
-{
-  $opt_debug
-  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_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_msys_to_cygwin
-
-
-# func_convert_path_nix_to_cygwin ARG
-# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
-# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
-# func_to_host_file_result.
-func_convert_path_nix_to_cygwin ()
-{
-  $opt_debug
-  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 ';.', and winepath ignores them completely.
-    func_stripname : : "$1"
-    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_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_nix_to_cygwin
-
-
-# func_mode_compile arg...
-func_mode_compile ()
-{
-    $opt_debug
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-    pie_flag=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  test -n "$libobj" && \
-	    func_fatal_error "you cannot specify \`-o' more than once"
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-pie | -fpie | -fPIE)
-          func_append pie_flag " $arg"
-	  continue
-	  ;;
-
-	-shared | -static | -prefer-pic | -prefer-non-pic)
-	  func_append later " $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  func_stripname '-Wc,' '' "$arg"
-	  args=$func_stripname_result
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
-	  for arg in $args; do
-	    IFS="$save_ifs"
-	    func_append_quoted lastarg "$arg"
-	  done
-	  IFS="$save_ifs"
-	  func_stripname ' ' '' "$lastarg"
-	  lastarg=$func_stripname_result
-
-	  # Add the arguments to base_compile.
-	  func_append base_compile " $lastarg"
-	  continue
-	  ;;
-
-	*)
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      func_append_quoted base_compile "$lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      func_fatal_error "you must specify an argument for -Xcompile"
-      ;;
-    target)
-      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"
-      }
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    case $libobj in
-    *.[cCFSifmso] | \
-    *.ada | *.adb | *.ads | *.asm | \
-    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
-      func_xform "$libobj"
-      libobj=$func_xform_result
-      ;;
-    esac
-
-    case $libobj in
-    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
-    *)
-      func_fatal_error "cannot determine name of library object from \`$libobj'"
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
-	build_old_libs=no
-	continue
-	;;
-
-      -static)
-	build_libtool_libs=no
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    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_dirname_and_basename "$obj" "/" ""
-    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
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2* | cegcc*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # 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"
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $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
-      if test -f "$lockfile"; then
-	$ECHO "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-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
-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."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-      func_append removelist " $output_obj"
-      $ECHO "$srcfile" > "$lockfile"
-    fi
-
-    $opt_dry_run || $RM $removelist
-    func_append removelist " $lockfile"
-    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
-
-    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
-    srcfile=$func_to_tool_file_result
-    func_quote_for_eval "$srcfile"
-    qsrcfile=$func_quote_for_eval_result
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      func_mkdir_p "$xdir$objdir"
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	func_append command " -o $lobj"
-      fi
-
-      func_show_eval_locale "$command"	\
-          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-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
-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."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	func_show_eval '$MV "$output_obj" "$lobj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-	suppress_output=' >/dev/null 2>&1'
-      fi
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile$pie_flag"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	func_append command " -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      func_append command "$suppress_output"
-      func_show_eval_locale "$command" \
-        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-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
-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."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	func_show_eval '$MV "$output_obj" "$obj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-    fi
-
-    $opt_dry_run || {
-      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
-
-      # Unlock the critical section if it was locked
-      if test "$need_locks" != no; then
-	removelist=$lockfile
-        $RM "$lockfile"
-      fi
-    }
-
-    exit $EXIT_SUCCESS
-}
-
-$opt_help || {
-  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
-}
-
-func_mode_help ()
-{
-    # We need to display help for each of the modes.
-    case $opt_mode in
-      "")
-        # Generic help is extracted from the usage comments
-        # at the start of this file.
-        func_help
-        ;;
-
-      clean)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-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
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      compile)
-      $ECHO \
-"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -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
-  -Wc,FLAG          pass FLAG directly to the compiler
-
-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'."
-        ;;
-
-      execute)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-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
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-        ;;
-
-      finish)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-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."
-        ;;
-
-      install)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The following components of INSTALL-COMMAND are treated specially:
-
-  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-        ;;
-
-      link)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -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
-  -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
-                    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -shared           only do dynamic linking of libtool libraries
-  -shrext SUFFIX    override the standard shared library file extension
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
-  -weak LIBNAME     declare that the target provides the LIBNAME interface
-  -Wc,FLAG
-  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
-  -Wl,FLAG
-  -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.
-
-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
-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 \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-        ;;
-
-      uninstall)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-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
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      *)
-        func_fatal_help "invalid operation mode \`$opt_mode'"
-        ;;
-    esac
-
-    echo
-    $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
-    func_mode_help
-  else
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-	func_mode_help
-      done
-    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-	echo
-	func_mode_help
-      done
-    } |
-    sed '1d
-      /^When reporting/,/^Report/{
-	H
-	d
-      }
-      $x
-      /information about other modes/d
-      /more detailed .*MODE/d
-      s/^Usage:.*--mode=$[^ ]*$ .*/Description of \1 mode:/'
-  fi
-  exit $?
-fi
-
-
-# func_mode_execute arg...
-func_mode_execute ()
-{
-    $opt_debug
-    # The first argument is the command name.
-    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"
-
-      dir=
-      case $file in
-      *.la)
-	func_resolve_sysroot "$file"
-	file=$func_resolve_sysroot_result
-
-	# 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"
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-	func_source "$file"
-
-	# Skip this library if it cannot be dlopened.
-	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'"
-	  continue
-	fi
-
-	func_dirname "$file" "" "."
-	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'"
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
-	;;
-
-      *)
-	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"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -* | *.la | *.lo ) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if func_ltwrapper_script_p "$file"; then
-	  func_source "$file"
-	  # Transform arg to wrapped name.
-	  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"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      func_append_quoted args "$file"
-    done
-
-    if test "X$opt_dry_run" = Xfalse; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-	eval "if test \"\${save_$lt_var+set}\" = set; then
-                $lt_var=\$save_$lt_var; export $lt_var
-	      else
-		$lt_unset $lt_var
-	      fi"
-      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
-    fi
-}
-
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
-
-
-# func_mode_finish arg...
-func_mode_finish ()
-{
-    $opt_debug
-    libs=
-    libdirs=
-    admincmds=
-
-    for opt in "$nonopt" ${1+"$@"}
-    do
-      if test -d "$opt"; then
-	func_append libdirs " $opt"
-
-      elif test -f "$opt"; then
-	if func_lalib_unsafe_p "$opt"; then
-	  func_append libs " $opt"
-	else
-	  func_warning "\`$opt' is not a valid libtool archive"
-	fi
-
-      else
-	func_fatal_error "invalid argument \`$opt'"
-      fi
-    done
-
-    if test -n "$libs"; then
-      if test -n "$lt_sysroot"; then
-        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
-        sysroot_cmd="s/$[ ']$$sysroot_regex/\1/g;"
-      else
-        sysroot_cmd=
-      fi
-
-      # Remove sysroot references
-      if $opt_dry_run; then
-        for lib in $libs; do
-          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 \
-	    > $tmpdir/tmp-la
-	  mv -f $tmpdir/tmp-la $lib
-	done
-        ${RM}r "$tmpdir"
-      fi
-    fi
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
-'"$cmd"'"'
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || func_append admincmds "
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    $opt_silent && exit $EXIT_SUCCESS
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      echo "----------------------------------------------------------------------"
-      echo "Libraries have been installed in:"
-      for libdir in $libdirs; do
-	$ECHO "   $libdir"
-      done
-      echo
-      echo "If you ever happen to want to link against installed libraries"
-      echo "in a given directory, LIBDIR, you must either use libtool, and"
-      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-      echo "flag during linking and do at least one of the following:"
-      if test -n "$shlibpath_var"; then
-	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-	echo "     during execution"
-      fi
-      if test -n "$runpath_var"; then
-	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-	echo "     during linking"
-      fi
-      if test -n "$hardcode_libdir_flag_spec"; then
-	libdir=LIBDIR
-	eval flag=\"$hardcode_libdir_flag_spec\"
-
-	$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'"
-      fi
-      echo
-
-      echo "See any operating system documentation about shared libraries for"
-      case $host in
-	solaris2.[6789]|solaris2.1[0-9])
-	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	  echo "pages."
-	  ;;
-	*)
-	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
-	  ;;
-      esac
-      echo "----------------------------------------------------------------------"
-    fi
-    exit $EXIT_SUCCESS
-}
-
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
-
-
-# func_mode_install arg...
-func_mode_install ()
-{
-    $opt_debug
-    # 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 ||
-       # Allow the use of GNU shtool's install command.
-       case $nonopt in *shtool*) :;; *) false;; esac; then
-      # Aesthetically quote it.
-      func_quote_for_eval "$nonopt"
-      install_prog="$func_quote_for_eval_result "
-      arg=$1
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    func_quote_for_eval "$arg"
-    func_append install_prog "$func_quote_for_eval_result"
-    install_shared_prog=$install_prog
-    case " $install_prog " in
-      *[\\\ /]cp\ *) install_cp=: ;;
-      *) install_cp=false ;;
-    esac
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    no_mode=:
-    for arg
-    do
-      arg2=
-      if test -n "$dest"; then
-	func_append files " $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f)
-	if $install_cp; then :; else
-	  prev=$arg
-	fi
-	;;
-      -g | -m | -o)
-	prev=$arg
-	;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# 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
-	    arg2=$install_override_mode
-	    no_mode=false
-	  fi
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      func_quote_for_eval "$arg"
-      func_append install_prog " $func_quote_for_eval_result"
-      if test -n "$arg2"; then
-	func_quote_for_eval "$arg2"
-      fi
-      func_append install_shared_prog " $func_quote_for_eval_result"
-    done
-
-    test -z "$install_prog" && \
-      func_fatal_help "you must specify an install program"
-
-    test -n "$prev" && \
-      func_fatal_help "the \`$prev' option requires an argument"
-
-    if test -n "$install_override_mode" && $no_mode; then
-      if $install_cp; then :; else
-	func_quote_for_eval "$install_override_mode"
-	func_append install_shared_prog " -m $func_quote_for_eval_result"
-      fi
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	func_fatal_help "no file or destination specified"
-      else
-	func_fatal_help "you must specify a destination"
-      fi
-    fi
-
-    # Strip any trailing slash from the destination.
-    func_stripname '' '/' "$dest"
-    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"
-      destname=
-    else
-      func_dirname_and_basename "$dest" "" "."
-      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"
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  func_fatal_help "\`$destdir' must be an absolute directory name"
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	func_append staticlibs " $file"
-	;;
-
-      *.la)
-	func_resolve_sysroot "$file"
-	file=$func_resolve_sysroot_result
-
-	# 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"
-
-	library_names=
-	old_library=
-	relink_command=
-	func_source "$file"
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) func_append current_libdirs " $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) func_append future_libdirs " $libdir" ;;
-	  esac
-	fi
-
-	func_dirname "$file" "/" ""
-	dir="$func_dirname_result"
-	func_append dir "$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  test "$inst_prefix_dir" = "$destdir" && \
-	    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.
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  func_warning "relinking \`$file'"
-	  func_show_eval "$relink_command" \
-	    '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"
-	  shift
-
-	  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"
-	  case $host_os in
-	  cygwin* | mingw* | pw32* | cegcc*)
-	    case $realname in
-	    *.dll.a)
-	      tstripme=""
-	      ;;
-	    esac
-	    ;;
-	  esac
-	  if test -n "$tstripme" && test -n "$striplib"; then
-	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      test "$linkname" != "$realname" \
-		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  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
-	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  func_lo2o "$destfile"
-	  staticdest=$func_lo2o_result
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	test -n "$destfile" && \
-	  func_show_eval "$install_prog $file $destfile" 'exit $?'
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  func_lo2o "$file"
-	  staticobj=$func_lo2o_result
-	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  func_basename "$file"
-	  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=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      func_stripname '' '.exe' "$file"
-	      file=$func_stripname_result
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin* | *mingw*)
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      wrapper=$func_ltwrapper_scriptname_result
-	    else
-	      func_stripname '' '.exe' "$file"
-	      wrapper=$func_stripname_result
-	    fi
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if func_ltwrapper_script_p "$wrapper"; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  func_source "$wrapper"
-
-	  # Check the variables that should have been set.
-	  test -z "$generated_by_libtool_version" && \
-	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
-
-	  finalize=yes
-	  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
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      func_warning "\`$lib' has not been installed in \`$libdir'"
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  func_source "$wrapper"
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    $opt_dry_run || {
-	      if test "$finalize" = yes; then
-	        tmpdir=`func_mktempdir`
-		func_basename "$file$stripped_ext"
-		file="$func_basename_result"
-	        outputname="$tmpdir/$file"
-	        # Replace the output file specification.
-	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
-
-	        $opt_silent || {
-	          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"
-		  $opt_dry_run || ${RM}r "$tmpdir"
-		  continue
-	        fi
-	        file="$outputname"
-	      else
-	        func_warning "cannot relink \`$file'"
-	      fi
-	    }
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$ECHO "$file$stripped_ext" | $SED "s%$[^/]*$$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    func_stripname '' '.exe' "$destfile"
-	    destfile=$func_stripname_result
-	    ;;
-	  esac
-	  ;;
-	esac
-	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
-	$opt_dry_run || if test -n "$outputname"; then
-	  ${RM}r "$tmpdir"
-	fi
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      func_basename "$file"
-      name="$func_basename_result"
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-      tool_oldlib=$func_to_tool_file_result
-
-      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
-      fi
-
-      # Do each command in the postinstall commands.
-      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
-    done
-
-    test -n "$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'
-    else
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
-
-
-# func_generate_dlsyms outputname originator pic_p
-# Extract symbols from dlprefiles and create ${outputname}S.o with
-# 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'`
-    my_dlsyms=
-
-    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-      if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	my_dlsyms="${my_outputname}S.c"
-      else
-	func_error "not configured to extract global symbols from dlpreopened files"
-      fi
-    fi
-
-    if test -n "$my_dlsyms"; then
-      case $my_dlsyms in
-      "") ;;
-      *.c)
-	# Discover the nlist of each of the dlfiles.
-	nlist="$output_objdir/${my_outputname}.nm"
-
-	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
-
-	# Parse the name list into a source file.
-	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 */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-#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
-   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
-
-/* External symbol declarations for the compiler. */\
-"
-
-	if test "$dlself" = yes; then
-	  func_verbose "generating symbol list for \`$output'"
-
-	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
-
-	  # Add our own program objects to the symbol list.
-	  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'"
-	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -n "$exclude_expsyms"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  if test -n "$export_symbols_regex"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  # Prepare the list of exported symbols
-	  if test -z "$export_symbols"; then
-	    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"'
-	      case $host in
-	      *cygwin* | *mingw* | *cegcc* )
-                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-	        ;;
-	      esac
-	    }
-	  else
-	    $opt_dry_run || {
-	      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
-	        *cygwin* | *mingw* | *cegcc* )
-	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-	          ;;
-	      esac
-	    }
-	  fi
-	fi
-
-	for dlprefile in $dlprefiles; do
-	  func_verbose "extracting global C symbols from \`$dlprefile'"
-	  func_basename "$dlprefile"
-	  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=""
-	        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
-	            func_basename "$dlprefile_dlname"
-	            dlprefile_dlbasename="$func_basename_result"
-	          else
-	            # no lafile. user explicitly requested -dlpreopen <import library>.
-	            $sharedlib_from_linklib_cmd "$dlprefile"
-	            dlprefile_dlbasename=$sharedlib_from_linklib_result
-	          fi
-	        fi
-	        $opt_dry_run || {
-	          if test -n "$dlprefile_dlbasename" ; then
-	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
-	          else
-	            func_warning "Could not compute DLL name from $name"
-	            eval '$ECHO ": $name " >> "$nlist"'
-	          fi
-	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
-	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
-	        }
-	      else # not an import lib
-	        $opt_dry_run || {
-	          eval '$ECHO ": $name " >> "$nlist"'
-	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	        }
-	      fi
-	    ;;
-	    *)
-	      $opt_dry_run || {
-	        eval '$ECHO ": $name " >> "$nlist"'
-	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	      }
-	    ;;
-          esac
-	done
-
-	$opt_dry_run || {
-	  # Make sure we have at least an empty file.
-	  test -f "$nlist" || : > "$nlist"
-
-	  if test -n "$exclude_expsyms"; then
-	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	    $MV "$nlist"T "$nlist"
-	  fi
-
-	  # Try sorting and uniquifying the output.
-	  if $GREP -v "^: " < "$nlist" |
-	      if sort -k 3 </dev/null >/dev/null 2>&1; then
-		sort -k 3
-	      else
-		sort +2
-	      fi |
-	      uniq > "$nlist"S; then
-	    :
-	  else
-	    $GREP -v "^: " < "$nlist" > "$nlist"S
-	  fi
-
-	  if test -f "$nlist"S; then
-	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
-	  else
-	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
-	  fi
-
-	  echo >> "$output_objdir/$my_dlsyms" "\
-
-/* The mapping between symbol names and symbols.  */
-typedef struct {
-  const char *name;
-  void *address;
-} lt_dlsymlist;
-extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
-LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
-  { \"$my_originator\", (void *) 0 },"
-
-	  case $need_lib_prefix in
-	  no)
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  *)
-	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  esac
-	  echo >> "$output_objdir/$my_dlsyms" "\
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_${my_prefix}_LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	} # !$opt_dry_run
-
-	pic_flag_for_symtable=
-	case "$compile_command " in
-	*" -static "*) ;;
-	*)
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
-	  *-*-hpux*)
-	    pic_flag_for_symtable=" $pic_flag"  ;;
-	  *)
-	    if test "X$my_pic_p" != Xno; then
-	      pic_flag_for_symtable=" $pic_flag"
-	    fi
-	    ;;
-	  esac
-	  ;;
-	esac
-	symtab_cflags=
-	for arg in $LTCFLAGS; do
-	  case $arg in
-	  -pie | -fpie | -fPIE) ;;
-	  *) func_append symtab_cflags " $arg" ;;
-	  esac
-	done
-
-	# Now compile the dynamic symbol file.
-	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"'
-
-	# Transform the symbol file into the correct name.
-	symfileobj="$output_objdir/${my_outputname}S.$objext"
-	case $host in
-	*cygwin* | *mingw* | *cegcc* )
-	  if test -f "$output_objdir/$my_outputname.def"; then
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	  else
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  fi
-	  ;;
-	*)
-	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  ;;
-	esac
-	;;
-      *)
-	func_fatal_error "unknown suffix for \`$my_dlsyms'"
-	;;
-      esac
-    else
-      # We keep going just in case the user didn't refer to
-      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-      # really was required.
-
-      # Nullify the symbol file.
-      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
-      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
-    fi
-}
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-# Despite the name, also deal with 64 bit binaries.
-func_win32_libid ()
-{
-  $opt_debug
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    # 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 '
-	    1,100{
-		/ I /{
-		    s,.*,import,
-		    p
-		    q
-		}
-	    }'`
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $ECHO "$win32_libid_type"
-}
-
-# func_cygming_dll_for_implib ARG
-#
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib ()
-{
-  $opt_debug
-  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
-}
-
-# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
-#
-# The is the core of a fallback implementation of a
-# platform-specific function to extract the name of the
-# DLL associated with the specified import library LIBNAME.
-#
-# SECTION_NAME is either .idata$6 or .idata$7, depending
-# on the platform and compiler that created the implib.
-#
-# Echos the name of the DLL associated with the
-# specified import library.
-func_cygming_dll_for_implib_fallback_core ()
-{
-  $opt_debug
-  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
-  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
-    $SED '/^Contents of section '"$match_literal"':/{
-      # Place marker at beginning of archive member dllname section
-      s/.*/====MARK====/
-      p
-      d
-    }
-    # These lines can sometimes be longer than 43 characters, but
-    # are always uninteresting
-    /:[	 ]*file format pe[i]\{,1\}-/d
-    /^In archive [^:]*:/d
-    # Ensure marker is printed
-    /^====MARK====/p
-    # Remove all lines with less than 43 characters
-    /^.\{43\}/!d
-    # From remaining lines, remove first 43 characters
-    s/^.\{43\}//' |
-    $SED -n '
-      # Join marker and all lines until next marker into a single line
-      /^====MARK====/ b para
-      H
-      $ b para
-      b
-      :para
-      x
-      s/\n//g
-      # Remove the marker
-      s/^====MARK====//
-      # Remove trailing dots and whitespace
-      s/[\. \t]*$//
-      # Print
-      /./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
-    # 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
-    # begins with a literal '.' or a single character followed by
-    # a '.'.
-    #
-    # Of those that remain, print the first one.
-    $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
-# import library ARG.
-#
-# This fallback implementation is for use when $DLLTOOL
-# does not support the --identify-strict option.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib_fallback ()
-{
-  $opt_debug
-  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
-    # ms-generated import library
-    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
-  else
-    # unknown
-    sharedlib_from_linklib_result=""
-  fi
-}
-
-
-# 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
-      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"
-	sleep 2
-      done
-    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
-      $opt_dry_run || rm -f "$lockfile"
-    fi
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
-    fi
-}
-
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    $opt_debug
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    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" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      func_basename "$my_xlib"
-      my_xlib="$func_basename_result"
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-	*" $my_xlib_u "*)
-	  func_arith $extracted_serial + 1
-	  extracted_serial=$func_arith_result
-	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
-	*) break ;;
-	esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
-
-      func_mkdir_p "$my_xdir"
-
-      case $host in
-      *-darwin*)
-	func_verbose "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	$opt_dry_run || {
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`basename "$darwin_archive"`
-	  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}"
-	      cd "$darwin_curdir"
-	      $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_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
-	      $LIPO -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    $RM -rf unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd $darwin_orig_dir
-	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	} # !$opt_dry_run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-	;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
-    done
-
-    func_extract_archives_result="$my_oldobjs"
-}
-
-
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# 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
-# the $objdir directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-	func_emit_wrapper_arg1=${1-no}
-
-	$ECHO "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='$sed_quote_subst'
-
-# Be Bourne compatible
-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
-  # 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
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variables:
-  generated_by_libtool_version='$macro_version'
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$ECHO are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    file=\"\$0\""
-
-    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
-    $ECHO "\
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-    ECHO=\"$qECHO\"
-  fi
-
-# 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
-# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
-# this pattern).
-#
-# There are only two supported options: --lt-debug and
-# --lt-dump-script. There is, deliberately, no --lt-help.
-#
-# The first argument to this parsing function should be the
-# script's $0 value, followed by "$@".
-lt_option_debug=
-func_parse_lt_options ()
-{
-  lt_script_arg0=\$0
-  shift
-  for lt_opt
-  do
-    case \"\$lt_opt\" in
-    --lt-debug) lt_option_debug=1 ;;
-    --lt-dump-script)
-        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
-        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
-        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
-        cat \"\$lt_dump_D/\$lt_dump_F\"
-        exit 0
-      ;;
-    --lt-*)
-        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
-        exit 1
-      ;;
-    esac
-  done
-
-  # Print the debug banner immediately:
-  if test -n \"\$lt_option_debug\"; then
-    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
-  fi
-}
-
-# Used when --lt-debug. Prints its arguments to stdout
-# (redirection is the responsibility of the caller)
-func_lt_dump_args ()
-{
-  lt_dump_args_N=1;
-  for lt_arg
-  do
-    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
-    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
-  done
-}
-
-# Core function for launching the target application
-func_exec_program_core ()
-{
-"
-  case $host in
-  # Backslashes separate directories on plain windows
-  *-*-mingw | *-*-os2* | *-cegcc*)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-    ;;
-
-  *)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-    ;;
-  esac
-  $ECHO "\
-      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-      exit 1
-}
-
-# A function to encapsulate launching the target application
-# Strips options in the --lt-* namespace from \$@ and
-# launches target application with the remaining arguments.
-func_exec_program ()
-{
-  case \" \$* \" in
-  *\\ --lt-*)
-    for lt_wr_arg
-    do
-      case \$lt_wr_arg in
-      --lt-*) ;;
-      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-      esac
-      shift
-    done ;;
-  esac
-  func_exec_program_core \${1+\"\$@\"}
-}
-
-  # Parse options
-  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
-  done
-
-  # Usually 'no', except on cygwin/mingw when embedded into
-  # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
-  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
-    # special case for '.'
-    if test \"\$thisdir\" = \".\"; then
-      thisdir=\`pwd\`
-    fi
-    # remove .libs from thisdir
-    case \"\$thisdir\" in
-    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
-    $objdir )   thisdir=. ;;
-    esac
-  fi
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; 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\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $MKDIR \"\$progdir\"
-    else
-      $RM \"\$progdir/\$file\"
-    fi"
-
-	  $ECHO "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$ECHO \"\$relink_command_output\" >&2
-	$RM \"\$progdir/\$file\"
-	exit 1
-      fi
-    fi
-
-    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $RM \"\$progdir/\$program\";
-      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $RM \"\$progdir/\$file\"
-  fi"
-	else
-	  $ECHO "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$ECHO "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# fixup the dll searchpath if we need to.
-	#
-	# Fix the DLL searchpath if we need to.  Do this before prepending
-	# to shlibpath, because on Windows, both are PATH and uninstalled
-	# libraries must come first.
-	if test -n "$dllsearchpath"; then
-	  $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $ECHO "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	$ECHO "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-      func_exec_program \${1+\"\$@\"}
-    fi
-  else
-    # The program doesn't exist.
-    \$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
-  fi
-fi\
-"
-}
-
-
-# func_emit_cwrapperexe_src
-# emit the source code for a wrapper executable on stdout
-# Must ONLY be called from within func_mode_link because
-# it depends on a number of variable set therein.
-func_emit_cwrapperexe_src ()
-{
-	cat <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-*/
-EOF
-	    cat <<"EOF"
-#ifdef _MSC_VER
-# define _CRT_SECURE_NO_DEPRECATE 1
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef _MSC_VER
-# include <direct.h>
-# include <process.h>
-# include <io.h>
-#else
-# include <unistd.h>
-# include <stdint.h>
-# ifdef __CYGWIN__
-#  include <io.h>
-# endif
-#endif
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-/* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
-# ifdef __STRICT_ANSI__
-int _putenv (const char *);
-# endif
-#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) ... */
-#endif
-
-/* portability defines, excluding path handling macros */
-#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__)
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-#elif defined(__CYGWIN__)
-# define HAVE_SETENV
-# define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
-#endif
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef S_IXOTH
-# define S_IXOTH 0
-#endif
-#ifndef S_IXGRP
-# define S_IXGRP 0
-#endif
-
-/* path handling portability macros */
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# define FOPEN_WB "wb"
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#ifndef FOPEN_WB
-# define FOPEN_WB "w"
-#endif
-#ifndef _O_BINARY
-# define _O_BINARY 0
-#endif
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-#if defined(LT_DEBUGWRAPPER)
-static int lt_debug = 1;
-#else
-static int lt_debug = 0;
-#endif
-
-const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
-
-void *xmalloc (size_t num);
-char *xstrdup (const char *string);
-const char *base_name (const char *name);
-char *find_executable (const char *wrapper);
-char *chase_symlinks (const char *pathspec);
-int make_executable (const char *path);
-int check_executable (const char *path);
-char *strendzap (char *str, const char *pat);
-void lt_debugprintf (const char *file, int line, const char *fmt, ...);
-void lt_fatal (const char *file, int line, const char *message, ...);
-static const char *nonnull (const char *s);
-static const char *nonempty (const char *s);
-void lt_setenv (const char *name, const char *value);
-char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_update_exe_path (const char *name, const char *value);
-void lt_update_lib_path (const char *name, const char *value);
-char **prepare_spawn (char **argv);
-void lt_dump_script (FILE *f);
-EOF
-
-	    cat <<EOF
-volatile 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
-              func_to_host_path "$temp_rpath"
-	      cat <<EOF
-const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
-EOF
-	    else
-	      cat <<"EOF"
-const char * LIB_PATH_VALUE   = "";
-EOF
-	    fi
-
-	    if test -n "$dllsearchpath"; then
-              func_to_host_path "$dllsearchpath:"
-	      cat <<EOF
-const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
-EOF
-	    else
-	      cat <<"EOF"
-const char * EXE_PATH_VARNAME = "";
-const char * EXE_PATH_VALUE   = "";
-EOF
-	    fi
-
-	    if test "$fast_install" = yes; then
-	      cat <<EOF
-const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
-EOF
-	    else
-	      cat <<EOF
-const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
-EOF
-	    fi
-
-
-	    cat <<"EOF"
-
-#define LTWRAPPER_OPTION_PREFIX         "--lt-"
-
-static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
-static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int  newargc;
-  char *tmp_pathspec;
-  char *actual_cwrapper_path;
-  char *actual_cwrapper_name;
-  char *target_name;
-  char *lt_argv_zero;
-  intptr_t rval = 127;
-
-  int i;
-
-  program_name = (char *) xstrdup (base_name (argv[0]));
-  newargz = XMALLOC (char *, argc + 1);
-
-  /* very simple arg parsing; don't want to rely on getopt
-   * also, copy all non cwrapper options to newargz, except
-   * argz[0], which is handled differently
-   */
-  newargc=0;
-  for (i = 1; i < argc; i++)
-    {
-      if (strcmp (argv[i], dumpscript_opt) == 0)
-	{
-EOF
-	    case "$host" in
-	      *mingw* | *cygwin* )
-		# make stdout use "unix" line endings
-		echo "          setmode(1,_O_BINARY);"
-		;;
-	      esac
-
-	    cat <<"EOF"
-	  lt_dump_script (stdout);
-	  return 0;
-	}
-      if (strcmp (argv[i], debug_opt) == 0)
-	{
-          lt_debug = 1;
-          continue;
-	}
-      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
-        {
-          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-             namespace, but it is not one of the ones we know about and
-             have already dealt with, above (inluding dump-script), then
-             report an error. Otherwise, targets might begin to believe
-             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-             namespace. The first time any user complains about this, we'll
-             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-             or a configure.ac-settable value.
-           */
-          lt_fatal (__FILE__, __LINE__,
-		    "unrecognized %s option: '%s'",
-                    ltwrapper_option_prefix, argv[i]);
-        }
-      /* otherwise ... */
-      newargz[++newargc] = xstrdup (argv[i]);
-    }
-  newargz[++newargc] = NULL;
-
-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");
-EOF
-	    cat <<"EOF"
-  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
-  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
-
-  tmp_pathspec = find_executable (argv[0]);
-  if (tmp_pathspec == NULL)
-    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
-  lt_debugprintf (__FILE__, __LINE__,
-                  "(main) found exe (before symlink chase) at: %s\n",
-		  tmp_pathspec);
-
-  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-  lt_debugprintf (__FILE__, __LINE__,
-                  "(main) found exe (after symlink chase) at: %s\n",
-		  actual_cwrapper_path);
-  XFREE (tmp_pathspec);
-
-  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
-  strendzap (actual_cwrapper_path, actual_cwrapper_name);
-
-  /* wrapper name transforms */
-  strendzap (actual_cwrapper_name, ".exe");
-  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
-  XFREE (actual_cwrapper_name);
-  actual_cwrapper_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  /* target_name transforms -- use actual target program name; might have lt- prefix */
-  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
-  strendzap (target_name, ".exe");
-  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
-  XFREE (target_name);
-  target_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(main) libtool target name: %s\n",
-		  target_name);
-EOF
-
-	    cat <<EOF
-  newargz[0] =
-    XMALLOC (char, (strlen (actual_cwrapper_path) +
-		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
-  strcpy (newargz[0], actual_cwrapper_path);
-  strcat (newargz[0], "$objdir");
-  strcat (newargz[0], "/");
-EOF
-
-	    cat <<"EOF"
-  /* stop here, and copy so we don't have to do this twice */
-  tmp_pathspec = xstrdup (newargz[0]);
-
-  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
-  strcat (newargz[0], actual_cwrapper_name);
-
-  /* DO want the lt- prefix here if it exists, so use target_name */
-  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
-  XFREE (tmp_pathspec);
-  tmp_pathspec = NULL;
-EOF
-
-	    case $host_os in
-	      mingw*)
-	    cat <<"EOF"
-  {
-    char* p;
-    while ((p = strchr (newargz[0], '\\')) != NULL)
-      {
-	*p = '/';
-      }
-    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
-      {
-	*p = '/';
-      }
-  }
-EOF
-	    ;;
-	    esac
-
-	    cat <<"EOF"
-  XFREE (target_name);
-  XFREE (actual_cwrapper_path);
-  XFREE (actual_cwrapper_name);
-
-  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
-  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
-     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
-     because on Windows, both *_VARNAMEs are PATH but uninstalled
-     libraries must come first. */
-  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
-  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-
-  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
-		  nonnull (lt_argv_zero));
-  for (i = 0; i < newargc; i++)
-    {
-      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
-		      i, nonnull (newargz[i]));
-    }
-
-EOF
-
-	    case $host_os in
-	      mingw*)
-		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);
-  if (rval == -1)
-    {
-      /* failed to start process */
-      lt_debugprintf (__FILE__, __LINE__,
-		      "(main) failed to launch target \"%s\": %s\n",
-		      lt_argv_zero, nonnull (strerror (errno)));
-      return 127;
-    }
-  return rval;
-EOF
-		;;
-	      *)
-		cat <<"EOF"
-  execv (lt_argv_zero, newargz);
-  return rval; /* =127, but avoids unused variable warning */
-EOF
-		;;
-	    esac
-
-	    cat <<"EOF"
-}
-
-void *
-xmalloc (size_t num)
-{
-  void *p = (void *) malloc (num);
-  if (!p)
-    lt_fatal (__FILE__, __LINE__, "memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
-			  string) : NULL;
-}
-
-const char *
-base_name (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return base;
-}
-
-int
-check_executable (const char *path)
-{
-  struct stat st;
-
-  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
-                  nonempty (path));
-  if ((!path) || (!*path))
-    return 0;
-
-  if ((stat (path, &st) >= 0)
-      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
-    return 1;
-  else
-    return 0;
-}
-
-int
-make_executable (const char *path)
-{
-  int rval = 0;
-  struct stat st;
-
-  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
-                  nonempty (path));
-  if ((!path) || (!*path))
-    return 0;
-
-  if (stat (path, &st) >= 0)
-    {
-      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
-    }
-  return rval;
-}
-
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise
-   Does not chase symlinks, even on platforms that support them.
-*/
-char *
-find_executable (const char *wrapper)
-{
-  int has_slash = 0;
-  const char *p;
-  const char *p_next;
-  /* static buffer for getcwd */
-  char tmp[LT_PATHMAX + 1];
-  int tmp_len;
-  char *concat_name;
-
-  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
-                  nonempty (wrapper));
-
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
-
-  /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable (concat_name))
-	return concat_name;
-      XFREE (concat_name);
-    }
-  else
-    {
-#endif
-      if (IS_DIR_SEPARATOR (wrapper[0]))
-	{
-	  concat_name = xstrdup (wrapper);
-	  if (check_executable (concat_name))
-	    return concat_name;
-	  XFREE (concat_name);
-	}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-    }
-#endif
-
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-      {
-	has_slash = 1;
-	break;
-      }
-  if (!has_slash)
-    {
-      /* no slashes; search PATH */
-      const char *path = getenv ("PATH");
-      if (path != NULL)
-	{
-	  for (p = path; *p; p = p_next)
-	    {
-	      const char *q;
-	      size_t p_len;
-	      for (q = p; *q; q++)
-		if (IS_PATH_SEPARATOR (*q))
-		  break;
-	      p_len = q - p;
-	      p_next = (*q == '\0' ? q : q + 1);
-	      if (p_len == 0)
-		{
-		  /* empty path: current directory */
-		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-                              nonnull (strerror (errno)));
-		  tmp_len = strlen (tmp);
-		  concat_name =
-		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, tmp, tmp_len);
-		  concat_name[tmp_len] = '/';
-		  strcpy (concat_name + tmp_len + 1, wrapper);
-		}
-	      else
-		{
-		  concat_name =
-		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, p, p_len);
-		  concat_name[p_len] = '/';
-		  strcpy (concat_name + p_len + 1, wrapper);
-		}
-	      if (check_executable (concat_name))
-		return concat_name;
-	      XFREE (concat_name);
-	    }
-	}
-      /* not found in PATH; assume curdir */
-    }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-              nonnull (strerror (errno)));
-  tmp_len = strlen (tmp);
-  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_name[tmp_len] = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
-
-  if (check_executable (concat_name))
-    return concat_name;
-  XFREE (concat_name);
-  return NULL;
-}
-
-char *
-chase_symlinks (const char *pathspec)
-{
-#ifndef S_ISLNK
-  return xstrdup (pathspec);
-#else
-  char buf[LT_PATHMAX];
-  struct stat s;
-  char *tmp_pathspec = xstrdup (pathspec);
-  char *p;
-  int has_symlinks = 0;
-  while (strlen (tmp_pathspec) && !has_symlinks)
-    {
-      lt_debugprintf (__FILE__, __LINE__,
-		      "checking path component for symlinks: %s\n",
-		      tmp_pathspec);
-      if (lstat (tmp_pathspec, &s) == 0)
-	{
-	  if (S_ISLNK (s.st_mode) != 0)
-	    {
-	      has_symlinks = 1;
-	      break;
-	    }
-
-	  /* search backwards for last DIR_SEPARATOR */
-	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
-	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    p--;
-	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    {
-	      /* no more DIR_SEPARATORS left */
-	      break;
-	    }
-	  *p = '\0';
-	}
-      else
-	{
-	  lt_fatal (__FILE__, __LINE__,
-		    "error accessing file \"%s\": %s",
-		    tmp_pathspec, nonnull (strerror (errno)));
-	}
-    }
-  XFREE (tmp_pathspec);
-
-  if (!has_symlinks)
-    {
-      return xstrdup (pathspec);
-    }
-
-  tmp_pathspec = realpath (pathspec, buf);
-  if (tmp_pathspec == 0)
-    {
-      lt_fatal (__FILE__, __LINE__,
-		"could not follow symlinks for %s", pathspec);
-    }
-  return xstrdup (tmp_pathspec);
-#endif
-}
-
-char *
-strendzap (char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert (str != NULL);
-  assert (pat != NULL);
-
-  len = strlen (str);
-  patlen = strlen (pat);
-
-  if (patlen <= len)
-    {
-      str += len - patlen;
-      if (strcmp (str, pat) == 0)
-	*str = '\0';
-    }
-  return str;
-}
-
-void
-lt_debugprintf (const char *file, int line, const char *fmt, ...)
-{
-  va_list args;
-  if (lt_debug)
-    {
-      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
-      va_start (args, fmt);
-      (void) vfprintf (stderr, fmt, args);
-      va_end (args);
-    }
-}
-
-static void
-lt_error_core (int exit_status, const char *file,
-	       int line, const char *mode,
-	       const char *message, va_list ap)
-{
-  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *file, int line, const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
-  va_end (ap);
-}
-
-static const char *
-nonnull (const char *s)
-{
-  return s ? s : "(null)";
-}
-
-static const char *
-nonempty (const char *s)
-{
-  return (s && !*s) ? "(empty)" : nonnull (s);
-}
-
-void
-lt_setenv (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_setenv) setting '%s' to '%s'\n",
-                  nonnull (name), nonnull (value));
-  {
-#ifdef HAVE_SETENV
-    /* always make a copy, for consistency with !HAVE_SETENV */
-    char *str = xstrdup (value);
-    setenv (name, str, 1);
-#else
-    int len = strlen (name) + 1 + strlen (value) + 1;
-    char *str = XMALLOC (char, len);
-    sprintf (str, "%s=%s", name, value);
-    if (putenv (str) != EXIT_SUCCESS)
-      {
-        XFREE (str);
-      }
-#endif
-  }
-}
-
-char *
-lt_extend_str (const char *orig_value, const char *add, int to_end)
-{
-  char *new_value;
-  if (orig_value && *orig_value)
-    {
-      int orig_value_len = strlen (orig_value);
-      int add_len = strlen (add);
-      new_value = XMALLOC (char, add_len + orig_value_len + 1);
-      if (to_end)
-        {
-          strcpy (new_value, orig_value);
-          strcpy (new_value + orig_value_len, add);
-        }
-      else
-        {
-          strcpy (new_value, add);
-          strcpy (new_value + add_len, orig_value);
-        }
-    }
-  else
-    {
-      new_value = xstrdup (add);
-    }
-  return new_value;
-}
-
-void
-lt_update_exe_path (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
-
-  if (name && *name && value && *value)
-    {
-      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]))
-        {
-          new_value[len-1] = '\0';
-        }
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-void
-lt_update_lib_path (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-EOF
-	    case $host_os in
-	      mingw*)
-		cat <<"EOF"
-
-/* Prepares an argument vector before calling spawn().
-   Note that spawn() does not by itself call the command interpreter
-     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
-      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-         GetVersionEx(&v);
-         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
-      }) ? "cmd.exe" : "command.com").
-   Instead it simply concatenates the arguments, separated by ' ', and calls
-   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
-   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
-   special way:
-   - Space and tab are interpreted as delimiters. They are not treated as
-     delimiters if they are surrounded by double quotes: "...".
-   - Unescaped double quotes are removed from the input. Their only effect is
-     that within double quotes, space and tab are treated like normal
-     characters.
-   - Backslashes not followed by double quotes are not special.
-   - But 2*n+1 backslashes followed by a double quote become
-     n backslashes followed by a double quote (n >= 0):
-       \" -> "
-       \\\" -> \"
-       \\\\\" -> \\"
- */
-#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-char **
-prepare_spawn (char **argv)
-{
-  size_t argc;
-  char **new_argv;
-  size_t i;
-
-  /* Count number of arguments.  */
-  for (argc = 0; argv[argc] != NULL; argc++)
-    ;
-
-  /* Allocate new argument vector.  */
-  new_argv = XMALLOC (char *, argc + 1);
-
-  /* Put quoted arguments into the new argument vector.  */
-  for (i = 0; i < argc; i++)
-    {
-      const char *string = argv[i];
-
-      if (string[0] == '\0')
-	new_argv[i] = xstrdup ("\"\"");
-      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
-	{
-	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
-	  size_t length;
-	  unsigned int backslashes;
-	  const char *s;
-	  char *quoted_string;
-	  char *p;
-
-	  length = 0;
-	  backslashes = 0;
-	  if (quote_around)
-	    length++;
-	  for (s = string; *s != '\0'; s++)
-	    {
-	      char c = *s;
-	      if (c == '"')
-		length += backslashes + 1;
-	      length++;
-	      if (c == '\\')
-		backslashes++;
-	      else
-		backslashes = 0;
-	    }
-	  if (quote_around)
-	    length += backslashes + 1;
-
-	  quoted_string = XMALLOC (char, length + 1);
-
-	  p = quoted_string;
-	  backslashes = 0;
-	  if (quote_around)
-	    *p++ = '"';
-	  for (s = string; *s != '\0'; s++)
-	    {
-	      char c = *s;
-	      if (c == '"')
-		{
-		  unsigned int j;
-		  for (j = backslashes + 1; j > 0; j--)
-		    *p++ = '\\';
-		}
-	      *p++ = c;
-	      if (c == '\\')
-		backslashes++;
-	      else
-		backslashes = 0;
-	    }
-	  if (quote_around)
-	    {
-	      unsigned int j;
-	      for (j = backslashes; j > 0; j--)
-		*p++ = '\\';
-	      *p++ = '"';
-	    }
-	  *p = '\0';
-
-	  new_argv[i] = quoted_string;
-	}
-      else
-	new_argv[i] = (char *) string;
-    }
-  new_argv[argc] = NULL;
-
-  return new_argv;
-}
-EOF
-		;;
-	    esac
-
-            cat <<"EOF"
-void lt_dump_script (FILE* f)
-{
-EOF
-	    func_emit_wrapper yes |
-	      $SED -n -e '
-s/^$.\{79\}$$..*$/\1\
-\2/
-h
-s/$[\\"]$/\\\1/g
-s/$/\\n/
-s/$[^\n]*$.*/  fputs ("\1", f);/p
-g
-D'
-            cat <<"EOF"
-}
-EOF
-}
-# end: func_emit_cwrapperexe_src
-
-# func_win32_import_lib_p ARG
-# True if ARG is an import lib, as indicated by $file_magic_cmd
-func_win32_import_lib_p ()
-{
-    $opt_debug
-    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
-    *import*) : ;;
-    *) false ;;
-    esac
-}
-
-# func_mode_link arg...
-func_mode_link ()
-{
-    $opt_debug
-    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
-      # 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
-      # 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.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args=$nonopt
-    base_compile="$nonopt $@"
-    compile_command=$nonopt
-    finalize_command=$nonopt
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-    new_inherited_linker_flags=
-
-    avoid_version=no
-    bindir=
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-    weak_libs=
-    single_module="${wl}-single_module"
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not 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
-	    func_warning "complete static linking is impossible in this configuration"
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	-static)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=built
-	  ;;
-	-static-libtool-libs)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	esac
-	build_libtool_libs=no
-	build_old_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      func_quote_for_eval "$arg"
-      qarg=$func_quote_for_eval_unquoted_result
-      func_append libtool_args " $func_quote_for_eval_result"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  func_append compile_command " @OUTPUT@"
-	  func_append finalize_command " @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	bindir)
-	  bindir="$arg"
-	  prev=
-	  continue
-	  ;;
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    func_append compile_command " @SYMFILE@"
-	    func_append finalize_command " @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      func_append dlfiles " $arg"
-	    else
-	      func_append dlprefiles " $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  test -f "$arg" \
-	    || func_fatal_error "symbol file \`$arg' does not exist"
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	framework)
-	  case $host in
-	    *-*-darwin*)
-	      case "$deplibs " in
-		*" $qarg.ltframework "*) ;;
-		*) func_append deplibs " $qarg.ltframework" # this is fixed later
-		   ;;
-	      esac
-	      ;;
-	  esac
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat "$save_arg"`
-	    do
-#	      func_append moreargs " $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if func_lalib_unsafe_p "$arg"; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		func_source "$arg"
-
-		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'"
-		fi
-
-		# Extract subdirectory from the argument.
-		func_dirname "$arg" "/" ""
-		xdir="$func_dirname_result"
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      func_append dlfiles " $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    func_append dlprefiles " $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  func_append libobjs " $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  func_append non_pic_objects " $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		else
-		  # If the PIC object exists, use it instead.
-		  # $xdir was prepended to $pic_object above.
-		  non_pic_object="$pic_object"
-		  func_append non_pic_objects " $non_pic_object"
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if $opt_dry_run; then
-		  # Extract subdirectory from the argument.
-		  func_dirname "$arg" "/" ""
-		  xdir="$func_dirname_result"
-
-		  func_lo2o "$arg"
-		  pic_object=$xdir$objdir/$func_lo2o_result
-		  non_pic_object=$xdir$func_lo2o_result
-		  func_append libobjs " $pic_object"
-		  func_append non_pic_objects " $non_pic_object"
-	        else
-		  func_fatal_error "\`$arg' is not a valid libtool object"
-		fi
-	      fi
-	    done
-	  else
-	    func_fatal_error "link input file \`$arg' does not exist"
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    func_fatal_error "only absolute run-paths are allowed"
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) func_append rpath " $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) func_append xrpath " $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	shrext)
-	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
-	weak)
-	  func_append weak_libs " $arg"
-	  prev=
-	  continue
-	  ;;
-	xcclinker)
-	  func_append linker_flags " $qarg"
-	  func_append compiler_flags " $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xcompiler)
-	  func_append compiler_flags " $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  func_append linker_flags " $qarg"
-	  func_append compiler_flags " $wl$qarg"
-	  prev=
-	  func_append compile_command " $wl$qarg"
-	  func_append finalize_command " $wl$qarg"
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  # See comment for -static flag below, for more details.
-	  func_append compile_command " $link_static_flag"
-	  func_append finalize_command " $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -bindir)
-	prev=bindir
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	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
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -framework)
-	prev=framework
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  func_append compile_command " $arg"
-	  func_append finalize_command " $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	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'"
-	  else
-	    func_fatal_error "need path for \`-L' option"
-	  fi
-	fi
-	func_resolve_sysroot "$func_stripname_result"
-	dir=$func_resolve_sysroot_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  test -z "$absdir" && \
-	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "* | *" $arg "*)
-	  # Will only happen for absolute or sysroot arguments
-	  ;;
-	*)
-	  # Preserve sysroot, but never include relative directories
-	  case $dir in
-	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
-	    *) func_append deplibs " -L$dir" ;;
-	  esac
-	  func_append lib_search_path " $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  ::) dllsearchpath=$dir;;
-	  *) func_append dllsearchpath ":$dir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) func_append dllsearchpath ":$testbindir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    func_append deplibs " System.ltframework"
-	    continue
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	func_append deplibs " $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      # Darwin uses the -arch flag to determine output architecture.
-      -model|-arch|-isysroot|--sysroot)
-	func_append compiler_flags " $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	prev=xcompiler
-	continue
-	;;
-
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-	func_append compiler_flags " $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	case "$new_inherited_linker_flags " in
-	    *" $arg "*) ;;
-	    * ) func_append new_inherited_linker_flags " $arg" ;;
-	esac
-	continue
-	;;
-
-      -multi_module)
-	single_module="${wl}-multi_module"
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-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"
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	func_stripname '-R' '' "$arg"
-	dir=$func_stripname_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	=*)
-	  func_stripname '=' '' "$dir"
-	  dir=$lt_sysroot$func_stripname_result
-	  ;;
-	*)
-	  func_fatal_error "only absolute run-paths are allowed"
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) func_append xrpath " $dir" ;;
-	esac
-	continue
-	;;
-
-      -shared)
-	# The effects of -shared are defined in a previous loop.
-	continue
-	;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -static | -static-libtool-libs)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -weak)
-        prev=weak
-	continue
-	;;
-
-      -Wc,*)
-	func_stripname '-Wc,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  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"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Wl,*)
-	func_stripname '-Wl,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  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"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # -msg_* for osf cc
-      -msg_*)
-	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-
-      # Flags to be passed through unchanged, with rationale:
-      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
-      # -r[0-9][0-9]*        specify processor for the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
-      # +DA*, +DD*           enable 64-bit mode for the HP compiler
-      # -q*                  compiler args for the IBM compiler
-      # -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
-      # @file                GCC response files
-      # -tp=*                Portland pgcc target processor selection
-      # --sysroot=*          for sysroot support
-      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-      -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)
-        func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-        func_append compile_command " $arg"
-        func_append finalize_command " $arg"
-        func_append compiler_flags " $arg"
-        continue
-        ;;
-
-      # Some other compiler flag.
-      -* | +*)
-        func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-
-      *.$objext)
-	# A standard object.
-	func_append objs " $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if func_lalib_unsafe_p "$arg"; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  func_source "$arg"
-
-	  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'"
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  func_dirname "$arg" "/" ""
-	  xdir="$func_dirname_result"
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		func_append dlfiles " $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      func_append dlprefiles " $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    func_append libobjs " $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    func_append non_pic_objects " $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  else
-	    # If the PIC object exists, use it instead.
-	    # $xdir was prepended to $pic_object above.
-	    non_pic_object="$pic_object"
-	    func_append non_pic_objects " $non_pic_object"
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if $opt_dry_run; then
-	    # Extract subdirectory from the argument.
-	    func_dirname "$arg" "/" ""
-	    xdir="$func_dirname_result"
-
-	    func_lo2o "$arg"
-	    pic_object=$xdir$objdir/$func_lo2o_result
-	    non_pic_object=$xdir$func_lo2o_result
-	    func_append libobjs " $pic_object"
-	    func_append non_pic_objects " $non_pic_object"
-	  else
-	    func_fatal_error "\`$arg' is not a valid libtool object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	func_append deplibs " $arg"
-	func_append old_deplibs " $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	func_resolve_sysroot "$arg"
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  func_append dlfiles " $func_resolve_sysroot_result"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  func_append dlprefiles " $func_resolve_sysroot_result"
-	  prev=
-	else
-	  func_append deplibs " $func_resolve_sysroot_result"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# 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"
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-      fi
-    done # argument parsing loop
-
-    if test "$module" = yes ; then
-      # [Mandriva] dropping ld option "--no-undefined" which is wrong for plugins
-      linker_flags=`$ECHO "X $linker_flags" | $Xsed -e 's/ --no-undefined//'`
-      compiler_flags=`$ECHO "X $compiler_flags" | $Xsed -e 's/ -Wl,--no-undefined//'`
-    fi
-
-    test -n "$prev" && \
-      func_fatal_help "the \`$prevarg' option requires an argument"
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      func_append compile_command " $arg"
-      func_append finalize_command " $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    func_basename "$output"
-    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\'\`
-    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\"
-
-    func_dirname "$output" "/" ""
-    output_objdir="$func_dirname_result$objdir"
-    func_to_tool_file "$output_objdir/"
-    tool_output_objdir=$func_to_tool_file_result
-    # Create the object directory.
-    func_mkdir_p "$output_objdir"
-
-    # Determine the type of output
-    case $output in
-    "")
-      func_fatal_help "you must specify an output file"
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if $opt_preserve_dup_deps ; then
-	case "$libs " in
-	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	esac
-      fi
-      func_append libs " $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if $opt_duplicate_compiler_generated_deps; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
-	  esac
-	  func_append pre_post_deps " $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-
-    case $linkmode in
-    lib)
-	passes="conv dlpreopen link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-
-    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
-	## 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"
-      fi
-
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	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
-	# Collect and forward deplibs of preopened libtool libs
-	for lib in $dlprefiles; do
-	  # Ignore non-libtool-libs
-	  dependency_libs=
-	  func_resolve_sysroot "$lib"
-	  case $lib in
-	  *.la)	func_source "$func_resolve_sysroot_result" ;;
-	  esac
-
-	  # Collect preopened libtool deplibs, except any this library
-	  # has declared as weak libs
-	  for deplib in $dependency_libs; do
-	    func_basename "$deplib"
-            deplib_base=$func_basename_result
-	    case " $weak_libs " in
-	    *" $deplib_base "*) ;;
-	    *) func_append deplibs " $deplib" ;;
-	    esac
-	  done
-	done
-	libs="$dlprefiles"
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    func_append compiler_flags " $deplib"
-	    if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) func_append new_inherited_linker_flags " $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    func_warning "\`-l' is ignored for archives/objects"
-	    continue
-	  fi
-	  func_stripname '-l' '' "$deplib"
-	  name=$func_stripname_result
-	  if test "$linkmode" = lib; 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"
-	  fi
-	  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}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    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 $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if func_lalib_p "$lib"; then
-		  library_names=
-		  old_library=
-		  func_source "$lib"
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    func_dirname "$lib" "" "."
-		    ladir="$func_dirname_result"
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-		;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	*.ltframework)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    deplibs="$deplib $deplibs"
-	    if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) func_append new_inherited_linker_flags " $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && 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
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    func_stripname '-L' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    func_append newlib_search_path " $func_resolve_sysroot_result"
-	    ;;
-	  *)
-	    func_warning "\`-L' is ignored for archives/objects"
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    func_stripname '-R' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    dir=$func_resolve_sysroot_result
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) func_append xrpath " $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la)
-	  func_resolve_sysroot "$deplib"
-	  lib=$func_resolve_sysroot_result
-	  ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    # Linking convenience modules into shared libraries is allowed,
-	    # but linking other static libraries is non-portable.
-	    case " $dlpreconveniencelibs " in
-	    *" $deplib "*) ;;
-	    *)
-	      valid_a_lib=no
-	      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
-		  fi
-		;;
-		pass_all)
-		  valid_a_lib=yes
-		;;
-	      esac
-	      if test "$valid_a_lib" != yes; then
-		echo
-		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because the file extensions .$libext of this argument makes me believe"
-		echo "*** that it is just a static archive that I should not 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
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      func_append newdlprefiles " $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      func_append newdlfiles " $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  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
-
-	# 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_dirname "$lib" "" "."
-	ladir="$func_dirname_result"
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	inherited_linker_flags=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	func_source "$lib"
-
-	# Convert "-framework foo" to "foo.ltframework"
-	if test -n "$inherited_linker_flags"; then
-	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework $[^ $]*$/\1.ltframework/g'`
-	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
-	    case " $new_inherited_linker_flags " in
-	      *" $tmp_inherited_linker_flag "*) ;;
-	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
-	    esac
-	  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
-	  test -n "$dlopen" && func_append dlfiles " $dlopen"
-	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
-	fi
-
-	if test "$pass" = conv; 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'"
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    func_append convenience " $ladir/$objdir/$old_library"
-	    func_append old_convenience " $ladir/$objdir/$old_library"
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    func_fatal_error "\`$lib' is not a convenience library"
-	  fi
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    deplibs="$deplib $deplibs"
-	    if $opt_preserve_dup_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $deplib"
-	  done
-	  continue
-	fi # $pass = conv
-
-
-	# 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
-	  linklib=$old_library
-	else
-	  for l in $old_library $library_names; do
-	    linklib="$l"
-	  done
-	fi
-	if test -z "$linklib"; then
-	  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 -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    func_append dlprefiles " $lib $dependency_libs"
-	  else
-	    func_append newdlfiles " $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [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 "passing it literally to the linker, although it might fail"
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	func_basename "$lib"
-	laname="$func_basename_result"
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; 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"
-	  else
-	    dir="$lt_sysroot$libdir"
-	    absdir="$lt_sysroot$libdir"
-	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    # Remove this search path later
-	    func_append notinst_path " $abs_ladir"
-	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
-	    # Remove this search path later
-	    func_append notinst_path " $abs_ladir"
-	  fi
-	fi # $installed = yes
-	func_stripname 'lib' '.la' "$laname"
-	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'"
-	  fi
-	  case "$host" in
-	    # special handling for platforms with PE-DLLs.
-	    *cygwin* | *mingw* | *cegcc* )
-	      # Linker will automatically link against shared library if both
-	      # static and shared are present.  Therefore, ensure we extract
-	      # symbols from the import library if a shared library is present
-	      # (otherwise, the dlopen module name will be incorrect).  We do
-	      # this by putting the import library name into $newdlprefiles.
-	      # We recover the dlopen module name by 'saving' the la file
-	      # name in a special purpose variable, and (later) extracting the
-	      # dlname from the la file.
-	      if test -n "$dlname"; then
-	        func_tr_sh "$dir/$linklib"
-	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
-	        func_append newdlprefiles " $dir/$linklib"
-	      else
-	        func_append newdlprefiles " $dir/$old_library"
-	        # Keep a list of preopened convenience libraries to check
-	        # that they are being used correctly in the link pass.
-	        test -z "$libdir" && \
-	          func_append dlpreconveniencelibs " $dir/$old_library"
-	      fi
-	    ;;
-	    * )
-	      # Prefer using a static library (so that no silly _DYNAMIC symbols
-	      # are required to link).
-	      if test -n "$old_library"; then
-	        func_append newdlprefiles " $dir/$old_library"
-	        # Keep a list of preopened convenience libraries to check
-	        # that they are being used correctly in the link pass.
-	        test -z "$libdir" && \
-	          func_append dlpreconveniencelibs " $dir/$old_library"
-	      # Otherwise, use the dlname, so that lt_dlopen finds it.
-	      elif test -n "$dlname"; then
-	        func_append newdlprefiles " $dir/$dlname"
-	      else
-	        func_append newdlprefiles " $dir/$linklib"
-	      fi
-	    ;;
-	  esac
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; 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
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) func_stripname '-L' '' "$deplib"
-	         func_resolve_sysroot "$func_stripname_result"
-	         func_append newlib_search_path " $func_resolve_sysroot_result"
-		 ;;
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if $opt_preserve_dup_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { { test "$prefer_static_libs" = no ||
-	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
-	       test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath:" in
-	      *"$absdir:"*) ;;
-	      *) func_append temp_rpath "$absdir:" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) func_append compile_rpath " $absdir" ;;
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append finalize_rpath " $libdir" ;;
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes; then
-	  use_static_libs=no
-	fi
-	if test -n "$library_names" &&
-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
-	  case $host in
-	  *cygwin* | *mingw* | *cegcc*)
-	      # No point in relinking DLLs because paths are not encoded
-	      func_append notinst_deplibs " $lib"
-	      need_relink=no
-	    ;;
-	  *)
-	    if test "$installed" = no; then
-	      func_append notinst_deplibs " $lib"
-	      need_relink=yes
-	    fi
-	    ;;
-	  esac
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on some
-	  # systems (darwin).  Don't bleat about dlopened modules though!
-	  dlopenmodule=""
-	  for dlpremoduletest in $dlprefiles; do
-	    if test "X$dlpremoduletest" = "X$lib"; then
-	      dlopenmodule="$dlpremoduletest"
-	      break
-	    fi
-	  done
-	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-	    echo
-	    if test "$linkmode" = prog; then
-	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $ECHO "*** $linklib is not portable!"
-	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) func_append compile_rpath " $absdir" ;;
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append finalize_rpath " $libdir" ;;
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    shift
-	    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"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw* | *cegcc*)
-	        func_arith $current - $age
-		major=$func_arith_result
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    func_basename "$soroot"
-	    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_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_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		    *-*-unixware7*) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a (non-dlopened) module then we can not
-		    # link against it, someone is ignoring the earlier warnings
-		    if /usr/bin/file -L $add 2> /dev/null |
-			 $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
-			  echo
-			  echo "*** And there doesn't seem to be a static archive available"
-			  echo "*** The link will probably fail, sorry"
-			else
-			  add="$dir/$old_library"
-			fi
-		      elif test -n "$old_library"; then
-			add="$dir/$old_library"
-		      fi
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-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"
-	      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"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    [\\/]*)
-		      func_append add_dir " -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      func_fatal_configuration "unsupported hardcode properties"
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; 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
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) func_append finalize_shlibpath "$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$opt_mode" = relink; 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
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) func_append finalize_shlibpath "$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-		add="$inst_prefix_dir$libdir/$linklib"
-	      else
-		add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      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
-		  [\\/]*)
-		    func_append add_dir " -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; 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
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; 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 "*** I have the capability to make that library automatically link in when"
-	    echo "*** you link to this library.  But I can only do this if you have a"
-	    echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      echo "*** But as you try to build a module library, libtool will still create "
-	      echo "*** a static module, that should work as long as the dlopening application"
-	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		echo
-		echo "*** However, this would only work if libtool was able to extract symbol"
-		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		echo "*** not find such a program.  So, this module is probably useless."
-		echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) func_stripname '-R' '' "$libdir"
-	           temp_xrpath=$func_stripname_result
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) func_append xrpath " $temp_xrpath";;
-		   esac;;
-	      *) func_append temp_deplibs " $libdir";;
-	      esac
-	    done
-	    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"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    case $deplib in
-              -L*) func_stripname '-L' '' "$deplib"
-                   func_resolve_sysroot "$func_stripname_result";;
-              *) func_resolve_sysroot "$deplib" ;;
-            esac
-	    if $opt_preserve_dup_deps ; then
-	      case "$tmp_libs " in
-	      *" $func_resolve_sysroot_result "*)
-                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $func_resolve_sysroot_result"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      path=
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-	        func_resolve_sysroot "$deplib"
-	        deplib=$func_resolve_sysroot_result
-	        func_dirname "$deplib" "" "."
-		dir=$func_dirname_result
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [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"
-		  fi
-		  ;;
-		esac
-		if $GREP "^installed=no" $deplib > /dev/null; then
-		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
-		      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 -z "$darwin_install_name"; then
-                          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}"
-		      path=
-		    fi
-		  fi
-		  ;;
-		*)
-		  path="-L$absdir/$objdir"
-		  ;;
-		esac
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`
-		  test -z "$libdir" && \
-		    func_fatal_error "\`$deplib' is not a valid libtool archive"
-		  test "$absdir" != "$libdir" && \
-		    func_warning "\`$deplib' seems to be moved"
-
-		  path="-L$absdir"
-		fi
-		;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      if test "$pass" = link; then
-	if test "$linkmode" = "prog"; 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
-	# 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
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) func_append lib_search_path " $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) func_append tmp_libs " $deplib" ;;
-	      esac
-	      ;;
-	    *) func_append tmp_libs " $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  func_append tmp_libs " $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-    fi
-    if test "$linkmode" = prog || test "$linkmode" = lib; then
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for archives"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for archives" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for archives"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for archives"
-
-      test -n "$vinfo" && \
-	func_warning "\`-version-info/-version-number' is ignored for archives"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for archives"
-
-      test -n "$export_symbols$export_symbols_regex" && \
-	func_warning "\`-export-symbols' is ignored for archives"
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      func_append objs "$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	func_stripname 'lib' '.la' "$outputname"
-	name=$func_stripname_result
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	test "$module" = no && \
-	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
-
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  func_stripname '' '.la' "$outputname"
-	  name=$func_stripname_result
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  func_stripname '' '.la' "$outputname"
-	  libname=$func_stripname_result
-	fi
-	;;
-      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"
-	else
-	  echo
-	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
-	  $ECHO "*** objects $objs is not portable!"
-	  func_append libobjs " $objs"
-	fi
-      fi
-
-      test "$dlself" != no && \
-	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"
-
-      install_libdir="$1"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	test -n "$vinfo" && \
-	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
-
-	test -n "$release" && \
-	  func_warning "\`-release' is ignored for convenience libraries"
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	shift
-	IFS="$save_ifs"
-
-	test -n "$7" && \
-	  func_fatal_help "too many parameters to \`-version-info'"
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major="$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
-	  #
-	  case $version_type in
-	  # correct linux to gnu/linux during the next big refactor
-	  darwin|linux|osf|windows|none)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|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"
-	    lt_irix_increment=no
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$1"
-	  revision="$2"
-	  age="$3"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[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"
-	  ;;
-	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"
-	  ;;
-	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"
-	  ;;
-	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"
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  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"
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	irix | nonstopux)
-	  if test "X$lt_irix_increment" = "Xno"; then
-	    func_arith $current - $age
-	  else
-	    func_arith $current - $age + 1
-	  fi
-	  major=$func_arith_result
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    func_arith $revision - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  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"
-	  ;;
-
-	osf)
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  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
-	    func_arith $current - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  func_append verstring ":${current}.0"
-	  ;;
-
-	qnx)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  func_arith $current - $age
-	  major=$func_arith_result
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  func_fatal_configuration "unknown library version type \`$version_type'"
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    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
-	  major=
-	  versuffix=
-	  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
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-
-      fi
-
-      func_generate_dlsyms "$libname" "$libname" "yes"
-      func_append libobjs " $symfileobj"
-      test "X$libobjs" = "X " && libobjs=
-
-      if test "$opt_mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$ECHO "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext | *.gcno)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
-		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-		 then
-		   continue
-		 fi
-	       fi
-	       func_append removelist " $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	test -n "$removelist" && \
-	  func_show_eval "${RM}r \$removelist"
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	func_append oldlibs " $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      #for path in $notinst_path; do
-      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
-      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
-      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
-      #done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  func_replace_sysroot "$libdir"
-	  func_append temp_xrpath " -R$func_replace_sysroot_result"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_rpath " $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) func_append dlfiles " $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) func_append dlprefiles " $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    func_append deplibs " System.ltframework"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    ;;
-	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      func_append deplibs " -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# 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=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $opt_dry_run || $RM conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $opt_dry_run || $RM conftest
-	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    func_append newdeplibs " $i"
-		    i=""
-		    ;;
-		  esac
-		fi
-		if test -n "$i" ; then
-		  libname=`eval "\\$ECHO \"$libname_spec\""`
-		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		  set dummy $deplib_matches; shift
-		  deplib_match=$1
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    func_append newdeplibs " $i"
-		  else
-		    droppeddeps=yes
-		    echo
-		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		    echo "*** I have the capability to make that library automatically link in when"
-		    echo "*** you link to this library.  But I can only do this if you have a"
-		    echo "*** shared version of the library, which I believe you do not have"
-		    echo "*** because a test_compile did reveal that the linker did not use it for"
-		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-		;;
-	      *)
-		func_append newdeplibs " $i"
-		;;
-	      esac
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		$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
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      func_append newdeplibs " $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval "\\$ECHO \"$libname_spec\""`
-		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		    set dummy $deplib_matches; shift
-		    deplib_match=$1
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      func_append newdeplibs " $i"
-		    else
-		      droppeddeps=yes
-		      echo
-		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		      echo "*** I have the capability to make that library automatically link in when"
-		      echo "*** you link to this library.  But I can only do this if you have a"
-		      echo "*** shared version of the library, which you do not appear to have"
-		      echo "*** because a test_compile did reveal that the linker did not use this one"
-		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  echo
-		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-		  echo "*** make it link in!  You will probably need to install it or some"
-		  echo "*** library that it depends on before this library will be fully"
-		  echo "*** functional.  Installing it before continuing would be even better."
-		fi
-		;;
-	      *)
-		func_append newdeplibs " $i"
-		;;
-	      esac
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method; shift
-	  file_magic_regex=`expr "$deplibs_check_method" : "$1 $.*$"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  func_append newdeplibs " $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      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`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  if test "$want_nocaseglob" = yes; then
-		    shopt -s nocaseglob
-		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-		    $nocaseglob
-		  else
-		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-		  fi
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null |
-			 $GREP " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [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=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		echo
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      func_append newdeplibs " $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method; shift
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 $.*$"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  func_append newdeplibs " $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
-		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      func_append newdeplibs " $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		echo
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      func_append newdeplibs " $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  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
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
-	    done
-	  fi
-	  case $tmp_deplibs in
-	  *[!\	\ ]*)
-	    echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	    ;;
-	  esac
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library with the System framework
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    echo
-	    echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-	    echo "*** a static module, that should work as long as the dlopening"
-	    echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      echo
-	      echo "*** However, this would only work if libtool was able to extract symbol"
-	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      echo "*** not find such a program.  So, this module is probably useless."
-	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    echo "*** The inter-library dependencies that have been dropped here will be"
-	    echo "*** automatically added whenever a program is linked with this library"
-	    echo "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      echo
-	      echo "*** Since this library must not contain undefined symbols,"
-	      echo "*** because either the platform does not support them or"
-	      echo "*** it was explicitly requested with -no-undefined,"
-	      echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-      case $host in
-	*-*-darwin*)
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
-	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
-	  deplibs=`$ECHO " $deplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
-	  ;;
-      esac
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $deplibs " in
-	  *" -L$path/$objdir "*)
-	    func_append new_libs " -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) func_append new_libs " $deplib" ;;
-	  esac
-	  ;;
-	*) func_append new_libs " $deplib" ;;
-	esac
-      done
-      deplibs="$new_libs"
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      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.
-	# FIXME: should test the right _cmds variable.
-	case $archive_cmds in
-	  *\$LD\ *) wl= ;;
-        esac
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		func_replace_sysroot "$libdir"
-		libdir=$func_replace_sysroot_result
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		func_append dep_rpath " $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append perm_rpath " $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      func_append rpath "$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	shift
-	realname="$1"
-	shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	linknames=
-	for link
-	do
-	  func_append linknames " $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	test "X$libobjs" = "X " && libobjs=
-
-	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"
-	  func_append delfiles " $export_symbols"
-	fi
-
-	orig_export_symbols=
-	case $host_os in
-	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
-	      # 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"
-	      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"
-	    $opt_dry_run || $RM $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd1 in $cmds; do
-	      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
-		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
-		  try_normal_branch=yes
-		  eval cmd=\"$cmd1\"
-		  func_len " $cmd"
-		  len=$func_len_result
-		  ;;
-		*)
-		  try_normal_branch=no
-		  ;;
-	      esac
-	      if test "$try_normal_branch" = yes \
-		 && { test "$len" -lt "$max_cmd_len" \
-		      || test "$max_cmd_len" -le -1; }
-	      then
-		func_show_eval "$cmd" 'exit $?'
-		skipped_export=false
-	      elif test -n "$nm_file_list_spec"; then
-		func_basename "$output"
-		output_la=$func_basename_result
-		save_libobjs=$libobjs
-		save_output=$output
-		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"
-		func_verbose "creating $NM input file list: $output"
-		for obj in $save_libobjs; do
-		  func_to_tool_file "$obj"
-		  $ECHO "$func_to_tool_file_result"
-		done > "$output"
-		eval cmd=\"$cmd1\"
-		func_show_eval "$cmd" 'exit $?'
-		output=$save_output
-		libobjs=$save_libobjs
-		skipped_export=false
-	      else
-		# The command line is too long to execute in one step.
-		func_verbose "using reloadable object file for export list..."
-		skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	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"
-	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-	fi
-
-	if test "X$skipped_export" != "X:" && 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"
-	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	  # '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.
-	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,$.*$$[ \,].*$,s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-	  export_symbols=$output_objdir/$libname.def
-	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	fi
-
-	tmp_deplibs=
-	inst_prefix_arg=
-	for test_deplib in $deplibs; do
-	  case " $convenience " in
-	  *" $test_deplib "*) ;;
-	  *)
-	    if test -n "$inst_prefix_dir" && test "$inst_prefix_dir" != "/" && (echo "$test_deplib" | grep -- "$inst_prefix_dir" >/dev/null); then
-	    	func_append inst_prefix_arg " $test_deplib"
-	    else
-		func_append tmp_deplibs " $test_deplib"
-	    fi
-	    ;;
-	  esac
-	done
-	deplibs="$tmp_deplibs"
-	if test -n "$inst_prefix_arg"; then
-		deplibs="$inst_prefix_arg $deplibs"
-	fi
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec" &&
-	    test "$compiler_needs_object" = yes &&
-	    test -z "$libobjs"; then
-	    # extract the archives, so we have objects to list.
-	    # TODO: could optimize this to just extract one archive.
-	    whole_archive_flag_spec=
-	  fi
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    func_append generated " $gentop"
-
-	    func_extract_archives $gentop $convenience
-	    func_append libobjs " $func_extract_archives_result"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	fi
-
-	if test "$thread_safe" = yes && 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
-	  $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 -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    eval test_cmds=\"$archive_expsym_cmds\"
-	    cmds=$archive_expsym_cmds
-	  else
-	    eval test_cmds=\"$archive_cmds\"
-	    cmds=$archive_cmds
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" &&
-	   func_len " $test_cmds" &&
-	   len=$func_len_result &&
-	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise
-	  # or, if using GNU ld and skipped_export is not :, use a linker
-	  # script.
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-	  func_basename "$output"
-	  output_la=$func_basename_result
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  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
-	    func_verbose "creating GNU ld script: $output"
-	    echo 'INPUT (' > $output
-	    for obj in $save_libobjs
-	    do
-	      func_to_tool_file "$obj"
-	      $ECHO "$func_to_tool_file_result" >> $output
-	    done
-	    echo ')' >> $output
-	    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
-	    func_verbose "creating linker input file list: $output"
-	    : > $output
-	    set x $save_libobjs
-	    shift
-	    firstobj=
-	    if test "$compiler_needs_object" = yes; then
-	      firstobj="$1 "
-	      shift
-	    fi
-	    for obj
-	    do
-	      func_to_tool_file "$obj"
-	      $ECHO "$func_to_tool_file_result" >> $output
-	    done
-	    func_append delfiles " $output"
-	    func_to_tool_file "$output"
-	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
-	  else
-	    if test -n "$save_libobjs"; then
-	      func_verbose "creating reloadable object files..."
-	      output=$output_objdir/$output_la-${k}.$objext
-	      eval test_cmds=\"$reload_cmds\"
-	      func_len " $test_cmds"
-	      len0=$func_len_result
-	      len=$len0
-
-	      # Loop over the list of objects to be linked.
-	      for obj in $save_libobjs
-	      do
-		func_len " $obj"
-		func_arith $len + $func_len_result
-		len=$func_arith_result
-		if test "X$objlist" = X ||
-		   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
-		    # The first file doesn't have a previous command to add.
-		    reload_objs=$objlist
-		    eval concat_cmds=\"$reload_cmds\"
-		  else
-		    # All subsequent reloadable object files will link in
-		    # the last one created.
-		    reload_objs="$objlist $last_robj"
-		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
-		  fi
-		  last_robj=$output_objdir/$output_la-${k}.$objext
-		  func_arith $k + 1
-		  k=$func_arith_result
-		  output=$output_objdir/$output_la-${k}.$objext
-		  objlist=" $obj"
-		  func_len " $last_robj"
-		  func_arith $len0 + $func_len_result
-		  len=$func_arith_result
-		fi
-	      done
-	      # Handle the remaining objects by creating one last
-	      # reloadable object file.  All subsequent reloadable object
-	      # files will link in the last one created.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      reload_objs="$objlist $last_robj"
-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
-	      if test -n "$last_robj"; then
-	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
-	      fi
-	      func_append delfiles " $output"
-
-	    else
-	      output=
-	    fi
-
-	    if ${skipped_export-false}; then
-	      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.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
-	      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='~'
-	    for cmd in $concat_cmds; do
-	      IFS="$save_ifs"
-	      $opt_silent || {
-		  func_quote_for_expand "$cmd"
-		  eval "func_echo $func_quote_for_expand_result"
-	      }
-	      $opt_dry_run || eval "$cmd" || {
-		lt_exit=$?
-
-		# Restore the uninstalled library and exit
-		if test "$opt_mode" = relink; then
-		  ( cd "$output_objdir" && \
-		    $RM "${realname}T" && \
-		    $MV "${realname}U" "$realname" )
-		fi
-
-		exit $lt_exit
-	      }
-	    done
-	    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"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-
-          if ${skipped_export-false}; then
-	    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"
-	      $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"
-	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	      # '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.
-	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,$.*$$[ \,].*$,s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-	      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.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	      cmds=$archive_expsym_cmds
-	    else
-	      cmds=$archive_cmds
-	    fi
-	  fi
-	fi
-
-	if test -n "$delfiles"; then
-	  # Append the command to remove temporary files to $cmds.
-	  eval cmds=\"\$cmds~\$RM $delfiles\"
-	fi
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  func_append libobjs " $func_extract_archives_result"
-	  test "X$libobjs" = "X " && libobjs=
-	fi
-
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $opt_silent || {
-	    func_quote_for_expand "$cmd"
-	    eval "func_echo $func_quote_for_expand_result"
-	  }
-	  $opt_dry_run || eval "$cmd" || {
-	    lt_exit=$?
-
-	    # Restore the uninstalled library and exit
-	    if test "$opt_mode" = relink; then
-	      ( cd "$output_objdir" && \
-	        $RM "${realname}T" && \
-		$MV "${realname}U" "$realname" )
-	    fi
-
-	    exit $lt_exit
-	  }
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$opt_mode" = relink; 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
-	    if test -z "$whole_archive_flag_spec"; then
-	      func_show_eval '${RM}r "$gentop"'
-	    fi
-	  fi
-
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for objects"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for objects" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for objects"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for objects"
-
-      test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for objects"
-
-      test -n "$release" && \
-	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"
-
-	libobj=$output
-	func_lo2o "$libobj"
-	obj=$func_lo2o_result
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $opt_dry_run || $RM $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # 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 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'`
-	else
-	  gentop="$output_objdir/${obj}x"
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $convenience
-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-	fi
-      fi
-
-      # If we're not building shared, we need to use non_pic_objs
-      test "$build_libtool_libs" != yes && 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
-
-      output="$obj"
-      func_execute_cmds "$reload_cmds" 'exit $?'
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $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
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	func_execute_cmds "$reload_cmds" 'exit $?'
-      fi
-
-      if test -n "$gentop"; then
-	func_show_eval '${RM}r "$gentop"'
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) func_stripname '' '.exe' "$output"
-	          output=$func_stripname_result.exe;;
-      esac
-      test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for programs"
-
-      test -n "$release" && \
-	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."
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
-	;;
-      esac
-
-      case $host in
-      *-*-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
-	  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"
-	    ;;
-	  esac
-	fi
-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
-	;;
-      esac
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $compile_deplibs " in
-	  *" -L$path/$objdir "*)
-	    func_append new_libs " -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $compile_deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) func_append new_libs " $deplib" ;;
-	  esac
-	  ;;
-	*) func_append new_libs " $deplib" ;;
-	esac
-      done
-      compile_deplibs="$new_libs"
-
-
-      func_append compile_command " $compile_deplibs"
-      func_append finalize_command " $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_rpath " $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    func_append rpath " $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append perm_rpath " $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  ::) dllsearchpath=$libdir;;
-	  *) func_append dllsearchpath ":$libdir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) func_append dllsearchpath ":$testbindir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    func_append rpath " $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_perm_rpath " $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; 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"
-
-      # template prelinking step
-      if test -n "$prelink_cmds"; then
-	func_execute_cmds "$prelink_cmds" 'exit $?'
-      fi
-
-      wrappers_required=yes
-      case $host in
-      *cegcc* | *mingw32ce*)
-        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-        wrappers_required=no
-        ;;
-      *cygwin* | *mingw* )
-        if test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      *)
-        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      esac
-      if test "$wrappers_required" = no; then
-	# Replace the output file specification.
-	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	exit_status=0
-	func_show_eval "$link_command" 'exit_status=$?'
-
-	if test -n "$postlink_cmds"; then
-	  func_to_tool_file "$output"
-	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	  func_execute_cmds "$postlink_cmds" 'exit $?'
-	fi
-
-	# Delete the generated files.
-	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"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    func_append rpath "$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    func_append rpath "$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	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.
-	$opt_dry_run || $RM $output
-	# Link the executable and exit
-	func_show_eval "$link_command" 'exit $?'
-
-	if test -n "$postlink_cmds"; then
-	  func_to_tool_file "$output"
-	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	  func_execute_cmds "$postlink_cmds" 'exit $?'
-	fi
-
-	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
-
-      # Replace the output file specification.
-      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      func_show_eval "$link_command" 'exit $?'
-
-      if test -n "$postlink_cmds"; then
-	func_to_tool_file "$output_objdir/$outputname"
-	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	func_execute_cmds "$postlink_cmds" 'exit $?'
-      fi
-
-      # Now create the wrapper script.
-      func_verbose "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    func_quote_for_eval "$var_value"
-	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if not in dry run mode.
-      $opt_dry_run || {
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) func_stripname '' '.exe' "$output"
-	         output=$func_stripname_result ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    func_stripname '' '.exe' "$outputname"
-	    outputname=$func_stripname_result ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    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"
-	    $RM $cwrappersource $cwrapper
-	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_cwrapperexe_src > $cwrappersource
-
-	    # The wrapper executable is built using the $host compiler,
-	    # because it contains $host paths and files. If cross-
-	    # compiling, it, like the target executable, must be
-	    # executed on the $host or under an emulation environment.
-	    $opt_dry_run || {
-	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
-	      $STRIP $cwrapper
-	    }
-
-	    # Now, create the wrapper script for func_source use:
-	    func_ltwrapper_scriptname $cwrapper
-	    $RM $func_ltwrapper_scriptname_result
-	    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
-		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
-	      else
-		func_emit_wrapper no > $func_ltwrapper_scriptname_result
-	      fi
-	    }
-	  ;;
-	  * )
-	    $RM $output
-	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_wrapper no > $output
-	    chmod +x $output
-	  ;;
-	esac
-      }
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # 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"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    func_append oldobjs " $symfileobj"
-	  fi
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	func_append generated " $gentop"
-
-	func_extract_archives $gentop $addlibs
-	func_append oldobjs " $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-	cmds=$old_archive_from_new_cmds
-      else
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  func_append oldobjs " $func_extract_archives_result"
-	fi
-
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      func_basename "$obj"
-	      $ECHO "$func_basename_result"
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  echo "copying selected object files to avoid basename conflicts..."
-	  gentop="$output_objdir/${outputname}x"
-	  func_append generated " $gentop"
-	  func_mkdir_p "$gentop"
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    func_basename "$obj"
-	    objbase="$func_basename_result"
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		func_arith $counter + 1
-		counter=$func_arith_result
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      func_append oldobjs " $gentop/$newobj"
-	      ;;
-	    *) func_append oldobjs " $obj" ;;
-	    esac
-	  done
-	fi
-	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-	tool_oldlib=$func_to_tool_file_result
-	eval cmds=\"$old_archive_cmds\"
-
-	func_len " $cmds"
-	len=$func_len_result
-	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	elif test -n "$archiver_list_spec"; then
-	  func_verbose "using command file archive linking..."
-	  for obj in $oldobjs
-	  do
-	    func_to_tool_file "$obj"
-	    $ECHO "$func_to_tool_file_result"
-	  done > $output_objdir/$libname.libcmd
-	  func_to_tool_file "$output_objdir/$libname.libcmd"
-	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  func_verbose "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  eval test_cmds=\"$old_archive_cmds\"
-	  func_len " $test_cmds"
-	  len0=$func_len_result
-	  len=$len0
-	  for obj in $save_oldobjs
-	  do
-	    func_len " $obj"
-	    func_arith $len + $func_len_result
-	    len=$func_arith_result
-	    func_append objlist " $obj"
-	    if test "$len" -lt "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-		RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	      len=$len0
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      func_execute_cmds "$cmds" 'exit $?'
-    done
-
-    test -n "$generated" && \
-      func_show_eval "${RM}r$generated"
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      func_verbose "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  func_quote_for_eval "$var_value"
-	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	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=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; 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 -z "$install_libdir"; then
-	      break
-	    fi
-	    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"
-		func_resolve_sysroot "$deplib"
-		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_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      -L*)
-		func_stripname -L '' "$deplib"
-		func_replace_sysroot "$func_stripname_result"
-		func_append newdependency_libs " -L$func_replace_sysroot_result"
-		;;
-	      -R*)
-		func_stripname -R '' "$deplib"
-		func_replace_sysroot "$func_stripname_result"
-		func_append newdependency_libs " -R$func_replace_sysroot_result"
-		;;
-	      *) func_append newdependency_libs " $deplib" ;;
-	      esac
-	    done
-	    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`
-		test -z "$libdir" && \
-		  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"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-	      *.la)
-		# Only pass preopened files to the pseudo-archive (for
-		# eventual linking with the app. that links it) if we
-		# 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`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      esac
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      func_append newdlfiles " $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      func_append newdlprefiles " $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $RM $output
-	  # place dlname in correct position for cygwin
-	  # In fact, it would be nice if we could use this code for all target
-	  # systems that can't hard-code library paths into their executables
-	  # and that have no shared library path variable independent of PATH,
-	  # but it turns out we can't easily determine that from inspecting
-	  # libtool variables, so we have to hard-code the OSs to which it
-	  # applies here; at the moment, that means platforms that use the PE
-	  # object format with DLL files.  See the long comment at the top of
-	  # tests/bindir.at for full details.
-	  tdlname=$dlname
-	  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
-		func_relative_path "$install_libdir" "$bindir"
-		tdlname=$func_relative_path_result$dlname
-	      else
-		# Otherwise fall back on heuristic.
-		tdlname=../bin/$dlname
-	      fi
-	      ;;
-	  esac
-	  $ECHO > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags='$new_inherited_linker_flags'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Names of additional weak libraries provided by this library
-weak_library_names='$weak_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $ECHO >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      }
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-}
-
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
-    func_mode_link ${1+"$@"}
-
-
-# func_mode_uninstall arg...
-func_mode_uninstall ()
-{
-    $opt_debug
-    RM="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) func_append RM " $arg"; rmforce=yes ;;
-      -*) func_append RM " $arg" ;;
-      *) func_append files " $arg" ;;
-      esac
-    done
-
-    test -z "$RM" && \
-      func_fatal_help "you must specify an RM program"
-
-    rmdirs=
-
-    for file in $files; do
-      func_dirname "$file" "" "."
-      dir="$func_dirname_result"
-      if test "X$dir" = X.; then
-	odir="$objdir"
-      else
-	odir="$dir/$objdir"
-      fi
-      func_basename "$file"
-      name="$func_basename_result"
-      test "$opt_mode" = uninstall && odir="$dir"
-
-      # Remember odir for removal later, being careful to avoid duplicates
-      if test "$opt_mode" = clean; then
-	case " $rmdirs " in
-	  *" $odir "*) ;;
-	  *) func_append rmdirs " $odir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if { test -L "$file"; } >/dev/null 2>&1 ||
-	 { test -h "$file"; } >/dev/null 2>&1 ||
-	 test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if func_lalib_p "$file"; then
-	  func_source $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    func_append rmfiles " $odir/$n"
-	  done
-	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
-
-	  case "$opt_mode" in
-	  clean)
-	    case " $library_names " in
-	    *" $dlname "*) ;;
-	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
-	    esac
-	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
-	    ;;
-	  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'
-	    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'
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	    ;;
-	  esac
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if func_lalib_p "$file"; then
-
-	  # Read the .lo file
-	  func_source $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" &&
-	     test "$pic_object" != none; 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
-	    func_append rmfiles " $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$opt_mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    func_stripname '' '.exe' "$file"
-	    file=$func_stripname_result
-	    func_stripname '' '.exe' "$name"
-	    noexename=$func_stripname_result
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    func_append rmfiles " $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if func_ltwrapper_p "$file"; then
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      relink_command=
-	      func_source $func_ltwrapper_scriptname_result
-	      func_append rmfiles " $func_ltwrapper_scriptname_result"
-	    else
-	      relink_command=
-	      func_source $dir/$noexename
-	    fi
-
-	    # 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/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      func_append rmfiles " $odir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      func_show_eval "$RM $rmfiles" 'exit_status=1'
-    done
-
-    # 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"
-      fi
-    done
-
-    exit $exit_status
-}
-
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
-    func_mode_uninstall ${1+"$@"}
-
-test -z "$opt_mode" && {
-  help="$generic_help"
-  func_fatal_help "you must specify a MODE"
-}
-
-test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$opt_mode'"
-
-if test -n "$exec_cmd"; then
-  eval exec "$exec_cmd"
-  exit $EXIT_FAILURE
-fi
-
-exit $exit_status
-
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
-# vi:sw=2
-

grip-3.10.1.tar.gz/missing Deleted

@@ -1,190 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, 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.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-case "$1" in
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing - GNU libit 0.0"
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-  aclocal)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acinclude.m4' or \`configure.in'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`configure.in'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acconfig.h' or \`configure.in'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' configure.in`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  makeinfo)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0

grip-3.10.1.tar.gz/mkinstalldirs Deleted

grip-3.10.1.tar.gz/pixmaps/gcd.xpm Deleted

@@ -1,339 +0,0 @@
-/* XPM */
-static char * gcd_xpm[] = {
-"75 79 257 2",
-"  	c None",
-". 	c #020204",
-"+ 	c #237ED8",
-"@ 	c #820B1C",
-"# 	c #11447C",
-"$ 	c #88C0F4",
-"% 	c #48060F",
-"& 	c #864A84",
-"* 	c #1864B6",
-"= 	c #0B2440",
-"- 	c #AF84B5",
-"; 	c #4A457E",
-"> 	c #8C305C",
-", 	c #240205",
-"' 	c #11549C",
-") 	c #499FEC",
-"! 	c #C9C1DF",
-"~ 	c #422A4C",
-"{ 	c #B31225",
-"] 	c #95A9E1",
-"^ 	c #0F345E",
-"/ 	c #051425",
-"( 	c #D04E6C",
-"_ 	c #670A15",
-": 	c #C6E0FC",
-"< 	c #31437A",
-"[ 	c #538FD5",
-"} 	c #5265B1",
-"| 	c #C9638A",
-"1 	c #2E5398",
-"2 	c #729EEC",
-"3 	c #821B34",
-"4 	c #2B8FE4",
-"5 	c #3666AC",
-"6 	c #BC2C44",
-"7 	c #2B1527",
-"8 	c #C8A8CC",
-"9 	c #F9C0CB",
-"0 	c #9A0E1D",
-"a 	c #A9D3F4",
-"b 	c #B52039",
-"c 	c #1E74CC",
-"d 	c #170204",
-"e 	c #215498",
-"f 	c #2D2442",
-"g 	c #2A345E",
-"h 	c #20447C",
-"i 	c #4A192F",
-"j 	c #191426",
-"k 	c #661C34",
-"l 	c #DB2C44",
-"m 	c #D884A0",
-"n 	c #CBB3D4",
-"o 	c #3A7FD0",
-"p 	c #37060C",
-"q 	c #D25A74",
-"r 	c #2567BC",
-"s 	c #68264C",
-"t 	c #3E457D",
-"u 	c #475AA7",
-"v 	c #760B1A",
-"w 	c #1D2340",
-"x 	c #56A2EC",
-"y 	c #E2627C",
-"z 	c #67B0F3",
-"A 	c #154C8B",
-"B 	c #570914",
-"C 	c #165CA8",
-"D 	c #E9D1DC",
-"E 	c #103C6E",
-"F 	c #040B17",
-"G 	c #81142C",
-"H 	c #081C33",
-"I 	c #CD2038",
-"J 	c #E53C54",
-"K 	c #FADEE4",
-"L 	c #B5D6F4",
-"M 	c #F490A1",
-"N 	c #B2BEE8",
-"O 	c #3F91E3",
-"P 	c #72427C",
-"Q 	c #981524",
-"R 	c #290B18",
-"S 	c #C2DAF4",
-"T 	c #C2182E",
-"U 	c #391427",
-"V 	c #77B6F4",
-"W 	c #2C80D9",
-"X 	c #1B6BC1",
-"Y 	c #0D2C51",
-"Z 	c #304C8A",
-"` 	c #E89EB0",
-" .	c #5BABEE",
-"..	c #906AA8",
-"+.	c #484E92",
-"@.	c #D7C2D8",
-"#.	c #483869",
-"$.	c #160B16",
-"%.	c #F7B0BD",
-"&.	c #EE586D",
-"*.	c #F37386",
-"=.	c #8E0C1D",
-"-.	c #18447D",
-";.	c #96C6F4",
-">.	c #9C2E54",
-",.	c #175499",
-"'.	c #9DB7E9",
-").	c #EEC7D4",
-"!.	c #215CA7",
-"~.	c #761227",
-"{.	c #BADBF8",
-"].	c #EC5E74",
-"^.	c #0C0204",
-"/.	c #47111F",
-"(.	c #2C020B",
-"_.	c #E8485F",
-":.	c #671325",
-"<.	c #DBEBFC",
-"[.	c #3F549A",
-"}.	c #283D72",
-"|.	c #F57F91",
-"1.	c #3A88DE",
-"2.	c #B594C2",
-"3.	c #1F335E",
-"4.	c #0B1426",
-"5.	c #CE3E5C",
-"6.	c #C31E34",
-"7.	c #2776CC",
-"8.	c #3B2447",
-"9.	c #151E38",
-"0.	c #A44A7C",
-"a.	c #4E76C4",
-"b.	c #6E86D4",
-"c.	c #967AB4",
-"d.	c #B0A0CC",
-"e.	c #CA729C",
-"f.	c #E6F0FC",
-"g.	c #663767",
-"h.	c #625AA4",
-"i.	c #6E66B4",
-"j.	c #A11B37",
-"k.	c #A04274",
-"l.	c #B06494",
-"m.	c #3272C8",
-"n.	c #7E427C",
-"o.	c #B2B0D8",
-"p.	c #AA5284",
-"q.	c #A3CDF4",
-"r.	c #581831",
-"s.	c #DECEE4",
-"t.	c #6E7AC8",
-"u.	c #CC96B8",
-"v.	c #7E96DC",
-"w.	c #A69ECC",
-"x.	c #DA6C8C",
-"y.	c #F6A0AE",
-"z.	c #DBB6CF",
-"A.	c #B676A4",
-"B.	c #463058",
-"C.	c #62325C",
-"D.	c #FAD7DC",
-"E.	c #882448",
-"F.	c #573869",
-"G.	c #B03C64",
-"H.	c #E1344C",
-"I.	c #F26C80",
-"J.	c #4398EC",
-"K.	c #65A9EE",
-"L.	c #3498E4",
-"M.	c #46AAEC",
-"N.	c #271B33",
-"O.	c #262C50",
-"P.	c #370D1A",
-"Q.	c #3D4B8D",
-"R.	c #1D2D54",
-"S.	c #4A6EBC",
-"T.	c #CE6E94",
-"U.	c #4A223C",
-"V.	c #560F1E",
-"W.	c #6A4C88",
-"X.	c #F9B8C3",
-"Y.	c #EE5066",
-"Z.	c #3D69B4",
-"`.	c #CA2C40",
-" +	c #CAC7E4",
-".+	c #B9172C",
-"++	c #4E9AEC",
-"@+	c #214C89",
-"#+	c #D9A5BF",
-"$+	c #58569C",
-"%+	c #B64A7C",
-"&+	c #72396C",
-"*+	c #F698A6",
-"=+	c #2F88DF",
-"-+	c #F68899",
-";+	c #362E54",
-">+	c #F6A8B4",
-",+	c #D1E5FC",
-"'+	c #1E3C6C",
-")+	c #901326",
-"!+	c #544C8C",
-"~+	c #D7263D",
-"{+	c #3E76D4",
-"]+	c #70B4F4",
-"^+	c #7E8ED4",
-"/+	c #BCA2C8",
-"(+	c #D87694",
-"_+	c #A41429",
-":+	c #468AD8",
-"<+	c #8D4074",
-"[+	c #564684",
-"}+	c #A60E21",
-"|+	c #36335E",
-"1+	c #FAD1D6",
-"2+	c #533159",
-"3+	c #305AA8",
-"4+	c #BA5684",
-"5+	c #692241",
-"6+	c #E74259",
-"7+	c #3C1A34",
-"8+	c #EAA6BC",
-"9+	c #DACADF",
-"0+	c #5A1E3C",
-"a+	c #745AA0",
-"b+	c #2386D9",
-"c+	c #B68ABC",
-"d+	c #DC8AA4",
-"e+	c #B26A9C",
-"f+	c #BAB6DC",
-"g+	c #76325C",
-"h+	c #8DC6F4",
-"i+	c #58A6EC",
-"j+	c #7CBAF4",
-"k+	c #EEF6FC",
-"l+	c #336EC4",
-"m+	c #B82644",
-"n+	c #7E5290",
-"o+	c #1E7AD0",
-"p+	c #236EC2",
-"q+	c #A23664",
-"r+	c #425AA4",
-"s+	c #C02644",
-"t+	c #683E74",
-"u+	c #543E74",
-"v+	c #C8324C",
-"w+	c #BE3244",
-"x+	c #522949",
-"y+	c #3490E5",
-"z+	c #E25E7C",
-"A+	c #F26478",
-"B+	c #FAC8D1",
-"C+	c #343C70",
-"D+	c #72A6EC",
-"E+	c #CF263C",
-"F+	c #F67A8C",
-"G+	c #768ECC",
-"H+	c #367ACC",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . ^.. ^.^.^.^.^.d ^.^.d ^.^.^.^.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . . . ^.^.^.d d d d , , , , , , , d , d d d d d ^.^.. . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . ^.^.d , , , (.(.p p p p % p % p p p (.(.(., d d d ^.^.. . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . ^.^.d , , (.(.p % % B B B _ _ _ _ _ _ _ B B B % % p (., , d d ^.. . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . ^.^.d , , (.p % B _ _ v =.=.}+.+6 6 6 6 6 .+0 =.v _ _ _ B % p (., , d . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . ^.d d (.(.% B _ _ =.}+T H.&.*.-+>+%.X.X.X.%.>+|.A+J l { 0 @ _ B B p (., , d ^.. . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . ^.d d (.p % B _ v }+I Y.-+>+B+D.D.D.1+B+B+B+B+1+1+1+D.B+9 y.*.6+T 0 v _ % % (., d ^.. . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . ^.d , p p B _ @ { J |.%.1+D.B+%.*+|.A+_.J J J J 6+&.*.-+>+9 D.K 1+>+A+l }+v _ % p (., d ^.. . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . ^.d d , p % _ v { _.*+B+K B+*+I.J I { }+=.@ @ v v v @ =.0 }+T l Y.-+X.D.D.X.F+l }+v B % (., d ^.. . . . . . . . . . . . . . ",
-". . . . . . . . . . . . ^.^., (.% B v }+J M 1+D.B+|._..+0 v v _ _ B B B B B B B B B _ v v =.}+~+&.M 1+D.9 *.I =._ B p (.d d . . . . . . . . . . . . . ",
-". . . . . . . . . . . ^.d , (.% B @ I *.B+K 9 F+H.}+@ _ _ B % % p p p (.(.(.p p p p % % B B _ v =.{ J -+1+K %.Y.{ v B p (., ^.. . . . . . . . . . . . ",
-". . . . . . . . . . ^.^., p % _ 0 H.>+K 1+-+l }+v _ B % p (.(., , , d , d d d d d , , , (.p % % B _ @ { _.>+K D.|.I v B % (.d d ^.. . . . . . . . . . ",
-". . . . . . . . . ^.d , (.B _ { ].B+K X._.{ v _ B % p (., , d ^.^.^.^.^.^.^.^.^.^.^.d d d , , (.% % B _ =.I *.B+K >+H.=.B % (.d ^.. . . . . . . . . . ",
-". . . . . . . . ^.^., (.B _ }+I.1+D.M l =._ B % p , , d ^.^.^.^.. . . . . . . . . . . . ^.^.d d , (.p % B _ }+_.X.K X.6+=.B % (.d d . . . . . . . . . ",
-". . . . . . . ^.d d p % _ .+*.D.D.I..+@ _ % p , , ^.^.^.. . . . . . . . . . . . . . . . . . . ^.^.d , (.% % _ =.l y.K 9 6+=._ % (.d ^.. . . . . . . . ",
-". . . . . . . ^., (.% _ { F+D.1+I.{ _ B % (., d ^.^.. . . . . . . . . . . . . . . . . . . . . . . ^.^.d , p % B @ I *+D.9 _.=.B p (.d ^.. . . . . . . ",
-". . . . . . ^.d (.% _ }+A+D.1+&._+_ B p , d ^.^.. . . . . . . . . . . . . . . . . . . . . . . . . . ^.^.d , (.% B v I M K 9 H.@ B p , d . . . . . . . ",
-". . . . . ^.d , p B =._.1+1+]._+_ B p , d ^.^.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ^., , % B v I *+K %.I v B (., d . . . . . . ",
-". . . . . ^., p B v l X.K |.{ _ % p , d ^.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ^.d (.p B @ ~+%.K -+{ _ % (.d ^.. . . . . ",
-". . . . ^.d (.% _ { *+K y.T v B p , d ^.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ^.^.d (.% B =.J B+1+Y.=.B p , d ^.. . . . ",
-". . . ^.d , p _ =.&.D.9 H.v B p , d . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ^.d (.% _ 0 I.K X.l v B (.d ^.. . . . ",
-". . . ^.d (.% _ ~+X.D.A+0 _ % (.d ^.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ^.^., p % v I y.K |.{ _ % (.d ^.. . . ",
-". . . d , % _ 0 I.D.*+{ v % (., ^.^.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ^.^., p B @ 6+1+B+6+@ B (., ^.. . . ",
-". . ^.d (.% v l 9 1+_.=.B p , d . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ^.d (.% _ }+F+K M { _ % , d ^.. . ",
-". ^.d , p _ 0 I.D.M { _ % (.d ^.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ^.d , p B v l X.B+J v B (.d ^.. . ",
-". . d (.% _ I %.B+6+@ B p , d . . . . . . . . . . . . . . . . . . . . . . ^.. . . . . . . . . . . . . . . . . . . . . . d , % _ }+|.D.|.}+B % , d . . ",
-". ^., p B =._.1+y.T v % (.d ^.. . . . . . . . . . . . . . . . . ^.^.d d d d d d d . ^.. . . . . . . . . . . . . . . . . d d p B v J B+X.~+_ % (.d . . ",
-". d , p _ }+-+D.A+0 _ p , ^.. . . . . . . . . . . . . . . . . ^.d d , , (.(.(., , d d d . . . . . . . . . . . . . . . . ^.d (.% v .+y.1+Y.=.B (., ^.. ",
-"^.d (.% v l 9 B+J v B p , ^.. . . . . . . . . . . . . . . ^.d d (.(.% % % % % % % (., , d . . . . . . . . . . . . . . . . ^., p _ =.].1+-+}+_ p , d . ",
-"^.d p B @ &.1+>+T _ % , d ^.. . . . . . . . . . . . . . ^.d , (.% B _ _ @ @ @ _ _ B % (., d d . . . . . . . . . . . . . . ^.d (.B v H.B+X.~+_ % (.d ^.",
-"^., p _ }+|.D.F+}+_ % , ^.^.. . . . . . . . . . . . . d d , p B B =.{ l _.Y._.l { =._ B p , d ^.. . . . . . . . . . . . . ^.d (.% v .+y.B+6+@ B (.d ^.",
-"^., % _ { *+D.Y.@ B p d ^.. . . . . . . . . . . . . ^.d , p B v T &.y.9 1+1+D.B+y.&.T v B p , d ^.. . . . . . . . . . . . . ^., % _ }+|.D.I.=.B p d ^.",
-"d , % _ E+%.9 H.v B (.d ^.. . . . . . . . . . . . . ^., p B @ ~+*+D.D.X.M -+*+X.1+D.*+l @ B p , d . . . . . . . . . . . . . ^.d p B =.A+D.M { _ p , ^.",
-"d (.% v J B+%.T _ % (.d . . . . . . . . . . . . . ^.d (.% _ ~+>+K B+I.l { }+{ I A+9 K %.~+v % (.d ^.. . . . . . . . . . . . ^., p B @ _.1+>+b _ % , d ",
-"d (.B @ &.1+y.{ v % , d . . . . . . . . . . . . . d , p B }+F+K %.H.}+@ @ v @ @ }+J X.K -+{ _ p , d . . . . . . . . . . . . . d (.B v H.B+X.`._ % , d ",
-"d p B )+|.D.-+}+_ p , ^.^.. . . . . . . . . . . ^.d (.% _ l 9 B+6+0 v _ B % B _ v 0 _.B+B+H.v % (.d ^.. . . . . . . . . . . ^.d (.% v I %.B+_.v % , d ",
-"d (.B Q M D.*.0 _ p , ^.. . . . . . . . . . . . . d (.B =.].D.-+{ @ B % p p p % B @ { M D.I.0 B (.d ^.. . . . . . . . . . . . d (.% _ T >+1+&._ % (.d ",
-", p B Q M D.I.0 _ p , ^.. . . . . . . . . . . . ^., p B }+|.1+A+0 v B p (., , p B v 0 A+D.|.}+B p , ^.. . . . . . . . . . . ^.^.(.% v T >+1+].v B (.d ",
-"d p B Q M D.I.0 _ p , ^.. . . . . . . . . . . . ^.d p B { -+1+&.=._ B (., , , (.% _ =.&.1+-+}+B p d ^.. . . . . . . . . . . ^.^., % _ .+>+1+z+v % (.d ",
-", p B Q M D.I.=._ p d d . . . . . . . . . . . . ^., p B 0 |.D.I.0 v B p (., (.% B v }+I.D.*.0 B (., ^.. . . . . . . . . . . . d , % v T >+1+]._ B (.d ",
-"d p B Q -+D.*.0 _ % , ^.. . . . . . . . . . . . ^.d (.B @ &.D.>+T =._ B p p % B _ @ T >+1+_.@ B (.d ^.. . . . . . . . . . F . d R % _ T %.1+&._ % , d ",
-", (.B @ I.D.M }+_ p , d . . . . . . . . . . . . . d (.% _ ~+X.D.*.{ @ v _ _ B v @ { I.D.>+T _ % , d . . . . . . . F F F F F $.$., V.v ~+9 ).6+_ % (.d ",
-"d (.B v _.B+y.T _ % , d . . . . . . . . . . . . . ^., p B 0 A+D.1+*.T 0 @ @ @ 0 I *.1+D.&.=.B p d d . . . . . . F / / H / / 4.j R /.v J B+%.`._ % , d ",
-"d (.% v H.B+%.I v % (.d ^.. . . . . . . . . . . . ^.d (.% _ { |.D.D.y.&.H.~+H.].>+D.D.F+}+_ % , d ^.. . . . F F / / H H = = 9.7 U r.G &.1+y..+_ p , ^.",
-"d , % _ I >+B+H.v B (.d ^.. . . . . . . . . . . . . ^.d (.% _ { ].%.D.1+).X.9 1+D.X.&.{ _ % (.d ^.. . . . . F F H = Y E E ^ Y w 7+r.)+*.D |._+B p , ^.",
-"^., p _ }+M 1+&.=.B p d ^.. . . . . . . . . . . . . . d , p % _ =.I z+*+8+X.8+M y I =._ % (., d . . . . . F / H = Y * y+x ) p+O.8.r.j.M 1+&.@ B p d ^.",
-"^., p B 0 A+1+-+}+_ % , d . . F F F F F F F F F . F . ^.d , R % /._ G j.b 6 b _+G _ V.p p d ^.^.. . F F / F H H Y E c h+: ;.o O.~ k 6 8+).l v % (.d ^.",
-". d (.B v J B+%.T v % (.$.F / F / / / / / / / / / F F F F $.$.R U U i i 0+0+0+0+i U P.R d $.^.. F F F / / H = Y ^ E b+a <.L :+C+2+s ( ).` T _ % (.d . ",
-". d , % _ .+y.1+_.@ V.P.j j H H H = = = = H H H H H / F F F j $.N.N.f 8.f 8.f 8.f N.j j $.F F F / / / = = = ^ E # A + a f.L :+C+2+E.m D *.0 B p , ^.. ",
-". ^., p B 0 I.1+-+_+r.U 7 9.= Y Y ^ ^ Y ^ ^ ^ ^ Y = = H H 4./ 9.9.w R.3.g 3.g 3.R.w w 4./ F / / / = = Y ^ E E # ' ,.=+L f.S [ t 2+G.z.).J v B (.d ^.. ",
-". ^., (.B v J ).X.6 k U.f R.^ # ' ' ' A E # E A A E Y = = = = = Y ^ E A C C ,.A E ^ Y = = H H = = Y ^ # ' C C ' ' C O L f.L [ ; g+| @.8+T _ % (.d ^.. ",
-". . d , % _ .+` D x.E.x+|+}.* 4 i+z  .4 X A c 4 4 o+A ^ Y Y Y ^ # * =+i+z z z i+=+C E ^ Y = = Y ^ # * =+i+z  .) =+p+x S f.S [ ; <+u.9+q )+B p , ^.. . ",
-". . ^., (.B =.y D #+q+F.< 7.]+{.,+,+{.a j+O  .a {.M.C E E E E # b+]+L : : : {.,+a ]+c E E ^ ^ E # c ]+{.,+,+{.{.q.]+;.,+k+L [ [+l.! #+s+v % (.d ^.. . ",
-". . ^.d (.% _ s+#+ +A.t+X j+<.f.: h+V j+a q.L f.<.z C A # # A o+h+<.<.a ]+z j+a <.<.V X E # E # X j+<.f.,+;.j+V q.S ,+f.f.S [ n+d. +(+)+V.p , d . . . ",
-". . . d d P.V.G | ! o.} ) : f.: K.o+X p+J.q.<.f.f.j+* A A A C  .<.<.;.O * C X O q.<.: L.' A A C ) : f.:  .7.X c O q.<.f.f.L [ c.N 8 w+:.% (.d ^.. . . ",
-". . . ^.d R /.:.>.2.'.7.;.f.,+z r e ,.C C ++S f.<.j+* C ,.' + a f.{.O ,.,.,.A ' L.a a M.C A ' c h+f.,+z r C e !.!.O L f.f.S [ ] N | 3 V.P., d . . . . ",
-". . . . d d P.i s p.G+) : f.;.7.!.e @+A ,.X j+<.<.j+* C ,.C J.: <.j+p+A A # -.# C b+4 o+' ' ' y+{.f.;.+ ,.A A ,.e r ]+<.f.{.[ '.c+> k /.R d ^.. . . . ",
-". . . . . d 7 7+x+&+} V ,+<.V r Z Z h A A ,.++: <.j+X C C * z <.,+ .C A E E E E E A ' ' A ' C  .,+<.V * A A -.h e e ++: k+S ++] p.s i P., ^.. . . . . ",
-". . . . . ^.$.N.~ u+5 ;.<.,+x 3+Q.< }.h A A 1.{.<.j+X * C * V <.,+J.' A E ^ ^ ^ ^ E E # A ' C z <.,+i+C A -.-.h Z 1 1.L f.S [ ..g.x+U R d . . . . . . ",
-". . . . . F $.7 f #.Z.;.<.,+x u +.Q.< < h e =+a <.j+X * * * j+f.: J.' # ^ ^ Y ^ E E # A ' ' * z <.: x ,.@+-.}.< Z [.1.L f.L [ W.2+8.7 $.^.. . . . . . ",
-". . . . . . F 9.f |+5 ;.<.,+i+a.a+!+t t @+e 1.L <.j+X * * * ]+<.,+++' A E ^ ^ ^ E E # # ' ,.*  .<.,+i+C @+h < t +.r+y+S f.{.[ ; B.f j $.^.. . . . . . ",
-". . . . . F F 4.w g 1 j+<.<.V :+^+a+!++.[.e ++: <.V * !.C * K.,+,+i+C A # E E E E A ' ' # ' C i+,+<.j+* 1 Z Q.+.$+} x : k+S [ t g N.j ^.. . . . . . . ",
-". . . . . . F 4.= 3.h x ,+f.q.1.2 v.i.$+r+r j+<.f.j+X !.!.C J.,+f.$ p+' A # # A * L.L.b+' ,.,.1.{.f.q.o 3+[.[.h.t.H+j+<.k+L [ < O.9.4.F . . . . . . . ",
-". . . . . . F F 9.Y '+W q.f.,+]+:+K.2 t.Z.x : f.<.j+* !.e ,.+ q.f.: x C ,.' ' C ) a : L.C @+e c $ f.<.j+m.r+i.b.:+x : <.f.L [ }.R.H / . . . . . . . . ",
-". . . . . . . F 4.Y 3.'  .,+f.: ]+1.o =+x L f.f.f.j+r 1 1 e C  .,+f.{.x m.X p+x {.<.a b+A @+Z !.J.: f.,+j+1.H+1.x S <.<.f.L :+'+w H F F . . . . . . . ",
-". . . . . . F F / = ^ -.c $ <.f.,+q.$ ;.{.L : f.<.j+* [.Z < Z c $ <.f.{.h+j+;.{.<.:  .!.< C+t Q.p+V <.f.,+q.;.;.{.L S <.<.q.1.^ = 4./ . . . . . . . . ",
-". . . . . . . F / H Y E ,.+ j+{.,+,+{.a j+x $ ,+f.j+r !+!+; t Z c  .a : : : : {.h+) * t u+#.F.t+W.7. .a ,+: : L $ x K.j+$ K.c ^ = / F . . . . . . . . ",
-". . . . . . . F / 9.Y E A ,.X y+) i+) 4 7.S.x S <.V l+..& &+g.F.; !.o+O ) i+) y+c 1 F.C.g+> k.e+2.] o + J.i+) =+p+e ,.* * C # = H F F . . . . . . . . ",
-". . . . . . . F / H Y E A C !.* * r * r m.l+J.S <.]+H+] d.c+l.p.k.<+P +.+.[.[.[+n.<+0.4+T.u.n  + +o.- n+Z e e < }.h }.E ^ Y = H / F F . . . . . . . . ",
-". . . . . . . F F H Y E ,.C * C r r r l+l+l+K.: ,+x S.w.f+@. +n f+8 2.- - - - c+/+8 n @.s.s.@.u.T.G.> C.2+B.|+g g R.R.= = H / / F F . . . . . . . . . ",
-". . . . . . . F / H Y C 4 M. .y+* r * r * 1.a <.a b+[+<+%+| d+#+z. +9+ + +!  + + +@.z.` d+y 5.b 3 k 0+U.8.f N.9.9.H H H H / F F F . . . . . . . . . . ",
-". . . . . . . . F / Y ' L.a ,+a x + c 7.J.;.,+:  .!.#.x+5+3 j.m+5.q (+m m m m m x.( w+b _+)+~._ V./.U 7 7 j j j F 4.F F F F F F . . . . . . . . . . . ",
-". . . . . . . F F / = ^ * L.h+L q.$ ]+j+q.a $ J.* }.;+8.U.i V.:._ ~.G 3 3 3 G 3 ~.v :._ B B % % p (.R $.$.$.F F F F F . F . . . . . . . . . . . . . . ",
-". . . . . . . . F / H = ^ ' c J. .z z  .i+y+c A ^ R.N.7 R P.P.P.% /.% B V.B V.B B % % % p p (., , d ^.^.. . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . F / H = ^ ^ # A C * C ,.# ^ Y = 9.H j d $., , (.(.(.(.(.(.(.(.(.(., , , d d d ^.^.^.. . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . F F / H = = Y ^ ^ Y Y Y Y Y = H 4.F F ^.^.d ^.d d d d d d d d d d d ^.^.^.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . F F F / H H H = = = H H / / / F F . . . . . . ^.^.^.^.^.^.^.. . ^.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . F F F F F / / / / / F / F . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . F F F F F F F F F F F . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . "};

grip-3.10.1.tar.gz/po/cat-id-tbl.c Deleted

grip-3.10.1.tar.gz/src/eggtrayicon.c Deleted

@@ -1,389 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* eggtrayicon.c
- * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
- *
- * This library 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 of the License, or (at your option) any later version.
- *
- * This library 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 this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <string.h>
-#include <gdk/gdkx.h>
-#include "eggtrayicon.h"
-
-#define SYSTEM_TRAY_REQUEST_DOCK    0
-#define SYSTEM_TRAY_BEGIN_MESSAGE   1
-#define SYSTEM_TRAY_CANCEL_MESSAGE  2
-         
-static GtkPlugClass *parent_class = NULL;
-
-static void egg_tray_icon_init (EggTrayIcon *icon);
-static void egg_tray_icon_class_init (EggTrayIconClass *klass);
-
-static void egg_tray_icon_unrealize (GtkWidget *widget);
-
-static void egg_tray_icon_update_manager_window (EggTrayIcon *icon);
-
-GType
-egg_tray_icon_get_type (void)
-{
-  static GType our_type = 0;
-
-  our_type = g_type_from_name("EggTrayIcon");
-
-  if (our_type == 0)
-    {
-      static const GTypeInfo our_info =
-      {
-	sizeof (EggTrayIconClass),
-	(GBaseInitFunc) NULL,
-	(GBaseFinalizeFunc) NULL,
-	(GClassInitFunc) egg_tray_icon_class_init,
-	NULL, /* class_finalize */
-	NULL, /* class_data */
-	sizeof (EggTrayIcon),
-	0,    /* n_preallocs */
-	(GInstanceInitFunc) egg_tray_icon_init
-      };
-
-      our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0);
-    }
-  else if (parent_class == NULL) {
-    /* we're reheating the old class from a previous instance -  engage ugly hack =( */
-    egg_tray_icon_class_init((EggTrayIconClass *)g_type_class_peek(our_type));
-  }
-
-  return our_type;
-}
-
-static void
-egg_tray_icon_init (EggTrayIcon *icon)
-{
-  icon->stamp = 1;
-  
-  gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK);
-}
-
-static void
-egg_tray_icon_class_init (EggTrayIconClass *klass)
-{
-  GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
-
-  parent_class = g_type_class_peek_parent (klass);
-
-  widget_class->unrealize = egg_tray_icon_unrealize;
-}
-
-static GdkFilterReturn
-egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_data)
-{
-  EggTrayIcon *icon = user_data;
-  XEvent *xev = (XEvent *)xevent;
-
-  if (xev->xany.type == ClientMessage &&
-      xev->xclient.message_type == icon->manager_atom &&
-      xev->xclient.data.l[1] == icon->selection_atom)
-    {
-      egg_tray_icon_update_manager_window (icon);
-    }
-  else if (xev->xany.window == icon->manager_window)
-    {
-      if (xev->xany.type == DestroyNotify)
-	{
-	  egg_tray_icon_update_manager_window (icon);
-	}
-    }
-  
-  return GDK_FILTER_CONTINUE;
-}
-
-static void
-egg_tray_icon_unrealize (GtkWidget *widget)
-{
-  EggTrayIcon *icon = EGG_TRAY_ICON (widget);
-  GdkWindow *root_window;
-
-  if (icon->manager_window != None)
-    {
-      GdkWindow *gdkwin;
-
-#if HAVE_GTK_MULTIHEAD
-      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget),
-                                              icon->manager_window);
-#else
-      gdkwin = gdk_window_lookup (icon->manager_window);
-#endif
-
-      gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-    }
-
-#if HAVE_GTK_MULTIHEAD
-  root_window = gdk_screen_get_root_window (gtk_widget_get_screen (widget));
-#else
-  root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
-#endif
-
-  gdk_window_remove_filter (root_window, egg_tray_icon_manager_filter, icon);
-
-  if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-    (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
-}
-
-static void
-egg_tray_icon_send_manager_message (EggTrayIcon *icon,
-				    long         message,
-				    Window       window,
-				    long         data1,
-				    long         data2,
-				    long         data3)
-{
-  XClientMessageEvent ev;
-  Display *display;
-  
-  ev.type = ClientMessage;
-  ev.window = window;
-  ev.message_type = icon->system_tray_opcode_atom;
-  ev.format = 32;
-  ev.data.l[0] = gdk_x11_get_server_time (GTK_WIDGET (icon)->window);
-  ev.data.l[1] = message;
-  ev.data.l[2] = data1;
-  ev.data.l[3] = data2;
-  ev.data.l[4] = data3;
-
-#if HAVE_GTK_MULTIHEAD
-  display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
-#else
-  display = gdk_display;
-#endif
-  
-  gdk_error_trap_push ();
-  XSendEvent (display,
-	      icon->manager_window, False, NoEventMask, (XEvent *)&ev);
-  XSync (display, False);
-  gdk_error_trap_pop ();
-}
-
-static void
-egg_tray_icon_send_dock_request (EggTrayIcon *icon)
-{
-  egg_tray_icon_send_manager_message (icon,
-				      SYSTEM_TRAY_REQUEST_DOCK,
-				      icon->manager_window,
-				      gtk_plug_get_id (GTK_PLUG (icon)),
-				      0, 0);
-}
-
-static void
-egg_tray_icon_update_manager_window (EggTrayIcon *icon)
-{
-  Display *xdisplay;
-  
-#if HAVE_GTK_MULTIHEAD
-  xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
-#else
-  xdisplay = gdk_display;
-#endif
-  
-  if (icon->manager_window != None)
-    {
-      GdkWindow *gdkwin;
-
-#if HAVE_GTK_MULTIHEAD
-      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
-					      icon->manager_window);
-#else
-      gdkwin = gdk_window_lookup (icon->manager_window);
-#endif
-      
-      gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-    }
-  
-  XGrabServer (xdisplay);
-  
-  icon->manager_window = XGetSelectionOwner (xdisplay,
-					     icon->selection_atom);
-
-  if (icon->manager_window != None)
-    XSelectInput (xdisplay,
-		  icon->manager_window, StructureNotifyMask);
-
-  XUngrabServer (xdisplay);
-  XFlush (xdisplay);
-  
-  if (icon->manager_window != None)
-    {
-      GdkWindow *gdkwin;
-
-#if HAVE_GTK_MULTIHEAD
-      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
-					      icon->manager_window);
-#else
-      gdkwin = gdk_window_lookup (icon->manager_window);
-#endif
-      
-      gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-
-      /* Send a request that we'd like to dock */
-      egg_tray_icon_send_dock_request (icon);
-    }
-}
-
-EggTrayIcon *
-egg_tray_icon_new_for_xscreen (Screen *xscreen, const char *name)
-{
-  EggTrayIcon *icon;
-  char buffer[256];
-  GdkWindow *root_window;
-
-  g_return_val_if_fail (xscreen != NULL, NULL);
-  
-  icon = g_object_new (EGG_TYPE_TRAY_ICON, NULL);
-  gtk_window_set_title (GTK_WINDOW (icon), name);
-
-#if HAVE_GTK_MULTIHEAD
-  /* FIXME: this code does not compile, screen is undefined. Now try
-   * getting the GdkScreen from xscreen (:. Dunno how to solve this
-   * (there is prolly some easy way I cant think of right now)
-   */
-  gtk_plug_construct_for_display (GTK_PLUG (icon),
-				  gdk_screen_get_display (screen), 0);
-#else
-  gtk_plug_construct (GTK_PLUG (icon), 0);
-#endif
-  
-  gtk_widget_realize (GTK_WIDGET (icon));
-
-  /* Now see if there's a manager window around */
-  g_snprintf (buffer, sizeof (buffer),
-	      "_NET_SYSTEM_TRAY_S%d",
-	      XScreenNumberOfScreen (xscreen));
-  
-  icon->selection_atom = XInternAtom (DisplayOfScreen (xscreen),
-				      buffer, False);
-  
-  icon->manager_atom = XInternAtom (DisplayOfScreen (xscreen),
-				    "MANAGER", False);
-  
-  icon->system_tray_opcode_atom = XInternAtom (DisplayOfScreen (xscreen),
-					       "_NET_SYSTEM_TRAY_OPCODE", False);
-
-  egg_tray_icon_update_manager_window (icon);
-
-#if HAVE_GTK_MULTIHEAD
-  root_window = gdk_screen_get_root_window (gtk_widget_get_screen (screen));
-#else
-  root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
-#endif
-  
-  /* Add a root window filter so that we get changes on MANAGER */
-  gdk_window_add_filter (root_window,
-			 egg_tray_icon_manager_filter, icon);
-		      
-  return icon;
-}
-
-#if HAVE_GTK_MULTIHEAD
-EggTrayIcon *
-egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name)
-{
-  EggTrayIcon *icon;
-  char buffer[256];
-
-  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
-  return egg_tray_icon_new_for_xscreen (GDK_SCREEN_XSCREEN (screen), name);
-}
-#endif
-
-EggTrayIcon*
-egg_tray_icon_new (const gchar *name)
-{
-  return egg_tray_icon_new_for_xscreen (DefaultScreenOfDisplay (gdk_display), name);
-}
-
-guint
-egg_tray_icon_send_message (EggTrayIcon *icon,
-			    gint         timeout,
-			    const gchar *message,
-			    gint         len)
-{
-  guint stamp;
-  
-  g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), 0);
-  g_return_val_if_fail (timeout >= 0, 0);
-  g_return_val_if_fail (message != NULL, 0);
-		     
-  if (icon->manager_window == None)
-    return 0;
-
-  if (len < 0)
-    len = strlen (message);
-
-  stamp = icon->stamp++;
-  
-  /* Get ready to send the message */
-  egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_BEGIN_MESSAGE,
-				      (Window)gtk_plug_get_id (GTK_PLUG (icon)),
-				      timeout, len, stamp);
-
-  /* Now to send the actual message */
-  gdk_error_trap_push ();
-  while (len > 0)
-    {
-      XClientMessageEvent ev;
-      Display *xdisplay;
-
-#if HAVE_GTK_MULTIHEAD
-      xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
-#else
-      xdisplay = gdk_display;
-#endif
-      
-      ev.type = ClientMessage;
-      ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon));
-      ev.format = 8;
-      ev.message_type = XInternAtom (xdisplay,
-				     "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
-      if (len > 20)
-	{
-	  memcpy (&ev.data, message, 20);
-	  len -= 20;
-	  message += 20;
-	}
-      else
-	{
-	  memcpy (&ev.data, message, len);
-	  len = 0;
-	}
-
-      XSendEvent (xdisplay,
-		  icon->manager_window, False, StructureNotifyMask, (XEvent *)&ev);
-      XSync (xdisplay, False);
-    }
-  gdk_error_trap_pop ();
-
-  return stamp;
-}
-
-void
-egg_tray_icon_cancel_message (EggTrayIcon *icon,
-			      guint        id)
-{
-  g_return_if_fail (EGG_IS_TRAY_ICON (icon));
-  g_return_if_fail (id > 0);
-  
-  egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE,
-				      (Window)gtk_plug_get_id (GTK_PLUG (icon)),
-				      id, 0, 0);
-}

grip-3.10.1.tar.gz/src/eggtrayicon.h Deleted

@@ -1,76 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* eggtrayicon.h
- * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
- *
- * This library 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 of the License, or (at your option) any later version.
- *
- * This library 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 this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __EGG_TRAY_ICON_H__
-#define __EGG_TRAY_ICON_H__
-
-#include <gtk/gtkplug.h>
-#include <gdk/gdkx.h>
-
-G_BEGIN_DECLS
-
-#define EGG_TYPE_TRAY_ICON		(egg_tray_icon_get_type ())
-#define EGG_TRAY_ICON(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TRAY_ICON, EggTrayIcon))
-#define EGG_TRAY_ICON_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
-#define EGG_IS_TRAY_ICON(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_TRAY_ICON))
-#define EGG_IS_TRAY_ICON_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TRAY_ICON))
-#define EGG_TRAY_ICON_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
-	
-typedef struct _EggTrayIcon	  EggTrayIcon;
-typedef struct _EggTrayIconClass  EggTrayIconClass;
-
-struct _EggTrayIcon
-{
-  GtkPlug parent_instance;
-
-  guint stamp;
-  
-  Atom selection_atom;
-  Atom manager_atom;
-  Atom system_tray_opcode_atom;
-  Window manager_window;
-};
-
-struct _EggTrayIconClass
-{
-  GtkPlugClass parent_class;
-};
-
-GType        egg_tray_icon_get_type       (void);
-
-#if EGG_TRAY_ENABLE_MULTIHEAD
-EggTrayIcon *egg_tray_icon_new_for_screen (GdkScreen   *screen,
-					   const gchar *name);
-#endif
-
-EggTrayIcon *egg_tray_icon_new            (const gchar *name);
-
-guint        egg_tray_icon_send_message   (EggTrayIcon *icon,
-					   gint         timeout,
-					   const char  *message,
-					   gint         len);
-void         egg_tray_icon_cancel_message (EggTrayIcon *icon,
-					   guint        id);
-
-
-					    
-G_END_DECLS
-
-#endif /* __EGG_TRAY_ICON_H__ */

grip-3.10.1.tar.gz/src/status_window.c Deleted

@@ -1,149 +0,0 @@
-/* status_window.c -- routines for display status information
- *
- * Copyright (c) 1998-2004  Mike Oliphant <grip@nostatic.org>
- *
- *   http://www.nostatic.org/grip
- *
- * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <vte/vte.h>
-#include "status_window.h"
-
-static void PipeCB(gpointer data,gint source,GdkInputCondition condition);
-
-/* Create a new status window */
-StatusWindow *NewStatusWindow(GtkWidget *box)
-{
-  StatusWindow *sw;
-  GtkWidget *vscrollbar;
-  GtkWidget *hbox;
-
-  sw=g_new(StatusWindow,1);
-
-  if(!sw) return NULL;
-
-  sw->pipe[0]=sw->pipe[1]=-1;
-
-  if(box) {
-    sw->embedded=TRUE;
-  }
-  else {
-    sw->embedded=FALSE;
-
-    /* Create new window here */
-  }
-
-  hbox=gtk_hbox_new(FALSE,3);
-
-  /*  sw->term_widget=zvt_term_new_with_size(40,10);
-
-  gtk_box_pack_start(GTK_BOX(hbox),sw->term_widget,FALSE,FALSE,0);
-  gtk_widget_show(sw->term_widget);
-
-  vscrollbar=gtk_vscrollbar_new(ZVT_TERM(sw->term_widget)->adjustment);
-  gtk_box_pack_start(GTK_BOX(hbox),vscrollbar,FALSE,FALSE,0);
-  gtk_widget_show(vscrollbar);*/
-
-  sw->term_widget=vte_terminal_new();
-
-  
-  vte_terminal_set_encoding(VTE_TERMINAL(sw->term_widget),"UTF-8");
-
-  /*  vte_terminal_set_size(VTE_TERMINAL(sw->term_widget),40,10);*/
-
-  gtk_box_pack_start(GTK_BOX(hbox),sw->term_widget,TRUE,TRUE,0);
-  gtk_widget_show(sw->term_widget);
-
-  vscrollbar=gtk_vscrollbar_new(VTE_TERMINAL(sw->term_widget)->adjustment);
-  gtk_box_pack_start(GTK_BOX(hbox),vscrollbar,FALSE,FALSE,0);
-  gtk_widget_show(vscrollbar);
-
-  gtk_box_pack_start(GTK_BOX(box),hbox,TRUE,TRUE,0);
-  gtk_widget_show(hbox);
-
-  return sw;
-}
-
-/* Write a line of output to a status window */
-void StatusWindowWrite(StatusWindow *sw,char *msg)
-{
-  char *buf;
-  gsize len;
-  int pos=0;
-
-  len=strlen(msg);
-
-  buf=(char *)malloc((len*2)+1);
-
-  while(*msg) {
-    if(1) { //!(*msg & (1<<7))) {
-      if(*msg=='\n') {
-	buf[pos++]='\r';
-        buf[pos++]='\n';
-      } 
-      else {
-	buf[pos++]=*msg;
-      }
-    }
-    
-    msg++;
-  }
-  
-  buf[pos]='\0';
-
-
-  /*  zvt_term_feed((ZvtTerm *)sw->term_widget,buf,strlen(buf));*/
-
-  vte_terminal_feed(VTE_TERMINAL(sw->term_widget),buf,strlen(buf));
-
-  free(buf);
-}
-
-/* Return the output pipe fd for a status window, opening the pipe
-   if necessary */
-int GetStatusWindowPipe(StatusWindow *sw)
-{
-  if(sw->pipe[1]>0) return sw->pipe[1];
-
-  if (pipe(sw->pipe) == -1) {
-    perror("pipe");
-    return -1;
-  }
-
-  fcntl(sw->pipe[0],F_SETFL,O_NONBLOCK);
-
-  gdk_input_add(sw->pipe[0],GDK_INPUT_READ,PipeCB,(gpointer)sw);
-
-  return sw->pipe[1];
-}
-
-static void PipeCB(gpointer data,gint source,GdkInputCondition condition)
-{
-  char buf[256];
-  StatusWindow *sw;
-
-  sw=(StatusWindow *)data;
-
-  while(read(sw->pipe[0],buf,256)>0) {
-    /*    StatusWindowWrite(sw,buf);*/
-  }
-}

grip-3.10.1.tar.gz/src/status_window.h Deleted

@@ -1,35 +0,0 @@
-/* status_window.h
- *
- * Copyright (c) 1998-2004  Mike Oliphant <grip@nostatic.org>
- *
- *   http://www.nostatic.org/grip
- *
- * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
-
-#include <gtk/gtk.h>
-/*#include <zvt/zvtterm.h>*/
-
-typedef struct {
-  gboolean embedded;
-  GtkWidget *term_widget;
-  int pipe[2];
-} StatusWindow;
-
-StatusWindow *NewStatusWindow(GtkWidget *box);
-void StatusWindowWrite(StatusWindow *sw,char *msg);
-int GetStatusWindowPipe(StatusWindow *sw);
-

grip-4.1.0.tar.gz Deleted

grip-3.10.1.tar.gz/ABOUT-NLS -> grip-4.1.1.tar.gz/ABOUT-NLS Changed

@@ -1,16 +1,16 @@
 1 Notes on the Free Translation Project
 ***************************************
 
-Free software is going international!  The Free Translation Project is a
-way to get maintainers of free software, translators, and users all
+Free software is going international!  The Free Translation Project is
+a way to get maintainers of free software, translators, and users all
 together, so that free software will gradually become able to speak many
 languages.  A few packages already provide translations for their
 messages.
 
-   If you found this 'ABOUT-NLS' file inside a distribution, you may
-assume that the distributed package does use GNU 'gettext' internally,
+   If you found this `ABOUT-NLS' file inside a distribution, you may
+assume that the distributed package does use GNU `gettext' internally,
 itself available at your nearest GNU archive site.  But you do _not_
-need to install GNU 'gettext' prior to configuring, installing or using
+need to install GNU `gettext' prior to configuring, installing or using
 this package with messages translated.
 
    Installers will find here some useful hints.  These notes also
@@ -23,12 +23,12 @@
 
 Some packages are "localizable" when properly installed; the programs
 they contain can be made to speak your own native language.  Most such
-packages use GNU 'gettext'.  Other packages have their own ways to
-internationalization, predating GNU 'gettext'.
+packages use GNU `gettext'.  Other packages have their own ways to
+internationalization, predating GNU `gettext'.
 
    By default, this package will be installed to allow translation of
 messages.  It will automatically detect whether the system already
-provides the GNU 'gettext' functions.  Installers may use special
+provides the GNU `gettext' functions.  Installers may use special
 options at configuration time for changing the default behaviour.  The
 command:
 
@@ -36,71 +36,72 @@
 
 will _totally_ disable translation of messages.
 
-   When you already have GNU 'gettext' installed on your system and run
-configure without an option for your new package, 'configure' will
-probably detect the previously built and installed 'libintl' library and
-will decide to use it.  If not, you may have to to use the
-'--with-libintl-prefix' option to tell 'configure' where to look for it.
+   When you already have GNU `gettext' installed on your system and run
+configure without an option for your new package, `configure' will
+probably detect the previously built and installed `libintl' library
+and will decide to use it.  If not, you may have to to use the
+`--with-libintl-prefix' option to tell `configure' where to look for it.
 
-   Internationalized packages usually have many 'po/LL.po' files, where
+   Internationalized packages usually have many `po/LL.po' files, where
 LL gives an ISO 639 two-letter code identifying the language.  Unless
-translations have been forbidden at 'configure' time by using the
-'--disable-nls' switch, all available translations are installed
-together with the package.  However, the environment variable 'LINGUAS'
+translations have been forbidden at `configure' time by using the
+`--disable-nls' switch, all available translations are installed
+together with the package.  However, the environment variable `LINGUAS'
 may be set, prior to configuration, to limit the installed set.
-'LINGUAS' should then contain a space separated list of two-letter
+`LINGUAS' should then contain a space separated list of two-letter
 codes, stating which languages are allowed.
 
 1.2 Using This Package
 ======================
 
 As a user, if your language has been installed for this package, you
-only have to set the 'LANG' environment variable to the appropriate
-'LL_CC' combination.  If you happen to have the 'LC_ALL' or some other
-'LC_xxx' environment variables set, you should unset them before setting
-'LANG', otherwise the setting of 'LANG' will not have the desired
-effect.  Here 'LL' is an ISO 639 two-letter language code, and 'CC' is
-an ISO 3166 two-letter country code.  For example, let's suppose that
-you speak German and live in Germany.  At the shell prompt, merely
-execute 'setenv LANG de_DE' (in 'csh'), 'export LANG; LANG=de_DE' (in
-'sh') or 'export LANG=de_DE' (in 'bash').  This can be done from your
-'.login' or '.profile' file, once and for all.
+only have to set the `LANG' environment variable to the appropriate
+`LL_CC' combination.  If you happen to have the `LC_ALL' or some other
+`LC_xxx' environment variables set, you should unset them before
+setting `LANG', otherwise the setting of `LANG' will not have the
+desired effect.  Here `LL' is an ISO 639 two-letter language code, and
+`CC' is an ISO 3166 two-letter country code.  For example, let's
+suppose that you speak German and live in Germany.  At the shell
+prompt, merely execute `setenv LANG de_DE' (in `csh'),
+`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
+This can be done from your `.login' or `.profile' file, once and for
+all.
 
    You might think that the country code specification is redundant.
 But in fact, some languages have dialects in different countries.  For
-example, 'de_AT' is used for Austria, and 'pt_BR' for Brazil.  The
+example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
 country code serves to distinguish the dialects.
 
-   The locale naming convention of 'LL_CC', with 'LL' denoting the
-language and 'CC' denoting the country, is the one use on systems based
-on GNU libc.  On other systems, some variations of this scheme are used,
-such as 'LL' or 'LL_CC.ENCODING'.  You can get the list of locales
-supported by your system for your language by running the command
-'locale -a | grep '^LL''.
+   The locale naming convention of `LL_CC', with `LL' denoting the
+language and `CC' denoting the country, is the one use on systems based
+on GNU libc.  On other systems, some variations of this scheme are
+used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
+locales supported by your system for your language by running the
+command `locale -a | grep '^LL''.
 
    Not all programs have translations for all languages.  By default, an
 English message is shown in place of a nonexistent translation.  If you
 understand other languages, you can set up a priority list of languages.
 This is done through a different environment variable, called
-'LANGUAGE'.  GNU 'gettext' gives preference to 'LANGUAGE' over 'LANG'
-for the purpose of message handling, but you still need to have 'LANG'
+`LANGUAGE'.  GNU `gettext' gives preference to `LANGUAGE' over `LANG'
+for the purpose of message handling, but you still need to have `LANG'
 set to the primary language; this is required by other parts of the
-system libraries.  For example, some Swedish users who would rather read
-translations in German than English for when Swedish is not available,
-set 'LANGUAGE' to 'sv:de' while leaving 'LANG' to 'sv_SE'.
+system libraries.  For example, some Swedish users who would rather
+read translations in German than English for when Swedish is not
+available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
 
    Special advice for Norwegian users: The language code for Norwegian
-bokma*l changed from 'no' to 'nb' recently (in 2003).  During the
+bokma*l changed from `no' to `nb' recently (in 2003).  During the
 transition period, while some message catalogs for this language are
-installed under 'nb' and some older ones under 'no', it's recommended
-for Norwegian users to set 'LANGUAGE' to 'nb:no' so that both newer and
+installed under `nb' and some older ones under `no', it's recommended
+for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
 older translations are used.
 
-   In the 'LANGUAGE' environment variable, but not in the 'LANG'
-environment variable, 'LL_CC' combinations can be abbreviated as 'LL' to
-denote the language's main dialect.  For example, 'de' is equivalent to
-'de_DE' (German as spoken in Germany), and 'pt' to 'pt_PT' (Portuguese
-as spoken in Portugal) in this context.
+   In the `LANGUAGE' environment variable, but not in the `LANG'
+environment variable, `LL_CC' combinations can be abbreviated as `LL'
+to denote the language's main dialect.  For example, `de' is equivalent
+to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
+(Portuguese as spoken in Portugal) in this context.
 
 1.3 Translating Teams
 =====================
@@ -110,22 +111,22 @@
 able to synergize with other translators speaking the same language.
 Each translation team has its own mailing list.  The up-to-date list of
 teams can be found at the Free Translation Project's homepage,
-'http://translationproject.org/', in the "Teams" area.
+`http://translationproject.org/', in the "Teams" area.
 
    If you'd like to volunteer to _work_ at translating messages, you
 should become a member of the translating team for your own language.
 The subscribing address is _not_ the same as the list itself, it has
-'-request' appended.  For example, speakers of Swedish can send a
-message to 'sv-request@li.org', having this message body:
+`-request' appended.  For example, speakers of Swedish can send a
+message to `sv-request@li.org', having this message body:
 
      subscribe
 
-   Keep in mind that team members are expected to participate _actively_
-in translations, or at solving translational difficulties, rather than
-merely lurking around.  If your team does not exist yet and you want to
-start one, or if you are unsure about what to do or how to get started,
-please write to 'coordinator@translationproject.org' to reach the
-coordinator for all translator teams.
+   Keep in mind that team members are expected to participate
+_actively_ in translations, or at solving translational difficulties,
+rather than merely lurking around.  If your team does not exist yet and
+you want to start one, or if you are unsure about what to do or how to
+get started, please write to `coordinator@translationproject.org' to
+reach the coordinator for all translator teams.
 
    The English team is special.  It works at improving and uniformizing
 the terminology in use.  Proven linguistic skills are praised more than
@@ -135,1214 +136,1114 @@
 ======================
 
 Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of Jun 2014.
-The matrix shows, in regard of each package, for which languages PO
-files have been submitted to translation coordination, with a
+matrix shows the current state of internationalization, as of June
+2010.  The matrix shows, in regard of each package, for which languages
+PO files have been submitted to translation coordination, with a
 translation percentage of at least 50%.
 
-     Ready PO files       af am an ar as ast az be bg bn bn_IN bs ca crh cs
-                        +---------------------------------------------------+
-     a2ps               |                       []                []     [] |
-     aegis              |                                                   |
-     anubis             |                                                   |
-     aspell             |                []                       []     [] |
-     bash               |                          []             []     [] |
-     bfd                |                                                   |
-     binutils           |                                         []        |
-     bison              |                                                   |
-     bison-runtime      |                []                                 |
-     buzztrax           |                                                [] |
-     ccd2cue            |                                                   |
-     ccide              |                                                   |
-     cflow              |                                                   |
-     clisp              |                                                   |
-     coreutils          |                                         []     [] |
-     cpio               |                                                   |
-     cppi               |                                                   |
-     cpplib             |                                         []        |
-     cryptsetup         |                                                [] |
-     datamash           |                                                   |
-     denemo             |                                         []     [] |
-     dfarc              |                                         []        |
-     dialog             |       []                                []     [] |
-     dico               |                                                   |
-     diffutils          |                                                [] |
-     dink               |                                         []        |
-     direvent           |                                                   |
-     doodle             |                                                [] |
-     dos2unix           |                                                   |
-     dos2unix-man       |                                                   |
-     e2fsprogs          |                                         []     [] |
-     enscript           |                                         []        |
-     exif               |                                                [] |
-     fetchmail          |                                         []     [] |
-     findutils          |                                                [] |
-     flex               |                                         []        |
-     freedink           |                                         []     [] |
-     fusionforge        |                                                   |
-     gas                |                                                   |
-     gawk               |                                         []        |
-     gcal               |                                         []        |
-     gcc                |                                                   |
-     gdbm               |                                                   |
-     gettext-examples   | []             []        []             []     [] |
-     gettext-runtime    |                          []             []     [] |
-     gettext-tools      |                          []             []        |
-     gjay               |                                                   |
-     glunarclock        |                []        []                    [] |
-     gnubiff            |                                                [] |
-     gnubik             |          []                                       |
-     gnucash            |          ()              ()             []        |
-     gnuchess           |                                                   |
-     gnulib             |                                                [] |
-     gnunet             |                                                   |
-     gnunet-gtk         |                                                   |
-     gold               |                                                   |
-     gphoto2            |                                                [] |
-     gprof              |                          []                       |
-     gramadoir          |                                                   |
-     grep               |                          []             []     [] |
-     grub               |                                         []        |
-     gsasl              |                                                   |
-     gss                |                                                   |
-     gst-plugins-bad    |                          []                    [] |
-     gst-plugins-base   |                          []             []     [] |
-     gst-plugins-good   |                          []             []     [] |
-     gst-plugins-ugly   |                          []             []     [] |
-     gstreamer          |                []        []             []     [] |
-     gtick              |                                                [] |
-     gtkam              |                       []                       [] |
-     gtkspell           | []             []     []                []     [] |
-     guix               |                                                   |
-     guix-packages      |                                                   |
-     gutenprint         |                                         []        |
-     hello              |                                         []        |
-     help2man           |                                                   |
-     help2man-texi      |                                                   |
-     hylafax            |                                                   |
-     idutils            |                                                   |
-     iso_15924          |                                                [] |
-     iso_3166           | []          []        [] [] []  []   [] [] []  [] |
-     iso_3166_2         |                                                   |
-     iso_4217           |                                                [] |
-     iso_639            |             [] []     [] [] []  []      [] []  [] |
-     iso_639_3          |                []                          []     |
-     iso_639_5          |                                                   |
-     jwhois             |                                                   |
-     kbd                |                                                [] |
-     klavaro            |          []              [] []          []     [] |
-     ld                 |                          []                       |
-     leafpad            |                       [] []             []     [] |
-     libc               |                          []             []     [] |
-     libexif            |                       ()                          |
-     libextractor       |                                                   |
-     libgnutls          |                                                [] |
-     libgphoto2         |                                                [] |
-     libgphoto2_port    |                                                [] |
-     libgsasl           |                                                   |
-     libiconv           |                          []                    [] |
-     libidn             |                                                [] |
-     liferea            |          []    []                       []     [] |
-     lilypond           |                                         []     [] |
-     lordsawar          |                                         []        |
-     lprng              |                                                   |
-     lynx               |                                         []     [] |
-     m4                 |                                                [] |
-     mailfromd          |                                                   |
-     mailutils          |                                                   |
-     make               |                                                [] |
-     man-db             |                                         []     [] |
-     man-db-manpages    |                                                   |
-     midi-instruments   |          []                             []     [] |
-     minicom            |                                                [] |
-     mkisofs            |                                                [] |
-     myserver           |                                                [] |
-     nano               |                          []             []     [] |
-     opcodes            |                                                   |
-     parted             |                                                [] |
-     pies               |                                                   |
-     pnmixer            |                                                   |
-     popt               |                                                [] |
-     procps-ng          |                                                   |
-     procps-ng-man      |                                                   |
-     psmisc             |                                                [] |
-     pspp               |                                         []        |
-     pushover           |                                                [] |
-     pwdutils           |                                                   |
-     pyspread           |                                                   |
-     radius             |                                         []        |
-     recode             |                       []                []     [] |
-     recutils           |                                                   |
-     rpm                |                                                   |
-     rush               |                                                   |
-     sarg               |                                                   |
-     sed                |                []        []             []     [] |
-     sharutils          |                                                [] |
-     shishi             |                                                   |
-     skribilo           |                                                   |
-     solfege            |                                         []     [] |
-     solfege-manual     |                                                   |
-     spotmachine        |                                                   |
-     sudo               |                                         []     [] |
-     sudoers            |                                         []     [] |
-     sysstat            |                                                [] |
-     tar                |                          []             []     [] |
-     texinfo            |                                         []     [] |
-     texinfo_document   |                                         []     [] |
-     tigervnc           |                          []                       |
-     tin                |                                                   |
-     tin-man            |                                                   |
-     tracgoogleappsa... |                                                   |
-     trader             |                                                   |
-     util-linux         |                                                [] |
-     ve                 |                                                   |
-     vice               |                                                   |
-     vmm                |                                                   |
-     vorbis-tools       |                                                [] |
-     wastesedge         |                                                   |
-     wcd                |                                                   |
-     wcd-man            |                                                   |
-     wdiff              |                                         []     [] |
-     wget               |                                                [] |
-     wyslij-po          |                                                   |
-     xboard             |                                                   |
-     xdg-user-dirs      | []    []    [] []     [] []     []      [] []  [] |
-     xkeyboard-config   |                          []             []     [] |
-                        +---------------------------------------------------+
-                          af am an ar as ast az be bg bn bn_IN bs ca crh cs
-                           4  0  2  5  3 11   0  8 25  3   3    1 55  4  74
-
-                          da  de  el en en_GB en_ZA eo es et eu fa fi  fr 
-                        +--------------------------------------------------+
-     a2ps               | []  []  []     []         [] [] []       []  []  |
-     aegis              | []  []                       []              []  |
-     anubis             | []  []                       []          []  []  |
-     aspell             | []  []         []         [] []          []  []  |
-     bash               |                           [] []              []  |
-     bfd                | []                           []          []  []  |
-     binutils           |                              []          []  []  |
-     bison              | []  []  []                [] [] []       []  []  |
-     bison-runtime      | []  []  []                [] [] []       []  []  |
-     buzztrax           | []  []                                   []  []  |
-     ccd2cue            | []  []                    []                 []  |
-     ccide              | []  []                    [] []          []  []  |
-     cflow              | []  []                    []             []  []  |
-     clisp              | []  []     []                []              []  |
-     coreutils          | []  []                       [] []           []  |
-     cpio               | []  []                       []          []  []  |
-     cppi               | []  []                    []             []  []  |
-     cpplib             | []  []                    [] []          []  []  |
-     cryptsetup         | []  []                       []          []  []  |
-     datamash           | []  []                    []                 []  |
-     denemo             | []                                               |
-     dfarc              | []  []                    [] []          []  []  |
-     dialog             | []  []  []                [] []    [] [] []  []  |
-     dico               | []  []                                   []  []  |
-     diffutils          | []  []  []                [] []              []  |
-     dink               | []  []                    [] []          []  []  |
-     direvent           | []  []                    []                 []  |
-     doodle             | []  []                    []             []      |
-     dos2unix           | []  []                    [] []              []  |
-     dos2unix-man       |     []                       []              []  |
-     e2fsprogs          | []  []                    [] []              []  |
-     enscript           | []  []         []         []             []  []  |
-     exif               | []  []                    [] []          []  []  |
-     fetchmail          | []  ()  []     []         [] []              []  |
-     findutils          | []  []  []                [] [] []       []  []  |
-     flex               | []  []                    [] []          []  []  |
-     freedink           | []  []  []                [] []    []    []  []  |
-     fusionforge        |     []                       []              []  |
-     gas                |                              []          []  []  |
-     gawk               | []  []                       []          []  []  |
-     gcal               | []  []                       []              []  |
-     gcc                |     []                                           |
-     gdbm               | []  []                    []             []  []  |
-     gettext-examples   | []  []  []                [] []          []  []  |
-     gettext-runtime    | []  []                    [] []          []  []  |
-     gettext-tools      | []  []                       []          []  []  |
-     gjay               |     []                    []             []  []  |
-     glunarclock        | []  []                    []             []  []  |
-     gnubiff            |     ()                    []             []  ()  |
-     gnubik             | []  []                    []             []  []  |
-     gnucash            | []  ()  ()     ()            ()          ()  ()  |
-     gnuchess           |     []                    [] []              []  |
-     gnulib             | []  []                    [] [] []       []  []  |
-     gnunet             |                              []                  |
-     gnunet-gtk         |     []                                           |
-     gold               |                              []          []  []  |
-     gphoto2            | []  ()                    []                 []  |
-     gprof              | []  []                    [] []          []  []  |
-     gramadoir          | []  []                    []             []  []  |
-     grep               | []  []                    [] [] []       []  []  |
-     grub               | []  []                       []          []  []  |
-     gsasl              | []  []                    []             []  []  |
-     gss                | []  []                    []             []  []  |
-     gst-plugins-bad    | []  []                                       []  |
-     gst-plugins-base   | []  []  []                   []          []  []  |
-     gst-plugins-good   | []  []  []                   []    []    []  []  |
-     gst-plugins-ugly   | []  []  []                [] []    []    []  []  |
-     gstreamer          | []  []  []                   []    []    []  []  |
-     gtick              | []  ()                    []             []  []  |
-     gtkam              | []  ()                    [] []          []  []  |
-     gtkspell           | []  []  []                [] []    []    []  []  |
-     guix               | []                        []                     |
-     guix-packages      |                                                  |
-     gutenprint         | []  []                                   []  []  |
-     hello              | []  []  []                [] [] []       []  []  |
-     help2man           | []  []  []                [] []          []  []  |
-     help2man-texi      |     []                       []              []  |
-     hylafax            |     []                       []                  |
-     idutils            | []  []                    []             []  []  |
-     iso_15924          | []  ()                    [] []    ()    []  ()  |
-     iso_3166           | []  ()  []                [] [] [] ()    []  ()  |
-     iso_3166_2         | []  ()                             ()        ()  |
-     iso_4217           | []  ()  []                   [] [] ()    []  ()  |
-     iso_639            | []  ()                    [] []    ()    []  ()  |
-     iso_639_3          |     ()                             ()        ()  |
-     iso_639_5          |     ()                             ()        ()  |
-     jwhois             |     []                    [] []          []  []  |
-     kbd                | []  []  []                [] []              []  |
-     klavaro            | []  []  []                [] []    []        []  |
-     ld                 | []                           []          []  []  |
-     leafpad            | []  []  []                [] []    []    []  []  |
-     libc               | []  []                       []          []  []  |
-     libexif            | []  []         ()            []              []  |
-     libextractor       |     []                                           |
-     libgnutls          |     []                    []             []  []  |
-     libgphoto2         | []  ()                                       []  |
-     libgphoto2_port    | []  ()                       []    []    []  []  |
-     libgsasl           | []  []                    []             []  []  |
-     libiconv           | []  []                    [] [] []       []  []  |
-     libidn             | []  []                    []             []  []  |
-     liferea            | []  ()  []                   []    []    []  []  |
-     lilypond           | []  []  []                [] []              []  |
-     lordsawar          | []  []                                           |
-     lprng              |                                                  |
-     lynx               | []  []                    []    []       []  []  |
-     m4                 | []  []  []                []             []  []  |
-     mailfromd          |                                              []  |
-     mailutils          |     []                       []          []  []  |
-     make               | []  []                       []          []  []  |
-     man-db             | []  []                    []                 []  |
-     man-db-manpages    |     []                                       []  |
-     midi-instruments   | []  []  []                [] [] []    [] []  []  |
-     minicom            | []  []                       []          []  []  |
-     mkisofs            |                           []             []  []  |
-     myserver           |     []                    []             []  []  |
-     nano               | []  []                    [] []    []    []  []  |
-     opcodes            | []  []                       []          []  []  |
-     parted             | []  []                                       []  |
-     pies               |     []                                           |
-     pnmixer            |     []                                       []  |
-     popt               | []  []                    [] []          []  []  |
-     procps-ng          |     []                                       []  |
-     procps-ng-man      |     []                                       []  |
-     psmisc             | []  []  []                []       []    []  []  |
-     pspp               |     []                       []              []  |
-     pushover           |     ()                    [] []              []  |
-     pwdutils           | []  []                                       []  |
-     pyspread           | []  []                                       []  |
-     radius             |                              []              []  |
-     recode             | []  []  []                [] []          []  []  |
-     recutils           |     []                       []          []  []  |
-     rpm                | []  []                    []             []  []  |
-     rush               |     []                                   []  []  |
-     sarg               | []                                           []  |
-     sed                | []  []  []                [] [] []       []  []  |
-     sharutils          |     []                    []    []           []  |
-     shishi             |     []                                   []  []  |
-     skribilo           | []                           []              []  |
-     solfege            | []  []                    [] [] []    [] []  []  |
-     solfege-manual     |     []                    [] [] []           []  |
-     spotmachine        | []  []                    []             []  []  |
-     sudo               | []  []                    [] []          []  []  |
-     sudoers            | []  []  []                []             []  []  |
-     sysstat            | []  []                    [] []          []  []  |
-     tar                | []  []                    [] [] []       []  []  |
-     texinfo            | []  []                    [] []              []  |
-     texinfo_document   |     []                    [] []              []  |
-     tigervnc           | []  []  []                []             []  []  |
-     tin                | []  []                          []           []  |
-     tin-man            |                []                                |
-     tracgoogleappsa... | []  []                    []             []  []  |
-     trader             | []  []         []         []             []  []  |
-     util-linux         | []  []                       []              []  |
-     ve                 |     []                    [] []          []  []  |
-     vice               | ()  ()                                       ()  |
-     vmm                |     []                                   []      |
-     vorbis-tools       | []  []                    []                 []  |
-     wastesedge         | []                                               |
-     wcd                |     []                    [] []          []      |
-     wcd-man            |     []                                           |
-     wdiff              | []  []                    [] [] []       []  []  |
-     wget               |     []                    [] [] []       []  []  |
-     wyslij-po          |     []                    []             []  []  |
-     xboard             | []  []                       []              []  |
-     xdg-user-dirs      | []  []  []                [] [] [] [] [] []  []  |
-     xkeyboard-config   | []  []  []                [] []          []  []  |
-                        +--------------------------------------------------+
-                          da  de  el en en_GB en_ZA eo es et eu fa fi  fr 
-                          119 131 32  1   6     0   94 95 22 13  4 102 139
-
-                          ga gd gl gu he hi hr hu hy ia id is it ja ka kk
-                        +-------------------------------------------------+
-     a2ps               |                   []          []    [] []       |
-     aegis              |                                     []          |
-     anubis             |                   [] []       []    []          |
-     aspell             | []                []          []    [] []       |
-     bash               |                      []       []    [] []       |
-     bfd                |                               []       []       |
-     binutils           |                               []    [] []       |
-     bison              |                   []                            |
-     bison-runtime      | []    []          [] []    [] []    [] []       |
-     buzztrax           |                                                 |
-     ccd2cue            |                      []                         |
-     ccide              |                   [] []                         |
-     cflow              | []                []          []                |
-     clisp              |                                                 |
-     coreutils          |                      []                []       |
-     cpio               | []                [] []       []    [] []       |
-     cppi               |       []          [] []             [] []       |
-     cpplib             |                               []       []       |
-     cryptsetup         |                                     []          |
-     datamash           |                                                 |
-     denemo             |                                     []          |
-     dfarc              |                   [] []             []          |
-     dialog             | [] [] []          [] []    [] [] [] [] []       |
-     dico               |                                                 |
-     diffutils          |                      []       []    [] []       |
-     dink               |                      []                         |
-     direvent           |                      []                         |
-     doodle             | []                                  []          |
-     dos2unix           |                      []                []       |
-     dos2unix-man       |                                                 |
-     e2fsprogs          |                      []       []                |
-     enscript           | []                []          []                |
-     exif               |       []          []          [] [] [] []       |
-     fetchmail          |                               []    [] []       |
-     findutils          | []    []          [] []       []    [] []       |
-     flex               | []                                              |
-     freedink           |                   [] []       []    []          |
-     fusionforge        |                                                 |
-     gas                |                               []                |
-     gawk               |                               []    () []       |
-     gcal               |                                                 |
-     gcc                |                                                 |
-     gdbm               |                                                 |
-     gettext-examples   | []    []          [] []       []    [] []       |
-     gettext-runtime    | []    []          [] []       []    [] []       |
-     gettext-tools      |                               []    [] []       |
-     gjay               |       []                                        |
-     glunarclock        | []    []          [] []       []    []          |
-     gnubiff            |                      []       []    ()          |
-     gnubik             |       []          []                []          |
-     gnucash            |          () () ()    ()             ()          |
-     gnuchess           |                                                 |
-     gnulib             | []    []             []             [] []       |
-     gnunet             |                                                 |
-     gnunet-gtk         |                                                 |
-     gold               |                               []    []          |
-     gphoto2            |                      []       []    [] []       |
-     gprof              | []                   []       []    []          |
-     gramadoir          | []                   []       []                |
-     grep               | []    []          [] []       []    [] []       |
-     grub               |       []             []             []          |
-     gsasl              | []                [] []       []    []          |
-     gss                | []                [] []       []    []          |
-     gst-plugins-bad    |                   [] []       []                |
-     gst-plugins-base   |       []          [] []       []                |
-     gst-plugins-good   |       []          [] []       []    [] []       |
-     gst-plugins-ugly   |       []          [] []       []    [] []       |
-     gstreamer          |       []          [] []       []    []          |
-     gtick              | []    []             []       []    []          |
-     gtkam              |                      []       [] [] [] []       |
-     gtkspell           | []    []    []    [] [] []    [] [] [] []       |
-     guix               |                                                 |
-     guix-packages      |                                                 |
-     gutenprint         |       []             []             []          |
-     hello              | []    []          [] []       []                |
-     help2man           |                   []                [] []       |
-     help2man-texi      |                                                 |
-     hylafax            |                               []                |
-     idutils            |                      []       []                |
-     iso_15924          |       []             []    [] [] [] []          |
-     iso_3166           | []    [] [] [] [] [] []    [] [] [] [] []    [] |
-     iso_3166_2         |                               []    []          |
-     iso_4217           |                   [] []       [] [] [] []       |
-     iso_639            | []    [] []       [] []       [] [] [] []       |
-     iso_639_3          |       []                            []          |
-     iso_639_5          |                                                 |
-     jwhois             |       []             []       []    []          |
-     kbd                |                      []       []    []          |
-     klavaro            |       []          [] []             []       [] |
-     ld                 | []                            []    [] []       |
-     leafpad            | []    []    []    [] []       []    [] ()       |
-     libc               |       []          []          []    [] []       |
-     libexif            |                                     []          |
-     libextractor       |                                                 |
-     libgnutls          |                                     []          |
-     libgphoto2         |                                     [] []       |
-     libgphoto2_port    |                                     [] []       |
-     libgsasl           | []                   []       []    []          |
-     libiconv           | []    []          [] []       []    [] []       |
-     libidn             |                   [] []       []    []          |
-     liferea            |       []    []       []             [] []       |
-     lilypond           |                                     []          |
-     lordsawar          |                                                 |
-     lprng              |                               []                |
-     lynx               |                      []       []    [] []       |
-     m4                 | []    []          []          []       []       |
-     mailfromd          |                                                 |
-     mailutils          |                                                 |
-     make               |                   []          []    [] []       |
-     man-db             |                               []       []       |
-     man-db-manpages    |                               []       []       |
-     midi-instruments   |       []    []    [] [] []    [] [] [] []       |
-     minicom            |                      []       []       []       |
-     mkisofs            |                               []    []          |
-     myserver           |                                     []          |
-     nano               | []    []          [] []             [] []       |
-     opcodes            | []                            []    []          |
-     parted             |       []             []       []    [] []       |
-     pies               |                                                 |
-     pnmixer            |                   []                []          |
-     popt               | []    [] []       [] []    [] [] [] [] []       |
-     procps-ng          |                                                 |
-     procps-ng-man      |                                                 |
-     psmisc             |                   [] []       []    []          |
-     pspp               |       []                               []       |
-     pushover           |                                     []          |
-     pwdutils           |                               []                |
-     pyspread           |                                                 |
-     radius             |                               []                |
-     recode             | []    []    []    [] []       []    []          |
-     recutils           |                                                 |
-     rpm                |                               []                |
-     rush               |       []                                        |
-     sarg               |                                                 |
-     sed                | []    []          [] []       []    [] []       |
-     sharutils          |                                                 |
-     shishi             |                                                 |
-     skribilo           |                      []                         |
-     solfege            |       []                            []          |
-     solfege-manual     |                                                 |
-     spotmachine        |                                                 |
-     sudo               |       []          []                [] []       |
-     sudoers            |                   []                [] []       |
-     sysstat            |                   [] []       []       []       |
-     tar                | []                [] []       []    [] []       |
-     texinfo            |                   []          []    []          |
-     texinfo_document   |                   [] []             []          |
-     tigervnc           |                                                 |
-     tin                |                                                 |
-     tin-man            |                                                 |
-     tracgoogleappsa... |       []    []    [] []                         |
-     trader             |                   [] []                         |
-     util-linux         |                                        []       |
-     ve                 |                                     []          |
-     vice               |                      ()             ()          |
-     vmm                |                                                 |
-     vorbis-tools       |                   []          []                |
-     wastesedge         |                                     []          |
-     wcd                |                                                 |
-     wcd-man            |                                                 |
-     wdiff              |       []             []             []          |
-     wget               |                   [] []             [] []       |
-     wyslij-po          |       []          []          []                |
-     xboard             |                                                 |
-     xdg-user-dirs      | [] [] [] [] [] [] [] []    [] [] [] [] []    [] |
-     xkeyboard-config   |       []          [] []       []    [] []       |
-                        +-------------------------------------------------+
-                          ga gd gl gu he hi hr hu hy ia id is it ja ka kk
-                          35  2 47  4  8  2 60 71  2  6 81 11 87 57  0  3
-
-                          kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl 
+     Ready PO files       af am an ar as ast az be be@latin bg bn_IN bs ca
                         +--------------------------------------------------+
-     a2ps               |                                  []          []  |
-     aegis              |                                              []  |
-     anubis             |                                  []    []    []  |
-     aspell             |                            []                []  |
-     bash               |                                        []    []  |
+     a2ps               |                       []                      [] |
+     aegis              |                                                  |
+     ant-phone          |                                                  |
+     anubis             |                                                  |
+     aspell             |                []                             [] |
+     bash               |                                                  |
      bfd                |                                                  |
+     bibshelf           |                []                                |
      binutils           |                                                  |
-     bison              |                                              []  |
-     bison-runtime      |          []    [] []             []    []    []  |
-     buzztrax           |                                                  |
-     ccd2cue            |                                                  |
-     ccide              |                   []                         []  |
-     cflow              |                                              []  |
-     clisp              |                                              []  |
-     coreutils          |                                        []    []  |
-     cpio               |                                              []  |
+     bison              |                                                  |
+     bison-runtime      |                []                                |
+     bluez-pin          | []             []                                |
+     bombono-dvd        |                                                  |
+     buzztard           |                                                  |
+     cflow              |                                                  |
+     clisp              |                                                  |
+     coreutils          |                                   []          [] |
+     cpio               |                                                  |
      cppi               |                                                  |
-     cpplib             |                                              []  |
-     cryptsetup         |                                              []  |
-     datamash           |                                        []    []  |
-     denemo             |                                                  |
-     dfarc              |                      []                      []  |
-     dialog             |       []       [] []             []    []    []  |
+     cpplib             |                                               [] |
+     cryptsetup         |                                                  |
+     dfarc              |                                                  |
+     dialog             |                             []                [] |
      dico               |                                                  |
-     diffutils          |                   []                   []    []  |
-     dink               |                                              []  |
-     direvent           |                                              []  |
-     doodle             |                                              []  |
-     dos2unix           |                                        []    []  |
-     dos2unix-man       |                                              []  |
-     e2fsprogs          |                                              []  |
-     enscript           |                                              []  |
-     exif               |    []             []                         []  |
-     fetchmail          |                                              []  |
-     findutils          |                                        []    []  |
-     flex               |                                              []  |
-     freedink           |                                        []    []  |
-     fusionforge        |                                                  |
+     diffutils          |                                               [] |
+     dink               |                                                  |
+     doodle             |                                                  |
+     e2fsprogs          |                                               [] |
+     enscript           |                                               [] |
+     exif               |                                                  |
+     fetchmail          |                                               [] |
+     findutils          |                                   []             |
+     flex               |                                               [] |
+     freedink           |                                                  |
      gas                |                                                  |
-     gawk               |                                              []  |
-     gcal               |                                                  |
+     gawk               |                []                             [] |
+     gcal               |                                               [] |
      gcc                |                                                  |
-     gdbm               |                                                  |
-     gettext-examples   |          []       []             [] [] []    []  |
-     gettext-runtime    |    []                                  []    []  |
-     gettext-tools      |    []                                            |
+     gettext-examples   | []             []                 []          [] |
+     gettext-runtime    |                                   []          [] |
+     gettext-tools      |                                   []          [] |
+     gip                |                                   []             |
      gjay               |                                                  |
-     glunarclock        |                   []                         []  |
-     gnubiff            |                                              []  |
-     gnubik             |                                        []    []  |
-     gnucash            | () ()          () ()          ()       () () []  |
-     gnuchess           |                                        []    []  |
-     gnulib             |                                              []  |
+     gliv               |                                   []             |
+     glunarclock        |                []                 []             |
+     gnubiff            |                                                  |
+     gnucash            |                                               [] |
+     gnuedu             |                                                  |
+     gnulib             |                                                  |
      gnunet             |                                                  |
      gnunet-gtk         |                                                  |
+     gnutls             |                                                  |
      gold               |                                                  |
-     gphoto2            |                                              []  |
-     gprof              |                                  []          []  |
-     gramadoir          |                                              []  |
-     grep               |                                        []    []  |
-     grub               |                []                      []    []  |
-     gsasl              |                                              []  |
+     gpe-aerial         |                                                  |
+     gpe-beam           |                                                  |
+     gpe-bluetooth      |                                                  |
+     gpe-calendar       |                                                  |
+     gpe-clock          |                []                                |
+     gpe-conf           |                                                  |
+     gpe-contacts       |                                                  |
+     gpe-edit           |                                                  |
+     gpe-filemanager    |                                                  |
+     gpe-go             |                                                  |
+     gpe-login          |                                                  |
+     gpe-ownerinfo      |                []                                |
+     gpe-package        |                                                  |
+     gpe-sketchbook     |                                                  |
+     gpe-su             |                []                                |
+     gpe-taskmanager    |                []                                |
+     gpe-timesheet      |                []                                |
+     gpe-today          |                []                                |
+     gpe-todo           |                                                  |
+     gphoto2            |                                                  |
+     gprof              |                                   []             |
+     gpsdrive           |                                                  |
+     gramadoir          |                                                  |
+     grep               |                                                  |
+     grub               |                []                             [] |
+     gsasl              |                                                  |
      gss                |                                                  |
-     gst-plugins-bad    |                   []                   []    []  |
-     gst-plugins-base   |                   []                   []    []  |
-     gst-plugins-good   |                [] []                   []    []  |
-     gst-plugins-ugly   |                   []             [] [] []    []  |
-     gstreamer          |                []                      []    []  |
-     gtick              |                                              []  |
-     gtkam              |                                        []    []  |
-     gtkspell           |          []    [] []       []    []    []    []  |
-     guix               |                                                  |
-     guix-packages      |                                                  |
-     gutenprint         |                                              []  |
-     hello              |                   []                   []    []  |
-     help2man           |                                        []        |
-     help2man-texi      |                                                  |
-     hylafax            |                                              []  |
-     idutils            |                                              []  |
-     iso_15924          |                () []                         []  |
-     iso_3166           | [] [] []       () [] [] []    []       []    []  |
-     iso_3166_2         |                ()                            []  |
-     iso_4217           |                () []                   []    []  |
-     iso_639            | [] []          () []    []    []             []  |
-     iso_639_3          | []             ()             []                 |
-     iso_639_5          |                ()                                |
-     jwhois             |                   []                         []  |
-     kbd                |                                              []  |
-     klavaro            |                                        []    []  |
-     ld                 |                                                  |
-     leafpad            |    []    []    [] []                         []  |
-     libc               |    []                                        []  |
-     libexif            |                                              []  |
-     libextractor       |                                              []  |
-     libgnutls          |                                  []          []  |
-     libgphoto2         |                                              []  |
-     libgphoto2_port    |                                              []  |
-     libgsasl           |                                              []  |
-     libiconv           |                []                            []  |
-     libidn             |                                              []  |
-     liferea            |                [] []                         []  |
-     lilypond           |                                              []  |
+     gst-plugins-bad    |                                   []             |
+     gst-plugins-base   |                                   []             |
+     gst-plugins-good   |                                   []             |
+     gst-plugins-ugly   |                                   []             |
+     gstreamer          | []                                []          [] |
+     gtick              |                                                  |
+     gtkam              |                       []                         |
+     gtkorphan          |                                   []             |
+     gtkspell           | []             []     []                         |
+     gutenprint         |                                                  |
+     hello              |                                   []             |
+     help2man           |                                                  |
+     hylafax            |                                                  |
+     idutils            |                                                  |
+     indent             |                                   []          [] |
+     iso_15924          |                                                  |
+     iso_3166           | []          []        []          []  []   [] [] |
+     iso_3166_2         |                                                  |
+     iso_4217           |                                                  |
+     iso_639            |             [] []     []              []         |
+     iso_639_3          |                                                  |
+     jwhois             |                                                  |
+     kbd                |                                                  |
+     keytouch           |                                               [] |
+     keytouch-editor    |                                                  |
+     keytouch-keyboa... |                                               [] |
+     klavaro            |          []                                      |
+     latrine            |                                                  |
+     ld                 |                                   []             |
+     leafpad            |                                   []          [] |
+     libc               |                                   []          [] |
+     libexif            |                       ()                         |
+     libextractor       |                                                  |
+     libgnutls          |                                                  |
+     libgpewidget       |                                                  |
+     libgpg-error       |                                                  |
+     libgphoto2         |                                                  |
+     libgphoto2_port    |                                                  |
+     libgsasl           |                                                  |
+     libiconv           |                                   []             |
+     libidn             |                                                  |
+     lifelines          |                                                  |
+     liferea            |                             []                [] |
+     lilypond           |                                                  |
+     linkdr             |          []                                      |
      lordsawar          |                                                  |
      lprng              |                                                  |
-     lynx               |                                              []  |
-     m4                 |                                              []  |
+     lynx               |                                               [] |
+     m4                 |                                                  |
      mailfromd          |                                                  |
      mailutils          |                                                  |
-     make               |    []                                        []  |
-     man-db             |                                              []  |
-     man-db-manpages    |                                              []  |
-     midi-instruments   |    [] []       []          []    []       [] []  |
-     minicom            |                                        []        |
-     mkisofs            |                                              []  |
+     make               |                                                  |
+     man-db             |                                                  |
+     man-db-manpages    |                                                  |
+     minicom            |                                                  |
+     mkisofs            |                                                  |
      myserver           |                                                  |
-     nano               |                                  []    []    []  |
-     opcodes            |                                              []  |
-     parted             |    []                                        []  |
+     nano               |                                   []          [] |
+     opcodes            |                                                  |
+     parted             |                                                  |
      pies               |                                                  |
-     pnmixer            |                                              []  |
-     popt               | [] []             []                   []    []  |
-     procps-ng          |                                                  |
-     procps-ng-man      |                                                  |
-     psmisc             |                                              []  |
-     pspp               |                []                            []  |
-     pushover           |                                                  |
-     pwdutils           |                                              []  |
-     pyspread           |                                                  |
-     radius             |                                              []  |
-     recode             |                                        []    []  |
-     recutils           |                                              []  |
-     rpm                |                                              []  |
-     rush               |                                              []  |
+     popt               |                                                  |
+     psmisc             |                                                  |
+     pspp               |                                               [] |
+     pwdutils           |                                                  |
+     radius             |                                               [] |
+     recode             |                       []                      [] |
+     rosegarden         |                                                  |
+     rpm                |                                                  |
+     rush               |                                                  |
      sarg               |                                                  |
-     sed                |                                        []    []  |
-     sharutils          |                                              []  |
+     screem             |                                                  |
+     scrollkeeper       |                    [] []                      [] |
+     sed                |                []                             [] |
+     sharutils          |                                   []          [] |
      shishi             |                                                  |
-     skribilo           |                                                  |
-     solfege            |                                        []    []  |
-     solfege-manual     |                                              []  |
-     spotmachine        |                                              []  |
-     sudo               |    []                                  []    []  |
-     sudoers            |    []                                  []    []  |
-     sysstat            |                                        []    []  |
-     tar                |          []                            []    []  |
-     texinfo            |                                              []  |
-     texinfo_document   |                                              []  |
-     tigervnc           |                                              []  |
+     skencil            |                                                  |
+     solfege            |                                                  |
+     solfege-manual     |                                                  |
+     soundtracker       |                                                  |
+     sp                 |                                                  |
+     sysstat            |                                                  |
+     tar                |                                   []             |
+     texinfo            |                                                  |
      tin                |                                                  |
-     tin-man            |                                                  |
-     tracgoogleappsa... |                   []                   []    []  |
-     trader             |                                        []        |
-     util-linux         |                                              []  |
-     ve                 |                                              []  |
-     vice               |                                              []  |
-     vmm                |                                              []  |
-     vorbis-tools       |                                              []  |
-     wastesedge         |                                              []  |
-     wcd                |                                              []  |
-     wcd-man            |                                              []  |
-     wdiff              |                                              []  |
-     wget               |                                        []    []  |
-     wyslij-po          |                                              []  |
-     xboard             |                                              []  |
-     xdg-user-dirs      | [] [] [] []    [] [] [] []    []       []    []  |
-     xkeyboard-config   |    []          []                            []  |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                                                  |
+     util-linux-ng      |                                               [] |
+     vice               |                                                  |
+     vmm                |                                                  |
+     vorbis-tools       |                                                  |
+     wastesedge         |                                                  |
+     wdiff              |                                                  |
+     wget               |                       []                      [] |
+     wyslij-po          |                                                  |
+     xchat              |                []     []          []          [] |
+     xdg-user-dirs      | []    []    [] []     []    []    []  []      [] |
+     xkeyboard-config   |                                   []          [] |
                         +--------------------------------------------------+
-                          kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl 
-                           5 15  4  6  0 13 23  3  3  3  4 11  2 42  1 125
+                          af am an ar as ast az be be@latin bg bn_IN bs ca
+                           6  0  1  2  3 19   1 10     3    28   3    1 38
 
-                          nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr 
-                        +------------------------------------------------+
-     a2ps               |          []     []  []   [] []       []    []  |
-     aegis              |                     []      []                 |
-     anubis             |          []                 []             []  |
-     aspell             |          []         []   [] []    [] []    []  |
-     bash               |          []         []      []    [] []    []  |
-     bfd                |                             []             []  |
-     binutils           |                             []             []  |
-     bison              |          []         []                     []  |
-     bison-runtime      |          []     []  []   [] []       [] [] []  |
-     buzztrax           |                     []                         |
-     ccd2cue            |                     []                     []  |
-     ccide              |          []                 []             []  |
-     cflow              |          []         []                     []  |
-     clisp              |                             []                 |
-     coreutils          |          []                 []       []    []  |
-     cpio               |          []                 []             []  |
-     cppi               |          []         []                     []  |
-     cpplib             |                     []      []             []  |
-     cryptsetup         |          []         []                     []  |
-     datamash           |                     []                     []  |
-     denemo             |                                                |
-     dfarc              |          []         []                     []  |
-     dialog             |          []         []   [] []    [] []    []  |
-     dico               |          []                                    |
-     diffutils          |          []         []                     []  |
-     dink               |                                                |
-     direvent           |          []         []                     []  |
-     doodle             |                                         [] []  |
-     dos2unix           |          []         []      []             []  |
-     dos2unix-man       |          []         []                         |
-     e2fsprogs          |          []                                    |
-     enscript           |          []         []   [] []       []    []  |
-     exif               |          []         []   [] []    []       []  |
-     fetchmail          |          []                 []          []     |
-     findutils          |          []         []      []    [] []    []  |
-     flex               |          []         []   [] []             []  |
-     freedink           |          []         []      []       []    []  |
-     fusionforge        |                                                |
-     gas                |                                                |
-     gawk               |          []                                    |
-     gcal               |                                                |
-     gcc                |                                                |
-     gdbm               |          []         []                     []  |
-     gettext-examples   |          []     []  []   [] []    [] []    []  |
-     gettext-runtime    | []       []     []  []   [] []    [] []    []  |
-     gettext-tools      |          []         []   [] []    [] []    []  |
-     gjay               |                                            []  |
-     glunarclock        |          []         []   []       [] []    []  |
-     gnubiff            |                                            []  |
-     gnubik             |          []         []               []    []  |
-     gnucash            |          ()     ()  ()   () ()             []  |
-     gnuchess           |                     []                     []  |
-     gnulib             |          []         []      []       []    []  |
-     gnunet             |                                                |
-     gnunet-gtk         |                                                |
-     gold               |                                                |
-     gphoto2            |          []         []   [] []             []  |
-     gprof              |                     []   [] []             []  |
-     gramadoir          |                                   []       []  |
-     grep               |          []         []      []    [] []    []  |
-     grub               |          []         []      []       []    []  |
-     gsasl              |          []                       []       []  |
-     gss                |          []              []       []       []  |
-     gst-plugins-bad    |          []         []      []    []       []  |
-     gst-plugins-base   |          []         []      []    [] []    []  |
-     gst-plugins-good   |          []         []   [] []    [] []    []  |
-     gst-plugins-ugly   |          []         []   [] []    [] []    []  |
-     gstreamer          |          []         []   [] []    [] []    []  |
-     gtick              |          []         []      []    []       []  |
-     gtkam              |       [] []         []      []    []       []  |
-     gtkspell           |          []     []  []   [] []    [] [] [] []  |
-     guix               |                                                |
-     guix-packages      |                                                |
-     gutenprint         |                                   [] []        |
-     hello              |          []         []      []    [] []    []  |
-     help2man           |          []         []      []             []  |
-     help2man-texi      |          []                                    |
-     hylafax            |                                                |
-     idutils            |          []                 []             []  |
-     iso_15924          |          []     ()       [] []       []    []  |
-     iso_3166           | [] [] [] []     ()  []   [] [] [] [] [] [] []  |
-     iso_3166_2         |          []     ()                         []  |
-     iso_4217           | []       []     ()       [] [] []    []    []  |
-     iso_639            |    [] [] []     ()       [] [] [] [] []    []  |
-     iso_639_3          |       []        ()                             |
-     iso_639_5          |                 ()                         []  |
-     jwhois             |          []         []   []                []  |
-     kbd                |          []                 []                 |
-     klavaro            |       [] []         []      []       []        |
-     ld                 |                                                |
-     leafpad            | []       []     []  []      []    [] []    []  |
-     libc               |          []                 []    []           |
-     libexif            |          []         ()            []           |
-     libextractor       |          []                                    |
-     libgnutls          |          []                                    |
-     libgphoto2         |          []                                    |
-     libgphoto2_port    |          []         []      []    []       []  |
-     libgsasl           |          []              []       []       []  |
-     libiconv           |          []         []            [] []    []  |
-     libidn             |          []         []                     []  |
-     liferea            |          []     []  []   [] ()    []    []     |
-     lilypond           |                                                |
-     lordsawar          |                                                |
-     lprng              |          []                                    |
-     lynx               |                     []      []                 |
-     m4                 |          []         []   [] []             []  |
-     mailfromd          |          []                                    |
-     mailutils          |          []                                    |
-     make               |          []         []      []                 |
-     man-db             |          []                 []             []  |
-     man-db-manpages    |          []                 []             []  |
-     midi-instruments   |          []     []  []   [] []    [] []    []  |
-     minicom            |          []         []   [] []                 |
-     mkisofs            |          []                 []             []  |
-     myserver           |                                      []    []  |
-     nano               |          []         []   [] []       []    []  |
-     opcodes            |                                                |
-     parted             |          []         []      []    [] []    []  |
-     pies               |          []                                    |
-     pnmixer            |                             []                 |
-     popt               |          []     []  []      []       []    []  |
-     procps-ng          |          []                                    |
-     procps-ng-man      |          []                                    |
-     psmisc             |          []         []      []             []  |
-     pspp               |          []                 []                 |
-     pushover           |                                                |
-     pwdutils           |          []                                    |
-     pyspread           | []                  []                         |
-     radius             |          []                 []                 |
-     recode             |          []     []  []   [] []    [] []    []  |
-     recutils           |                     []                     []  |
-     rpm                |          []                                    |
-     rush               |          []         []                     []  |
-     sarg               |                     []      []                 |
-     sed                |          []     []  []   [] []    [] []    []  |
-     sharutils          |          []         []                     []  |
-     shishi             |          []                                []  |
-     skribilo           |                                            []  |
-     solfege            |          []         []      []                 |
-     solfege-manual     |          []         []                         |
-     spotmachine        |                     []                     []  |
-     sudo               |          []         []      []    [] []    []  |
-     sudoers            |          []         []               []    []  |
-     sysstat            |          []         []      []    []       []  |
-     tar                |          []         []      []       []    []  |
-     texinfo            |          []         []      []                 |
-     texinfo_document   |          []         []                         |
-     tigervnc           |                     []      []             []  |
-     tin                |                             []                 |
-     tin-man            |                                                |
-     tracgoogleappsa... |          []         []      []             []  |
-     trader             |                             []             []  |
-     util-linux         |          []         []                         |
-     ve                 |          []         []                     []  |
-     vice               |                                                |
-     vmm                |                                                |
-     vorbis-tools       |          []                          []    []  |
-     wastesedge         |                                                |
-     wcd                |                                                |
-     wcd-man            |                                                |
-     wdiff              |          []         []      []       []    []  |
-     wget               |          []         []      []    []       []  |
-     wyslij-po          | []       []         []                     []  |
-     xboard             |          []                 []             []  |
-     xdg-user-dirs      | [] [] [] []  [] []  []   [] []    [] [] [] []  |
-     xkeyboard-config   |          []         []      []       []        |
-                        +------------------------------------------------+
-                          nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr 
-                           7  3  6 114  1 12  88   32 82  3 40 45  7 101
+                          crh cs da  de  el en en_GB en_ZA eo es et eu fa
+                        +-------------------------------------------------+
+     a2ps               |     [] []  []  []     []            [] []       |
+     aegis              |        []  []                       []          |
+     ant-phone          |        []  ()                                   |
+     anubis             |        []  []                                   |
+     aspell             |     [] []  []         []            []          |
+     bash               |     []                           [] []          |
+     bfd                |                                     []          |
+     bibshelf           |        []  []                       []          |
+     binutils           |                                     []          |
+     bison              |            []  []                               |
+     bison-runtime      |        []  []  []                      []       |
+     bluez-pin          |     [] []  []  []                [] []          |
+     bombono-dvd        |        []                                       |
+     buzztard           |     [] []  []                                   |
+     cflow              |        []  []                                   |
+     clisp              |        []  []     []                []          |
+     coreutils          |     [] []  []                          []       |
+     cpio               |                                                 |
+     cppi               |                                                 |
+     cpplib             |        []  []                       []          |
+     cryptsetup         |            []                                   |
+     dfarc              |        []  []                       []          |
+     dialog             |        []  []                    [] []    []    |
+     dico               |                                                 |
+     diffutils          |     [] []  []  []                [] []          |
+     dink               |        []  []                       []          |
+     doodle             |            []                                   |
+     e2fsprogs          |     []     []                       []          |
+     enscript           |        []  []         []                        |
+     exif               |     () []  []                                   |
+     fetchmail          |     [] []  ()  []     []            []          |
+     findutils          |     [] []  []                                   |
+     flex               |            []                       []          |
+     freedink           |        []  []                       []          |
+     gas                |                                     []          |
+     gawk               |        []  []                       []          |
+     gcal               |                                     []          |
+     gcc                |            []                       []          |
+     gettext-examples   |            []  []                [] []          |
+     gettext-runtime    |        []  []                    [] []          |
+     gettext-tools      |            []                       []    []    |
+     gip                |        []  []                       []    []    |
+     gjay               |            []                                   |
+     gliv               |     [] []  []                                   |
+     glunarclock        |        []  []                                   |
+     gnubiff            |            ()                                   |
+     gnucash            |     []     ()  ()     ()            ()          |
+     gnuedu             |        []                           []          |
+     gnulib             |            []                       []          |
+     gnunet             |                                                 |
+     gnunet-gtk         |        []                                       |
+     gnutls             |     []     []                                   |
+     gold               |                                     []          |
+     gpe-aerial         |     [] []  []                       []          |
+     gpe-beam           |     [] []  []                       []          |
+     gpe-bluetooth      |        []  []                                   |
+     gpe-calendar       |        []                                       |
+     gpe-clock          |     [] []  []                       []          |
+     gpe-conf           |     [] []  []                                   |
+     gpe-contacts       |        []  []                       []          |
+     gpe-edit           |        []  []                                   |
+     gpe-filemanager    |        []  []                       []          |
+     gpe-go             |     [] []  []                       []          |
+     gpe-login          |        []  []                                   |
+     gpe-ownerinfo      |     [] []  []                       []          |
+     gpe-package        |        []  []                       []          |
+     gpe-sketchbook     |     [] []  []                       []          |
+     gpe-su             |     [] []  []                       []          |
+     gpe-taskmanager    |     [] []  []                       []          |
+     gpe-timesheet      |     [] []  []                       []          |
+     gpe-today          |     [] []  []                       []          |
+     gpe-todo           |        []  []                       []          |
+     gphoto2            |     [] []  ()         []            []    []    |
+     gprof              |        []  []                       []          |
+     gpsdrive           |        []                           [] []       |
+     gramadoir          |        []  []                    []             |
+     grep               |     []                                          |
+     grub               |        []  []                                   |
+     gsasl              |            []                                   |
+     gss                |                                                 |
+     gst-plugins-bad    |     [] []  []                       []    []    |
+     gst-plugins-base   |     [] []  []                       []    []    |
+     gst-plugins-good   |     [] []  []  []                   []    []    |
+     gst-plugins-ugly   |     [] []  []  []                   []    []    |
+     gstreamer          |     [] []  []                       []    []    |
+     gtick              |        []  ()                    []             |
+     gtkam              |     [] []  ()                    [] []          |
+     gtkorphan          |     [] []  []                    []             |
+     gtkspell           |     [] []  []  []                [] []    []    |
+     gutenprint         |        []  []         []                        |
+     hello              |        []  []                    [] []          |
+     help2man           |            []                                   |
+     hylafax            |            []                       []          |
+     idutils            |        []  []                                   |
+     indent             |     [] []  []                    [] [] [] []    |
+     iso_15924          |        []      ()                [] []          |
+     iso_3166           | []  [] []  []  ()                [] [] [] ()    |
+     iso_3166_2         |                ()                               |
+     iso_4217           |     [] []  []  ()                   [] []       |
+     iso_639            | []  [] []  []  ()                [] []          |
+     iso_639_3          | []                                              |
+     jwhois             |                                     []          |
+     kbd                |     [] []  []  []                   []          |
+     keytouch           |        []  []                                   |
+     keytouch-editor    |        []  []                                   |
+     keytouch-keyboa... |        []                                       |
+     klavaro            |     [] []  []                    []             |
+     latrine            |        []  ()                                   |
+     ld                 |        []                           []          |
+     leafpad            |     [] []  []  []                   []    []    |
+     libc               |     [] []  []                       []          |
+     libexif            |        []  []         ()                        |
+     libextractor       |                                                 |
+     libgnutls          |     []                                          |
+     libgpewidget       |        []  []                                   |
+     libgpg-error       |     []     []                                   |
+     libgphoto2         |        []  ()                                   |
+     libgphoto2_port    |        []  ()                             []    |
+     libgsasl           |                                                 |
+     libiconv           |     [] []  []                    []    []       |
+     libidn             |     []     []                    []             |
+     lifelines          |        []  ()                                   |
+     liferea            |     []     []  []                   []    []    |
+     lilypond           |     []     []                       []          |
+     linkdr             |        []  []                       []          |
+     lordsawar          |        []                                       |
+     lprng              |                                                 |
+     lynx               |     [] []  []                          []       |
+     m4                 |     [] []  []  []                               |
+     mailfromd          |                                                 |
+     mailutils          |                                     []          |
+     make               |        []  []                       []          |
+     man-db             |                                                 |
+     man-db-manpages    |                                                 |
+     minicom            |     [] []  []                       []          |
+     mkisofs            |                                                 |
+     myserver           |                                                 |
+     nano               |            []                       []    []    |
+     opcodes            |            []                       []          |
+     parted             |     []     []                                   |
+     pies               |                                                 |
+     popt               |     [] []  []                    [] []          |
+     psmisc             |     []     []                             []    |
+     pspp               |                                     []          |
+     pwdutils           |        []                                       |
+     radius             |                                     []          |
+     recode             |     [] []  []  []                [] []          |
+     rosegarden         |     ()     ()                       ()          |
+     rpm                |        []  []                       []          |
+     rush               |                                                 |
+     sarg               |                                                 |
+     screem             |                                                 |
+     scrollkeeper       |     [] []  []         []            []          |
+     sed                |     []     []  []                [] [] []       |
+     sharutils          |        []  []                       [] []       |
+     shishi             |                                                 |
+     skencil            |        []  ()                       []          |
+     solfege            |            []                    []    []       |
+     solfege-manual     |                                  []    []       |
+     soundtracker       |        []  []                       []          |
+     sp                 |            []                                   |
+     sysstat            |        []  []                             []    |
+     tar                |     []     []                          [] []    |
+     texinfo            |            []                    [] []          |
+     tin                |            []                          []       |
+     unicode-han-tra... |                                                 |
+     unicode-transla... |                                                 |
+     util-linux-ng      |     [] []  []                       []          |
+     vice               |        ()  ()                                   |
+     vmm                |            []                                   |
+     vorbis-tools       |     []                           []             |
+     wastesedge         |        []                                       |
+     wdiff              |            []                       []          |
+     wget               |     []     []                          []       |
+     wyslij-po          |                                                 |
+     xchat              |     []     []  []                   [] []       |
+     xdg-user-dirs      | []  [] []  []  []                [] [] [] []    |
+     xkeyboard-config   | []  [] []  []                    [] []          |
+                        +-------------------------------------------------+
+                          crh cs da  de  el en en_GB en_ZA eo es et eu fa
+                           5  64 105 117 18  1   8     0   28 89 18 19  0
 
-                          sv  sw ta te tg th tr uk  ur vi  wa wo zh_CN
-                        +----------------------------------------------+
-     a2ps               | []              [] [] []     []              |
-     aegis              |                              []              |
-     anubis             | []                 [] []     []              |
-     aspell             | []                    []     []  []     []   |
-     bash               | []                    []     []         []   |
-     bfd                | []                    []     []              |
-     binutils           | []                    []     []              |
-     bison              | []                    []     []         []   |
-     bison-runtime      | []              [] [] []     []         []   |
-     buzztrax           | []                           []         []   |
-     ccd2cue            |                       []     []         []   |
-     ccide              | []                    []     []         []   |
-     cflow              | []                    []     []         []   |
-     clisp              |                                              |
-     coreutils          | []                    []     []              |
-     cpio               | []                 [] []     []         []   |
-     cppi               | []                    []     []         []   |
-     cpplib             | []                 [] []     []         []   |
-     cryptsetup         |                       []     []         []   |
-     datamash           | []                    []     []              |
-     denemo             |                                         []   |
-     dfarc              | []                           []              |
-     dialog             | []  []          []           []  []     []   |
-     dico               |                       []                     |
-     diffutils          | []                 [] []     []         []   |
-     dink               | []                                           |
-     direvent           |                       []     []              |
-     doodle             | []                           []              |
-     dos2unix           | []                    []     []         []   |
-     dos2unix-man       | []                    []                []   |
-     e2fsprogs          | []                    []     []         []   |
-     enscript           | []                 [] []     []              |
-     exif               | []                 [] []     []         []   |
-     fetchmail          | []                 []        []         []   |
-     findutils          | []                 [] []     []         []   |
-     flex               | []                 []        []         []   |
-     freedink           | []              []           []              |
-     fusionforge        |                                              |
-     gas                |                       []                     |
-     gawk               | []                           []         []   |
-     gcal               | []                 []                   []   |
-     gcc                | []                                           |
-     gdbm               |                       []     []              |
-     gettext-examples   | []                 [] []     []         []   |
-     gettext-runtime    | []                 [] []     []         []   |
-     gettext-tools      | []                 [] []     []         []   |
-     gjay               |                 []           []         []   |
-     glunarclock        | []                           []  []     []   |
-     gnubiff            | []                           []              |
-     gnubik             | []                    []     []         []   |
-     gnucash            |        () ()              () ()         []   |
-     gnuchess           |                       []     []         []   |
-     gnulib             | []                    []     []         []   |
-     gnunet             |                                              |
-     gnunet-gtk         |                                              |
-     gold               |                       []     []              |
-     gphoto2            | []                    []     []         []   |
-     gprof              | []                 [] []     []              |
-     gramadoir          | []                           []         []   |
-     grep               | []              []    []     []         []   |
-     grub               | []                 [] []     []              |
-     gsasl              | []                    []     []         []   |
-     gss                | []                           []         []   |
-     gst-plugins-bad    | []                 [] []     []         []   |
-     gst-plugins-base   | []                 [] []     []         []   |
-     gst-plugins-good   | []                 [] []     []         []   |
-     gst-plugins-ugly   | []                 [] []     []         []   |
-     gstreamer          | []                 [] []     []         []   |
-     gtick              |                       []     []         []   |
-     gtkam              | []                    []     []         []   |
-     gtkspell           | []              [] [] []     []  []     []   |
-     guix               |                                              |
-     guix-packages      |                                              |
-     gutenprint         |                    [] []     []         []   |
-     hello              | []              [] [] []     []         []   |
-     help2man           |                       []     []         []   |
-     help2man-texi      |                       []                     |
-     hylafax            |                              []              |
-     idutils            |                       []     []         []   |
-     iso_15924          | []              () [] []     ()         []   |
-     iso_3166           | []        []    () [] []     ()  []     []   |
-     iso_3166_2         |                 () [] []     ()         []   |
-     iso_4217           | []              () [] []     ()         []   |
-     iso_639            | []     [] []    () [] []     ()  []     []   |
-     iso_639_3          |        []       () [] []     ()              |
-     iso_639_5          |                 ()    []     ()              |
-     jwhois             | []                 []        []         []   |
-     kbd                | []                    []     []         []   |
-     klavaro            | []                    []  [] []     []  []   |
-     ld                 | []                 [] []     []         []   |
-     leafpad            | []              [] [] []     []         []   |
-     libc               | []                 [] []     []         []   |
-     libexif            | []                           []         ()   |
-     libextractor       |                       []     []              |
-     libgnutls          | []                    []     []         []   |
-     libgphoto2         | []                    []     []              |
-     libgphoto2_port    | []                    []     []         []   |
-     libgsasl           | []                    []     []         []   |
-     libiconv           | []                    []     []  []     []   |
-     libidn             | ()                    []     []         []   |
-     liferea            | []                 [] []     []         []   |
-     lilypond           |                              []              |
-     lordsawar          |                                              |
-     lprng              |                              []              |
-     lynx               | []                 [] []     []              |
-     m4                 | []                           []         []   |
-     mailfromd          |                       []     []              |
-     mailutils          |                              []              |
-     make               | []                    []     []         []   |
-     man-db             | []                           []         []   |
-     man-db-manpages    | []                                      []   |
-     midi-instruments   | []              [] [] []     []         []   |
-     minicom            | []                           []              |
-     mkisofs            |                       []     []         []   |
-     myserver           |                              []              |
-     nano               | []                    []     []         []   |
-     opcodes            |                       []     []         []   |
-     parted             | []                 [] []     []         []   |
-     pies               |                       []     []              |
-     pnmixer            |                       []     []         []   |
-     popt               | []     []       [] [] []     []         []   |
-     procps-ng          |                       []     []              |
-     procps-ng-man      |                       []                     |
-     psmisc             | []                    []     []         []   |
-     pspp               |                    [] []                []   |
-     pushover           | []                                           |
-     pwdutils           | []                           []              |
-     pyspread           |                       []                     |
-     radius             |                       []     []              |
-     recode             | []                 []        []         []   |
-     recutils           | []                    []     []              |
-     rpm                | []                    []     []         []   |
-     rush               |                       []     []              |
-     sarg               |                                              |
-     sed                | []                 [] []     []         []   |
-     sharutils          | []                    []     []         []   |
-     shishi             |                              []         []   |
-     skribilo           | []                    []                     |
-     solfege            | []                 []        []         []   |
-     solfege-manual     |                    []                        |
-     spotmachine        | []                    []     []              |
-     sudo               | []                 [] []     []         []   |
-     sudoers            | []                    []     []         []   |
-     sysstat            | []                 [] []     []         []   |
-     tar                | []                 [] []     []         []   |
-     texinfo            |                    [] []     []              |
-     texinfo_document   |                       []                     |
-     tigervnc           | []                    []                []   |
-     tin                |                                         []   |
-     tin-man            |                                              |
-     tracgoogleappsa... | []              []    []     []         []   |
-     trader             | []                                           |
-     util-linux         | []                    []     []         []   |
-     ve                 | []                    []     []         []   |
-     vice               | ()                 ()                        |
-     vmm                |                                              |
-     vorbis-tools       | []                           []              |
-     wastesedge         |                                              |
-     wcd                |                       []     []         []   |
-     wcd-man            |                       []                     |
-     wdiff              | []                    []     []         []   |
-     wget               |                       []     []         []   |
-     wyslij-po          |                       []     []              |
-     xboard             |                       []                []   |
-     xdg-user-dirs      | []     [] []    [] [] []     []         []   |
-     xkeyboard-config   | []                 [] []     []              |
-                        +----------------------------------------------+
-                          sv  sw ta te tg th tr uk  ur vi  wa wo zh_CN
-                          106  1  4  3  0 13 51 115  1 125  7  1  100 
+                          fi  fr  ga gl gu he hi hr hu hy id  is it ja ka kn
+                        +----------------------------------------------------+
+     a2ps               | []  []                          []        []       |
+     aegis              |     []                                 []          |
+     ant-phone          |     []                                 []          |
+     anubis             | []  []                          []     []          |
+     aspell             |     []  []                      []     []          |
+     bash               | []  []                          []        []       |
+     bfd                | []  []                          []                 |
+     bibshelf           | []  []  []                      []     []          |
+     binutils           | []  []                          []                 |
+     bison              | []  []  []                      []                 |
+     bison-runtime      | []  []  []                      []     [] []       |
+     bluez-pin          | []  []  []                [] [] []  []    []       |
+     bombono-dvd        | []                                                 |
+     buzztard           |                                 []                 |
+     cflow              | []      []                      []                 |
+     clisp              |     []                                             |
+     coreutils          |     []  []                []    []     []          |
+     cpio               | []  []  []                      []                 |
+     cppi               | []  []                                             |
+     cpplib             | []  []                          []                 |
+     cryptsetup         |     []                          []     []          |
+     dfarc              | []  []                                 []          |
+     dialog             |     []  [] []                   []  [] [] []       |
+     dico               |                                                    |
+     diffutils          | []  []  [] []    []       []    []     [] []       |
+     dink               |     []                                             |
+     doodle             |         []                             []          |
+     e2fsprogs          |     []                          []                 |
+     enscript           |     []  []             []       []                 |
+     exif               | []  []                          []  [] [] []       |
+     fetchmail          |     []                          []     [] []       |
+     findutils          | []  []  []                []    []     []          |
+     flex               | []  []  []                                         |
+     freedink           | []  []                          []                 |
+     gas                |     []                          []                 |
+     gawk               |     []  []       []             []     () []       |
+     gcal               |     []                                             |
+     gcc                |                                 []                 |
+     gettext-examples   | []  []  []                []    []     [] []       |
+     gettext-runtime    | []  []  []                      []     [] []       |
+     gettext-tools      |     []                          []     [] []       |
+     gip                | []  []  [] []                   []        []       |
+     gjay               | []                                                 |
+     gliv               | []  ()                                             |
+     glunarclock        | []      []                []    []                 |
+     gnubiff            |     ()                          []     ()          |
+     gnucash            | ()  ()           ()       ()           () []       |
+     gnuedu             |     []                                 []          |
+     gnulib             | []  []  []                []           [] []       |
+     gnunet             |                                                    |
+     gnunet-gtk         |     []                                             |
+     gnutls             |     []                                 []          |
+     gold               | []                              []                 |
+     gpe-aerial         | []  []                          []                 |
+     gpe-beam           | []  []                          []        []       |
+     gpe-bluetooth      | []                              []     [] []       |
+     gpe-calendar       | []                                        []       |
+     gpe-clock          | []  []                    []    []        []       |
+     gpe-conf           | []  []                          []        []       |
+     gpe-contacts       | []  []                          []        []       |
+     gpe-edit           | []                              []        []       |
+     gpe-filemanager    | []                        []    []        []       |
+     gpe-go             | []  []                    []    []        []       |
+     gpe-login          | []                              []        []       |
+     gpe-ownerinfo      | []  []                    []    []        []       |
+     gpe-package        | []                              []        []       |
+     gpe-sketchbook     | []  []                          []        []       |
+     gpe-su             | []  []     []             []    []        []       |
+     gpe-taskmanager    | []  []                    []    []        []       |
+     gpe-timesheet      | []  []  []                      []        []       |
+     gpe-today          | []  []  [] []             []    []        []       |
+     gpe-todo           | []                              []        []       |
+     gphoto2            | []  []                    []    []     [] []       |
+     gprof              | []  []  []                      []                 |
+     gpsdrive           |            []                   []     []          |
+     gramadoir          |     []  []                      []                 |
+     grep               | []                                     []          |
+     grub               | []                        []    []     []          |
+     gsasl              | []  []  []                      []     []          |
+     gss                | []  []  []                      []     []          |
+     gst-plugins-bad    | []  []                    []    []     [] []       |
+     gst-plugins-base   | []  []                    []    []     [] []       |
+     gst-plugins-good   | []  []                    []    []     [] []       |
+     gst-plugins-ugly   | []  []                    []    []     [] []       |
+     gstreamer          | []  []                    []    []     []          |
+     gtick              | []  []  []                      []     []          |
+     gtkam              |     []                    []    []     [] []       |
+     gtkorphan          |     []                          []     []          |
+     gtkspell           | []  []  [] []             [] [] []     [] []       |
+     gutenprint         | []  []                    []           []          |
+     hello              | []      []                      []                 |
+     help2man           | []  []                                             |
+     hylafax            |                                 []                 |
+     idutils            | []  []  []                []    []     []          |
+     indent             | []  []  [] []             []    []     [] []       |
+     iso_15924          | []  ()                          []     []          |
+     iso_3166           | []  ()  [] [] [] [] [] [] []    []     [] []       |
+     iso_3166_2         |     ()                    []    []     []          |
+     iso_4217           | []  ()                    []    []     [] []       |
+     iso_639            | []  ()  []    []          []    []     [] []    [] |
+     iso_639_3          |     ()                                 []       [] |
+     jwhois             | []  []                    []    []     []          |
+     kbd                |     []                          []                 |
+     keytouch           | []  []  []                []    []     []          |
+     keytouch-editor    | []      []                []    []     []          |
+     keytouch-keyboa... | []      []                []    []     []          |
+     klavaro            |            []             []                       |
+     latrine            | []                              []     []          |
+     ld                 | []  []  []                      []                 |
+     leafpad            | []  []  []       []       []    []     [] ()       |
+     libc               | []  []     []                   []        []       |
+     libexif            |                                        []          |
+     libextractor       |                                                    |
+     libgnutls          |     []                                 []          |
+     libgpewidget       | []      []                      []        []       |
+     libgpg-error       |     []                                 []          |
+     libgphoto2         |     []                                 [] []       |
+     libgphoto2_port    |     []                                 [] []       |
+     libgsasl           | []  []  []                      []     []          |
+     libiconv           | []  []  []                      []     [] []       |
+     libidn             | []  []                          []     []          |
+     lifelines          |     ()                                             |
+     liferea            |     []                    []           [] []       |
+     lilypond           | []  []                                             |
+     linkdr             | []               []    [] []           []          |
+     lordsawar          |                                                    |
+     lprng              |                                 []                 |
+     lynx               |     []                    []    []     [] []       |
+     m4                 | []  []  [] []                   []        []       |
+     mailfromd          |                                                    |
+     mailutils          |     []                          []                 |
+     make               | []  []  [] []    []    []       []     [] []       |
+     man-db             |                                 []     []          |
+     man-db-manpages    |                                 []                 |
+     minicom            | []  []                    []    []        []       |
+     mkisofs            | []  []                          []     []          |
+     myserver           |                                                    |
+     nano               | []  []  [] []             []           []          |
+     opcodes            | []  []  []                      []                 |
+     parted             |     []                          []     [] []       |
+     pies               |                                                    |
+     popt               | []  []  [] []             []    []  [] [] []       |
+     psmisc             | []  []                          []                 |
+     pspp               |                                                    |
+     pwdutils           |     []                          []                 |
+     radius             |     []                          []                 |
+     recode             | []  []  [] []    []       []    []     []          |
+     rosegarden         | ()  ()                          ()     () ()       |
+     rpm                |                                 []        []       |
+     rush               |                                                    |
+     sarg               |     []                                             |
+     screem             |                                        [] []       |
+     scrollkeeper       | []                        []    []     []          |
+     sed                | []  []  [] []             []    []     [] []       |
+     sharutils          | []  []  []                []    []     [] []       |
+     shishi             |     []                                             |
+     skencil            |     []                                             |
+     solfege            | []  []     []                          []          |
+     solfege-manual     |     []     []                                      |
+     soundtracker       |     []                                 []          |
+     sp                 |     []                                    ()       |
+     sysstat            | []  []                          []     [] []       |
+     tar                | []  []  []                []    []     [] []       |
+     texinfo            |     []                          []     [] []       |
+     tin                |     []                                             |
+     unicode-han-tra... |                                                    |
+     unicode-transla... |     []  []                                         |
+     util-linux-ng      | []  []                    []    []     [] []       |
+     vice               |     ()                    ()           ()          |
+     vmm                |     []                                             |
+     vorbis-tools       |                                 []                 |
+     wastesedge         |     ()                                 ()          |
+     wdiff              | []                                                 |
+     wget               | []  []  []             [] []    []     [] []       |
+     wyslij-po          | []  []                          []                 |
+     xchat              | []  []        []    []    []    []     [] []    [] |
+     xdg-user-dirs      | []  []  [] [] [] [] []    []    []  [] [] []    [] |
+     xkeyboard-config   | []  []                    []    []     []          |
+                        +----------------------------------------------------+
+                          fi  fr  ga gl gu he hi hr hu hy id  is it ja ka kn
+                          105 121 53 20  4  8  3  5 53  2 120  5 84 67  0  4
 
-                          zh_HK zh_TW
-                        +-------------+
-     a2ps               |             | 30
-     aegis              |             |  9
-     anubis             |             | 19
-     aspell             |             | 29
-     bash               |        []   | 23
-     bfd                |             | 11
-     binutils           |             | 12
-     bison              |        []   | 18
-     bison-runtime      |        []   | 38
-     buzztrax           |             |  9
-     ccd2cue            |             | 10
-     ccide              |             | 17
-     cflow              |             | 16
-     clisp              |             | 10
-     coreutils          |             | 18
-     cpio               |             | 20
-     cppi               |             | 17
-     cpplib             |        []   | 19
-     cryptsetup         |             | 14
-     datamash           |             | 11
-     denemo             |             |  5
-     dfarc              |             | 17
-     dialog             |        []   | 42
-     dico               |             |  6
-     diffutils          |             | 22
-     dink               |             | 10
-     direvent           |             | 11
-     doodle             |             | 12
-     dos2unix           |        []   | 18
-     dos2unix-man       |             |  9
-     e2fsprogs          |             | 15
-     enscript           |             | 21
-     exif               |             | 27
-     fetchmail          |             | 19
-     findutils          |             | 29
-     flex               |        []   | 19
-     freedink           |             | 24
-     fusionforge        |             |  3
-     gas                |             |  5
-     gawk               |             | 13
-     gcal               |             |  8
-     gcc                |             |  2
-     gdbm               |             | 10
-     gettext-examples   |  []    []   | 40
-     gettext-runtime    |  []    []   | 35
-     gettext-tools      |        []   | 24
-     gjay               |             |  9
-     glunarclock        |        []   | 27
-     gnubiff            |             |  9
-     gnubik             |             | 19
-     gnucash            |        ()   |  6
-     gnuchess           |             | 11
-     gnulib             |             | 23
-     gnunet             |             |  1
-     gnunet-gtk         |             |  1
-     gold               |             |  7
-     gphoto2            |        []   | 19
-     gprof              |             | 21
-     gramadoir          |             | 14
-     grep               |        []   | 31
-     grub               |             | 21
-     gsasl              |        []   | 19
-     gss                |             | 17
-     gst-plugins-bad    |             | 21
-     gst-plugins-base   |             | 27
-     gst-plugins-good   |             | 32
-     gst-plugins-ugly   |             | 34
-     gstreamer          |        []   | 32
-     gtick              |             | 19
-     gtkam              |             | 24
-     gtkspell           |  []    []   | 48
-     guix               |             |  2
-     guix-packages      |             |  0
-     gutenprint         |             | 15
-     hello              |        []   | 30
-     help2man           |             | 18
-     help2man-texi      |             |  5
-     hylafax            |             |  5
-     idutils            |             | 14
-     iso_15924          |        []   | 23
-     iso_3166           |  []    []   | 58
-     iso_3166_2         |             |  9
-     iso_4217           |  []    []   | 28
-     iso_639            |  []    []   | 46
-     iso_639_3          |             | 10
-     iso_639_5          |             |  2
-     jwhois             |        []   | 20
-     kbd                |             | 17
-     klavaro            |             | 30
-     ld                 |        []   | 15
-     leafpad            |        []   | 39
-     libc               |        []   | 24
-     libexif            |             | 10
-     libextractor       |             |  5
-     libgnutls          |             | 13
-     libgphoto2         |             | 10
-     libgphoto2_port    |        []   | 19
-     libgsasl           |             | 18
-     libiconv           |        []   | 29
-     libidn             |             | 17
-     liferea            |             | 29
-     lilypond           |             | 11
-     lordsawar          |             |  3
-     lprng              |             |  3
-     lynx               |             | 19
-     m4                 |        []   | 22
-     mailfromd          |             |  4
-     mailutils          |             |  6
-     make               |             | 19
-     man-db             |             | 15
-     man-db-manpages    |             | 10
-     midi-instruments   |        []   | 43
-     minicom            |        []   | 17
-     mkisofs            |             | 13
-     myserver           |             |  9
-     nano               |        []   | 30
-     opcodes            |             | 12
-     parted             |        []   | 23
-     pies               |             |  4
-     pnmixer            |             |  9
-     popt               |        []   | 36
-     procps-ng          |             |  5
-     procps-ng-man      |             |  4
-     psmisc             |        []   | 22
-     pspp               |             | 13
-     pushover           |             |  6
-     pwdutils           |             |  8
-     pyspread           |             |  6
-     radius             |             |  9
-     recode             |             | 31
-     recutils           |             | 10
-     rpm                |        []   | 13
-     rush               |             | 10
-     sarg               |             |  4
-     sed                |        []   | 35
-     sharutils          |             | 13
-     shishi             |             |  7
-     skribilo           |             |  7
-     solfege            |             | 21
-     solfege-manual     |             |  9
-     spotmachine        |             | 11
-     sudo               |             | 26
-     sudoers            |             | 22
-     sysstat            |             | 23
-     tar                |        []   | 30
-     texinfo            |             | 17
-     texinfo_document   |             | 13
-     tigervnc           |             | 14
-     tin                |        []   |  7
-     tin-man            |             |  1
-     tracgoogleappsa... |        []   | 22
-     trader             |             | 12
-     util-linux         |             | 13
-     ve                 |             | 14
-     vice               |             |  1
-     vmm                |             |  3
-     vorbis-tools       |             | 13
-     wastesedge         |             |  3
-     wcd                |             |  8
-     wcd-man            |             |  3
-     wdiff              |        []   | 23
-     wget               |             | 21
-     wyslij-po          |             | 14
-     xboard             |             | 10
-     xdg-user-dirs      |  []    []   | 68
-     xkeyboard-config   |        []   | 28
-                        +-------------+
-       89 teams           zh_HK zh_TW
-      166 domains           7    42    2809
+                          ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
+                        +-----------------------------------------------+
+     a2ps               |                               []              |
+     aegis              |                                               |
+     ant-phone          |                                               |
+     anubis             |                               []    []        |
+     aspell             |                         []                    |
+     bash               |                                               |
+     bfd                |                                               |
+     bibshelf           |                []             []              |
+     binutils           |                                               |
+     bison              |                               []              |
+     bison-runtime      |       []    [] []             []    []        |
+     bluez-pin          |    [] []    [] []             []              |
+     bombono-dvd        |                                               |
+     buzztard           |                                               |
+     cflow              |                                               |
+     clisp              |                                               |
+     coreutils          |          []                                   |
+     cpio               |                                               |
+     cppi               |                                               |
+     cpplib             |                                               |
+     cryptsetup         |                                               |
+     dfarc              |                   []                          |
+     dialog             |    []       [] []             []    []        |
+     dico               |                                               |
+     diffutils          |                []             []              |
+     dink               |                                               |
+     doodle             |                                               |
+     e2fsprogs          |                                               |
+     enscript           |                                               |
+     exif               |                []                             |
+     fetchmail          |                                               |
+     findutils          |                                               |
+     flex               |                                               |
+     freedink           |                                     []        |
+     gas                |                                               |
+     gawk               |                                               |
+     gcal               |                                               |
+     gcc                |                                               |
+     gettext-examples   |       []       []             [] []           |
+     gettext-runtime    | []                                            |
+     gettext-tools      | []                                            |
+     gip                |                []             []              |
+     gjay               |                                               |
+     gliv               |                                               |
+     glunarclock        |                []                             |
+     gnubiff            |                                               |
+     gnucash            | ()          ()                      ()     () |
+     gnuedu             |                                               |
+     gnulib             |                                               |
+     gnunet             |                                               |
+     gnunet-gtk         |                                               |
+     gnutls             |                               []              |
+     gold               |                                               |
+     gpe-aerial         |                []                             |
+     gpe-beam           |                []                             |
+     gpe-bluetooth      |                []                []           |
+     gpe-calendar       |                []                             |
+     gpe-clock          | []    []       []             [] []           |
+     gpe-conf           | []             []                             |
+     gpe-contacts       | []             []                             |
+     gpe-edit           |                []                             |
+     gpe-filemanager    | []             []                             |
+     gpe-go             | []             []                []           |
+     gpe-login          |                []                             |
+     gpe-ownerinfo      |                []             []              |
+     gpe-package        | []             []                             |
+     gpe-sketchbook     | []             []                             |
+     gpe-su             | []    []       []             [] [] []        |
+     gpe-taskmanager    | [] [] []       []             [] []           |
+     gpe-timesheet      |                []             []              |
+     gpe-today          |       []       []             [] []           |
+     gpe-todo           |                []                   []        |
+     gphoto2            |                                               |
+     gprof              |                               []              |
+     gpsdrive           |                                               |
+     gramadoir          |                                               |
+     grep               |                                               |
+     grub               |                                               |
+     gsasl              |                                               |
+     gss                |                                               |
+     gst-plugins-bad    |             [] []                [] []        |
+     gst-plugins-base   |             [] []                             |
+     gst-plugins-good   |                []                []           |
+     gst-plugins-ugly   |             [] []             [] [] []        |
+     gstreamer          |                                               |
+     gtick              |                                               |
+     gtkam              |                                     []        |
+     gtkorphan          |                []                      []     |
+     gtkspell           |       []    [] []       []    []    [] []     |
+     gutenprint         |                                               |
+     hello              | []             []             []              |
+     help2man           |                                               |
+     hylafax            |                                               |
+     idutils            |                                               |
+     indent             |                                               |
+     iso_15924          |             [] []                             |
+     iso_3166           | [] []       () [] [] []    []       []        |
+     iso_3166_2         |                                               |
+     iso_4217           |             []                      []        |
+     iso_639            |                      []    []                 |
+     iso_639_3          |                            []                 |
+     jwhois             |                []                             |
+     kbd                |                                               |
+     keytouch           |                []                             |
+     keytouch-editor    |                []                             |
+     keytouch-keyboa... |                []                             |
+     klavaro            |                                     []        |
+     latrine            |                []                             |
+     ld                 |                                               |
+     leafpad            | []          [] []                             |
+     libc               | []                                            |
+     libexif            |                                               |
+     libextractor       |                                               |
+     libgnutls          |                               []              |
+     libgpewidget       |                []             []              |
+     libgpg-error       |                                               |
+     libgphoto2         |                                               |
+     libgphoto2_port    |                                               |
+     libgsasl           |                                               |
+     libiconv           |                                               |
+     libidn             |                                               |
+     lifelines          |                                               |
+     liferea            |                                               |
+     lilypond           |                                               |
+     linkdr             |                                               |
+     lordsawar          |                                               |
+     lprng              |                                               |
+     lynx               |                                               |
+     m4                 |                                               |
+     mailfromd          |                                               |
+     mailutils          |                                               |
+     make               | []                                            |
+     man-db             |                                               |
+     man-db-manpages    |                                               |
+     minicom            |                                     []        |
+     mkisofs            |                                               |
+     myserver           |                                               |
+     nano               |                               []    []        |
+     opcodes            |                                               |
+     parted             |                                               |
+     pies               |                                               |
+     popt               | []             []                   []        |
+     psmisc             |                                               |
+     pspp               |                                               |
+     pwdutils           |                                               |
+     radius             |                                               |
+     recode             |                                               |
+     rosegarden         |                                               |
+     rpm                |                                               |
+     rush               |                                               |
+     sarg               |                                               |
+     screem             |                                               |
+     scrollkeeper       |                                     []     [] |
+     sed                |                                               |
+     sharutils          |                                               |
+     shishi             |                                               |
+     skencil            |                                               |
+     solfege            |                                     []        |
+     solfege-manual     |                                               |
+     soundtracker       |                                               |
+     sp                 |                                               |
+     sysstat            |                []                             |
+     tar                |       []                                      |
+     texinfo            |                                     []        |
+     tin                |                                               |
+     unicode-han-tra... |                                               |
+     unicode-transla... |                                               |
+     util-linux-ng      |                                               |
+     vice               |                                               |
+     vmm                |                                               |
+     vorbis-tools       |                                               |
+     wastesedge         |                                               |
+     wdiff              |                                               |
+     wget               |             []                                |
+     wyslij-po          |                                               |
+     xchat              | []             [] []                          |
+     xdg-user-dirs      | [] []       [] [] []       []       [] []     |
+     xkeyboard-config   | []    []    []                                |
+                        +-----------------------------------------------+
+                          ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
+                          20  5 10  1 13 48  4  2  2  4 24 10 20  3   1
+
+                          nl  nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr
+                        +---------------------------------------------------+
+     a2ps               | []           []     []  []   [] []       []    [] |
+     aegis              | []                      []      []                |
+     ant-phone          |                         []   []                   |
+     anubis             | []           []                 []                |
+     aspell             | []                           [] []    [] []       |
+     bash               | []                                    []          |
+     bfd                |                                 []                |
+     bibshelf           | []  []                                            |
+     binutils           |                                 []    []          |
+     bison              | []           []                 []                |
+     bison-runtime      | []           []     []  []   [] []       []       |
+     bluez-pin          | []           []         []   [] []    [] []    [] |
+     bombono-dvd        |     []                          ()                |
+     buzztard           | []  []                                            |
+     cflow              |              []                                   |
+     clisp              | []                              []                |
+     coreutils          | []           []     []  []      []       []       |
+     cpio               | []           []                 []                |
+     cppi               |              []                                   |
+     cpplib             | []                                                |
+     cryptsetup         | []                                                |
+     dfarc              |              []                                   |
+     dialog             | []           []         []      []                |
+     dico               |              []                                   |
+     diffutils          | []           []         []   [] []             [] |
+     dink               | ()                                                |
+     doodle             | []                                          []    |
+     e2fsprogs          | []           []                                   |
+     enscript           | []                      []   [] []       []       |
+     exif               | []           []              [] ()    []          |
+     fetchmail          | []           []                 []          []    |
+     findutils          | []           []     []          []       []       |
+     flex               | []           []         []   [] []                |
+     freedink           | []           []                                   |
+     gas                |                                                   |
+     gawk               | []           []         []   []                   |
+     gcal               |                                                   |
+     gcc                |                                                [] |
+     gettext-examples   | []           []     []       [] []    [] []    [] |
+     gettext-runtime    | []  []       []     []       [] []    [] []    [] |
+     gettext-tools      |              []              [] []    [] []    [] |
+     gip                | []           []                 []    []       [] |
+     gjay               |                                                   |
+     gliv               | []           []         []   [] []    []          |
+     glunarclock        | []                      []   []       []       [] |
+     gnubiff            | []                           ()                   |
+     gnucash            | []           ()         ()      ()                |
+     gnuedu             | []                                                |
+     gnulib             | []           []                 []       []       |
+     gnunet             |                                                   |
+     gnunet-gtk         |                                                   |
+     gnutls             | []           []                                   |
+     gold               |                                                   |
+     gpe-aerial         | []                  []  []   [] []       []    [] |
+     gpe-beam           | []                  []  []   [] []       []    [] |
+     gpe-bluetooth      | []                      []                        |
+     gpe-calendar       |                         []      []       []    [] |
+     gpe-clock          | []                  []  []   [] []    [] []    [] |
+     gpe-conf           | []                  []  []   [] []    [] []       |
+     gpe-contacts       |                         []   [] []       []    [] |
+     gpe-edit           | []           []                          []       |
+     gpe-filemanager    | []                              []       []       |
+     gpe-go             | []           []         []   [] []    [] []    [] |
+     gpe-login          | []                      []                        |
+     gpe-ownerinfo      | []                  []  []   [] []    [] []    [] |
+     gpe-package        | []                                       []       |
+     gpe-sketchbook     | []                  []  []   [] []       []    [] |
+     gpe-su             | []                  []  []   [] []    [] []    [] |
+     gpe-taskmanager    | []                  []  []   [] []    [] []    [] |
+     gpe-timesheet      | []                  []  []   [] []    [] []    [] |
+     gpe-today          | []                  []  []   [] []    [] []    [] |
+     gpe-todo           | []                      []      []       []    [] |
+     gphoto2            | []        [] []         []   [] []    []       [] |
+     gprof              | []                      []   []                   |
+     gpsdrive           | []                              []                |
+     gramadoir          | []                                    []          |
+     grep               | []           []                 []    []          |
+     grub               | []           []                 []                |
+     gsasl              | []           []                       []       [] |
+     gss                |              []              []       []          |
+     gst-plugins-bad    | []           []         []      []    []    []    |
+     gst-plugins-base   | []           []         []      []    []          |
+     gst-plugins-good   | []           []         []      []    []          |
+     gst-plugins-ugly   | []           []         []      []    [] []       |
+     gstreamer          | []           []         []      []    []          |
+     gtick              | []                              []    []          |
+     gtkam              | []        [] []         []      []    []          |
+     gtkorphan          | []                                                |
+     gtkspell           | []           []     []  []   [] []    [] [] [] [] |
+     gutenprint         | []                              []                |
+     hello              | []           []                       [] []       |
+     help2man           |              []                 []                |
+     hylafax            | []                                                |
+     idutils            | []           []         []   [] []                |
+     indent             | []           []         []   [] []    []       [] |
+     iso_15924          | []           []                 []       []       |
+     iso_3166           | []  [] [] [] []     ()  []   [] [] [] [] [] [] [] |
+     iso_3166_2         | []           []                          []       |
+     iso_4217           | []  []       []     []          [] []    []    [] |
+     iso_639            | []     [] [] []                 [] [] [] []    [] |
+     iso_639_3          |        [] []                                      |
+     jwhois             | []           []         []   []                   |
+     kbd                | []           []              []                   |
+     keytouch           | []           []                       []          |
+     keytouch-editor    | []           []                       []          |
+     keytouch-keyboa... | []           []                       []          |
+     klavaro            | []                      []                        |
+     latrine            |              []                 []                |
+     ld                 |                                                   |
+     leafpad            | []  []       []     []  []      []    [] []    [] |
+     libc               | []           []                 []    []          |
+     libexif            | []           []         ()            []          |
+     libextractor       |                                                   |
+     libgnutls          | []           []                                   |
+     libgpewidget       | []           []                          []       |
+     libgpg-error       |              []              []                   |
+     libgphoto2         | []           []                                   |
+     libgphoto2_port    | []           []         []      []    []          |
+     libgsasl           | []           []              []       []       [] |
+     libiconv           | []           []                       [] []    [] |
+     libidn             | []           []                                   |
+     lifelines          | []           []                                   |
+     liferea            | []           []     []  []   [] ()    ()    []    |
+     lilypond           | []                                                |
+     linkdr             | []                  []          []                |
+     lordsawar          |                                                   |
+     lprng              |              []                                   |
+     lynx               | []                      []      []                |
+     m4                 | []           []         []   [] []                |
+     mailfromd          |              []                                   |
+     mailutils          |              []                                   |
+     make               | []           []         []      []                |
+     man-db             | []           []                 []                |
+     man-db-manpages    | []           []                 []                |
+     minicom            |              []         []   [] []                |
+     mkisofs            | []           []                 []                |
+     myserver           |                                                   |
+     nano               | []           []         []      []                |
+     opcodes            | []                           []                   |
+     parted             | []           []                 []    []          |
+     pies               |              []                                   |
+     popt               | []           []     []          []                |
+     psmisc             | []           []                 []                |
+     pspp               | []                      []                        |
+     pwdutils           |              []                                   |
+     radius             | []           []                 []                |
+     recode             | []           []     []  []   [] []    [] []       |
+     rosegarden         |              ()                 ()                |
+     rpm                | []           []     []                            |
+     rush               | []           []                                   |
+     sarg               |                                                   |
+     screem             |                                                   |
+     scrollkeeper       | []  []       []              [] []    []    [] [] |
+     sed                | []           []     []  []   [] []    [] []    [] |
+     sharutils          | []           []                 []             [] |
+     shishi             |              []                                   |
+     skencil            |                     []  []                        |
+     solfege            | []           []         []      []                |
+     solfege-manual     | []           []         []                        |
+     soundtracker       |                                       []          |
+     sp                 |                                                   |
+     sysstat            | []           []         []      []                |
+     tar                | []           []                 []       []       |
+     texinfo            | []           []              [] []                |
+     tin                |                                 []                |
+     unicode-han-tra... |                                                   |
+     unicode-transla... |                                                   |
+     util-linux-ng      | []           []         []      []       []       |
+     vice               | []                                                |
+     vmm                | []                                                |
+     vorbis-tools       | []           []                                   |
+     wastesedge         | []                                                |
+     wdiff              | []           []                                   |
+     wget               | []           []     []  []      []    [] []       |
+     wyslij-po          | []  []       []                                   |
+     xchat              | []        [] []     []          []    [] [] [] [] |
+     xdg-user-dirs      | []  [] [] [] []  [] []  []   [] []    [] [] [] [] |
+     xkeyboard-config   | []           []                 []                |
+                        +---------------------------------------------------+
+                          nl  nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr
+                          135 10  4  7 105  1 29  62   47 91  3 54 46  9 37
+
+                          sv  sw ta te tg th tr uk vi  wa zh_CN zh_HK zh_TW
+                        +---------------------------------------------------+
+     a2ps               | []              [] [] [] []                       | 27
+     aegis              |                          []                       |  9
+     ant-phone          | []                 []    []      []               |  9
+     anubis             | []                 [] [] []                       | 15
+     aspell             |                       [] []  []                   | 20
+     bash               | []                    [] []                       | 12
+     bfd                |                          []                       |  6
+     bibshelf           | []                       []      []               | 16
+     binutils           |                       [] []                       |  8
+     bison              | []                       []                       | 12
+     bison-runtime      | []              []    [] []      []          []   | 29
+     bluez-pin          | []              [] [] [] []  []  []          []   | 37
+     bombono-dvd        |                          []                       |  4
+     buzztard           |                          []                       |  7
+     cflow              |                       [] []      []               |  9
+     clisp              |                                                   | 10
+     coreutils          | []                    [] []      []               | 22
+     cpio               | []                 [] [] []      []          []   | 13
+     cppi               |                       [] []                       |  5
+     cpplib             | []                 [] [] []      []          []   | 14
+     cryptsetup         | []                       []                       |  7
+     dfarc              |                          []                       |  9
+     dialog             | []  []          []       []  []  []          []   | 30
+     dico               |                       []                          |  2
+     diffutils          | []                 [] [] []      []          []   | 30
+     dink               |                                                   |  4
+     doodle             | []                       []                       |  7
+     e2fsprogs          | []                 []    []                       | 11
+     enscript           | []                 [] [] []                       | 17
+     exif               | []                       []      []               | 16
+     fetchmail          |                    []    []      []               | 17
+     findutils          | []                 [] [] []      []               | 20
+     flex               | []                 []    []                  []   | 15
+     freedink           |                          []                       | 10
+     gas                |                    []                             |  4
+     gawk               | []                 []    []      []               | 18
+     gcal               | []                 []                             |  5
+     gcc                | []                 []            []               |  7
+     gettext-examples   | []                 [] [] []      []    []    []   | 34
+     gettext-runtime    | []                 [] [] []      []    []    []   | 29
+     gettext-tools      | []                 [] [] []      []          []   | 22
+     gip                | []                       []      []          []   | 22
+     gjay               |                          []                       |  3
+     gliv               | []                 []    []                       | 14
+     glunarclock        | []                       []  []  []          []   | 19
+     gnubiff            | []                       []                       |  4
+     gnucash            |                    () [] ()      []          ()   | 10
+     gnuedu             |                          []                  []   |  7
+     gnulib             | []                    [] []      []               | 16
+     gnunet             |                          []                       |  1
+     gnunet-gtk         | []                 []    []                       |  5
+     gnutls             | []                       []      []               | 10
+     gold               |                          []                       |  4
+     gpe-aerial         | []                       []      []               | 18
+     gpe-beam           | []                       []      []               | 19
+     gpe-bluetooth      | []                       []      []               | 13
+     gpe-calendar       | []                       []  []  []               | 12
+     gpe-clock          | []                 []    []  []  []               | 28
+     gpe-conf           | []                       []  []  []               | 20
+     gpe-contacts       | []                       []      []               | 17
+     gpe-edit           | []                       []      []               | 12
+     gpe-filemanager    | []                       []  []  []               | 16
+     gpe-go             | []                 []    []  []  []               | 25
+     gpe-login          | []                       []      []               | 11
+     gpe-ownerinfo      | []                 []    []      []          []   | 25
+     gpe-package        | []                       []      []               | 13
+     gpe-sketchbook     | []                       []      []               | 20
+     gpe-su             | []                 []    []  []  []               | 30
+     gpe-taskmanager    | []                 []    []  []  []               | 29
+     gpe-timesheet      | []                 []    []      []          []   | 25
+     gpe-today          | []                 []    []  []  []          []   | 30
+     gpe-todo           | []                       []  []  []               | 17
+     gphoto2            | []                    [] []      []          []   | 24
+     gprof              | []                 []    []                       | 15
+     gpsdrive           | []                       []      []               | 11
+     gramadoir          | []                       []      []               | 11
+     grep               |                 []       []      []               | 10
+     grub               | []                       []      []               | 14
+     gsasl              | []                       []      []          []   | 14
+     gss                | []                       []      []               | 11
+     gst-plugins-bad    | []                 []    []      []               | 26
+     gst-plugins-base   | []                 [] [] []      []               | 24
+     gst-plugins-good   | []                 []    []      []               | 24
+     gst-plugins-ugly   | []                 [] [] []      []               | 29
+     gstreamer          | []                    [] []      []               | 22
+     gtick              |                       [] []      []               | 13
+     gtkam              | []                       []      []               | 20
+     gtkorphan          | []                       []      []               | 14
+     gtkspell           | []              [] [] [] []  []  []    []    []   | 45
+     gutenprint         | []                                                | 10
+     hello              | []              [] []    []      []          []   | 21
+     help2man           | []                       []                       |  7
+     hylafax            |                          []                       |  5
+     idutils            | []                 []    []      []               | 17
+     indent             | []                 [] [] []      []          []   | 30
+     iso_15924          |                 ()    [] ()      []          []   | 16
+     iso_3166           | []        []    () [] [] ()  []  []    []    ()   | 53
+     iso_3166_2         |                 ()    [] ()      []               |  9
+     iso_4217           | []              () [] [] ()      []    []         | 26
+     iso_639            | []     [] []    ()    [] ()  []  []    []    []   | 38
+     iso_639_3          |        []                ()                       |  8
+     jwhois             | []                 []    []      []          []   | 16
+     kbd                | []                 [] [] []      []               | 15
+     keytouch           | []                       []      []               | 16
+     keytouch-editor    | []                       []      []               | 14
+     keytouch-keyboa... | []                       []      []               | 14
+     klavaro            |                          []                       | 11
+     latrine            |                    []    []      []               | 10
+     ld                 | []                 []    []                  []   | 11
+     leafpad            | []                 [] [] []      []          []   | 33
+     libc               | []                 []    []      []          []   | 21
+     libexif            |                          []      ()               |  7
+     libextractor       |                          []                       |  1
+     libgnutls          | []                       []      []               |  9
+     libgpewidget       | []                       []      []               | 14
+     libgpg-error       | []                       []      []               |  9
+     libgphoto2         |                       [] []                       |  8
+     libgphoto2_port    | []                    [] []                  []   | 14
+     libgsasl           | []                       []      []               | 13
+     libiconv           | []                       []  []  []               | 21
+     libidn             | ()                       []      []               | 11
+     lifelines          | []                                                |  4
+     liferea            | []                 []            []               | 21
+     lilypond           |                          []                       |  7
+     linkdr             | []                 []    []      []          []   | 17
+     lordsawar          |                                                   |  1
+     lprng              |                          []                       |  3
+     lynx               | []                 [] [] []                       | 17
+     m4                 | []                       []      []          []   | 19
+     mailfromd          |                       [] []                       |  3
+     mailutils          |                          []                       |  5
+     make               | []                 []    []      []               | 21
+     man-db             | []                       []      []               |  8
+     man-db-manpages    |                                                   |  4
+     minicom            | []                       []                       | 16
+     mkisofs            |                          []      []               |  9
+     myserver           |                                                   |  0
+     nano               | []                       []      []          []   | 21
+     opcodes            | []                 []    []                       | 11
+     parted             | []                 [] [] []                  []   | 15
+     pies               |                       [] []                       |  3
+     popt               | []              [] []    []      []          []   | 27
+     psmisc             | []                       []                       | 11
+     pspp               |                                                   |  4
+     pwdutils           | []                       []                       |  6
+     radius             |                       [] []                       |  9
+     recode             | []                 []    []      []               | 28
+     rosegarden         | ()                                                |  0
+     rpm                | []                       []                  []   | 11
+     rush               |                       [] []                       |  4
+     sarg               |                                                   |  1
+     screem             |                          []                       |  3
+     scrollkeeper       | []                 [] [] []                  []   | 27
+     sed                | []                 []    []      []          []   | 30
+     sharutils          | []                 []    []      []          []   | 22
+     shishi             |                          []                       |  3
+     skencil            | []                       []                       |  7
+     solfege            | []                 []    []      []               | 16
+     solfege-manual     |                    []                             |  8
+     soundtracker       | []                 []    []                       |  9
+     sp                 |                    []                             |  3
+     sysstat            |                          []      []               | 15
+     tar                | []                 [] [] []      []          []   | 23
+     texinfo            | []                 [] [] []      []               | 17
+     tin                |                                                   |  4
+     unicode-han-tra... |                                                   |  0
+     unicode-transla... |                                                   |  2
+     util-linux-ng      | []                 [] [] []                       | 20
+     vice               | ()                 ()                             |  1
+     vmm                |                          []                       |  4
+     vorbis-tools       |                          []                       |  6
+     wastesedge         |                                                   |  2
+     wdiff              | []                       []                       |  7
+     wget               | []                 []    []      []          []   | 26
+     wyslij-po          |                       [] []                       |  8
+     xchat              | []              []    [] []      []          []   | 36
+     xdg-user-dirs      | []     [] []    [] [] [] []      []    []    []   | 63
+     xkeyboard-config   | []                    [] []                       | 22
+                        +---------------------------------------------------+
+       85 teams           sv  sw ta te tg th tr uk vi  wa zh_CN zh_HK zh_TW
+      178 domains         119  1  3  3  0 10 65 51 155 17  98     7    41    2618
 
    Some counters in the preceding matrix are higher than the number of
 visible blocks let us expect.  This is because a few extra PO files are
@@ -1350,30 +1251,32 @@
 dialects.
 
    For a PO file in the matrix above to be effective, the package to
-which it applies should also have been internationalized and distributed
-as such by its maintainer.  There might be an observable lag between the
-mere existence a PO file and its wide availability in a distribution.
+which it applies should also have been internationalized and
+distributed as such by its maintainer.  There might be an observable
+lag between the mere existence a PO file and its wide availability in a
+distribution.
 
-   If Jun 2014 seems to be old, you may fetch a more recent copy of this
-'ABOUT-NLS' file on most GNU archive sites.  The most up-to-date matrix
-with full percentage details can be found at
-'http://translationproject.org/extra/matrix.html'.
+   If June 2010 seems to be old, you may fetch a more recent copy of
+this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
+matrix with full percentage details can be found at
+`http://translationproject.org/extra/matrix.html'.
 
-1.5 Using 'gettext' in new packages
+1.5 Using `gettext' in new packages
 ===================================
 
 If you are writing a freely available program and want to
-internationalize it you are welcome to use GNU 'gettext' in your
-package.  Of course you have to respect the GNU Lesser General Public
-License which covers the use of the GNU 'gettext' library.  This means
-in particular that even non-free programs can use 'libintl' as a shared
-library, whereas only free software can use 'libintl' as a static
-library or use modified versions of 'libintl'.
+internationalize it you are welcome to use GNU `gettext' in your
+package.  Of course you have to respect the GNU Library General Public
+License which covers the use of the GNU `gettext' library.  This means
+in particular that even non-free programs can use `libintl' as a shared
+library, whereas only free software can use `libintl' as a static
+library or use modified versions of `libintl'.
 
    Once the sources are changed appropriately and the setup can handle
-the use of 'gettext' the only thing missing are the translations.  The
+the use of `gettext' the only thing missing are the translations.  The
 Free Translation Project is also available for packages which are not
 developed inside the GNU project.  Therefore the information given above
 applies also for every other Free Software Project.  Contact
-'coordinator@translationproject.org' to make the '.pot' files available
+`coordinator@translationproject.org' to make the `.pot' files available
 to the translation teams.
+

grip-3.10.1.tar.gz/CREDITS -> grip-4.1.1.tar.gz/CREDITS Changed

grip-3.10.1.tar.gz/ChangeLog -> grip-4.1.1.tar.gz/ChangeLog Changed

@@ -1,4 +1,45 @@
-v3.10.1 2019-02-05  Johnny A. Solbu <johnny@solbu.net>
+v4.1.1 2020-02-05  Johnny A. Solbu <johnny@solbu.net>
+
+	* Patch from Till Bargheer: fix directory creation
+	* Translation updates:
+	  Brazilian portuguese, danish, dutch, german 
+	  italian, korean, norwegian, ukranian
+
+v4.1.0 2020-02-04  Johnny A. Solbu <johnny@solbu.net>
+
+	* Update gettext to 0.19.4.
+	* Drop libgnomeui2 and libgnome2 dependencies
+	* Fix out of source tree builds
+	* Add meson as build system option
+	* Fix application window icon
+	* Restored short command-line options
+	* Port to GtkStatusIcon and drop included EggTracyIcon code
+	* Fix tray icon right-click menu positioning
+	* Make -Werror optional (it does more harm than good)
+
+v4.0.1 2019-12-02  Johnny A. Solbu <johnny@solbu.net>
+
+	* Patch from Dan Fandrich:
+	  Stop copying overlapping strings on multi-artist CDs
+	* Add korean translation from TP
+	* nl.po, zh_CN.po: Update translations from TP
+
+v4.0.0 2019-10-05  Johnny A. Solbu <johnny@solbu.net>
+
+	* Patches from Adrian Reber:
+	  - Remove vte dependency
+	     grip uses vte for its status window. The version of vte grip relies on
+	     is not maintained upstream for a long time. This commit removes the
+	     complete status window functionality from grip. Messages previously sent
+	     to the status window are now sent to the console.
+	  - Switch to non-deprecated g_string functions
+	  - Ignore deprecation errors
+
+v3.10.2 2019-08-17  Johnny A. Solbu <johnny@solbu.net>
+
+	* Sync updated french translation from Translation Project
+
+v3.10.1 2019-02-24  Johnny A. Solbu <johnny@solbu.net>
 
 	* Patch from Lutz Mändle: Calculates the correct space needed for
 	  drawing the labels in the edit box

grip-3.10.1.tar.gz/INSTALL -> grip-4.1.1.tar.gz/INSTALL Changed

@@ -1,7 +1,9 @@
 Requirements
 ============
 
-To use Grip, you must have:
+To use Grip, you must have a few dependencies.
+If you obtained Grip from an RPM or DEB file, then they are already installed.
+The dependencies are:
 
 A CD/DVD player (surprise, surprise)
 Some GTK2 libraries.
@@ -9,35 +11,39 @@
 On a Redhat/Fedora/Mageia/OpenMandriva or other RPM based distributions,
 you need these packages installed:
 
-gnomeui2-devel
+gtk2-devel
 cdda-devel
 id3-devel
-vte-devel
 
 
 On Debian derivatives you need these packages, as listed in the Debian control file (as maintained by Josef Grosch):
 
-libgnome2-dev
-libgnomeui-dev
+libgtk2.0-dev
 libcurl4-openssl-dev
-libvte-dev
 libid3-3.8.3-dev
 
 
-
 Installation
 ============
 
-If you obtained Grip from an RPM or DEB file, then they are already
-installed. If you have the source distribution, you need to compile it.
+If you have the source distribution, you need to compile it.
+To compile and install Grip, simply go through one of the following two steps after extracting the tarball:
+
+Alternative 1, meson:
+
+ * mkdir build
+ * cd build
+ * meson ../
+ * ninja
+ become root if you are installing in a non-user directory, then run
+ * ninja install
 
-To install Grip, simply go through the following steps:
+Alternative 2, GNU autotools (The old and trusted way):
 
- o after unpacking Grip, cd to the extracted directory
- o './configure'
- o 'make'
- o become root if you are installing in a non-user directory
- o 'make install'
+ * './configure'
+ * 'make'
+ become root if you are installing in a non-user directory, then run
+ * 'make install'
 
 For information on options to the configure process, run:
 
@@ -53,8 +59,8 @@
   --disable-shared-id3    -- This will force Grip to link statically, rather
                              than dynamically with id3lib
 
-  --disable-werror        -- This will turn most errors into warnings.
-			     (Do Not use this option when creating and testing patches!)
+  --enable-werror         -- This will turn warnings into errors.
+			     Use this option when creating and testing patches.
 
 Note that if Gnome is installed in a non-standard place (such as /opt), you
 may need to use the '--with-gnome' configure option for all libraries to be

grip-3.10.1.tar.gz/Makefile.am -> grip-4.1.1.tar.gz/Makefile.am Changed

grip-3.10.1.tar.gz/Makefile.in -> grip-4.1.1.tar.gz/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -79,19 +89,22 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
-	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in mkinstalldirs $(dist_man_MANS) ABOUT-NLS \
-	COPYING TODO compile config.guess config.sub depcomp \
-	install-sh missing ltmain.sh ltconfig
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -163,7 +176,7 @@
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir dist dist-all distcheck
+	cscope distdir distdir-am 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,
@@ -186,6 +199,18 @@
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \
+	$(srcdir)/config.h.in $(top_srcdir)/build-aux/compile \
+	$(top_srcdir)/build-aux/config.guess \
+	$(top_srcdir)/build-aux/config.rpath \
+	$(top_srcdir)/build-aux/config.sub \
+	$(top_srcdir)/build-aux/install-sh \
+	$(top_srcdir)/build-aux/ltmain.sh \
+	$(top_srcdir)/build-aux/missing ABOUT-NLS AUTHORS COPYING \
+	ChangeLog INSTALL NEWS README TODO build-aux/compile \
+	build-aux/config.guess build-aux/config.rpath \
+	build-aux/config.sub build-aux/install-sh build-aux/ltmain.sh \
+	build-aux/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -236,8 +261,6 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CDPAR_LIBS = @CDPAR_LIBS@
@@ -249,7 +272,6 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -261,9 +283,10 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNOME_CFLAGS = @GNOME_CFLAGS@
 GNOME_LIBS = @GNOME_LIBS@
 GREP = @GREP@
@@ -273,23 +296,28 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -307,20 +335,18 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
 POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-TERMINAL_WIDGET_CFLAGS = @TERMINAL_WIDGET_CFLAGS@
-TERMINAL_WIDGET_LIBS = @TERMINAL_WIDGET_LIBS@
+THREAD_LIBS = @THREAD_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -366,6 +392,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -375,11 +402,18 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = po src pixmaps doc contrib
-EXTRA_DIST = \
+EXTRA_DIST = build-aux/config.rpath \
 	grip.desktop \
 	grip-audiocd.desktop \
 	CREDITS \
-	COPYING-LGPL
+	COPYING-LGPL \
+	meson.build \
+	meson_options.txt \
+	doc/C/meson.build \
+	pixmaps/meson.build \
+	po/meson.build \
+	po/LINGUAS \
+	src/meson.build
 
 Applicationsdir = $(datadir)/applications
 Applications_DATA = grip.desktop
@@ -388,6 +422,9 @@
 soliddatadir = $(datadir)/solid/actions
 soliddata_DATA = grip-audiocd.desktop
 dist_man_MANS = grip.1
+
+# Autopoint m4 stuff
+ACLOCAL_AMFLAGS = -I m4
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -398,24 +435,23 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
+	  $(AUTOMAKE) --foreign Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    echo ' $(SHELL) ./config.status'; \
 	    $(SHELL) ./config.status;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -663,7 +699,10 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -728,7 +767,7 @@
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
@@ -744,17 +783,17 @@
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
 dist-zip: distdir
@@ -772,7 +811,7 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@@ -782,23 +821,23 @@
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=.. --prefix="$$dc_install_base" \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -985,6 +1024,8 @@
 	uninstall-man uninstall-man1 uninstall-soliddataDATA \
 	uninstall-soliddataappsDATA
 
+.PRECIOUS: Makefile
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

grip-3.10.1.tar.gz/aclocal.m4 -> grip-4.1.1.tar.gz/aclocal.m4 Changed

@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,9081 +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'.])])
 
-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
-#
-# This file is free software, distributed under the terms of the GNU
-# General Public License.  As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
-# the same distribution terms as the rest of that program.
-#
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-#
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
-#
-# Modified to never use included libintl. 
-# Owen Taylor <otaylor@redhat.com>, 12/15/1998
-#
-# Major rework to remove unused code
-# Owen Taylor <otaylor@redhat.com>, 12/11/2002
-#
-# Added better handling of ALL_LINGUAS from GNU gettext version 
-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
-#
-# Modified to require ngettext
-# Matthias Clasen <mclasen@redhat.com> 08/06/2004
-#
-# We need this here as well, since someone might use autoconf-2.5x
-# to configure GLib then an older version to configure a package
-# using AM_GLIB_GNU_GETTEXT
-AC_PREREQ(2.53)
+# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+# serial 11 (pkg-config-0.29.1)
 
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
 dnl
-dnl We go to great lengths to make sure that aclocal won't 
-dnl try to pull in the installed version of these macros
-dnl when running aclocal in the glib directory.
+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
-m4_copy([AC_DEFUN],[glib_DEFUN])
-m4_copy([AC_REQUIRE],[glib_REQUIRE])
+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 At the end, if we're not within glib, we'll define the public
-dnl definitions in terms of our private definitions.
+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
-
-# GLIB_LC_MESSAGES
-#--------------------
-glib_DEFUN([GLIB_LC_MESSAGES],
-  [AC_CHECK_HEADERS([locale.h])
-    if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES, 1,
-        [Define if your <locale.h> file defines LC_MESSAGES.])
-    fi
-  fi])
-
-# GLIB_PATH_PROG_WITH_TEST
-#----------------------------
-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-# GLIB_WITH_NLS
-#-----------------
-glib_DEFUN([GLIB_WITH_NLS],
-  dnl NLS is obligatory
-  [USE_NLS=yes
-    AC_SUBST(USE_NLS)
-
-    gt_cv_have_gettext=no
-
-    CATOBJEXT=NONE
-    XGETTEXT=:
-    INTLLIBS=
-
-    AC_CHECK_HEADER(libintl.h,
-     [gt_cv_func_dgettext_libintl="no"
-      libintl_extra_libs=""
-
-      #
-      # First check in libc
-      #
-      AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
-        [AC_TRY_LINK([
-#include <libintl.h>
-],
-         [return !ngettext ("","", 1)],
-	  gt_cv_func_ngettext_libc=yes,
-          gt_cv_func_ngettext_libc=no)
-        ])
-  
-      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-	      AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
-        	[AC_TRY_LINK([
-#include <libintl.h>
-],
-	          [return !dgettext ("","")],
-		  gt_cv_func_dgettext_libc=yes,
-	          gt_cv_func_dgettext_libc=no)
-        	])
-      fi
-  
-      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-        AC_CHECK_FUNCS(bind_textdomain_codeset)
-      fi
-
-      #
-      # If we don't have everything we want, check in libintl
-      #
-      if test "$gt_cv_func_dgettext_libc" != "yes" \
-	 || test "$gt_cv_func_ngettext_libc" != "yes" \
-         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-        
-        AC_CHECK_LIB(intl, bindtextdomain,
-	    [AC_CHECK_LIB(intl, ngettext,
-		    [AC_CHECK_LIB(intl, dgettext,
-			          gt_cv_func_dgettext_libintl=yes)])])
-
-	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-	  AC_MSG_CHECKING([if -liconv is needed to use gettext])
-	  AC_MSG_RESULT([])
-  	  AC_CHECK_LIB(intl, ngettext,
-          	[AC_CHECK_LIB(intl, dcgettext,
-		       [gt_cv_func_dgettext_libintl=yes
-			libintl_extra_libs=-liconv],
-			:,-liconv)],
-		:,-liconv)
-        fi
-
-        #
-        # If we found libintl, then check in it for bind_textdomain_codeset();
-        # we'll prefer libc if neither have bind_textdomain_codeset(),
-        # and both have dgettext and ngettext
-        #
-        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS -lintl $libintl_extra_libs"
-          unset ac_cv_func_bind_textdomain_codeset
-          AC_CHECK_FUNCS(bind_textdomain_codeset)
-          LIBS="$glib_save_LIBS"
-
-          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-            gt_cv_func_dgettext_libc=no
-          else
-            if test "$gt_cv_func_dgettext_libc" = "yes" \
-		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
-              gt_cv_func_dgettext_libintl=no
-            fi
-          fi
-        fi
-      fi
-
-      if test "$gt_cv_func_dgettext_libc" = "yes" \
-	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        gt_cv_have_gettext=yes
-      fi
-  
-      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        INTLLIBS="-lintl $libintl_extra_libs"
-      fi
-  
-      if test "$gt_cv_have_gettext" = "yes"; then
-	AC_DEFINE(HAVE_GETTEXT,1,
-	  [Define if the GNU gettext() function is already present or preinstalled.])
-	GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-	if test "$MSGFMT" != "no"; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS $INTLLIBS"
-	  AC_CHECK_FUNCS(dcgettext)
-	  MSGFMT_OPTS=
-	  AC_MSG_CHECKING([if msgfmt accepts -c])
-	  GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: test 1.0\n"
-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
-"Last-Translator: test <foo@bar.xx>\n"
-"Language-Team: C <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
-	  AC_SUBST(MSGFMT_OPTS)
-	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-	  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-			 return _nl_msg_cat_cntr],
-	    [CATOBJEXT=.gmo 
-             DATADIRNAME=share],
-	    [case $host in
-	    *-*-solaris*)
-	    dnl On Solaris, if bind_textdomain_codeset is in libc,
-	    dnl GNU format message catalog is always supported,
-            dnl since both are added to the libc all together.
-	    dnl Hence, we'd like to go with DATADIRNAME=share and
-	    dnl and CATOBJEXT=.gmo in this case.
-            AC_CHECK_FUNC(bind_textdomain_codeset,
-	      [CATOBJEXT=.gmo 
-               DATADIRNAME=share],
-	      [CATOBJEXT=.mo
-               DATADIRNAME=lib])
-	    ;;
-	    *-*-openbsd*)
-	    CATOBJEXT=.mo
-            DATADIRNAME=share
-	    ;;
-	    *)
-	    CATOBJEXT=.mo
-            DATADIRNAME=lib
-	    ;;
-	    esac])
-          LIBS="$glib_save_LIBS"
-	  INSTOBJEXT=.mo
-	else
-	  gt_cv_have_gettext=no
-	fi
-      fi
-    ])
-
-    if test "$gt_cv_have_gettext" = "yes" ; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        [always defined to indicate that i18n is enabled])
-    fi
-
-    dnl Test whether we really found GNU xgettext.
-    if test "$XGETTEXT" != ":"; then
-      dnl If it is not GNU xgettext we define it as : so that the
-      dnl Makefiles still can work.
-      if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-        : ;
-      else
-        AC_MSG_RESULT(
-	  [found xgettext program is not GNU xgettext; ignore it])
-        XGETTEXT=":"
-      fi
-    fi
-
-    # We need to process the po/ directory.
-    POSUB=po
-
-    AC_OUTPUT_COMMANDS(
-      [case "$CONFIG_FILES" in *po/Makefile.in*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-      esac])
-
-    dnl These rules are solely for the distribution goal.  While doing this
-    dnl we only have to keep exactly one list of the available catalogs
-    dnl in configure.ac.
-    for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(CATALOGS)
-    AC_SUBST(CATOBJEXT)
-    AC_SUBST(DATADIRNAME)
-    AC_SUBST(GMOFILES)
-    AC_SUBST(INSTOBJEXT)
-    AC_SUBST(INTLLIBS)
-    AC_SUBST(PO_IN_DATADIR_TRUE)
-    AC_SUBST(PO_IN_DATADIR_FALSE)
-    AC_SUBST(POFILES)
-    AC_SUBST(POSUB)
-  ])
-
-# AM_GLIB_GNU_GETTEXT
-# -------------------
-# Do checks necessary for use of gettext. If a suitable implementation 
-# of gettext is found in either in libintl or in the C library,
-# it will set INTLLIBS to the libraries needed for use of gettext
-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
-# on various variables needed by the Makefile.in.in installed by 
-# glib-gettextize.
+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
-glib_DEFUN([GLIB_GNU_GETTEXT],
-  [AC_REQUIRE([AC_PROG_CC])dnl
-   
-   GLIB_LC_MESSAGES
-   GLIB_WITH_NLS
-
-   if test "$gt_cv_have_gettext" = "yes"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       AC_MSG_CHECKING(for catalogs to be installed)
-       NEW_LINGUAS=
-       for presentlang in $ALL_LINGUAS; do
-         useit=no
-         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
-           desiredlanguages="$LINGUAS"
-         else
-           desiredlanguages="$ALL_LINGUAS"
-         fi
-         for desiredlang in $desiredlanguages; do
- 	   # Use the presentlang catalog if desiredlang is
-           #   a. equal to presentlang, or
-           #   b. a variant of presentlang (because in this case,
-           #      presentlang can be used as a fallback for messages
-           #      which are not translated in the desiredlang catalog).
-           case "$desiredlang" in
-             "$presentlang"*) useit=yes;;
-           esac
-         done
-         if test $useit = yes; then
-           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-         fi
-       done
-       LINGUAS=$NEW_LINGUAS
-       AC_MSG_RESULT($LINGUAS)
-     fi
-
-     dnl Construct list of names of catalog files to be constructed.
-     if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-   dnl Try to locate is.
-   MKINSTALLDIRS=
-   if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-   fi
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-   fi
-   AC_SUBST(MKINSTALLDIRS)
-
-   dnl Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.
-   test -d po || mkdir po
-   if test "x$srcdir" != "x."; then
-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-       posrcprefix="$srcdir/"
-     else
-       posrcprefix="../$srcdir/"
-     fi
-   else
-     posrcprefix="../"
-   fi
-   rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/$.*$ \\\\/\1/" \
-	< $srcdir/po/POTFILES.in > po/POTFILES
-  ])
-
-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
-# -------------------------------
-# Define VARIABLE to the location where catalog files will
-# be installed by po/Makefile.
-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
-glib_save_prefix="$prefix"
-glib_save_exec_prefix="$exec_prefix"
-glib_save_datarootdir="$datarootdir"
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-datarootdir=`eval echo "${datarootdir}"`
-if test "x$CATOBJEXT" = "x.mo" ; then
-  localedir=`eval echo "${libdir}/locale"`
-else
-  localedir=`eval echo "${datadir}/locale"`
-fi
-prefix="$glib_save_prefix"
-exec_prefix="$glib_save_exec_prefix"
-datarootdir="$glib_save_datarootdir"
-AC_DEFINE_UNQUOTED($1, "$localedir",
-  [Define the location where the catalogs will be installed])
-])
-
+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 Now the definitions that aclocal will find
+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
-ifdef(glib_configure_ac,[],[
-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
-])dnl
-
-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
-# 
-# Create a temporary file with TEST-FILE as its contents and pass the
-# file name to PROGRAM.  Perform ACTION-IF-PASS if PROGRAM exits with
-# 0 and perform ACTION-IF-FAIL for any other exit status.
-AC_DEFUN([GLIB_RUN_PROG],
-[cat >conftest.foo <<_ACEOF
-$2
-_ACEOF
-if AC_RUN_LOG([$1 conftest.foo]); then
-  m4_ifval([$3], [$3], [:])
-m4_ifvaln([$4], [else $4])dnl
-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
-fi])
-
-
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define([_LT_COPYING], [dnl
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 57 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-       [m4_default([$3],
-		   [m4_fatal([Libtool version $1 or higher is required],
-		             63)])],
-       [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
-  *\ * | *\	*)
-    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-
-_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
-dnl
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
+dnl 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.1])
+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
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_WITH_SYSROOT])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-])
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    _LT_PATH_MAGIC
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG([CC])
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
-
-# _LT_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-[# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/$[["`$\\]]$/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/$[["`\\]]$/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-])
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun([_LT_PROG_LTMAIN],
-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
-])# _LT_PROG_LTMAIN
-
-
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL_INIT],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _LT_CONFIG_LIBTOOL([COMMANDS])
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-
-
-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-# -----------------------------------------------------
-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-[_LT_CONFIG_LIBTOOL([$1])
-_LT_CONFIG_LIBTOOL_INIT([$2])
-])
-
-
-# _LT_FORMAT_COMMENT([COMMENT])
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define([_LT_FORMAT_COMMENT],
-[m4_ifval([$1], [
-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-)])
-
-
-
-
-
-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME.  Any other value will be used directly.
-m4_define([_LT_DECL],
-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-	[m4_ifval([$1], [$1], [$2])])
-    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-    m4_ifval([$4],
-	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-    lt_dict_add_subkey([lt_decl_dict], [$2],
-	[tagged?], [m4_ifval([$5], [yes], [no])])])
-])
-
-
-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-# --------------------------------------------------------
-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-
-
-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_tag_varnames],
-[_lt_decl_filter([tagged?], [yes], $@)])
-
-
-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-# ---------------------------------------------------------
-m4_define([_lt_decl_filter],
-[m4_case([$#],
-  [0], [m4_fatal([$0: too few arguments: $#])],
-  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-])
-
-
-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-# --------------------------------------------------
-m4_define([lt_decl_quote_varnames],
-[_lt_decl_filter([value], [1], $@)])
-
-
-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_dquote_varnames],
-[_lt_decl_filter([value], [2], $@)])
-
-
-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_varnames_tagged],
-[m4_assert([$# <= 2])dnl
-_$0(m4_quote(m4_default([$1], [[, ]])),
-    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-m4_define([_lt_decl_varnames_tagged],
-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-
-
-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_all_varnames],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
-     m4_if([$2], [],
-	   m4_quote(lt_decl_varnames),
-	m4_quote(m4_shift($@))))[]dnl
-])
-m4_define([_lt_decl_all_varnames],
-[lt_join($@, lt_decl_varnames_tagged([$1],
-			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-])
-
-
-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'.  VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly.  In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun([_LT_LIBTOOL_TAGS],
-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
-])
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-#    # Some comment about what VAR is for.
-#    visible_name=$lt_internal_name
-m4_define([_LT_LIBTOOL_DECLARE],
-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-					   [description])))[]dnl
-m4_pushdef([_libtool_name],
-    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-    [0], [_libtool_name=[$]$1],
-    [1], [_libtool_name=$lt_[]$1],
-    [2], [_libtool_name=$lt_[]$1],
-    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-])
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-[m4_foreach([_lt_var],
-    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define([_LT_LIBTOOL_TAG_VARS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-
-
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'.  Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun([_LT_CONFIG_COMMANDS],
-[AC_PROVIDE_IFELSE([LT_OUTPUT],
-	dnl If the libtool generation code has been placed in $CONFIG_LT,
-	dnl instead of duplicating it all over again into config.status,
-	dnl then we will have config.status run $CONFIG_LT later, so it
-	dnl needs to know what name is stored there:
-        [AC_CONFIG_COMMANDS([libtool],
-            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-    dnl If the libtool generation code is destined for config.status,
-    dnl expand the accumulated commands and init code now:
-    [AC_CONFIG_COMMANDS([libtool],
-        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-])#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-[
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$[]1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable.  If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins.  After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script.  The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef([AS_INIT_GENERATED],
-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-[m4_defun([_LT_GENERATED_FILE_INIT],
-[m4_require([AS_PREPARE])]dnl
-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-[lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-[# Run this file to recreate a libtool stub with the current configuration.])
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-exec AS_MESSAGE_LOG_FD>>config.log
-{
-  echo
-  AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2011 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test $[#] != 0
-do
-  case $[1] in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
-
-    *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test "$silent" = yes &&
-  lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
-])# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars.  Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun([_LT_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_CONFIG_SAVE_COMMANDS([
-  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-  m4_if(_LT_TAG, [C], [
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-  _LT_PROG_LTMAIN
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_REPLACE_SHELLFNS
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-],
-[cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-])dnl /m4_if
-],
-[m4_if([$1], [], [
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'], [])
-])dnl /_LT_CONFIG_SAVE_COMMANDS
-])# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN([LT_SUPPORTED_TAG], [])
-
-
-# C support is built-in for now
-m4_define([_LT_LANG_C_enabled], [])
-m4_define([_LT_TAGS], [])
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN([LT_LANG],
-[AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
-  [C],			[_LT_LANG(C)],
-  [C++],		[_LT_LANG(CXX)],
-  [Go],			[_LT_LANG(GO)],
-  [Java],		[_LT_LANG(GCJ)],
-  [Fortran 77],		[_LT_LANG(F77)],
-  [Fortran],		[_LT_LANG(FC)],
-  [Windows Resource],	[_LT_LANG(RC)],
-  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-    [_LT_LANG($1)],
-    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun([_LT_LANG],
-[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-  [LT_SUPPORTED_TAG([$1])dnl
-  m4_append([_LT_TAGS], [$1 ])dnl
-  m4_define([_LT_LANG_]$1[_enabled], [])dnl
-  _LT_LANG_$1_CONFIG($1)])dnl
-])# _LT_LANG
-
-
-m4_ifndef([AC_PROG_GO], [
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-m4_defun([AC_PROG_GO],
-[AC_LANG_PUSH(Go)dnl
-AC_ARG_VAR([GOC],     [Go compiler command])dnl
-AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
-_AC_ARG_VAR_LDFLAGS()dnl
-AC_CHECK_TOOL(GOC, gccgo)
-if test -z "$GOC"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
-  fi
-fi
-if test -z "$GOC"; then
-  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
-fi
-])#m4_defun
-])#m4_ifndef
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun([_LT_LANG_DEFAULT_CONFIG],
-[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-  [LT_LANG(CXX)],
-  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_F77],
-  [LT_LANG(F77)],
-  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_FC],
-  [LT_LANG(FC)],
-  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-
-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-  [LT_LANG(GCJ)],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-    [LT_LANG(GCJ)],
-    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-      [LT_LANG(GCJ)],
-      [m4_ifdef([AC_PROG_GCJ],
-	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([A][M_PROG_GCJ],
-	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([LT_PROG_GCJ],
-	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
-AC_PROVIDE_IFELSE([AC_PROG_GO],
-  [LT_LANG(GO)],
-  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
-
-AC_PROVIDE_IFELSE([LT_PROG_RC],
-  [LT_LANG(RC)],
-  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun([_LT_TAG_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun([_LT_COMPILER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun([_LT_LINKER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-    AC_CHECK_TOOL([LIPO], [lipo], [:])
-    AC_CHECK_TOOL([OTOOL], [otool], [:])
-    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-    _LT_DECL([], [DSYMUTIL], [1],
-      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-    _LT_DECL([], [NMEDIT], [1],
-      [Tool to change global to local symbols on Mac OS X])
-    _LT_DECL([], [LIPO], [1],
-      [Tool to manipulate fat objects and archives on Mac OS X])
-    _LT_DECL([], [OTOOL], [1],
-      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-    _LT_DECL([], [OTOOL64], [1],
-      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi])
-
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-	[lt_cv_ld_exported_symbols_list=yes],
-	[lt_cv_ld_exported_symbols_list=no])
-	LDFLAGS="$save_LDFLAGS"
-    ])
-
-    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
-      [lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
-      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
-      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[012]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[[012]]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
-
-
-# _LT_DARWIN_LINKER_FEATURES([TAG])
-# ---------------------------------
-# Checks for linker and compiler features on darwin
-m4_defun([_LT_DARWIN_LINKER_FEATURES],
-[
-  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_automatic, $1)=yes
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
-                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
-  else
-    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-  fi
-  _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    m4_if([$1], [CXX],
-[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-    fi
-],[])
-  else
-  _LT_TAGVAR(ld_shlibs, $1)=no
-  fi
-])
-
-# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
-# ----------------------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-# Store the results from the different compilers for each TAGNAME.
-# Allow to override them for all tags through lt_cv_aix_libpath.
-m4_defun([_LT_SYS_MODULE_PATH_AIX],
-[m4_require([_LT_DECL_SED])dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
-  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
-  lt_aix_libpath_sed='[
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *$[^ ]*$ *$/\1/
-	      p
-	  }
-      }]'
-  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi],[])
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
-  fi
-  ])
-  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
-fi
-])# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
-[m4_divert_text([M4SH-INIT], [$1
-])])# _LT_SHELL_INIT
-
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Find how we can fake an echo command that does not interpret backslash.
-# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-AC_MSG_CHECKING([how to print strings])
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$[]1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*" 
-}
-
-case "$ECHO" in
-  printf*) AC_MSG_RESULT([printf]) ;;
-  print*) AC_MSG_RESULT([print -r]) ;;
-  *) AC_MSG_RESULT([cat]) ;;
-esac
-
-m4_ifdef([_AS_DETECT_SUGGESTED],
-[_AS_DETECT_SUGGESTED([
-  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test "X`printf %s $ECHO`" = "X$ECHO" \
-      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
-
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_WITH_SYSROOT
-# ----------------
-AC_DEFUN([_LT_WITH_SYSROOT],
-[AC_MSG_CHECKING([for sysroot])
-AC_ARG_WITH([sysroot],
-[  --with-sysroot[=DIR] Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).],
-[], [with_sysroot=no])
-
-dnl lt_sysroot will always be passed unquoted.  We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
-   if test "$GCC" = yes; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   AC_MSG_RESULT([${with_sysroot}])
-   AC_MSG_ERROR([The sysroot must be an absolute path.])
-   ;;
-esac
-
- AC_MSG_RESULT([${lt_sysroot:-no}])
-_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and in which our libraries should be installed.])])
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun([_LT_ENABLE_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-  [AS_HELP_STRING([--disable-libtool-lock],
-    [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD="${LD-ld}_sol2"
-        fi
-        ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-])# _LT_ENABLE_LOCK
-
-
-# _LT_PROG_AR
-# -----------
-m4_defun([_LT_PROG_AR],
-[AC_CHECK_TOOLS(AR, [ar], false)
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
-
-AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
-  [lt_cv_ar_at_file=no
-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
-     [echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
-      AC_TRY_EVAL([lt_ar_try])
-      if test "$ac_status" -eq 0; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	AC_TRY_EVAL([lt_ar_try])
-	if test "$ac_status" -ne 0; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-     ])
-  ])
-
-if test "x$lt_cv_ar_at_file" = xno; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-_LT_DECL([], [archiver_list_spec], [1],
-  [How to feed a file listing to the archiver])
-])# _LT_PROG_AR
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun([_LT_CMD_OLD_ARCHIVE],
-[_LT_PROG_AR
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL([], [RANLIB], [1],
-    [Commands used to install an old-style archive])
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-_LT_DECL([], [old_postinstall_cmds], [2])
-_LT_DECL([], [old_postuninstall_cmds], [2])
-_LT_TAGDECL([], [old_archive_cmds], [2],
-    [Commands used to build an old-style archive])
-_LT_DECL([], [lock_old_archive_extraction], [0],
-    [Whether to use a lock for old archive extraction])
-])# _LT_CMD_OLD_ARCHIVE
-
-
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([_LT_COMPILER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $RM conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$5], , :, [$5])
-else
-    m4_if([$6], , :, [$6])
-fi
-])# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-
-
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                  [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN([_LT_LINKER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$4], , :, [$4])
-else
-    m4_if([$5], , :, [$5])
-fi
-])# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN([LT_CMD_MAX_LEN],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL([], [max_cmd_len], [0],
-    [What is the maximum length of a command?])
-])# LT_CMD_MAX_LEN
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun([_LT_HEADER_DLFCN],
-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-])# _LT_HEADER_DLFCN
-
-
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun([_LT_TRY_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-[#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}]
-_LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_TRY_DLOPEN_SELF
-
-
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN([LT_SYS_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-    ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-	  lt_cv_dlopen_self_static, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-_LT_DECL([dlopen_support], [enable_dlopen], [0],
-	 [Whether dlopen is supported])
-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-	 [Whether dlopen of programs is supported])
-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-	 [Whether dlopen of statically linked programs is supported])
-])# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-
-
-# _LT_COMPILER_C_O([TAGNAME])
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun([_LT_COMPILER_C_O],
-[m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-])
-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-	[Does compiler simultaneously support -c and -o options?])
-])# _LT_COMPILER_C_O
-
-
-# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-# ----------------------------------
-# Check to see if we can do hard links to lock some files if needed
-m4_defun([_LT_COMPILER_FILE_LOCKS],
-[m4_require([_LT_ENABLE_LOCK])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_COMPILER_C_O([$1])
-
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-])# _LT_COMPILER_FILE_LOCKS
-
-
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun([_LT_CHECK_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-_LT_DECL([], [objdir], [0],
-         [The name of the directory that contains temporary libtool files])dnl
-m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-  [Define to the sub-directory in which libtool stores uninstalled libraries.])
-])# _LT_CHECK_OBJDIR
-
-
-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-# --------------------------------------
-# Check hardcoding attributes.
-m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-_LT_TAGDECL([], [hardcode_action], [0],
-    [How to hardcode a shared library path into an executable])
-])# _LT_LINKER_HARDCODE_LIBPATH
-
-
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun([_LT_CMD_STRIPLIB],
-[m4_require([_LT_DECL_EGREP])
-striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      AC_MSG_RESULT([yes])
-    else
-      AC_MSG_RESULT([no])
-    fi
-    ;;
-  *)
-    AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-_LT_DECL([], [striplib], [1])
-])# _LT_CMD_STRIPLIB
-
-
-# _LT_SYS_DYNAMIC_LINKER([TAG])
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-m4_defun([_LT_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_OBJDUMP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-m4_if([$1],
-	[], [
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=$[[A-Za-z]]:$,\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/$[[A-Za-z]]:$,\1,g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[[4-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/$[[^/]]*$\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-m4_if([$1], [],[
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$[[a-zA-Z]]\$:| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
-      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[23]].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[[3-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
-    [lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-	 [lt_cv_shlibpath_overrides_runpath=yes])])
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-    ])
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-    if AC_TRY_EVAL(ac_compile); then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
-
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-
-  # 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="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-_LT_DECL([], [variables_saved_for_relink], [1],
-    [Variables whose values should be saved in libtool wrapper scripts and
-    restored at link time])
-_LT_DECL([], [need_lib_prefix], [0],
-    [Do we need the "lib" prefix for modules?])
-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-_LT_DECL([], [version_type], [0], [Library versioning type])
-_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-_LT_DECL([], [shlibpath_overrides_runpath], [0],
-    [Is shlibpath searched before the hard-coded library search path?])
-_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-_LT_DECL([], [library_names_spec], [1],
-    [[List of archive names.  First name is the real one, the rest are links.
-    The last name is the one that the linker finds with -lNAME]])
-_LT_DECL([], [soname_spec], [1],
-    [[The coded name of the library, if different from the real name]])
-_LT_DECL([], [install_override_mode], [1],
-    [Permission mode override for installation of shared libraries])
-_LT_DECL([], [postinstall_cmds], [2],
-    [Command to use after installation of a shared archive])
-_LT_DECL([], [postuninstall_cmds], [2],
-    [Command to use after uninstallation of a shared archive])
-_LT_DECL([], [finish_cmds], [2],
-    [Commands used to finish a libtool library installation in a directory])
-_LT_DECL([], [finish_eval], [1],
-    [[As "finish_cmds", except a single script fragment to be evaled but
-    not shown]])
-_LT_DECL([], [hardcode_into_libs], [0],
-    [Whether we should hardcode library paths into libraries])
-_LT_DECL([], [sys_lib_search_path_spec], [2],
-    [Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-    [Run-time system search path for libraries])
-])# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program which can recognize shared library
-AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-[m4_require([_LT_DECL_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="m4_if([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-_LT_DECL([], [MAGIC_CMD], [0],
-	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-])# _LT_PATH_TOOL_PREFIX
-
-# Old name:
-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-
-
-# _LT_PATH_MAGIC
-# --------------
-# find a file program which can recognize a shared library
-m4_defun([_LT_PATH_MAGIC],
-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# _LT_PATH_MAGIC
-
-
-# LT_PATH_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([LT_PATH_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-_LT_PATH_LD_GNU
-AC_SUBST([LD])
-
-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-])# LT_PATH_LD
-
-# Old names:
-AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_LD], [])
-dnl AC_DEFUN([AC_PROG_LD], [])
-
-
-# _LT_PATH_LD_GNU
-#- --------------
-m4_defun([_LT_PATH_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# _LT_PATH_LD_GNU
-
-
-# _LT_CMD_RELOAD
-# --------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-m4_defun([_LT_CMD_RELOAD],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test "$GCC" != yes; then
-      reload_cmds=false
-    fi
-    ;;
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_TAGDECL([], [reload_cmds], [2])dnl
-])# _LT_CMD_RELOAD
-
-
-# _LT_CHECK_MAGIC_METHOD
-# ----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_MAGIC_METHOD],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-AC_CACHE_CHECK([how to recognize dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[[4-9]]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[[45]]*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc*)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[[3-9]]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/$..$/s\/[[\1]]\/[[\1]]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-_LT_DECL([], [deplibs_check_method], [1],
-    [Method to check whether dependent libraries are shared objects])
-_LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method = "file_magic"])
-_LT_DECL([], [file_magic_glob], [1],
-    [How to find potential files when deplibs_check_method = "file_magic"])
-_LT_DECL([], [want_nocaseglob], [1],
-    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
-])# _LT_CHECK_MAGIC_METHOD
-
-
-# LT_PATH_NM
-# ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN([LT_PATH_NM],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi])
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-  AC_SUBST([DUMPBIN])
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST([NM])
-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-  [lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
-  cat conftest.out >&AS_MESSAGE_LOG_FD
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*])
-])# LT_PATH_NM
-
-# Old names:
-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_NM], [])
-dnl AC_DEFUN([AC_PROG_NM], [])
-
-# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-# --------------------------------
-# how to determine the name of the shared library
-# associated with a specific link library.
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-m4_require([_LT_DECL_DLLTOOL])
-AC_CACHE_CHECK([how to associate runtime and link libraries],
-lt_cv_sharedlib_from_linklib_cmd,
-[lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh
-  # decide which to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-  ;;
-esac
-])
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
-    [Command to associate shared and link libraries])
-])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-
-
-# _LT_PATH_MANIFEST_TOOL
-# ----------------------
-# locate the manifest tool
-m4_defun([_LT_PATH_MANIFEST_TOOL],
-[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
-  [lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
-  MANIFEST_TOOL=:
-fi
-_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
-])# _LT_PATH_MANIFEST_TOOL
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN([LT_LIB_M],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-AC_SUBST([LIBM])
-])# LT_LIB_M
-
-# Old name:
-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_CHECK_LIBM], [])
-
-
-# _LT_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------
-m4_defun([_LT_COMPILER_NO_RTTI],
-[m4_require([_LT_TAG_COMPILER])dnl
-
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
-  esac
-
-  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-	[Compiler flag to turn off builtin functions])
-])# _LT_COMPILER_NO_RTTI
-
-
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='$[[_A-Za-z]][[_A-Za-z0-9]]*$'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: $[[^ ]]*$[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $lib[[^ ]]*$$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK ['"\
-"     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF $[^|]$*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/.*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx]"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]$$symcode$symcode*$[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT@&t@_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT@&t@_DLSYM_CONST
-#else
-# define LT@&t@_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-LT@&t@_DLSYM_CONST struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[[]] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* $.*$ $.*$$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-    [Take the output of nm and produce a listing of raw symbols and C names])
-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-    [Transform the output of nm in a proper C declaration])
-_LT_DECL([global_symbol_to_c_name_address],
-    [lt_cv_sys_global_symbol_to_c_name_address], [1],
-    [Transform the output of nm in a C name address pair])
-_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-    [Transform the output of nm in a C name address pair when lib prefix is needed])
-_LT_DECL([], [nm_file_list_spec], [1],
-    [Specify filename containing input files for $NM])
-]) # _LT_CMD_GLOBAL_SYMBOLS
-
-
-# _LT_COMPILER_PIC([TAGNAME])
-# ---------------------------
-m4_defun([_LT_COMPILER_PIC],
-[m4_require([_LT_TAG_COMPILER])dnl
-_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_TAGVAR(lt_prog_compiler_static, $1)=
-
-m4_if([$1], [CXX], [
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[[4-9]]*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      mingw* | cygwin* | os2* | pw32* | cegcc*)
-	# This hack is so that the source file can tell whether it is being
-	# built for inclusion in a dll (and should export symbols for example).
-	m4_if([$1], [GCJ], [],
-	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  ecpc* )
-	    # old Intel C++ for x86_64 which still supported -KPIC.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  icpc* )
-	    # Intel C++, used to be incompatible with GCC.
-	    # ICC 10 doesn't accept -KPIC any more.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  ;;
-        *Intel*\ [[CF]]*Compiler*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	  ;;
-	*Portland\ Group*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-
-AC_CACHE_CHECK([for $compiler option to produce PIC],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-	[Additional compiler flags for building library objects])
-
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-	[Compiler flag to prevent dynamic linking])
-])# _LT_COMPILER_PIC
-
-
-# _LT_LINKER_SHLIBS([TAGNAME])
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun([_LT_LINKER_SHLIBS],
-[AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-m4_if([$1], [CXX], [
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  case $host_os in
-  aix[[4-9]]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    # Also, AIX nm treats weak defined symbols like other global defined
-    # symbols, whereas GNU nm marks them as "W".
-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-    ;;
-  cygwin* | mingw* | cegcc*)
-    case $cc_basename in
-    cl*)
-      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-      ;;
-    *)
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1 DATA/;s/^.*[[ ]]__nm__$[[^ ]]*$[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-      ;;
-    esac
-    ;;
-  linux* | k*bsd*-gnu)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
-  *)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-    ;;
-  esac
-], [
-  runpath_var=
-  _LT_TAGVAR(allow_undefined_flag, $1)=
-  _LT_TAGVAR(always_export_symbols, $1)=no
-  _LT_TAGVAR(archive_cmds, $1)=
-  _LT_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_TAGVAR(compiler_needs_object, $1)=no
-  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(hardcode_automatic, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(inherit_rpath, $1)=no
-  _LT_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_TAGVAR(module_cmds, $1)=
-  _LT_TAGVAR(module_expsym_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  _LT_TAGVAR(ld_shlibs, $1)=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ $GNU\ Binutils$\ 2.19.5*) ;;
-	  *\ $GNU\ Binutils$\ 2.[[2-9]]*) ;;
-	  *\ $GNU\ Binutils$\ [[3-9]]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[[3-9]]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=no
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1 DATA/;s/^.*[[ ]]__nm__$[[^ ]]*$[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    haiku*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    interix[[3-9]]*)
-      _LT_TAGVAR(hardcode_direct, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-	  tmp_sharedflag='--shared' ;;
-	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix[[4-9]]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_TAGVAR(archive_cmds, $1)=''
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-	_LT_TAGVAR(link_all_deplibs, $1)=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
-
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        _LT_SYS_MODULE_PATH_AIX([$1])
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX([$1])
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  fi
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[[45]]*)
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	_LT_TAGVAR(always_export_symbols, $1)=yes
-	_LT_TAGVAR(file_list_spec, $1)='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    sed -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	  else
-	    sed -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	  fi~
-	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	  linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-	  case $lt_outputfile in
-	    *.exe|*.EXE) ;;
-	    *)
-	      lt_outputfile="$lt_outputfile.exe"
-	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-	      ;;
-	  esac~
-	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	    $RM "$lt_outputfile.manifest";
-	  fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	# FIXME: Should let the user specify the lib program.
-	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-      _LT_DARWIN_LINKER_FEATURES($1)
-      ;;
-
-    dgux*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	m4_if($1, [], [
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  _LT_LINKER_OPTION([if $CC understands -b],
-	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
-	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
-	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
-	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
-	  [lt_cv_irix_exported_symbol],
-	  [save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-	   AC_LINK_IFELSE(
-	     [AC_LANG_SOURCE(
-	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
-			      [C++], [[int foo (void) { return 0; }]],
-			      [Fortran 77], [[
-      subroutine foo
-      end]],
-			      [Fortran], [[
-      subroutine foo
-      end]])])],
-	      [lt_cv_irix_exported_symbol=yes],
-	      [lt_cv_irix_exported_symbol=no])
-           LDFLAGS="$save_LDFLAGS"])
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-	fi
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(inherit_rpath, $1)=yes
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	     ;;
-	   *)
-	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-])
-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-
-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-_LT_DECL([], [extract_expsyms_cmds], [2],
-    [The commands to extract the exported symbol list from a shared archive])
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
-	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
-	[$RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-	  _LT_TAGVAR(allow_undefined_flag, $1)=
-	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-	  then
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	  else
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  fi
-	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-	])
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-    [Whether or not to add -lc for building shared libraries])
-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-    [enable_shared_with_static_runtimes], [0],
-    [Whether or not to disallow shared libs when runtime libs are static])
-_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-    [Compiler flag to allow reflexive dlopens])
-_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-    [Compiler flag to generate shared objects directly from archives])
-_LT_TAGDECL([], [compiler_needs_object], [1],
-    [Whether the compiler copes with passing no objects directly])
-_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-    [Create an old-style archive from a shared archive])
-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-    [Create a temporary old-style archive to link instead of a shared archive])
-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-_LT_TAGDECL([], [archive_expsym_cmds], [2])
-_LT_TAGDECL([], [module_cmds], [2],
-    [Commands used to build a loadable module if different from building
-    a shared archive.])
-_LT_TAGDECL([], [module_expsym_cmds], [2])
-_LT_TAGDECL([], [with_gnu_ld], [1],
-    [Whether we are building with GNU ld or not])
-_LT_TAGDECL([], [allow_undefined_flag], [1],
-    [Flag that allows shared libraries with undefined symbols to be built])
-_LT_TAGDECL([], [no_undefined_flag], [1],
-    [Flag that enforces no undefined symbols])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-    [Flag to hardcode $libdir into a binary during linking.
-    This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-    [Whether we need a single "-rpath" flag with a separated argument])
-_LT_TAGDECL([], [hardcode_direct], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary])
-_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary and the resulting library dependency is
-    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
-    library is relocated])
-_LT_TAGDECL([], [hardcode_minus_L], [0],
-    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_automatic], [0],
-    [Set to "yes" if building a shared library automatically hardcodes DIR
-    into the library and all subsequent libraries and executables linked
-    against it])
-_LT_TAGDECL([], [inherit_rpath], [0],
-    [Set to yes if linker adds runtime paths of dependent libraries
-    to runtime path list])
-_LT_TAGDECL([], [link_all_deplibs], [0],
-    [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [always_export_symbols], [0],
-    [Set to "yes" if exported symbols are required])
-_LT_TAGDECL([], [export_symbols_cmds], [2],
-    [The commands to list exported symbols])
-_LT_TAGDECL([], [exclude_expsyms], [1],
-    [Symbols that should not be listed in the preloaded symbols])
-_LT_TAGDECL([], [include_expsyms], [1],
-    [Symbols that must always be exported])
-_LT_TAGDECL([], [prelink_cmds], [2],
-    [Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [postlink_cmds], [2],
-    [Commands necessary for finishing linking programs])
-_LT_TAGDECL([], [file_list_spec], [1],
-    [Specify filename containing input files])
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-dnl    [Compiler flag to generate thread safe objects])
-])# _LT_LINKER_SHLIBS
-
-
-# _LT_LANG_C_CONFIG([TAG])
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_C_CONFIG],
-[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_SYS_DYNAMIC_LINKER($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-  LT_SYS_DLOPEN_SELF
-  _LT_CMD_STRIPLIB
-
-  # Report which library types will actually be built
-  AC_MSG_CHECKING([if libtool supports shared libraries])
-  AC_MSG_RESULT([$can_build_shared])
-
-  AC_MSG_CHECKING([whether to build shared libraries])
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[[4-9]]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  AC_MSG_RESULT([$enable_shared])
-
-  AC_MSG_CHECKING([whether to build static libraries])
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  AC_MSG_RESULT([$enable_static])
-
-  _LT_CONFIG($1)
-fi
-AC_LANG_POP
-CC="$lt_save_CC"
-])# _LT_LANG_C_CONFIG
-
-
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_CFLAGS=$CFLAGS
-  lt_save_LD=$LD
-  lt_save_GCC=$GCC
-  GCC=$GXX
-  lt_save_with_gnu_ld=$with_gnu_ld
-  lt_save_path_LD=$lt_cv_path_LD
-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-  else
-    $as_unset lt_cv_prog_gnu_ld
-  fi
-  if test -n "${lt_cv_path_LDCXX+set}"; then
-    lt_cv_path_LD=$lt_cv_path_LDCXX
-  else
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  CFLAGS=$CXXFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test "$GXX" = yes; then
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-    else
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-    fi
-
-    if test "$GXX" = yes; then
-      # Set up default GNU C++ configuration
-
-      LT_PATH_LD
-
-      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-      # archiving commands below assume that GNU ld is being used.
-      if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-        # If archive_cmds runs LD, not CC, wlarc should be empty
-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-        #     investigate it a little bit more. (MM)
-        wlarc='${wl}'
-
-        # ancient GNU ld didn't support --whole-archive et. al.
-        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	  $GREP 'no-whole-archive' > /dev/null; then
-          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-        else
-          _LT_TAGVAR(whole_archive_flag_spec, $1)=
-        fi
-      else
-        with_gnu_ld=no
-        wlarc=
-
-        # A generic and very simple default shared library creation
-        # command for GNU C++ for the case where it uses the native
-        # linker, instead of GNU ld.  If possible, this setting should
-        # overridden to take advantage of the native linker features on
-        # the platform it is being used on.
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
-
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-    else
-      GXX=no
-      with_gnu_ld=no
-      wlarc=
-    fi
-
-    # PORTME: fill in a description of your system's C++ link characteristics
-    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-    _LT_TAGVAR(ld_shlibs, $1)=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-      aix[[4-9]]*)
-        if test "$host_cpu" = ia64; then
-          # On IA64, the linker does run time linking by default, so we don't
-          # have to do anything special.
-          aix_use_runtimelinking=no
-          exp_sym_flag='-Bexport'
-          no_entry_flag=""
-        else
-          aix_use_runtimelinking=no
-
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
-          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	    for ld_flag in $LDFLAGS; do
-	      case $ld_flag in
-	      *-brtl*)
-	        aix_use_runtimelinking=yes
-	        break
-	        ;;
-	      esac
-	    done
-	    ;;
-          esac
-
-          exp_sym_flag='-bexport'
-          no_entry_flag='-bnoentry'
-        fi
-
-        # When large executables or shared objects are built, AIX ld can
-        # have problems creating the table of contents.  If linking a library
-        # or program results in "error TOC overflow" add -mminimal-toc to
-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-        _LT_TAGVAR(archive_cmds, $1)=''
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-        if test "$GXX" = yes; then
-          case $host_os in aix4.[[012]]|aix4.[[012]].*)
-          # We only want to do this on AIX 4.2 and lower, the check
-          # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	    # We have reworked collect2
-	    :
-	  else
-	    # We have old collect2
-	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	    # It fails to find uninstalled libraries when the uninstalled
-	    # path is not listed in the libpath.  Setting hardcode_minus_L
-	    # to unsupported forces relinking
-	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-          esac
-          shared_flag='-shared'
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag="$shared_flag "'${wl}-G'
-	  fi
-	  _LT_TAGVAR(link_all_deplibs, $1)=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
-
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-        # It seems that -bexpall does not export symbols beginning with
-        # underscore (_), so it is better to generate a list of symbols to
-	# export.
-        _LT_TAGVAR(always_export_symbols, $1)=yes
-        if test "$aix_use_runtimelinking" = yes; then
-          # Warning - without using the other runtime loading flags (-brtl),
-          # -berok will link without error, but may produce a broken library.
-          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          _LT_SYS_MODULE_PATH_AIX([$1])
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-        else
-          if test "$host_cpu" = ia64; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-          else
-	    # Determine the default libpath from the value encoded in an
-	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX([$1])
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	    # Warning - without using the other run time loading flags,
-	    # -berok will link without error, but may produce a broken library.
-	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	    if test "$with_gnu_ld" = yes; then
-	      # We only use this code for GNU lds that support --whole-archive.
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    else
-	      # Exported symbols can be pulled into shared objects from archives
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	    fi
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-          fi
-        fi
-        ;;
-
-      beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	  ;;
-        esac
-        ;;
-
-      cygwin* | mingw* | pw32* | cegcc*)
-	case $GXX,$cc_basename in
-	,cl* | no,cl*)
-	  # Native MSVC
-	  # hardcode_libdir_flag_spec is actually meaningless, as there is
-	  # no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=yes
-	  _LT_TAGVAR(file_list_spec, $1)='@'
-	  # Tell ltmain to make .lib files, not .a files.
-	  libext=lib
-	  # Tell ltmain to make .dll files, not .so files.
-	  shrext_cmds=".dll"
-	  # FIXME: Setting linknames here is a bad hack.
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      $SED -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	    else
-	      $SED -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	    fi~
-	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	    linknames='
-	  # The linker will not automatically build a static lib if we build a DLL.
-	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	  # Don't use ranlib
-	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	    lt_tool_outputfile="@TOOL_OUTPUT@"~
-	    case $lt_outputfile in
-	      *.exe|*.EXE) ;;
-	      *)
-		lt_outputfile="$lt_outputfile.exe"
-		lt_tool_outputfile="$lt_tool_outputfile.exe"
-		;;
-	    esac~
-	    func_to_tool_file "$lt_outputfile"~
-	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	      $RM "$lt_outputfile.manifest";
-	    fi'
-	  ;;
-	*)
-	  # g++
-	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-	  # as there is no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=no
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	    # If the export-symbols file already is a .def file (1st line
-	    # is EXPORTS), use it as is; otherwise, prepend...
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      cp $export_symbols $output_objdir/$soname.def;
-	    else
-	      echo EXPORTS > $output_objdir/$soname.def;
-	      cat $export_symbols >> $output_objdir/$soname.def;
-	    fi~
-	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	  ;;
-	esac
-	;;
-      darwin* | rhapsody*)
-        _LT_DARWIN_LINKER_FEATURES($1)
-	;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      freebsd2.*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      freebsd-elf*)
-        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-        ;;
-
-      gnu*)
-        ;;
-
-      haiku*)
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        ;;
-
-      hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            _LT_TAGVAR(ld_shlibs, $1)=no
-            ;;
-          aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              _LT_TAGVAR(ld_shlibs, $1)=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            _LT_TAGVAR(hardcode_direct, $1)=no
-            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-            ;;
-          *)
-            _LT_TAGVAR(hardcode_direct, $1)=yes
-            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					         # but as the default
-					         # location of the library.
-            ;;
-        esac
-
-        case $cc_basename in
-          CC*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	    esac
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test $with_gnu_ld = no; then
-	        case $host_cpu in
-	          hppa*64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	        esac
-	      fi
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      interix[[3-9]]*)
-	_LT_TAGVAR(hardcode_direct, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process.  To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
-	      fi
-	    fi
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-	    ;;
-        esac
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(inherit_rpath, $1)=yes
-        ;;
-
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	    ;;
-	  icpc* | ecpc* )
-	    # Intel C++
-	    with_gnu_ld=yes
-	    # version 8.0 and above of icpc choke on multiply defined symbols
-	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-	    # earlier do not add the objects themselves.
-	    case `$CC -V 2>&1` in
-	      *"Version 7."*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	      *)  # Version 8.0 or newer
-	        tmp_idyn=
-	        case $host_cpu in
-		  ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
-	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-		$RANLIB $oldlib'
-	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    *) # Version 6 and above use weak symbols
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-            ;;
-	  cxx*)
-	    # Compaq C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	    runpath_var=LD_RUN_PATH
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
-	    ;;
-	  xl* | mpixl* | bgxl*)
-	    # IBM XL 8.0 on PPC, with GNU ld
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    if test "x$supports_anon_versioning" = xyes; then
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	    fi
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	      _LT_TAGVAR(compiler_needs_object, $1)=yes
-
-	      # Not sure whether something based on
-	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	      # would be better.
-	      output_verbose_link_cmd='func_echo_all'
-
-	      # Archives containing C++ object files must be created using
-	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	      # necessary to make sure instantiated templates are included
-	      # in the archive.
-	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	esac
-	;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-	;;
-
-      *nto* | *qnx*)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
-
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      openbsd*)
-	if test -f /usr/libexec/ld.so; then
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=func_echo_all
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      osf3* | osf4* | osf5*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-		;;
-	      *)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
-	          $RM $lib.exp'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-		;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld.*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-	  *)
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	      case $host in
-	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	      esac
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	      # Commands to make compiler produce verbose output that lists
-	      # what "hidden" libraries, object files and flags are used when
-	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	    case $host_os in
-	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	      *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
-	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-
-	    output_verbose_link_cmd='func_echo_all'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	    # The C++ compiler must be used to create the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      else
-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	        # platform.
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      fi
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	      case $host_os in
-		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-		*)
-		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-      esac
-      ;;
-
-      sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly.  If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-	_LT_TAGVAR(link_all_deplibs, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
-          CC*)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
-	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
-	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
-	      '"$_LT_TAGVAR(reload_cmds, $1)"
-	    ;;
-	  *)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	esac
-      ;;
-
-      tandem*)
-        case $cc_basename in
-          NCC*)
-	    # NonStop-UX NCC 3.20
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-    esac
-
-    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-    _LT_TAGVAR(GCC, $1)="$GXX"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  with_gnu_ld=$lt_save_with_gnu_ld
-  lt_cv_path_LDCXX=$lt_cv_path_LD
-  lt_cv_path_LD=$lt_save_path_LD
-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
-
-AC_LANG_POP
-])# _LT_LANG_CXX_CONFIG
-
-
-# _LT_FUNC_STRIPNAME_CNF
-# ----------------------
-# func_stripname_cnf prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-#
-# This function is identical to the (non-XSI) version of func_stripname,
-# except this one can be used by m4 code that may be executed by configure,
-# rather than the libtool script.
-m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
-AC_REQUIRE([_LT_DECL_SED])
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
-func_stripname_cnf ()
-{
-  case ${2} in
-  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-  esac
-} # func_stripname_cnf
-])# _LT_FUNC_STRIPNAME_CNF
-
-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-# ---------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
-
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-_LT_EOF
-], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
-package foo
-func foo() {
-}
-_LT_EOF
-])
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-esac
-
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case ${prev}${p} in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
-	 prev=$p
-	 continue
-       fi
-
-       # Expand the sysroot to ease extracting the directories later.
-       if test -z "$prev"; then
-         case $p in
-         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-         esac
-       fi
-       case $p in
-       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-       esac
-       if test "$pre_test_object_deps_done" = no; then
-	 case ${prev} in
-	 -L | -R)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       prev=
-       ;;
-
-    *.lto.$objext) ;; # Ignore GCC LTO objects
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	   _LT_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-	   _LT_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# PORTME: override above test on systems where it is broken
-m4_if([$1], [CXX],
-[case $host_os in
-interix[[3-9]]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_TAGVAR(predep_objects,$1)=
-  _LT_TAGVAR(postdep_objects,$1)=
-  _LT_TAGVAR(postdeps,$1)=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC* | sunCC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-])
-
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-    [The directories searched by this compiler when creating a shared library])
-_LT_TAGDECL([], [predep_objects], [1],
-    [Dependencies to place before and after the objects being linked to
-    create a shared library])
-_LT_TAGDECL([], [postdep_objects], [1])
-_LT_TAGDECL([], [predeps], [1])
-_LT_TAGDECL([], [postdeps], [1])
-_LT_TAGDECL([], [compiler_lib_search_path], [1],
-    [The library search path used internally by the compiler when linking
-    a shared library])
-])# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_LANG_F77_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_F77_CONFIG],
-[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${F77-"f77"}
-  CFLAGS=$FFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-  GCC=$G77
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$G77"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-  CFLAGS="$lt_save_CFLAGS"
-fi # test "$_lt_disable_F77" != yes
-
-AC_LANG_POP
-])# _LT_LANG_F77_CONFIG
-
-
-# _LT_LANG_FC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_FC_CONFIG],
-[AC_LANG_PUSH(Fortran)
-
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${FC-"f95"}
-  CFLAGS=$FCFLAGS
-  compiler=$CC
-  GCC=$ac_cv_fc_compiler_gnu
-
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-fi # test "$_lt_disable_FC" != yes
-
-AC_LANG_POP
-])# _LT_LANG_FC_CONFIG
-
-
-# _LT_LANG_GCJ_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Java Compiler compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GCJ_CONFIG],
-[AC_REQUIRE([LT_PROG_GCJ])dnl
-AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GCJ-"gcj"}
-CFLAGS=$GCJFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-ac_compile='$CC -c $GCJFLAGS conftest.$ac_ext >&AS_MESSAGE_LOG_FD'
-ac_link='$CC -o conftest$ac_exeext --main=conftest $GCJFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&AS_MESSAGE_LOG_FD'
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_GO_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Go compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GO_CONFIG],
-[AC_REQUIRE([LT_PROG_GO])dnl
-AC_LANG_SAVE
-
-# Source file extension for Go test sources.
-ac_ext=go
-
-# Object file extension for compiled Go test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="package main; func main() { }"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='package main; func main() { }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GOC-"gccgo"}
-CFLAGS=$GOFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# Go did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GO_CONFIG
-
-
-# _LT_LANG_RC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_RC_CONFIG],
-[AC_REQUIRE([LT_PROG_RC])dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=
-CC=${RC-"windres"}
-CFLAGS=
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
-  :
-  _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN([LT_PROG_GCJ],
-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-    [AC_CHECK_TOOL(GCJ, gcj,)
-      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)])])[]dnl
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-
-
-# LT_PROG_GO
-# ----------
-AC_DEFUN([LT_PROG_GO],
-[AC_CHECK_TOOL(GOC, gccgo,)
-])
-
-
-# LT_PROG_RC
-# ----------
-AC_DEFUN([LT_PROG_RC],
-[AC_CHECK_TOOL(RC, windres,)
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_RC], [])
-
-
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_EGREP],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_REQUIRE([AC_PROG_FGREP])dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-_LT_DECL([], [EGREP], [1], [An ERE matcher])
-_LT_DECL([], [FGREP], [1], [A literal string matcher])
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST([GREP])
-])
-
-
-# _LT_DECL_OBJDUMP
-# --------------
-# If we don't have a new enough Autoconf to choose the best objdump
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_OBJDUMP],
-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-AC_SUBST([OBJDUMP])
-])
-
-# _LT_DECL_DLLTOOL
-# ----------------
-# Ensure DLLTOOL variable is set.
-m4_defun([_LT_DECL_DLLTOOL],
-[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
-AC_SUBST([DLLTOOL])
-])
-
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-m4_defun([_LT_DECL_SED],
-[AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-])# _LT_DECL_SED
-
-m4_ifndef([AC_PROG_SED], [
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-
-m4_defun([AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])#AC_PROG_SED
-])#m4_ifndef
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_SED], [])
-
-
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,b/c, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-])# _LT_CHECK_SHELL_FEATURES
-
-
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun([_LT_PROG_FUNCTION_REPLACE],
-[dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts([$2], [$], [\\], [^$[	 ]$], [\\\1])
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-])
-
-
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-[if test x"$xsi_shell" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac])
-
-  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
-    func_basename_result="${1##*/}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac
-    func_basename_result="${1##*/}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
-    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-    # positional parameters, so assign one to ordinary parameter first.
-    func_stripname_result=${3}
-    func_stripname_result=${func_stripname_result#"${1}"}
-    func_stripname_result=${func_stripname_result%"${2}"}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
-    func_split_long_opt_name=${1%%=*}
-    func_split_long_opt_arg=${1#*=}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
-    func_split_short_opt_arg=${1#??}
-    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
-    case ${1} in
-      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-      *)    func_lo2o_result=${1} ;;
-    esac])
-
-  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
-
-  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
-
-  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
-    func_quote_for_eval "${2}"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
-    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append $[[a-zA-Z_]]\{1,\}$ "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append $[[a-zA-Z_]]\{1,\}$ "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-fi
-])
-
-# _LT_PATH_CONVERSION_FUNCTIONS
-# -----------------------------
-# Determine which file name conversion functions should be used by
-# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
-# for certain cross-compile configurations and native mingw.
-m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_MSG_CHECKING([how to convert $build file names to $host format])
-AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-[case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-])
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
-_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
-         [0], [convert $build file names to $host format])dnl
-
-AC_MSG_CHECKING([how to convert $build file names to toolchain format])
-AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-[#assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-])
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
-_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
-         [0], [convert $build files to toolchain format])dnl
-])# _LT_PATH_CONVERSION_FUNCTIONS
-
-# Helper functions for option handling.                    -*- Autoconf -*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-#   Inc.
-#   Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 7 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-
-
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define([_LT_MANGLE_OPTION],
-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-
-
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-# saved as a flag.
-m4_define([_LT_SET_OPTION],
-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-        _LT_MANGLE_DEFUN([$1], [$2]),
-    [m4_warning([Unknown $1 option `$2'])])[]dnl
-])
-
-
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define([_LT_IF_OPTION],
-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-
-
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define([_LT_UNLESS_OPTIONS],
-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-		      [m4_define([$0_found])])])[]dnl
-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-])[]dnl
-])
-
-
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME.  If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun([_LT_SET_OPTIONS],
-[# Set options
-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-    [_LT_SET_OPTION([$1], _LT_Option)])
-
-m4_if([$1],[LT_INIT],[
-  dnl
-  dnl Simply set some default values (i.e off) if boolean options were not
-  dnl specified:
-  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-  ])
-  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-  ])
-  dnl
-  dnl If no reference was made to various pairs of opposing options, then
-  dnl we run the default mode handler for the pair.  For example, if neither
-  dnl `shared' nor `disable-shared' was passed, we enable building of shared
-  dnl archives by default:
-  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-  		   [_LT_ENABLE_FAST_INSTALL])
-  ])
-])# _LT_SET_OPTIONS
-
-
-
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define([_LT_MANGLE_DEFUN],
-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-
-
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define([LT_OPTION_DEFINE],
-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-])# LT_OPTION_DEFINE
-
-
-# dlopen
-# ------
-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-])
-
-AU_DEFUN([AC_LIBTOOL_DLOPEN],
-[_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-
-
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-[enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-esac
-
-test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [1], [Assembler program])dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
-])# win32-dll
-
-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-
-
-# _LT_ENABLE_SHARED([DEFAULT])
-# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_SHARED],
-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([shared],
-    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-
-    _LT_DECL([build_libtool_libs], [enable_shared], [0],
-	[Whether or not to build shared libraries])
-])# _LT_ENABLE_SHARED
-
-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-])
-
-AC_DEFUN([AC_DISABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], [disable-shared])
-])
-
-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-
-
-
-# _LT_ENABLE_STATIC([DEFAULT])
-# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_STATIC],
-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([static],
-    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-
-    _LT_DECL([build_old_libs], [enable_static], [0],
-	[Whether or not to build static libraries])
-])# _LT_ENABLE_STATIC
-
-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
-
-AC_DEFUN([AC_DISABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], [disable-static])
-])
-
-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-
-
-
-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_FAST_INSTALL],
-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([fast-install],
-    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL([fast_install], [enable_fast_install], [0],
-	 [Whether or not to optimize for fast installation])dnl
-])# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-
-# Old names:
-AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
-])
-
-AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-
-
-# _LT_WITH_PIC([MODE])
-# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-# LT_INIT options.
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-m4_define([_LT_WITH_PIC],
-[AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-
-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-])# _LT_WITH_PIC
-
-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-
-# Old name:
-AU_DEFUN([AC_LIBTOOL_PICMODE],
-[_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-
-
-m4_define([_LTDL_MODE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-		 [m4_define([_LTDL_MODE], [nonrecursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-		 [m4_define([_LTDL_MODE], [recursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-		 [m4_define([_LTDL_MODE], [subproject])])
-
-m4_define([_LTDL_TYPE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [installable],
-		 [m4_define([_LTDL_TYPE], [installable])])
-LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-		 [m4_define([_LTDL_TYPE], [convenience])])
-
-# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltsugar.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-
-
-# lt_join(SEP, ARG1, [ARG2...])
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define([lt_join],
-[m4_if([$#], [1], [],
-       [$#], [2], [[$2]],
-       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-m4_define([_lt_join],
-[m4_if([$#$2], [2], [],
-       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-
-
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
-m4_define([lt_car], [[$1]])
-m4_define([lt_cdr],
-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-       [$#], 1, [],
-       [m4_dquote(m4_shift($@))])])
-m4_define([lt_unquote], $1)
-
-
-# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define([lt_append],
-[m4_define([$1],
-	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-
-
-
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-# ----------------------------------------------------------
-# Produce a SEP delimited list of all paired combinations of elements of
-# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-# has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
-m4_define([lt_combine],
-[m4_if(m4_eval([$# > 3]), [1],
-       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-[[m4_foreach([_Lt_prefix], [$2],
-	     [m4_foreach([_Lt_suffix],
-		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-
-
-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define([lt_if_append_uniq],
-[m4_ifdef([$1],
-	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-		 [lt_append([$1], [$2], [$3])$4],
-		 [$5])],
-	  [lt_append([$1], [$2], [$3])$4])])
-
-
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define([lt_dict_add],
-[m4_define([$1($2)], [$3])])
-
-
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define([lt_dict_add_subkey],
-[m4_define([$1($2:$3)], [$4])])
-
-
-# lt_dict_fetch(DICT, KEY, [SUBKEY])
-# ----------------------------------
-m4_define([lt_dict_fetch],
-[m4_ifval([$3],
-	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-
-
-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-# -----------------------------------------------------------------
-m4_define([lt_if_dict_fetch],
-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-	[$5],
-    [$6])])
-
-
-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-# --------------------------------------------------------------
-m4_define([lt_dict_filter],
-[m4_if([$5], [], [],
-  [lt_join(m4_quote(m4_default([$4], [[, ]])),
-           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-])
-
-# ltversion.m4 -- version numbers			-*- Autoconf -*-
-#
-#   Copyright (C) 2004 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# @configure_input@
-
-# serial 3337 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.4.2])
-m4_define([LT_PACKAGE_REVISION], [1.3337])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2'
-macro_revision='1.3337'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
-
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 5 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else.  This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-
-m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
-m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
-m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
-m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
-m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
-m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
-m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
-m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
-m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
-m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
-m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
-m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
-m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
-m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
-m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
-m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
-m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
-m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
-
-# 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 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)))?$])
@@ -9116,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" && \
@@ -9137,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"
@@ -9150,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
@@ -9161,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
@@ -9227,16 +211,40 @@
         AC_MSG_RESULT([yes])
 	$3
 fi[]dnl
-])# PKG_CHECK_MODULES
+])dnl PKG_CHECK_MODULES
+
+
+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
 
 
-# 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_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],
@@ -9247,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],
@@ -9267,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
@@ -9282,9 +294,77 @@
 AS_VAR_COPY([$1], [pkg_cv_][$1])
 
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
+])dnl PKG_CHECK_VAR
+
+dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl   [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
+dnl   [DESCRIPTION], [DEFAULT])
+dnl ------------------------------------------
+dnl
+dnl Prepare a "--with-" configure option using the lowercase
+dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
+dnl PKG_CHECK_MODULES in a single macro.
+AC_DEFUN([PKG_WITH_MODULES],
+[
+m4_pushdef([with_arg], m4_tolower([$1]))
+
+m4_pushdef([description],
+           [m4_default([$5], [build with ]with_arg[ support])])
+
+m4_pushdef([def_arg], [m4_default([$6], [auto])])
+m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
+m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
+
+m4_case(def_arg,
+            [yes],[m4_pushdef([with_without], [--without-]with_arg)],
+            [m4_pushdef([with_without],[--with-]with_arg)])
+
+AC_ARG_WITH(with_arg,
+     AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
+    [AS_TR_SH([with_]with_arg)=def_arg])
+
+AS_CASE([$AS_TR_SH([with_]with_arg)],
+            [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
+            [auto],[PKG_CHECK_MODULES([$1],[$2],
+                                        [m4_n([def_action_if_found]) $3],
+                                        [m4_n([def_action_if_not_found]) $4])])
+
+m4_popdef([with_arg])
+m4_popdef([description])
+m4_popdef([def_arg])
+
+])dnl PKG_WITH_MODULES
+
+dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl   [DESCRIPTION], [DEFAULT])
+dnl -----------------------------------------------
+dnl
+dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
+dnl check._[VARIABLE-PREFIX] is exported as make variable.
+AC_DEFUN([PKG_HAVE_WITH_MODULES],
+[
+PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
+
+AM_CONDITIONAL([HAVE_][$1],
+               [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
+])dnl PKG_HAVE_WITH_MODULES
+
+dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl   [DESCRIPTION], [DEFAULT])
+dnl ------------------------------------------------------
+dnl
+dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
+dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
+dnl and preprocessor variable.
+AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
+[
+PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
+
+AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
+        [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
+])dnl PKG_HAVE_DEFINE_WITH_MODULES
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9296,10 +376,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.16'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.16.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -9315,14 +395,14 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9367,15 +447,14 @@
 # configured tree to be moved without reconfiguration.
 
 AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9406,7 +485,7 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9597,13 +676,12 @@
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -9611,49 +689,41 @@
   # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  AS_CASE([$CONFIG_FILES],
+          [*\'*], [eval set x "$CONFIG_FILES"],
+          [*], [set x $CONFIG_FILES])
   shift
-  for mf
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_mf
   do
     # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
+    am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: AIX grep has a line
     # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`AS_DIRNAME(["$am_mf"])`
+    am_filepart=`AS_BASENAME(["$am_mf"])`
+    AM_RUN_LOG([cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles]) || am_rc=$?
   done
+  if test $am_rc -ne 0; then
+    AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  Try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).])
+  fi
+  AS_UNSET([am_dirpart])
+  AS_UNSET([am_filepart])
+  AS_UNSET([am_mf])
+  AS_UNSET([am_rc])
+  rm -f conftest-deps.mk
 }
 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
@@ -9662,18 +732,17 @@
 # -----------------------------
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
      [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+     [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9760,11 +829,11 @@
 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -9828,7 +897,7 @@
 Aborting the configuration process, to ensure you take notice of the issue.
 
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
 
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -9837,7 +906,11 @@
 END
     AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
   fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -9866,7 +939,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9877,7 +950,7 @@
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -9887,7 +960,7 @@
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9909,7 +982,7 @@
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9944,7 +1017,7 @@
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9952,49 +1025,42 @@
 
 # AM_MAKE_INCLUDE()
 # -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
 AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
 am__doit:
-	@echo this is the am__doit target
+	@echo this is the am__doit target >confinc.out
 .PHONY: am__doit
 END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
 am__include="#"
 am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+  AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+      ['0:this is the am__doit target'],
+      [AS_CASE([$s],
+          [BSD], [am__include='.include' am__quote='"'],
+          [am__include='include' am__quote=''])])
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
+  fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10035,7 +1101,7 @@
 # Obsolete and "removed" macros, that must however still report explicit
 # error messages when used, to smooth transition.
 #
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10062,7 +1128,7 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10091,7 +1157,7 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10138,7 +1204,7 @@
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10157,7 +1223,7 @@
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10238,7 +1304,7 @@
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10298,7 +1364,7 @@
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10326,7 +1392,7 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10345,7 +1411,7 @@
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10476,3 +1542,17 @@
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([m4/gettext.m4])
+m4_include([m4/iconv.m4])
+m4_include([m4/intlmacosx.m4])
+m4_include([m4/lib-ld.m4])
+m4_include([m4/lib-link.m4])
+m4_include([m4/lib-prefix.m4])
+m4_include([m4/libtool.m4])
+m4_include([m4/ltoptions.m4])
+m4_include([m4/ltsugar.m4])
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
+m4_include([m4/nls.m4])
+m4_include([m4/po.m4])
+m4_include([m4/progtest.m4])

grip-4.1.1.tar.gz/build-aux Added

grip-4.1.1.tar.gz/build-aux/compile Added

@@ -0,0 +1,348 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.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, 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 <https://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>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:

grip-4.1.1.tar.gz/build-aux/config.guess Added

@@ -0,0 +1,1476 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright 1992-2018 Free Software Foundation, Inc.
+
+timestamp='2018-03-08'
+
+# 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
+# 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 <https://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 Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+#
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+#
+# You can get the latest version of this script from:
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+#
+# Please send patches to <config-patches@gnu.org>.
+
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Options:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright 1992-2018 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."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > "$dummy.c" ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+case "$UNAME_SYSTEM" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval "$set_cc_for_build"
+	cat <<-EOF > "$dummy.c"
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
+
+	# If ldd exists, use it to detect musl libc.
+	if command -v ldd >/dev/null && \
+		ldd --version 2>&1 | grep -q ^musl
+	then
+	    LIBC=musl
+	fi
+	;;
+esac
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# 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=`(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) and ABI.
+	case "$UNAME_MACHINE_ARCH" in
+	    earm*)
+		os=netbsdelf
+		;;
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval "$set_cc_for_build"
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		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
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "$UNAME_VERSION" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		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}${abi}"
+	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
+	exit ;;
+    *:OpenBSD:*:*)
+	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 ;;
+    *:MidnightBSD:*:*)
+	echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
+	exit ;;
+    *:SolidBSD:*:*)
+	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
+	exit ;;
+    *:MirBSD:*:*)
+	echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
+	exit ;;
+    *:Sortix:*:*)
+	echo "$UNAME_MACHINE"-unknown-sortix
+	exit ;;
+    *:Redox:*:*)
+	echo "$UNAME_MACHINE"-unknown-redox
+	exit ;;
+    mips:OSF1:*.*)
+        echo mips-dec-osf1
+        exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	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 ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE=alpha ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE=alpha ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE=alphaev5 ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE=alphaev56 ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE=alphapca56 ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE=alphapca57 ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE=alphaev6 ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE=alphaev67 ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE=alphaev68 ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE=alphaev68 ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE=alphaev68 ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE=alphaev69 ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE=alphaev7 ;;
+	    "EV7.9 (21364A)")
+		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`"
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo "$UNAME_MACHINE"-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo "$UNAME_MACHINE"-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+	echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix"$UNAME_RELEASE"
+	exit ;;
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    s390x:SunOS:*:*)
+	echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+	exit ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux"$UNAME_RELEASE"
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval "$set_cc_for_build"
+	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 (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH=x86_64
+	    fi
+	fi
+	echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos"$UNAME_RELEASE"
+	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
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos"$UNAME_RELEASE"
+		;;
+	    sun4)
+		echo sparc-sun-sunos"$UNAME_RELEASE"
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos"$UNAME_RELEASE"
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint"$UNAME_RELEASE"
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint"$UNAME_RELEASE"
+	exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+	echo m68k-atari-mint"$UNAME_RELEASE"
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+	echo m68k-milan-mint"$UNAME_RELEASE"
+	exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+	echo m68k-hades-mint"$UNAME_RELEASE"
+	exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+	echo m68k-unknown-mint"$UNAME_RELEASE"
+	exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten"$UNAME_RELEASE"
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten"$UNAME_RELEASE"
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix"$UNAME_RELEASE"
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix"$UNAME_RELEASE"
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix"$UNAME_RELEASE"
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval "$set_cc_for_build"
+	sed 's/^	//' << EOF > "$dummy.c"
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
+	  dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/$[0-9]*$.*/\1/p'` &&
+	  SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos"$UNAME_RELEASE"
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
+	then
+	    if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
+	       [ "$TARGET_BINARY_INTERFACE"x = x ]
+	    then
+		echo m88k-dg-dgux"$UNAME_RELEASE"
+	    else
+		echo m88k-dg-dguxbcs"$UNAME_RELEASE"
+	    fi
+	else
+	    echo i586-dg-dgux"$UNAME_RELEASE"
+	fi
+	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+	fi
+	echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval "$set_cc_for_build"
+		sed 's/^		//' << EOF > "$dummy.c"
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[4567])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	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
+	echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
+	case "$UNAME_MACHINE" in
+	    9000/31?)            HP_ARCH=m68000 ;;
+	    9000/[34]??)         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    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
+		      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
+			esac ;;
+		    esac
+		fi
+		if [ "$HP_ARCH" = "" ]; then
+		    eval "$set_cc_for_build"
+		    sed 's/^		//' << EOF > "$dummy.c"
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
+EOF
+		    (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 ]
+	then
+	    eval "$set_cc_for_build"
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH=hppa2.0w
+	    else
+		HP_ARCH=hppa64
+	    fi
+	fi
+	echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux"$HPUX_REV"
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval "$set_cc_for_build"
+	sed 's/^	//' << EOF > "$dummy.c"
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo "$UNAME_MACHINE"-unknown-osf1mk
+	else
+	    echo "$UNAME_MACHINE"-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+	exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+	exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+	exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+	exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
+	| sed -e 's/CRAY.*$[A-Z]90$/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	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_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/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi"$UNAME_RELEASE"
+	exit ;;
+    *:BSD/OS:*:*)
+	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
+	exit ;;
+    *:FreeBSD:*:*)
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case "$UNAME_PROCESSOR" in
+	    amd64)
+		UNAME_PROCESSOR=x86_64 ;;
+	    i386)
+		UNAME_PROCESSOR=i586 ;;
+	esac
+	echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
+	exit ;;
+    i*:CYGWIN*:*)
+	echo "$UNAME_MACHINE"-pc-cygwin
+	exit ;;
+    *:MINGW64*:*)
+	echo "$UNAME_MACHINE"-pc-mingw64
+	exit ;;
+    *:MINGW*:*)
+	echo "$UNAME_MACHINE"-pc-mingw32
+	exit ;;
+    *:MSYS*:*)
+	echo "$UNAME_MACHINE"-pc-msys
+	exit ;;
+    i*:PW*:*)
+	echo "$UNAME_MACHINE"-pc-pw32
+	exit ;;
+    *:Interix*:*)
+	case "$UNAME_MACHINE" in
+	    x86)
+		echo i586-pc-interix"$UNAME_RELEASE"
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix"$UNAME_RELEASE"
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix"$UNAME_RELEASE"
+		exit ;;
+	esac ;;
+    i*:UWIN*:*)
+	echo "$UNAME_MACHINE"-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	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
+	exit ;;
+    aarch64:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    arm*:Linux:*:*)
+	eval "$set_cc_for_build"
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	else
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
+	    else
+		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
+	    fi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    cris:Linux:*:*)
+	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
+	exit ;;
+    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 ;;
+    hexagon:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    i*86:Linux:*:*)
+	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+	exit ;;
+    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 ;;
+    m68*:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval "$set_cc_for_build"
+	sed 's/^	//' << EOF > "$dummy.c"
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
+	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
+	;;
+    mips64el:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-"$LIBC"
+	exit ;;
+    or32:Linux:*:* | or1k*:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-"$LIBC"
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-"$LIBC"
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
+	  PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
+	  *)    echo hppa-unknown-linux-"$LIBC" ;;
+	esac
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-"$LIBC"
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-"$LIBC"
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-"$LIBC"
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-"$LIBC"
+	exit ;;
+    riscv32:Linux:*:* | riscv64:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
+	exit ;;
+    sh64*:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    sh*:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    tile*:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    vax:Linux:*:*)
+	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
+	exit ;;
+    x86_64:Linux:*:*)
+	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+	exit ;;
+    xtensa*:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+	# Use sysv4.2uw... so that sysv4* matches it.
+	echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo "$UNAME_MACHINE"-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo "$UNAME_MACHINE"-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo "$UNAME_MACHINE"-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo "$UNAME_MACHINE"-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	echo i386-unknown-lynxos"$UNAME_RELEASE"
+	exit ;;
+    i*86:*DOS:*:*)
+	echo "$UNAME_MACHINE"-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:*)
+	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
+	else
+		echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
+	else
+		echo "$UNAME_MACHINE"-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+	# 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 configure will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos"$UNAME_RELEASE"
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos"$UNAME_RELEASE"
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos"$UNAME_RELEASE"
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	echo powerpc-unknown-lynxos"$UNAME_RELEASE"
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv"$UNAME_RELEASE"
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo "$UNAME_MACHINE"-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo "$UNAME_MACHINE"-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux"$UNAME_RELEASE"
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+		echo mips-nec-sysv"$UNAME_RELEASE"
+	else
+		echo mips-unknown-sysv"$UNAME_RELEASE"
+	fi
+	exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux"$UNAME_RELEASE"
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux"$UNAME_RELEASE"
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux"$UNAME_RELEASE"
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux"$UNAME_RELEASE"
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux"$UNAME_RELEASE"
+	exit ;;
+    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 ;;
+    *:Rhapsody:*:*)
+	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	eval "$set_cc_for_build"
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
+	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		       grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		       grep IS_PPC >/dev/null
+		then
+		    UNAME_PROCESSOR=powerpc
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
+	echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = x86; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NEO-*:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
+    NSE-*:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
+    NSR-*:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
+    NSV-*:NONSTOP_KERNEL:*:*)
+	echo nsv-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
+    NSX-*:NONSTOP_KERNEL:*:*)
+	echo nsx-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
+	exit ;;
+    *:Plan9:*:*)
+	# "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
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo "$UNAME_MACHINE"-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+	echo mips-sei-seiux"$UNAME_RELEASE"
+	exit ;;
+    *:DragonFly:*:*)
+	echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
+	exit ;;
+    *:*VMS:*:*)
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "$UNAME_MACHINE" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
+	exit ;;
+    i*86:rdos:*:*)
+	echo "$UNAME_MACHINE"-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo "$UNAME_MACHINE"-pc-aros
+	exit ;;
+    x86_64:VMkernel:*:*)
+	echo "$UNAME_MACHINE"-unknown-esx
+	exit ;;
+    amd64:Isilon\ OneFS:*:*)
+	echo x86_64-unknown-onefs
+	exit ;;
+esac
+
+echo "$0: unable to guess system type" >&2
+
+case "$UNAME_MACHINE:$UNAME_SYSTEM" in
+    mips:Linux | mips64:Linux)
+	# If we got here on MIPS GNU/Linux, output extra information.
+	cat >&2 <<EOF
+
+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
+the system type. Please install a C compiler and try again.
+EOF
+	;;
+esac
+
+cat >&2 <<EOF
+
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite *all*
+copies of config.guess and config.sub with the latest versions from:
+
+  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+and
+  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = "$UNAME_MACHINE"
+UNAME_RELEASE = "$UNAME_RELEASE"
+UNAME_SYSTEM  = "$UNAME_SYSTEM"
+UNAME_VERSION = "$UNAME_VERSION"
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:

grip-4.1.1.tar.gz/build-aux/config.rpath Added

@@ -0,0 +1,684 @@
+#! /bin/sh
+# Output a system dependent set of variables, describing how to set the
+# run time search path of shared libraries in an executable.
+#
+#   Copyright 1996-2014 Free Software Foundation, Inc.
+#   Taken from GNU libtool, 2001
+#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+#   This file is free software; the Free Software Foundation gives
+#   unlimited permission to copy and/or distribute it, with or without
+#   modifications, as long as this notice is preserved.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
+# should be set by the caller.
+#
+# The set of defined variables is at the end of this script.
+
+# Known limitations:
+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
+#   than 256 bytes, otherwise the compiler driver will dump core. The only
+#   known workaround is to choose shorter directory names for the build
+#   directory and/or the installation directory.
+
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+shrext=.so
+
+host="$1"
+host_cpu=`echo "$host" | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\1/'`
+host_vendor=`echo "$host" | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\2/'`
+host_os=`echo "$host" | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\3/'`
+
+# Code taken from libtool.m4's _LT_CC_BASENAME.
+
+for cc_temp in $CC""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
+
+# Code taken from libtool.m4's _LT_COMPILER_PIC.
+
+wl=
+if test "$GCC" = yes; then
+  wl='-Wl,'
+else
+  case "$host_os" in
+    aix*)
+      wl='-Wl,'
+      ;;
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      ;;
+    hpux9* | hpux10* | hpux11*)
+      wl='-Wl,'
+      ;;
+    irix5* | irix6* | nonstopux*)
+      wl='-Wl,'
+      ;;
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      case $cc_basename in
+        ecc*)
+          wl='-Wl,'
+          ;;
+        icc* | ifort*)
+          wl='-Wl,'
+          ;;
+        lf95*)
+          wl='-Wl,'
+          ;;
+        nagfor*)
+          wl='-Wl,-Wl,,'
+          ;;
+        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+          wl='-Wl,'
+          ;;
+        ccc*)
+          wl='-Wl,'
+          ;;
+        xl* | bgxl* | bgf* | mpixl*)
+          wl='-Wl,'
+          ;;
+        como)
+          wl='-lopt='
+          ;;
+        *)
+          case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ F* | *Sun*Fortran*)
+              wl=
+              ;;
+            *Sun\ C*)
+              wl='-Wl,'
+              ;;
+          esac
+          ;;
+      esac
+      ;;
+    newsos6)
+      ;;
+    *nto* | *qnx*)
+      ;;
+    osf3* | osf4* | osf5*)
+      wl='-Wl,'
+      ;;
+    rdos*)
+      ;;
+    solaris*)
+      case $cc_basename in
+        f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+          wl='-Qoption ld '
+          ;;
+        *)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
+    sunos4*)
+      wl='-Qoption ld '
+      ;;
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      wl='-Wl,'
+      ;;
+    sysv4*MP*)
+      ;;
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      wl='-Wl,'
+      ;;
+    unicos*)
+      wl='-Wl,'
+      ;;
+    uts4*)
+      ;;
+  esac
+fi
+
+# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
+
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+
+case "$host_os" in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+  # 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.
+  # Unlike libtool, we use -rpath here, not --rpath, since the documented
+  # option of GNU ld is called -rpath, not --rpath.
+  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  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
+      fi
+      ;;
+    amigaos*)
+      case "$host_cpu" in
+        powerpc)
+          ;;
+        m68k)
+          hardcode_libdir_flag_spec='-L$libdir'
+          hardcode_minus_L=yes
+          ;;
+      esac
+      ;;
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    cygwin* | mingw* | pw32* | cegcc*)
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    haiku*)
+      ;;
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      ;;
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    netbsd*)
+      ;;
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+        ld_shlibs=no
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      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
+          ;;
+        *)
+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+          else
+            ld_shlibs=no
+          fi
+          ;;
+      esac
+      ;;
+    sunos4*)
+      hardcode_direct=yes
+      ;;
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+  esac
+  if test "$ld_shlibs" = no; then
+    hardcode_libdir_flag_spec=
+  fi
+else
+  case "$host_os" in
+    aix3*)
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes; 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
+      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
+            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+              aix_use_runtimelinking=yes
+              break
+            fi
+          done
+          ;;
+        esac
+      fi
+      hardcode_direct=yes
+      hardcode_libdir_separator=':'
+      if test "$GCC" = yes; then
+        case $host_os in aix4.[012]|aix4.[012].*)
+          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
+            hardcode_minus_L=yes
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_libdir_separator=
+          fi
+          ;;
+        esac
+      fi
+      # Begin _LT_AC_SYS_LIBPATH_AIX.
+      echo 'int main () { return 0; }' > conftest.c
+      ${CC} ${LDFLAGS} conftest.c -o conftest
+      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *$.*$$/\1/; p; }
+}'`
+      if test -z "$aix_libpath"; then
+        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *$.*$$/\1/; p; }
+}'`
+      fi
+      if test -z "$aix_libpath"; then
+        aix_libpath="/usr/lib:/lib"
+      fi
+      rm -f conftest.c conftest
+      # End _LT_AC_SYS_LIBPATH_AIX.
+      if test "$aix_use_runtimelinking" = yes; then
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+      else
+        if test "$host_cpu" = ia64; then
+          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+        else
+          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        fi
+      fi
+      ;;
+    amigaos*)
+      case "$host_cpu" in
+        powerpc)
+          ;;
+        m68k)
+          hardcode_libdir_flag_spec='-L$libdir'
+          hardcode_minus_L=yes
+          ;;
+      esac
+      ;;
+    bsdi[45]*)
+      ;;
+    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.
+      hardcode_libdir_flag_spec=' '
+      libext=lib
+      ;;
+    darwin* | rhapsody*)
+      hardcode_direct=no
+      if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    dgux*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    freebsd2.[01]*)
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    freebsd* | dragonfly*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    hpux9*)
+      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
+      ;;
+    hpux10*)
+      if test "$with_gnu_ld" = no; then
+        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
+      fi
+      ;;
+    hpux11*)
+      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_direct=yes
+            # 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*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    netbsd*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    newsos6)
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    *nto* | *qnx*)
+      ;;
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+        hardcode_direct=yes
+        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+        else
+          case "$host_os" in
+            openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+              hardcode_libdir_flag_spec='-R$libdir'
+              ;;
+            *)
+              hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+              ;;
+          esac
+        fi
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      ;;
+    osf3*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    osf4* | osf5*)
+      if test "$GCC" = yes; then
+        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+        # Both cc and cxx compiler support -rpath directly
+        hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      hardcode_libdir_separator=:
+      ;;
+    solaris*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      ;;
+    sunos4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    sysv4)
+      case $host_vendor in
+        sni)
+          hardcode_direct=yes # is this really true???
+          ;;
+        siemens)
+          hardcode_direct=no
+          ;;
+        motorola)
+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+          ;;
+      esac
+      ;;
+    sysv4.3*)
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+        ld_shlibs=yes
+      fi
+      ;;
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      ;;
+    sysv5* | sco3.2v5* | sco5v6*)
+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator=':'
+      ;;
+    uts4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    *)
+      ld_shlibs=no
+      ;;
+  esac
+fi
+
+# Check dynamic linker characteristics
+# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
+# Unlike libtool.m4, here we don't care about _all_ names of the library, but
+# only about the one the linker finds when passed -lNAME. This is the last
+# element of library_names_spec in libtool.m4, or possibly two of them if the
+# linker has special search rules.
+library_names_spec=      # the last element of library_names_spec in libtool.m4
+libname_spec='lib$name'
+case "$host_os" in
+  aix3*)
+    library_names_spec='$libname.a'
+    ;;
+  aix[4-9]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  amigaos*)
+    case "$host_cpu" in
+      powerpc*)
+        library_names_spec='$libname$shrext' ;;
+      m68k)
+        library_names_spec='$libname.a' ;;
+    esac
+    ;;
+  beos*)
+    library_names_spec='$libname$shrext'
+    ;;
+  bsdi[45]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  cygwin* | mingw* | pw32* | cegcc*)
+    shrext=.dll
+    library_names_spec='$libname.dll.a $libname.lib'
+    ;;
+  darwin* | rhapsody*)
+    shrext=.dylib
+    library_names_spec='$libname$shrext'
+    ;;
+  dgux*)
+    library_names_spec='$libname$shrext'
+    ;;
+  freebsd[23].*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  freebsd* | dragonfly*)
+    library_names_spec='$libname$shrext'
+    ;;
+  gnu*)
+    library_names_spec='$libname$shrext'
+    ;;
+  haiku*)
+    library_names_spec='$libname$shrext'
+    ;;
+  hpux9* | hpux10* | hpux11*)
+    case $host_cpu in
+      ia64*)
+        shrext=.so
+        ;;
+      hppa*64*)
+        shrext=.sl
+        ;;
+      *)
+        shrext=.sl
+        ;;
+    esac
+    library_names_spec='$libname$shrext'
+    ;;
+  interix[3-9]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  irix5* | irix6* | nonstopux*)
+    library_names_spec='$libname$shrext'
+    case "$host_os" in
+      irix5* | nonstopux*)
+        libsuff= shlibsuff=
+        ;;
+      *)
+        case $LD in
+          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
+          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
+          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
+          *) libsuff= shlibsuff= ;;
+        esac
+        ;;
+    esac
+    ;;
+  linux*oldld* | linux*aout* | linux*coff*)
+    ;;
+  linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    library_names_spec='$libname$shrext'
+    ;;
+  knetbsd*-gnu)
+    library_names_spec='$libname$shrext'
+    ;;
+  netbsd*)
+    library_names_spec='$libname$shrext'
+    ;;
+  newsos6)
+    library_names_spec='$libname$shrext'
+    ;;
+  *nto* | *qnx*)
+    library_names_spec='$libname$shrext'
+    ;;
+  openbsd*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  os2*)
+    libname_spec='$name'
+    shrext=.dll
+    library_names_spec='$libname.a'
+    ;;
+  osf3* | osf4* | osf5*)
+    library_names_spec='$libname$shrext'
+    ;;
+  rdos*)
+    ;;
+  solaris*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sunos4*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  sysv4 | sysv4.3*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sysv4*MP*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+    library_names_spec='$libname$shrext'
+    ;;
+  tpf*)
+    library_names_spec='$libname$shrext'
+    ;;
+  uts4*)
+    library_names_spec='$libname$shrext'
+    ;;
+esac
+
+sed_quote_subst='s/$["`$\\]$/\\\1/g'
+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
+escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+
+LC_ALL=C sed -e 's/^$[a-zA-Z0-9_]*$=/acl_cv_\1=/' <<EOF
+
+# How to pass a linker flag through the compiler.
+wl="$escaped_wl"
+
+# Static library suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally "so").
+shlibext="$shlibext"
+
+# Format of library name prefix.
+libname_spec="$escaped_libname_spec"
+
+# Library names that the linker finds when passed -lNAME.
+library_names_spec="$escaped_library_names_spec"
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator="$hardcode_libdir_separator"
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct="$hardcode_direct"
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L="$hardcode_minus_L"
+
+EOF

grip-4.1.1.tar.gz/build-aux/config.sub Added

grip-4.1.1.tar.gz/build-aux/depcomp Added

@@ -0,0 +1,791 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1999-2018 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 <https://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.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputting dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.$[^.]*$$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.$[^.]*$$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the "deleted header file" problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+## Some versions of gcc put a space before the ':'.  On the theory
+## that the space means something, we add a space to the output as
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like '#:fec' to the end of the
+    # dependency line.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  set_dir_from "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
+    "$@" -Wc,-M
+  else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
+    "$@" -M
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *$.*$ *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using '\' :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: $.*$$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  set_dir_from  "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
+    sed -ne '2,${
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
+tru64)
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *$.*$/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/$.*$/'"$tab"'\1 \\/p
+s/.$.*$ \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for ':'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+  "$@" $dashmflag |
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no eat=no
+  for arg
+  do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*$$object *:$|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+        set fnord "$@"
+        shift
+        shift
+        ;;
+    *)
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
+    esac
+  done
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:

grip-4.1.1.tar.gz/build-aux/install-sh Added

@@ -0,0 +1,518 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2018-03-11.20; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# 'make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+tab='	'
+nl='
+'
+IFS=" $tab$nl"
+
+# Set DOITPROG to "echo" to test this script.
+
+doit=${DOITPROG-}
+doit_exec=${doit:-exec}
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+is_target_a_directory=possibly
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
+
+    -o) chowncmd="$chownprog $2"
+        shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;
+
+    -T) is_target_a_directory=never;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --) shift
+        break;;
+
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
+
+    *)  break;;
+  esac
+  shift
+done
+
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=!]) dst_arg=./$dst_arg;;
+    esac
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call 'install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+        u_plus_rw=
+      else
+        u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+        u_plus_rw=
+      else
+        u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names problematic for 'test' and other utilities.
+  case $src in
+    -* | [=!]) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+    dst=$dst_arg
+
+    # If destination is a directory, append the input filename.
+    if test -d "$dst"; then
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
+      fi
+      dstdir=$dst
+      dstbase=`basename "$src"`
+      case $dst in
+	*/) dst=$dst$dstbase;;
+	*)  dst=$dst/$dstbase;;
+      esac
+      dstdir_status=0
+    else
+      dstdir=`dirname "$dst"`
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  case $dstdir in
+    */) dstdirslash=$dstdir;;
+    *)  dstdirslash=$dstdir/;;
+  esac
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+        # Create intermediate dirs using mode 755 as modified by the umask.
+        # This is like FreeBSD 'install' as of 1997-10-28.
+        umask=`umask`
+        case $stripcmd.$umask in
+          # Optimize common cases.
+          *[2367][2367]) mkdir_umask=$umask;;
+          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+          *[0-7])
+            mkdir_umask=`expr $umask + 22 \
+              - $umask % 100 % 40 + $umask % 20 \
+              - $umask % 10 % 4 + $umask % 2
+            `;;
+          *) mkdir_umask=$umask,go-w;;
+        esac
+
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+
+        posix_mkdir=false
+        case $umask in
+          *[123567][0-7][0-7])
+            # POSIX mkdir -p sets u+wx bits regardless of umask, which
+            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+            ;;
+          *)
+            # Note that $RANDOM variable is not portable (e.g. dash);  Use it
+            # here however when possible just to lower collision chance.
+            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+
+            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+            # Because "mkdir -p" follows existing symlinks and we likely work
+            # directly in world-writeable /tmp, make sure that the '$tmpdir'
+            # directory is successfully created first before we actually test
+            # 'mkdir -p' feature.
+            if (umask $mkdir_umask &&
+                $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.
+                   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 -- "$test_tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+                   }
+                 }
+              then posix_mkdir=:
+              fi
+              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+            else
+              # Remove any dirs left behind by ancient mkdir implementations.
+              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+            fi
+            trap '' 0;;
+        esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+        /*) prefix='/';;
+        [-=!]*) prefix='./';;
+        *)  prefix='';;
+      esac
+
+      oIFS=$IFS
+      IFS=/
+      set -f
+      set fnord $dstdir
+      shift
+      set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+        test X"$d" = X && continue
+
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask=$mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=${dstdirslash}_inst.$$_
+    rmtmp=${dstdirslash}_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       set +f &&
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
+
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:

grip-4.1.1.tar.gz/build-aux/ltmain.sh Added

@@ -0,0 +1,11151 @@
+#! /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.6
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+# 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.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+PROGRAM=libtool
+PACKAGE=libtool
+VERSION=2.4.6
+package_revision=2.4.6
+
+
+## ------ ##
+## 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=:
+  # 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
+fi
+
+# 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 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
+
+# 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
+
+
+
+## ------------------------- ##
+## 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"}
+: ${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}"}
+
+
+## -------------------- ##
+## Useful sed snippets. ##
+## -------------------- ##
+
+sed_dirname='s|/[^/]*$||'
+sed_basename='s|^.*/||'
+
+# 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'
+
+# 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'
+
+# 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"
+
+
+## ----------------- ##
+## 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.
+
+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.
+
+# 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=:
+
+# 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
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath=$0
+
+# The name of this program.
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
+
+# Make sure we have an absolute progpath for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *[\\/]*)
+     progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
+     progdir=`cd "$progdir" && pwd`
+     progpath=$progdir/$progname
+     ;;
+  *)
+     _G_IFS=$IFS
+     IFS=${PATH_SEPARATOR-:}
+     for progdir in $PATH; do
+       IFS=$_G_IFS
+       test -x "$progdir/$progname" && break
+     done
+     IFS=$_G_IFS
+     test -n "$progdir" || progdir=`pwd`
+     progpath=$progdir/$progname
+     ;;
+esac
+
+
+## ----------------- ##
+## 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.
+
+opt_dry_run=false
+opt_quiet=false
+opt_verbose=false
+
+# 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='&#x1b;[0m'
+        tc_bold='&#x1b;[1m';   tc_standout='&#x1b;[7m'
+        tc_red='&#x1b;[31m';   tc_green='&#x1b;[32m'
+        tc_blue='&#x1b;[34m';  tc_cyan='&#x1b;[36m'
+      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
+    }
+
+    require_term_colors=:
+}
+
+
+## ----------------- ##
+## Function library. ##
+## ----------------- ##
+
+# 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.
+
+
+# func_append VAR VALUE
+# ---------------------
+# Append VALUE onto the existing contents of VAR.
+
+  # 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
+
+    '"$_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_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 ()
+{
+    $debug_cmd
+
+    _G_directory_path=$1
+    _G_dir_list=
+
+    if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
+
+      # 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 "$_G_directory_path"; do
+        # ...make a list in topmost first order.  Use a colon delimited
+	# list incase some portion of path contains whitespace.
+        _G_dir_list=$_G_directory_path:$_G_dir_list
+
+        # If the last portion added has no slash in it, the list is done
+        case $_G_directory_path in */*) ;; *) break ;; esac
+
+        # ...otherwise throw away the child directory and loop
+        _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
+      done
+      _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
+
+      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 "$_G_dir" 2>/dev/null || :
+      done
+      IFS=$func_mkdir_p_IFS
+
+      # Bail out if we (or some other process) failed to create a directory.
+      test -d "$_G_directory_path" || \
+        func_fatal_error "Failed to create '$1'"
+    fi
+}
+
+
+# func_mktempdir [BASENAME]
+# -------------------------
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, BASENAME is the basename for that directory.
+func_mktempdir ()
+{
+    $debug_cmd
+
+    _G_template=${TMPDIR-/tmp}/${1-$progname}
+
+    if test : = "$opt_dry_run"; then
+      # Return a directory name, but don't create it in dry-run mode
+      _G_tmpdir=$_G_template-$$
+    else
+
+      # If mktemp works, use that first and foremost
+      _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$_G_tmpdir"; then
+        # Failing that, at least try and use $RANDOM to avoid a race
+        _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
+
+    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"}
+
+    eval func_run_hooks func_options \
+        ${func_validate_options_result+"$func_validate_options_result"}
+
+    # save modified positional parameters for caller
+    func_options_result=$func_run_hooks_result
+}
+
+
+# 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 ()
+{
+    $debug_cmd
+
+    # 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_parse_options [ARG]...
+# ---------------------------
+# The main option parsing loop.
+func_hookable func_parse_options
+func_parse_options ()
+{
+    $debug_cmd
+
+    func_parse_options_result=
+
+    # 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
+
+      # Break out of the loop if we already parsed every option.
+      test $# -gt 0 || break
+
+      _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
+		      ;;
+
+        --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_validate_options [ARG]...
+# ------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+func_hookable func_validate_options
+func_validate_options ()
+{
+    $debug_cmd
+
+    # Display all warnings if -W was not given.
+    test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
+
+    func_run_hooks func_validate_options ${1+"$@"}
+
+    # Bail if the options were screwed!
+    $exit_cmd $EXIT_FAILURE
+
+    # save modified positional parameters for caller
+    func_validate_options_result=$func_run_hooks_result
+}
+
+
+
+## ----------------- ##
+## Helper functions. ##
+## ----------------- ##
+
+# 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 ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    eval \$ECHO \""$fatal_help"\"
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+
+# func_help
+# ---------
+# Echo long help message to standard output and exit.
+func_help ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message"
+    exit 0
+}
+
+
+# func_missing_arg ARGNAME
+# ------------------------
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+    $debug_cmd
+
+    func_error "Missing argument for '$1'."
+    exit_cmd=exit
+}
+
+
+# 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.
+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 ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+    exit 0
+}
+
+
+# func_usage_message
+# ------------------
+# Echo short help message to standard output.
+func_usage_message ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    echo
+    $SED -n 's|^# ||
+        /^Written by/{
+          x;p;x
+        }
+	h
+	/^Written by/q' < "$progpath"
+    echo
+    eval \$ECHO \""$usage_message"\"
+}
+
+
+# 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 $?
+}
+
+
+# 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:
+
+# Set a version string.
+scriptversion='(GNU libtool) 2.4.6'
+
+
+# func_echo ARG...
+# ----------------
+# Libtool also displays the current mode in messages, so override
+# funclib.sh func_echo with this custom definition.
+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${opt_mode+: $opt_mode}: $_G_line"
+    done
+    IFS=$func_echo_IFS
+}
+
+
+# func_warning ARG...
+# -------------------
+# Libtool warnings are not categorized, so override funclib.sh
+# func_warning with this simpler definition.
+func_warning ()
+{
+    $debug_cmd
+
+    $warning_func ${1+"$@"}
+}
+
+
+## ---------------- ##
+## 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
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+func_help ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_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)
+       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/software/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...
+# -------------------------------
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+    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 ()
+{
+    re_begincf='^# ### BEGIN LIBTOOL'
+    re_endcf='^# ### END LIBTOOL'
+
+    # Default configuration.
+    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
+
+    # Now print the configurations for the tags.
+    for tagname in $taglist; do
+      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
+    done
+
+    exit $?
+}
+
+
+# func_features
+# -------------
+# Display the features supported by this script.
+func_features ()
+{
+    echo "host: $host"
+    if test yes = "$build_libtool_libs"; then
+      echo "enable shared libraries"
+    else
+      echo "disable shared libraries"
+    fi
+    if test yes = "$build_old_libs"; then
+      echo "enable static libraries"
+    else
+      echo "disable static libraries"
+    fi
+
+    exit $?
+}
+
+
+# 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
+
+    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) ;;
+    *)
+        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
+}
+
+
+# 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
+$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
+$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
+$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
+
+      exit $EXIT_MISMATCH
+    fi
+}
+
+
+# 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=
+
+    # 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
+
+
+# libtool_parse_options [ARG]...
+# ---------------------------------
+# Provide handling for libtool specific options.
+libtool_parse_options ()
+{
+    $debug_cmd
+
+    # 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"
+                        ;;
+
+	# An option not handled by this hook function:
+        *)		set dummy "$_G_opt" ${1+"$@"};	shift; break  ;;
+      esac
+    done
+
+
+    # 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
+
+
+
+# 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
+
+    # 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."
+    }
+
+    # 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
+
+
+
+## ----------- ##
+##    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.
+# 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 | func_generated_by_libtool_p
+}
+
+# func_lalib_unsafe_p 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.
+func_lalib_unsafe_p ()
+{
+    lalib_p=no
+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+	for lalib_p_l in 1 2 3 4
+	do
+	    read lalib_p_line
+	    case $lalib_p_line in
+		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+	    esac
+	done
+	exec 0<&5 5<&-
+    fi
+    test yes = "$lalib_p"
+}
+
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+    test -f "$1" &&
+      $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
+}
+
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+    func_ltwrapper_exec_suffix=
+    case $1 in
+    *.exe) ;;
+    *) func_ltwrapper_exec_suffix=.exe ;;
+    esac
+    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
+
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+    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_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+    $debug_cmd
+
+    save_ifs=$IFS; IFS='~'
+    for cmd in $1; do
+      IFS=$sp$nl
+      eval cmd=\"$cmd\"
+      IFS=$save_ifs
+      func_show_eval "$cmd" "${2-:}"
+    done
+    IFS=$save_ifs
+}
+
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# 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.
+func_source ()
+{
+    $debug_cmd
+
+    case $1 in
+    */* | *\\*)	. "$1" ;;
+    *)		. "./$1" ;;
+    esac
+}
+
+
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+  func_resolve_sysroot_result=$1
+  case $func_resolve_sysroot_result in
+  =*)
+    func_stripname '=' '' "$func_resolve_sysroot_result"
+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+    ;;
+  esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+  case $lt_sysroot:$1 in
+  ?*:"$lt_sysroot"*)
+    func_stripname "$lt_sysroot" '' "$1"
+    func_replace_sysroot_result='='$func_stripname_result
+    ;;
+  *)
+    # Including no sysroot.
+    func_replace_sysroot_result=$1
+    ;;
+  esac
+}
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    $debug_cmd
+
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+	func_append_quoted CC_quoted "$arg"
+      done
+      CC_expanded=`func_echo_all $CC`
+      CC_quoted_expanded=`func_echo_all $CC_quoted`
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	      # Double-quote args containing other shell metacharacters.
+	      func_append_quoted CC_quoted "$arg"
+	    done
+	    CC_expanded=`func_echo_all $CC`
+	    CC_quoted_expanded=`func_echo_all $CC_quoted`
+	    case "$@ " in
+	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  func_echo "unable to infer tagged configuration"
+	  func_fatal_error "specify a tag with '--tag'"
+#	else
+#	  func_verbose "using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+
+
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=$1
+    if test yes = "$build_libtool_libs"; then
+      write_lobj=\'$2\'
+    else
+      write_lobj=none
+    fi
+
+    if test yes = "$build_old_libs"; then
+      write_oldobj=\'$3\'
+    else
+      write_oldobj=none
+    fi
+
+    $opt_dry_run || {
+      cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+      $MV "${write_libobj}T" "$write_libobj"
+    }
+}
+
+
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+  $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
+    # command is not found, the shell will set an exit code of 127 and print
+    # *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
+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+        $SED -e "$sed_naive_backslashify"`
+    else
+      func_convert_core_file_wine_to_w32_result=
+    fi
+  fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+  $debug_cmd
+
+  # unfortunately, winepath doesn't convert paths, only file names
+  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 -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
+        else
+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+        fi
+      fi
+    done
+    IFS=$oldIFS
+  fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+  $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
+      # on failure, ensure result is empty
+      func_cygpath_result=
+    fi
+  else
+    func_cygpath_result=
+    func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
+  fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format.  Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+  $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 "$sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+  $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 "Continuing, but uninstalled executables may not work."
+    # Fallback:
+    func_to_host_file_result=$1
+  fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+  $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 "Continuing, but uninstalled executables may not work."
+    # Fallback.  This is a deliberately simplistic "conversion" and
+    # should not be "improved".  See libtool.info.
+    if test "x$1" != "x$2"; then
+      lt_replace_pathsep_chars="s|$1|$2|g"
+      func_to_host_path_result=`echo "$3" |
+        $SED -e "$lt_replace_pathsep_chars"`
+    else
+      func_to_host_path_result=$3
+    fi
+  fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+  $debug_cmd
+
+  case $4 in
+  $1 ) func_to_host_path_result=$3$func_to_host_path_result
+    ;;
+  esac
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# 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.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+  $debug_cmd
+
+  $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+  $debug_cmd
+
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
+      ;;
+    *)
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
+      ;;
+  esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+  func_to_host_file_result=$1
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+  $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
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+  $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.
+    func_to_host_file_result=`cygpath -m "$1"`
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+  $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
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+  $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
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+  $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
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# 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.
+#
+# Path separators are also converted from $build format to $host format.  If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+#   file name conversion function    : func_convert_file_X_to_Y ()
+#   path conversion function         : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same.  If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+  $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
+  fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+  $debug_cmd
+
+  func_init_to_host_path_cmd
+  $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+  func_to_host_path_result=$1
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+  $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 ';.';
+    # and winepath ignores them completely.
+    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_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+  $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_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_cygwin_to_w32
+
+
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
+# a working winepath.  Returns result in func_to_host_file_result.
+func_convert_path_nix_to_w32 ()
+{
+  $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_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_nix_to_w32
+
+
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+  $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_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_msys_to_cygwin
+
+
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+  $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 ';.', and winepath ignores them completely.
+    func_stripname : : "$1"
+    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_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# 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 ()
+{
+    $debug_cmd
+
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile=$nonopt  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
+    suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
+    pie_flag=
+
+    for arg
+    do
+      case $arg_mode in
+      arg  )
+	# do not "continue".  Instead, add this to base_compile
+	lastarg=$arg
+	arg_mode=normal
+	;;
+
+      target )
+	libobj=$arg
+	arg_mode=normal
+	continue
+	;;
+
+      normal )
+	# Accept any command-line options.
+	case $arg in
+	-o)
+	  test -n "$libobj" && \
+	    func_fatal_error "you cannot specify '-o' more than once"
+	  arg_mode=target
+	  continue
+	  ;;
+
+	-pie | -fpie | -fPIE)
+          func_append pie_flag " $arg"
+	  continue
+	  ;;
+
+	-shared | -static | -prefer-pic | -prefer-non-pic)
+	  func_append later " $arg"
+	  continue
+	  ;;
+
+	-no-suppress)
+	  suppress_opt=no
+	  continue
+	  ;;
+
+	-Xcompiler)
+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+	  continue      #  The current "srcfile" will either be retained or
+	  ;;            #  replaced later.  I would guess that would be a bug.
+
+	-Wc,*)
+	  func_stripname '-Wc,' '' "$arg"
+	  args=$func_stripname_result
+	  lastarg=
+	  save_ifs=$IFS; IFS=,
+	  for arg in $args; do
+	    IFS=$save_ifs
+	    func_append_quoted lastarg "$arg"
+	  done
+	  IFS=$save_ifs
+	  func_stripname ' ' '' "$lastarg"
+	  lastarg=$func_stripname_result
+
+	  # Add the arguments to base_compile.
+	  func_append base_compile " $lastarg"
+	  continue
+	  ;;
+
+	*)
+	  # Accept the current argument as the source file.
+	  # The previous "srcfile" becomes the current argument.
+	  #
+	  lastarg=$srcfile
+	  srcfile=$arg
+	  ;;
+	esac  #  case $arg
+	;;
+      esac    #  case $arg_mode
+
+      # Aesthetically quote the previous argument.
+      func_append_quoted base_compile "$lastarg"
+    done # for arg
+
+    case $arg_mode in
+    arg)
+      func_fatal_error "you must specify an argument for -Xcompile"
+      ;;
+    target)
+      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
+      }
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    case $libobj in
+    *.[cCFSifmso] | \
+    *.ada | *.adb | *.ads | *.asm | \
+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
+      func_xform "$libobj"
+      libobj=$func_xform_result
+      ;;
+    esac
+
+    case $libobj in
+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
+    *)
+      func_fatal_error "cannot determine name of library object from '$libobj'"
+      ;;
+    esac
+
+    func_infer_tag $base_compile
+
+    for arg in $later; do
+      case $arg in
+      -shared)
+	test yes = "$build_libtool_libs" \
+	  || func_fatal_configuration "cannot build a shared library"
+	build_old_libs=no
+	continue
+	;;
+
+      -static)
+	build_libtool_libs=no
+	build_old_libs=yes
+	continue
+	;;
+
+      -prefer-pic)
+	pic_mode=yes
+	continue
+	;;
+
+      -prefer-non-pic)
+	pic_mode=no
+	continue
+	;;
+      esac
+    done
+
+    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_dirname_and_basename "$obj" "/" ""
+    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 yes = "$build_old_libs"; then
+      removelist="$obj $lobj $libobj ${libobj}T"
+    else
+      removelist="$lobj $libobj ${libobj}T"
+    fi
+
+    # On Cygwin there's no "real" PIC flag so we must build both object types
+    case $host_os in
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
+      pic_mode=default
+      ;;
+    esac
+    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 no = "$compiler_c_o"; then
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+      lockfile=$output_obj.lock
+    else
+      output_obj=
+      need_locks=no
+      lockfile=
+    fi
+
+    # 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 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 warn = "$need_locks"; then
+      if test -f "$lockfile"; then
+	$ECHO "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+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
+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."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+      func_append removelist " $output_obj"
+      $ECHO "$srcfile" > "$lockfile"
+    fi
+
+    $opt_dry_run || $RM $removelist
+    func_append removelist " $lockfile"
+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+    srcfile=$func_to_tool_file_result
+    func_quote_for_eval "$srcfile"
+    qsrcfile=$func_quote_for_eval_result
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test yes = "$build_libtool_libs"; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      if test no != "$pic_mode"; then
+	command="$base_compile $qsrcfile $pic_flag"
+      else
+	# Don't build PIC code
+	command="$base_compile $qsrcfile"
+      fi
+
+      func_mkdir_p "$xdir$objdir"
+
+      if test -z "$output_obj"; then
+	# Place PIC objects in $objdir
+	func_append command " -o $lobj"
+      fi
+
+      func_show_eval_locale "$command"	\
+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
+
+      if test warn = "$need_locks" &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+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
+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."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+	func_show_eval '$MV "$output_obj" "$lobj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+
+      # Allow error messages only from the first compilation.
+      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 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 yes = "$compiler_c_o"; then
+	func_append command " -o $obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      func_append command "$suppress_output"
+      func_show_eval_locale "$command" \
+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+
+      if test warn = "$need_locks" &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+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
+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."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+	func_show_eval '$MV "$output_obj" "$obj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+    fi
+
+    $opt_dry_run || {
+      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+
+      # Unlock the critical section if it was locked
+      if test no != "$need_locks"; then
+	removelist=$lockfile
+        $RM "$lockfile"
+      fi
+    }
+
+    exit $EXIT_SUCCESS
+}
+
+$opt_help || {
+  test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
+}
+
+func_mode_help ()
+{
+    # We need to display help for each of the modes.
+    case $opt_mode in
+      "")
+        # Generic help is extracted from the usage comments
+        # at the start of this file.
+        func_help
+        ;;
+
+      clean)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+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
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      compile)
+      $ECHO \
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -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
+  -Wc,FLAG          pass FLAG directly to the compiler
+
+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'."
+        ;;
+
+      execute)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+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
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+        ;;
+
+      finish)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+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."
+        ;;
+
+      install)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the 'install' or 'cp' program.
+
+The following components of INSTALL-COMMAND are treated specially:
+
+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+        ;;
+
+      link)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -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
+  -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
+                    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+                    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -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
+  -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
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -shared           only do dynamic linking of libtool libraries
+  -shrext SUFFIX    override the standard shared library file extension
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+  -weak LIBNAME     declare that the target provides the LIBNAME interface
+  -Wc,FLAG
+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wl,FLAG
+  -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.
+
+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
+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 '.lo' or '.$objext', then a reloadable object file
+is created, otherwise an executable program is created."
+        ;;
+
+      uninstall)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+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
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      *)
+        func_fatal_help "invalid operation mode '$opt_mode'"
+        ;;
+    esac
+
+    echo
+    $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
+    func_mode_help
+  else
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	func_mode_help
+      done
+    } | $SED -n '1p; 2,$s/^Usage:/  or: /p'
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	echo
+	func_mode_help
+      done
+    } |
+    $SED '1d
+      /^When reporting/,/^Report/{
+	H
+	d
+      }
+      $x
+      /information about other modes/d
+      /more detailed .*MODE/d
+      s/^Usage:.*--mode=$[^ ]*$ .*/Description of \1 mode:/'
+  fi
+  exit $?
+fi
+
+
+# func_mode_execute arg...
+func_mode_execute ()
+{
+    $debug_cmd
+
+    # The first argument is the command name.
+    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"
+
+      dir=
+      case $file in
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# 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"
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+	func_source "$file"
+
+	# Skip this library if it cannot be dlopened.
+	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'"
+	  continue
+	fi
+
+	func_dirname "$file" "" "."
+	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'"
+	  fi
+	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	func_dirname "$file" "" "."
+	dir=$func_dirname_result
+	;;
+
+      *)
+	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
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic=$magic
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -* | *.la | *.lo ) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if func_ltwrapper_script_p "$file"; then
+	  func_source "$file"
+	  # Transform arg to wrapped name.
+	  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
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      func_append_quoted args "$file"
+    done
+
+    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"
+      fi
+
+      # Restore saved environment variables
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+                $lt_var=\$save_$lt_var; export $lt_var
+	      else
+		$lt_unset $lt_var
+	      fi"
+      done
+
+      # Now prepare to actually exec the command.
+      exec_cmd=\$cmd$args
+    fi
+}
+
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+    $debug_cmd
+
+    libs=
+    libdirs=
+    admincmds=
+
+    for opt in "$nonopt" ${1+"$@"}
+    do
+      if test -d "$opt"; then
+	func_append libdirs " $opt"
+
+      elif test -f "$opt"; then
+	if func_lalib_unsafe_p "$opt"; then
+	  func_append libs " $opt"
+	else
+	  func_warning "'$opt' is not a valid libtool archive"
+	fi
+
+      else
+	func_fatal_error "invalid argument '$opt'"
+      fi
+    done
+
+    if test -n "$libs"; then
+      if test -n "$lt_sysroot"; then
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+        sysroot_cmd="s/$[ ']$$sysroot_regex/\1/g;"
+      else
+        sysroot_cmd=
+      fi
+
+      # Remove sysroot references
+      if $opt_dry_run; then
+        for lib in $libs; do
+          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 \
+	    > $tmpdir/tmp-la
+	  mv -f $tmpdir/tmp-la $lib
+	done
+        ${RM}r "$tmpdir"
+      fi
+    fi
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+'"$cmd"'"'
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    $opt_quiet && exit $EXIT_SUCCESS
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      echo "----------------------------------------------------------------------"
+      echo "Libraries have been installed in:"
+      for libdir in $libdirs; do
+	$ECHO "   $libdir"
+      done
+      echo
+      echo "If you ever happen to want to link against installed libraries"
+      echo "in a given directory, LIBDIR, you must either use libtool, and"
+      echo "specify the full pathname of the library, or use the '-LLIBDIR'"
+      echo "flag during linking and do at least one of the following:"
+      if test -n "$shlibpath_var"; then
+	echo "   - add LIBDIR to the '$shlibpath_var' environment variable"
+	echo "     during execution"
+      fi
+      if test -n "$runpath_var"; then
+	echo "   - add LIBDIR to the '$runpath_var' environment variable"
+	echo "     during linking"
+      fi
+      if test -n "$hardcode_libdir_flag_spec"; then
+	libdir=LIBDIR
+	eval flag=\"$hardcode_libdir_flag_spec\"
+
+	$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'"
+      fi
+      echo
+
+      echo "See any operating system documentation about shared libraries for"
+      case $host in
+	solaris2.[6789]|solaris2.1[0-9])
+	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	  echo "pages."
+	  ;;
+	*)
+	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
+	  ;;
+      esac
+      echo "----------------------------------------------------------------------"
+    fi
+    exit $EXIT_SUCCESS
+}
+
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
+
+
+# func_mode_install arg...
+func_mode_install ()
+{
+    $debug_cmd
+
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
+       # Allow the use of GNU shtool's install command.
+       case $nonopt in *shtool*) :;; *) false;; esac
+    then
+      # Aesthetically quote it.
+      func_quote_for_eval "$nonopt"
+      install_prog="$func_quote_for_eval_result "
+      arg=$1
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    func_quote_for_eval "$arg"
+    func_append install_prog "$func_quote_for_eval_result"
+    install_shared_prog=$install_prog
+    case " $install_prog " in
+      *[\\\ /]cp\ *) install_cp=: ;;
+      *) install_cp=false ;;
+    esac
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=false
+    stripme=
+    no_mode=:
+    for arg
+    do
+      arg2=
+      if test -n "$dest"; then
+	func_append files " $dest"
+	dest=$arg
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=: ;;
+      -f)
+	if $install_cp; then :; else
+	  prev=$arg
+	fi
+	;;
+      -g | -m | -o)
+	prev=$arg
+	;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*)
+	;;
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  if test X-m = "X$prev" && test -n "$install_override_mode"; then
+	    arg2=$install_override_mode
+	    no_mode=false
+	  fi
+	  prev=
+	else
+	  dest=$arg
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      func_quote_for_eval "$arg"
+      func_append install_prog " $func_quote_for_eval_result"
+      if test -n "$arg2"; then
+	func_quote_for_eval "$arg2"
+      fi
+      func_append install_shared_prog " $func_quote_for_eval_result"
+    done
+
+    test -z "$install_prog" && \
+      func_fatal_help "you must specify an install program"
+
+    test -n "$prev" && \
+      func_fatal_help "the '$prev' option requires an argument"
+
+    if test -n "$install_override_mode" && $no_mode; then
+      if $install_cp; then :; else
+	func_quote_for_eval "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_for_eval_result"
+      fi
+    fi
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	func_fatal_help "no file or destination specified"
+      else
+	func_fatal_help "you must specify a destination"
+      fi
+    fi
+
+    # Strip any trailing slash from the destination.
+    func_stripname '' '/' "$dest"
+    dest=$func_stripname_result
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=:
+    if $isdir; then
+      destdir=$dest
+      destname=
+    else
+      func_dirname_and_basename "$dest" "" "."
+      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"
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  func_fatal_help "'$destdir' must be an absolute directory name"
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic=$magic
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	func_append staticlibs " $file"
+	;;
+
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# 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"
+
+	library_names=
+	old_library=
+	relink_command=
+	func_source "$file"
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append current_libdirs " $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append future_libdirs " $libdir" ;;
+	  esac
+	fi
+
+	func_dirname "$file" "/" ""
+	dir=$func_dirname_result
+	func_append dir "$objdir"
+
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  test "$inst_prefix_dir" = "$destdir" && \
+	    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.
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	  fi
+
+	  func_warning "relinking '$file'"
+	  func_show_eval "$relink_command" \
+	    '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
+	  shift
+
+	  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
+	  case $host_os in
+	  cygwin* | mingw* | pw32* | cegcc*)
+	    case $realname in
+	    *.dll.a)
+	      tstripme=
+	      ;;
+	    esac
+	    ;;
+	  os2*)
+	    case $realname in
+	    *_dll.a)
+	      tstripme=
+	      ;;
+	    esac
+	    ;;
+	  esac
+	  if test -n "$tstripme" && test -n "$striplib"; then
+	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    # Try 'ln -sf' first, because the 'ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
+	    for linkname
+	    do
+	      test "$linkname" != "$realname" \
+		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  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
+	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile=$destdir/$destname
+	else
+	  func_basename "$file"
+	  destfile=$func_basename_result
+	  destfile=$destdir/$destfile
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  func_lo2o "$destfile"
+	  staticdest=$func_lo2o_result
+	  ;;
+	*.$objext)
+	  staticdest=$destfile
+	  destfile=
+	  ;;
+	*)
+	  func_fatal_help "cannot copy a libtool object to '$destfile'"
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	test -n "$destfile" && \
+	  func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+	# Install the old object if enabled.
+	if test yes = "$build_old_libs"; then
+	  # Deduce the name of the old-style object file.
+	  func_lo2o "$file"
+	  staticobj=$func_lo2o_result
+	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
+	fi
+	exit $EXIT_SUCCESS
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile=$destdir/$destname
+	else
+	  func_basename "$file"
+	  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=
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      func_stripname '' '.exe' "$file"
+	      file=$func_stripname_result
+	      stripped_ext=.exe
+	    fi
+	    ;;
+	esac
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin* | *mingw*)
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      wrapper=$func_ltwrapper_scriptname_result
+	    else
+	      func_stripname '' '.exe' "$file"
+	      wrapper=$func_stripname_result
+	    fi
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if func_ltwrapper_script_p "$wrapper"; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  func_source "$wrapper"
+
+	  # Check the variables that should have been set.
+	  test -z "$generated_by_libtool_version" && \
+	    func_fatal_error "invalid libtool wrapper script '$wrapper'"
+
+	  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'`
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      func_warning "'$lib' has not been installed in '$libdir'"
+	      finalize=false
+	    fi
+	  done
+
+	  relink_command=
+	  func_source "$wrapper"
+
+	  outputname=
+	  if test no = "$fast_install" && test -n "$relink_command"; then
+	    $opt_dry_run || {
+	      if $finalize; then
+	        tmpdir=`func_mktempdir`
+		func_basename "$file$stripped_ext"
+		file=$func_basename_result
+	        outputname=$tmpdir/$file
+	        # Replace the output file specification.
+	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+
+	        $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"
+		  $opt_dry_run || ${RM}r "$tmpdir"
+		  continue
+	        fi
+	        file=$outputname
+	      else
+	        func_warning "cannot relink '$file'"
+	      fi
+	    }
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$ECHO "$file$stripped_ext" | $SED "s%$[^/]*$$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyway
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    func_stripname '' '.exe' "$destfile"
+	    destfile=$func_stripname_result
+	    ;;
+	  esac
+	  ;;
+	esac
+	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+	$opt_dry_run || if test -n "$outputname"; then
+	  ${RM}r "$tmpdir"
+	fi
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      func_basename "$file"
+      name=$func_basename_result
+
+      # Set up the ranlib parameters.
+      oldlib=$destdir/$name
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
+
+      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+      if test -n "$stripme" && test -n "$old_striplib"; then
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
+      fi
+
+      # Do each command in the postinstall commands.
+      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+    done
+
+    test -n "$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'
+    else
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
+
+
+# func_generate_dlsyms outputname originator pic_p
+# Extract symbols from dlprefiles and create ${outputname}S.o with
+# a dlpreopen symbol table.
+func_generate_dlsyms ()
+{
+    $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 no != "$dlself"; then
+      if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	my_dlsyms=${my_outputname}S.c
+      else
+	func_error "not configured to extract global symbols from dlpreopened files"
+      fi
+    fi
+
+    if test -n "$my_dlsyms"; then
+      case $my_dlsyms in
+      "") ;;
+      *.c)
+	# Discover the nlist of each of the dlfiles.
+	nlist=$output_objdir/$my_outputname.nm
+
+	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+	# Parse the name list into a source file.
+	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) $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+#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 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
+
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
+/* External symbol declarations for the compiler. */\
+"
+
+	if test yes = "$dlself"; then
+	  func_verbose "generating symbol list for '$output'"
+
+	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+	  # Add our own program objects to the symbol list.
+	  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'"
+	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -n "$exclude_expsyms"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  if test -n "$export_symbols_regex"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  # Prepare the list of exported symbols
+	  if test -z "$export_symbols"; then
+	    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"'
+	      case $host in
+	      *cygwin* | *mingw* | *cegcc* )
+                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+	        ;;
+	      esac
+	    }
+	  else
+	    $opt_dry_run || {
+	      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
+	        *cygwin* | *mingw* | *cegcc* )
+	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+	          ;;
+	      esac
+	    }
+	  fi
+	fi
+
+	for dlprefile in $dlprefiles; do
+	  func_verbose "extracting global C symbols from '$dlprefile'"
+	  func_basename "$dlprefile"
+	  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=
+	        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
+	            func_basename "$dlprefile_dlname"
+	            dlprefile_dlbasename=$func_basename_result
+	          else
+	            # no lafile. user explicitly requested -dlpreopen <import library>.
+	            $sharedlib_from_linklib_cmd "$dlprefile"
+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
+	          fi
+	        fi
+	        $opt_dry_run || {
+	          if test -n "$dlprefile_dlbasename"; then
+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+	          else
+	            func_warning "Could not compute DLL name from $name"
+	            eval '$ECHO ": $name " >> "$nlist"'
+	          fi
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+	        }
+	      else # not an import lib
+	        $opt_dry_run || {
+	          eval '$ECHO ": $name " >> "$nlist"'
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	        }
+	      fi
+	    ;;
+	    *)
+	      $opt_dry_run || {
+	        eval '$ECHO ": $name " >> "$nlist"'
+	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	      }
+	    ;;
+          esac
+	done
+
+	$opt_dry_run || {
+	  # Make sure we have at least an empty file.
+	  test -f "$nlist" || : > "$nlist"
+
+	  if test -n "$exclude_expsyms"; then
+	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	    $MV "$nlist"T "$nlist"
+	  fi
+
+	  # Try sorting and uniquifying the output.
+	  if $GREP -v "^: " < "$nlist" |
+	      if sort -k 3 </dev/null >/dev/null 2>&1; then
+		sort -k 3
+	      else
+		sort +2
+	      fi |
+	      uniq > "$nlist"S; then
+	    :
+	  else
+	    $GREP -v "^: " < "$nlist" > "$nlist"S
+	  fi
+
+	  if test -f "$nlist"S; then
+	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+	  else
+	    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.  */
+typedef struct {
+  const char *name;
+  void *address;
+} lt_dlsymlist;
+extern LT_DLSYM_CONST lt_dlsymlist
+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},"
+
+	  if test -s "$nlist"I; then
+	    echo >> "$output_objdir/$my_dlsyms" "\
+  {\"@INIT@\", (void *) &lt_syminit},"
+	  fi
+
+	  case $need_lib_prefix in
+	  no)
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  *)
+	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  esac
+	  echo >> "$output_objdir/$my_dlsyms" "\
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_${my_prefix}_LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	} # !$opt_dry_run
+
+	pic_flag_for_symtable=
+	case "$compile_command " in
+	*" -static "*) ;;
+	*)
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+	  *-*-hpux*)
+	    pic_flag_for_symtable=" $pic_flag"  ;;
+	  *)
+	    $my_pic_p && pic_flag_for_symtable=" $pic_flag"
+	    ;;
+	  esac
+	  ;;
+	esac
+	symtab_cflags=
+	for arg in $LTCFLAGS; do
+	  case $arg in
+	  -pie | -fpie | -fPIE) ;;
+	  *) func_append symtab_cflags " $arg" ;;
+	  esac
+	done
+
+	# Now compile the dynamic symbol file.
+	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" "${nlist}I"'
+
+	# Transform the symbol file into the correct name.
+	symfileobj=$output_objdir/${my_outputname}S.$objext
+	case $host in
+	*cygwin* | *mingw* | *cegcc* )
+	  if test -f "$output_objdir/$my_outputname.def"; then
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	  else
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  fi
+	  ;;
+	*)
+	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  ;;
+	esac
+	;;
+      *)
+	func_fatal_error "unknown suffix for '$my_dlsyms'"
+	;;
+      esac
+    else
+      # We keep going just in case the user didn't refer to
+      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+      # really was required.
+
+      # Nullify the symbol file.
+      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
+    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'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
+func_win32_libid ()
+{
+  $debug_cmd
+
+  win32_libid_type=unknown
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    # 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
+      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|
+		    p
+		    q
+		}
+	    }'`
+	;;
+      esac
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $ECHO "$win32_libid_type"
+}
+
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+  $debug_cmd
+
+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+  $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"':/{
+      # Place marker at beginning of archive member dllname section
+      s/.*/====MARK====/
+      p
+      d
+    }
+    # These lines can sometimes be longer than 43 characters, but
+    # are always uninteresting
+    /:[	 ]*file format pe[i]\{,1\}-/d
+    /^In archive [^:]*:/d
+    # Ensure marker is printed
+    /^====MARK====/p
+    # Remove all lines with less than 43 characters
+    /^.\{43\}/!d
+    # From remaining lines, remove first 43 characters
+    s/^.\{43\}//' |
+    $SED -n '
+      # Join marker and all lines until next marker into a single line
+      /^====MARK====/ b para
+      H
+      $ b para
+      b
+      :para
+      x
+      s/\n//g
+      # Remove the marker
+      s/^====MARK====//
+      # Remove trailing dots and whitespace
+      s/[\. \t]*$//
+      # Print
+      /./p' |
+    # we now have a list, one entry per line, of the stringified
+    # contents of the appropriate section of all members of the
+    # 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
+    # begins with a literal '.' or a single character followed by
+    # a '.'.
+    #
+    # Of those that remain, print the first one.
+    $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+  $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
+    # ms-generated import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+  else
+    # unknown
+    sharedlib_from_linklib_result=
+  fi
+}
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    $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"
+	sleep 2
+      done
+    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 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
+     :
+    else
+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+    fi
+}
+
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    $debug_cmd
+
+    my_gentop=$1; shift
+    my_oldlibs=${1+"$@"}
+    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 ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      func_basename "$my_xlib"
+      my_xlib=$func_basename_result
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  func_arith $extracted_serial + 1
+	  extracted_serial=$func_arith_result
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir=$my_gentop/$my_xlib_u
+
+      func_mkdir_p "$my_xdir"
+
+      case $host in
+      *-darwin*)
+	func_verbose "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	$opt_dry_run || {
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  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"
+	      cd "$darwin_curdir"
+	      $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 "$sed_basename" | sort -u`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
+	      $LIPO -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    $RM -rf unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd $darwin_orig_dir
+	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	} # !$opt_dry_run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+	;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+    done
+
+    func_extract_archives_result=$my_oldobjs
+}
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# 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 where it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=${1-no}
+
+	$ECHO "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='$sed_quote_subst'
+
+# Be Bourne compatible
+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
+  # 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
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='$macro_version'
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$ECHO are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    file=\"\$0\""
+
+    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+    $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+    ECHO=\"$qECHO\"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /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 that match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=\$0
+  shift
+  for lt_opt
+  do
+    case \"\$lt_opt\" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+        cat \"\$lt_dump_D/\$lt_dump_F\"
+        exit 0
+      ;;
+    --lt-*)
+        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n \"\$lt_option_debug\"; then
+    echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
+    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+"
+  case $host in
+  # Backslashes separate directories on plain windows
+  *-*-mingw | *-*-os2* | *-cegcc*)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+    ;;
+
+  *)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+    ;;
+  esac
+  $ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core \${1+\"\$@\"}
+}
+
+  # Parse options
+  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+    # special case for '.'
+    if test \"\$thisdir\" = \".\"; then
+      thisdir=\`pwd\`
+    fi
+    # remove .libs from thisdir
+    case \"\$thisdir\" in
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    $objdir )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	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\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $MKDIR \"\$progdir\"
+    else
+      $RM \"\$progdir/\$file\"
+    fi"
+
+	  $ECHO "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	\$ECHO \"\$relink_command_output\" >&2
+	$RM \"\$progdir/\$file\"
+	exit 1
+      fi
+    fi
+
+    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $RM \"\$progdir/\$program\";
+      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $RM \"\$progdir/\$file\"
+  fi"
+	else
+	  $ECHO "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	$ECHO "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# fixup the dll searchpath if we need to.
+	#
+	# Fix the DLL searchpath if we need to.  Do this before prepending
+	# to shlibpath, because on Windows, both are PATH and uninstalled
+	# libraries must come first.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	# Export our shlibpath_var if we have one.
+	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\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	$ECHO "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+      func_exec_program \${1+\"\$@\"}
+    fi
+  else
+    # The program doesn't exist.
+    \$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
+  fi
+fi\
+"
+}
+
+
+# func_emit_cwrapperexe_src
+# emit the source code for a wrapper executable on stdout
+# Must ONLY be called from within func_mode_link because
+# it depends on a number of variable set therein.
+func_emit_cwrapperexe_src ()
+{
+	cat <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+*/
+EOF
+	    cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include <direct.h>
+# include <process.h>
+# include <io.h>
+#else
+# include <unistd.h>
+# include <stdint.h>
+# ifdef __CYGWIN__
+#  include <io.h>
+# endif
+#endif
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
+/* declarations of non-ANSI functions */
+#if defined __MINGW32__
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#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_platform || defined ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined _MSC_VER
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+# define S_IXUSR _S_IEXEC
+#elif defined __MINGW32__
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+#elif defined __CYGWIN__
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined other platforms ... */
+#endif
+
+#if defined PATH_MAX
+# define LT_PATHMAX PATH_MAX
+#elif defined MAXPATHLEN
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef S_IXOTH
+# define S_IXOTH 0
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0
+#endif
+
+/* path handling portability macros */
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+  defined __OS2__
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free (stale); stale = 0; } \
+} while (0)
+
+#if defined LT_DEBUGWRAPPER
+static int lt_debug = 1;
+#else
+static int lt_debug = 0;
+#endif
+
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
+
+void *xmalloc (size_t num);
+char *xstrdup (const char *string);
+const char *base_name (const char *name);
+char *find_executable (const char *wrapper);
+char *chase_symlinks (const char *pathspec);
+int make_executable (const char *path);
+int check_executable (const char *path);
+char *strendzap (char *str, const char *pat);
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
+EOF
+
+	    cat <<EOF
+#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 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";
+EOF
+	    else
+	      cat <<"EOF"
+const char * LIB_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test -n "$dllsearchpath"; then
+              func_to_host_path "$dllsearchpath:"
+	      cat <<EOF
+const char * EXE_PATH_VARNAME = "PATH";
+const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * EXE_PATH_VARNAME = "";
+const char * EXE_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test yes = "$fast_install"; then
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+EOF
+	    else
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+EOF
+	    fi
+
+
+	    cat <<"EOF"
+
+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+
+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
+static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int  newargc;
+  char *tmp_pathspec;
+  char *actual_cwrapper_path;
+  char *actual_cwrapper_name;
+  char *target_name;
+  char *lt_argv_zero;
+  int rval = 127;
+
+  int i;
+
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  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
+   * argz[0], which is handled differently
+   */
+  newargc=0;
+  for (i = 1; i < argc; i++)
+    {
+      if (STREQ (argv[i], dumpscript_opt))
+	{
+EOF
+	    case $host in
+	      *mingw* | *cygwin* )
+		# make stdout use "unix" line endings
+		echo "          setmode(1,_O_BINARY);"
+		;;
+	      esac
+
+	    cat <<"EOF"
+	  lt_dump_script (stdout);
+	  return 0;
+	}
+      if (STREQ (argv[i], debug_opt))
+	{
+          lt_debug = 1;
+          continue;
+	}
+      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
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal (__FILE__, __LINE__,
+		    "unrecognized %s option: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
+
+EOF
+	    cat <<EOF
+  /* The GNU banner must be the first non-error debug message */
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
+EOF
+	    cat <<"EOF"
+  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
+
+  tmp_pathspec = find_executable (argv[0]);
+  if (tmp_pathspec == NULL)
+    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (before symlink chase) at: %s\n",
+		  tmp_pathspec);
+
+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (after symlink chase) at: %s\n",
+		  actual_cwrapper_path);
+  XFREE (tmp_pathspec);
+
+  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+  /* wrapper name transforms */
+  strendzap (actual_cwrapper_name, ".exe");
+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+  XFREE (actual_cwrapper_name);
+  actual_cwrapper_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  /* target_name transforms -- use actual target program name; might have lt- prefix */
+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+  strendzap (target_name, ".exe");
+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+  XFREE (target_name);
+  target_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(main) libtool target name: %s\n",
+		  target_name);
+EOF
+
+	    cat <<EOF
+  newargz[0] =
+    XMALLOC (char, (strlen (actual_cwrapper_path) +
+		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+  strcpy (newargz[0], actual_cwrapper_path);
+  strcat (newargz[0], "$objdir");
+  strcat (newargz[0], "/");
+EOF
+
+	    cat <<"EOF"
+  /* stop here, and copy so we don't have to do this twice */
+  tmp_pathspec = xstrdup (newargz[0]);
+
+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+  strcat (newargz[0], actual_cwrapper_name);
+
+  /* DO want the lt- prefix here if it exists, so use target_name */
+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+  XFREE (tmp_pathspec);
+  tmp_pathspec = NULL;
+EOF
+
+	    case $host_os in
+	      mingw*)
+	    cat <<"EOF"
+  {
+    char* p;
+    while ((p = strchr (newargz[0], '\\')) != NULL)
+      {
+	*p = '/';
+      }
+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+      {
+	*p = '/';
+      }
+  }
+EOF
+	    ;;
+	    esac
+
+	    cat <<"EOF"
+  XFREE (target_name);
+  XFREE (actual_cwrapper_path);
+  XFREE (actual_cwrapper_name);
+
+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+     because on Windows, both *_VARNAMEs are PATH but uninstalled
+     libraries must come first. */
+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+
+  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+		  nonnull (lt_argv_zero));
+  for (i = 0; i < newargc; i++)
+    {
+      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+		      i, nonnull (newargz[i]));
+    }
+
+EOF
+
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+  /* execv doesn't actually work on mingw as expected on unix */
+  newargz = prepare_spawn (newargz);
+  rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  if (rval == -1)
+    {
+      /* failed to start process */
+      lt_debugprintf (__FILE__, __LINE__,
+		      "(main) failed to launch target \"%s\": %s\n",
+		      lt_argv_zero, nonnull (strerror (errno)));
+      return 127;
+    }
+  return rval;
+EOF
+		;;
+	      *)
+		cat <<"EOF"
+  execv (lt_argv_zero, newargz);
+  return rval; /* =127, but avoids unused variable warning */
+EOF
+		;;
+	    esac
+
+	    cat <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+  void *p = (void *) malloc (num);
+  if (!p)
+    lt_fatal (__FILE__, __LINE__, "memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+			  string) : NULL;
+}
+
+const char *
+base_name (const char *name)
+{
+  const char *base;
+
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
+
+int
+check_executable (const char *path)
+{
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0)
+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+    return 1;
+  else
+    return 0;
+}
+
+int
+make_executable (const char *path)
+{
+  int rval = 0;
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if (stat (path, &st) >= 0)
+    {
+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+    }
+  return rval;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise
+   Does not chase symlinks, even on platforms that support them.
+*/
+char *
+find_executable (const char *wrapper)
+{
+  int has_slash = 0;
+  const char *p;
+  const char *p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  size_t tmp_len;
+  char *concat_name;
+
+  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+                  nonempty (wrapper));
+
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
+  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable (concat_name))
+	return concat_name;
+      XFREE (concat_name);
+    }
+  else
+    {
+#endif
+      if (IS_DIR_SEPARATOR (wrapper[0]))
+	{
+	  concat_name = xstrdup (wrapper);
+	  if (check_executable (concat_name))
+	    return concat_name;
+	  XFREE (concat_name);
+	}
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
+    }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+      {
+	has_slash = 1;
+	break;
+      }
+  if (!has_slash)
+    {
+      /* no slashes; search PATH */
+      const char *path = getenv ("PATH");
+      if (path != NULL)
+	{
+	  for (p = path; *p; p = p_next)
+	    {
+	      const char *q;
+	      size_t p_len;
+	      for (q = p; *q; q++)
+		if (IS_PATH_SEPARATOR (*q))
+		  break;
+	      p_len = (size_t) (q - p);
+	      p_next = (*q == '\0' ? q : q + 1);
+	      if (p_len == 0)
+		{
+		  /* empty path: current directory */
+		  if (getcwd (tmp, LT_PATHMAX) == NULL)
+		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+                              nonnull (strerror (errno)));
+		  tmp_len = strlen (tmp);
+		  concat_name =
+		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, tmp, tmp_len);
+		  concat_name[tmp_len] = '/';
+		  strcpy (concat_name + tmp_len + 1, wrapper);
+		}
+	      else
+		{
+		  concat_name =
+		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, p, p_len);
+		  concat_name[p_len] = '/';
+		  strcpy (concat_name + p_len + 1, wrapper);
+		}
+	      if (check_executable (concat_name))
+		return concat_name;
+	      XFREE (concat_name);
+	    }
+	}
+      /* not found in PATH; assume curdir */
+    }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+              nonnull (strerror (errno)));
+  tmp_len = strlen (tmp);
+  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable (concat_name))
+    return concat_name;
+  XFREE (concat_name);
+  return NULL;
+}
+
+char *
+chase_symlinks (const char *pathspec)
+{
+#ifndef S_ISLNK
+  return xstrdup (pathspec);
+#else
+  char buf[LT_PATHMAX];
+  struct stat s;
+  char *tmp_pathspec = xstrdup (pathspec);
+  char *p;
+  int has_symlinks = 0;
+  while (strlen (tmp_pathspec) && !has_symlinks)
+    {
+      lt_debugprintf (__FILE__, __LINE__,
+		      "checking path component for symlinks: %s\n",
+		      tmp_pathspec);
+      if (lstat (tmp_pathspec, &s) == 0)
+	{
+	  if (S_ISLNK (s.st_mode) != 0)
+	    {
+	      has_symlinks = 1;
+	      break;
+	    }
+
+	  /* search backwards for last DIR_SEPARATOR */
+	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    p--;
+	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    {
+	      /* no more DIR_SEPARATORS left */
+	      break;
+	    }
+	  *p = '\0';
+	}
+      else
+	{
+	  lt_fatal (__FILE__, __LINE__,
+		    "error accessing file \"%s\": %s",
+		    tmp_pathspec, nonnull (strerror (errno)));
+	}
+    }
+  XFREE (tmp_pathspec);
+
+  if (!has_symlinks)
+    {
+      return xstrdup (pathspec);
+    }
+
+  tmp_pathspec = realpath (pathspec, buf);
+  if (tmp_pathspec == 0)
+    {
+      lt_fatal (__FILE__, __LINE__,
+		"could not follow symlinks for %s", pathspec);
+    }
+  return xstrdup (tmp_pathspec);
+#endif
+}
+
+char *
+strendzap (char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert (str != NULL);
+  assert (pat != NULL);
+
+  len = strlen (str);
+  patlen = strlen (pat);
+
+  if (patlen <= len)
+    {
+      str += len - patlen;
+      if (STREQ (str, pat))
+	*str = '\0';
+    }
+  return str;
+}
+
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+  va_list args;
+  if (lt_debug)
+    {
+      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+      va_start (args, fmt);
+      (void) vfprintf (stderr, fmt, args);
+      va_end (args);
+    }
+}
+
+static void
+lt_error_core (int exit_status, const char *file,
+	       int line, const char *mode,
+	       const char *message, va_list ap)
+{
+  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *file, int line, const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
+  va_end (ap);
+}
+
+static const char *
+nonnull (const char *s)
+{
+  return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+  return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
+void
+lt_setenv (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_setenv) setting '%s' to '%s'\n",
+                  nonnull (name), nonnull (value));
+  {
+#ifdef HAVE_SETENV
+    /* always make a copy, for consistency with !HAVE_SETENV */
+    char *str = xstrdup (value);
+    setenv (name, str, 1);
+#else
+    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)
+      {
+        XFREE (str);
+      }
+#endif
+  }
+}
+
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+  char *new_value;
+  if (orig_value && *orig_value)
+    {
+      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)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
+    }
+  else
+    {
+      new_value = xstrdup (add);
+    }
+  return new_value;
+}
+
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      /* some systems can't cope with a ':'-terminated path #' */
+      size_t len = strlen (new_value);
+      while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+        {
+          new_value[--len] = '\0';
+        }
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+EOF
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+   Note that spawn() does not by itself call the command interpreter
+     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+         GetVersionEx(&v);
+         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+      }) ? "cmd.exe" : "command.com").
+   Instead it simply concatenates the arguments, separated by ' ', and calls
+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
+   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+   special way:
+   - Space and tab are interpreted as delimiters. They are not treated as
+     delimiters if they are surrounded by double quotes: "...".
+   - Unescaped double quotes are removed from the input. Their only effect is
+     that within double quotes, space and tab are treated like normal
+     characters.
+   - Backslashes not followed by double quotes are not special.
+   - But 2*n+1 backslashes followed by a double quote become
+     n backslashes followed by a double quote (n >= 0):
+       \" -> "
+       \\\" -> \"
+       \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+  size_t argc;
+  char **new_argv;
+  size_t i;
+
+  /* Count number of arguments.  */
+  for (argc = 0; argv[argc] != NULL; argc++)
+    ;
+
+  /* Allocate new argument vector.  */
+  new_argv = XMALLOC (char *, argc + 1);
+
+  /* Put quoted arguments into the new argument vector.  */
+  for (i = 0; i < argc; i++)
+    {
+      const char *string = argv[i];
+
+      if (string[0] == '\0')
+	new_argv[i] = xstrdup ("\"\"");
+      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+	{
+	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+	  size_t length;
+	  unsigned int backslashes;
+	  const char *s;
+	  char *quoted_string;
+	  char *p;
+
+	  length = 0;
+	  backslashes = 0;
+	  if (quote_around)
+	    length++;
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		length += backslashes + 1;
+	      length++;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    length += backslashes + 1;
+
+	  quoted_string = XMALLOC (char, length + 1);
+
+	  p = quoted_string;
+	  backslashes = 0;
+	  if (quote_around)
+	    *p++ = '"';
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		{
+		  unsigned int j;
+		  for (j = backslashes + 1; j > 0; j--)
+		    *p++ = '\\';
+		}
+	      *p++ = c;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    {
+	      unsigned int j;
+	      for (j = backslashes; j > 0; j--)
+		*p++ = '\\';
+	      *p++ = '"';
+	    }
+	  *p = '\0';
+
+	  new_argv[i] = quoted_string;
+	}
+      else
+	new_argv[i] = (char *) string;
+    }
+  new_argv[argc] = NULL;
+
+  return new_argv;
+}
+EOF
+		;;
+	    esac
+
+            cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+	    func_emit_wrapper yes |
+	      $SED -n -e '
+s/^$.\{79\}$$..*$/\1\
+\2/
+h
+s/$[\\"]$/\\\1/g
+s/$/\\n/
+s/$[^\n]*$.*/  fputs ("\1", f);/p
+g
+D'
+            cat <<"EOF"
+}
+EOF
+}
+# end: func_emit_cwrapperexe_src
+
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+    $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 ()
+{
+    $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
+      # 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 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.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args=$nonopt
+    base_compile="$nonopt $@"
+    compile_command=$nonopt
+    finalize_command=$nonopt
+
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
+    new_inherited_linker_flags=
+
+    avoid_version=no
+    bindir=
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    os2dllname=
+    non_pic_objects=
+    precious_files_regex=
+    prefer_static_libs=no
+    preload=false
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+    vinfo_number=no
+    weak_libs=
+    single_module=$wl-single_module
+    func_infer_tag $base_compile
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -shared)
+	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 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
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	-static)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=built
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
+	build_libtool_libs=no
+	build_old_libs=yes
+	break
+	;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test "$#" -gt 0; do
+      arg=$1
+      shift
+      func_quote_for_eval "$arg"
+      qarg=$func_quote_for_eval_unquoted_result
+      func_append libtool_args " $func_quote_for_eval_result"
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+	case $prev in
+	output)
+	  func_append compile_command " @OUTPUT@"
+	  func_append finalize_command " @OUTPUT@"
+	  ;;
+	esac
+
+	case $prev in
+	bindir)
+	  bindir=$arg
+	  prev=
+	  continue
+	  ;;
+	dlfiles|dlprefiles)
+	  $preload || {
+	    # Add the symbol object into the linking commands.
+	    func_append compile_command " @SYMFILE@"
+	    func_append finalize_command " @SYMFILE@"
+	    preload=:
+	  }
+	  case $arg in
+	  *.la | *.lo) ;;  # We handle these cases below.
+	  force)
+	    if test no = "$dlself"; then
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  self)
+	    if test dlprefiles = "$prev"; then
+	      dlself=yes
+	    elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
+	      dlself=yes
+	    else
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  *)
+	    if test dlfiles = "$prev"; then
+	      func_append dlfiles " $arg"
+	    else
+	      func_append dlprefiles " $arg"
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  esac
+	  ;;
+	expsyms)
+	  export_symbols=$arg
+	  test -f "$arg" \
+	    || func_fatal_error "symbol file '$arg' does not exist"
+	  prev=
+	  continue
+	  ;;
+	expsyms_regex)
+	  export_symbols_regex=$arg
+	  prev=
+	  continue
+	  ;;
+	framework)
+	  case $host in
+	    *-*-darwin*)
+	      case "$deplibs " in
+		*" $qarg.ltframework "*) ;;
+		*) func_append deplibs " $qarg.ltframework" # this is fixed later
+		   ;;
+	      esac
+	      ;;
+	  esac
+	  prev=
+	  continue
+	  ;;
+	inst_prefix)
+	  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
+	  ;;
+	objectlist)
+	  if test -f "$arg"; then
+	    save_arg=$arg
+	    moreargs=
+	    for fil in `cat "$save_arg"`
+	    do
+#	      func_append moreargs " $fil"
+	      arg=$fil
+	      # A libtool-controlled object.
+
+	      # Check to see that this really is a libtool object.
+	      if func_lalib_unsafe_p "$arg"; then
+		pic_object=
+		non_pic_object=
+
+		# Read the .lo file
+		func_source "$arg"
+
+		if test -z "$pic_object" ||
+		   test -z "$non_pic_object" ||
+		   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
+
+		if test none != "$pic_object"; then
+		  # Prepend the subdirectory the object is found in.
+		  pic_object=$xdir$pic_object
+
+		  if test dlfiles = "$prev"; then
+		    if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
+		      func_append dlfiles " $pic_object"
+		      prev=
+		      continue
+		    else
+		      # If libtool objects are unsupported, then we need to preload.
+		      prev=dlprefiles
+		    fi
+		  fi
+
+		  # CHECK ME:  I think I busted this.  -Ossama
+		  if test dlprefiles = "$prev"; then
+		    # Preload the old-style object.
+		    func_append dlprefiles " $pic_object"
+		    prev=
+		  fi
+
+		  # A PIC object.
+		  func_append libobjs " $pic_object"
+		  arg=$pic_object
+		fi
+
+		# Non-PIC object.
+		if test none != "$non_pic_object"; then
+		  # Prepend the subdirectory the object is found in.
+		  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 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
+		  func_append non_pic_objects " $non_pic_object"
+		fi
+	      else
+		# Only an error if not doing a dry-run.
+		if $opt_dry_run; then
+		  # Extract subdirectory from the argument.
+		  func_dirname "$arg" "/" ""
+		  xdir=$func_dirname_result
+
+		  func_lo2o "$arg"
+		  pic_object=$xdir$objdir/$func_lo2o_result
+		  non_pic_object=$xdir$func_lo2o_result
+		  func_append libobjs " $pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+	        else
+		  func_fatal_error "'$arg' is not a valid libtool object"
+		fi
+	      fi
+	    done
+	  else
+	    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
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release=-$arg
+	  prev=
+	  continue
+	  ;;
+	rpath | xrpath)
+	  # We need an absolute path.
+	  case $arg in
+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+	  *)
+	    func_fatal_error "only absolute run-paths are allowed"
+	    ;;
+	  esac
+	  if test rpath = "$prev"; then
+	    case "$rpath " in
+	    *" $arg "*) ;;
+	    *) func_append rpath " $arg" ;;
+	    esac
+	  else
+	    case "$xrpath " in
+	    *" $arg "*) ;;
+	    *) func_append xrpath " $arg" ;;
+	    esac
+	  fi
+	  prev=
+	  continue
+	  ;;
+	shrext)
+	  shrext_cmds=$arg
+	  prev=
+	  continue
+	  ;;
+	weak)
+	  func_append weak_libs " $arg"
+	  prev=
+	  continue
+	  ;;
+	xcclinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xcompiler)
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xlinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $wl$qarg"
+	  prev=
+	  func_append compile_command " $wl$qarg"
+	  func_append finalize_command " $wl$qarg"
+	  continue
+	  ;;
+	*)
+	  eval "$prev=\"\$arg\""
+	  prev=
+	  continue
+	  ;;
+	esac
+      fi # test -n "$prev"
+
+      prevarg=$arg
+
+      case $arg in
+      -all-static)
+	if test -n "$link_static_flag"; then
+	  # See comment for -static flag below, for more details.
+	  func_append compile_command " $link_static_flag"
+	  func_append finalize_command " $link_static_flag"
+	fi
+	continue
+	;;
+
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	func_fatal_error "'-allow-undefined' must not be used because it is the default"
+	;;
+
+      -avoid-version)
+	avoid_version=yes
+	continue
+	;;
+
+      -bindir)
+	prev=bindir
+	continue
+	;;
+
+      -dlopen)
+	prev=dlfiles
+	continue
+	;;
+
+      -dlpreopen)
+	prev=dlprefiles
+	continue
+	;;
+
+      -export-dynamic)
+	export_dynamic=yes
+	continue
+	;;
+
+      -export-symbols | -export-symbols-regex)
+	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-export-symbols = "X$arg"; then
+	  prev=expsyms
+	else
+	  prev=expsyms_regex
+	fi
+	continue
+	;;
+
+      -framework)
+	prev=framework
+	continue
+	;;
+
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+	case $with_gcc/$host in
+	no/*-*-irix* | /*-*-irix*)
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  ;;
+	esac
+	continue
+	;;
+
+      -L*)
+	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'"
+	  else
+	    func_fatal_error "need path for '-L' option"
+	  fi
+	fi
+	func_resolve_sysroot "$func_stripname_result"
+	dir=$func_resolve_sysroot_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  absdir=`cd "$dir" && pwd`
+	  test -z "$absdir" && \
+	    func_fatal_error "cannot determine absolute directory name of '$dir'"
+	  dir=$absdir
+	  ;;
+	esac
+	case "$deplibs " in
+	*" -L$dir "* | *" $arg "*)
+	  # Will only happen for absolute or sysroot arguments
+	  ;;
+	*)
+	  # Preserve sysroot, but never include relative directories
+	  case $dir in
+	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+	    *) func_append deplibs " -L$dir" ;;
+	  esac
+	  func_append lib_search_path " $dir"
+	  ;;
+	esac
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$dir:"*) ;;
+	  ::) dllsearchpath=$dir;;
+	  *) func_append dllsearchpath ":$dir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+	continue
+	;;
+
+      -l*)
+	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)
+	    continue
+	    ;;
+	  *-*-os2*)
+	    # These systems don't actually have a C library (as such)
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C and math libraries are in the System framework
+	    func_append deplibs " System.ltframework"
+	    continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  esac
+	elif test X-lc_r = "X$arg"; then
+	 case $host in
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
+	   # Do not include libc_r directly, use -pthread flag.
+	   continue
+	   ;;
+	 esac
+	fi
+	func_append deplibs " $arg"
+	continue
+	;;
+
+      -mllvm)
+	prev=mllvm
+	continue
+	;;
+
+      -module)
+	module=yes
+	continue
+	;;
+
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      # Darwin uses the -arch flag to determine output architecture.
+      -model|-arch|-isysroot|--sysroot)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	prev=xcompiler
+	continue
+	;;
+
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	case "$new_inherited_linker_flags " in
+	    *" $arg "*) ;;
+	    * ) func_append new_inherited_linker_flags " $arg" ;;
+	esac
+	continue
+	;;
+
+      -multi_module)
+	single_module=$wl-multi_module
+	continue
+	;;
+
+      -no-fast-install)
+	fast_install=no
+	continue
+	;;
+
+      -no-install)
+	case $host in
+	*-*-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"
+	  fast_install=no
+	  ;;
+	*) no_install=yes ;;
+	esac
+	continue
+	;;
+
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
+
+      -objectlist)
+	prev=objectlist
+	continue
+	;;
+
+      -os2dllname)
+	prev=os2dllname
+	continue
+	;;
+
+      -o) prev=output ;;
+
+      -precious-files-regex)
+	prev=precious_regex
+	continue
+	;;
+
+      -release)
+	prev=release
+	continue
+	;;
+
+      -rpath)
+	prev=rpath
+	continue
+	;;
+
+      -R)
+	prev=xrpath
+	continue
+	;;
+
+      -R*)
+	func_stripname '-R' '' "$arg"
+	dir=$func_stripname_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	=*)
+	  func_stripname '=' '' "$dir"
+	  dir=$lt_sysroot$func_stripname_result
+	  ;;
+	*)
+	  func_fatal_error "only absolute run-paths are allowed"
+	  ;;
+	esac
+	case "$xrpath " in
+	*" $dir "*) ;;
+	*) func_append xrpath " $dir" ;;
+	esac
+	continue
+	;;
+
+      -shared)
+	# The effects of -shared are defined in a previous loop.
+	continue
+	;;
+
+      -shrext)
+	prev=shrext
+	continue
+	;;
+
+      -static | -static-libtool-libs)
+	# The effects of -static are defined in a previous loop.
+	# We used to do the same as -all-static on platforms that
+	# didn't have a PIC flag, but the assumption that the effects
+	# would be equivalent was wrong.  It would break on at least
+	# Digital Unix and AIX.
+	continue
+	;;
+
+      -thread-safe)
+	thread_safe=yes
+	continue
+	;;
+
+      -version-info)
+	prev=vinfo
+	continue
+	;;
+
+      -version-number)
+	prev=vinfo
+	vinfo_number=yes
+	continue
+	;;
+
+      -weak)
+        prev=weak
+	continue
+	;;
+
+      -Wc,*)
+	func_stripname '-Wc,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs=$IFS; IFS=,
+	for flag in $args; do
+	  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
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Wl,*)
+	func_stripname '-Wl,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs=$IFS; IFS=,
+	for flag in $args; do
+	  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
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Xcompiler)
+	prev=xcompiler
+	continue
+	;;
+
+      -Xlinker)
+	prev=xlinker
+	continue
+	;;
+
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
+
+      # -msg_* for osf cc
+      -msg_*)
+	func_quote_for_eval "$arg"
+	arg=$func_quote_for_eval_result
+	;;
+
+      # Flags to be passed through unchanged, with rationale:
+      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
+      # -r[0-9][0-9]*        specify processor for the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+      # +DA*, +DD*           enable 64-bit mode for the HP compiler
+      # -q*                  compiler args for the IBM compiler
+      # -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*, -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
+      # -fuse-ld=*           Linker select flags for GCC
+      -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*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+      -specs=*|-fsanitize=*|-fuse-ld=*)
+        func_quote_for_eval "$arg"
+	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
+	;;
+
+      *.$objext)
+	# A standard object.
+	func_append objs " $arg"
+	;;
+
+      *.lo)
+	# A libtool-controlled object.
+
+	# Check to see that this really is a libtool object.
+	if func_lalib_unsafe_p "$arg"; then
+	  pic_object=
+	  non_pic_object=
+
+	  # Read the .lo file
+	  func_source "$arg"
+
+	  if test -z "$pic_object" ||
+	     test -z "$non_pic_object" ||
+	     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
+
+	  test none = "$pic_object" || {
+	    # Prepend the subdirectory the object is found in.
+	    pic_object=$xdir$pic_object
+
+	    if test dlfiles = "$prev"; then
+	      if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
+		func_append dlfiles " $pic_object"
+		prev=
+		continue
+	      else
+		# If libtool objects are unsupported, then we need to preload.
+		prev=dlprefiles
+	      fi
+	    fi
+
+	    # CHECK ME:  I think I busted this.  -Ossama
+	    if test dlprefiles = "$prev"; then
+	      # Preload the old-style object.
+	      func_append dlprefiles " $pic_object"
+	      prev=
+	    fi
+
+	    # A PIC object.
+	    func_append libobjs " $pic_object"
+	    arg=$pic_object
+	  }
+
+	  # Non-PIC object.
+	  if test none != "$non_pic_object"; then
+	    # Prepend the subdirectory the object is found in.
+	    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 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
+	    func_append non_pic_objects " $non_pic_object"
+	  fi
+	else
+	  # Only an error if not doing a dry-run.
+	  if $opt_dry_run; then
+	    # Extract subdirectory from the argument.
+	    func_dirname "$arg" "/" ""
+	    xdir=$func_dirname_result
+
+	    func_lo2o "$arg"
+	    pic_object=$xdir$objdir/$func_lo2o_result
+	    non_pic_object=$xdir$func_lo2o_result
+	    func_append libobjs " $pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  else
+	    func_fatal_error "'$arg' is not a valid libtool object"
+	  fi
+	fi
+	;;
+
+      *.$libext)
+	# An archive.
+	func_append deplibs " $arg"
+	func_append old_deplibs " $arg"
+	continue
+	;;
+
+      *.la)
+	# A libtool-controlled library.
+
+	func_resolve_sysroot "$arg"
+	if test dlfiles = "$prev"; then
+	  # This library was specified with -dlopen.
+	  func_append dlfiles " $func_resolve_sysroot_result"
+	  prev=
+	elif test dlprefiles = "$prev"; then
+	  # The library was specified with -dlpreopen.
+	  func_append dlprefiles " $func_resolve_sysroot_result"
+	  prev=
+	else
+	  func_append deplibs " $func_resolve_sysroot_result"
+	fi
+	continue
+	;;
+
+      # Some other compiler argument.
+      *)
+	# 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
+	;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+      fi
+    done # argument parsing loop
+
+    test -n "$prev" && \
+      func_fatal_help "the '$prevarg' option requires an argument"
+
+    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"
+    fi
+
+    oldlibs=
+    # calculate the name of the file, without its directory
+    func_basename "$output"
+    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\'\`
+    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
+    func_to_tool_file "$output_objdir/"
+    tool_output_objdir=$func_to_tool_file_result
+    # Create the object directory.
+    func_mkdir_p "$output_objdir"
+
+    # Determine the type of output
+    case $output in
+    "")
+      func_fatal_help "you must specify an output file"
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    specialdeplibs=
+
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if $opt_preserve_dup_deps; then
+	case "$libs " in
+	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	esac
+      fi
+      func_append libs " $deplib"
+    done
+
+    if test lib = "$linkmode"; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if $opt_duplicate_compiler_generated_deps; then
+	for pre_post_dep in $predeps $postdeps; do
+	  case "$pre_post_deps " in
+	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
+	  esac
+	  func_append pre_post_deps " $pre_post_dep"
+	done
+      fi
+      pre_post_deps=
+    fi
+
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+
+    case $linkmode in
+    lib)
+	passes="conv dlpreopen link"
+	for file in $dlfiles $dlprefiles; do
+	  case $file in
+	  *.la) ;;
+	  *)
+	    func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
+	    ;;
+	  esac
+	done
+	;;
+    prog)
+	compile_deplibs=
+	finalize_deplibs=
+	alldeplibs=false
+	newdlfiles=
+	newdlprefiles=
+	passes="conv scan dlopen dlpreopen link"
+	;;
+    *)  passes="conv"
+	;;
+    esac
+
+    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 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
+      fi
+
+      if test lib,link = "$linkmode,$pass" ||
+	 test prog,scan = "$linkmode,$pass"; then
+	libs=$deplibs
+	deplibs=
+      fi
+      if test prog = "$linkmode"; then
+	case $pass in
+	dlopen) libs=$dlfiles ;;
+	dlpreopen) libs=$dlprefiles ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	esac
+      fi
+      if test lib,dlpreopen = "$linkmode,$pass"; then
+	# Collect and forward deplibs of preopened libtool libs
+	for lib in $dlprefiles; do
+	  # Ignore non-libtool-libs
+	  dependency_libs=
+	  func_resolve_sysroot "$lib"
+	  case $lib in
+	  *.la)	func_source "$func_resolve_sysroot_result" ;;
+	  esac
+
+	  # Collect preopened libtool deplibs, except any this library
+	  # has declared as weak libs
+	  for deplib in $dependency_libs; do
+	    func_basename "$deplib"
+            deplib_base=$func_basename_result
+	    case " $weak_libs " in
+	    *" $deplib_base "*) ;;
+	    *) func_append deplibs " $deplib" ;;
+	    esac
+	  done
+	done
+	libs=$dlprefiles
+      fi
+      if test dlopen = "$pass"; then
+	# Collect dlpreopened libraries
+	save_deplibs=$deplibs
+	deplibs=
+      fi
+
+      for deplib in $libs; do
+	lib=
+	found=false
+	case $deplib in
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	  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 lib = "$linkmode"; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-l*)
+	  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 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"
+	  fi
+	  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
+	      if test -f "$lib"; then
+		if test .la = "$search_ext"; then
+		  found=:
+		else
+		  found=false
+		fi
+		break 2
+	      fi
+	    done
+	  done
+	  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 yes = "$allow_libtool_libs_with_static_runtimes"; then
+	      case " $predeps $postdeps " in
+	      *" $deplib "*)
+		if func_lalib_p "$lib"; then
+		  library_names=
+		  old_library=
+		  func_source "$lib"
+		  for l in $old_library $library_names; do
+		    ll=$l
+		  done
+		  if test "X$ll" = "X$old_library"; then # only static version available
+		    found=false
+		    func_dirname "$lib" "" "."
+		    ladir=$func_dirname_result
+		    lib=$ladir/$old_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
+		fi
+		;;
+	      *) ;;
+	      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 prog,link = "$linkmode,$pass"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    deplibs="$deplib $deplibs"
+	    if test lib = "$linkmode"; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-L*)
+	  case $linkmode in
+	  lib)
+	    deplibs="$deplib $deplibs"
+	    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 conv = "$pass"; then
+	      deplibs="$deplib $deplibs"
+	      continue
+	    fi
+	    if test scan = "$pass"; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    ;;
+	  *)
+	    func_warning "'-L' is ignored for archives/objects"
+	    ;;
+	  esac # linkmode
+	  continue
+	  ;; # -L
+	-R*)
+	  if test link = "$pass"; then
+	    func_stripname '-R' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    dir=$func_resolve_sysroot_result
+	    # Make sure the xrpath contains only unique directories.
+	    case "$xrpath " in
+	    *" $dir "*) ;;
+	    *) func_append xrpath " $dir" ;;
+	    esac
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue
+	  ;;
+	*.la)
+	  func_resolve_sysroot "$deplib"
+	  lib=$func_resolve_sysroot_result
+	  ;;
+	*.$libext)
+	  if test conv = "$pass"; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  case $linkmode in
+	  lib)
+	    # Linking convenience modules into shared libraries is allowed,
+	    # but linking other static libraries is non-portable.
+	    case " $dlpreconveniencelibs " in
+	    *" $deplib "*) ;;
+	    *)
+	      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=:
+		  fi
+		;;
+		pass_all)
+		  valid_a_lib=:
+		;;
+	      esac
+	      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"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because the file extensions .$libext of this argument makes me believe"
+		echo "*** that it is just a static archive that I should not use here."
+	      fi
+	      ;;
+	    esac
+	    continue
+	    ;;
+	  prog)
+	    if test link != "$pass"; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    continue
+	    ;;
+	  esac # linkmode
+	  ;; # *.$libext
+	*.lo | *.$objext)
+	  if test conv = "$pass"; then
+	    deplibs="$deplib $deplibs"
+	  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"
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      func_append newdlfiles " $deplib"
+	    fi
+	  fi
+	  continue
+	  ;;
+	%DEPLIBS%)
+	  alldeplibs=:
+	  continue
+	  ;;
+	esac # case $deplib
+
+	$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_dirname "$lib" "" "."
+	ladir=$func_dirname_result
+
+	dlname=
+	dlopen=
+	dlpreopen=
+	libdir=
+	library_names=
+	old_library=
+	inherited_linker_flags=
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variables installed, or shouldnotlink
+	installed=yes
+	shouldnotlink=no
+	avoidtemprpath=
+
+
+	# Read the .la file
+	func_source "$lib"
+
+	# Convert "-framework foo" to "foo.ltframework"
+	if test -n "$inherited_linker_flags"; then
+	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework $[^ $]*$/\1.ltframework/g'`
+	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+	    case " $new_inherited_linker_flags " in
+	      *" $tmp_inherited_linker_flag "*) ;;
+	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
+	    esac
+	  done
+	fi
+	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
+	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 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'"
+	    fi
+	    # It is a libtool convenience library, so add in its objects.
+	    func_append convenience " $ladir/$objdir/$old_library"
+	    func_append old_convenience " $ladir/$objdir/$old_library"
+	  elif test prog != "$linkmode" && test lib != "$linkmode"; then
+	    func_fatal_error "'$lib' is not a convenience library"
+	  fi
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    deplibs="$deplib $deplibs"
+	    if $opt_preserve_dup_deps; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done
+	  continue
+	fi # $pass = conv
+
+
+	# Get the name of the library we link against.
+	linklib=
+	if test -n "$old_library" &&
+	   { 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
+	  done
+	fi
+	if test -z "$linklib"; then
+	  func_fatal_error "cannot find name of link library for '$lib'"
+	fi
+
+	# This library was specified with -dlopen.
+	if test dlopen = "$pass"; then
+	  test -z "$libdir" \
+	    && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
+	  if test -z "$dlname" ||
+	     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
+	    # bomb out in the load deplibs phase.
+	    func_append dlprefiles " $lib $dependency_libs"
+	  else
+	    func_append newdlfiles " $lib"
+	  fi
+	  continue
+	fi # $pass = dlopen
+
+	# We need an absolute path.
+	case $ladir in
+	[\\/]* | [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 "passing it literally to the linker, although it might fail"
+	    abs_ladir=$ladir
+	  fi
+	  ;;
+	esac
+	func_basename "$lib"
+	laname=$func_basename_result
+
+	# Find the relevant object directory and library name.
+	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
+	  else
+	    dir=$lt_sysroot$libdir
+	    absdir=$lt_sysroot$libdir
+	  fi
+	  test yes = "$hardcode_automatic" && avoidtemprpath=yes
+	else
+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    dir=$ladir
+	    absdir=$abs_ladir
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  else
+	    dir=$ladir/$objdir
+	    absdir=$abs_ladir/$objdir
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  fi
+	fi # $installed = yes
+	func_stripname 'lib' '.la' "$laname"
+	name=$func_stripname_result
+
+	# This library was specified with -dlpreopen.
+	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
+	    # special handling for platforms with PE-DLLs.
+	    *cygwin* | *mingw* | *cegcc* )
+	      # Linker will automatically link against shared library if both
+	      # static and shared are present.  Therefore, ensure we extract
+	      # symbols from the import library if a shared library is present
+	      # (otherwise, the dlopen module name will be incorrect).  We do
+	      # this by putting the import library name into $newdlprefiles.
+	      # We recover the dlopen module name by 'saving' the la file
+	      # name in a special purpose variable, and (later) extracting the
+	      # dlname from the la file.
+	      if test -n "$dlname"; then
+	        func_tr_sh "$dir/$linklib"
+	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+	        func_append newdlprefiles " $dir/$linklib"
+	      else
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      fi
+	    ;;
+	    * )
+	      # Prefer using a static library (so that no silly _DYNAMIC symbols
+	      # are required to link).
+	      if test -n "$old_library"; then
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      # Otherwise, use the dlname, so that lt_dlopen finds it.
+	      elif test -n "$dlname"; then
+	        func_append newdlprefiles " $dir/$dlname"
+	      else
+	        func_append newdlprefiles " $dir/$linklib"
+	      fi
+	    ;;
+	  esac
+	fi # $pass = dlpreopen
+
+	if test -z "$libdir"; then
+	  # Link the convenience library
+	  if test lib = "$linkmode"; then
+	    deplibs="$dir/$old_library $deplibs"
+	  elif test prog,link = "$linkmode,$pass"; then
+	    compile_deplibs="$dir/$old_library $compile_deplibs"
+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+	  else
+	    deplibs="$lib $deplibs" # used for prog,scan pass
+	  fi
+	  continue
+	fi
+
+
+	if test prog = "$linkmode" && test link != "$pass"; then
+	  func_append newlib_search_path " $ladir"
+	  deplibs="$lib $deplibs"
+
+	  linkalldeplibs=false
+	  if test no != "$link_all_deplibs" || test -z "$library_names" ||
+	     test no = "$build_libtool_libs"; then
+	    linkalldeplibs=:
+	  fi
+
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    case $deplib in
+	    -L*) func_stripname '-L' '' "$deplib"
+	         func_resolve_sysroot "$func_stripname_result"
+	         func_append newlib_search_path " $func_resolve_sysroot_result"
+		 ;;
+	    esac
+	    # Need to link against all dependency_libs?
+	    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
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done # for deplib
+	  continue
+	fi # $linkmode = prog...
+
+	if test prog,link = "$linkmode,$pass"; then
+	  if test -n "$library_names" &&
+	     { { 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
+	      # Make sure the rpath contains only unique directories.
+	      case $temp_rpath: in
+	      *"$absdir:"*) ;;
+	      *) func_append temp_rpath "$absdir:" ;;
+	      esac
+	    fi
+
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi # $linkmode,$pass = prog,link...
+
+	  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
+	  fi
+	fi
+
+	link_static=no # Whether the deplib will be linked statically
+	use_static_libs=$prefer_static_libs
+	if test built = "$use_static_libs" && test yes = "$installed"; then
+	  use_static_libs=no
+	fi
+	if test -n "$library_names" &&
+	   { test no = "$use_static_libs" || test -z "$old_library"; }; then
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc* | *os2*)
+	      # No point in relinking DLLs because paths are not encoded
+	      func_append notinst_deplibs " $lib"
+	      need_relink=no
+	    ;;
+	  *)
+	    if test no = "$installed"; then
+	      func_append notinst_deplibs " $lib"
+	      need_relink=yes
+	    fi
+	    ;;
+	  esac
+	  # This is a shared library
+
+	  # Warn about portability, can't link against -module's on some
+	  # systems (darwin).  Don't bleat about dlopened modules though!
+	  dlopenmodule=
+	  for dlpremoduletest in $dlprefiles; do
+	    if test "X$dlpremoduletest" = "X$lib"; then
+	      dlopenmodule=$dlpremoduletest
+	      break
+	    fi
+	  done
+	  if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
+	    echo
+	    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 lib = "$linkmode" &&
+	     test yes = "$hardcode_into_libs"; then
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi
+
+	  if test -n "$old_archive_from_expsyms_cmds"; then
+	    # figure out the soname
+	    set dummy $library_names
+	    shift
+	    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
+	    elif test -n "$soname_spec"; then
+	      # bleh windows
+	      case $host in
+	      *cygwin* | mingw* | *cegcc* | *os2*)
+	        func_arith $current - $age
+		major=$func_arith_result
+		versuffix=-$major
+		;;
+	      esac
+	      eval soname=\"$soname_spec\"
+	    else
+	      soname=$realname
+	    fi
+
+	    # Make a new name for the extract_expsyms_cmds to use
+	    soroot=$soname
+	    func_basename "$soroot"
+	    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_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_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
+	    fi
+	    # make sure the library variables are pointing to the new library
+	    dir=$output_objdir
+	    linklib=$newlib
+	  fi # test -n "$old_archive_from_expsyms_cmds"
+
+	  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 no = "$hardcode_direct"; then
+		add=$dir/$linklib
+		case $host in
+		  *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
+		  *-*-sysv4*uw2*) add_dir=-L$dir ;;
+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+		    *-*-unixware7*) add_dir=-L$dir ;;
+		  *-*-darwin* )
+		    # if the lib is a (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
+		      if test "X$dlopenmodule" != "X$lib"; then
+			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
+			if test -z "$old_library"; then
+			  echo
+			  echo "*** And there doesn't seem to be a static archive available"
+			  echo "*** The link will probably fail, sorry"
+			else
+			  add=$dir/$old_library
+			fi
+		      elif test -n "$old_library"; then
+			add=$dir/$old_library
+		      fi
+		    fi
+		esac
+	      elif test no = "$hardcode_minus_L"; then
+		case $host in
+		*-*-sunos*) add_shlibpath=$dir ;;
+		esac
+		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 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
+		    [\\/]*)
+		      func_append add_dir " -L$inst_prefix_dir$libdir"
+		      ;;
+		  esac
+		fi
+		add=-l$name
+	      elif test yes = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    *) lib_linked=no ;;
+	    esac
+
+	    if test yes != "$lib_linked"; then
+	      func_fatal_configuration "unsupported hardcode properties"
+	    fi
+
+	    if test -n "$add_shlibpath"; then
+	      case :$compile_shlibpath: in
+	      *":$add_shlibpath:"*) ;;
+	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
+	      esac
+	    fi
+	    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 yes != "$hardcode_direct" &&
+		 test yes != "$hardcode_minus_L" &&
+		 test yes = "$hardcode_shlibpath_var"; then
+		case :$finalize_shlibpath: in
+		*":$libdir:"*) ;;
+		*) func_append finalize_shlibpath "$libdir:" ;;
+		esac
+	      fi
+	    fi
+	  fi
+
+	  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 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 yes = "$hardcode_automatic"; then
+	      if test -n "$inst_prefix_dir" &&
+		 test -f "$inst_prefix_dir$libdir/$linklib"; then
+		add=$inst_prefix_dir$libdir/$linklib
+	      else
+		add=$libdir/$linklib
+	      fi
+	    else
+	      # We cannot seem to hardcode it, guess we'll fake it.
+	      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
+		  [\\/]*)
+		    func_append add_dir " -L$inst_prefix_dir$libdir"
+		    ;;
+		esac
+	      fi
+	      add=-l$name
+	    fi
+
+	    if test prog = "$linkmode"; then
+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	    fi
+	  fi
+	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 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 yes = "$build_libtool_libs"; then
+	  # Not a shared library
+	  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 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 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 "*** not find such a program.  So, this module is probably useless."
+		echo "*** 'nm' from GNU binutils and a full rebuild may help."
+	      fi
+	      if test no = "$build_old_libs"; then
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  else
+	    deplibs="$dir/$old_library $deplibs"
+	    link_static=yes
+	  fi
+	fi # link shared/static library?
+
+	if test lib = "$linkmode"; then
+	  if test -n "$dependency_libs" &&
+	     { 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
+	      case $libdir in
+	      -R*) func_stripname '-R' '' "$libdir"
+	           temp_xrpath=$func_stripname_result
+		   case " $xrpath " in
+		   *" $temp_xrpath "*) ;;
+		   *) func_append xrpath " $temp_xrpath";;
+		   esac;;
+	      *) func_append temp_deplibs " $libdir";;
+	      esac
+	    done
+	    dependency_libs=$temp_deplibs
+	  fi
+
+	  func_append newlib_search_path " $absdir"
+	  # Link against this library
+	  test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  # ... and its dependency_libs
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    newdependency_libs="$deplib $newdependency_libs"
+	    case $deplib in
+              -L*) func_stripname '-L' '' "$deplib"
+                   func_resolve_sysroot "$func_stripname_result";;
+              *) func_resolve_sysroot "$deplib" ;;
+            esac
+	    if $opt_preserve_dup_deps; then
+	      case "$tmp_libs " in
+	      *" $func_resolve_sysroot_result "*)
+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $func_resolve_sysroot_result"
+	  done
+
+	  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 ;;
+	      *.la)
+	        func_resolve_sysroot "$deplib"
+	        deplib=$func_resolve_sysroot_result
+	        func_dirname "$deplib" "" "."
+		dir=$func_dirname_result
+		# We need an absolute path.
+		case $dir in
+		[\\/]* | [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
+		  fi
+		  ;;
+		esac
+		if $GREP "^installed=no" $deplib > /dev/null; then
+		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
+		      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 -z "$darwin_install_name"; then
+                          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"
+		      path=
+		    fi
+		  fi
+		  ;;
+		*)
+		  path=-L$absdir/$objdir
+		  ;;
+		esac
+		else
+		  eval libdir=`$SED -n -e 's/^libdir=$.*$$/\1/p' $deplib`
+		  test -z "$libdir" && \
+		    func_fatal_error "'$deplib' is not a valid libtool archive"
+		  test "$absdir" != "$libdir" && \
+		    func_warning "'$deplib' seems to be moved"
+
+		  path=-L$absdir
+		fi
+		;;
+	      esac
+	      case " $deplibs " in
+	      *" $path "*) ;;
+	      *) deplibs="$path $deplibs" ;;
+	      esac
+	    done
+	  fi # link_all_deplibs != no
+	fi # linkmode = lib
+      done # for deplib in $libs
+      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 dlpreopen = "$pass"; then
+	# Link the dlpreopened libraries before other libraries
+	for deplib in $save_deplibs; do
+	  deplibs="$deplib $deplibs"
+	done
+      fi
+      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
+	    case "$lib_search_path " in
+	    *" $dir "*) ;;
+	    *) func_append lib_search_path " $dir" ;;
+	    esac
+	  done
+	  newlib_search_path=
+	}
+
+	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
+	  eval tmp_libs=\"\$$var\"
+	  new_libs=
+	  for deplib in $tmp_libs; do
+	    # FIXME: Pedantically, this is the right thing to do, so
+	    #        that some nasty dependency loop isn't accidentally
+	    #        broken:
+	    #new_libs="$deplib $new_libs"
+	    # Pragmatically, this seems to cause very few problems in
+	    # practice:
+	    case $deplib in
+	    -L*) new_libs="$deplib $new_libs" ;;
+	    -R*) ;;
+	    *)
+	      # And here is the reason: when a library appears more
+	      # than once as an explicit dependence of a library, or
+	      # is implicitly linked in more than once by the
+	      # compiler, it is considered special, and multiple
+	      # occurrences thereof are not removed.  Compare this
+	      # with having the same library being listed as a
+	      # dependency of multiple other libraries: in this case,
+	      # we know (pedantically, we assume) the library does not
+	      # need to be listed more than once, so we keep only the
+	      # last copy.  This is not always right, but it is rare
+	      # enough that we require users that really mean to play
+	      # such unportable linking tricks to link the library
+	      # using -Wl,-lname, so that libtool does not consider it
+	      # for duplicate removal.
+	      case " $specialdeplibs " in
+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+	      *)
+		case " $new_libs " in
+		*" $deplib "*) ;;
+		*) new_libs="$deplib $new_libs" ;;
+		esac
+		;;
+	      esac
+	      ;;
+	    esac
+	  done
+	  tmp_libs=
+	  for deplib in $new_libs; do
+	    case $deplib in
+	    -L*)
+	      case " $tmp_libs " in
+	      *" $deplib "*) ;;
+	      *) func_append tmp_libs " $deplib" ;;
+	      esac
+	      ;;
+	    *) func_append tmp_libs " $deplib" ;;
+	    esac
+	  done
+	  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
+	case " $predeps $postdeps $compiler_lib_search_path " in
+	*" $i "*)
+	  i=
+	  ;;
+	esac
+	if test -n "$i"; then
+	  func_append tmp_libs " $i"
+	fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test prog = "$linkmode"; then
+      dlfiles=$newdlfiles
+    fi
+    if test prog = "$linkmode" || test lib = "$linkmode"; then
+      dlprefiles=$newdlprefiles
+    fi
+
+    case $linkmode in
+    oldlib)
+      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" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "'-rpath' is ignored for archives"
+
+      test -n "$xrpath" && \
+	func_warning "'-R' is ignored for archives"
+
+      test -n "$vinfo" && \
+	func_warning "'-version-info/-version-number' is ignored for archives"
+
+      test -n "$release" && \
+	func_warning "'-release' is ignored for archives"
+
+      test -n "$export_symbols$export_symbols_regex" && \
+	func_warning "'-export-symbols' is ignored for archives"
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs=$output
+      func_append objs "$old_deplibs"
+      ;;
+
+    lib)
+      # Make sure we only generate libraries of the form 'libNAME.la'.
+      case $outputname in
+      lib*)
+	func_stripname 'lib' '.la' "$outputname"
+	name=$func_stripname_result
+	eval shared_ext=\"$shrext_cmds\"
+	eval libname=\"$libname_spec\"
+	;;
+      *)
+	test no = "$module" \
+	  && func_fatal_help "libtool library '$output' must begin with 'lib'"
+
+	if test no != "$need_lib_prefix"; then
+	  # Add the "lib" prefix for modules if required
+	  func_stripname '' '.la' "$outputname"
+	  name=$func_stripname_result
+	  eval shared_ext=\"$shrext_cmds\"
+	  eval libname=\"$libname_spec\"
+	else
+	  func_stripname '' '.la' "$outputname"
+	  libname=$func_stripname_result
+	fi
+	;;
+      esac
+
+      if test -n "$objs"; then
+	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"
+	  $ECHO "*** objects $objs is not portable!"
+	  func_append libobjs " $objs"
+	fi
+      fi
+
+      test no = "$dlself" \
+	|| func_warning "'-dlopen self' is ignored for libtool libraries"
+
+      set dummy $rpath
+      shift
+      test 1 -lt "$#" \
+	&& func_warning "ignoring multiple '-rpath's for a libtool library"
+
+      install_libdir=$1
+
+      oldlibs=
+      if test -z "$rpath"; then
+	if test yes = "$build_libtool_libs"; then
+	  # Building a libtool convenience library.
+	  # Some compilers have problems with a '.al' extension so
+	  # convenience libraries should have the same extension an
+	  # archive normally would.
+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	  build_libtool_libs=convenience
+	  build_old_libs=yes
+	fi
+
+	test -n "$vinfo" && \
+	  func_warning "'-version-info/-version-number' is ignored for convenience libraries"
+
+	test -n "$release" && \
+	  func_warning "'-release' is ignored for convenience libraries"
+      else
+
+	# Parse the version information argument.
+	save_ifs=$IFS; IFS=:
+	set dummy $vinfo 0 0 0
+	shift
+	IFS=$save_ifs
+
+	test -n "$7" && \
+	  func_fatal_help "too many parameters to '-version-info'"
+
+	# convert absolute version numbers to libtool ages
+	# this retains compatibility with .la files and attempts
+	# to make the code below a bit more comprehensible
+
+	case $vinfo_number in
+	yes)
+	  number_major=$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
+	  # that has an extra 1 added just for fun
+	  #
+	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
+	  darwin|freebsd-elf|linux|osf|windows|none)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age=$number_minor
+	    revision=$number_revision
+	    ;;
+	  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
+	    lt_irix_increment=no
+	    ;;
+	  esac
+	  ;;
+	no)
+	  current=$1
+	  revision=$2
+	  age=$3
+	  ;;
+	esac
+
+	# Check that each of the things are valid numbers.
+	case $current in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[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"
+	  ;;
+	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"
+	  ;;
+	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"
+	  ;;
+	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"
+	fi
+
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case $version_type in
+	none) ;;
+
+	darwin)
+	  # Like Linux, but with the current version available in
+	  # verstring for coding it into the library header
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  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"
+	  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
+	  ;;
+
+	freebsd-elf)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
+	  ;;
+
+	irix | nonstopux)
+	  if test no = "$lt_irix_increment"; then
+	    func_arith $current - $age
+	  else
+	    func_arith $current - $age + 1
+	  fi
+	  major=$func_arith_result
+
+	  case $version_type in
+	    nonstopux) verstring_prefix=nonstopux ;;
+	    *)         verstring_prefix=sgi ;;
+	  esac
+	  verstring=$verstring_prefix$major.$revision
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$revision
+	  while test 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
+	  done
+
+	  # Before this point, $major must not contain '.'.
+	  major=.$major
+	  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
+	  ;;
+
+	osf)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=.$current.$age.$revision
+	  verstring=$current.$age.$revision
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  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
+	  done
+
+	  # Make executables depend on our current version.
+	  func_append verstring ":$current.0"
+	  ;;
+
+	qnx)
+	  major=.$current
+	  versuffix=.$current
+	  ;;
+
+	sco)
+	  major=.$current
+	  versuffix=.$current
+	  ;;
+
+	sunos)
+	  major=.$current
+	  versuffix=.$current.$revision
+	  ;;
+
+	windows)
+	  # Use '-' rather than '.', since we only want one
+	  # extension on DOS 8.3 file systems.
+	  func_arith $current - $age
+	  major=$func_arith_result
+	  versuffix=-$major
+	  ;;
+
+	*)
+	  func_fatal_configuration "unknown library version type '$version_type'"
+	  ;;
+	esac
+
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring=0.0
+	    ;;
+	  esac
+	  if test no = "$need_version"; then
+	    versuffix=
+	  else
+	    versuffix=.0.0
+	  fi
+	fi
+
+	# Remove version info from name if versioning should be avoided
+	if test yes,no = "$avoid_version,$need_version"; then
+	  major=
+	  versuffix=
+	  verstring=
+	fi
+
+	# Check to see if the archive will have undefined symbols.
+	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
+	fi
+
+      fi
+
+      func_generate_dlsyms "$libname" "$libname" :
+      func_append libobjs " $symfileobj"
+      test " " = "$libobjs" && libobjs=
+
+      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=
+	tempremovelist=`$ECHO "$output_objdir/*"`
+	for p in $tempremovelist; do
+	  case $p in
+	    *.$objext | *.gcno)
+	       ;;
+	    $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
+		 fi
+	       fi
+	       func_append removelist " $p"
+	       ;;
+	    *) ;;
+	  esac
+	done
+	test -n "$removelist" && \
+	  func_show_eval "${RM}r \$removelist"
+      fi
+
+      # Now set the variables for building old libraries.
+      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`
+      fi
+
+      # Eliminate all temporary directories.
+      #for path in $notinst_path; do
+      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
+      #done
+
+      if test -n "$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	temp_xrpath=
+	for libdir in $xrpath; do
+	  func_replace_sysroot "$libdir"
+	  func_append temp_xrpath " -R$func_replace_sysroot_result"
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+	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
+      dlfiles=
+      for lib in $old_dlfiles; do
+	case " $dlprefiles $dlfiles " in
+	*" $lib "*) ;;
+	*) func_append dlfiles " $lib" ;;
+	esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles=$dlprefiles
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+	case "$dlprefiles " in
+	*" $lib "*) ;;
+	*) func_append dlprefiles " $lib" ;;
+	esac
+      done
+
+      if test yes = "$build_libtool_libs"; then
+	if test -n "$rpath"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # these systems don't actually have a c library (as such)!
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C library is in the System framework
+	    func_append deplibs " System.ltframework"
+	    ;;
+	  *-*-netbsd*)
+	    # Don't link with libc until the a.out ld.so is fixed.
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    ;;
+	  *)
+	    # Add libc to deplibs on all other systems if necessary.
+	    if test yes = "$build_libtool_need_lc"; then
+	      func_append deplibs " -lc"
+	    fi
+	    ;;
+	  esac
+	fi
+
+	# Transform deplibs into only deplibs that can be linked in shared.
+	name_save=$name
+	libname_save=$libname
+	release_save=$release
+	versuffix_save=$versuffix
+	major_save=$major
+	# 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=
+	newdeplibs=
+	droppeddeps=no
+	case $deplibs_check_method in
+	pass_all)
+	  # Don't check for shared/static.  Everything works.
+	  # This might be a little naive.  We might want to check
+	  # whether the library exists or not.  But this is on
+	  # osf3 & osf4 and I'm not really sure... Just
+	  # implementing what was already the behavior.
+	  newdeplibs=$deplibs
+	  ;;
+	test_compile)
+	  # This code stresses the "libraries are programs" paradigm to its
+	  # limits. Maybe even breaks it.  We compile a program, linking it
+	  # against the deplibs as a proxy for the library.  Then we can check
+	  # whether they linked in statically or dynamically with ldd.
+	  $opt_dry_run || $RM conftest.c
+	  cat > conftest.c <<EOF
+	  int main() { return 0; }
+EOF
+	  $opt_dry_run || $RM conftest
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	    ldd_output=`ldd conftest`
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		  case " $predeps $postdeps " in
+		  *" $i "*)
+		    func_append newdeplibs " $i"
+		    i=
+		    ;;
+		  esac
+		fi
+		if test -n "$i"; then
+		  libname=`eval "\\$ECHO \"$libname_spec\""`
+		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		  set dummy $deplib_matches; shift
+		  deplib_match=$1
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
+		    func_append newdeplibs " $i"
+		  else
+		    droppeddeps=yes
+		    echo
+		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		    echo "*** I have the capability to make that library automatically link in when"
+		    echo "*** you link to this library.  But I can only do this if you have a"
+		    echo "*** shared version of the library, which I believe you do not have"
+		    echo "*** because a test_compile did reveal that the linker did not use it for"
+		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		  fi
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  else
+	    # Error occurred in the first compile.  Let's try to salvage
+	    # the situation: Compile a separate program for each library.
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		$opt_dry_run || $RM conftest
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+		  ldd_output=`ldd conftest`
+		  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		    case " $predeps $postdeps " in
+		    *" $i "*)
+		      func_append newdeplibs " $i"
+		      i=
+		      ;;
+		    esac
+		  fi
+		  if test -n "$i"; then
+		    libname=`eval "\\$ECHO \"$libname_spec\""`
+		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		    set dummy $deplib_matches; shift
+		    deplib_match=$1
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
+		      func_append newdeplibs " $i"
+		    else
+		      droppeddeps=yes
+		      echo
+		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		      echo "*** I have the capability to make that library automatically link in when"
+		      echo "*** you link to this library.  But I can only do this if you have a"
+		      echo "*** shared version of the library, which you do not appear to have"
+		      echo "*** because a test_compile did reveal that the linker did not use this one"
+		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		    fi
+		  fi
+		else
+		  droppeddeps=yes
+		  echo
+		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
+		  echo "*** make it link in!  You will probably need to install it or some"
+		  echo "*** library that it depends on before this library will be fully"
+		  echo "*** functional.  Installing it before continuing would be even better."
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  fi
+	  ;;
+	file_magic*)
+	  set dummy $deplibs_check_method; shift
+	  file_magic_regex=`expr "$deplibs_check_method" : "$1 $.*$"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=
+		  ;;
+		esac
+	      fi
+	      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 yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  if test yes = "$want_nocaseglob"; then
+		    shopt -s nocaseglob
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		    $nocaseglob
+		  else
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		  fi
+		  for potent_lib in $potential_libs; do
+		      # Follow soft links.
+		      if ls -lLd "$potent_lib" 2>/dev/null |
+			 $GREP " -> " >/dev/null; then
+			continue
+		      fi
+		      # The statement above tries to avoid entering an
+		      # endless loop below, in case of cyclic links.
+		      # We might still enter an endless loop, since a link
+		      # loop can be closed while we follow links,
+		      # but so what?
+		      potlib=$potent_lib
+		      while test -h "$potlib" 2>/dev/null; do
+			potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
+			case $potliblink in
+			[\\/]* | [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=
+			break 2
+		      fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib"; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib"; then
+		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a file magic. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	match_pattern*)
+	  set dummy $deplibs_check_method; shift
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 $.*$"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib"; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		    potlib=$potent_lib # see symlink-check above in file_magic test
+		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+		       $EGREP "$match_pattern_regex" > /dev/null; then
+		      func_append newdeplibs " $a_deplib"
+		      a_deplib=
+		      break 2
+		    fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib"; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib"; then
+		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	none | unknown | *)
+	  newdeplibs=
+	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+	  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||"`
+	    done
+	  fi
+	  case $tmp_deplibs in
+	  *[!\	\ ]*)
+	    echo
+	    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."
+	    fi
+	    echo "*** All declared inter-library dependencies are being dropped."
+	    droppeddeps=yes
+	    ;;
+	  esac
+	  ;;
+	esac
+	versuffix=$versuffix_save
+	major=$major_save
+	release=$release_save
+	libname=$libname_save
+	name=$name_save
+
+	case $host in
+	*-*-rhapsody* | *-*-darwin1.[012])
+	  # On Rhapsody replace the C library with the System framework
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
+	  ;;
+	esac
+
+	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"
+	    echo "*** a static module, that should work as long as the dlopening"
+	    echo "*** application is linked with the -dlopen flag."
+	    if test -z "$global_symbol_pipe"; then
+	      echo
+	      echo "*** However, this would only work if libtool was able to extract symbol"
+	      echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
+	      echo "*** not find such a program.  So, this module is probably useless."
+	      echo "*** 'nm' from GNU binutils and a full rebuild may help."
+	    fi
+	    if test no = "$build_old_libs"; then
+	      oldlibs=$output_objdir/$libname.$libext
+	      build_libtool_libs=module
+	      build_old_libs=yes
+	    else
+	      build_libtool_libs=no
+	    fi
+	  else
+	    echo "*** The inter-library dependencies that have been dropped here will be"
+	    echo "*** automatically added whenever a program is linked with this library"
+	    echo "*** or is declared to -dlopen it."
+
+	    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 no = "$build_old_libs"; then
+		oldlibs=$output_objdir/$libname.$libext
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  fi
+	fi
+	# Done checking deplibs!
+	deplibs=$newdeplibs
+      fi
+      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+      case $host in
+	*-*-darwin*)
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
+	  deplibs=`$ECHO " $deplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
+	  ;;
+      esac
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      deplibs=$new_libs
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      # Test again, we may have decided not to build it any more
+      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 yes = "$hardcode_into_libs"; then
+	  # Hardcode the library paths
+	  hardcode_libdirs=
+	  dep_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
+		else
+		  # Just accumulate the unique libdirs.
+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		    ;;
+		  *)
+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		    ;;
+		  esac
+		fi
+	      else
+		eval flag=\"$hardcode_libdir_flag_spec\"
+		func_append dep_rpath " $flag"
+	      fi
+	    elif test -n "$runpath_var"; then
+	      case "$perm_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append perm_rpath " $libdir" ;;
+	      esac
+	    fi
+	  done
+	  # Substitute the hardcoded libdirs into the rpath.
+	  if test -n "$hardcode_libdir_separator" &&
+	     test -n "$hardcode_libdirs"; then
+	    libdir=$hardcode_libdirs
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
+	  fi
+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+	    # We should set the runpath_var.
+	    rpath=
+	    for dir in $perm_rpath; do
+	      func_append rpath "$dir:"
+	    done
+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+	  fi
+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+	fi
+
+	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
+
+	# Get the real and link names of the library.
+	eval shared_ext=\"$shrext_cmds\"
+	eval library_names=\"$library_names_spec\"
+	set dummy $library_names
+	shift
+	realname=$1
+	shift
+
+	if test -n "$soname_spec"; then
+	  eval soname=\"$soname_spec\"
+	else
+	  soname=$realname
+	fi
+	if test -z "$dlname"; then
+	  dlname=$soname
+	fi
+
+	lib=$output_objdir/$realname
+	linknames=
+	for link
+	do
+	  func_append linknames " $link"
+	done
+
+	# Use standard objects if they are pic
+	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	test "X$libobjs" = "X " && libobjs=
+
+	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
+	  func_append delfiles " $export_symbols"
+	fi
+
+	orig_export_symbols=
+	case $host_os in
+	cygwin* | mingw* | cegcc*)
+	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+	    # exporting using user supplied symfile
+	    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
+	      export_symbols=
+	      always_export_symbols=yes
+	    }
+	  fi
+	  ;;
+	esac
+
+	# Prepare the list of exported symbols
+	if test -z "$export_symbols"; then
+	  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='~'
+	    for cmd1 in $cmds; do
+	      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
+		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+		  try_normal_branch=yes
+		  eval cmd=\"$cmd1\"
+		  func_len " $cmd"
+		  len=$func_len_result
+		  ;;
+		*)
+		  try_normal_branch=no
+		  ;;
+	      esac
+	      if test yes = "$try_normal_branch" \
+		 && { test "$len" -lt "$max_cmd_len" \
+		      || test "$max_cmd_len" -le -1; }
+	      then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      elif test -n "$nm_file_list_spec"; then
+		func_basename "$output"
+		output_la=$func_basename_result
+		save_libobjs=$libobjs
+		save_output=$output
+		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"
+		func_verbose "creating $NM input file list: $output"
+		for obj in $save_libobjs; do
+		  func_to_tool_file "$obj"
+		  $ECHO "$func_to_tool_file_result"
+		done > "$output"
+		eval cmd=\"$cmd1\"
+		func_show_eval "$cmd" 'exit $?'
+		output=$save_output
+		libobjs=$save_libobjs
+		skipped_export=false
+	      else
+		# The command line is too long to execute in one step.
+		func_verbose "using reloadable object file for export list..."
+		skipped_export=:
+		# Break out early, otherwise skipped_export may be
+		# set to false by a later but shorter cmd.
+		break
+	      fi
+	    done
+	    IFS=$save_ifs
+	    if test -n "$export_symbols_regex" && 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
+	  fi
+	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
+	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	fi
+
+	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"
+	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	  # '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.
+	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,$.*$$[ \,].*$,s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	  export_symbols=$output_objdir/$libname.def
+	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	fi
+
+	tmp_deplibs=
+	for test_deplib in $deplibs; do
+	  case " $convenience " in
+	  *" $test_deplib "*) ;;
+	  *)
+	    func_append tmp_deplibs " $test_deplib"
+	    ;;
+	  esac
+	done
+	deplibs=$tmp_deplibs
+
+	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec" &&
+	    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.
+	    whole_archive_flag_spec=
+	  fi
+	  if test -n "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  else
+	    gentop=$output_objdir/${outputname}x
+	    func_append generated " $gentop"
+
+	    func_extract_archives $gentop $convenience
+	    func_append libobjs " $func_extract_archives_result"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	fi
+
+	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 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 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
+	  else
+	    eval test_cmds=\"$module_cmds\"
+	    cmds=$module_cmds
+	  fi
+	else
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    eval test_cmds=\"$archive_expsym_cmds\"
+	    cmds=$archive_expsym_cmds
+	  else
+	    eval test_cmds=\"$archive_cmds\"
+	    cmds=$archive_cmds
+	  fi
+	fi
+
+	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
+	  :
+	else
+	  # The command line is too long to link in one step, link piecewise
+	  # or, if using GNU ld and skipped_export is not :, use a linker
+	  # script.
+
+	  # Save the value of $output and $libobjs because we want to
+	  # use them later.  If we have whole_archive_flag_spec, we
+	  # want to use save_libobjs as it was before
+	  # whole_archive_flag_spec was expanded, because we can't
+	  # assume the linker understands whole_archive_flag_spec.
+	  # This may have to be revisited, in case too many
+	  # convenience libraries get linked in and end up exceeding
+	  # the spec.
+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	  fi
+	  save_output=$output
+	  func_basename "$output"
+	  output_la=$func_basename_result
+
+	  # Clear the reloadable object creation command queue and
+	  # initialize k to one.
+	  test_cmds=
+	  concat_cmds=
+	  objlist=
+	  last_robj=
+	  k=1
+
+	  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
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    echo ')' >> $output
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$func_to_tool_file_result
+	  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 yes = "$compiler_needs_object"; then
+	      firstobj="$1 "
+	      shift
+	    fi
+	    for obj
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
+	  else
+	    if test -n "$save_libobjs"; then
+	      func_verbose "creating reloadable object files..."
+	      output=$output_objdir/$output_la-$k.$objext
+	      eval test_cmds=\"$reload_cmds\"
+	      func_len " $test_cmds"
+	      len0=$func_len_result
+	      len=$len0
+
+	      # Loop over the list of objects to be linked.
+	      for obj in $save_libobjs
+	      do
+		func_len " $obj"
+		func_arith $len + $func_len_result
+		len=$func_arith_result
+		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 1 -eq "$k"; then
+		    # The first file doesn't have a previous command to add.
+		    reload_objs=$objlist
+		    eval concat_cmds=\"$reload_cmds\"
+		  else
+		    # All subsequent reloadable object files will link in
+		    # the last one created.
+		    reload_objs="$objlist $last_robj"
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+		  fi
+		  last_robj=$output_objdir/$output_la-$k.$objext
+		  func_arith $k + 1
+		  k=$func_arith_result
+		  output=$output_objdir/$output_la-$k.$objext
+		  objlist=" $obj"
+		  func_len " $last_robj"
+		  func_arith $len0 + $func_len_result
+		  len=$func_arith_result
+		fi
+	      done
+	      # Handle the remaining objects by creating one last
+	      # reloadable object file.  All subsequent reloadable object
+	      # files will link in the last one created.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      reload_objs="$objlist $last_robj"
+	      eval concat_cmds=\"\$concat_cmds$reload_cmds\"
+	      if test -n "$last_robj"; then
+	        eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+	      fi
+	      func_append delfiles " $output"
+
+	    else
+	      output=
+	    fi
+
+	    ${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.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+	      if test -n "$last_robj"; then
+		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+	      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='~'
+	    for cmd in $concat_cmds; do
+	      IFS=$save_ifs
+	      $opt_quiet || {
+		  func_quote_for_expand "$cmd"
+		  eval "func_echo $func_quote_for_expand_result"
+	      }
+	      $opt_dry_run || eval "$cmd" || {
+		lt_exit=$?
+
+		# Restore the uninstalled library and exit
+		if test relink = "$opt_mode"; then
+		  ( cd "$output_objdir" && \
+		    $RM "${realname}T" && \
+		    $MV "${realname}U" "$realname" )
+		fi
+
+		exit $lt_exit
+	      }
+	    done
+	    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"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+
+          ${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
+	      $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"
+	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	      # '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.
+	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,$.*$$[ \,].*$,s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	      export_symbols=$output_objdir/$libname.def
+	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	    fi
+	  }
+
+	  libobjs=$output
+	  # Restore the value of output.
+	  output=$save_output
+
+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	  # Expand the library linking commands again to reset the
+	  # value of $libobjs for piecewise linking.
+
+	  # Do each of the archive commands.
+	  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
+	      cmds=$module_cmds
+	    fi
+	  else
+	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	      cmds=$archive_expsym_cmds
+	    else
+	      cmds=$archive_cmds
+	    fi
+	  fi
+	fi
+
+	if test -n "$delfiles"; then
+	  # Append the command to remove temporary files to $cmds.
+	  eval cmds=\"\$cmds~\$RM $delfiles\"
+	fi
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append libobjs " $func_extract_archives_result"
+	  test "X$libobjs" = "X " && libobjs=
+	fi
+
+	save_ifs=$IFS; IFS='~'
+	for cmd in $cmds; do
+	  IFS=$sp$nl
+	  eval cmd=\"$cmd\"
+	  IFS=$save_ifs
+	  $opt_quiet || {
+	    func_quote_for_expand "$cmd"
+	    eval "func_echo $func_quote_for_expand_result"
+	  }
+	  $opt_dry_run || eval "$cmd" || {
+	    lt_exit=$?
+
+	    # Restore the uninstalled library and exit
+	    if test relink = "$opt_mode"; then
+	      ( cd "$output_objdir" && \
+	        $RM "${realname}T" && \
+		$MV "${realname}U" "$realname" )
+	    fi
+
+	    exit $lt_exit
+	  }
+	done
+	IFS=$save_ifs
+
+	# Restore the uninstalled library and exit
+	if test 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
+	    if test -z "$whole_archive_flag_spec"; then
+	      func_show_eval '${RM}r "$gentop"'
+	    fi
+	  fi
+
+	  exit $EXIT_SUCCESS
+	fi
+
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
+	  fi
+	done
+
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test yes = "$module" || test yes = "$export_dynamic"; then
+	  # On all known operating systems, these are identical.
+	  dlname=$soname
+	fi
+      fi
+      ;;
+
+    obj)
+      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" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "'-rpath' is ignored for objects"
+
+      test -n "$xrpath" && \
+	func_warning "'-R' is ignored for objects"
+
+      test -n "$vinfo" && \
+	func_warning "'-version-info' is ignored for objects"
+
+      test -n "$release" && \
+	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"
+
+	libobj=$output
+	func_lo2o "$libobj"
+	obj=$func_lo2o_result
+	;;
+      *)
+	libobj=
+	obj=$output
+	;;
+      esac
+
+      # Delete the old objects.
+      $opt_dry_run || $RM $obj $libobj
+
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # 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\"
+	  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
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $convenience
+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+	fi
+      fi
+
+      # If we're not building shared, we need to use non_pic_objs
+      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
+
+      output=$obj
+      func_execute_cmds "$reload_cmds" 'exit $?'
+
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      test yes = "$build_libtool_libs" || {
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	# Create an invalid libtool object if no PIC, so that we don't
+	# accidentally link it into a program.
+	# $show "echo timestamp > $libobj"
+	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+	exit $EXIT_SUCCESS
+      }
+
+      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
+	func_execute_cmds "$reload_cmds" 'exit $?'
+      fi
+
+      if test -n "$gentop"; then
+	func_show_eval '${RM}r "$gentop"'
+      fi
+
+      exit $EXIT_SUCCESS
+      ;;
+
+    prog)
+      case $host in
+	*cygwin*) func_stripname '' '.exe' "$output"
+	          output=$func_stripname_result.exe;;
+      esac
+      test -n "$vinfo" && \
+	func_warning "'-version-info' is ignored for programs"
+
+      test -n "$release" && \
+	func_warning "'-release' is ignored for programs"
+
+      $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])
+	# On Rhapsody replace the C library is the System framework
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	;;
+      esac
+
+      case $host in
+      *-*-darwin*)
+	# Don't allow lazy linking, it breaks C++ global constructors
+	# But is supposedly fixed on 10.4 or later (yay!).
+	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"
+	    ;;
+	  esac
+	fi
+	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`
+	;;
+      esac
+
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $compile_deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $compile_deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      compile_deplibs=$new_libs
+
+
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"
+
+      if test -n "$rpath$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath $xrpath; do
+	  # This is the magic to use -rpath.
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+      fi
+
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs=$libdir
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append perm_rpath " $libdir" ;;
+	  esac
+	fi
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$libdir:"*) ;;
+	  ::) dllsearchpath=$libdir;;
+	  *) func_append dllsearchpath ":$libdir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir=$hardcode_libdirs
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      compile_rpath=$rpath
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs=$libdir
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$finalize_perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_perm_rpath " $libdir" ;;
+	  esac
+	fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir=$hardcode_libdirs
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      finalize_rpath=$rpath
+
+      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@" false
+
+      # template prelinking step
+      if test -n "$prelink_cmds"; then
+	func_execute_cmds "$prelink_cmds" 'exit $?'
+      fi
+
+      wrappers_required=:
+      case $host in
+      *cegcc* | *mingw32ce*)
+        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+        wrappers_required=false
+        ;;
+      *cygwin* | *mingw* )
+        test yes = "$build_libtool_libs" || wrappers_required=false
+        ;;
+      *)
+        if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+          wrappers_required=false
+        fi
+        ;;
+      esac
+      $wrappers_required || {
+	# Replace the output file specification.
+	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	link_command=$compile_command$compile_rpath
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	exit_status=0
+	func_show_eval "$link_command" 'exit_status=$?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	# Delete the generated files.
+	if test -f "$output_objdir/${outputname}S.$objext"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
+	fi
+
+	exit $exit_status
+      }
+
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+	if test -n "$perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+	if test -n "$finalize_perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $finalize_perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+      fi
+
+      if test yes = "$no_install"; then
+	# We don't need to create a wrapper script.
+	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.
+	$opt_dry_run || $RM $output
+	# Link the executable and exit
+	func_show_eval "$link_command" 'exit $?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	exit $EXIT_SUCCESS
+      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'`
+
+      # Delete the old output files.
+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+      func_show_eval "$link_command" 'exit $?'
+
+      if test -n "$postlink_cmds"; then
+	func_to_tool_file "$output_objdir/$outputname"
+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	func_execute_cmds "$postlink_cmds" 'exit $?'
+      fi
+
+      # Now create the wrapper script.
+      func_verbose "creating $output"
+
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+	# Preserve any variables that may affect compiler behavior
+	for var in $variables_saved_for_relink; do
+	  if eval test -z \"\${$var+set}\"; then
+	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	  elif eval var_value=\$$var; test -z "$var_value"; then
+	    relink_command="$var=; export $var; $relink_command"
+	  else
+	    func_quote_for_eval "$var_value"
+	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	  fi
+	done
+	relink_command="(cd `pwd`; $relink_command)"
+	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      fi
+
+      # Only actually do things if not in dry run mode.
+      $opt_dry_run || {
+	# win32 will think the script is a binary if it has
+	# a .exe suffix, so we strip it off here.
+	case $output in
+	  *.exe) func_stripname '' '.exe' "$output"
+	         output=$func_stripname_result ;;
+	esac
+	# test for cygwin because mv fails w/o .exe extensions
+	case $host in
+	  *cygwin*)
+	    exeext=.exe
+	    func_stripname '' '.exe' "$outputname"
+	    outputname=$func_stripname_result ;;
+	  *) exeext= ;;
+	esac
+	case $host in
+	  *cygwin* | *mingw* )
+	    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
+	    $RM $cwrappersource $cwrapper
+	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_cwrapperexe_src > $cwrappersource
+
+	    # The wrapper executable is built using the $host compiler,
+	    # because it contains $host paths and files. If cross-
+	    # compiling, it, like the target executable, must be
+	    # executed on the $host or under an emulation environment.
+	    $opt_dry_run || {
+	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+	      $STRIP $cwrapper
+	    }
+
+	    # Now, create the wrapper script for func_source use:
+	    func_ltwrapper_scriptname $cwrapper
+	    $RM $func_ltwrapper_scriptname_result
+	    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
+		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+	      else
+		func_emit_wrapper no > $func_ltwrapper_scriptname_result
+	      fi
+	    }
+	  ;;
+	  * )
+	    $RM $output
+	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_wrapper no > $output
+	    chmod +x $output
+	  ;;
+	esac
+      }
+      exit $EXIT_SUCCESS
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      case $build_libtool_libs in
+        convenience)
+	  oldobjs="$libobjs_save $symfileobj"
+	  addlibs=$convenience
+	  build_libtool_libs=no
+	  ;;
+	module)
+	  oldobjs=$libobjs_save
+	  addlibs=$old_convenience
+	  build_libtool_libs=no
+          ;;
+	*)
+	  oldobjs="$old_deplibs $non_pic_objects"
+	  $preload && test -f "$symfileobj" \
+	    && func_append oldobjs " $symfileobj"
+	  addlibs=$old_convenience
+	  ;;
+      esac
+
+      if test -n "$addlibs"; then
+	gentop=$output_objdir/${outputname}x
+	func_append generated " $gentop"
+
+	func_extract_archives $gentop $addlibs
+	func_append oldobjs " $func_extract_archives_result"
+      fi
+
+      # Do each command in the archive commands.
+      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
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append oldobjs " $func_extract_archives_result"
+	fi
+
+	# POSIX demands no paths to be encoded in archives.  We have
+	# to avoid creating archives with duplicate basenames if we
+	# might have to extract them afterwards, e.g., when creating a
+	# static archive out of a convenience library, or when linking
+	# the entirety of a libtool archive into another (currently
+	# not supported by libtool).
+	if (for obj in $oldobjs
+	    do
+	      func_basename "$obj"
+	      $ECHO "$func_basename_result"
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	  :
+	else
+	  echo "copying selected object files to avoid basename conflicts..."
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
+	  func_mkdir_p "$gentop"
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  counter=1
+	  for obj in $save_oldobjs
+	  do
+	    func_basename "$obj"
+	    objbase=$func_basename_result
+	    case " $oldobjs " in
+	    " ") oldobjs=$obj ;;
+	    *[\ /]"$objbase "*)
+	      while :; do
+		# Make sure we don't pick an alternate name that also
+		# overlaps.
+		newobj=lt$counter-$objbase
+		func_arith $counter + 1
+		counter=$func_arith_result
+		case " $oldobjs " in
+		*[\ /]"$newobj "*) ;;
+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+		esac
+	      done
+	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      func_append oldobjs " $gentop/$newobj"
+	      ;;
+	    *) func_append oldobjs " $obj" ;;
+	    esac
+	  done
+	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
+	eval cmds=\"$old_archive_cmds\"
+
+	func_len " $cmds"
+	len=$func_len_result
+	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  cmds=$old_archive_cmds
+	elif test -n "$archiver_list_spec"; then
+	  func_verbose "using command file archive linking..."
+	  for obj in $oldobjs
+	  do
+	    func_to_tool_file "$obj"
+	    $ECHO "$func_to_tool_file_result"
+	  done > $output_objdir/$libname.libcmd
+	  func_to_tool_file "$output_objdir/$libname.libcmd"
+	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+	  cmds=$old_archive_cmds
+	else
+	  # the command line is too long to link in one step, link in parts
+	  func_verbose "using piecewise archive linking..."
+	  save_RANLIB=$RANLIB
+	  RANLIB=:
+	  objlist=
+	  concat_cmds=
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  # Is there a better way of finding the last object in the list?
+	  for obj in $save_oldobjs
+	  do
+	    last_oldobj=$obj
+	  done
+	  eval test_cmds=\"$old_archive_cmds\"
+	  func_len " $test_cmds"
+	  len0=$func_len_result
+	  len=$len0
+	  for obj in $save_oldobjs
+	  do
+	    func_len " $obj"
+	    func_arith $len + $func_len_result
+	    len=$func_arith_result
+	    func_append objlist " $obj"
+	    if test "$len" -lt "$max_cmd_len"; then
+	      :
+	    else
+	      # the above command should be used before it gets too long
+	      oldobjs=$objlist
+	      if test "$obj" = "$last_oldobj"; then
+		RANLIB=$save_RANLIB
+	      fi
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
+	      objlist=
+	      len=$len0
+	    fi
+	  done
+	  RANLIB=$save_RANLIB
+	  oldobjs=$objlist
+	  if test -z "$oldobjs"; then
+	    eval cmds=\"\$concat_cmds\"
+	  else
+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+	  fi
+	fi
+      fi
+      func_execute_cmds "$cmds" 'exit $?'
+    done
+
+    test -n "$generated" && \
+      func_show_eval "${RM}r$generated"
+
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test yes = "$build_old_libs" && old_library=$libname.$libext
+      func_verbose "creating $output"
+
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+	if eval test -z \"\${$var+set}\"; then
+	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	elif eval var_value=\$$var; test -z "$var_value"; then
+	  relink_command="$var=; export $var; $relink_command"
+	else
+	  func_quote_for_eval "$var_value"
+	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	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=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      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 yes = "$installed"; then
+	    if test -z "$install_libdir"; then
+	      break
+	    fi
+	    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
+		func_resolve_sysroot "$deplib"
+		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_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      -L*)
+		func_stripname -L '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -L$func_replace_sysroot_result"
+		;;
+	      -R*)
+		func_stripname -R '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -R$func_replace_sysroot_result"
+		;;
+	      *) func_append newdependency_libs " $deplib" ;;
+	      esac
+	    done
+	    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`
+		test -z "$libdir" && \
+		  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
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+	      *.la)
+		# Only pass preopened files to the pseudo-archive (for
+		# eventual linking with the app. that links it) if we
+		# 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`
+		test -z "$libdir" && \
+		  func_fatal_error "'$lib' is not a valid libtool archive"
+		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      esac
+	    done
+	    dlprefiles=$newdlprefiles
+	  else
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlfiles " $abs"
+	    done
+	    dlfiles=$newdlfiles
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlprefiles " $abs"
+	    done
+	    dlprefiles=$newdlprefiles
+	  fi
+	  $RM $output
+	  # place dlname in correct position for cygwin
+	  # In fact, it would be nice if we could use this code for all target
+	  # systems that can't hard-code library paths into their executables
+	  # and that have no shared library path variable independent of PATH,
+	  # but it turns out we can't easily determine that from inspecting
+	  # libtool variables, so we have to hard-code the OSs to which it
+	  # applies here; at the moment, that means platforms that use the PE
+	  # object format with DLL files.  See the long comment at the top of
+	  # tests/bindir.at for full details.
+	  tdlname=$dlname
+	  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 -n "$bindir"; then
+		func_relative_path "$install_libdir" "$bindir"
+		tdlname=$func_relative_path_result/$dlname
+	      else
+		# Otherwise fall back on heuristic.
+		tdlname=../bin/$dlname
+	      fi
+	      ;;
+	  esac
+	  $ECHO > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Linker flags that cannot go in dependency_libs.
+inherited_linker_flags='$new_inherited_linker_flags'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Names of additional weak libraries provided by this library
+weak_library_names='$weak_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+	  if test no,yes = "$installed,$need_relink"; then
+	    $ECHO >> $output "\
+relink_command=\"$relink_command\""
+	  fi
+	done
+      }
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
+      ;;
+    esac
+    exit $EXIT_SUCCESS
+}
+
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+  func_mode_link ${1+"$@"}
+fi
+
+
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+    $debug_cmd
+
+    RM=$nonopt
+    files=
+    rmforce=false
+    exit_status=0
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic=$magic
+
+    for arg
+    do
+      case $arg in
+      -f) func_append RM " $arg"; rmforce=: ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
+      esac
+    done
+
+    test -z "$RM" && \
+      func_fatal_help "you must specify an RM program"
+
+    rmdirs=
+
+    for file in $files; do
+      func_dirname "$file" "" "."
+      dir=$func_dirname_result
+      if test . = "$dir"; then
+	odir=$objdir
+      else
+	odir=$dir/$objdir
+      fi
+      func_basename "$file"
+      name=$func_basename_result
+      test uninstall = "$opt_mode" && odir=$dir
+
+      # Remember odir for removal later, being careful to avoid duplicates
+      if test clean = "$opt_mode"; then
+	case " $rmdirs " in
+	  *" $odir "*) ;;
+	  *) func_append rmdirs " $odir" ;;
+	esac
+      fi
+
+      # Don't error if the file doesn't exist and rm -f was used.
+      if { test -L "$file"; } >/dev/null 2>&1 ||
+	 { test -h "$file"; } >/dev/null 2>&1 ||
+	 test -f "$file"; then
+	:
+      elif test -d "$file"; then
+	exit_status=1
+	continue
+      elif $rmforce; then
+	continue
+      fi
+
+      rmfiles=$file
+
+      case $name in
+      *.la)
+	# Possibly a libtool archive, so verify it.
+	if func_lalib_p "$file"; then
+	  func_source $dir/$name
+
+	  # Delete the libtool libraries and symlinks.
+	  for n in $library_names; do
+	    func_append rmfiles " $odir/$n"
+	  done
+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
+
+	  case $opt_mode in
+	  clean)
+	    case " $library_names " in
+	    *" $dlname "*) ;;
+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
+	    esac
+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
+	    ;;
+	  uninstall)
+	    if test -n "$library_names"; then
+	      # Do each command in the postuninstall commands.
+	      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" '$rmforce || exit_status=1'
+	    fi
+	    # FIXME: should reinstall the best remaining shared library.
+	    ;;
+	  esac
+	fi
+	;;
+
+      *.lo)
+	# Possibly a libtool object, so verify it.
+	if func_lalib_p "$file"; then
+
+	  # Read the .lo file
+	  func_source $dir/$name
+
+	  # Add PIC object to the list of files to remove.
+	  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 none != "$non_pic_object"; then
+	    func_append rmfiles " $dir/$non_pic_object"
+	  fi
+	fi
+	;;
+
+      *)
+	if test clean = "$opt_mode"; then
+	  noexename=$name
+	  case $file in
+	  *.exe)
+	    func_stripname '' '.exe' "$file"
+	    file=$func_stripname_result
+	    func_stripname '' '.exe' "$name"
+	    noexename=$func_stripname_result
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    func_append rmfiles " $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if func_ltwrapper_p "$file"; then
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      relink_command=
+	      func_source $func_ltwrapper_scriptname_result
+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
+	    else
+	      relink_command=
+	      func_source $dir/$noexename
+	    fi
+
+	    # 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 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"
+	    fi
+	  fi
+	fi
+	;;
+      esac
+      func_show_eval "$RM $rmfiles" 'exit_status=1'
+    done
+
+    # 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"
+      fi
+    done
+
+    exit $exit_status
+}
+
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+  func_mode_uninstall ${1+"$@"}
+fi
+
+test -z "$opt_mode" && {
+  help=$generic_help
+  func_fatal_help "you must specify a MODE"
+}
+
+test -z "$exec_cmd" && \
+  func_fatal_help "invalid operation mode '$opt_mode'"
+
+if test -n "$exec_cmd"; then
+  eval exec "$exec_cmd"
+  exit $EXIT_FAILURE
+fi
+
+exit $exit_status
+
+
+# The TAGs below are defined such that we never get into a situation
+# 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
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:

grip-4.1.1.tar.gz/build-aux/missing Added

@@ -0,0 +1,215 @@
+#! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, 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 <https://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.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try '$0 --help' for more information"
+  exit 1
+fi
+
+case $1 in
+
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+
+Supported PROGRAM values:
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
+
+# Local variables:
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:

grip-3.10.1.tar.gz/config.h.in -> grip-4.1.1.tar.gz/config.h.in Changed

@@ -1,14 +1,12 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* always defined to indicate that i18n is enabled */
+/* Define to 1 if translation of program messages to the user's native
+   language is requested. */
 #undef ENABLE_NLS
 
 /* Gettext package */
 #undef GETTEXT_PACKAGE
 
-/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-#undef HAVE_BIND_TEXTDOMAIN_CODESET
-
 /* Define to 1 if you have the <cdda/cdda_interface.h> header file. */
 #undef HAVE_CDDA_CDDA_INTERFACE_H
 
@@ -21,7 +19,16 @@
 /* Define to 1 if you have the <cdda_paranoia.h> header file. */
 #undef HAVE_CDDA_PARANOIA_H
 
-/* Define to 1 if you have the `dcgettext' function. */
+/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
+   CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYCURRENT
+
+/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
+   the CoreFoundation framework. */
+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
+
+/* Define if the GNU dcgettext() function is already present or preinstalled.
+   */
 #undef HAVE_DCGETTEXT
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
@@ -30,6 +37,9 @@
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
+/* Define if you have the iconv() function and it works. */
+#undef HAVE_ICONV
+
 /* Description */
 #undef HAVE_ID3V2
 
@@ -39,24 +49,9 @@
 /* Define to 1 if you have the <io/cam/cdrom.h> header file. */
 #undef HAVE_IO_CAM_CDROM_H
 
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#undef HAVE_LC_MESSAGES
-
 /* Define to 1 if you have the <linux/cdrom.h> header file. */
 #undef HAVE_LINUX_CDROM_H
 
-/* Define to 1 if you have the <linux/soundcard.h> header file. */
-#undef HAVE_LINUX_SOUNDCARD_H
-
-/* Define to 1 if you have the <linux/ucdrom.h> header file. */
-#undef HAVE_LINUX_UCDROM_H
-
-/* Define to 1 if you have the <locale.h> header file. */
-#undef HAVE_LOCALE_H
-
-/* Define to 1 if you have the <machine/soundcard.h> header file. */
-#undef HAVE_MACHINE_SOUNDCARD_H
-
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
@@ -72,24 +67,12 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the <sun/audioio.h> header file. */
-#undef HAVE_SUN_AUDIOIO_H
-
-/* Define to 1 if you have the <sys/audioio.h> header file. */
-#undef HAVE_SYS_AUDIOIO_H
-
-/* Define to 1 if you have the <sys/audio.io.h> header file. */
-#undef HAVE_SYS_AUDIO_IO_H
-
 /* Define to 1 if you have the <sys/cdio.h> header file. */
 #undef HAVE_SYS_CDIO_H
 
 /* Define to 1 if you have the <sys/mntent.h> header file. */
 #undef HAVE_SYS_MNTENT_H
 
-/* Define to 1 if you have the <sys/soundcard.h> header file. */
-#undef HAVE_SYS_SOUNDCARD_H
-
 /* Define to 1 if you have the <sys/statvfs.h> header file. */
 #undef HAVE_SYS_STATVFS_H
 
@@ -105,17 +88,7 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Description */
-#undef ID3LIB_MAJOR
-
-/* Description */
-#undef ID3LIB_MINOR
-
-/* Description */
-#undef ID3LIB_PATCH
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR
 
 /* Name of package */

grip-3.10.1.tar.gz/configure -> grip-4.1.1.tar.gz/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for grip 3.10.1.
+# Generated by GNU Autoconf 2.69 for grip 4.1.1.
 #
 # Report bugs to <https://sourceforge.net/projects/grip>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='grip'
 PACKAGE_TARNAME='grip'
-PACKAGE_VERSION='3.10.1'
-PACKAGE_STRING='grip 3.10.1'
+PACKAGE_VERSION='4.1.1'
+PACKAGE_STRING='grip 4.1.1'
 PACKAGE_BUGREPORT='https://sourceforge.net/projects/grip'
 PACKAGE_URL=''
 
@@ -632,37 +632,39 @@
 # include <unistd.h>
 #endif"
 
+gt_needs=
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
 ID3_LIBS
 CDPAR_LIBS
-MKINSTALLDIRS
+THREAD_LIBS
 POSUB
-POFILES
-PO_IN_DATADIR_FALSE
-PO_IN_DATADIR_TRUE
+LTLIBINTL
+LIBINTL
 INTLLIBS
-INSTOBJEXT
-GMOFILES
-DATADIRNAME
-CATOBJEXT
-CATALOGS
+LTLIBICONV
+LIBICONV
+INTL_MACOSX_LIBS
+XGETTEXT_EXTRA_OPTIONS
+MSGMERGE
+XGETTEXT_015
 XGETTEXT
+GMSGFMT_015
+MSGFMT_015
 GMSGFMT
-MSGFMT_OPTS
 MSGFMT
+GETTEXT_MACRO_VERSION
 USE_NLS
 GETTEXT_PACKAGE
-TERMINAL_WIDGET_LIBS
-TERMINAL_WIDGET_CFLAGS
 GNOME_LIBS
 GNOME_CFLAGS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
 CXXCPP
+LT_SYS_LIBRARY_PATH
 OTOOL64
 OTOOL
 LIPO
@@ -706,7 +708,6 @@
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
-am__quote
 am__include
 DEPDIR
 OBJEXT
@@ -765,6 +766,7 @@
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -783,7 +785,8 @@
 PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
-SHELL'
+SHELL
+am__quote'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
@@ -799,9 +802,14 @@
 enable_static
 with_pic
 enable_fast_install
+with_aix_soname
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
+enable_nls
+enable_rpath
+with_libiconv_prefix
+with_libintl_prefix
 '
       ac_precious_vars='build_alias
 host_alias
@@ -815,14 +823,13 @@
 CXXFLAGS
 CCC
 CPP
+LT_SYS_LIBRARY_PATH
 CXXCPP
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
 GNOME_CFLAGS
-GNOME_LIBS
-TERMINAL_WIDGET_CFLAGS
-TERMINAL_WIDGET_LIBS'
+GNOME_LIBS'
 
 
 # Initialize some variables set by options.
@@ -861,6 +868,7 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1113,6 +1121,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=* \
@@ -1250,7 +1267,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.
@@ -1363,7 +1380,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 grip 3.10.1 to adapt to many kinds of systems.
+\`configure' configures grip 4.1.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1403,6 +1420,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]
@@ -1433,7 +1451,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of grip 3.10.1:";;
+     short | recursive ) echo "Configuration of grip 4.1.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1450,7 +1468,7 @@
   --disable-cdpar         do not compile with cdparanoia
   --disable-id3           do not compile with id3lib
   --disable-shared-id3    use static id3lib
-  --disable-werror        do not treat warnings as errors
+  --enable-werror         treat warnings as errors
   --enable-dependency-tracking
                           do not reject slow dependency extractors
   --disable-dependency-tracking
@@ -1460,15 +1478,25 @@
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
+  --disable-nls           do not use Native Language Support
+  --disable-rpath         do not hardcode runtime library paths
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --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-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-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
+  --without-libiconv-prefix     don't search for libiconv in includedir and libdir
+  --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
+  --without-libintl-prefix     don't search for libintl in includedir and libdir
 
 Some influential environment variables:
   CC          C compiler command
@@ -1481,6 +1509,8 @@
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
   CPP         C preprocessor
+  LT_SYS_LIBRARY_PATH
+              User-defined run-time library search path.
   CXXCPP      C++ preprocessor
   PKG_CONFIG  path to pkg-config utility
   PKG_CONFIG_PATH
@@ -1490,10 +1520,6 @@
   GNOME_CFLAGS
               C compiler flags for GNOME, overriding pkg-config
   GNOME_LIBS  linker flags for GNOME, overriding pkg-config
-  TERMINAL_WIDGET_CFLAGS
-              C compiler flags for TERMINAL_WIDGET, overriding pkg-config
-  TERMINAL_WIDGET_LIBS
-              linker flags for TERMINAL_WIDGET, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1561,7 +1587,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-grip configure 3.10.1
+grip configure 4.1.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2051,7 +2077,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by grip $as_me 3.10.1, which was
+It was created by grip $as_me 4.1.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2331,6 +2357,7 @@
   >$cache_file
 fi
 
+gt_needs="$gt_needs "
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -2400,10 +2427,9 @@
 
 
 
-am__api_version='1.14'
 
 ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+for ac_dir in build-aux "$srcdir"/build-aux; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -2419,7 +2445,7 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2431,6 +2457,8 @@
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
+am__api_version='1.16'
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -2601,8 +2629,8 @@
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
   case $am_aux_dir in
@@ -2621,7 +2649,7 @@
 $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -2915,7 +2943,7 @@
 
 # Define the identity of the package.
  PACKAGE='grip'
- VERSION='3.10.1'
+ VERSION='4.1.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2945,12 +2973,12 @@
 
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
@@ -2997,7 +3025,7 @@
 Aborting the configuration process, to ensure you take notice of the issue.
 
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
 
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -3009,6 +3037,7 @@
 fi
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
@@ -3067,16 +3096,23 @@
 
 
 warning_flags="$CFLAGS -Wall"
+warning_flags="$warning_flags -Wno-deprecated-declarations"
 werror_flags="$warning_flags -Werror"
 
 # Check whether --enable-werror was given.
 if test "${enable_werror+set}" = set; then :
-  enableval=$enable_werror; CFLAGS=$warning_flags
+  enableval=$enable_werror;
 else
-  CFLAGS=$werror_flags
+  enable_werror=no
 fi
 
 
+if test $enable_werror = yes; then :
+  CFLAGS="$CFLAGS $werror_flags"
+else
+  CFLAGS="$CFLAGS $warning_flags"
+fi
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3928,45 +3964,45 @@
 
 ac_config_commands="$ac_config_commands depfiles"
 
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
 am__doit:
-	@echo this is the am__doit target
+	@echo this is the am__doit target >confinc.out
 .PHONY: am__doit
 END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+  case $?:`cat confinc.out 2>/dev/null` in #(
+  '0:this is the am__doit target') :
+    case $s in #(
+  BSD) :
+    am__include='.include' am__quote='"' ;; #(
+  *) :
+    am__include='include' am__quote='' ;;
+esac ;; #(
+  *) :
      ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
+esac
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
+  fi
+done
+rm -f confinc.* confmf.*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+$as_echo "${_am_result}" >&6; }
 
 # Check whether --enable-dependency-tracking was given.
 if test "${enable_dependency_tracking+set}" = set; then :
@@ -4968,20 +5004,7 @@
 
 done
 
-for ac_header in linux/cdrom.h linux/ucdrom.h sys/cdio.h io/cam/cdrom.h sys/mntent.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
-
-for ac_header in linux/soundcard.h machine/soundcard.h sys/soundcard.h sys/audioio.h sys/audio.io.h sun/audioio.h
+for ac_header in linux/cdrom.h sys/cdio.h io/cam/cdrom.h sys/mntent.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"
@@ -5003,8 +5026,8 @@
 
 
 
-macro_version='2.4.2'
-macro_revision='1.3337'
+macro_version='2.4.6'
+macro_revision='2.4.6'
 
 
 
@@ -5018,7 +5041,7 @@
 
 
 
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -5138,7 +5161,7 @@
     $ECHO ""
 }
 
-case "$ECHO" in
+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
@@ -5331,19 +5354,19 @@
 
 # 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
+  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
 else
   with_gnu_ld=no
 fi
 
 ac_prog=ld
-if test "$GCC" = yes; then
+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
+    # 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` ;;
@@ -5357,7 +5380,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.
@@ -5368,7 +5391,7 @@
     with_gnu_ld=unknown
     ;;
   esac
-elif test "$with_gnu_ld" = yes; then
+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
@@ -5379,32 +5402,32 @@
   $as_echo_n "(cached) " >&6
 else
   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
 fi
 
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
 if test -n "$LD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 $as_echo "$LD" >&6; }
@@ -5447,33 +5470,38 @@
 else
   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
@@ -5484,15 +5512,15 @@
 	esac
       fi
     done
-    IFS="$lt_save_ifs"
+    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"
+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 :
@@ -5598,9 +5626,9 @@
   fi
 fi
 
-    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=:
@@ -5608,8 +5636,8 @@
     esac
   fi
 
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
   fi
 fi
 test -z "$NM" && NM=nm
@@ -5660,7 +5688,7 @@
   $as_echo_n "(cached) " >&6
 else
     i=0
-  teststring="ABCD"
+  teststring=ABCD
 
   case $build_os in
   msdosdjgpp*)
@@ -5700,7 +5728,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`
@@ -5750,22 +5778,23 @@
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    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
+      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
@@ -5783,7 +5812,7 @@
 
 fi
 
-if test -n $lt_cv_sys_max_cmd_len ; then
+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
@@ -5801,30 +5830,6 @@
 : ${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
@@ -5947,13 +5952,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
@@ -6081,13 +6086,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]*)
@@ -6114,8 +6119,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
@@ -6151,10 +6155,6 @@
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -6193,7 +6193,7 @@
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -6215,8 +6215,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)$'
@@ -6269,6 +6269,9 @@
 tpf*)
   lt_cv_deplibs_check_method=pass_all
   ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 esac
 
 fi
@@ -6426,8 +6429,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
@@ -6439,7 +6442,7 @@
   ;;
 *)
   # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
   ;;
 esac
 
@@ -6593,7 +6596,7 @@
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-      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
 	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
@@ -6601,7 +6604,7 @@
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-	if test "$ac_status" -ne 0; then
+	if test 0 -ne "$ac_status"; then
           lt_cv_ar_at_file=@
         fi
       fi
@@ -6614,7 +6617,7 @@
 { $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
+if test no = "$lt_cv_ar_at_file"; then
   archiver_list_spec=
 else
   archiver_list_spec=$lt_cv_ar_at_file
@@ -6831,7 +6834,7 @@
 
 if test -n "$RANLIB"; then
   case $host_os in
-  openbsd*)
+  bitrig* | openbsd*)
     old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
@@ -6921,7 +6924,7 @@
   symcode='[ABCDGISTW]'
   ;;
 hpux*)
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     symcode='[ABCDEGRST]'
   fi
   ;;
@@ -6954,14 +6957,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=
@@ -6979,21 +7012,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'"
@@ -7041,11 +7077,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_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
 /* This system does not cope well with relocations in const data.  */
 # define LT_DLSYM_CONST
 #else
@@ -7071,7 +7107,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}
 };
@@ -7091,13 +7127,13 @@
 	  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_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
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
 	  LIBS=$lt_globsym_save_LIBS
@@ -7118,7 +7154,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=
@@ -7171,6 +7207,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 $as_echo_n "checking for sysroot... " >&6; }
 
@@ -7183,9 +7229,9 @@
 
 
 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
    ;; #(
@@ -7195,8 +7241,8 @@
  no|'')
    ;; #(
  *)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
+   { $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
@@ -7208,18 +7254,99 @@
 
 
 
+{ $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
+      $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
+
+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; }
+
+
+{ $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
+  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; }
+
+
+
+
+
+
+
+# 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-%%"`
+}
+
 # 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
+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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -7228,24 +7355,25 @@
   test $ac_status = 0; }; 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 { { 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
+    if test yes = "$lt_cv_prog_gnu_ld"; then
       case `/usr/bin/file conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -melf32bsmip"
@@ -7274,9 +7402,50 @@
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+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 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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -7290,9 +7459,19 @@
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    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"
 	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
+	  powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -7311,7 +7490,10 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
@@ -7329,7 +7511,7 @@
 
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
+  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; }
@@ -7369,13 +7551,14 @@
 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
+  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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -7387,7 +7570,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*)
@@ -7396,7 +7579,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
         ;;
       *)
@@ -7412,7 +7595,7 @@
   ;;
 esac
 
-need_locks="$enable_libtool_lock"
+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.
@@ -7523,7 +7706,7 @@
 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
+if test yes != "$lt_cv_path_mainfest_tool"; then
   MANIFEST_TOOL=:
 fi
 
@@ -8026,7 +8209,7 @@
   $as_echo_n "(cached) " >&6
 else
   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
@@ -8044,7 +8227,7 @@
 	  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
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -8083,7 +8266,7 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS="$save_LDFLAGS"
+	LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
@@ -8112,7 +8295,7 @@
       _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
+      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
@@ -8125,32 +8308,32 @@
 $as_echo "$lt_cv_ld_force_load" >&6; }
     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=
@@ -8158,6 +8341,41 @@
     ;;
   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
@@ -8176,9 +8394,9 @@
 
 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 $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
 
@@ -8205,14 +8423,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
 else
@@ -8236,14 +8454,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
 else
@@ -8267,14 +8485,14 @@
     *)
       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
 else
@@ -8282,8 +8500,6 @@
 fi
 
 
-test -z "$pic_mode" && pic_mode=default
-
 
 
 
@@ -8299,14 +8515,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
 else
@@ -8320,11 +8536,63 @@
 
 
 
+  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
+
+
+
+
+
+
+
 
 
 
 # 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'
@@ -8373,7 +8641,7 @@
 
 
 
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
@@ -8412,7 +8680,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
@@ -8423,14 +8691,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
@@ -8439,15 +8707,8 @@
 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-%%"`
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
 
 
 # Only perform the check for file, if the check method requires it
@@ -8462,22 +8723,22 @@
 else
   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
   ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
   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/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+    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"
+	  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
 	    :
@@ -8500,13 +8761,13 @@
       break
     fi
   done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
   ;;
 esac
 fi
 
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+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; }
@@ -8528,22 +8789,22 @@
 else
   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
   ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
   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/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
+    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"
+	  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
 	    :
@@ -8566,13 +8827,13 @@
       break
     fi
   done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
   ;;
 esac
 fi
 
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+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; }
@@ -8593,7 +8854,7 @@
 
 # Use C for the default configuration in the libtool script
 
-lt_save_CC="$CC"
+lt_save_CC=$CC
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -8647,11 +8908,15 @@
 $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 "$GCC" = yes; then
+if test yes = "$GCC"; then
   case $cc_basename in
   nvcc*)
     lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
@@ -8667,7 +8932,7 @@
   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"
+   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
@@ -8697,7 +8962,7 @@
 { $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
+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
     :
@@ -8715,17 +8980,18 @@
 lt_prog_compiler_static=
 
 
-  if test "$GCC" = yes; then
+  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 "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       fi
+      lt_prog_compiler_pic='-fPIC'
       ;;
 
     amigaos*)
@@ -8736,8 +9002,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_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
         ;;
       esac
@@ -8753,6 +9019,11 @@
       # 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*)
@@ -8823,7 +9094,7 @@
     case $host_os in
     aix*)
       lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
@@ -8831,10 +9102,29 @@
       fi
       ;;
 
+    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
+      ;;
+
     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
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -8850,7 +9140,7 @@
 	;;
       esac
       # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
+      lt_prog_compiler_static='$wl-a ${wl}archive'
       ;;
 
     irix5* | irix6* | nonstopux*)
@@ -8859,9 +9149,9 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    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_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-KPIC'
@@ -8886,6 +9176,12 @@
 	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)
@@ -8983,7 +9279,7 @@
       ;;
 
     sysv4*MP*)
-      if test -d /usr/nec ;then
+      if test -d /usr/nec; then
 	lt_prog_compiler_pic='-Kconform_pic'
 	lt_prog_compiler_static='-Bstatic'
       fi
@@ -9012,7 +9308,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_prog_compiler_pic=
     ;;
@@ -9044,7 +9340,7 @@
   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"
+   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
@@ -9074,7 +9370,7 @@
 { $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
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
      "" | " "*) ;;
      *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -9106,7 +9402,7 @@
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
+   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
@@ -9125,13 +9421,13 @@
      fi
    fi
    $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
+   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
+if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
 else
     lt_prog_compiler_static=
@@ -9251,8 +9547,8 @@
 
 
 
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+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; }
@@ -9264,9 +9560,9 @@
   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;}
+  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
@@ -9309,9 +9605,9 @@
   # 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'.
+  # 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
@@ -9326,7 +9622,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
     ;;
@@ -9334,7 +9630,7 @@
     # we just hope/assume this is gcc and not c89 (= MSVC++)
     with_gnu_ld=yes
     ;;
-  openbsd*)
+  openbsd* | bitrig*)
     with_gnu_ld=no
     ;;
   esac
@@ -9344,7 +9640,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
@@ -9366,24 +9662,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
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
+    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'
+      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
+    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 ...
@@ -9396,7 +9692,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
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
@@ -9415,7 +9711,7 @@
       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_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             archive_expsym_cmds=''
         ;;
       m68k)
@@ -9431,7 +9727,7 @@
 	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'
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -9441,7 +9737,7 @@
       # _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'
+      export_dynamic_flag_spec='$wl--export-all-symbols'
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
@@ -9449,61 +9745,89 @@
       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'
+        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'
+      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'
+      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'
+      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
+      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
-	  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'
+	  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'
+	  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' ;;
@@ -9514,42 +9838,47 @@
 	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'
+	  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'
+	  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'
+	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
+        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'
+            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'
+	  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
+	  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'
+              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
@@ -9563,8 +9892,8 @@
 	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'
+	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
       ;;
 
@@ -9582,8 +9911,8 @@
 
 _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'
+	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
@@ -9595,7 +9924,7 @@
 	ld_shlibs=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
@@ -9610,9 +9939,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
-	    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'
+	    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
@@ -9629,15 +9958,15 @@
 
     *)
       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'
+	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
+    if test no = "$ld_shlibs"; then
       runpath_var=
       hardcode_libdir_flag_spec=
       export_dynamic_flag_spec=
@@ -9653,7 +9982,7 @@
       # 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
+      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
@@ -9661,34 +9990,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
-	  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'
+	  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='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  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
 
 	# 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
 
@@ -9707,13 +10059,21 @@
       hardcode_direct_absolute=yes
       hardcode_libdir_separator=':'
       link_all_deplibs=yes
-      file_list_spec='${wl}-f,'
+      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 "$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
@@ -9732,36 +10092,42 @@
 	  ;;
 	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
-	link_all_deplibs=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
 
-      export_dynamic_flag_spec='${wl}-bexpall'
+      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
+      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 "${lt_cv_aix_libpath+set}" = set; then
+        if test set = "${lt_cv_aix_libpath+set}"; then
   aix_libpath=$lt_cv_aix_libpath
 else
   if ${lt_cv_aix_libpath_+:} false; then :
@@ -9796,7 +10162,7 @@
 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"
+    lt_cv_aix_libpath_=/usr/lib:/lib
   fi
 
 fi
@@ -9804,17 +10170,17 @@
   aix_libpath=$lt_cv_aix_libpath_
 fi
 
-        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"
+        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 "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	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"
+	  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
+	 if test set = "${lt_cv_aix_libpath+set}"; then
   aix_libpath=$lt_cv_aix_libpath
 else
   if ${lt_cv_aix_libpath_+:} false; then :
@@ -9849,7 +10215,7 @@
 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"
+    lt_cv_aix_libpath_=/usr/lib:/lib
   fi
 
 fi
@@ -9857,21 +10223,33 @@
   aix_libpath=$lt_cv_aix_libpath_
 fi
 
-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	 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
+	  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'
+	    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'
+	  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
       ;;
@@ -9880,7 +10258,7 @@
       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_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             archive_expsym_cmds=''
         ;;
       m68k)
@@ -9910,16 +10288,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.
-	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='
+	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
@@ -9928,18 +10307,18 @@
 	# 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'
+          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
@@ -9948,7 +10327,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.
 	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.
@@ -9967,24 +10346,24 @@
   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\"`'
+  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"
+  allow_undefined_flag=$_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
-    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}"
+    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
@@ -10026,33 +10405,33 @@
       ;;
 
     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'
+      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
-	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'
+	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_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'
+      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'
+      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 "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      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'
+	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
@@ -10060,25 +10439,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*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  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+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'
+	  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'
+	  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'
+	  archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
 
@@ -10090,7 +10469,7 @@
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler__b=no
-   save_LDFLAGS="$LDFLAGS"
+   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
@@ -10109,14 +10488,14 @@
      fi
    fi
    $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
+   LDFLAGS=$save_LDFLAGS
 
 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'
+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
@@ -10124,8 +10503,8 @@
 	  ;;
 	esac
       fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
 	hardcode_libdir_separator=:
 
 	case $host_cpu in
@@ -10136,7 +10515,7 @@
 	*)
 	  hardcode_direct=yes
 	  hardcode_direct_absolute=yes
-	  export_dynamic_flag_spec='${wl}-E'
+	  export_dynamic_flag_spec='$wl-E'
 
 	  # hardcode_minus_L: Not really in the search PATH,
 	  # but as the default location of the library.
@@ -10147,8 +10526,8 @@
       ;;
 
     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'
+      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.
@@ -10158,8 +10537,8 @@
 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"
+  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; }
@@ -10171,24 +10550,34 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-           LDFLAGS="$save_LDFLAGS"
+           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'
+	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
       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'
+	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_flag_spec='$wl-rpath $wl$libdir'
       hardcode_libdir_separator=:
       inherit_rpath=yes
       link_all_deplibs=yes
       ;;
 
+    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
+      ;;
+
     netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -10203,7 +10592,7 @@
     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_flag_spec='$wl-rpath $wl$libdir'
       hardcode_libdir_separator=:
       hardcode_shlibpath_var=no
       ;;
@@ -10211,27 +10600,19 @@
     *nto* | *qnx*)
       ;;
 
-    openbsd*)
+    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__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	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'
+	  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
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
 	fi
       else
 	ld_shlibs=no
@@ -10242,33 +10623,53 @@
       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'
+      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 "$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'
+      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'
+	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_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'
+      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_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'
+          $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'
@@ -10279,24 +10680,24 @@
 
     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'
+      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'
+          $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_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'
+            $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'
+	  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'
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 	  ;;
 	esac
       fi
@@ -10306,11 +10707,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
-	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	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
@@ -10320,10 +10721,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.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	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
@@ -10372,43 +10773,43 @@
       ;;
 
     sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='${wl}-z,text'
+      no_undefined_flag='$wl-z,text'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
       runpath_var='LD_RUN_PATH'
 
-      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'
+      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'
+	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 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.
-      no_undefined_flag='${wl}-z,text'
-      allow_undefined_flag='${wl}-z,nodefs'
+      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_flag_spec='$wl-R,$libdir'
       hardcode_libdir_separator=':'
       link_all_deplibs=yes
-      export_dynamic_flag_spec='${wl}-Bexport'
+      export_dynamic_flag_spec='$wl-Bexport'
       runpath_var='LD_RUN_PATH'
 
-      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'
+      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'
+	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
       ;;
 
@@ -10423,10 +10824,10 @@
       ;;
     esac
 
-    if test x$host_vendor = xsni; then
+    if test sni = "$host_vendor"; then
       case $host in
       sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='${wl}-Blargedynsym'
+	export_dynamic_flag_spec='$wl-Blargedynsym'
 	;;
       esac
     fi
@@ -10434,7 +10835,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
 $as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
+test no = "$ld_shlibs" && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
 
@@ -10460,7 +10861,7 @@
   # Assume -lc should be added
   archive_cmds_need_lc=yes
 
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+  if test yes,yes = "$GCC,$enable_shared"; then
     case $archive_cmds in
     *'~'*)
       # FIXME: we may have to deal with multi-command sequences.
@@ -10675,14 +11076,14 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
-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
@@ -10698,28 +11099,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--;
         }
@@ -10733,7 +11141,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
@@ -10742,7 +11150,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -10759,14 +11167,16 @@
 # 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'
+  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]*)
@@ -10774,41 +11184,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
   ;;
@@ -10818,18 +11278,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
   ;;
@@ -10837,8 +11297,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"
@@ -10850,7 +11310,7 @@
 
 cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
-  shrext_cmds=".dll"
+  shrext_cmds=.dll
   need_version=no
   need_lib_prefix=no
 
@@ -10859,8 +11319,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~
@@ -10876,17 +11336,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'
 
       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'
@@ -10895,8 +11355,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*)
@@ -10923,7 +11383,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'`
@@ -10936,8 +11396,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'
@@ -10950,7 +11410,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
@@ -10963,8 +11423,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`'
@@ -10977,8 +11437,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
   ;;
 
@@ -10996,12 +11456,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
@@ -11026,26 +11487,15 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  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
   ;;
@@ -11063,14 +11513,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'
@@ -11078,8 +11529,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
     ;;
@@ -11088,8 +11539,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, ...
@@ -11102,8 +11553,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
@@ -11114,7 +11565,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
@@ -11122,8 +11573,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=
@@ -11142,8 +11593,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
   ;;
 
@@ -11152,13 +11603,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.
+  hardcode_libdir_flag_spec='-L$libdir'
+  ;;
+
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+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
@@ -11202,29 +11673,15 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 11209 "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
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
-
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
 
-  # 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="$sys_lib_dlsearch_path_spec $lt_ld_extra"
@@ -11244,12 +11701,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
@@ -11259,7 +11716,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
   ;;
@@ -11268,58 +11725,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*)
@@ -11330,8 +11797,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
@@ -11341,11 +11808,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
@@ -11353,8 +11820,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)
@@ -11375,24 +11842,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'
@@ -11410,7 +11877,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
@@ -11418,8 +11885,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
   ;;
 
@@ -11429,20 +11896,35 @@
 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
+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
+
+
+
+
+
+
 
 
 
@@ -11539,15 +12021,15 @@
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
    test -n "$runpath_var" ||
-   test "X$hardcode_automatic" = "Xyes" ; then
+   test yes = "$hardcode_automatic"; then
 
   # We can hardcode non-existent directories.
-  if test "$hardcode_direct" != no &&
+  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 "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
-     test "$hardcode_minus_L" != no; then
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+     test no != "$hardcode_minus_L"; then
     # Linking always hardcodes the temporary library directory.
     hardcode_action=relink
   else
@@ -11562,12 +12044,12 @@
 { $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
+if test relink = "$hardcode_action" ||
+   test yes = "$inherit_rpath"; 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
@@ -11577,7 +12059,7 @@
 
 
 
-  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
@@ -11587,23 +12069,23 @@
 
   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
     { $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 :
@@ -11641,10 +12123,10 @@
 { $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"
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else
 
-    lt_cv_dlopen="dyld"
+    lt_cv_dlopen=dyld
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
 
@@ -11652,10 +12134,18 @@
 
     ;;
 
+  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_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"
+  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; }
@@ -11694,11 +12184,11 @@
 { $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"
+  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"
+  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; }
@@ -11737,7 +12227,7 @@
 { $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"
+  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; }
@@ -11776,7 +12266,7 @@
 { $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"
+  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; }
@@ -11815,7 +12305,7 @@
 { $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"
+  lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
 fi
 
 
@@ -11836,21 +12326,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"
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
@@ -11858,7 +12348,7 @@
 if ${lt_cv_dlopen_self+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  	  if test "$cross_compiling" = yes; then :
+  	  if test yes = "$cross_compiling"; then :
   lt_cv_dlopen_self=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -11905,9 +12395,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
 
@@ -11937,7 +12427,7 @@
   (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
+  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
@@ -11957,14 +12447,14 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
 $as_echo "$lt_cv_dlopen_self" >&6; }
 
-    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\"
       { $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 "$cross_compiling" = yes; then :
+  	  if test yes = "$cross_compiling"; then :
   lt_cv_dlopen_self_static=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -12011,9 +12501,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
 
@@ -12043,7 +12533,7 @@
   (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
+  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
@@ -12064,9 +12554,9 @@
 $as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
     ;;
   esac
 
@@ -12110,7 +12600,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"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -12138,7 +12628,7 @@
 
 
 
-  # Report which library types will actually be built
+  # 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
@@ -12146,13 +12636,13 @@
 
   { $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
+  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'
@@ -12160,8 +12650,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
@@ -12171,7 +12665,7 @@
   { $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
+  test yes = "$enable_shared" || enable_static=yes
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
 $as_echo "$enable_static" >&6; }
 
@@ -12185,11 +12679,11 @@
 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"
+CC=$lt_save_CC
 
-      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_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -12368,7 +12862,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;"
 
@@ -12429,46 +12923,39 @@
   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-%%"`
+  func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
 
 
   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_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
     else
       lt_prog_compiler_no_builtin_flag_CXX=
     fi
 
-    if test "$GXX" = yes; then
+    if test yes = "$GXX"; 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
+  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
 else
   with_gnu_ld=no
 fi
 
 ac_prog=ld
-if test "$GCC" = yes; then
+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
+    # 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` ;;
@@ -12482,7 +12969,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.
@@ -12493,7 +12980,7 @@
     with_gnu_ld=unknown
     ;;
   esac
-elif test "$with_gnu_ld" = yes; then
+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
@@ -12504,32 +12991,32 @@
   $as_echo_n "(cached) " >&6
 else
   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
 fi
 
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
 if test -n "$LD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 $as_echo "$LD" >&6; }
@@ -12565,22 +13052,22 @@
 
       # 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'
+      if test yes = "$with_gnu_ld"; 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'
+        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}'
+        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'
+          whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
         else
           whole_archive_flag_spec_CXX=
         fi
@@ -12617,18 +13104,30 @@
         ld_shlibs_CXX=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
@@ -12638,6 +13137,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
 
@@ -12656,13 +13162,21 @@
         hardcode_direct_absolute_CXX=yes
         hardcode_libdir_separator_CXX=':'
         link_all_deplibs_CXX=yes
-        file_list_spec_CXX='${wl}-f,'
+        file_list_spec_CXX='$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.
+          hardcode_direct_CXX=no
+          hardcode_direct_absolute_CXX=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
@@ -12680,37 +13194,44 @@
 	  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
-	  link_all_deplibs_CXX=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
 
-        export_dynamic_flag_spec_CXX='${wl}-bexpall'
+        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
+	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_CXX='-berok'
+          # The "-G" linker flag allows undefined symbols.
+          no_undefined_flag_CXX='-bernotok'
           # Determine the default libpath from the value encoded in an empty
           # executable.
-          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
   if ${lt_cv_aix_libpath__CXX+:} false; then :
@@ -12745,7 +13266,7 @@
 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"
+    lt_cv_aix_libpath__CXX=/usr/lib:/lib
   fi
 
 fi
@@ -12753,18 +13274,18 @@
   aix_libpath=$lt_cv_aix_libpath__CXX
 fi
 
-          hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+          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"
+          archive_expsym_cmds_CXX='$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
-	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+          if test ia64 = "$host_cpu"; 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"
+	    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
+	    if test set = "${lt_cv_aix_libpath+set}"; then
   aix_libpath=$lt_cv_aix_libpath
 else
   if ${lt_cv_aix_libpath__CXX+:} false; then :
@@ -12799,7 +13320,7 @@
 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"
+    lt_cv_aix_libpath__CXX=/usr/lib:/lib
   fi
 
 fi
@@ -12807,22 +13328,34 @@
   aix_libpath=$lt_cv_aix_libpath__CXX
 fi
 
-	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    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
+	    no_undefined_flag_CXX=' $wl-bernotok'
+	    allow_undefined_flag_CXX=' $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_CXX='${wl}--whole-archive$convenience ${wl}--no-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'
+	    archive_expsym_cmds_CXX='$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.
+	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$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_CXX="$archive_expsym_cmds_CXX"'~$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_CXX="$archive_expsym_cmds_CXX"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	    fi
+	    archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d'
           fi
         fi
         ;;
@@ -12832,7 +13365,7 @@
 	  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'
+	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 	else
 	  ld_shlibs_CXX=no
 	fi
@@ -12860,57 +13393,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.
-	  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='
+	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	  archive_expsym_cmds_CXX='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, 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'
+            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'
+	  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'
+	    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, use it as
+	    # is; otherwise, prepend EXPORTS...
+	    archive_expsym_cmds_CXX='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 -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
@@ -12924,27 +13458,27 @@
   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\"`'
+  if test yes = "$lt_cv_ld_force_load"; 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"
+  allow_undefined_flag_CXX=$_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
-    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}"
+    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 yes != "$lt_cv_apple_cc_single_mod"; 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
@@ -12953,6 +13487,34 @@
 
 	;;
 
+      os2*)
+	hardcode_libdir_flag_spec_CXX='-L$libdir'
+	hardcode_minus_L_CXX=yes
+	allow_undefined_flag_CXX=unsupported
+	shrext_cmds=.dll
+	archive_cmds_CXX='$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_CXX='$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_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+	enable_shared_with_static_runtimes_CXX=yes
+	;;
+
       dgux*)
         case $cc_basename in
           ec++*)
@@ -12987,18 +13549,15 @@
         ld_shlibs_CXX=yes
         ;;
 
-      gnu*)
-        ;;
-
       haiku*)
-        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        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_flag_spec_CXX='$wl+b $wl$libdir'
         hardcode_libdir_separator_CXX=:
-        export_dynamic_flag_spec_CXX='${wl}-E'
+        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
@@ -13010,7 +13569,7 @@
             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'
+            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 "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.
@@ -13019,11 +13578,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
-              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'
+            if test yes = "$GXX"; 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 "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
             else
               # FIXME: insert proper C++ library support
               ld_shlibs_CXX=no
@@ -13033,15 +13592,15 @@
         ;;
 
       hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+        if test no = "$with_gnu_ld"; 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'
+	      export_dynamic_flag_spec_CXX='$wl-E'
               ;;
           esac
         fi
@@ -13067,13 +13626,13 @@
           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'
+	        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+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'
+	        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
@@ -13084,20 +13643,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*)
-	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            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+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'
+	            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
@@ -13112,22 +13671,22 @@
       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'
+	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'
+	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'
+	    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
@@ -13136,22 +13695,22 @@
 	    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'
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; 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'
+	        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_flag_spec_CXX='$wl-rpath $wl$libdir'
         hardcode_libdir_separator_CXX=:
         inherit_rpath_CXX=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -13159,8 +13718,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.
-	    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'
+	    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.
@@ -13169,10 +13728,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"'
 
-	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    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.
@@ -13186,59 +13745,59 @@
 	    # 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'
+	        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'
+	        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'
+	    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`"'
+               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'
+                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'
+                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'
+                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'
+	      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'
+	    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'
+	    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'
@@ -13252,18 +13811,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
-	    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
+	    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 yes = "$supports_anon_versioning"; 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'
+                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
 	    ;;
 	  *)
@@ -13271,10 +13830,10 @@
 	    *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'
+	      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'
+	      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
@@ -13332,22 +13891,17 @@
         ld_shlibs_CXX=yes
 	;;
 
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	ld_shlibs_CXX=no
-	;;
-
-      openbsd*)
+      openbsd* | bitrig*)
 	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'
+	  hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; 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
@@ -13363,9 +13917,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.
-	    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_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_flag_spec_CXX='$wl-rpath,$libdir'
 	    hardcode_libdir_separator_CXX=:
 
 	    # Archives containing C++ object files must be created using
@@ -13383,17 +13937,17 @@
           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=' $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_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'
+                  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
@@ -13408,21 +13962,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
-	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	    if test yes,no = "$GXX,$with_gnu_ld"; 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 -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'
+	          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_flag_spec_CXX='$wl-rpath $wl$libdir'
 	      hardcode_libdir_separator_CXX=:
 
 	      # Commands to make compiler produce verbose output that lists
@@ -13468,9 +14022,9 @@
 	    # 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_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'
+              $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
@@ -13478,7 +14032,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?)
 		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
 	        ;;
@@ -13495,30 +14049,30 @@
 	    ;;
           gcx*)
 	    # Green Hills C++ Compiler
-	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    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 test yes,no = "$GXX,$with_gnu_ld"; 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_cmds_CXX='$CC -shared $pic_flag -nostdlib $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'
+                  $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.
-	        archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        archive_cmds_CXX='$CC -G -nostdlib $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'
+                  $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
@@ -13526,11 +14080,11 @@
 	        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'
+	      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'
+		  whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 		  ;;
 	      esac
 	    fi
@@ -13539,52 +14093,52 @@
         ;;
 
     sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag_CXX='${wl}-z,text'
+      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 -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'
+	  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
+	# 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_CXX='${wl}-z,text'
-	allow_undefined_flag_CXX='${wl}-z,nodefs'
+	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_flag_spec_CXX='$wl-R,$libdir'
 	hardcode_libdir_separator_CXX=':'
 	link_all_deplibs_CXX=yes
-	export_dynamic_flag_spec_CXX='${wl}-Bexport'
+	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'
+	    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"
+              '"$old_archive_cmds_CXX"
 	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
-	      '"$reload_cmds_CXX"
+              '"$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'
+	    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
       ;;
@@ -13616,10 +14170,10 @@
 
     { $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
+    test no = "$ld_shlibs_CXX" && can_build_shared=no
 
-    GCC_CXX="$GXX"
-    LD_CXX="$LD"
+    GCC_CXX=$GXX
+    LD_CXX=$LD
 
     ## CAVEAT EMPTOR:
     ## There is no encapsulation within the following macros, do not change
@@ -13663,13 +14217,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
@@ -13685,16 +14239,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 "$compiler_lib_search_path_CXX"; then
-	     compiler_lib_search_path_CXX="${prev}${p}"
+	     compiler_lib_search_path_CXX=$prev$p
 	   else
-	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
+	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p"
 	   fi
 	   ;;
 	 # The "-l" case would never come before the object being
@@ -13702,9 +14256,9 @@
 	 esac
        else
 	 if test -z "$postdeps_CXX"; then
-	   postdeps_CXX="${prev}${p}"
+	   postdeps_CXX=$prev$p
 	 else
-	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
+	   postdeps_CXX="${postdeps_CXX} $prev$p"
 	 fi
        fi
        prev=
@@ -13719,15 +14273,15 @@
 	 continue
        fi
 
-       if test "$pre_test_object_deps_done" = no; then
+       if test no = "$pre_test_object_deps_done"; then
 	 if test -z "$predep_objects_CXX"; then
-	   predep_objects_CXX="$p"
+	   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"
+	   postdep_objects_CXX=$p
 	 else
 	   postdep_objects_CXX="$postdep_objects_CXX $p"
 	 fi
@@ -13757,51 +14311,6 @@
   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
 
 
@@ -13810,7 +14319,7 @@
 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!^ !!'`
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'`
 fi
 
 
@@ -13849,17 +14358,18 @@
 
 
   # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
+  if test yes = "$GXX"; then
     lt_prog_compiler_wl_CXX='-Wl,'
     lt_prog_compiler_static_CXX='-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_prog_compiler_static_CXX='-Bstatic'
       fi
+      lt_prog_compiler_pic_CXX='-fPIC'
       ;;
 
     amigaos*)
@@ -13870,8 +14380,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_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
         ;;
       esac
@@ -13886,6 +14396,11 @@
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
       # (--disable-auto-import) libraries
       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static_CXX='$wl-static'
+	;;
+      esac
       ;;
     darwin* | rhapsody*)
       # PIC is the default on this platform
@@ -13935,7 +14450,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_prog_compiler_static_CXX='-Bstatic'
 	else
@@ -13975,14 +14490,14 @@
 	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_static_CXX='$wl-a ${wl}archive'
+	    if test ia64 != "$host_cpu"; then
 	      lt_prog_compiler_pic_CXX='+Z'
 	    fi
 	    ;;
 	  aCC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+	    lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
 	    case $host_cpu in
 	    hppa*64*|ia64*)
 	      # +Z the default
@@ -14011,7 +14526,7 @@
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -14019,7 +14534,7 @@
 	    lt_prog_compiler_pic_CXX='-fPIC'
 	    ;;
 	  ecpc* )
-	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    # 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'
@@ -14164,7 +14679,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_prog_compiler_pic_CXX=
     ;;
@@ -14196,7 +14711,7 @@
   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"
+   lt_compiler_flag="$lt_prog_compiler_pic_CXX -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
@@ -14226,7 +14741,7 @@
 { $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; }
 
-if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then
     case $lt_prog_compiler_pic_CXX in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -14252,7 +14767,7 @@
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works_CXX=no
-   save_LDFLAGS="$LDFLAGS"
+   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
@@ -14271,13 +14786,13 @@
      fi
    fi
    $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
+   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
+if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then
     :
 else
     lt_prog_compiler_static_CXX=
@@ -14391,8 +14906,8 @@
 
 
 
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o_CXX" && 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; }
@@ -14404,9 +14919,9 @@
   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;}
+  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
@@ -14423,17 +14938,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
-      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'
+      export_symbols_cmds_CXX='$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_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+      export_symbols_cmds_CXX='`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*)
-    export_symbols_cmds_CXX="$ltdll_cmds"
+    export_symbols_cmds_CXX=$ltdll_cmds
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
@@ -14446,9 +14965,6 @@
       ;;
     esac
     ;;
-  linux* | k*bsd*-gnu)
-    link_all_deplibs_CXX=no
-    ;;
   *)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
     ;;
@@ -14456,7 +14972,7 @@
 
 { $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
+test no = "$ld_shlibs_CXX" && can_build_shared=no
 
 with_gnu_ld_CXX=$with_gnu_ld
 
@@ -14473,7 +14989,7 @@
   # Assume -lc should be added
   archive_cmds_need_lc_CXX=yes
 
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+  if test yes,yes = "$GCC,$enable_shared"; then
     case $archive_cmds_CXX in
     *'~'*)
       # FIXME: we may have to deal with multi-command sequences.
@@ -14601,7 +15117,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -14618,14 +15134,16 @@
 # 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'
+  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]*)
@@ -14633,41 +15151,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
   ;;
@@ -14677,18 +15245,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
   ;;
@@ -14696,8 +15264,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"
@@ -14709,7 +15277,7 @@
 
 cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
-  shrext_cmds=".dll"
+  shrext_cmds=.dll
   need_version=no
   need_lib_prefix=no
 
@@ -14718,8 +15286,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~
@@ -14735,16 +15303,16 @@
     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'
 
       ;;
     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'
@@ -14753,8 +15321,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*)
@@ -14781,7 +15349,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'`
@@ -14794,8 +15362,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'
@@ -14808,7 +15376,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
@@ -14821,8 +15389,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`'
@@ -14834,8 +15402,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
   ;;
 
@@ -14853,12 +15421,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
@@ -14883,26 +15452,15 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  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
   ;;
@@ -14920,14 +15478,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'
@@ -14935,8 +15494,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
     ;;
@@ -14945,8 +15504,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, ...
@@ -14959,8 +15518,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
@@ -14971,7 +15530,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
@@ -14979,8 +15538,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=
@@ -14999,8 +15558,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
   ;;
 
@@ -15009,13 +15568,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.
+  hardcode_libdir_flag_spec_CXX='-L$libdir'
+  ;;
+
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+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
@@ -15059,29 +15638,15 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 15066 "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
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
-
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
 
-  # 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="$sys_lib_dlsearch_path_spec $lt_ld_extra"
@@ -15101,12 +15666,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
@@ -15116,7 +15681,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
   ;;
@@ -15125,58 +15690,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*)
@@ -15187,8 +15762,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
@@ -15198,11 +15773,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
@@ -15210,8 +15785,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)
@@ -15232,24 +15807,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'
@@ -15267,7 +15842,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
@@ -15275,8 +15850,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
   ;;
 
@@ -15286,20 +15861,32 @@
 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
+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
+
+
+
 
 
 
@@ -15342,15 +15929,15 @@
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" ||
    test -n "$runpath_var_CXX" ||
-   test "X$hardcode_automatic_CXX" = "Xyes" ; then
+   test yes = "$hardcode_automatic_CXX"; then
 
   # We can hardcode non-existent directories.
-  if test "$hardcode_direct_CXX" != no &&
+  if test no != "$hardcode_direct_CXX" &&
      # 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
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" &&
+     test no != "$hardcode_minus_L_CXX"; then
     # Linking always hardcodes the temporary library directory.
     hardcode_action_CXX=relink
   else
@@ -15365,12 +15952,12 @@
 { $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
+if test relink = "$hardcode_action_CXX" ||
+   test yes = "$inherit_rpath_CXX"; 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
@@ -15393,7 +15980,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_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -15553,12 +16140,12 @@
     pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 >= 2.2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 >= 2.2.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.14\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.14") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= 2.2.0" 2>/dev/null`
+  pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.14" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -15570,12 +16157,12 @@
     pkg_cv_GNOME_LIBS="$GNOME_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 >= 2.2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 >= 2.2.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.14\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.14") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 >= 2.2.0" 2>/dev/null`
+  pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.14" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -15596,14 +16183,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgnomeui-2.0 >= 2.2.0" 2>&1`
+	        GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.14" 2>&1`
         else
-	        GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgnomeui-2.0 >= 2.2.0" 2>&1`
+	        GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.14" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GNOME_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libgnomeui-2.0 >= 2.2.0) were not met:
+	as_fn_error $? "Package requirements (gtk+-2.0 >= 2.14) were not met:
 
 $GNOME_PKG_ERRORS
 
@@ -15637,99 +16224,6 @@
                    CFLAGS="$CFLAGS $GNOME_CFLAGS"
 fi
 
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TERMINAL_WIDGET" >&5
-$as_echo_n "checking for TERMINAL_WIDGET... " >&6; }
-
-if test -n "$TERMINAL_WIDGET_CFLAGS"; then
-    pkg_cv_TERMINAL_WIDGET_CFLAGS="$TERMINAL_WIDGET_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vte\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "vte") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_TERMINAL_WIDGET_CFLAGS=`$PKG_CONFIG --cflags "vte" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$TERMINAL_WIDGET_LIBS"; then
-    pkg_cv_TERMINAL_WIDGET_LIBS="$TERMINAL_WIDGET_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vte\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "vte") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_TERMINAL_WIDGET_LIBS=`$PKG_CONFIG --libs "vte" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        TERMINAL_WIDGET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "vte" 2>&1`
-        else
-	        TERMINAL_WIDGET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vte" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$TERMINAL_WIDGET_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (vte) were not met:
-
-$TERMINAL_WIDGET_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables TERMINAL_WIDGET_CFLAGS
-and TERMINAL_WIDGET_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables TERMINAL_WIDGET_CFLAGS
-and TERMINAL_WIDGET_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	TERMINAL_WIDGET_CFLAGS=$pkg_cv_TERMINAL_WIDGET_CFLAGS
-	TERMINAL_WIDGET_LIBS=$pkg_cv_TERMINAL_WIDGET_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-CFLAGS="$TERMINAL_WIDGET_CFLAGS $CFLAGS"
-
 ac_fn_c_check_header_mongrel "$LINENO" "curl/curl.h" "ac_cv_header_curl_curl_h" "$ac_includes_default"
 if test "x$ac_cv_header_curl_curl_h" = xyes; then :
 
@@ -15788,714 +16282,2130 @@
 #define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
 _ACEOF
 
-ALL_LINGUAS="be bg ca da de es fi fr fur hu it ja uk nb nl pl pt_BR ru sr vi zh_CN zh_HK zh_TW"
 
-   for ac_header in locale.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
-if test "x$ac_cv_header_locale_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LOCALE_H 1
-_ACEOF
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
+    # Check whether --enable-nls was given.
+if test "${enable_nls+set}" = set; then :
+  enableval=$enable_nls; USE_NLS=$enableval
+else
+  USE_NLS=yes
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
+
+
+
+
+      GETTEXT_MACRO_VERSION=0.19
+
 
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  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
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; 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_MSGFMT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case "$MSGFMT" in
+  [\\/]* | ?:[\\/]*)
+    ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH; do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&5
+          if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+            ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
+    ;;
+esac
+fi
+MSGFMT="$ac_cv_path_MSGFMT"
+if test "$MSGFMT" != ":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+  # Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; 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_GMSGFMT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GMSGFMT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GMSGFMT="$GMSGFMT" # 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_GMSGFMT="$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
+
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  ;;
+esac
+fi
+GMSGFMT=$ac_cv_path_GMSGFMT
+if test -n "$GMSGFMT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 
-    if test $ac_cv_header_locale_h = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
-$as_echo_n "checking for LC_MESSAGES... " >&6; }
-if ${am_cv_val_LC_MESSAGES+:} false; then :
+    case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+    *) MSGFMT_015=$MSGFMT ;;
+  esac
+
+  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+    *) GMSGFMT_015=$GMSGFMT ;;
+  esac
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  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
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; 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_XGETTEXT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <locale.h>
-int
-main ()
-{
-return LC_MESSAGES
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  am_cv_val_LC_MESSAGES=yes
+  case "$XGETTEXT" in
+  [\\/]* | ?:[\\/]*)
+    ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH; do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&5
+          if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
+     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+            ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+    ;;
+esac
+fi
+XGETTEXT="$ac_cv_path_XGETTEXT"
+if test "$XGETTEXT" != ":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
 else
-  am_cv_val_LC_MESSAGES=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+    rm -f messages.po
+
+    case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+    *) XGETTEXT_015=$XGETTEXT ;;
+  esac
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
-$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
-    if test $am_cv_val_LC_MESSAGES = yes; then
 
-$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
 
-    fi
+# Extract the first word of "msgmerge", so it can be a program name with args.
+set dummy msgmerge; 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_MSGMERGE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case "$MSGMERGE" in
+  [\\/]* | ?:[\\/]*)
+    ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH; do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&5
+          if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
+            ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+  test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
+    ;;
+esac
+fi
+MSGMERGE="$ac_cv_path_MSGMERGE"
+if test "$MSGMERGE" != ":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+$as_echo "$MSGMERGE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+        test -n "$localedir" || localedir='${datadir}/locale'
+
+
+    test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+
+
+  ac_config_commands="$ac_config_commands po-directories"
+
+
+
+      if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
   fi
-     USE_NLS=yes
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
 
 
-    gt_cv_have_gettext=no
 
-    CATOBJEXT=NONE
-    XGETTEXT=:
-    INTLLIBS=
-
-    ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
-if test "x$ac_cv_header_libintl_h" = xyes; then :
-  gt_cv_func_dgettext_libintl="no"
-      libintl_extra_libs=""
-
-      #
-      # First check in libc
-      #
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
-$as_echo_n "checking for ngettext in libc... " >&6; }
-if ${gt_cv_func_ngettext_libc+:} false; then :
-  $as_echo_n "(cached) " >&6
+# 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
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  with_gnu_ld=no
+fi
 
-#include <libintl.h>
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  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
 
-int
-main ()
-{
-return !ngettext ("","", 1)
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gt_cv_func_ngettext_libc=yes
+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
-  gt_cv_func_ngettext_libc=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${acl_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$acl_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      acl_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 `"$acl_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="$acl_save_ifs"
+else
+  acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
 
+LD="$acl_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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
-$as_echo "$gt_cv_func_ngettext_libc" >&6; }
+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 ${acl_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'*)
+  acl_cv_prog_gnu_ld=yes
+  ;;
+*)
+  acl_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+$as_echo "$acl_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$acl_cv_prog_gnu_ld
+
 
-      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-	      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
-$as_echo_n "checking for dgettext in libc... " >&6; }
-if ${gt_cv_func_dgettext_libc+:} false; then :
+
+
+                                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+$as_echo_n "checking for shared library run path origin... " >&6; }
+if ${acl_cv_rpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_rpath=done
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+$as_echo "$acl_cv_rpath" >&6; }
+  wl="$acl_cv_wl"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+    # Check whether --enable-rpath was given.
+if test "${enable_rpath+set}" = set; then :
+  enableval=$enable_rpath; :
+else
+  enable_rpath=yes
+fi
+
+
+
+
+  acl_libdirstem=lib
+  acl_libdirstem2=
+  case "$host_os" in
+    solaris*)
+                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
+$as_echo_n "checking for 64-bit host... " >&6; }
+if ${gl_cv_solaris_64bit+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#include <libintl.h>
+#ifdef _LP64
+sixtyfour bits
+#endif
 
-int
-main ()
-{
-return !dgettext ("","")
-  ;
-  return 0;
-}
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gt_cv_func_dgettext_libc=yes
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
+  gl_cv_solaris_64bit=yes
 else
-  gt_cv_func_dgettext_libc=no
+  gl_cv_solaris_64bit=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
+
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
-$as_echo "$gt_cv_func_dgettext_libc" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
+$as_echo "$gl_cv_solaris_64bit" >&6; }
+      if test $gl_cv_solaris_64bit = yes; then
+        acl_libdirstem=lib/64
+        case "$host_cpu" in
+          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
+          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+        esac
+      fi
+      ;;
+    *)
+      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+      if test -n "$searchpath"; then
+        acl_save_IFS="${IFS= 	}"; IFS=":"
+        for searchdir in $searchpath; do
+          if test -d "$searchdir"; then
+            case "$searchdir" in
+              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+              */../ | */.. )
+                # Better ignore directories of this form. They are misleading.
+                ;;
+              *) searchdir=`cd "$searchdir" && pwd`
+                 case "$searchdir" in
+                   */lib64 ) acl_libdirstem=lib64 ;;
+                 esac ;;
+            esac
+          fi
+        done
+        IFS="$acl_save_IFS"
       fi
+      ;;
+  esac
+  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+
+
+
+
+
+
+
 
-      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-        for ac_func in bind_textdomain_codeset
-do :
-  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_BIND_TEXTDOMAIN_CODESET 1
-_ACEOF
+
+
+
+
+    use_additional=yes
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+
+# Check whether --with-libiconv-prefix was given.
+if test "${with_libiconv_prefix+set}" = set; then :
+  withval=$with_libiconv_prefix;
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+        if test "$acl_libdirstem2" != "$acl_libdirstem" \
+           && ! test -d "$withval/$acl_libdirstem"; then
+          additional_libdir="$withval/$acl_libdirstem2"
+        fi
+      fi
+    fi
 
 fi
-done
 
+      LIBICONV=
+  LTLIBICONV=
+  INCICONV=
+  LIBICONV_PREFIX=
+      HAVE_LIBICONV=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='iconv '
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
+          else
+                                    :
+          fi
+        else
+                              found_dir=
+          found_la=
+          found_so=
+          found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
+          if test $use_additional = yes; then
+            dir="$additional_libdir"
+                                    if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
+                fi
+              fi
+            fi
+                        if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIBICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                                    if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+                                                        if test "$enable_rpath" = no \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+              else
+                                                                                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                                if test "$acl_hardcode_direct" = yes; then
+                                                      LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+                else
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+                                                            haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                                                                                haveit=
+                    for x in $LDFLAGS $LIBICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
+                    fi
+                    if test "$acl_hardcode_minus_L" != no; then
+                                                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+                    else
+                                                                                                                                                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
+              else
+                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
+              fi
+            fi
+                        additional_includedir=
+            case "$found_dir" in
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                if test "$name" = 'iconv'; then
+                  LIBICONV_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = 'iconv'; then
+                  LIBICONV_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INCICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                                            INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+                        if test -n "$found_la"; then
+                                                        save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+                            for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIBICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIBICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                                                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
+                    LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+            LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
+          fi
+        fi
       fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
+                        alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+      done
+            acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+    else
+            for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+            for found_dir in $ltrpathdirs; do
+      LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
+    done
+  fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-      #
-      # If we don't have everything we want, check in libintl
-      #
-      if test "$gt_cv_func_dgettext_libc" != "yes" \
-	 || test "$gt_cv_func_ngettext_libc" != "yes" \
-         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
-$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
-if ${ac_cv_lib_intl_bindtextdomain+:} false; then :
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
+if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     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 bindtextdomain ();
+#include <CoreFoundation/CFPreferences.h>
 int
 main ()
 {
-return bindtextdomain ();
+CFPreferencesCopyAppValue(NULL, NULL)
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_intl_bindtextdomain=yes
+  gt_cv_func_CFPreferencesCopyAppValue=yes
 else
-  ac_cv_lib_intl_bindtextdomain=no
+  gt_cv_func_CFPreferencesCopyAppValue=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+     LIBS="$gt_save_LIBS"
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
-$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
-if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
-$as_echo_n "checking for ngettext in -lintl... " >&6; }
-if ${ac_cv_lib_intl_ngettext+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+
+$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+
+  fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
+$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
+if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     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 ngettext ();
+#include <CoreFoundation/CFLocale.h>
 int
 main ()
 {
-return ngettext ();
+CFLocaleCopyCurrent();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_intl_ngettext=yes
+  gt_cv_func_CFLocaleCopyCurrent=yes
 else
-  ac_cv_lib_intl_ngettext=no
+  gt_cv_func_CFLocaleCopyCurrent=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+     LIBS="$gt_save_LIBS"
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
-$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
-$as_echo_n "checking for dgettext in -lintl... " >&6; }
-if ${ac_cv_lib_intl_dgettext+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+
+$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
+
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+
+
+
+
+
+
+  LIBINTL=
+  LTLIBINTL=
+  POSUB=
+
+    case " $gt_needs " in
+    *" need-formatstring-macros "*) gt_api_version=3 ;;
+    *" need-ngettext "*) gt_api_version=2 ;;
+    *) gt_api_version=1 ;;
+  esac
+  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
+    if test "$USE_NLS" = "yes"; then
+    gt_use_preinstalled_gnugettext=no
+
+
+        if test $gt_api_version -ge 3; then
+          gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+'
+        else
+          gt_revision_test_code=
+        fi
+        if test $gt_api_version -ge 2; then
+          gt_expression_test_code=' + * ngettext ("", "", 0)'
+        else
+          gt_expression_test_code=
+        fi
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+$as_echo_n "checking for GNU gettext in libc... " >&6; }
+if eval \${$gt_func_gnugettext_libc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl  $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 dgettext ();
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;
+
 int
 main ()
 {
-return dgettext ();
+
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_intl_dgettext=yes
+  eval "$gt_func_gnugettext_libc=yes"
 else
-  ac_cv_lib_intl_dgettext=no
+  eval "$gt_func_gnugettext_libc=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_intl_dgettext" >&5
-$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
-if test "x$ac_cv_lib_intl_dgettext" = xyes; then :
-  gt_cv_func_dgettext_libintl=yes
 fi
+eval ac_res=\$$gt_func_gnugettext_libc
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
-fi
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
 
-fi
 
 
-	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
-$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
-$as_echo "" >&6; }
-  	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
-$as_echo_n "checking for ngettext in -lintl... " >&6; }
-if ${ac_cv_lib_intl_ngettext+:} false; then :
+
+
+          am_save_CPPFLAGS="$CPPFLAGS"
+
+  for element in $INCICONV; do
+    haveit=
+    for x in $CPPFLAGS; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+    fi
+  done
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
+if ${am_cv_func_iconv+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl -liconv $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    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 ngettext ();
+#include <stdlib.h>
+#include <iconv.h>
+
 int
 main ()
 {
-return ngettext ();
+iconv_t cd = iconv_open("","");
+           iconv(cd,NULL,NULL,NULL,NULL);
+           iconv_close(cd);
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_intl_ngettext=yes
-else
-  ac_cv_lib_intl_ngettext=no
+  am_cv_func_iconv=yes
 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_intl_ngettext" >&5
-$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
-$as_echo_n "checking for dcgettext in -lintl... " >&6; }
-if ${ac_cv_lib_intl_dcgettext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl -liconv $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS $LIBICONV"
+      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 dcgettext ();
+#include <stdlib.h>
+#include <iconv.h>
+
 int
 main ()
 {
-return dcgettext ();
+iconv_t cd = iconv_open("","");
+             iconv(cd,NULL,NULL,NULL,NULL);
+             iconv_close(cd);
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_intl_dcgettext=yes
-else
-  ac_cv_lib_intl_dcgettext=no
+  am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+      LIBS="$am_save_LIBS"
+    fi
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
-$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
-if test "x$ac_cv_lib_intl_dcgettext" = xyes; then :
-  gt_cv_func_dgettext_libintl=yes
-			libintl_extra_libs=-liconv
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+$as_echo "$am_cv_func_iconv" >&6; }
+  if test "$am_cv_func_iconv" = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+$as_echo_n "checking for working iconv... " >&6; }
+if ${am_cv_func_iconv_works+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  :
-fi
 
+                  am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      am_cv_func_iconv_works=no
+      for ac_iconv_const in '' 'const'; do
+        if test "$cross_compiling" = yes; then :
+  case "$host_os" in
+             aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+             *)            am_cv_func_iconv_works="guessing yes" ;;
+           esac
 else
-  :
-fi
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-        fi
+#include <iconv.h>
+#include <string.h>
 
-        #
-        # If we found libintl, then check in it for bind_textdomain_codeset();
-        # we'll prefer libc if neither have bind_textdomain_codeset(),
-        # and both have dgettext and ngettext
-        #
-        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS -lintl $libintl_extra_libs"
-          unset ac_cv_func_bind_textdomain_codeset
-          for ac_func in bind_textdomain_codeset
-do :
-  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+#ifndef ICONV_CONST
+# define ICONV_CONST $ac_iconv_const
+#endif
+
+int
+main ()
+{
+int result = 0;
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
+  /* Test against Solaris 10 bug: Failures are not distinguishable from
+     successful returns.  */
+  {
+    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+    if (cd_ascii_to_88591 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\263";
+        char buf[10];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_ascii_to_88591,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_ascii_to_88591);
+      }
+  }
+  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\304";
+        static char buf[2] = { (char)0xDE, (char)0xAD };
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
+          result |= 4;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    result |= 16;
+  return result;
+
+  ;
+  return 0;
+}
 _ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  am_cv_func_iconv_works=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+        test "$am_cv_func_iconv_works" = no || break
+      done
+      LIBS="$am_save_LIBS"
 
 fi
-done
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+$as_echo "$am_cv_func_iconv_works" >&6; }
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
 
-          LIBS="$glib_save_LIBS"
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
 
-          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-            gt_cv_func_dgettext_libc=no
-          else
-            if test "$gt_cv_func_dgettext_libc" = "yes" \
-		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
-              gt_cv_func_dgettext_libintl=no
-            fi
-          fi
-        fi
-      fi
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+$as_echo_n "checking how to link with libiconv... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+$as_echo "$LIBICONV" >&6; }
+  else
+            CPPFLAGS="$am_save_CPPFLAGS"
+    LIBICONV=
+    LTLIBICONV=
+  fi
 
-      if test "$gt_cv_func_dgettext_libc" = "yes" \
-	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        gt_cv_have_gettext=yes
-      fi
 
-      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        INTLLIBS="-lintl $libintl_extra_libs"
-      fi
 
-      if test "$gt_cv_have_gettext" = "yes"; then
 
-$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
 
-	# Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; 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_MSGFMT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case "$MSGFMT" in
-  /*)
-  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
-	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
-	break
+
+
+
+
+
+
+    use_additional=yes
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+
+# Check whether --with-libintl-prefix was given.
+if test "${with_libintl_prefix+set}" = set; then :
+  withval=$with_libintl_prefix;
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+        if test "$acl_libdirstem2" != "$acl_libdirstem" \
+           && ! test -d "$withval/$acl_libdirstem"; then
+          additional_libdir="$withval/$acl_libdirstem2"
+        fi
       fi
     fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
-  ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test "$MSGFMT" != "no"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-$as_echo "$MSGFMT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-	if test "$MSGFMT" != "no"; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS $INTLLIBS"
-	  for ac_func in dcgettext
-do :
-  ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
-if test "x$ac_cv_func_dcgettext" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DCGETTEXT 1
-_ACEOF
 
 fi
-done
 
-	  MSGFMT_OPTS=
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
-$as_echo_n "checking if msgfmt accepts -c... " >&6; }
-	  cat >conftest.foo <<_ACEOF
+      LIBINTL=
+  LTLIBINTL=
+  INCINTL=
+  LIBINTL_PREFIX=
+      HAVE_LIBINTL=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='intl '
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
+          else
+                                    :
+          fi
+        else
+                              found_dir=
+          found_la=
+          found_so=
+          found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
+          if test $use_additional = yes; then
+            dir="$additional_libdir"
+                                    if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
+                fi
+              fi
+            fi
+                        if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIBINTL; do
 
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: test 1.0\n"
-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
-"Last-Translator: test <foo@bar.xx>\n"
-"Language-Team: C <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                                    if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+                                                        if test "$enable_rpath" = no \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+                                LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+              else
+                                                                                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                                if test "$acl_hardcode_direct" = yes; then
+                                                      LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+                else
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+                                                            haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                                                                                haveit=
+                    for x in $LDFLAGS $LIBINTL; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
+                    fi
+                    if test "$acl_hardcode_minus_L" != no; then
+                                                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+                    else
+                                                                                                                                                                                LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                                LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
+              else
+                                                LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
+              fi
+            fi
+                        additional_includedir=
+            case "$found_dir" in
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                if test "$name" = 'intl'; then
+                  LIBINTL_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = 'intl'; then
+                  LIBINTL_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INCINTL; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                                            INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+                        if test -n "$found_la"; then
+                                                        save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+                            for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIBINTL; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIBINTL; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                                                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                                        LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
+                    LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+            LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
+                        alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+      done
+            acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+    else
+            for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+            for found_dir in $ltrpathdirs; do
+      LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
+    done
+  fi
 
-_ACEOF
-if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
-  ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  MSGFMT_OPTS=-c; { $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; }
-echo "$as_me: failed input was:" >&5
-sed 's/^/| /' conftest.foo >&5
-fi
 
-	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; 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_GMSGFMT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GMSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # 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_GMSGFMT="$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
 
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-if test -n "$GMSGFMT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-$as_echo "$GMSGFMT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
 
-	  # Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; 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_XGETTEXT+:} false; then :
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+$as_echo_n "checking for GNU gettext in libintl... " >&6; }
+if eval \${$gt_func_gnugettext_libintl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case "$XGETTEXT" in
-  /*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
-	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-  ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test "$XGETTEXT" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-$as_echo "$XGETTEXT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  gt_save_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $INCINTL"
+            gt_save_LIBS="$LIBS"
+            LIBS="$LIBS $LIBINTL"
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+
 int
 main ()
 {
-extern int _nl_msg_cat_cntr;
-			 return _nl_msg_cat_cntr
+
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  CATOBJEXT=.gmo
-             DATADIRNAME=share
+  eval "$gt_func_gnugettext_libintl=yes"
 else
-  case $host in
-	    *-*-solaris*)
-	    	                	    	                ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
-  CATOBJEXT=.gmo
-               DATADIRNAME=share
-else
-  CATOBJEXT=.mo
-               DATADIRNAME=lib
+  eval "$gt_func_gnugettext_libintl=no"
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+                        if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
+              LIBS="$LIBS $LIBICONV"
+              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+
+int
+main ()
+{
+
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  LIBINTL="$LIBINTL $LIBICONV"
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                 eval "$gt_func_gnugettext_libintl=yes"
 
-	    ;;
-	    *-*-openbsd*)
-	    CATOBJEXT=.mo
-            DATADIRNAME=share
-	    ;;
-	    *)
-	    CATOBJEXT=.mo
-            DATADIRNAME=lib
-	    ;;
-	    esac
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-          LIBS="$glib_save_LIBS"
-	  INSTOBJEXT=.mo
-	else
-	  gt_cv_have_gettext=no
-	fi
-      fi
-
+            fi
+            CPPFLAGS="$gt_save_CPPFLAGS"
+            LIBS="$gt_save_LIBS"
 fi
+eval ac_res=\$$gt_func_gnugettext_libintl
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+        fi
+
+                                        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+                && test "$PACKAGE" != gettext-runtime \
+                && test "$PACKAGE" != gettext-tools; }; then
+          gt_use_preinstalled_gnugettext=yes
+        else
+                    LIBINTL=
+          LTLIBINTL=
+          INCINTL=
+        fi
 
 
 
-    if test "$gt_cv_have_gettext" = "yes" ; then
+    if test -n "$INTL_MACOSX_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+                LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+      fi
+    fi
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes" \
+       || test "$nls_cv_use_gnu_gettext" = "yes"; then
 
 $as_echo "#define ENABLE_NLS 1" >>confdefs.h
 
+    else
+      USE_NLS=no
     fi
+  fi
 
-        if test "$XGETTEXT" != ":"; then
-                  if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-        : ;
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
+$as_echo_n "checking whether to use NLS... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
+  if test "$USE_NLS" = "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
+$as_echo_n "checking where the gettext function comes from... " >&6; }
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        gt_source="external libintl"
       else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
-$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
-        XGETTEXT=":"
+        gt_source="libc"
       fi
+    else
+      gt_source="included intl directory"
     fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
+$as_echo "$gt_source" >&6; }
+  fi
 
-    # We need to process the po/ directory.
-    POSUB=po
-
-    ac_config_commands="$ac_config_commands default-1"
+  if test "$USE_NLS" = "yes"; then
 
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
+$as_echo_n "checking how to link with libintl... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
+$as_echo "$LIBINTL" >&6; }
+
+  for element in $INCINTL; do
+    haveit=
+    for x in $CPPFLAGS; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
 
-                for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
     done
+    if test -z "$haveit"; then
+      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+    fi
+  done
 
+      fi
 
 
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
 
 
+$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
 
+    fi
 
+        POSUB=po
+  fi
 
 
 
+    INTLLIBS="$LIBINTL"
 
 
 
-   if test "$gt_cv_have_gettext" = "yes"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
-$as_echo_n "checking for catalogs to be installed... " >&6; }
-       NEW_LINGUAS=
-       for presentlang in $ALL_LINGUAS; do
-         useit=no
-         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
-           desiredlanguages="$LINGUAS"
-         else
-           desiredlanguages="$ALL_LINGUAS"
-         fi
-         for desiredlang in $desiredlanguages; do
- 	   # Use the presentlang catalog if desiredlang is
-           #   a. equal to presentlang, or
-           #   b. a variant of presentlang (because in this case,
-           #      presentlang can be used as a fallback for messages
-           #      which are not translated in the desiredlang catalog).
-           case "$desiredlang" in
-             "$presentlang"*) useit=yes;;
-           esac
-         done
-         if test $useit = yes; then
-           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-         fi
-       done
-       LINGUAS=$NEW_LINGUAS
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
-$as_echo "$LINGUAS" >&6; }
-     fi
 
-          if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
 
-            MKINSTALLDIRS=
-   if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-   fi
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-   fi
 
 
-         test -d po || mkdir po
-   if test "x$srcdir" != "x."; then
-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-       posrcprefix="$srcdir/"
-     else
-       posrcprefix="../$srcdir/"
-     fi
-   else
-     posrcprefix="../"
-   fi
-   rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/$.*$ \\\\/\1/" \
-	< $srcdir/po/POTFILES.in > po/POTFILES
+
+ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+if test "x$ac_cv_header_pthread_h" = xyes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in -lpthread" >&5
+$as_echo_n "checking for pthread_join in -lpthread... " >&6; }
+if ${ac_cv_lib_pthread_pthread_join+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthread  $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 pthread_join ();
+int
+main ()
+{
+return pthread_join ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_pthread_pthread_join=yes
+else
+  ac_cv_lib_pthread_pthread_join=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_pthread_pthread_join" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_join" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_join" = xyes; then :
+  THREAD_LIBS="-lpthread"
+else
+  as_fn_error $? "pthread library is missing" "$LINENO" 5
+fi
+
+else
+  as_fn_error $? "pthread.h header is missing" "$LINENO" 5
+fi
+
+
+
 
 
 if test "$enable_cdpar" = "yes"; then
@@ -16659,60 +18569,6 @@
 
 fi
 
-ID3LIB_MAJOR=3
-ID3LIB_MINOR=8
-ID3LIB_PATCH=3
-
-if test $id3lib = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for id3lib version" >&5
-$as_echo_n "checking for id3lib version... " >&6; }
-      if test "$cross_compiling" = yes; then :
-  echo $ac_n "cross compiling; assuming ${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH} $ac_c"
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <id3.h>
-#include <stdio.h>
-int
-main ()
-{
-    FILE *output;
-    output=fopen("conftest.id3","w");
-    fprintf(output,"ID3LIB_MAJOR=%d\nID3LIB_MINOR=%d\nID3LIB_PATCH=%d\n",
-	ID3LIB_MAJOR_VERSION,ID3LIB_MINOR_VERSION,ID3LIB_PATCH_VERSION);
-    fclose(output);
-    exit(0);
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  . ./conftest.id3
-   echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not determine id3lib version" >&5
-$as_echo "$as_me: WARNING: could not determine id3lib version" >&2;}
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-cat >>confdefs.h <<_ACEOF
-#define ID3LIB_MAJOR $ID3LIB_MAJOR
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define ID3LIB_MINOR $ID3LIB_MINOR
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define ID3LIB_PATCH $ID3LIB_PATCH
-_ACEOF
-
-fi
 
 LIBS=$id3_libs_bak
 
@@ -16720,7 +18576,7 @@
 
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in pixmaps/Makefile doc/Makefile doc/C/Makefile contrib/Makefile"
+ac_config_files="$ac_config_files po/Makefile.in Makefile src/Makefile pixmaps/Makefile doc/Makefile doc/C/Makefile contrib/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -17259,7 +19115,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by grip $as_me 3.10.1, which was
+This file was extended by grip $as_me 4.1.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17325,7 +19181,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-grip config.status 3.10.1
+grip config.status 4.1.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -17444,7 +19300,7 @@
 #
 # INIT-COMMANDS
 #
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
 
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -17460,6 +19316,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"`'
@@ -17509,10 +19366,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"`'
@@ -17577,7 +19437,8 @@
 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"`'
@@ -17682,9 +19543,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 \
@@ -17750,7 +19614,7 @@
 compiler_lib_search_path_CXX; 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\\\\\\""
@@ -17777,7 +19641,8 @@
 postuninstall_cmds \
 finish_cmds \
 sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec \
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path \
 reload_cmds_CXX \
 old_archive_cmds_CXX \
 old_archive_from_new_cmds_CXX \
@@ -17791,7 +19656,7 @@
 postlink_cmds_CXX; 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\\\\\\""
@@ -17800,19 +19665,16 @@
 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'
 
@@ -17820,6 +19682,12 @@
 
 
 
+# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+    # from automake < 1.5.
+    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+    # Capture the value of LINGUAS because we need it to compute CATALOGS.
+    LINGUAS="${LINGUAS-%UNSET%}"
 
 
 _ACEOF
@@ -17833,10 +19701,10 @@
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+    "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
+    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "doc/C/Makefile") CONFIG_FILES="$CONFIG_FILES doc/C/Makefile" ;;
@@ -18440,29 +20308,35 @@
   # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  case $CONFIG_FILES in #(
+  *\'*) :
+    eval set x "$CONFIG_FILES" ;; #(
+  *) :
+    set x $CONFIG_FILES ;; #(
+  *) :
+     ;;
+esac
   shift
-  for mf
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_mf
   do
     # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
+    am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: AIX grep has a line
     # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X$//$[^/]' \| \
-	 X"$mf" : 'X$//$$' \| \
-	 X"$mf" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
+	 X"$am_mf" : 'X$//$[^/]' \| \
+	 X"$am_mf" : 'X$//$$' \| \
+	 X"$am_mf" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X"$am_mf" |
     sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -18480,106 +20354,99 @@
 	    q
 	  }
 	  s/.*/./; q'`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X$//$[^/]' \| \
-	 X"$file" : 'X$//$$' \| \
-	 X"$file" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$[^/].*/{
+    am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/$[^/][^/]*$/*$' \| \
+	 X"$am_mf" : 'X$//$$' \| \
+	 X"$am_mf" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X/"$am_mf" |
+    sed '/^.*\/$[^/][^/]*$\/*$/{
 	    s//\1/
 	    q
 	  }
-	  /^X$\/\/$$/{
+	  /^X\/$\/\/$$/{
 	    s//\1/
 	    q
 	  }
-	  /^X$\/$.*/{
+	  /^X\/$\/$.*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
+    { echo "$as_me:$LINENO: cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles" >&5
+   (cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } || am_rc=$?
   done
+  if test $am_rc -ne 0; 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 $? "Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  Try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+  { am_dirpart=; unset am_dirpart;}
+  { am_filepart=; unset am_filepart;}
+  { am_mf=; unset am_mf;}
+  { am_rc=; unset am_rc;}
+  rm -f conftest-deps.mk
 }
  ;;
     "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='CXX '
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
 
 # ### BEGIN LIBTOOL CONFIG
 
@@ -18599,6 +20466,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
 
@@ -18716,18 +20586,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
 
@@ -18818,8 +20697,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
@@ -18912,13 +20794,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
 
@@ -18984,13 +20866,72 @@
 
 _LT_EOF
 
+    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
+
   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
@@ -18999,7 +20940,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
@@ -19009,165 +20950,6 @@
   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"
@@ -19254,13 +21036,13 @@
 # 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
+# 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
+# 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_CXX
 
@@ -19326,9 +21108,120 @@
 _LT_EOF
 
  ;;
-    "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-      esac ;;
+    "po-directories":C)
+    for ac_file in $CONFIG_FILES; do
+      # Support "outfile[:infile[:infile...]]"
+      case "$ac_file" in
+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+      esac
+      # PO directories have a Makefile.in generated from Makefile.in.in.
+      case "$ac_file" in */Makefile.in)
+        # Adjust a relative srcdir.
+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+        # In autoconf-2.13 it is called $ac_given_srcdir.
+        # In autoconf-2.50 it is called $srcdir.
+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+        case "$ac_given_srcdir" in
+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+          /*) top_srcdir="$ac_given_srcdir" ;;
+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+        esac
+        # Treat a directory as a PO directory if and only if it has a
+        # POTFILES.in file. This allows packages to have multiple PO
+        # directories under different names or in different locations.
+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+          rm -f "$ac_dir/POTFILES"
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+          gt_tab=`printf '\t'`
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
+          POMAKEFILEDEPS="POTFILES.in"
+          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+          # on $ac_dir but don't depend on user-specified configuration
+          # parameters.
+          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+            # The LINGUAS file contains the set of available languages.
+            if test -n "$OBSOLETE_ALL_LINGUAS"; then
+              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+            fi
+            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+          else
+            # The set of available languages was given in configure.in.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+          fi
+          # Compute POFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+          # Compute UPDATEPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+          # Compute DUMMYPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+          # Compute GMOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+          case "$ac_given_srcdir" in
+            .) srcdirpre= ;;
+            *) srcdirpre='$(srcdir)/' ;;
+          esac
+          POFILES=
+          UPDATEPOFILES=
+          DUMMYPOFILES=
+          GMOFILES=
+          for lang in $ALL_LINGUAS; do
+            POFILES="$POFILES $srcdirpre$lang.po"
+            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+          done
+          # CATALOGS depends on both $ac_dir and the user's LINGUAS
+          # environment variable.
+          INST_LINGUAS=
+          if test -n "$ALL_LINGUAS"; then
+            for presentlang in $ALL_LINGUAS; do
+              useit=no
+              if test "%UNSET%" != "$LINGUAS"; then
+                desiredlanguages="$LINGUAS"
+              else
+                desiredlanguages="$ALL_LINGUAS"
+              fi
+              for desiredlang in $desiredlanguages; do
+                # Use the presentlang catalog if desiredlang is
+                #   a. equal to presentlang, or
+                #   b. a variant of presentlang (because in this case,
+                #      presentlang can be used as a fallback for messages
+                #      which are not translated in the desiredlang catalog).
+                case "$desiredlang" in
+                  "$presentlang"*) useit=yes;;
+                esac
+              done
+              if test $useit = yes; then
+                INST_LINGUAS="$INST_LINGUAS $presentlang"
+              fi
+            done
+          fi
+          CATALOGS=
+          if test -n "$INST_LINGUAS"; then
+            for lang in $INST_LINGUAS; do
+              CATALOGS="$CATALOGS $lang.gmo"
+            done
+          fi
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+            if test -f "$f"; then
+              case "$f" in
+                *.orig | *.bak | *~) ;;
+                *) cat "$f" >> "$ac_dir/Makefile" ;;
+              esac
+            fi
+          done
+        fi
+        ;;
+      esac
+    done ;;
 
   esac
 done # for ac_tag

grip-3.10.1.tar.gz/configure.ac -> grip-4.1.1.tar.gz/configure.ac Changed

@@ -1,52 +1,58 @@
-AC_PREREQ(2.52)
+AC_PREREQ([2.60])
 
-AC_INIT([grip], [3.10.1], [https://sourceforge.net/projects/grip])
+AC_INIT([grip], [4.1.1], [https://sourceforge.net/projects/grip])
 AC_CONFIG_SRCDIR([src/main.c])
-AM_INIT_AUTOMAKE
+AC_CONFIG_MACRO_DIRS([m4])
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE([1.14 foreign])
 
 AM_MAINTAINER_MODE
 AM_CONFIG_HEADER(config.h)
 
 AC_ARG_ENABLE(shared_cdpar,
-	[  --disable-shared-cdpar  use static cdparanoia lib],
+	[AS_HELP_STRING([--disable-shared-cdpar], [use static cdparanoia lib])],
         ,enable_shared_cdpar=yes)
 
 AC_ARG_ENABLE(cdpar,
-	[  --disable-cdpar         do not compile with cdparanoia],
+	[AS_HELP_STRING([--disable-cdpar],[do not compile with cdparanoia])],
         , enable_cdpar=yes)
 
 AC_ARG_ENABLE(id3,
-	[  --disable-id3           do not compile with id3lib],
+	[AS_HELP_STRING([--disable-id3], [do not compile with id3lib])],
         , enable_id3=yes)
 
 AC_ARG_ENABLE(shared_id3,
-	[  --disable-shared-id3    use static id3lib],
+	[AS_HELP_STRING([--disable-shared-id3],[use static id3lib])],
         , enable_shared_id3=yes)
 
 warning_flags="$CFLAGS -Wall"
+dnl glib deprecated a function that gtk2 still uses
+dnl disable deprecation warnings for now
+warning_flags="$warning_flags -Wno-deprecated-declarations"
 werror_flags="$warning_flags -Werror"
 
 AC_ARG_ENABLE([werror],
-	[  --disable-werror        do not treat warnings as errors],
-        [CFLAGS=$warning_flags], [CFLAGS=$werror_flags])
+	[AS_HELP_STRING([--enable-werror],[treat warnings as errors])],
+        , enable_werror=no)
+
+AS_IF([test $enable_werror = yes],
+      [CFLAGS="$CFLAGS $werror_flags"],
+      [CFLAGS="$CFLAGS $warning_flags"])
 
 AC_PROG_CC
 AC_PROG_CXX
 AC_ISC_POSIX
 AC_HEADER_STDC
 AC_CHECK_HEADERS(sys/vfs.h sys/statvfs.h)
-AC_CHECK_HEADERS(linux/cdrom.h linux/ucdrom.h sys/cdio.h io/cam/cdrom.h sys/mntent.h)
-AC_CHECK_HEADERS(linux/soundcard.h machine/soundcard.h sys/soundcard.h sys/audioio.h sys/audio.io.h sun/audioio.h)
+AC_CHECK_HEADERS(linux/cdrom.h sys/cdio.h io/cam/cdrom.h sys/mntent.h)
 
 AM_PROG_LIBTOOL
 
-PKG_CHECK_MODULES(GNOME, libgnomeui-2.0 >= 2.2.0,
+PKG_PROG_PKG_CONFIG
+PKG_CHECK_MODULES(GNOME, gtk+-2.0 >= 2.14,
                   [LIBS="$LIBS $GNOME_LIBS"
                    CFLAGS="$CFLAGS $GNOME_CFLAGS"])
 
-PKG_CHECK_MODULES(TERMINAL_WIDGET, vte)
-CFLAGS="$TERMINAL_WIDGET_CFLAGS $CFLAGS"
-
 dnl check for ghttp
 AC_CHECK_HEADER(curl/curl.h, [], [AC_MSG_ERROR(libcurl headers are missing)])
 AC_CHECK_LIB(curl,curl_global_init, [LIBS="$LIBS `curl-config --libs`"], [AC_MSG_ERROR(curl libs are missing)])
@@ -54,8 +60,17 @@
 GETTEXT_PACKAGE=grip
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
-ALL_LINGUAS="be bg ca da de es fi fr fur hu it ja uk nb nl pl pt_BR ru sr vi zh_CN zh_HK zh_TW"
-AM_GLIB_GNU_GETTEXT
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.4])
+
+dnl pthread check
+AC_CHECK_HEADER(pthread.h,
+  AC_CHECK_LIB(pthread, pthread_join,
+    [THREAD_LIBS="-lpthread"],
+    [AC_MSG_ERROR(pthread library is missing)]),
+  [AC_MSG_ERROR(pthread.h header is missing)])
+
+AC_SUBST(THREAD_LIBS)
 
 dnl do cdparanoia check
 if test "$enable_cdpar" = "yes"; then
@@ -105,35 +120,6 @@
 		AC_MSG_WARN(id3lib not found - disabling id3v2 support))
 fi
 
-dnl expected version for cross compiling
-ID3LIB_MAJOR=3
-ID3LIB_MINOR=8
-ID3LIB_PATCH=3
-
-dnl This test will extract the version number from id3lib and define the macros
-dnl ID3LIB_MAJOR, ID3LIB_MINOR, ID3LIB_PATCH
-if test $id3lib = yes; then
-    AC_MSG_CHECKING(for id3lib version)
-      AC_TRY_RUN([
-#include <id3.h>
-#include <stdio.h>
-int 
-main ()
-{
-    FILE *output;
-    output=fopen("conftest.id3","w");
-    fprintf(output,"ID3LIB_MAJOR=%d\nID3LIB_MINOR=%d\nID3LIB_PATCH=%d\n",
-	ID3LIB_MAJOR_VERSION,ID3LIB_MINOR_VERSION,ID3LIB_PATCH_VERSION);
-    fclose(output);
-    exit(0);
-}
-], . ./conftest.id3
-   echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}", 
-   AC_MSG_WARN(could not determine id3lib version),[echo $ac_n "cross compiling; assuming ${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH} $ac_c"])
-   AC_DEFINE_UNQUOTED(ID3LIB_MAJOR, $ID3LIB_MAJOR, [Description])
-   AC_DEFINE_UNQUOTED(ID3LIB_MINOR, $ID3LIB_MINOR, [Description])
-   AC_DEFINE_UNQUOTED(ID3LIB_PATCH, $ID3LIB_PATCH, [Description])
-fi
 AC_SUBST(ID3_LIBS)
 LIBS=$id3_libs_bak
 
@@ -141,10 +127,9 @@
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
 
-AC_OUTPUT([
+AC_OUTPUT([ po/Makefile.in
 Makefile
 src/Makefile
-po/Makefile.in
 pixmaps/Makefile
 doc/Makefile
 doc/C/Makefile

grip-3.10.1.tar.gz/contrib/Makefile.in -> grip-4.1.1.tar.gz/contrib/Makefile.in Changed

grip-3.10.1.tar.gz/doc/C/Makefile.am -> grip-4.1.1.tar.gz/doc/C/Makefile.am Changed

grip-3.10.1.tar.gz/doc/C/Makefile.in -> grip-4.1.1.tar.gz/doc/C/Makefile.in Changed

grip-4.1.1.tar.gz/doc/C/meson.build Added

@@ -0,0 +1,52 @@
+help_files = [
+  'grip.xml',
+  'cdconfig.png',
+  'cdplayer.png',
+  'cdplayersmall.png',
+  'cdscan.png',
+  'discdbconfig.png',
+  'discdb.png',
+  'editing.png',
+  'eject.png',
+  'encprog.png',
+  'ffwd.png',
+  'grip-logo.png',
+  'id3config.png',
+  'minmax.png',
+  'miscconfig.png',
+  'modeinterface.png',
+  'mp3config2.png',
+  'mp3config.png',
+  'multiartist.png',
+  'nexttrk.png',
+  'playloop.png',
+  'playnormal.png',
+  'playonce.png',
+  'playpause.png',
+  'playplaylist.png',
+  'playrandom.png',
+  'prevtrk.png',
+  'progtrack.png',
+  'proxyconfig.png',
+  'quit.png',
+  'rewind.png',
+  'ripconfig2.png',
+  'ripconfig3.png',
+  'ripconfig.png',
+  'ripping.png',
+  'ripprog.png',
+  'ripsmall.png',
+  'smile1.png',
+  'smile2.png',
+  'smile3.png',
+  'smile4.png',
+  'smile5.png',
+  'smile6.png',
+  'smile7.png',
+  'smile8.png',
+  'stop.png',
+  'trkedit.png',
+  'volume.png',
+]
+
+install_data(help_files, install_dir: join_paths(grip_helpdir, 'C'))

grip-3.10.1.tar.gz/doc/Makefile.in -> grip-4.1.1.tar.gz/doc/Makefile.in Changed

grip-3.10.1.tar.gz/grip.1 -> grip-4.1.1.tar.gz/grip.1 Changed

@@ -1,16 +1,12 @@
-.TH grip 1 "2018-05-22" "" ""
+.TH grip 1 "2020-01-18" "" ""
 .SH NAME
 \fBgrip \fP- A gtk-based cd-player and cd-ripper.
-.PP
-\fBgcd \fP- A gtk-based cd-player (used as part of grip, or alone).
 \fB
 .SH SYNOPSIS
 .nf
 .fam C
 \fBgrip\fP [\fB-d\fP <device>] [\fB-s\fP] [\fB-l\fP]
 
-\fBgcd\fP [\fB-d\fP <device>] [\fB-f\fP] [\fB-l\fP]
-
 .fam T
 .fi
 .fam T
@@ -22,57 +18,44 @@
 encoders, letting you take a disc and transform it easily straight into
 MP3s. The CDDB protocol is supported for retrieving track information
 from disc database servers. Grip works with DigitalDJ to provide a
-unified "computerized" version of your music collection. GCD is the cd-
-player only version of Grip.
-.PP
-Because Grip and GCD share much of their functionality, this file
-documents both of them. If you installed only GCD, you should ignore
-the bits that talk about "ripping" and "encoding" of tracks.
+unified "computerized" version of your music collection.
 .PP
 Grip is designed to work closely with DigitalDJ, my SQL-based mp3
 jukebox system (although it does not require it).
 .SH OPTIONS
 These are the command-line options for \fBgrip\fP:
-.PP
-\fB-d\fP <device>
-Use <device> as the cd-rom device (default: /dev/cdrom).
 .TP
 .B
-\fB-s\fP
-Launch \fBgrip\fP in a "small" (cd-only) mode.
+\fB-c, --config=CONFIG\fP
+Specify the config file to use (in your home dir)
 .TP
 .B
-\fB-l\fP
-"local" mode -- don't try to use CDDB.
+\fB-d, --device=DEVICE\fP
+Use <device> as the cd-rom device (default: /dev/cdrom).
 .TP
 .B
-\fB--version\fP
-Print version string, and exit.
+\fB-s, --small\fP
+Launch \fBgrip\fP in a "small" (cd-only) mode.
 .TP
 .B
-\fB-v\fP
-Verbose (debug) mode.
-.PP
-These are \fBgcd\fP's command-line options:
-.PP
-\fB-d\fP <device>
-Use <device> as the cd-rom device (default: /dev/cdrom).
+\fB-l, --local\fP
+"local" mode -- don't try to use CDDB.
 .TP
 .B
-\fB-f\fP
-Launch \fBgcd\fP in "full" (track-display) mode.
+\fB--no-redirect\fP
+Do not do I/O redirection
 .TP
 .B
-\fB-l\fP
-"local" mode -- Don't try to use CDDB.
+\fB-v, --version\fP
+Print version string, and exit.
 .TP
 .B
-\fB-v\fP
+\fB--verbose\fP
 Verbose (debug) mode.
+.PP
 .SH USAGE
-The most handy way to launch Grip/GCD is from your window manager's
-doc. A dock icon (gripicon.tif/gcdicon.tif) is included with the
-distribution.
+The most handy way to launch Grip is from your window manager's
+doc. A dock icon is included with the distribution.
 .PP
 Grip's operation should be pretty self-explanatory. Tracks to rip are
 selected with the right mouse button. To select all tracks on the disc,
@@ -81,15 +64,6 @@
 selected. If you select "Rip partial track", only the current select of
 the current track will be ripped or encoded. Start/End sector values
 are ignored if partial track ripping is not enabled.
-.PP
-Grip and GCD used to be installed as setuid root. This was for several
-reasons. First, most people have their systems configured such that
-their user account does not have access to the cd drive. Secondly,
-cdparanoia requires access to both the cd device and (for SCSI drives)
-the generic SCSI device (usually /dev/sg<something>). Despite this, I
-no longer install the programs setuid root. This means that you will
-have to set the permissions correctly on the appropriate devices, or
-run the program as root.
 .SH CONFIGURATION
 The "Config" menu allows you to configure your ripping program and your
 CDDB database. Rip/Encode/ID3 options are only available in Grip.
@@ -102,7 +76,7 @@
 If this is not selected, Grip will stop play when it starts and
 when it stops.
 .TP
-.B Rewind when stopped
+Rewind when stopped
 If selected, Grip will rewind to the first track when play is
 stopped.
 .TP
@@ -401,12 +375,12 @@
 advertisements in Grip and restrict you, the user, to use only their
 databases. I am against this commercial use of the track information
 submitted by users such as yourself. For this reason, I encourage you
-to use free servers, such as "freecddb.freecddb.org".
+to use free servers, such as "freedb.freedb.org".
 .SH
 License and Disclaimer
-Grip and GCD are Copyright (c) 1998 by Mike Oliphant. Grip and GCD may
-be used and distributed under the terms of the GNU General Public
-License. All other brand and product names are trademarks, registered
+Grip are Copyright (c) 1998 by Mike Oliphant. Grip may be used
+and distributed under the terms of the GNU General Public License.
+All other brand and product names are trademarks, registered
 trademarks or service marks of their respective holders.
 .PP
 These programs are distributed in the hope that it will be useful, but
@@ -459,7 +433,7 @@
 *
 Everyone else who has given me feedback and helped test Grip
 .SH BUGS
-If you have trouble with Grip or GCD, read the "FAQ" section in the
+If you have trouble with Grip, read the "FAQ" section in the
 built in manual.  If you still have a question after reading through
 this document carefully, or have a feature request, feel free to
 send an email to the mailinglist, or open a bug repport on the
@@ -468,7 +442,7 @@
 .SH CHANGES
 See the ChangeLog file that came with the source code.
 .SH AUTHOR
-Grip and GCD written by Mike Oliphant (oliphant@gtk.org)
+Grip written by Mike Oliphant (oliphant@gtk.org)
 .br
 Documentation formatting by Aaron Sherman (ajs@ajs.com)
 .br

grip-4.1.1.tar.gz/m4 Added

grip-4.1.1.tar.gz/m4/gettext.m4 Added

@@ -0,0 +1,401 @@
+# gettext.m4 serial 66 (gettext-0.18.2)
+dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
+
+dnl Macro to add for using GNU gettext.
+
+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
+dnl    default (if it is not specified or empty) is 'no-libtool'.
+dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
+dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
+dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
+dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
+dnl    depending on --{enable,disable}-{shared,static} and on the presence of
+dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
+dnl    $(top_builddir)/intl/libintl.a will be created.
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
+dnl    implementations (in libc or libintl) without the ngettext() function
+dnl    will be ignored.  If NEEDSYMBOL is specified and is
+dnl    'need-formatstring-macros', then GNU gettext implementations that don't
+dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
+dnl INTLDIR is used to find the intl libraries.  If empty,
+dnl    the value '$(top_builddir)/intl/' is used.
+dnl
+dnl The result of the configuration is one of three cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl    and used.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) No internationalization, always use English msgid.
+dnl    Catalog format: none
+dnl    Catalog extension: none
+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
+dnl but we keep it in order not to force irrelevant filename changes on the
+dnl maintainers.
+dnl
+AC_DEFUN([AM_GNU_GETTEXT],
+[
+  dnl Argument checking.
+  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
+    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
+])])])])])
+  ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
+    [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
+  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
+    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
+])])])])
+  define([gt_included_intl],
+    ifelse([$1], [external],
+      ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
+      [yes]))
+  define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
+  gt_NEEDS_INIT
+  AM_GNU_GETTEXT_NEED([$2])
+
+  AC_REQUIRE([AM_PO_SUBDIRS])dnl
+  ifelse(gt_included_intl, yes, [
+    AC_REQUIRE([AM_INTL_SUBDIR])dnl
+  ])
+
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Sometimes libintl requires libiconv, so first search for libiconv.
+  dnl Ideally we would do this search only after the
+  dnl      if test "$USE_NLS" = "yes"; then
+  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
+  dnl the configure script would need to contain the same shell code
+  dnl again, outside any 'if'. There are two solutions:
+  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
+  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
+  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
+  dnl documented, we avoid it.
+  ifelse(gt_included_intl, yes, , [
+    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+  ])
+
+  dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
+  gt_INTL_MACOSX
+
+  dnl Set USE_NLS.
+  AC_REQUIRE([AM_NLS])
+
+  ifelse(gt_included_intl, yes, [
+    BUILD_INCLUDED_LIBINTL=no
+    USE_INCLUDED_LIBINTL=no
+  ])
+  LIBINTL=
+  LTLIBINTL=
+  POSUB=
+
+  dnl Add a version number to the cache macros.
+  case " $gt_needs " in
+    *" need-formatstring-macros "*) gt_api_version=3 ;;
+    *" need-ngettext "*) gt_api_version=2 ;;
+    *) gt_api_version=1 ;;
+  esac
+  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
+  dnl If we use NLS figure out what method
+  if test "$USE_NLS" = "yes"; then
+    gt_use_preinstalled_gnugettext=no
+    ifelse(gt_included_intl, yes, [
+      AC_MSG_CHECKING([whether included gettext is requested])
+      AC_ARG_WITH([included-gettext],
+        [  --with-included-gettext use the GNU gettext library included here],
+        nls_cv_force_use_gnu_gettext=$withval,
+        nls_cv_force_use_gnu_gettext=no)
+      AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
+
+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+    ])
+        dnl User does not insist on using GNU NLS library.  Figure out what
+        dnl to use.  If GNU gettext is available we use this.  Else we have
+        dnl to fall back to GNU NLS library.
+
+        if test $gt_api_version -ge 3; then
+          gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+'
+        else
+          gt_revision_test_code=
+        fi
+        if test $gt_api_version -ge 2; then
+          gt_expression_test_code=' + * ngettext ("", "", 0)'
+        else
+          gt_expression_test_code=
+        fi
+
+        AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
+         [AC_LINK_IFELSE(
+            [AC_LANG_PROGRAM(
+               [[
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;
+               ]],
+               [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+               ]])],
+            [eval "$gt_func_gnugettext_libc=yes"],
+            [eval "$gt_func_gnugettext_libc=no"])])
+
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+          dnl Sometimes libintl requires libiconv, so first search for libiconv.
+          ifelse(gt_included_intl, yes, , [
+            AM_ICONV_LINK
+          ])
+          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
+          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
+          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
+          dnl even if libiconv doesn't exist.
+          AC_LIB_LINKFLAGS_BODY([intl])
+          AC_CACHE_CHECK([for GNU gettext in libintl],
+            [$gt_func_gnugettext_libintl],
+           [gt_save_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $INCINTL"
+            gt_save_LIBS="$LIBS"
+            LIBS="$LIBS $LIBINTL"
+            dnl Now see whether libintl exists and does not depend on libiconv.
+            AC_LINK_IFELSE(
+              [AC_LANG_PROGRAM(
+                 [[
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+                 ]],
+                 [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+                 ]])],
+              [eval "$gt_func_gnugettext_libintl=yes"],
+              [eval "$gt_func_gnugettext_libintl=no"])
+            dnl Now see whether libintl exists and depends on libiconv.
+            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
+              LIBS="$LIBS $LIBICONV"
+              AC_LINK_IFELSE(
+                [AC_LANG_PROGRAM(
+                   [[
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+                   ]],
+                   [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+                   ]])],
+                [LIBINTL="$LIBINTL $LIBICONV"
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                 eval "$gt_func_gnugettext_libintl=yes"
+                ])
+            fi
+            CPPFLAGS="$gt_save_CPPFLAGS"
+            LIBS="$gt_save_LIBS"])
+        fi
+
+        dnl If an already present or preinstalled GNU gettext() is found,
+        dnl use it.  But if this macro is used in GNU gettext, and GNU
+        dnl gettext is already preinstalled in libintl, we update this
+        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+                && test "$PACKAGE" != gettext-runtime \
+                && test "$PACKAGE" != gettext-tools; }; then
+          gt_use_preinstalled_gnugettext=yes
+        else
+          dnl Reset the values set by searching for libintl.
+          LIBINTL=
+          LTLIBINTL=
+          INCINTL=
+        fi
+
+    ifelse(gt_included_intl, yes, [
+        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
+          dnl GNU gettext is not found in the C library.
+          dnl Fall back on included GNU gettext library.
+          nls_cv_use_gnu_gettext=yes
+        fi
+      fi
+
+      if test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions used to generate GNU NLS library.
+        BUILD_INCLUDED_LIBINTL=yes
+        USE_INCLUDED_LIBINTL=yes
+        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
+        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
+        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+      fi
+
+      CATOBJEXT=
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions to use GNU gettext tools.
+        CATOBJEXT=.gmo
+      fi
+    ])
+
+    if test -n "$INTL_MACOSX_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Some extra flags are needed during linking.
+        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+      fi
+    fi
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes" \
+       || test "$nls_cv_use_gnu_gettext" = "yes"; then
+      AC_DEFINE([ENABLE_NLS], [1],
+        [Define to 1 if translation of program messages to the user's native language
+   is requested.])
+    else
+      USE_NLS=no
+    fi
+  fi
+
+  AC_MSG_CHECKING([whether to use NLS])
+  AC_MSG_RESULT([$USE_NLS])
+  if test "$USE_NLS" = "yes"; then
+    AC_MSG_CHECKING([where the gettext function comes from])
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        gt_source="external libintl"
+      else
+        gt_source="libc"
+      fi
+    else
+      gt_source="included intl directory"
+    fi
+    AC_MSG_RESULT([$gt_source])
+  fi
+
+  if test "$USE_NLS" = "yes"; then
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        AC_MSG_CHECKING([how to link with libintl])
+        AC_MSG_RESULT([$LIBINTL])
+        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
+      fi
+
+      dnl For backward compatibility. Some packages may be using this.
+      AC_DEFINE([HAVE_GETTEXT], [1],
+       [Define if the GNU gettext() function is already present or preinstalled.])
+      AC_DEFINE([HAVE_DCGETTEXT], [1],
+       [Define if the GNU dcgettext() function is already present or preinstalled.])
+    fi
+
+    dnl We need to process the po/ directory.
+    POSUB=po
+  fi
+
+  ifelse(gt_included_intl, yes, [
+    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
+    dnl to 'yes' because some of the testsuite requires it.
+    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
+      BUILD_INCLUDED_LIBINTL=yes
+    fi
+
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST([BUILD_INCLUDED_LIBINTL])
+    AC_SUBST([USE_INCLUDED_LIBINTL])
+    AC_SUBST([CATOBJEXT])
+
+    dnl For backward compatibility. Some configure.ins may be using this.
+    nls_cv_header_intl=
+    nls_cv_header_libgt=
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    DATADIRNAME=share
+    AC_SUBST([DATADIRNAME])
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INSTOBJEXT=.mo
+    AC_SUBST([INSTOBJEXT])
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    GENCAT=gencat
+    AC_SUBST([GENCAT])
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INTLOBJS=
+    if test "$USE_INCLUDED_LIBINTL" = yes; then
+      INTLOBJS="\$(GETTOBJS)"
+    fi
+    AC_SUBST([INTLOBJS])
+
+    dnl Enable libtool support if the surrounding package wishes it.
+    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
+    AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
+  ])
+
+  dnl For backward compatibility. Some Makefiles may be using this.
+  INTLLIBS="$LIBINTL"
+  AC_SUBST([INTLLIBS])
+
+  dnl Make all documented variables known to autoconf.
+  AC_SUBST([LIBINTL])
+  AC_SUBST([LTLIBINTL])
+  AC_SUBST([POSUB])
+])
+
+
+dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
+m4_define([gt_NEEDS_INIT],
+[
+  m4_divert_text([DEFAULTS], [gt_needs=])
+  m4_define([gt_NEEDS_INIT], [])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
+AC_DEFUN([AM_GNU_GETTEXT_NEED],
+[
+  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])

grip-4.1.1.tar.gz/m4/iconv.m4 Added

@@ -0,0 +1,271 @@
+# iconv.m4 serial 19 (gettext-0.18.2)
+dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
+[
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([iconv])
+])
+
+AC_DEFUN([AM_ICONV_LINK],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+
+  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed libiconv and not disabled its use
+  dnl via --without-libiconv-prefix, he wants to use it. The first
+  dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
+  am_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
+
+  AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM(
+         [[
+#include <stdlib.h>
+#include <iconv.h>
+         ]],
+         [[iconv_t cd = iconv_open("","");
+           iconv(cd,NULL,NULL,NULL,NULL);
+           iconv_close(cd);]])],
+      [am_cv_func_iconv=yes])
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS $LIBICONV"
+      AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[
+#include <stdlib.h>
+#include <iconv.h>
+           ]],
+           [[iconv_t cd = iconv_open("","");
+             iconv(cd,NULL,NULL,NULL,NULL);
+             iconv_close(cd);]])],
+        [am_cv_lib_iconv=yes]
+        [am_cv_func_iconv=yes])
+      LIBS="$am_save_LIBS"
+    fi
+  ])
+  if test "$am_cv_func_iconv" = yes; then
+    AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
+      dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
+      dnl Solaris 10.
+      am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      am_cv_func_iconv_works=no
+      for ac_iconv_const in '' 'const'; do
+        AC_RUN_IFELSE(
+          [AC_LANG_PROGRAM(
+             [[
+#include <iconv.h>
+#include <string.h>
+
+#ifndef ICONV_CONST
+# define ICONV_CONST $ac_iconv_const
+#endif
+             ]],
+             [[int result = 0;
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
+  /* Test against Solaris 10 bug: Failures are not distinguishable from
+     successful returns.  */
+  {
+    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+    if (cd_ascii_to_88591 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\263";
+        char buf[10];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_ascii_to_88591,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_ascii_to_88591);
+      }
+  }
+  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\304";
+        static char buf[2] = { (char)0xDE, (char)0xAD };
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
+          result |= 4;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    result |= 16;
+  return result;
+]])],
+          [am_cv_func_iconv_works=yes], ,
+          [case "$host_os" in
+             aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+             *)            am_cv_func_iconv_works="guessing yes" ;;
+           esac])
+        test "$am_cv_func_iconv_works" = no || break
+      done
+      LIBS="$am_save_LIBS"
+    ])
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
+    AC_DEFINE([HAVE_ICONV], [1],
+      [Define if you have the iconv() function and it works.])
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    AC_MSG_CHECKING([how to link with libiconv])
+    AC_MSG_RESULT([$LIBICONV])
+  else
+    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
+    dnl either.
+    CPPFLAGS="$am_save_CPPFLAGS"
+    LIBICONV=
+    LTLIBICONV=
+  fi
+  AC_SUBST([LIBICONV])
+  AC_SUBST([LTLIBICONV])
+])
+
+dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
+dnl avoid warnings like
+dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
+dnl This is tricky because of the way 'aclocal' is implemented:
+dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
+dnl   Otherwise aclocal's initial scan pass would miss the macro definition.
+dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
+dnl   Otherwise aclocal would emit many "Use of uninitialized value $1"
+dnl   warnings.
+m4_define([gl_iconv_AC_DEFUN],
+  m4_version_prereq([2.64],
+    [[AC_DEFUN_ONCE(
+        [$1], [$2])]],
+    [m4_ifdef([gl_00GNULIB],
+       [[AC_DEFUN_ONCE(
+           [$1], [$2])]],
+       [[AC_DEFUN(
+           [$1], [$2])]])]))
+gl_iconv_AC_DEFUN([AM_ICONV],
+[
+  AM_ICONV_LINK
+  if test "$am_cv_func_iconv" = yes; then
+    AC_MSG_CHECKING([for iconv declaration])
+    AC_CACHE_VAL([am_cv_proto_iconv], [
+      AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+           ]],
+           [[]])],
+        [am_cv_proto_iconv_arg1=""],
+        [am_cv_proto_iconv_arg1="const"])
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+    AC_MSG_RESULT([
+         $am_cv_proto_iconv])
+    AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
+      [Define as const if the declaration of iconv() needs const.])
+    dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
+    m4_ifdef([gl_ICONV_H_DEFAULTS],
+      [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
+       if test -n "$am_cv_proto_iconv_arg1"; then
+         ICONV_CONST="const"
+       fi
+      ])
+  fi
+])

grip-4.1.1.tar.gz/m4/intlmacosx.m4 Added

@@ -0,0 +1,56 @@
+# intlmacosx.m4 serial 5 (gettext-0.18.2)
+dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Checks for special options needed on Mac OS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
+[
+  dnl Check for API introduced in Mac OS X 10.2.
+  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+    [gt_cv_func_CFPreferencesCopyAppValue],
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <CoreFoundation/CFPreferences.h>]],
+          [[CFPreferencesCopyAppValue(NULL, NULL)]])],
+       [gt_cv_func_CFPreferencesCopyAppValue=yes],
+       [gt_cv_func_CFPreferencesCopyAppValue=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
+      [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+  fi
+  dnl Check for API introduced in Mac OS X 10.3.
+  AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <CoreFoundation/CFLocale.h>]],
+          [[CFLocaleCopyCurrent();]])],
+       [gt_cv_func_CFLocaleCopyCurrent=yes],
+       [gt_cv_func_CFLocaleCopyCurrent=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
+      [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+  AC_SUBST([INTL_MACOSX_LIBS])
+])

grip-4.1.1.tar.gz/m4/lib-ld.m4 Added

@@ -0,0 +1,119 @@
+# lib-ld.m4 serial 6
+dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Subroutines of libtool.m4,
+dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
+dnl collision with libtool.m4.
+
+dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
+AC_DEFUN([AC_LIB_PROG_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes
+  ;;
+*)
+  acl_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$acl_cv_prog_gnu_ld
+])
+
+dnl From libtool-2.4. Sets the variable LD.
+AC_DEFUN([AC_LIB_PROG_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+        [assume the C compiler uses GNU ld [default=no]])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  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
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
+      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
+        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL([acl_cv_path_LD],
+[if test -z "$LD"; then
+  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$acl_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      acl_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 `"$acl_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="$acl_save_ifs"
+else
+  acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT([$LD])
+else
+  AC_MSG_RESULT([no])
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_LIB_PROG_LD_GNU
+])

grip-4.1.1.tar.gz/m4/lib-link.m4 Added

@@ -0,0 +1,777 @@
+# lib-link.m4 serial 26 (gettext-0.18.2)
+dnl Copyright (C) 2001-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_PREREQ([2.54])
+
+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  pushdef([Name],[m4_translit([$1],[./+-], [____])])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+    AC_LIB_LINKFLAGS_BODY([$1], [$2])
+    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+    ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
+  ])
+  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+  LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+  dnl results of this search when this library appears as a dependency.
+  HAVE_LIB[]NAME=yes
+  popdef([NAME])
+  popdef([Name])
+])
+
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
+dnl searches for libname and the libraries corresponding to explicit and
+dnl implicit dependencies, together with the specified include files and
+dnl the ability to compile and link the specified testcode. The missing-message
+dnl defaults to 'no' and may contain additional hints for the user.
+dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
+dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  pushdef([Name],[m4_translit([$1],[./+-], [____])])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+
+  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([$1], [$2])
+
+  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed lib[]Name and not disabled its use
+  dnl via --without-lib[]Name-prefix, he wants to use it.
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+
+  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+    ac_save_LIBS="$LIBS"
+    dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
+    dnl because these -l options might require -L options that are present in
+    dnl LIBS. -l options benefit only from the -L options listed before it.
+    dnl Otherwise, add it to the front of LIBS, because it may be a static
+    dnl library that depends on another static library that is present in LIBS.
+    dnl Static libraries benefit only from the static libraries listed after
+    dnl it.
+    case " $LIB[]NAME" in
+      *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
+      *)       LIBS="$LIB[]NAME $LIBS" ;;
+    esac
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM([[$3]], [[$4]])],
+      [ac_cv_lib[]Name=yes],
+      [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
+    LIBS="$ac_save_LIBS"
+  ])
+  if test "$ac_cv_lib[]Name" = yes; then
+    HAVE_LIB[]NAME=yes
+    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
+    AC_MSG_CHECKING([how to link with lib[]$1])
+    AC_MSG_RESULT([$LIB[]NAME])
+  else
+    HAVE_LIB[]NAME=no
+    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
+    dnl $INC[]NAME either.
+    CPPFLAGS="$ac_save_CPPFLAGS"
+    LIB[]NAME=
+    LTLIB[]NAME=
+    LIB[]NAME[]_PREFIX=
+  fi
+  AC_SUBST([HAVE_LIB]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  popdef([NAME])
+  popdef([Name])
+])
+
+dnl Determine the platform dependent parameters needed to use rpath:
+dnl   acl_libext,
+dnl   acl_shlibext,
+dnl   acl_libname_spec,
+dnl   acl_library_names_spec,
+dnl   acl_hardcode_libdir_flag_spec,
+dnl   acl_hardcode_libdir_separator,
+dnl   acl_hardcode_direct,
+dnl   acl_hardcode_minus_L.
+AC_DEFUN([AC_LIB_RPATH],
+[
+  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
+  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
+  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
+  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
+  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
+  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+  AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_rpath=done
+  ])
+  wl="$acl_cv_wl"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE([rpath],
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
+])
+
+dnl AC_LIB_FROMPACKAGE(name, package)
+dnl declares that libname comes from the given package. The configure file
+dnl will then not have a --with-libname-prefix option but a
+dnl --with-package-prefix option. Several libraries can come from the same
+dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
+dnl macro call that searches for libname.
+AC_DEFUN([AC_LIB_FROMPACKAGE],
+[
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  define([acl_frompackage_]NAME, [$2])
+  popdef([NAME])
+  pushdef([PACK],[$2])
+  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
+                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  define([acl_libsinpackage_]PACKUP,
+    m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
+  popdef([PACKUP])
+  popdef([PACK])
+])
+
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
+  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
+                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
+  dnl Autoconf >= 2.61 supports dots in --with options.
+  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_ARG_WITH(P_A_C_K[-prefix],
+[[  --with-]]P_A_C_K[[-prefix[=DIR]  search for ]PACKLIBS[ in DIR/include and DIR/lib
+  --without-]]P_A_C_K[[-prefix     don't search for ]PACKLIBS[ in includedir and libdir]],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+        if test "$acl_libdirstem2" != "$acl_libdirstem" \
+           && ! test -d "$withval/$acl_libdirstem"; then
+          additional_libdir="$withval/$acl_libdirstem2"
+        fi
+      fi
+    fi
+])
+  dnl Search the library and its dependencies in $additional_libdir and
+  dnl $LDFLAGS. Using breadth-first-seach.
+  LIB[]NAME=
+  LTLIB[]NAME=
+  INC[]NAME=
+  LIB[]NAME[]_PREFIX=
+  dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
+  dnl computed. So it has to be reset here.
+  HAVE_LIB[]NAME=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='$1 $2'
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
+        dnl or AC_LIB_HAVE_LINKFLAGS call.
+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
+          else
+            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
+            dnl that this library doesn't exist. So just drop it.
+            :
+          fi
+        else
+          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
+          dnl and the already constructed $LIBNAME/$LTLIBNAME.
+          found_dir=
+          found_la=
+          found_so=
+          found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
+          if test $use_additional = yes; then
+            dir="$additional_libdir"
+            dnl The same code as in the loop below:
+            dnl First look for a shared library.
+            if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
+                fi
+              fi
+            fi
+            dnl Then look for a static library.
+            if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIB[]NAME; do
+              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                  dnl First look for a shared library.
+                  if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                  dnl Then look for a static library.
+                  if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+            dnl Found the library.
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+              dnl Linking with a shared library. We attempt to hardcode its
+              dnl directory into the executable's runpath, unless it's the
+              dnl standard /usr/lib.
+              if test "$enable_rpath" = no \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+                dnl No hardcoding is needed.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+              else
+                dnl Use an explicit option to hardcode DIR into the resulting
+                dnl binary.
+                dnl Potentially add DIR to ltrpathdirs.
+                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                dnl The hardcoding into $LIBNAME is system dependent.
+                if test "$acl_hardcode_direct" = yes; then
+                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+                  dnl resulting binary.
+                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                else
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                    dnl Use an explicit option to hardcode DIR into the resulting
+                    dnl binary.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    dnl Potentially add DIR to rpathdirs.
+                    dnl The rpathdirs will be appended to $LIBNAME at the end.
+                    haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                    dnl Rely on "-L$found_dir".
+                    dnl But don't add it if it's already contained in the LDFLAGS
+                    dnl or the already constructed $LIBNAME
+                    haveit=
+                    for x in $LDFLAGS $LIB[]NAME; do
+                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+                    fi
+                    if test "$acl_hardcode_minus_L" != no; then
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    else
+                      dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
+                      dnl here, because this doesn't fit in flags passed to the
+                      dnl compiler. So give up. No hardcoding. This affects only
+                      dnl very old systems.
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                dnl Linking with a static library.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
+              else
+                dnl We shouldn't come here, but anyway it's good to have a
+                dnl fallback.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
+              fi
+            fi
+            dnl Assume the include files are nearby.
+            additional_includedir=
+            case "$found_dir" in
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                if test "$name" = '$1'; then
+                  LIB[]NAME[]_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = '$1'; then
+                  LIB[]NAME[]_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+              dnl Potentially add $additional_includedir to $INCNAME.
+              dnl But don't add it
+              dnl   1. if it's the standard /usr/include,
+              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
+              dnl   3. if it's already present in $CPPFLAGS or the already
+              dnl      constructed $INCNAME,
+              dnl   4. if it doesn't exist as a directory.
+              if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INC[]NAME; do
+                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                      dnl Really add $additional_includedir to $INCNAME.
+                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+            dnl Look for dependencies.
+            if test -n "$found_la"; then
+              dnl Read the .la file. It defines the variables
+              dnl dlname, library_names, old_library, dependency_libs, current,
+              dnl age, revision, installed, dlopen, dlpreopen, libdir.
+              save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+              dnl We use only dependency_libs.
+              for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
+                    dnl But don't add it
+                    dnl   1. if it's the standard /usr/lib,
+                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
+                    dnl   3. if it's already present in $LDFLAGS or the already
+                    dnl      constructed $LIBNAME,
+                    dnl   4. if it doesn't exist as a directory.
+                    if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LIBNAME.
+                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LTLIBNAME.
+                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                    dnl Handle this in the next round.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                    dnl Handle this in the next round. Throw away the .la's
+                    dnl directory; it is already contained in a preceding -L
+                    dnl option.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                    dnl Most likely an immediate library name.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+            dnl Didn't find the library; assume it is in the system directories
+            dnl known to the linker and runtime loader. (All the system
+            dnl directories known to the linker should also be known to the
+            dnl runtime loader, otherwise the system is severely misconfigured.)
+            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
+      dnl Weird platform: only the last -rpath option counts, the user must
+      dnl pass all path elements in one option. We can arrange that for a
+      dnl single library, but not when more than one $LIBNAMEs are used.
+      alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+      done
+      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
+      acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+    else
+      dnl The -rpath options are cumulative.
+      for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+    dnl When using libtool, the option that works for both libraries and
+    dnl executables is -R. The -R options are cumulative.
+    for found_dir in $ltrpathdirs; do
+      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+    done
+  fi
+  popdef([P_A_C_K])
+  popdef([PACKLIBS])
+  popdef([PACKUP])
+  popdef([PACK])
+  popdef([NAME])
+])
+
+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
+AC_DEFUN([AC_LIB_APPENDTOVAR],
+[
+  for element in [$2]; do
+    haveit=
+    for x in $[$1]; do
+      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      [$1]="${[$1]}${[$1]:+ }$element"
+    fi
+  done
+])
+
+dnl For those cases where a variable contains several -L and -l options
+dnl referring to unknown libraries and directories, this macro determines the
+dnl necessary additional linker options for the runtime path.
+dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
+dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
+dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
+dnl otherwise linking without libtool is assumed.
+AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+[
+  AC_REQUIRE([AC_LIB_RPATH])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  $1=
+  if test "$enable_rpath" != no; then
+    if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+      dnl Use an explicit option to hardcode directories into the resulting
+      dnl binary.
+      rpathdirs=
+      next=
+      for opt in $2; do
+        if test -n "$next"; then
+          dir="$next"
+          dnl No need to hardcode the standard /usr/lib.
+          if test "X$dir" != "X/usr/$acl_libdirstem" \
+             && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+            rpathdirs="$rpathdirs $dir"
+          fi
+          next=
+        else
+          case $opt in
+            -L) next=yes ;;
+            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
+                 dnl No need to hardcode the standard /usr/lib.
+                 if test "X$dir" != "X/usr/$acl_libdirstem" \
+                    && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+                   rpathdirs="$rpathdirs $dir"
+                 fi
+                 next= ;;
+            *) next= ;;
+          esac
+        fi
+      done
+      if test "X$rpathdirs" != "X"; then
+        if test -n ""$3""; then
+          dnl libtool is used for linking. Use -R options.
+          for dir in $rpathdirs; do
+            $1="${$1}${$1:+ }-R$dir"
+          done
+        else
+          dnl The linker is used for linking directly.
+          if test -n "$acl_hardcode_libdir_separator"; then
+            dnl Weird platform: only the last -rpath option counts, the user
+            dnl must pass all path elements in one option.
+            alldirs=
+            for dir in $rpathdirs; do
+              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
+            done
+            acl_save_libdir="$libdir"
+            libdir="$alldirs"
+            eval flag=\"$acl_hardcode_libdir_flag_spec\"
+            libdir="$acl_save_libdir"
+            $1="$flag"
+          else
+            dnl The -rpath options are cumulative.
+            for dir in $rpathdirs; do
+              acl_save_libdir="$libdir"
+              libdir="$dir"
+              eval flag=\"$acl_hardcode_libdir_flag_spec\"
+              libdir="$acl_save_libdir"
+              $1="${$1}${$1:+ }$flag"
+            done
+          fi
+        fi
+      fi
+    fi
+  fi
+  AC_SUBST([$1])
+])

grip-4.1.1.tar.gz/m4/lib-prefix.m4 Added

@@ -0,0 +1,224 @@
+# lib-prefix.m4 serial 7 (gettext-0.18)
+dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
+dnl require excessive bracketing.
+ifdef([AC_HELP_STRING],
+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
+dnl to access previously installed libraries. The basic assumption is that
+dnl a user will want packages to use other packages he previously installed
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+AC_DEFUN([AC_LIB_PREFIX],
+[
+  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_LIB_ARG_WITH([lib-prefix],
+[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
+  --without-lib-prefix    don't search for libraries in includedir and libdir],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+      fi
+    fi
+])
+  if test $use_additional = yes; then
+    dnl Potentially add $additional_includedir to $CPPFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/include,
+    dnl   2. if it's already present in $CPPFLAGS,
+    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_includedir" != "X/usr/include"; then
+      haveit=
+      for x in $CPPFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-I$additional_includedir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_includedir" = "X/usr/local/include"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_includedir"; then
+            dnl Really add $additional_includedir to $CPPFLAGS.
+            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+          fi
+        fi
+      fi
+    fi
+    dnl Potentially add $additional_libdir to $LDFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/lib,
+    dnl   2. if it's already present in $LDFLAGS,
+    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+      haveit=
+      for x in $LDFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-L$additional_libdir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux*) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_libdir"; then
+            dnl Really add $additional_libdir to $LDFLAGS.
+            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+          fi
+        fi
+      fi
+    fi
+  fi
+])
+
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
+dnl acl_final_exec_prefix, containing the values to which $prefix and
+dnl $exec_prefix will expand at the end of the configure script.
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
+[
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
+dnl variables prefix and exec_prefix bound to the values they will have
+dnl at the end of the configure script.
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+[
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  $1
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_PREPARE_MULTILIB creates
+dnl - a variable acl_libdirstem, containing the basename of the libdir, either
+dnl   "lib" or "lib64" or "lib/64",
+dnl - a variable acl_libdirstem2, as a secondary possible value for
+dnl   acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
+dnl   "lib/amd64".
+AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
+[
+  dnl There is no formal standard regarding lib and lib64.
+  dnl On glibc systems, the current practice is that on a system supporting
+  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+  dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
+  dnl the compiler's default mode by looking at the compiler's library search
+  dnl path. If at least one of its elements ends in /lib64 or points to a
+  dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
+  dnl Otherwise we use the default, namely "lib".
+  dnl On Solaris systems, the current practice is that on a system supporting
+  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+  dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
+  dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  acl_libdirstem=lib
+  acl_libdirstem2=
+  case "$host_os" in
+    solaris*)
+      dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
+      dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
+      dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
+      dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
+      dnl symlink is missing, so we set acl_libdirstem2 too.
+      AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
+        [AC_EGREP_CPP([sixtyfour bits], [
+#ifdef _LP64
+sixtyfour bits
+#endif
+           ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
+        ])
+      if test $gl_cv_solaris_64bit = yes; then
+        acl_libdirstem=lib/64
+        case "$host_cpu" in
+          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
+          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+        esac
+      fi
+      ;;
+    *)
+      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+      if test -n "$searchpath"; then
+        acl_save_IFS="${IFS= 	}"; IFS=":"
+        for searchdir in $searchpath; do
+          if test -d "$searchdir"; then
+            case "$searchdir" in
+              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+              */../ | */.. )
+                # Better ignore directories of this form. They are misleading.
+                ;;
+              *) searchdir=`cd "$searchdir" && pwd`
+                 case "$searchdir" in
+                   */lib64 ) acl_libdirstem=lib64 ;;
+                 esac ;;
+            esac
+          fi
+        done
+        IFS="$acl_save_IFS"
+      fi
+      ;;
+  esac
+  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+])

grip-4.1.1.tar.gz/m4/libtool.m4 Added

@@ -0,0 +1,8372 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   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
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+# Copyright (C) 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.
+#
+# 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+])
+
+# serial 58 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.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
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS=$ltmain
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_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)
+# -------------------
+# 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],
+[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])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
+m4_require([_LT_CMD_TRUNCATE])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# 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
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test 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
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/$[["`$\\]]$/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/$[["`\\]]$/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from 'configure', and 'config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# 'config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain=$ac_aux_dir/ltmain.sh
+])# _LT_PROG_LTMAIN
+
+
+## ------------------------------------- ##
+## Accumulate code for creating libtool. ##
+## ------------------------------------- ##
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the 'libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+## ------------------------ ##
+## FIXME: Eliminate VARNAME ##
+## ------------------------ ##
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to 'config.status' so that its
+# declaration there will have the same value as in 'configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags='_LT_TAGS'dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into 'config.status', and then the shell code to quote escape them in
+# for loops in 'config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# '#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test 0 = "$lt_write_fail" && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+lt_cl_silent=false
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+'$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2011 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test 0 != $[#]
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try '$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try '$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+lt_cl_success=:
+test 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
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options that allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}"; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile=${ofile}T
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+# 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
+# ### END LIBTOOL CONFIG
+
+_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 set != "${COLLECT_NAMES+set}"; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "$LT_MULTI_MODULE"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS=$save_LDFLAGS
+    ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test 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
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+	10.[[012]][[,.]]*)
+	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test 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
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  if test 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
+  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
+    _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 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
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *$[^ ]*$ *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script 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
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+case $ECHO in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
+
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[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 #(
+ 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|'')
+   ;; #(
+ *)
+   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 where our libraries should be installed.])])
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test 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 AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE=32
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE=64
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out 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 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 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 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
+      *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"
+  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 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 AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*|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
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks=$enable_libtool_lock
+])# _LT_ENABLE_LOCK
+
+
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test 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 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test no = "$lt_cv_ar_at_file"; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[_LT_PROG_AR
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  bitrig* | openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"  ## 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\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test yes = "[$]$2"; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+])
+
+if test yes = "[$]$2"; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring=ABCD
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  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
+])
+if test -n "$lt_cv_sys_max_cmd_len"; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test yes = "$cross_compiling"; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -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
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test 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
+  beos*)
+    lt_cv_dlopen=load_add_on
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen=LoadLibrary
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+    # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
+    lt_cv_dlopen=dyld
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  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],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen=dlopen],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test no = "$lt_cv_dlopen"; then
+    enable_dlopen=no
+  else
+    enable_dlopen=yes
+  fi
+
+  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"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test 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
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links=nottested
+if test 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
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test no = "$hard_links"; then
+    AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
+  [Define to the sub-directory where libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
+
+  # We can hardcode non-existent directories.
+  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 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
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test 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 yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP"; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_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
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+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
+
+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'
+  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
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$[[a-zA-Z]]\$:| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[23]].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$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
+  ;;
+
+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
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test 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.
+  _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'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
+  # 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="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd* | 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
+  ;;
+
+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
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test yes = "$with_gnu_ld"; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=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
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+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
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([sys_lib_dlsearch_path_spec], [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 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_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$1"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac])
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program 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
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test no = "$withval" || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+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
+    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
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD=$ac_dir/$ac_prog
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test no != "$with_gnu_ld" && break
+	;;
+      *)
+	test yes != "$with_gnu_ld" && break
+	;;
+      esac
+    fi
+  done
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi])
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test 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
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
+])# _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
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# 'unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# 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]]*)
+  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
+  ;;
+
+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*)
+  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
+])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/$..$/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM=$NM
+else
+  lt_nm_to_check=${ac_tool_prefix}nm
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS=$lt_save_ifs
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	# 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
+  : ${lt_cv_path_NM=no}
+fi])
+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 -headers /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+  AC_SUBST([DUMPBIN])
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh;
+  # decide which 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
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test 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
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM=-lm)
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test yes = "$GCC"; then
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='$[[_A-Za-z]][[_A-Za-z0-9]]*$'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test 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
+
+# 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"
+
+  # 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'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT@&t@_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* .* $.*$$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS=conftstm.$ac_objext
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test yes = "$pipe_works"; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_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
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test 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 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*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test ia64 = "$host_cpu"; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+	    if test 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'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64, which still supported -KPIC.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test 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 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*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    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*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      case $cc_basename in
+      # old Intel for x86_64, which still supported -KPIC.
+      ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      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)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
+
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to 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) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+    else
+      _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
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1 DATA/;s/^.*[[ ]]__nm__$[[^ ]]*$[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test 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
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test 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
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v | $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
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1 DATA/;s/^.*[[ ]]__nm__$[[^ ]]*$[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, 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(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'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test 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
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	  tmp_sharedflag='--shared' ;;
+        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(compiler_needs_object, $1)=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+
+        if test 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'
+        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(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $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~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 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
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test 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
+      fi
+      ;;
+
+    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
+	  _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)='`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
+	# 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
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+      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 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
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test 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
+
+      _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,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 -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
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX([$1])
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	  if test 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'
+	  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
+	  _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
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-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
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test 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 "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_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+      ;;
+
+    hpux10*)
+      if test 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 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'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test 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'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+	  ;;
+	esac
+      fi
+      if test 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(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test 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"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS=$save_LDFLAGS])
+	if test 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
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    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*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd* | 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__`"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	else
+	  _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
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      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 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'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test 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_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test 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'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='$wl'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands '-z linker_flag'.  GCC discards it without '$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test 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
+	;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=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.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test 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'
+      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.
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test 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'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test sni = "$host_vendor"; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test yes,yes = "$GCC,$enable_shared"; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting $shlibpath_var if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC=$CC
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report 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 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
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test yes = "$enable_shared" || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC=$lt_save_CC
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test no != "$CXX" &&
+    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+    (test g++ != "$CXX"))); then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_caught_CXX_error"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test 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 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 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'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='$wl'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test 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
+          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
+          # 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
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      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
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+        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 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`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test 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
+
+        _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,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.
+          # 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(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 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"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX([$1])
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	    if test 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'
+	    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
+	    _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
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=.dll
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-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'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file, 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
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+        _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++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "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.
+            #
+            # 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 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
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        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'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test 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'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test 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'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+                $RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    if test 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'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      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__`"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+                  echo "-hidden">> $lib.exp~
+                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+                  $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld.*$$/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test 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 $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands '-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test 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 $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 $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
+	        # platform.
+	        _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 $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 -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We 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(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+              '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+              '"$_LT_TAGVAR(reload_cmds, $1)"
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)=$GXX
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test yes != "$_lt_caught_CXX_error"
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case @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
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
+])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case $prev$p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test x-L = "$p" ||
+          test x-R = "$p"; 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 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
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)=$prev$p
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test no = "$pre_test_object_deps_done"; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)=$p
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)=$p
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test no = "$F77"; then
+  _lt_disable_F77=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_disable_F77"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test 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
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test yes = "$enable_shared" || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)=$G77
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_F77"
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test no = "$FC"; then
+  _lt_disable_FC=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_disable_FC"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test 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
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is 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
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_FC"
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code=$lt_simple_compile_test_code
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+CFLAGS=
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f "$lt_ac_sed" && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test 10 -lt "$lt_ac_count" && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test "$lt_ac_count" -gt "$lt_ac_max"; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# 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],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS

grip-4.1.1.tar.gz/m4/ltoptions.m4 Added

@@ -0,0 +1,437 @@
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   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 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])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option '$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+		   [_LT_ENABLE_FAST_INSTALL])
+  _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+		   [_LT_WITH_AIX_SONAME([aix])])
+  ])
+])# _LT_SET_OPTIONS
+
+
+## --------------------------------- ##
+## Macros to handle LT_INIT options. ##
+## --------------------------------- ##
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the 'shared' and
+# 'disable-shared' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the 'static' and
+# 'disable-static' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the 'fast-install'
+# and 'disable-fast-install' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_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'
+# LT_INIT options.
+# MODE is either 'yes' or 'no'.  If omitted, it defaults to 'both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for lt_pkg in $withval; do
+	IFS=$lt_save_ifs
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [pic_mode=m4_default([$1], [default])])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+## ----------------- ##
+## LTDL_INIT Options ##
+## ----------------- ##
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])

grip-4.1.1.tar.gz/m4/ltsugar.m4 Added

@@ -0,0 +1,124 @@
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# 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
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59, which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])

grip-4.1.1.tar.gz/m4/ltversion.m4 Added

grip-4.1.1.tar.gz/m4/lt~obsolete.m4 Added

@@ -0,0 +1,99 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   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
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 5 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])

grip-4.1.1.tar.gz/m4/nls.m4 Added

@@ -0,0 +1,32 @@
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_NLS],
+[
+  AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  AC_ARG_ENABLE([nls],
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)
+  AC_MSG_RESULT([$USE_NLS])
+  AC_SUBST([USE_NLS])
+])

grip-4.1.1.tar.gz/m4/po.m4 Added

@@ -0,0 +1,453 @@
+# po.m4 serial 24 (gettext-0.19)
+dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ([2.60])
+
+dnl Checks for all prerequisites of the po subdirectory.
+AC_DEFUN([AM_PO_SUBDIRS],
+[
+  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+  AC_REQUIRE([AC_PROG_SED])dnl
+  AC_REQUIRE([AM_NLS])dnl
+
+  dnl Release version of the gettext macros. This is used to ensure that
+  dnl the gettext macros and po/Makefile.in.in are in sync.
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
+
+  dnl Perform the following tests also if --disable-nls has been given,
+  dnl because they are needed for "make dist" to work.
+
+  dnl Search for GNU msgfmt in the PATH.
+  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
+  dnl The second test excludes FreeBSD msgfmt.
+  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
+
+  dnl Test whether it is GNU msgfmt >= 0.15.
+changequote(,)dnl
+  case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+    *) MSGFMT_015=$MSGFMT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([MSGFMT_015])
+changequote(,)dnl
+  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+    *) GMSGFMT_015=$GMSGFMT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([GMSGFMT_015])
+
+  dnl Search for GNU xgettext 0.12 or newer in the PATH.
+  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
+  dnl The second test excludes FreeBSD xgettext.
+  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  dnl Remove leftover from FreeBSD xgettext call.
+  rm -f messages.po
+
+  dnl Test whether it is GNU xgettext >= 0.15.
+changequote(,)dnl
+  case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+    *) XGETTEXT_015=$XGETTEXT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([XGETTEXT_015])
+
+  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
+  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
+    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
+
+  dnl Installation directories.
+  dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
+  dnl have to define it here, so that it can be used in po/Makefile.
+  test -n "$localedir" || localedir='${datadir}/locale'
+  AC_SUBST([localedir])
+
+  dnl Support for AM_XGETTEXT_OPTION.
+  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
+
+  AC_CONFIG_COMMANDS([po-directories], [[
+    for ac_file in $CONFIG_FILES; do
+      # Support "outfile[:infile[:infile...]]"
+      case "$ac_file" in
+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+      esac
+      # PO directories have a Makefile.in generated from Makefile.in.in.
+      case "$ac_file" in */Makefile.in)
+        # Adjust a relative srcdir.
+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+        # In autoconf-2.13 it is called $ac_given_srcdir.
+        # In autoconf-2.50 it is called $srcdir.
+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+        case "$ac_given_srcdir" in
+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+          /*) top_srcdir="$ac_given_srcdir" ;;
+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+        esac
+        # Treat a directory as a PO directory if and only if it has a
+        # POTFILES.in file. This allows packages to have multiple PO
+        # directories under different names or in different locations.
+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+          rm -f "$ac_dir/POTFILES"
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+          gt_tab=`printf '\t'`
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
+          POMAKEFILEDEPS="POTFILES.in"
+          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+          # on $ac_dir but don't depend on user-specified configuration
+          # parameters.
+          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+            # The LINGUAS file contains the set of available languages.
+            if test -n "$OBSOLETE_ALL_LINGUAS"; then
+              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+            fi
+            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+          else
+            # The set of available languages was given in configure.in.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+          fi
+          # Compute POFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+          # Compute UPDATEPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+          # Compute DUMMYPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+          # Compute GMOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+          case "$ac_given_srcdir" in
+            .) srcdirpre= ;;
+            *) srcdirpre='$(srcdir)/' ;;
+          esac
+          POFILES=
+          UPDATEPOFILES=
+          DUMMYPOFILES=
+          GMOFILES=
+          for lang in $ALL_LINGUAS; do
+            POFILES="$POFILES $srcdirpre$lang.po"
+            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+          done
+          # CATALOGS depends on both $ac_dir and the user's LINGUAS
+          # environment variable.
+          INST_LINGUAS=
+          if test -n "$ALL_LINGUAS"; then
+            for presentlang in $ALL_LINGUAS; do
+              useit=no
+              if test "%UNSET%" != "$LINGUAS"; then
+                desiredlanguages="$LINGUAS"
+              else
+                desiredlanguages="$ALL_LINGUAS"
+              fi
+              for desiredlang in $desiredlanguages; do
+                # Use the presentlang catalog if desiredlang is
+                #   a. equal to presentlang, or
+                #   b. a variant of presentlang (because in this case,
+                #      presentlang can be used as a fallback for messages
+                #      which are not translated in the desiredlang catalog).
+                case "$desiredlang" in
+                  "$presentlang"*) useit=yes;;
+                esac
+              done
+              if test $useit = yes; then
+                INST_LINGUAS="$INST_LINGUAS $presentlang"
+              fi
+            done
+          fi
+          CATALOGS=
+          if test -n "$INST_LINGUAS"; then
+            for lang in $INST_LINGUAS; do
+              CATALOGS="$CATALOGS $lang.gmo"
+            done
+          fi
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+            if test -f "$f"; then
+              case "$f" in
+                *.orig | *.bak | *~) ;;
+                *) cat "$f" >> "$ac_dir/Makefile" ;;
+              esac
+            fi
+          done
+        fi
+        ;;
+      esac
+    done]],
+   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+    # from automake < 1.5.
+    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+    # Capture the value of LINGUAS because we need it to compute CATALOGS.
+    LINGUAS="${LINGUAS-%UNSET%}"
+   ])
+])
+
+dnl Postprocesses a Makefile in a directory containing PO files.
+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
+[
+  # When this code is run, in config.status, two variables have already been
+  # set:
+  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
+  # - LINGUAS is the value of the environment variable LINGUAS at configure
+  #   time.
+
+changequote(,)dnl
+  # Adjust a relative srcdir.
+  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+  ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+  # In autoconf-2.13 it is called $ac_given_srcdir.
+  # In autoconf-2.50 it is called $srcdir.
+  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+  case "$ac_given_srcdir" in
+    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+    /*) top_srcdir="$ac_given_srcdir" ;;
+    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
+
+  # Find a way to echo strings without interpreting backslash.
+  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
+    gt_echo='echo'
+  else
+    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
+      gt_echo='printf %s\n'
+    else
+      echo_func () {
+        cat <<EOT
+$*
+EOT
+      }
+      gt_echo='echo_func'
+    fi
+  fi
+
+  # A sed script that extracts the value of VARIABLE from a Makefile.
+  tab=`printf '\t'`
+  sed_x_variable='
+# Test if the hold space is empty.
+x
+s/P/P/
+x
+ta
+# Yes it was empty. Look if we have the expected variable definition.
+/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
+  # Seen the first line of the variable definition.
+  s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
+  ba
+}
+bd
+:a
+# Here we are processing a line from the variable definition.
+# Remove comment, more precisely replace it with a space.
+s/#.*$/ /
+# See if the line ends in a backslash.
+tb
+:b
+s/\\$//
+# Print the line, without the trailing backslash.
+p
+tc
+# There was no trailing backslash. The end of the variable definition is
+# reached. Clear the hold space.
+s/^.*$//
+x
+bd
+:c
+# A trailing backslash means that the variable definition continues in the
+# next line. Put a nonempty string into the hold space to indicate this.
+s/^.*$/P/
+x
+:d
+'
+changequote([,])dnl
+
+  # Set POTFILES to the value of the Makefile variable POTFILES.
+  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
+  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
+  # Compute POTFILES_DEPS as
+  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
+  POTFILES_DEPS=
+  for file in $POTFILES; do
+    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
+  done
+  POMAKEFILEDEPS=""
+
+  if test -n "$OBSOLETE_ALL_LINGUAS"; then
+    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+  fi
+  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+    # The LINGUAS file contains the set of available languages.
+    ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+  else
+    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
+    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
+    ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
+  fi
+  # Hide the ALL_LINGUAS assignment from automake < 1.5.
+  eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+  # Compute POFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+  # Compute UPDATEPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+  # Compute DUMMYPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+  # Compute GMOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+  # Compute PROPERTIESFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
+  # Compute CLASSFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
+  # Compute QMFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
+  # Compute MSGFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
+  # Compute RESOURCESDLLFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
+  case "$ac_given_srcdir" in
+    .) srcdirpre= ;;
+    *) srcdirpre='$(srcdir)/' ;;
+  esac
+  POFILES=
+  UPDATEPOFILES=
+  DUMMYPOFILES=
+  GMOFILES=
+  PROPERTIESFILES=
+  CLASSFILES=
+  QMFILES=
+  MSGFILES=
+  RESOURCESDLLFILES=
+  for lang in $ALL_LINGUAS; do
+    POFILES="$POFILES $srcdirpre$lang.po"
+    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+    PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
+    CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
+    QMFILES="$QMFILES $srcdirpre$lang.qm"
+    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
+    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
+  done
+  # CATALOGS depends on both $ac_dir and the user's LINGUAS
+  # environment variable.
+  INST_LINGUAS=
+  if test -n "$ALL_LINGUAS"; then
+    for presentlang in $ALL_LINGUAS; do
+      useit=no
+      if test "%UNSET%" != "$LINGUAS"; then
+        desiredlanguages="$LINGUAS"
+      else
+        desiredlanguages="$ALL_LINGUAS"
+      fi
+      for desiredlang in $desiredlanguages; do
+        # Use the presentlang catalog if desiredlang is
+        #   a. equal to presentlang, or
+        #   b. a variant of presentlang (because in this case,
+        #      presentlang can be used as a fallback for messages
+        #      which are not translated in the desiredlang catalog).
+        case "$desiredlang" in
+          "$presentlang"*) useit=yes;;
+        esac
+      done
+      if test $useit = yes; then
+        INST_LINGUAS="$INST_LINGUAS $presentlang"
+      fi
+    done
+  fi
+  CATALOGS=
+  JAVACATALOGS=
+  QTCATALOGS=
+  TCLCATALOGS=
+  CSHARPCATALOGS=
+  if test -n "$INST_LINGUAS"; then
+    for lang in $INST_LINGUAS; do
+      CATALOGS="$CATALOGS $lang.gmo"
+      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
+      QTCATALOGS="$QTCATALOGS $lang.qm"
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
+    done
+  fi
+
+  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
+  tab=`printf '\t'`
+  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang.msg: $lang.po
+${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
+${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if test -n "$POMAKEFILEDEPS"; then
+    cat >> "$ac_file.tmp" <<EOF
+Makefile: $POMAKEFILEDEPS
+EOF
+  fi
+  mv "$ac_file.tmp" "$ac_file"
+])
+
+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
+AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
+[
+  XGETTEXT_EXTRA_OPTIONS=
+])
+
+dnl Registers an option to be passed to xgettext in the po subdirectory.
+AC_DEFUN([AM_XGETTEXT_OPTION],
+[
+  AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
+])

grip-4.1.1.tar.gz/m4/progtest.m4 Added

@@ -0,0 +1,91 @@
+# progtest.m4 serial 7 (gettext-0.18.2)
+dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+AC_PREREQ([2.50])
+
+# Search path for a program which passes the given test.
+
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
+[
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  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
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL([ac_cv_path_$1],
+[case "[$]$1" in
+  [[\\/]]* | ?:[[\\/]]*)
+    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in ifelse([$5], , $PATH, [$5]); do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
+          if [$3]; then
+            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+    ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+  AC_MSG_RESULT([$][$1])
+else
+  AC_MSG_RESULT([no])
+fi
+AC_SUBST([$1])dnl
+])

grip-4.1.1.tar.gz/meson.build Added

@@ -0,0 +1,87 @@
+project('grip', ['c', 'cpp'],
+  version: '4.1.0',
+  license: 'GPL2+',
+  meson_version: '>= 0.47.0'
+)
+
+grip_prefix = get_option('prefix')
+grip_datadir = join_paths(grip_prefix, get_option('datadir'))
+grip_icondir = join_paths(grip_datadir, 'pixmaps')
+grip_localedir = join_paths(grip_datadir, 'locale')
+grip_helpdir = join_paths(grip_datadir, 'gnome', 'help', 'grip')
+
+config_h = configuration_data()
+
+config_h.set_quoted('PACKAGE', 'grip')
+config_h.set_quoted('VERSION', meson.project_version())
+config_h.set('GETTEXT_PACKAGE', 'PACKAGE')
+config_h.set_quoted('PACKAGE_BUGREPORT', 'https://sourceforge.net/projects/grip')
+config_h.set_quoted('GNOME_ICONDIR', grip_icondir)
+config_h.set_quoted('GNOMELOCALEDIR', grip_localedir)
+
+cc = meson.get_compiler('c')
+cxx = meson.get_compiler('cpp')
+
+libgtk_dep = dependency('gtk+-2.0', version: '>= 2.14')
+id3_dep = cxx.find_library('libid3', required: get_option('id3lib'))
+curl_dep = dependency('libcurl')
+thread_dep = dependency('threads')
+
+cdparanoia_deps = []
+cdparanoia_found = false
+cdparanoia_dep = dependency('cdparanoia-3', version: '>= 10.2', required: get_option('cdparanoia'))
+
+if cdparanoia_dep.found()
+  cdparanoia_deps = [cdparanoia_dep]
+  cdparanoia_found = true
+else
+  cdparanoia_dep = cc.find_library('cdda_paranoia', required : get_option('cdparanoia'))
+  cdinterface_dep = cc.find_library('cdda_interface', required : get_option('cdparanoia'))
+  if cdparanoia_dep.found() and cdinterface_dep.found()
+    cdparanoia_deps = [cdparanoia_dep, cdinterface_dep]
+    cdparanoia_found = true
+  endif
+endif
+
+if cdparanoia_found
+  # TODO: convert this to a CDPARANOIA_HEADERS_IN_DIR approach
+  config_h.set('HAVE_CDDA_INTERFACE_H', cc.has_header('cdda_paranoia.h'))
+  config_h.set('HAVE_CDDA_PARANOIA_H', cc.has_header('cdda_paranoia.h'))
+  config_h.set('HAVE_CDDA_CDDA_INTERFACE_H', cc.has_header('cdda/cdda_interface.h'))
+  config_h.set('HAVE_CDDA_CDDA_PARANOIA_H', cc.has_header('cdda/cdda_paranoia.h'))
+endif
+
+check_headers = [
+  ['HAVE_SYS_VFS_H', 'sys/vfs.h'],
+  ['HAVE_SYS_STATVFS_H', 'sys/statvfs.h'],
+  ['HAVE_LINUX_CDROM_H', 'linux/cdrom.h'],
+  ['HAVE_SYS_CDIO_H', 'sys/cdio.h'],
+  ['HAVE_IO_CAM_CDROM_H', 'io/cam/cdrom.h'],
+  ['HAVE_SYS_MNTENT_H', 'sys/mntent.h'],
+]
+foreach header: check_headers
+  config_h.set(header[0], cc.has_header(header[1]))
+endforeach
+
+configure_file(output: 'config.h', configuration: config_h)
+config_inc = include_directories('.')
+
+add_global_arguments(
+  '-DG_LOG_DOMAIN="@0@"'.format(meson.project_name()),
+  language : ['c', 'cpp']
+)
+
+gnome = import('gnome')
+i18n = import('i18n')
+
+subdir('src')
+subdir('pixmaps')
+subdir('po')
+subdir('doc/C')
+
+applicationsdir = join_paths(grip_datadir, 'applications')
+install_data('grip.desktop', install_dir: applicationsdir)
+install_data('grip-audiocd.desktop', install_dir: join_paths(grip_datadir, 'apps', 'solid', 'actions'))
+install_data('grip-audiocd.desktop', install_dir: join_paths(grip_datadir, 'solid', 'actions'))
+
+install_man('grip.1')

grip-4.1.1.tar.gz/meson_options.txt Added

grip-3.10.1.tar.gz/pixmaps/Makefile.am -> grip-4.1.1.tar.gz/pixmaps/Makefile.am Changed

grip-3.10.1.tar.gz/pixmaps/Makefile.in -> grip-4.1.1.tar.gz/pixmaps/Makefile.in Changed

grip-4.1.1.tar.gz/pixmaps/meson.build Added

grip-3.10.1.tar.gz/po/ChangeLog -> grip-4.1.1.tar.gz/po/ChangeLog Changed

grip-4.1.1.tar.gz/po/LINGUAS Added

grip-3.10.1.tar.gz/po/Makefile.in.in -> grip-4.1.1.tar.gz/po/Makefile.in.in Changed

@@ -1,18 +1,21 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-#
-# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
 #
+# Origin: gettext-0.19
+GETTEXT_MACRO_VERSION = 0.19
 
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+PACKAGE = @PACKAGE@
 VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
+SED = @SED@
 SHELL = /bin/sh
 @SET_MAKE@
 
@@ -22,231 +25,450 @@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 datadir = @datadir@
-libdir = @libdir@
-localedir = $(libdir)/locale
-gnulocaledir = $(datadir)/locale
+localedir = @localedir@
 gettextsrcdir = $(datadir)/gettext/po
-subdir = po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
 
-CC = @CC@
-GENCAT = @GENCAT@
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
+mkdir_p = @mkdir_p@
+
+GMSGFMT_ = @GMSGFMT@
+GMSGFMT_no = @GMSGFMT@
+GMSGFMT_yes = @GMSGFMT_015@
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = @MSGFMT@
+MSGFMT_no = @MSGFMT@
+MSGFMT_yes = @MSGFMT_015@
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = @XGETTEXT@
+XGETTEXT_no = @XGETTEXT@
+XGETTEXT_yes = @XGETTEXT_015@
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
 MSGMERGE = msgmerge
+MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
 
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-
-INCLUDES = -I.. -I$(top_srcdir)/intl
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-SOURCES = cat-id-tbl.c
 POFILES = @POFILES@
 GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
-stamp-cat-id $(POFILES) $(SOURCES)
+UPDATEPOFILES = @UPDATEPOFILES@
+DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
 
 POTFILES = \
 
 CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-INSTOBJEXT = @INSTOBJEXT@
 
-.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
+POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
+POFILESDEPS_yes = $(POFILESDEPS_)
+POFILESDEPS_no =
+POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
+
+DISTFILESDEPS_ = update-po
+DISTFILESDEPS_yes = $(DISTFILESDEPS_)
+DISTFILESDEPS_no =
+DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
 
-.c.o:
-	$(COMPILE) $<
+# Makevars gets inserted here. (Don't remove this line!)
 
-.po.pox:
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	$(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
 
 .po.mo:
-	$(MSGFMT) -o $@ $<
+	@echo "$(MSGFMT) -c -o $@ $<"; \
+	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
 
 .po.gmo:
-	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) -o $$file $<
+	@lang=`echo $* | sed -e 's,.*/,,'`; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
+	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
 
-.po.cat:
-	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && $(GENCAT) $@ $*.msg
+.sin.sed:
+	sed -e '/^#/d' $< > t-$@
+	mv t-$@ $@
 
 
 all: all-@USE_NLS@
 
-all-yes: cat-id-tbl.c $(CATALOGS)
+all-yes: stamp-po
 all-no:
 
-$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
-	$(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
-	  --add-comments --keyword=_ --keyword=N_ \
-	  --msgid-bugs-address="https://sourceforge.net/projects/grip" \
-	  --files-from=$(srcdir)/POTFILES.in \
-	&& test ! -f $(GETTEXT_PACKAGE).po \
-	   || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
-		&& mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot )
-
-$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
-$(srcdir)/stamp-cat-id: $(GETTEXT_PACKAGE).pot
-	rm -f cat-id-tbl.tmp
-	sed -f ./po2tbl.sed $(srcdir)/$(GETTEXT_PACKAGE).pot \
-		| sed -e "s/@GETTEXT_PACKAGE NAME@/$(GETTEXT_PACKAGE)/" > cat-id-tbl.tmp
-	if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
-	  rm cat-id-tbl.tmp; \
+# Ensure that the gettext macros and this Makefile.in.in are in sync.
+CHECK_MACRO_VERSION = \
+	test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+	  || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
+	       exit 1; \
+	     }
+
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+	@$(CHECK_MACRO_VERSION)
+	test ! -f $(srcdir)/$(DOMAIN).pot || \
+	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
+	  echo "touch stamp-po" && \
+	  echo timestamp > stamp-poT && \
+	  mv stamp-poT stamp-po; \
+	}
+
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+# The determination of whether the package xyz is a GNU one is based on the
+# heuristic whether some file in the top level directory mentions "GNU xyz".
+# If GNU 'find' is available, we avoid grepping through monster files.
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+	package_gnu="$(PACKAGE_GNU)"; \
+	test -n "$$package_gnu" || { \
+	  if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
+		 LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \
+			       -size -10000000c -exec grep 'GNU @PACKAGE@' \
+			       /dev/null '{}' ';' 2>/dev/null; \
+	       else \
+		 LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
+	       fi; \
+	     } | grep -v 'libtool:' >/dev/null; then \
+	     package_gnu=yes; \
+	   else \
+	     package_gnu=no; \
+	   fi; \
+	}; \
+	if test "$$package_gnu" = "yes"; then \
+	  package_prefix='GNU '; \
 	else \
-	  echo cat-id-tbl.c changed; \
-	  rm -f $(srcdir)/cat-id-tbl.c; \
-	  mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
+	  package_prefix=''; \
+	fi; \
+	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+	else \
+	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+	fi; \
+	case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	  '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
+	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	      --files-from=$(srcdir)/POTFILES.in \
+	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	      --msgid-bugs-address="$$msgid_bugs_address" \
+	    ;; \
+	  *) \
+	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	      --files-from=$(srcdir)/POTFILES.in \
+	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	      --package-name="$${package_prefix}@PACKAGE@" \
+	      --package-version='@VERSION@' \
+	      --msgid-bugs-address="$$msgid_bugs_address" \
+	    ;; \
+	esac
+	test ! -f $(DOMAIN).po || { \
+	  if test -f $(srcdir)/$(DOMAIN).pot; then \
+	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+	    sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+	    if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+	    else \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+	      mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	    fi; \
+	  else \
+	    mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	  fi; \
+	}
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+$(srcdir)/$(DOMAIN).pot:
+	$(MAKE) $(DOMAIN).pot-update
+
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(POFILESDEPS)
+	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+	if test -f "$(srcdir)/$${lang}.po"; then \
+	  test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
+	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
+	  cd $(srcdir) \
+	    && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	           '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
+	           *) \
+	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
+	         esac; \
+	       }; \
+	else \
+	  $(MAKE) $${lang}.po-create; \
 	fi
-	cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
 
 
 install: install-exec install-data
 install-exec:
 install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
-	if test -r "$(MKINSTALLDIRS)"; then \
-	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+	  for file in $(DISTFILES.common) Makevars.template; do \
+	    $(INSTALL_DATA) $(srcdir)/$$file \
+			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	  for file in Makevars; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
 	else \
-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+	  : ; \
 	fi
+install-data-no: all
+install-data-yes: all
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
-	  case "$$cat" in \
-	    *.gmo) destdir=$(gnulocaledir);; \
-	    *)     destdir=$(localedir);; \
-	  esac; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
-	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $$dir; \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
-	  fi; \
-	  if test -r $$cat; then \
-	    $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
-	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $(srcdir)/$$cat as" \
-		 "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
-	  fi; \
-	  if test -r $$cat.m; then \
-	    $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	    echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
-	  else \
-	    if test -r $(srcdir)/$$cat.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
-		$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	      echo "installing $(srcdir)/$$cat as" \
-		   "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
-	    else \
-	      true; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
+	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	    if test -n "$$lc"; then \
+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	      rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
 	    fi; \
-	  fi; \
+	  done; \
 	done
-	if test "$(GETTEXT_PACKAGE)" = "gettext"; then \
-	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
-	  fi; \
-	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: installdirs-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
 	else \
 	  : ; \
 	fi
+installdirs-data-no:
+installdirs-data-yes:
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	    if test -n "$$lc"; then \
+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	    fi; \
+	  done; \
+	done
 
 # Define this as empty until I found a useful application.
 installcheck:
 
-uninstall:
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: uninstall-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  for file in $(DISTFILES.common) Makevars.template; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+uninstall-data-no:
+uninstall-data-yes:
 	catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+	    rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	  done; \
 	done
-	rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
 
 check: all
 
-cat-id-tbl.o: ../intl/libgettext.h
-
-dvi info tags TAGS ID:
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
 
 mostlyclean:
-	rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp
+	rm -f remove-potcdate.sed
+	rm -f stamp-poT
+	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
 	rm -fr *.o
 
 clean: mostlyclean
 
 distclean: clean
-	rm -f Makefile Makefile.in POTFILES *.mo *.gmo *.msg *.cat *.cat.m po2tbl.sed
+	rm -f Makefile Makefile.in POTFILES *.mo
 
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
-	rm -f $(GMOFILES)
-
-distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: update-po $(DISTFILES)
+	rm -f stamp-po $(GMOFILES)
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+	test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
+	@$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: stamp-po $(DISTFILES)
 	dists="$(DISTFILES)"; \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  dists="$$dists Makevars.template"; \
+	fi; \
+	if test -f $(srcdir)/$(DOMAIN).pot; then \
+	  dists="$$dists $(DOMAIN).pot stamp-po"; \
+	fi; \
+	if test -f $(srcdir)/ChangeLog; then \
+	  dists="$$dists ChangeLog"; \
+	fi; \
+	for i in 0 1 2 3 4 5 6 7 8 9; do \
+	  if test -f $(srcdir)/ChangeLog.$$i; then \
+	    dists="$$dists ChangeLog.$$i"; \
+	  fi; \
+	done; \
+	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
 	for file in $$dists; do \
-	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-	    || cp -p $(srcdir)/$$file $(distdir); \
+	  if test -f $$file; then \
+	    cp -p $$file $(distdir) || exit 1; \
+	  else \
+	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+	  fi; \
 	done
 
 update-po: Makefile
-	$(MAKE) $(GETTEXT_PACKAGE).pot
+	$(MAKE) $(DOMAIN).pot-update
+	test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+	$(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+	@lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+	echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+	exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
 	cd $(srcdir); \
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  mv $$lang.po $$lang.old.po; \
-	  echo "$$lang:"; \
-	  if $(MSGMERGE) $$lang.old.po $(GETTEXT_PACKAGE).pot -o $$lang.po; then \
-	    rm -f $$lang.old.po; \
+	if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	       '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	         $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	       *) \
+	         $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	     esac; \
+	   }; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
 	  else \
-	    echo "msgmerge for $$cat failed!"; \
-	    rm -f $$lang.po; \
-	    mv $$lang.old.po $$lang.po; \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
 	  fi; \
-	done
+	else \
+	  echo "msgmerge for $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
 
-POTFILES: POTFILES.in
-	( if test 'x$(srcdir)' != 'x.'; then \
-	    posrcprefix='$(top_srcdir)/'; \
-	  else \
-	    posrcprefix="../"; \
-	  fi; \
-	  rm -f $@-t $@ \
-	    && (sed -e '/^#/d' -e '/^[ 	]*$$/d' \
-		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in \
-		| sed -e '$$s/\\$$//') > $@-t \
-	    && chmod a-w $@-t \
-	    && mv $@-t $@ )
-
-Makefile: Makefile.in.in ../config.status POTFILES
-	cd .. \
-	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-	       $(SHELL) ./config.status
+$(DUMMYPOFILES):
+
+update-gmo: Makefile $(GMOFILES)
+	@:
+
+# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
+# because execution permission bits may not work on the current file system.
+# Use @SHELL@, which is the shell determined by autoconf for the use by its
+# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+	cd $(top_builddir) \
+	  && @SHELL@ ./config.status $(subdir)/$@.in po-directories
+
+force:
 
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

grip-4.1.1.tar.gz/po/Makevars Added

@@ -0,0 +1,78 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Mike Oliphant and Johnny A. Solbu
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU = no
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = https://sourceforge.net/p/grip/bugs/
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS = --previous --quiet
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes

grip-4.1.1.tar.gz/po/Rules-quot Added

@@ -0,0 +1,58 @@
+# This file, Rules-quot, can be copied and used freely without restrictions.
+# Special Makefile rules for English message catalogs with quotation marks.
+
+DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
+
+.SUFFIXES: .insert-header .po-update-en
+
+en@quot.po-create:
+	$(MAKE) en@quot.po-update
+en@boldquot.po-create:
+	$(MAKE) en@boldquot.po-update
+
+en@quot.po-update: en@quot.po-update-en
+en@boldquot.po-update: en@boldquot.po-update-en
+
+.insert-header.po-update-en:
+	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
+	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	ll=`echo $$lang | sed -e 's/@.*//'`; \
+	LC_ALL=C; export LC_ALL; \
+	cd $(srcdir); \
+	if $(MSGINIT) $(MSGINIT_OPTIONS) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \
+	   | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \
+	   { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	     '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \
+	       $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \
+	       ;; \
+	     *) \
+	       $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \
+	       ;; \
+	     esac } 2>/dev/null > $$tmpdir/$$lang.new.po \
+	     ; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  else \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	else \
+	  echo "creation of $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+en@quot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
+
+en@boldquot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
+
+mostlyclean: mostlyclean-quot
+mostlyclean-quot:
+	rm -f *.insert-header

grip-4.1.1.tar.gz/po/be.gmo Added

grip-3.10.1.tar.gz/po/be.po -> grip-4.1.1.tar.gz/po/be.po Changed

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grip.old\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
 "PO-Revision-Date: 2003-06-29 14:38+0300\n"
 "Last-Translator: Vital Khilko <dojlid@mova.org>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -16,47 +16,39 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "Пазначце геамэтрыю асноўнага акна"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "ГЭАМЭТРЫЯ"
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr "Пазначце файл канфігурацыі для выкарыстаньня (у вашай хатняй тэчцы)"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr "КАНФІГУРАЦЫЯ"
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "Пазначце прыладу cdrom"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "ПРЫЛАДА"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "Пазначце прыладу scsi"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "Загружаць у \"паменшаным\" рэжыме (толькі прайгравальнік)"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr "\"Мясцовы\" рэжым - не праглядаць інфармацыю аб дыске ў сеціве"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr ""
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "Запусьціць у рэжыме адладкі"
 
@@ -64,16 +56,12 @@
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "Памылка: Немагчыма ініцыялізаваць [%s]\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr ""
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
@@ -81,75 +69,38 @@
 "Праца ў прагрэсе.\n"
 "Сапраўды выйсьці?"
 
-#: src/grip.c:401
+#: src/grip.c:380
 #, fuzzy
-msgid "Status"
-msgstr "Стан запісу"
-
-#: src/grip.c:416
-msgid "General"
-msgstr ""
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "Запіс"
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
-msgstr "Кадаваньне"
+msgid "Unable to open help file"
+msgstr "Памылка: Немагчыма стварыць часовы файл"
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "Дапамога"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "Зьмест"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "Прайграваньне дыскаў"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "Запіс з дыскаў"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "Канфігураваньне Grip"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "FAQ"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "Атрыманьне дадатковых зьвестак"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "Дасланьне паведамленьняў аб памылках"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "Пра праграму"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr ""
 
-#: src/grip.c:641
+#: src/grip.c:505
 #, fuzzy
 msgid "Error: Trying to show homepage failed."
 msgstr "Памылка: Немагчыма захаваць файл канфігурацыі"
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr ""
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -159,383 +110,391 @@
 "Вы мусіце пераканфігураваць Grip.\n"
 "Ваш стары файл канфігурацыі будзе захаваны з канчаткам -old."
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "паслужнік %s, порт %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 #, fuzzy
 msgid "Error: Unable to save config file."
 msgstr "Памылка: Немагчыма захаваць файл канфігурацыі"
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "Канфігурацыя"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "Прылада CDRom"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Не перарываць прайграваньне падчас выхаду/запуску"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "Пераматаць назад пасьля спыненьня"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr ""
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "Аўтапрайграваньне новага дыска"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "Шуфляваць перад кожным прайграваньнем"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr ""
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr ""
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr ""
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "Праграма запісу:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "Каманда запісу"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "Радок запісу"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "Выключыць paranoia"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "Выключыць extra paranoia"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "Выключыць scratch"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "дэтэктаваньне"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "аднавіць"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr ""
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "Фармат файла запіса"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 #, fuzzy
 msgid "Rip file format (Multi-artist)"
 msgstr "Фармат файла запіса"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "Прылада SCSI"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "Праграма запісу"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "Дакладнае значэньне запісу"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "Максымум незакадаваных файлаў .wav"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "Аўтазапіс з новага дыска"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "Сыгнал пасьля запісу"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr ""
 "Вызваленьне дыска\n"
 "пасьля запісу"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr ""
 "Затрымка перад\n"
 "вызваленьнем"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr "Затрымка перад запісам"
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr ""
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr "Спыняць прыладу cdrom між трэкамі"
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "Каманда фільтрацыі для *.wav"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "Каманда фільтрацыі дыска"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "Выбары"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "Запіс"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "Кодэр:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr "Каманда кадаваньня"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr "Радок кадаваньня"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 #, fuzzy
 msgid "Encoder file extension"
 msgstr "Фармат файла кадаваньня"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 #, fuzzy
 msgid "Encoder file format"
 msgstr "Фармат файла кадаваньня"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 #, fuzzy
 msgid "Encode file format (Multi-artist)"
 msgstr "Фармат файла кадаваньня"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "Кодэр"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr "Выдаляць файл .wav пасьля кадаваньня"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "Унесьці зьвесткі у базу даньняў SQL"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr "Ствараць файлы .m3u"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "Выкарыстоўваць адносны шлях ў файлах .m3u"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "Фармат файла M3U"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Бітавая хуткасьць кадаваньня (Кбіт/сэк)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "Нумар працэсара для выкарыстаньня"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 #, fuzzy
 msgid "Encoder 'nice' value"
 msgstr "Дакладнае значэньне кадэра"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 #, fuzzy
 msgid "Encoder filter command"
 msgstr "Каманда філтраваньня кодэра"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 #, fuzzy
 msgid "Execute command after encode"
 msgstr "Выдаляць файл .wav пасьля кадаваньня"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "Кадаваньне"
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr "Дадаць тэг ID3 да кадаваных файлаў"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Дадаць тэг ID2 да кадаваных файлаў"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr ""
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "Поле камэнтара ID3"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr ""
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 #, fuzzy
 msgid "ID3v2 Character set encoding"
 msgstr "Выдаляць файл .wav пасьля кадаваньня"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "Паслужнік БД"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "Шлях CGI"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "Першасны паслужнік"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "Другасны паслужнік"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr "Адпраўка зьвестак у БД праз э.пошту"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 #, fuzzy
 msgid "DB Character set encoding"
 msgstr "Выдаляць файл .wav пасьля кадаваньня"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "Выкарыстоўваць пашырэньні freedb"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "Аўтаматычна запытваць зьвесткі аб дыске"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "БД дыскаў"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "Выкарыстоўваць проксі"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr ""
 "Атрымаць зьвесткі аб проксі з пераменай\n"
 "асяродьдзя 'http_proxy'"
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "Паслужнік проксі"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "Порт проксі"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "Карыстальнік проксі"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "Пароль да проксі"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "Проксі"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "Адрэса э.пошты"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "Праграма абнаўленьня дыскаў"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "Назвы файлаў не малымі літарамі"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr ""
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr ""
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr ""
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
 msgstr ""
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr ""
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "Рознае"
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 #, fuzzy
 msgid "Error: Unable to save ripper config."
 msgstr "Памылка: Немагчыма захаваць файл канфігурацыі"
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 #, fuzzy
 msgid "Error: Unable to save encoder config."
 msgstr "Памылка: Немагчыма захаваць файл канфігурацыі"
@@ -575,7 +534,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr "Немагчыма дасылаць запыт падчас запісу"
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "Невядомы дыск"
@@ -585,228 +543,201 @@
 msgid "Track %02d"
 msgstr "Трэк %02d"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "Запыт %s (праз %s) для дыска %02x.\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "Запыт %s для дыска %02x.\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "Няма супадзеньняў\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"Супадзеньне для \"%s / %s\"\n"
-"Загрузка даньняў...\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "Выканана\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "Памылка захаваньня даньняў дыска\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 #, fuzzy
 msgid "Length"
 msgstr "Час"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "Трэкі"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "Трэк"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 #, fuzzy
 msgid "Done.\n"
 msgstr "Выканана\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 #, fuzzy
 msgid "Error saving disc data."
 msgstr "Памылка запісу даньняў дыска"
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "Рэжым паўтору прайграваньня"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "Пераключыць паўтор прайграваньня"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "Стан запісу"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "Граць / прыпыніць"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "Пераматаць назад"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "Пераматаць наперад"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "Перайсьці да папярэдняга трэка"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "Перайсьці да наступнага трэка"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "Пераключыць рэжым прайграваньня"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "Наступны дыск"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "Спыніць прайграваньне"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "Вызваліць дыск"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr "Сканаваць дыск"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "Пераключыць кіраваньне гучнасьцю"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "Пераключыць рэдактар дыска"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Запытаць зьвесткі ў БД дыскаў"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "Пераключыць адлюстраваньне запіса"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Выйсьці з Grip"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 #, fuzzy
 msgid "Cannot fast forward while ripping."
 msgstr "Немагчыма пераматаць падчас запісу"
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 #, fuzzy
 msgid "Cannot rewind while ripping."
 msgstr "Немагчыма пераматаць падчас запісу"
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 #, fuzzy
 msgid "Cannot switch discs while ripping."
 msgstr "Немагчыма пераключаць дыскі падчас запісу"
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "Вызваліць дыск\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 #, fuzzy
 msgid "Cannot eject while ripping."
 msgstr "Немагчыма вызваліць дыск падчас запісу"
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr "Маецца дыск - вызваленьне\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 #, fuzzy
 msgid "Cannot play while ripping."
 msgstr "Немагчыма прайграваць падчас запісу"
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 #, fuzzy
 msgid "Cannot switch tracks while ripping."
 msgstr "Немагчыма пераключыць запісы падчас запісу"
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "Праверка новага дыска\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat адшукаў дыск, прагляд запісаў\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "Маецца дыск.\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr ""
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "CDStat паведамляе аб адсутнасьці дыска\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Бягучы сэктар: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "Дыск адсутнічае"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -818,27 +749,39 @@
 "\n"
 "Вы жадаеце прыняць зьвесткі аб гэтым дыске?"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 #, fuzzy
 msgid "Error: Unable to create temporary file."
 msgstr "Памылка: Немагчыма стварыць часовы файл"
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 #, fuzzy
 msgid "Error: Unable to write disc data."
 msgstr "Памылка: Немагчыма запісаць даньні дыска"
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr ""
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 #, fuzzy
 msgid "Error: Unable to execute mail command."
 msgstr "Памылка: Немагчыма захаваць файл канфігурацыі"
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr ""
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr ""
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr ""
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "Сыстэмнае паведамленьне"
 
@@ -872,85 +815,85 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Памылка: Немагчыма адкрыць %s для запісу\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "Назва дыска"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "Назва трэка"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr ""
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "Выканаўца дыска"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "ID3 жанр"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "Год запіса"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "Назва трэка"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "Выканаўца трэка"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr ""
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "Падзяленьне"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "Назва/Выканаўца"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "Выканаўца/Назва"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr ""
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "Некалькі выканаўцаў"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "Захаваць зьвесткі дыска"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "Прыняць зьвесткі дыска"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 #, fuzzy
 msgid "No disc present."
 msgstr "Дыск адсутнічае"
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 #, fuzzy
 msgid "Cannot submit. No disc is present."
 msgstr ""
 "Немагчыма прыняць\n"
 "Дыск адсутнічае"
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 #, fuzzy
 msgid "You must enter a disc title."
 msgstr "Вы мусіце пазначыць назву дыска"
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 #, fuzzy
 msgid "You must enter a disc artist."
 msgstr "Вы мусіце пазначыць выканаўца"
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -961,7 +904,7 @@
 "Continue?"
 msgstr ""
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -973,11 +916,11 @@
 "\n"
 "Працягваць?"
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "Выбар жанра"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -985,19 +928,18 @@
 "Перадача патрабуе жанр адрозны ад \"невядомы\"\n"
 "Калі ласка, выбярыце жанр са сьпісу ніжэй"
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "Жанр БД дыскаў"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "Прыняць"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "Адмяніць"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "невядомае поле ID3\n"
@@ -1008,195 +950,172 @@
 msgstr ""
 "Памылка: Немагчыма перакласьці назву файла. Адсутнічае карыстальнік як %s\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "Збой выкананьня\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "Памылка: Кепскі тып поля\n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 #, fuzzy
 msgid "Error: Reading config file\n"
 msgstr "Памылка: Недапушчальны файл канфігурацыі\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "Памылка: Недапушчальны файл канфігурацыі\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "Запіс+кадаваньне"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "Запіс і кадаваньне вылучаных запісаў"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "Толькі запіс"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "Запіс без кадаваньня вылучаных запісаў"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr ""
 "Перарваць працэсы\n"
 "запісу й кадаваньня"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "Забіць усе актыўныя працэсы запісу й кадаваньня"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "Перарваць запіс"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "Забіць працэс запісу"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "Сканаваць DDJ"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "Унесьці зьвесткі аб дыску ў базу даньняў DigitalDJ"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "Запіс часткі трэка"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "Граць"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "Бягучы сэктар:      0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "Запіс: Вольны"
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Кадаваньне: Трк 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
 msgstr "Кадаваньне: Вольны"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr "Агульныя паказьнікі:"
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "Пачатковы сэктар"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "Апошні сэктар"
 
-#: src/rip.c:384
-#, fuzzy, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "Унесьці зьвесткі у базу даньняў SQL"
-
-#: src/rip.c:609
+#: src/rip.c:600
 #, fuzzy
 msgid "Error: can't open m3u file."
 msgstr "Памылка: Немагчыма адкрыць m3u\n"
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr ""
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr "Агульны памер кадаваньня: %d\n"
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "Запіс: Трк %d (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr "Запіс: %6.2f%%"
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "Запіс скончаны\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr ""
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "Наступны трэк %d, агулам %d трэкаў\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "Праверка, ці не патрабуецца запіс іншага трэка\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "Кадаваньне: Трк %d (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr "Кадаваньне: %6.2f%%"
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "Скончана кадаваньне на працэсары %d\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "Выдаленьне [%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "Запіс скончаны\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "Выканаўца невядомы"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "Назва невядома"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
 msgstr ""
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
 "executable."
 msgstr ""
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 #, fuzzy
 msgid ""
 "Invalid encoder executable.\n"
@@ -1206,7 +1125,7 @@
 "Недапушчальная каманда кадаваньня\n"
 "Праверце вашую канфігурацыю кодэра"
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1214,167 +1133,224 @@
 "Трэкі не вылучаны.\n"
 "Запісываць увесь дыск?\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "Запіс усяго дыска\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr ""
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Першы правераны запіс %d\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr ""
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "Недахоп правоў для запісу файла wav"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "Запіс трэка %d у %s\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Запіс: Трк %d (0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "Файл %s ужо быў запісаны. Прапускаецца...\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "Недахоп прасторы ў каталёге для вываду"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "Выклік CDPRip\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, fuzzy, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Даданьне трэка %d да сьпіса кадаваньня\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "Няма вольных працэсараў\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Кадаваньне трэка %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 #, fuzzy
 msgid "No write access to write encoded file."
 msgstr "Недахоп правоў для запісу кадаванага файла"
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i: Кадаваньне ў %s\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Кадаваньне: Трк %d (0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr ""
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Агульны памер запісанага: %d\n"
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Агульны памер кадаванага: %d\n"
 
-#: src/tray.c:57
+#: src/tray.c:59
 #, fuzzy
 msgid "Artist"
 msgstr "Выканаўца невядомы"
 
-#: src/tray.c:58
+#: src/tray.c:60
 #, fuzzy
 msgid "Title"
 msgstr "Назва невядома"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
 "%02d:%02d of %02d:%02d"
 msgstr ""
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr ""
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr ""
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
 "%s%s%s"
 msgstr ""
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
 "Idle"
 msgstr ""
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr ""
 
-#: src/tray.c:196
+#: src/tray.c:186
 #, fuzzy
 msgid "Stop"
 msgstr "Спыніць прайграваньне"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr ""
 
-#: src/tray.c:209
+#: src/tray.c:199
 #, fuzzy
 msgid "Next"
 msgstr "Наступны дыск"
 
-#: src/tray.c:217
+#: src/tray.c:207
 #, fuzzy
 msgid "Rip and Encode"
 msgstr ""
 "Перарваць працэсы\n"
 "запісу й кадаваньня"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr ""
 
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "Пазначце геамэтрыю асноўнага акна"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "ГЭАМЭТРЫЯ"
+
+#, fuzzy
+#~ msgid "Status"
+#~ msgstr "Стан запісу"
+
+#~ msgid "Playing CDs"
+#~ msgstr "Прайграваньне дыскаў"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "Запіс з дыскаў"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "Канфігураваньне Grip"
+
+#~ msgid "FAQ"
+#~ msgstr "FAQ"
+
+#~ msgid "Getting More Help"
+#~ msgstr "Атрыманьне дадатковых зьвестак"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "Дасланьне паведамленьняў аб памылках"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "Запыт %s (праз %s) для дыска %02x.\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "Запыт %s для дыска %02x.\n"
+
+#~ msgid "No match\n"
+#~ msgstr "Няма супадзеньняў\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "Супадзеньне для \"%s / %s\"\n"
+#~ "Загрузка даньняў...\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "Вызваліць дыск\n"
+
+#, fuzzy
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "Унесьці зьвесткі у базу даньняў SQL"
+
+#~ msgid "Rip finished\n"
+#~ msgstr "Запіс скончаны\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "Скончана кадаваньне на працэсары %d\n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "Выдаленьне [%s]\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "Запіс скончаны\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "Запіс трэка %d у %s\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "Файл %s ужо быў запісаны. Прапускаецца...\n"
+
+#~ msgid "%i: Encoding to %s\n"
+#~ msgstr "%i: Кадаваньне ў %s\n"
+
 #~ msgid ""
 #~ "Invalid rip executable\n"
 #~ "Check your rip config"

grip-4.1.1.tar.gz/po/bg.gmo Added

grip-3.10.1.tar.gz/po/bg.po -> grip-4.1.1.tar.gz/po/bg.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 3.1\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
 "PO-Revision-Date: 2004-02-08 14:03+0200\n"
 "Last-Translator: Vladimir \"Kaladan\" Petkov <vpetkov@i-space.org>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -16,47 +16,39 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "Определя размерите на основния прозорец"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "РАЗМЕРИ"
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr "Определя конфигурационния файл в употреба (в домашната директория)"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr "КОНФИГУРАЦИЯ"
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "Определя CD ROM устройството"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "УСТРОЙСТВО"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "Упределя SCSI устройството в употреба"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "Зарежда в \"ограничен\" (CD-ROM само) режим"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr "\"Локален\"·режим·--·не се търси информация за диска в интернет"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "Не прави I/O пренасочване"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "Стартира в режим за докладване на грешки"
 
@@ -64,16 +56,12 @@
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "Грешка: Разпознаването е невъзможно [%s]\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr ""
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
@@ -81,74 +69,38 @@
 "Извършва се работа.\n"
 "Да изгася програмата?"
 
-#: src/grip.c:401
-msgid "Status"
-msgstr "Статус"
-
-#: src/grip.c:416
-msgid "General"
-msgstr "Основен"
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "Извличане"
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
-msgstr "Кодиране"
+#: src/grip.c:380
+#, fuzzy
+msgid "Unable to open help file"
+msgstr "Грешка: Неуспешно създаване на временен файл"
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "Помощ"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "Съдържание"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "Изпълняващи се CD-та"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "Извличащи се CD-та"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "Конфигурация"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "Често Задавани Въпроси"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "Допълнителна помощ"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "Докладване за грешки"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "Относно"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr ""
 
-#: src/grip.c:641
+#: src/grip.c:505
 #, fuzzy
 msgid "Error: Trying to show homepage failed."
 msgstr "Грешка: Запазването на конфигурационния файл е невъзможно"
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr ""
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -159,376 +111,384 @@
 "Grip трябва да бъде пренастроен.\n"
 "Старият конфигурационен фал е запазен с -old·в края."
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "сървър е·%s,·порт·%d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 #, fuzzy
 msgid "Error: Unable to save config file."
 msgstr "Грешка: Запазването на конфигурационния файл е невъзможно"
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "Настройки"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "CDRom устройство"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Не прекъсва музиката на излизане/стартиране"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "Започва от начало, когато е музиката е спряна"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "Започва с първата песен ако не свири"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "Автоматично стартира диск при постяване в устройството"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "Разбърква преди всяко изпълнение"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr ""
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr ""
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr ""
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "Извличаща програма:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr ""
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "Команден интерпретатор"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "Изключва paranoia"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "Изключва допъплнителна paranoia"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "Изключва драскане"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "засичане"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "поправя"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr ""
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "Формат на извлечения файл"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 #, fuzzy
 msgid "Rip file format (Multi-artist)"
 msgstr "Формат на извлечения файл"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "SCSI устройство"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "Програма за извличане"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "Извлича \"добра\" стойност"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "Максимално не-кодирани .wav файлове"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "Автоматично извличане при вмъкване на CD"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "Звуков сигнал след извличане"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "Автоматично изваждане на диска след извличане"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "Закъснение на автоматичното изваждане"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr "Закъснение преди извличането"
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr "Закъснение на кодирането след като дискът е извлечен"
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr "Спира CDRom устройството между песните"
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "Команда за филтър на Wav"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "Команда за филтър на Диск"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "Опции"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "Извличане"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "Кодираща програма:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr ""
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr ""
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 #, fuzzy
 msgid "Encoder file extension"
 msgstr "Файлове формат при кодиране"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 #, fuzzy
 msgid "Encoder file format"
 msgstr "Файлове формат при кодиране"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 #, fuzzy
 msgid "Encode file format (Multi-artist)"
 msgstr "Файлове формат при кодиране"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "Кодираща програма"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr "Изтрива .wav файлът след кодиране"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "Вмъква информация в SQL БазаДанни"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr "Създава .m3u файлове"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "Използва свързани пътища в .m3u файловете"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "M3U файлов формат"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Скорост на кодиране (килобита/сек.)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "Процесори в употреба"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 #, fuzzy
 msgid "Encoder 'nice' value"
 msgstr "Извлича \"добра\" стойност"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 #, fuzzy
 msgid "Encoder filter command"
 msgstr "Команда за филтър на Диск"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 #, fuzzy
 msgid "Execute command after encode"
 msgstr "Изтрива .wav файлът след кодиране"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "Кодиране"
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr "Добавя ID3 коментари в кодираните файлове"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Добавя ID3v2 коментари в кодираните файлове"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr "Добавя информация само във файлове завършващи с '.mp3'"
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "Поле за ID3 коментар"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr "Кодова таблица на ID3v1"
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 #, fuzzy
 msgid "ID3v2 Character set encoding"
 msgstr "Кодова таблица на ID3v1"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "Сървър База Данни"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "Път на CGI"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "Основен сървър"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "Втори сървър"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr ""
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 msgid "DB Character set encoding"
 msgstr ""
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "Използва freedb разширения"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "Изпълнява преглеждане на диск автоматично"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "ДискБД"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "Използва прокси сървър"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr ""
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "Прокси сървър"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "Прокси порт"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "Прокси потребителско име"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "Прокси парола"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "Прокси"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "Електронна поща"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "Програма за осъвременяване на CD"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "Не прави имената на файловете с малки букви"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr ""
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr ""
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "Не променя интервалите в долни черти"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
 msgstr ""
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr ""
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "Допълнителни"
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 #, fuzzy
 msgid "Error: Unable to save ripper config."
 msgstr "Грешка: Запазването на конфигурационния файл е невъзможно"
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 #, fuzzy
 msgid "Error: Unable to save encoder config."
 msgstr "Грешка: Запазването на конфигурационния файл е невъзможно"
@@ -569,7 +529,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr "Прегледа е невъзможен по време на извличане"
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "Непознат Диск"
@@ -579,228 +538,201 @@
 msgid "Track %02d"
 msgstr "Песен %02d"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "Запитва·%s·(през·%s)·за диск·%02x.\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "Запитва·%s·за дискт·%02x.\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "Няма съвпадение\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"Намерена информация за·\"%s·/·%s\"\n"
-"Изтегляне на информация...\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "Готово\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "Грешка при запазване на информацията за диска\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 #, fuzzy
 msgid "Length"
 msgstr "Дължина"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "Песни"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "Песен"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 #, fuzzy
 msgid "Done.\n"
 msgstr "Готово\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 #, fuzzy
 msgid "Error saving disc data."
 msgstr "Грешка при запазването на информацията за диска"
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "Режим въртене"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "Режим пеобръщане"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "Статус на извличането"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "Изпълнява песен / Пауза"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "Начало"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "Напред"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "Отива на предишната песен"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "Отива на следващата песен"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "Опции на изпълненията"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "Следващ Диск"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "Спира изпълението"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "Изважда диск"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr "Сканира съдържанието на диска"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "Сила на звука"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "Редактор на дискове"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Прави/отказва заявка към БД за дискове"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "Изобразяване на песните"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Напуска Grip"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 #, fuzzy
 msgid "Cannot fast forward while ripping."
 msgstr "Прескачането напред в невъзможно по време на извличане"
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 #, fuzzy
 msgid "Cannot rewind while ripping."
 msgstr "Връщането в началото е невъзможно по време на извличане"
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 #, fuzzy
 msgid "Cannot switch discs while ripping."
 msgstr "Смяна на дискове е невъзможна по време на извличане"
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "Изважда диск\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 #, fuzzy
 msgid "Cannot eject while ripping."
 msgstr "Дискът не може да бъде изваден докато се извлича информация"
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr "Изважда диска\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 #, fuzzy
 msgid "Cannot play while ripping."
 msgstr "Не може да бъде изпълнен докато се извлича информация"
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 #, fuzzy
 msgid "Cannot switch tracks while ripping."
 msgstr "Не може да се разменят песни по време на извличане"
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "Проверява за нов диск\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat намери диск, проверкана песните\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "Валиден диск!\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "Песни с дължина над 0\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "CDStat докладва че няма диск\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Текущ селектор: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "Няма Диск"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -812,27 +744,39 @@
 "\n"
 "Искате ли да изпратите информация за диска?"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 #, fuzzy
 msgid "Error: Unable to create temporary file."
 msgstr "Грешка: Неуспешно създаване на временен файл"
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 #, fuzzy
 msgid "Error: Unable to write disc data."
 msgstr "Грешка: Незъвможно записването на информация за диска"
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Изпраща запис чрез Ел. Поща към %s\n"
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 #, fuzzy
 msgid "Error: Unable to execute mail command."
 msgstr "Грешка: Запазването на конфигурационния файл е невъзможно"
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr ""
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr ""
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr ""
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "Системно Съобщение"
 
@@ -866,85 +810,85 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Грешка: Не мога да отворя %s за да записвам\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "Заглавие на диска"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "Име на песента"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr "W"
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "Изпълнител"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "ID3 жанр:"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "Година"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "Име на песента"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "Изпълнител на песента"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr "W"
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "Разделя:"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "Заглавие/Изпълнител"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "Изпълнител/Заглавие"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr ""
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "Много-изпълнители"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "Запазва информация за диска"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "Изпраща информация за диска"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 #, fuzzy
 msgid "No disc present."
 msgstr "Няма диск"
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 #, fuzzy
 msgid "Cannot submit. No disc is present."
 msgstr ""
 "Изпращането невъзможно\n"
 "Няма диск"
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 #, fuzzy
 msgid "You must enter a disc title."
 msgstr "Трябва да въведете заглавие на диска"
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 #, fuzzy
 msgid "You must enter a disc artist."
 msgstr "Трябва да въведете изпълнител на диска"
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -962,7 +906,7 @@
 "\n"
 "Напред?"
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -974,11 +918,11 @@
 "\n"
 "Напред?"
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "Избор на жанр"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -986,19 +930,18 @@
 "Изпращането изисква жанр различен от·\"непознат\"\n"
 "Моля, изберете жанр"
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "Жанр"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "Изпраща"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "Отказва"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "непознато ID3 поле\n"
@@ -1009,200 +952,177 @@
 msgstr ""
 "Грешка: не мога да преведа името на файла. Потребителят %s не същесвува\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "Стартирането се провали\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "Грешка: Лош тип на записа\n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 #, fuzzy
 msgid "Error: Reading config file\n"
 msgstr "Грешка: Невалиден конфигурационен файл\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "Грешка: Невалиден конфигурационен файл\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "Извлича и кодира"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "Извлича и кодира избраните песни"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "Само извлича"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "Извлича но не кодира избраните песни"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr "Отказва Извличането и Кодирането"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "Прекъсва всички активни процеси по извличане и кодиране"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "Отказва само извличането"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "Спира всички извличащи процеси"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "DDJ Сканиране"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "Вмъква информация за диска в баздата данни DigitalDJ"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "Извлича част от песен"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "Изпълнява"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "Текущ сектор:······0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "Извличане: Затихнало"
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Код: Песен 99·(99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
 msgstr "Код.: Затихнало"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr "Общи индикатори:"
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "Начален сектор"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "Краен сектор"
 
-#: src/rip.c:384
-#, fuzzy, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "Вмъква информация в SQL БазаДанни"
-
-#: src/rip.c:609
+#: src/rip.c:600
 #, fuzzy
 msgid "Error: can't open m3u file."
 msgstr "Грешка: m3u·файлът не може да бъде отворен\n"
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr ""
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr "Общ размер на код. инфомрация: %d\n"
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "Извлича: Песен %d·(%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr "Извлича: %6.2f%%"
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "Извличането приключи\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr ""
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "Следващата песен е %d, общо %d\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "Проверява дали е необходимо да бъде извлечена друга песен\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "Кодира: Песен %d·(%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr "Кодира: %6.2f%%"
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "Кодирнаето на процесор %d приключи\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "Изтрива·[%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "Извличането приключи\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "Няма Изпълнител"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "Няма Заглавие"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
 msgstr ""
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
 "executable."
 msgstr ""
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
 "encoder executable."
 msgstr ""
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1210,166 +1130,222 @@
 "Няма избрани песни.\n"
 "Извличане на целия CD?\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "Извлича цял CD\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr ""
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Първата избрана песен е %d\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr ""
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "Няма права за писане за да запише wav файлът"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "Извлича песен %d в %s\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Извлича: Песен %d·(0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "Файлът %s вече е извлечен. Пропуска...\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "Няма достатъчно място на твърдия диск"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "Обръща се към CDPRip\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Песента %d е добавена към списъка %s\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "Няма свободни процесори\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Кодира песен %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 #, fuzzy
 msgid "No write access to write encoded file."
 msgstr "Няма права за запис на кодирания файл"
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr ""
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Кодира: Песен %d·(0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr ""
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 "Не се извлича нищо в момента, нека да занулим стойностите на кодиране\n"
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Общ размер на извлечената информация: %d\n"
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Общ размер на кодираната информация: %d\n"
 
-#: src/tray.c:57
+#: src/tray.c:59
 #, fuzzy
 msgid "Artist"
 msgstr "Няма Изпълнител"
 
-#: src/tray.c:58
+#: src/tray.c:60
 #, fuzzy
 msgid "Title"
 msgstr "Няма Заглавие"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
 "%02d:%02d of %02d:%02d"
 msgstr ""
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr ""
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr ""
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
 "%s%s%s"
 msgstr ""
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
 "Idle"
 msgstr ""
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr ""
 
-#: src/tray.c:196
+#: src/tray.c:186
 #, fuzzy
 msgid "Stop"
 msgstr "Спира изпълението"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr ""
 
-#: src/tray.c:209
+#: src/tray.c:199
 #, fuzzy
 msgid "Next"
 msgstr "Следващ Диск"
 
-#: src/tray.c:217
+#: src/tray.c:207
 #, fuzzy
 msgid "Rip and Encode"
 msgstr "Отказва Извличането и Кодирането"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr ""
 
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "Определя размерите на основния прозорец"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "РАЗМЕРИ"
+
+#~ msgid "Status"
+#~ msgstr "Статус"
+
+#~ msgid "General"
+#~ msgstr "Основен"
+
+#~ msgid "Playing CDs"
+#~ msgstr "Изпълняващи се CD-та"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "Извличащи се CD-та"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "Конфигурация"
+
+#~ msgid "FAQ"
+#~ msgstr "Често Задавани Въпроси"
+
+#~ msgid "Getting More Help"
+#~ msgstr "Допълнителна помощ"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "Докладване за грешки"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "Запитва·%s·(през·%s)·за диск·%02x.\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "Запитва·%s·за дискт·%02x.\n"
+
+#~ msgid "No match\n"
+#~ msgstr "Няма съвпадение\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "Намерена информация за·\"%s·/·%s\"\n"
+#~ "Изтегляне на информация...\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "Изважда диск\n"
+
+#, fuzzy
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "Вмъква информация в SQL БазаДанни"
+
+#~ msgid "Rip finished\n"
+#~ msgstr "Извличането приключи\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "Кодирнаето на процесор %d приключи\n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "Изтрива·[%s]\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "Извличането приключи\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "Извлича песен %d в %s\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "Файлът %s вече е извлечен. Пропуска...\n"
+
 #~ msgid "Keep application minimum size"
 #~ msgstr "Запазва малък размер на програмата"

grip-4.1.1.tar.gz/po/boldquot.sed Added

grip-4.1.1.tar.gz/po/ca.gmo Added

grip-3.10.1.tar.gz/po/ca.po -> grip-4.1.1.tar.gz/po/ca.po Changed

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grip 3.1.10\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
 "PO-Revision-Date: 2004-04-16 02:42+0200\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -15,49 +15,41 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "Especifiqueu la geometria de la finestra principal"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "GEOMETRIA"
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr ""
 "Especifiqueu el fitxer de configuració a utilitzar (en el vostre directori "
 "personal)"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr "CONFIG"
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "Especifiqueu el dispositiu de cdrom a utilitzar"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "DISPOSITIU"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "Especifiqueu el dispositiu genèric scsi a utilitzar"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "Executa en mode «xicotet» (només-cd)"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr "Mode «local» -- no mires la informació del disc en la xarxa"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "No faces redirecció de E/S"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "Executa en mode detallat (debug)"
 
@@ -65,16 +57,12 @@
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "Error: no s'ha pogut inicialitzar [%s]\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr "Grip s'ha iniciat amb èxit\n"
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
@@ -82,74 +70,38 @@
 "Hi ha treballs en progrés.\n"
 "De veritat voleu sortir?"
 
-#: src/grip.c:401
-msgid "Status"
-msgstr "Estat"
-
-#: src/grip.c:416
-msgid "General"
-msgstr "General"
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "Extracció"
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
-msgstr "Codificació"
+#: src/grip.c:380
+#, fuzzy
+msgid "Unable to open help file"
+msgstr "Error: No s'ha pogut crear un fitxer temporal"
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "Taula de continguts"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "Reproducció de CD"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "Extracció de CD"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "Configuració de Grip"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "Preguntes més freqüents"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "Obtenir més ajuda"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "Informar d'errors"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "Quant a"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr "Versió %s"
 
-#: src/grip.c:641
+#: src/grip.c:505
 #, fuzzy
 msgid "Error: Trying to show homepage failed."
 msgstr "Error: No s'ha pogut desar el fitxer de configuració"
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr "Creat amb el Grip"
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -160,356 +112,364 @@
 "Tindreu que reconfigurar Grip.\n"
 "La vostra configuració antiga s'ha desat amb el sufixe -old."
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "el servidor és %s, port %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 #, fuzzy
 msgid "Error: Unable to save config file."
 msgstr "Error: No s'ha pogut desar el fitxer de configuració"
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "Config"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "Dispositiu CDRom"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "No interrompre la reproducció al sortir/executar"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "Rebobina al parar"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "Comença amb la primera pista si no s'està reproduint"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "Autoreproducció a l'insertar"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "Baralla abans de cada reproducció"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr "Evita expulsions defectuoses"
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr "Escaneja la unitat de discs per a nous discs"
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr "Interval entre escaneigs (segons)"
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "Extractor:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "Executable de l'extractor"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "Ordre de extracció"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "Deshabilita paranoia"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "Deshabilita paranoia extra"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "Ratlles: deshabilita la"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "detecció"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "reparació"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr "Calcula l'ajust de ganància"
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "Format de fitxer d'extracció"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 #, fuzzy
 msgid "Rip file format (Multi-artist)"
 msgstr "Format de fitxer d'extracció"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "Dispositiu genèric SCSI"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "Extractor"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "Valor «nice» de la extracció"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "Núm. màxim de .wav no codificats"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "Autoextracció a l'insertar"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "Avisa després d'extraure"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "Autoexpulsió després d'extraure"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "Demora de l'auto-expulsió"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr "Pausa abans d'extraure"
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr "Retarda la codificació fins que s'haja extret el disc"
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr "Atura la unitat de cdrom entre pistes"
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "Ordre de filtre de wav"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "Ordre de filtre de disc"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "Opcions"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "Extracció"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "Codificador:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr "Executable del codificador"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr "Ordre del codificador"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 #, fuzzy
 msgid "Encoder file extension"
 msgstr "Extensió de fitxer codificat"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 #, fuzzy
 msgid "Encoder file format"
 msgstr "Format de fitxer codificat"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 #, fuzzy
 msgid "Encode file format (Multi-artist)"
 msgstr "Format de fitxer codificat"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "Codificador"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr "Elimina els .wav després de codificar"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "Inserta la info en una base de dades SQL"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr "Crea fitxers .m3u"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "Utilitza camins relatius en els fitxers .m3u"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "Format del fitxer M3U"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Bitrate de la codificació (kbits/seg)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "Número de CPU a utilitzar"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 #, fuzzy
 msgid "Encoder 'nice' value"
 msgstr "Valor «nice» de la codificació"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 #, fuzzy
 msgid "Encoder filter command"
 msgstr "Ordre de filtre de codificació"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 #, fuzzy
 msgid "Execute command after encode"
 msgstr "Elimina els .wav després de codificar"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "Codificació"
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr "Afegeix tags ID3 als fitxers codificats"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Afegeix tags ID3v2 als fitxers codificats"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr "Només fica tags als fitxers acabats en «.mp3»"
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "Camp de comentari d'ID3"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr "Codificació del joc de caràcters de l'ID3v1"
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 msgid "ID3v2 Character set encoding"
 msgstr "Codificació del joc de caràcters de l'ID3v2"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "Servidor de BD"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "Ruta de CGI"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "Servidor primari"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "Servidor secundari"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr "Email d'enviament a la BD"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 msgid "DB Character set encoding"
 msgstr "Codificació del joc de caràcters de la BD"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "Utilitza extensions de freedb"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "Fa consultes de discs automàticament"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "BD de discs"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "Utilitza un servidor intermedi"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Adquireix servidor de la var. d'entorn «http_proxy»"
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "Servidor intermedi"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "Port del servidor intermedi"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "Nom d'usuari del servidor intermedi"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "Password del servidor intermedi"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "Servidor Intermedi"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "Adreça de correu electrònic"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "Programa d'actualització de CD"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "No fica els noms de fitxer en minúscules"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr "Permetre bits alts en els noms fitxer"
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr ""
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "No canvia espais a subratllats"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -517,20 +477,20 @@
 "Caràcters a no eliminar\n"
 "dels noms de fitxer"
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr ""
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "Misc"
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 #, fuzzy
 msgid "Error: Unable to save ripper config."
 msgstr "Error: No s'ha pogut desar la configuració de l'extractor"
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 #, fuzzy
 msgid "Error: Unable to save encoder config."
 msgstr "Error: No s'ha pogut desar la configuració del codificador"
@@ -570,7 +530,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr "No es pot consultar mentre s'extrau"
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "Disc desconegut"
@@ -580,227 +539,200 @@
 msgid "Track %02d"
 msgstr "Pista %02d"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "S'està consultant a %s (a través de %s) el disc %02x.\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "S'està consultant a %s el disc %02x.\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "No hi ha coincidències\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"Coincidir amb «%s / %s»\n"
-"S'estan descarregant dades...\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "Fet\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "S'ha produït un error al desar les dades del disc\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 msgid "Length"
 msgstr "Longitud"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "Pistes"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "Pista"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 #, fuzzy
 msgid "Done.\n"
 msgstr "Fet\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 #, fuzzy
 msgid "Error saving disc data."
 msgstr "Error saving disc data"
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "Rota el mode de reproducció"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "Activa/Desactiva la repetició de la reproducció"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "Estat de l'extracció"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "Reprodueix la pista / Pausa la reproducció"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "Rebobina"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "Avanç ràpid"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "Vés a la pista anterior"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "Vés a la pista següent"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "Mostra/oculta les opcions del mode de reproducció"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "Següent disc"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "Para la reproducció"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "Expulsa el disc"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr "Escaneja els continguts del disc"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "Mostra/oculta el control de volum"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "Mostra/oculta l'editor de discs"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Inicia/avorta les cerques de DiscDB"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "Mostra/oculta les pistes"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Surt de Grip"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 #, fuzzy
 msgid "Cannot fast forward while ripping."
 msgstr "No es pot avançar ràpidament mentre s'extrau"
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 #, fuzzy
 msgid "Cannot rewind while ripping."
 msgstr "No es pot rebobinar mentre s'extrau"
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 #, fuzzy
 msgid "Cannot switch discs while ripping."
 msgstr "No es pot canviar de disc mentre s'extrau"
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "Expulsa el disc\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 #, fuzzy
 msgid "Cannot eject while ripping."
 msgstr "No es pot expular mentre s'extrau"
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr "Teniu el disc -- expulsant\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 #, fuzzy
 msgid "Cannot play while ripping."
 msgstr "No es pot reproduir mentre s'extrau"
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 #, fuzzy
 msgid "Cannot switch tracks while ripping."
 msgstr "No es pot canviar de pista mentre s'extrau"
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "S'està comprovant si hi ha un nou disc\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat ha trobat un disc, s'estan comprovant les pistes\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "Hi ha un disc vàlid!\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "No hi ha pistes amb llargària no-zero\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "CDStat ha dit que no hi ha cap disc\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Sector actual: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "No hi ha disc"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -812,27 +744,39 @@
 "\n"
 "Voleu enviar la informació sobre aquest disc?"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 #, fuzzy
 msgid "Error: Unable to create temporary file."
 msgstr "Error: No s'ha pogut crear un fitxer temporal"
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 #, fuzzy
 msgid "Error: Unable to write disc data."
 msgstr "Error: No s'ha pogut escriure les dades del disc"
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "S'està enviant l'entrada a %s\n"
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 #, fuzzy
 msgid "Error: Unable to execute mail command."
 msgstr "Error: No s'ha pogut desar la configuració del codificador"
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr ""
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr ""
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr ""
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "Missatge del sistema"
 
@@ -866,85 +810,85 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Error: No s'ha pogut obrir %s per a escriptura\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "Títol del disc"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "Nom de la pista"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr "A"
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "Nom de l'artista"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "Gènere ID3:"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "Any del disc"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "Nom de la pista"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "Artista de la pista"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr "A"
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "Parteix:"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "Títol/Artista"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "Artista/Títol"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr "Caràcter de separació"
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "Artista múltiple"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "Desa la info del disc"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "Envia la info del disc"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 #, fuzzy
 msgid "No disc present."
 msgstr "No hi ha un disc present"
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 #, fuzzy
 msgid "Cannot submit. No disc is present."
 msgstr ""
 "No es pot enviar\n"
 "No hi ha cap disc present"
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 #, fuzzy
 msgid "You must enter a disc title."
 msgstr "Teniu que introduir el títol del disc"
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 #, fuzzy
 msgid "You must enter a disc artist."
 msgstr "Teniu que introduir l'artista del disc"
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -962,7 +906,7 @@
 "\n"
 "Voleu continuar?"
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -974,11 +918,11 @@
 "\n"
 "Voleu continuar?"
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "Selecció de gènere"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -986,19 +930,18 @@
 "L'enviament requereix un gènere diferent a «desconegut»\n"
 "Si us plau, seleccioneu un gènere de DiscDB"
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "Gènere DiscDB"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "Envia"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "camp ID3 desconegut\n"
@@ -1009,193 +952,170 @@
 msgstr ""
 "Error: no s'ha pogut traduir el nom de fitxer. No hi ha cap usuari «%s»\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "Ha fallat l'exec\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "Error: Tipus d'entrada errònia\n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 #, fuzzy
 msgid "Error: Reading config file\n"
 msgstr "Error: fitxer de configuració invàlid\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "Error: fitxer de configuració invàlid\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "Extrau i codifica"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "Extrau i codifica les pistes seleccionades"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "Només extrau"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "Extrau però no codifica les pistes seleccionades"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr "Avorta l'extracció i codificació"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "Mata tots els processos actius de extracció i codificació"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "Avorta l'extracció"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "Mata els processos d'extracció"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "Escaneig DDJ"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "Inserta la informació del disc en la base de dades de DigitalDJ"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "Extrau pista parcial"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "Reprodueix"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "Sector actual:       0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "Extr: Inactiu"
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Cod: Pista 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
 msgstr "Cod: Inactiu"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr "Indicadors generals:"
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "Sector inicial"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "Sector final"
 
-#: src/rip.c:384
-#, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "S'està inserint la pista %d en la base de dades de ddj\n"
-
-#: src/rip.c:609
+#: src/rip.c:600
 #, fuzzy
 msgid "Error: can't open m3u file."
 msgstr "Error: no es pot obrir el fitxer m3u\n"
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr "En KillRip\n"
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr "Ara la mida total de codificació és: %d\n"
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "Extr: Pista %d (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr "Extr: %6.2f%%"
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "Extracció finalitzada\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr "Extracció parcial %d núm wavs %d\n"
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "La següent pista és %d, el total és %d\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "Comprova si necessitem extraure altres pistes\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "Cod: Pista %d (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr "Cod: %6.2f%%"
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "Ha finalitzat la codificació en el processador %d\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "S'està eliminant [%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "L'extracció ha finalitzat\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "SenseArtista"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "SenseTítol"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
 msgstr ""
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
 "executable."
 msgstr ""
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 #, fuzzy
 msgid ""
 "Invalid encoder executable.\n"
@@ -1205,7 +1125,7 @@
 "Executable de codificació invàlid\n"
 "Comproveu la vostra configuració de codificació"
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1213,167 +1133,228 @@
 "No hi ha cap pista seleccionada.\n"
 "Extraure el CD sencer?\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "S'està extraient el CD sencer\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr "En RipNextTrack\n"
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "La primera pista comprovada és %d\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr "Extraient!\n"
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "No hi ha accés d'escriptura per a escriure el fitxer wav"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "S'està extraient la pista %d en %s\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Extracció: Pista %d (0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "El fitxer %s ja s'ha extret. S'ignorarà...\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "No hi ha espai disponible en el directori d'eixida"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "S'està cridant a CDPRip\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "S'ha afegit la pista %d a la llista de codificació %s\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "No hi ha processadors lliures\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Cod pista %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 #, fuzzy
 msgid "No write access to write encoded file."
 msgstr "No hi ha accés d'escriptura per a escriure el fitxer codificat"
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i: S'està codificant en %s\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Enc: Pista %d (0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr "En CalculateAll\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 "No s'està extraient ara, així que es ficaran a zero els valors de "
 "codificació\n"
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "La mida total d'extracció és: %d\n"
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "La mida total de codificació és: %d\n"
 
-#: src/tray.c:57
+#: src/tray.c:59
 #, fuzzy
 msgid "Artist"
 msgstr "SenseArtista"
 
-#: src/tray.c:58
+#: src/tray.c:60
 #, fuzzy
 msgid "Title"
 msgstr "SenseTítol"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
 "%02d:%02d of %02d:%02d"
 msgstr ""
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr ""
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr ""
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
 "%s%s%s"
 msgstr ""
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
 "Idle"
 msgstr ""
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr ""
 
-#: src/tray.c:196
+#: src/tray.c:186
 #, fuzzy
 msgid "Stop"
 msgstr "Para la reproducció"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr ""
 
-#: src/tray.c:209
+#: src/tray.c:199
 #, fuzzy
 msgid "Next"
 msgstr "Següent disc"
 
-#: src/tray.c:217
+#: src/tray.c:207
 #, fuzzy
 msgid "Rip and Encode"
 msgstr "Avorta l'extracció i codificació"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr ""
 
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "Especifiqueu la geometria de la finestra principal"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "GEOMETRIA"
+
+#~ msgid "Grip started successfully\n"
+#~ msgstr "Grip s'ha iniciat amb èxit\n"
+
+#~ msgid "Status"
+#~ msgstr "Estat"
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid "Playing CDs"
+#~ msgstr "Reproducció de CD"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "Extracció de CD"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "Configuració de Grip"
+
+#~ msgid "FAQ"
+#~ msgstr "Preguntes més freqüents"
+
+#~ msgid "Getting More Help"
+#~ msgstr "Obtenir més ajuda"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "Informar d'errors"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "S'està consultant a %s (a través de %s) el disc %02x.\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "S'està consultant a %s el disc %02x.\n"
+
+#~ msgid "No match\n"
+#~ msgstr "No hi ha coincidències\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "Coincidir amb «%s / %s»\n"
+#~ "S'estan descarregant dades...\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "Expulsa el disc\n"
+
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "S'està inserint la pista %d en la base de dades de ddj\n"
+
+#~ msgid "Rip finished\n"
+#~ msgstr "Extracció finalitzada\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "Ha finalitzat la codificació en el processador %d\n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "S'està eliminant [%s]\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "L'extracció ha finalitzat\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "S'està extraient la pista %d en %s\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "El fitxer %s ja s'ha extret. S'ignorarà...\n"
+
+#~ msgid "%i: Encoding to %s\n"
+#~ msgstr "%i: S'està codificant en %s\n"
+
 #~ msgid ""
 #~ "This is a development version of Grip. If you encounter problems, you are "
 #~ "encouraged to revert to the latest stable version."

grip-4.1.1.tar.gz/po/da.gmo Added

grip-3.10.1.tar.gz/po/da.po -> grip-4.1.1.tar.gz/po/da.po Changed

@@ -1,14 +1,14 @@
 # Danish translation grip.
-# Copyright (C) 2017 grip.
+# Copyright (C) 2020 Mike Oliphant and Johnny A. Solbu (msgids)
 # This file is distributed under the same license as the grip package.
-# Joe Hansen <joedalton2@yahoo.dk>, 2018.
+# Joe Hansen <joedalton2@yahoo.dk>, 2018, 2020.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: grip-3.6.0\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
-"PO-Revision-Date: 2018-08-14 22:30+0200\n"
+"Project-Id-Version: grip-4.1.0\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
+"PO-Revision-Date: 2020-03-08 22:30+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -17,489 +17,457 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "Angiv geometrien for hovedvinduet"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "GEOMETRI"
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr "Angiv konfigurationsfilen at bruge (i din hjemmemappe)"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr "KONFIGURATION"
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
-msgstr "Angiv cdrom-enheden at bruge"
+msgstr "Angiv cd-rom-enheden at bruge"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "ENHED"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "Angiv den generiske scsi-enhed at bruge"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
-msgstr "Start i »small« (kun-cd) tilstand"
+msgstr "Start i »small« (kun cd) tilstand"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
-msgstr "»Local« tilstand - slå ikke diskinformation op på nettet"
+msgstr "»Local« tilstand — slå ikke diskinformation op på nettet"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "Udfør ikke I/O-videresendelse"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
-msgstr "Afvikl i uddybende (fejlsøgning) tilstand"
+msgstr "Afvikl i uddybende tilstand (fejlsøgning)"
 
 #: src/grip.c:187
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "Fejl: Kunne ikke initialisere [%s]\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr "Grip startede\n"
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
 msgstr ""
-"Arbejde er i gang.\n"
+"Der er igangværende arbejde.\n"
 "Ønsker du at lukke ned?"
 
-#: src/grip.c:401
-msgid "Status"
-msgstr "Status"
-
-#: src/grip.c:416
-msgid "General"
-msgstr "Generelt"
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "Udtræk"
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
-msgstr "Kod"
+#: src/grip.c:380
+msgid "Unable to open help file"
+msgstr "Kan ikke åbne hjælpefilen"
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "Hjælp"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "Indholdsfortegnelse"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "Afspiller cd'er"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "Udtrækker cd'er"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "Konfigurering af Grip"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "OSS"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "Få yderligere hjælp"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "Rapporter fejl"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "Om"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr "Version %s"
 
-#: src/grip.c:641
+#: src/grip.c:505
 msgid "Error: Trying to show homepage failed."
 msgstr "Fejl: Kunne ikke vise hjemmesiden."
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr "Oprettet af Grip"
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
 "Your old config file has been saved with -old appended."
 msgstr ""
-"Din konfigurationsfil er forældet - nulstiller til standarderne.\n"
+"Din konfigurationsfil er forældet — nulstiller til standarderne.\n"
 "Du skal konfigurere Grip om.\n"
 "Din gamle konfigurationsfil er blevet gemt med -old tilføjet."
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "server er %s, port %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 msgid "Error: Unable to save config file."
 msgstr "Fejl: Kan ikke gemme konfigurationsfilen."
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "Konfiguration"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
-msgstr "CDRom-enhed"
+msgstr "Cd-rom-enhed"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Afbryd ikke afspilning ved afslut/opstart"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "Spol tilbage ved stop"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "Start med første nummer hvis der ikke afspilles"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "Automatisk afspilning ved diskindsættelse"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "Bland før hver afspilning"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
-msgstr "Omgå fejlramt skub ud"
+msgstr "Omgå forsøg på at skubbe ud"
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
-msgstr "Forespørg diskdrev for ny disk"
+msgstr "Forespørg diskdrev om ny disk"
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
-msgstr "Forespørg-interval (sekunder)"
+msgstr "Forespørgelsesinterval (sekunder)"
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "Cd"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "Udtrækker:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "Kørbar fil for udtrækker"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "Udtrækskommandolinje"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "Deaktiver paranoia"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "Deaktiver ekstra paranoia"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "Deaktiver scratch"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
-msgstr "detektion"
+msgstr "registrering"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "reparer"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr "Beregn forstærkningsjustering"
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "Udtræk filformat"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 msgid "Rip file format (Multi-artist)"
-msgstr "Udtræk filformat (flere kunstnere)"
+msgstr "Filformat for udtrækning (flere kunstnere)"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "Generisk SCSI-enhed"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "Udtrækker"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
-msgstr "Udtræk »nice«-værdi"
+msgstr "»nice«-værdi for udtrækker"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "Maks. ikke-kodede .wav'er"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "Udtræk automatisk ved indsættelse"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "Bip efter udtræk"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "Skub ud automatisk efter udtrækning"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "Forsinkelse for automatisk skub ud"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr "Forsinkelse før udtrækning"
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr "Forsink kodning indtil disk er udtrukket"
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
-msgstr "Stop cdrom-drev mellem numrene"
+msgstr "Stop cd-rom-drev mellem numrene"
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "Wav-filterkommando"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "Diskfilterkommando"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "Indstillinger"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "Udtræk"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "Koder:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr "Koderens kørbare fil"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr "Koderens kommandolinje"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 msgid "Encoder file extension"
 msgstr "Koderens filendelse"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 msgid "Encoder file format"
 msgstr "Koderens filformat"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 msgid "Encode file format (Multi-artist)"
 msgstr "Koderens filformat (flere kunstnere)"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "Koder"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr "Slet .wav efter kodning"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
-msgstr "Indsæt informationen i SQL-databasen"
+msgstr "Indsæt information i SQL-databasen"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr "Opret .m3u-filer"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "Brug relative stier i .m3u-filer"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "M3U-filformat"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Kodningsbithastighed (kbit/sek)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
-msgstr "Antallet af cpu'er at bruge"
+msgstr "Antallet af cpu'er der skal bruges"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 msgid "Encoder 'nice' value"
 msgstr "Koderens »nice«-værdi"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 msgid "Encoder filter command"
 msgstr "Koderens filterkommando"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 msgid "Execute command after encode"
 msgstr "Kør kommando efter kodning"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "Kod"
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr "Tilføj ID3-mærker til kodede filer"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Tilføj ID3v2-mærker til kodede filer"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr "Mærk kun filer der ender med ».mp3«"
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "ID3-kommentarfelt"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr "ID3v1-tegnsætkodning"
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 msgid "ID3v2 Character set encoding"
 msgstr "ID3v2-tegnsætkodning"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "DB-server"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "CGI-sti"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "Primær server"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "Sekundær server"
 
-#: src/gripcfg.c:613
+# DB er nok database, dvs. database af information om cd'er (f.eks. at
+# spor 8 er 2. sats af Brahms' 3. spektakel osv.)
+# måske Indsend e-post til DB
+# el.
+# E-post-adresse til indsendelse til DB
+# Men det er jo to vidt forskellige ting.
+# Måske:
+# DB-indsendelses-e-post
+# Det skulle dække begge muligheder
+#: src/gripcfg.c:601
 msgid "DB Submit email"
-msgstr "DB-indlægs e-post"
+msgstr "DB-indsendelses-e-post"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 msgid "DB Character set encoding"
 msgstr "DB-tegnsætkodning"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "Brug freedb-udvidelser"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "Udfør diskopslag automatisk"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "Brug proxyserver"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Hent server fra »http_proxy«-miljøvariablen"
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "Proxyserver"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "Proxyport"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "Proxybrugernavn"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "Proxyadgangskode"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "E-postadresse"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "Cd-opdateringsprogram"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
-msgstr "Lav ikke små bogstaver i filnavne"
+msgstr "Gør ikke bogstaver små i filnavne"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr "Tillad høje bit i filnavne"
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
-msgstr "Erstat ikke kompatible tegn med hexadecimale numre"
+msgstr "Erstat inkompatible tegn med hexadecimale numre"
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "Ændr ikke mellemrum til understreg"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
-msgstr "Skriv m3u-filer via non-posix-overholdende '\\'s"
+msgstr "Skriv m3u-filer via ikke-posix-overholdende »\\«"
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -507,19 +475,19 @@
 "Tegn der ikke skal fjernes\n"
 "i filnavne"
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr "Vis statusfeltikon"
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "Div."
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 msgid "Error: Unable to save ripper config."
 msgstr "Fejl: Kunne ikke gemme udtrækkerkonfig."
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 msgid "Error: Unable to save encoder config."
 msgstr "Fejl: Kunne ikke gemme koderkonfig."
 
@@ -555,9 +523,8 @@
 
 #: src/cdplay.c:90
 msgid "Cannot do lookup while ripping."
-msgstr "Kan ikke lave opslag under udtrækning."
+msgstr "Kan ikke udføre opslag under udtrækning."
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "Ukendt disk"
@@ -567,219 +534,196 @@
 msgid "Track %02d"
 msgstr "Nummer %02d"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "Forespørger %s (via %s) for disk %02x.\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "Forespørger %s for disk %02x.\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "Ingen match\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"Match for »%s / %s«\n"
-"Henter data ...\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "Færdig\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "Kunne ikke gemmel diskdata\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 msgid "Length"
 msgstr "Længde"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "Numre"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr "Vælg forrige CDDB-post."
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr "Vælg næste CDDB-post."
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "Nummer"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr "UdførNæsteDiskDBPost.\n"
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
 msgstr "Ingen diskdata. Returnerer.\n"
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
 msgstr "Allerede ved sidste indeks. Returnerer.\n"
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 msgid "Done.\n"
 msgstr "Færdig.\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
 msgstr "UdførForrDiskDBPost.\n"
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
 msgstr "Allrede ved første indeks. Returnerer.\n"
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 msgid "Error saving disc data."
 msgstr "Kunne ikke gemme diskdata."
 
-#: src/cdplay.c:797
+# rotate er ofte at skifte cyklisk mellem flere muligheder, dvs. "Ændre
+# cyklisk" eller mindre teknisk bare "Skift".
+# Så jeg ville tænke over om man kan bruge Skift/ændr i stedet.
+#: src/cdplay.c:783
 msgid "Rotate play mode"
-msgstr "Roter afspilningstilstand"
+msgstr "Skift afspilningstilstand"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
-msgstr "Aktiver loop-afspilning"
+msgstr "Aktiver gentaget afspilning"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "Udtræk-status"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "Afspil nummer / sæt afspilning på pause"
 
-#: src/cdplay.c:973
+# skal nok følge den næste
+#: src/cdplay.c:959
 msgid "Rewind"
-msgstr "Spol tilbage"
+msgstr "SpolTilbage"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "HurtigFremad"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "Gå til forrige nummer"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "Gå til næste nummer"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "Aktiver indstillinger for afspilningstilstand"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "Næste disk"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "Stop afspilning"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "Skub disk ud"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr "Skan diskindhold"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "Aktiver lydstyrkekontrol"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "Aktiver diskredigeringsprogram"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Igangsæt/afbryd DiscDB-opslag"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "Aktiver visning af numre"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Afslut Grip"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 msgid "Cannot fast forward while ripping."
-msgstr "Kan ikke spole hurtigt fremad under udtrækning."
+msgstr "Kan ikke spole under udtrækning."
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 msgid "Cannot rewind while ripping."
 msgstr "Kan ikke spole tilbage under udtrækning."
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 msgid "Cannot switch discs while ripping."
 msgstr "Kan ikke skifte diske under udtrækning."
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "Skub disk ud\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 msgid "Cannot eject while ripping."
 msgstr "Kan ikke skubbe disk ud under udtrækning."
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
-msgstr "Har disk - skubber den ud\n"
+msgstr "Har disk — skubber den ud\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 msgid "Cannot play while ripping."
 msgstr "Kan ikke afspille under udtrækning."
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 msgid "Cannot switch tracks while ripping."
 msgstr "Kan ikke ændre nummer under udtrækning."
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "Kontroller om der er kommet en ny disk\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
-msgstr "CDStat fandt en disk, kontrollerer numrene\n"
+msgstr "CDStat fandt en disk — kontrollerer numrene\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "Vi har en gyldig disk!\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "Ingen numre med længden nul\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "CDStat sagde ingen disk\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Nuværende sektor: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "Ingen disk"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -791,24 +735,36 @@
 "\n"
 "Ønsker du at indsende denne diskinformation?"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 msgid "Error: Unable to create temporary file."
 msgstr "Fejl: Kan ikke oprette midlertidig fil."
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 msgid "Error: Unable to write disc data."
 msgstr "Fejl: Kan ikke skrive diskdata."
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Sender information til %s\n"
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 msgid "Error: Unable to execute mail command."
 msgstr "Fejl: Kunne ikke køre postkommando."
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr "Advarsel"
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr "Information"
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr "Spørgsmål"
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "Systembesked"
 
@@ -840,81 +796,81 @@
 #: src/discdb.c:808
 #, c-format
 msgid "Error: Unable to open %s for writing\n"
-msgstr "Fejl: Kan ikke åbne %s for skrivning\n"
+msgstr "Fejl: Kan ikke åbne %s til skrivning\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "Disktitel"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "Navn"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr "W"
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "Diskkunstner"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
-msgstr "UD3-genre:"
+msgstr "ID3-genre:"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "Diskår"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "Navn"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "Kunstner"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr "W"
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "Opdel:"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "Titel/kunstner"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "Kunstner/titel"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr "Opdel tegn"
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "Flere kunstnere"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "Gem diskinformation"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "Indsend diskinformation"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 msgid "No disc present."
 msgstr "Ingen disk til stede."
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 msgid "Cannot submit. No disc is present."
 msgstr "Kan ikke indsende. Ingen disk er til stede."
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 msgid "You must enter a disc title."
 msgstr "Du skal indtaste en disktitel."
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 msgid "You must enter a disc artist."
 msgstr "Du skal indtaste en diskkunster."
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -932,7 +888,7 @@
 "\n"
 "Fortsæt?"
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -944,11 +900,11 @@
 "\n"
 "Fortsæt?"
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "Valg af genre"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -956,19 +912,18 @@
 "Indsendelse kræver en genre forskellig fra\n"
 "»unknown«. Vælg en DiscDB-genre nedenfor"
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "DiscDB-genre"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "Indsend"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "Afbryd"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "ukendt ID3-felt\n"
@@ -978,187 +933,164 @@
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr "Fejl: kan ikke oversætte filnavn. Ingen sådan bruger %s\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "Kørsel mislykkedes\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
-msgstr "Fejl: Ugyldig indtastningstype\n"
+msgstr "Fejl: Ugyldig indgangstype\n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 msgid "Error: Reading config file\n"
 msgstr "Fejl: Under læsning af konfigurationsfil\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "Fejl: Ugyldig konfigurationsfil\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "Udtræk+kod"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "Udtræk og kod valgte numre"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "Udtræk kun"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "Udtræk men kod ikke valgte numre"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
-msgstr "Om udtræk og kod"
+msgstr "Afbryd udtræk og kod"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "Dræb alle aktive udtræks- og kodningsprocesser"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
-msgstr "Kun om udtrækning"
+msgstr "Afbryd kun udtrækning"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "Dræb udtrækproces"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "DDJ-skanning"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "Indsæt diskinformation i DigitalDJ-databasen"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "Udtræk del af et nummer"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "Afspil"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "Nuværende sektor:    0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "Udtræk: Ledig"
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Kod: Num. 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
 msgstr "Kod: Ledig"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr "Overordnede indikatorer:"
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "Startsektor"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "Slutsektor"
 
-#: src/rip.c:384
-#, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "Indsætter nummeret %d i ddj-databasen\n"
-
-#: src/rip.c:609
+#: src/rip.c:600
 msgid "Error: can't open m3u file."
 msgstr "Fejl: kan ikke åbne m3u-filen."
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr "I KillRip\n"
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr "Ny samlet kodningsstørrelse er: %d\n"
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "Udtræk: Num. %d (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr "Udtræk: %6.2f%%"
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "Udtræk er færdig\n"
-
 # hvad mon num wavs er her?
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr "Udtræk del af %d  num wavs %d\n"
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
-msgstr "Næste nummer er %d, samlet er %d\n"
+msgstr "Næste nummer er %d, i alt %d\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "Kontroller om vi skal udtrække et nummer mere\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "Kod: Num. %d (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr "Kod: %6.2f%%"
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "Afsluttede kodning på cpu %d\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "Sletter [%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "Udtrækket er færdigt\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "IngenKunstner"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "IngenTitel"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
 msgstr ""
 "Ingen disk blev registreret i drevet. Hvis du har en disk i dit drev, så "
-"kontroller dine CDRom-enhedsindstillinger under Konfiguration->Cd."
+"kontroller dine cd-rom-enhedsindstillinger under Konfiguration->Cd."
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1168,7 +1100,7 @@
 "Kontroller din udtrækskonfiguration og sikr dig, at den angiver den fulde "
 "sti til udtrækkerens kørbare fil."
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1176,9 +1108,9 @@
 msgstr ""
 "Ugyldig kørbar fil for koderen.\n"
 "Kontroller din kodningskonfiguration og sikr dig, at den angiver den fulde "
-"stil til koderens kørbare fil."
+"sti til koderens kørbare fil."
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1186,105 +1118,91 @@
 "Ingen numre valgt.\n"
 "Udtræk hele cd'en?\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "Udtrækker hele cd'en\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr "I RipNextTrack\n"
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Første kontrollerede nummer er %d\n"
 
-#: src/rip.c:1497
+# kunne måske også være Udtrækning i gang
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr "Udtræk i gang!\n"
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "Ingen skriveadgang til at skrive wav-filen"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "Udtrækker nummer %d til %s\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Udtræk: Num. %d (0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "Filen %s er allerede blevet udtrukket. Udelader ...\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "Ikke nok plads i uddatamappen"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "Kalder CDPRip\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Tilføjede nummer %d til %s-listen\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "Ingen ledige cpu'er\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Koder nummer %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 msgid "No write access to write encoded file."
 msgstr "Ingen skriveadgang til at skrive kodet fil."
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i: Koder til %s\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Kod: Num. %d (0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr "I CalculateAll\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr "Vi udtrækker ikke nu, lad os nulkode værdier\n"
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Samlet udtrækstørrelse er: %d\n"
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Samlet kodet størrelse er: %d\n"
 
-#: src/tray.c:57
+#: src/tray.c:59
 msgid "Artist"
 msgstr "Kunstner"
 
-#: src/tray.c:58
+#: src/tray.c:60
 msgid "Title"
 msgstr "Titel"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1293,17 +1211,17 @@
 "%s - %s\n"
 "%02d:%02d af %02d:%02d"
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
-msgstr "Udtrækker Num. %02d:\t%6.2f%% (%6.2f%% )"
+msgstr "Udtrækker nummer %02d:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Koder nummer %02d:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1312,7 +1230,7 @@
 "%s - %s\n"
 "%s%s%s"
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1321,26 +1239,102 @@
 "%s - %s\n"
 "Ledig"
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr "Pause"
 
-#: src/tray.c:196
+#: src/tray.c:186
 msgid "Stop"
 msgstr "Stop"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr "Forrige"
 
-#: src/tray.c:209
+#: src/tray.c:199
 msgid "Next"
 msgstr "Næste"
 
-#: src/tray.c:217
+#: src/tray.c:207
 msgid "Rip and Encode"
 msgstr "Udtræk og kod"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr "Afslut"
+
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "Angiv geometrien for hovedvinduet"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "GEOMETRI"
+
+#~ msgid "Grip started successfully\n"
+#~ msgstr "Grip startede\n"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "General"
+#~ msgstr "Generelt"
+
+#~ msgid "Playing CDs"
+#~ msgstr "Afspiller cd'er"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "Udtrækker cd'er"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "Konfigurering af Grip"
+
+#~ msgid "FAQ"
+#~ msgstr "OSS"
+
+#~ msgid "Getting More Help"
+#~ msgstr "Få yderligere hjælp"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "Rapporter fejl"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "Forespørger %s (via %s) for disk %02x.\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "Forespørger %s for disk %02x.\n"
+
+#~ msgid "No match\n"
+#~ msgstr "Ingen match\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "Match for »%s / %s«\n"
+#~ "Henter data ...\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "Skub disk ud\n"
+
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "Indsætter nummeret %d i ddj-databasen\n"
+
+#~ msgid "Rip finished\n"
+#~ msgstr "Udtræk er færdig\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "Afsluttede kodning på cpu %d\n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "Sletter [%s]\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "Udtrækket er færdigt\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "Udtrækker nummer %d til %s\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "Filen %s er allerede blevet udtrukket. Udelader ...\n"
+
+#~ msgid "%i: Encoding to %s\n"
+#~ msgstr "%i: Koder til %s\n"

grip-4.1.1.tar.gz/po/de.gmo Added

grip-3.10.1.tar.gz/po/de.po -> grip-4.1.1.tar.gz/po/de.po Changed

@@ -1,15 +1,14 @@
 # German translation for grip2.
-# Copyright (C) 2005 Free Software Foundation, Inc.
 # This file is distributed under the same license as the grip package.
+# Copyright (C) 2020 Mike Oliphant and Johnny A. Solbu (msgids)
 # Götz Waschk <goetz.waschk@gmail.com>, 2002-2005.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2017.
-#
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2017, 2020.
 msgid ""
 msgstr ""
-"Project-Id-Version: grip 3.6.0\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
-"PO-Revision-Date: 2017-10-04 20:02+0200\n"
+"Project-Id-Version: grip 4.1.0\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
+"PO-Revision-Date: 2020-02-07 21:56+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
@@ -17,49 +16,42 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
-"X-Generator: Poedit 2.0.3\n"
+"X-Generator: Lokalize 19.12.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "Geometrie des Hauptfensters festlegen"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "GEOMETRIE"
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr "Konfigurationsdatei angeben (im persönlichen Ordner)"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr "CONFIG"
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "Zu benutzendes CD-ROM-Gerät angeben"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "GERÄT"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "Zu benutzendes generisches SCSI-Gerät angeben"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "Im »kleinen« (CD-Spieler-) Modus starten"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr "»Lokaler« Modus – keine CD-Informationen aus dem Netz holen"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "Keine I/O-Umleitung verwenden"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "Ausführlichen (Debug)-Modus verwenden"
 
@@ -67,16 +59,12 @@
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "Fehler: Initialisierung ist fehlgeschlagen [%s]\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr "Grip wurde erfolgreich gestartet\n"
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
@@ -84,73 +72,36 @@
 "Noch nicht fertig,\n"
 "wirklich beenden?"
 
-#: src/grip.c:401
-msgid "Status"
-msgstr "Status"
-
-#: src/grip.c:416
-msgid "General"
-msgstr "Allgemein"
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "Auslesen"
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
-msgstr "Kodieren"
+#: src/grip.c:380
+msgid "Unable to open help file"
+msgstr "Hilfedatei konnte nicht geöffnet werden."
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "Inhaltsverzeichnis"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "CDs abspielen"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "CDs auslesen"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "Grip konfigurieren"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "FAQ"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "Mehr Hilfe erhalten"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "Fehler melden"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "Info"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr "Version %s"
 
-#: src/grip.c:641
+#: src/grip.c:505
 msgid "Error: Trying to show homepage failed."
 msgstr "Fehler: Homepage konnte nicht angezeigt werden."
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr "Erstellt von Grip"
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -161,349 +112,357 @@
 "Sie müssen Grip nun neu konfigurieren.\n"
 "Die alte Konfigurationsdatei wurde durch Anhängen von -old umbenannt."
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "Server ist %s, Port %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 msgid "Error: Unable to save config file."
 msgstr "Fehler: Konfigurationsdatei konnte nicht gespeichert werden."
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "Konfiguration"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "CD-ROM-Laufwerk"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Abspielen beim Start/Beenden nicht unterbrechen"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "Zurückspulen wenn angehalten"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "Beim Abspielen mit erstem Titel starten"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "Automatisch nach Einlegen abspielen"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "Neu mischen vor jedem Abspielen"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr "Fehlerhafte CD-Auswurfsfunktion umgehen"
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr "Laufwerk nach neuer CD fragen"
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr "Frageintervall (Sekunden)"
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "Ausleser:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "Auslese-Programm"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "Befehlszeile"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "Paranoia deaktivieren"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "Extra-Paranoia deaktivieren"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "Kratzer"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "-erkennung ausschalten"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "-reparatur ausschalten"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr "Verstärkungs-Anpassung berechnen"
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "Format der ausgelesenen Dateien"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 msgid "Rip file format (Multi-artist)"
 msgstr "Format der ausgelesenen Dateien (Mehrere Künstler)"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "Generisches SCSI-Gerät"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "Ausleser"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "Priorität des Auslesers"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "Max. unkodierte .wav's"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "Automatisch nach Einlegen auslesen"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "Nach dem Rippen akustisch melden"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "Automatisch auswerfen nach dem Auslesen"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "Verzögerung vor automatischen Auswurf"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr "Verzögerung vor dem Auslesen"
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr "Erst nach dem Auslesen der CD kodieren"
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr "CD-ROM-Laufwerk zwischen den Titeln stoppen"
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "Wav-Filter-Befehl"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "CD-Filter-Befehl"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "Optionen"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "Auslesen"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "Kodierer:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr "Kodier-Programm"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr "Befehlszeile"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 msgid "Encoder file extension"
 msgstr "Kodier-Dateinamensendung"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 msgid "Encoder file format"
 msgstr "Kodier-Dateiformat"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 msgid "Encode file format (Multi-artist)"
 msgstr "Kodier-Dateiformat (Mehrere Künstler)"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "Kodierer"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr ".wav-Dateien nach dem Kodieren löschen"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "Info in SQL-Datenbank einfügen"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr ".m3u-Dateien erstellen"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "Relative Pfade in .m3u-Dateien verwenden"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "M3U-Dateiformat"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Bitrate des Kodierers (kbits/s)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "Anzahl von CPUs verwenden"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 msgid "Encoder 'nice' value"
 msgstr "Priorität des Kodierers"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 msgid "Encoder filter command"
 msgstr "Kodier-Filter-Befehl"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 msgid "Execute command after encode"
 msgstr "Befehl nach dem Kodieren ausführen"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "Kodieren"
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr "ID3-Tags zu kodierten Dateien hinzufügen"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr "ID3v2-Tags zu kodierten Dateien hinzufügen"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr "Tags nur in ».mp3«-Dateien schreiben"
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "ID3-Kommentarfeld"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr "ID3v1-Zeichenkodierung"
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 msgid "ID3v2 Character set encoding"
 msgstr "ID3v2-Zeichenkodierung"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "Datenbankserver"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "CGI-Pfad"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "Primärer Server"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "Sekundärer Server"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr "DB-E-Mail-Adresse"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 msgid "DB Character set encoding"
 msgstr "DB-Zeichenkodierung"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "FreeDB-Erweiterungen verwenden"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "Automatisch CDs nachschlagen"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "Proxy-Server verwenden"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Server aus der »http_proxy«-Umgebungsvariable holen"
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "Proxy-Server"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "Proxy-Portnummer"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "Proxy-Benutzername"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "Proxy-Passwort"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "E-Mail-Adresse"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "Programm zum Aktualisieren der CD"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "Dateinamen nicht in Kleinbuchstaben umwandeln"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr "»Hohe Bits« in Dateinamen erlauben"
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr "Inkompatible Zeichen durch Hexadezimalzahlen ersetzen"
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "Leerzeichen nicht in Unterstriche umwandeln"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 "m3u-Dateien mit nicht-POSIX-kompatiblem Rückschrägstrich »\\« schreiben"
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -511,19 +470,19 @@
 "Zeichen, die nicht aus Dateinamen \n"
 "entfernt werden sollen"
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr "Benachrichtigungssymbol anzeigen"
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "Sonst."
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 msgid "Error: Unable to save ripper config."
 msgstr "Fehler: Konfiguration des Auslesers konnte nicht gespeichert werden."
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 msgid "Error: Unable to save encoder config."
 msgstr "Fehler: Konfiguration des Kodierers konnte nicht gespeichert werden."
 
@@ -562,7 +521,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr "Die CD kann nicht während des Rippens nachgeschlagen werden."
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "Unbekannte CD"
@@ -572,219 +530,192 @@
 msgid "Track %02d"
 msgstr "Titel %02d"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "%s wird abgefragt (über %s) nach CD %02x.\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "Wird abgefragt %s nach CD %02x.\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "Kein Treffer\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"Treffer für »%s / %s«\n"
-"Daten werden heruntergeladen …\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "Fertig\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "Fehler beim Speichern der CD-Daten\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 msgid "Length"
 msgstr "Länge"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "Titel"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr "Vorigen CDDB-Eintrag auswählen."
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr "Nächsten CDDB-Eintrag auswählen."
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "Titel"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr "DoNextDiscDBEntry.\n"
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
 msgstr "Keine Daten zur CD. Zurück.\n"
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
 msgstr "Bereits im letzten Index. Zurück.\n"
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 msgid "Done.\n"
 msgstr "Fertig.\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
 msgstr "DoPrevDiscDBEntry.\n"
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
 msgstr "Bereits im ersten Index. Zurück.\n"
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 msgid "Error saving disc data."
 msgstr "Fehler beim Speichern der CD-Daten."
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "Abspielmodus rotieren"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "Wiederholung an-/ausschalten"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "Rip-Status"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "Titel / Pause abspielen"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "Zurückspulen"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "Vorspulen"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "Zum vorherigen Titel gehen"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "Zum nächsten Titel gehen"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "Abspielmodi an-/ausschalten"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "Nächste CD"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "Abspielen stoppen"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "CD auswerfen"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr "CD-Verzeichnis lesen"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "Lautstärkeregler an-/ausschalten"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "CD-Editor an-/ausschalten"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Start/Abbruch der DiscDB-Abfrage"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "Titelanzeige an-/ausschalten"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Grip beenden"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 msgid "Cannot fast forward while ripping."
 msgstr "Während des Auslesens kann nicht vorgespult werden."
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 msgid "Cannot rewind while ripping."
 msgstr "Während des Auslesens kann nicht zurückgespult werden."
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 msgid "Cannot switch discs while ripping."
 msgstr "Während des Auslesens kann die CD nicht gewechselt werden."
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "CD auswerfen\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 msgid "Cannot eject while ripping."
 msgstr "Die CD kann während des Auslesens nicht ausgeworfen werden."
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr "CD vorhanden – wird ausgeworfen\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 msgid "Cannot play while ripping."
 msgstr "Die CD kann während des Auslesens nicht abgespielt werden."
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 msgid "Cannot switch tracks while ripping."
 msgstr "Während des Auslesens kann der Titel nicht gewechselt werden."
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "Auf neue CD wird geprüft\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat fand eine CD, Titel werden überprüft\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "Wir haben eine gültige CD!\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "Keine Titel mit einer Länge ungleich null\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "CDStat sagt, dass keine CD vorhanden ist\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Aktueller Sektor: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "Keine CD"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -796,24 +727,36 @@
 "\n"
 "Möchten Sie diese CD-Information übertragen?"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 msgid "Error: Unable to create temporary file."
 msgstr "Fehler: Temporäre Datei konnte nicht angelegt werden."
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 msgid "Error: Unable to write disc data."
 msgstr "Fehler: CD-Daten konnten nicht geschrieben werden."
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Eintrag wird per E-Mail an %s gesendet\n"
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 msgid "Error: Unable to execute mail command."
 msgstr "Fehler: E-Mail-Befehl konnte nicht ausgeführt werden."
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr "Warnung"
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr "Information"
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr "Frage"
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "Systemnachricht"
 
@@ -847,79 +790,79 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Fehler: %s konnte nicht zum Schreiben geöffnet werden\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "CD-Name"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "Titelname"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr "W"
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "CD-Künstler"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "ID3-Genre:"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "CD-Jahr"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "Titelname"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "Titel-Künstler"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr "W"
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "Teilen:"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "Titel/Künstler"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "Künstler/Titel"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr "Aufteil-Zeichen"
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "Verschiedene Künstler"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "CD-Information speichern"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "CD-Information übertragen"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 msgid "No disc present."
 msgstr "Keine CD vorhanden."
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 msgid "Cannot submit. No disc is present."
 msgstr "Übertragen nicht möglich, keine CD vorhanden."
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 msgid "You must enter a disc title."
 msgstr "Sie müssen einen CD-Namen eingeben."
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 msgid "You must enter a disc artist."
 msgstr "Sie müssen einen CD-Künstler eingeben."
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -937,7 +880,7 @@
 "\n"
 "Weitermachen?"
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -949,11 +892,11 @@
 "\n"
 "Weitermachen?"
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "Genre-Auswahl"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -961,19 +904,18 @@
 "Übertragen erfordert ein anderes Genre als »unknown«.\n"
 "Wählen Sie bitte unten ein DiscDB-Genre aus."
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "DiscDB-Genre"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "Abschicken"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "unbekanntes ID3-Feld\n"
@@ -985,178 +927,155 @@
 "Fehler: Dateiname konnte nicht übersetzt werden. Kein Benutzer namens %s "
 "bekannt\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "Ausführen fehlgeschlagen\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "Fehler: Falscher Eintragstyp\n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 msgid "Error: Reading config file\n"
 msgstr "Fehler: Lesen der Konfigurationsdatei\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "Fehler: Ungültige Konfigurationsdatei\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "Auslesen und kodieren"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "Ausgewählte Titel auslesen und kodieren"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "Nur auslesen"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "Ausgewählten Titel auslesen, aber nicht kodieren"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr "Alles abbrechen"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "Alle aktiven Auslese- und Kodierungsprozesse abbrechen"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "Nur Auslesen abbrechen"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "Töten des Rip-Prozesses"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "DDJ einfügen"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "CD-Information in die DigitalDJ-Datenbank einfügen"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "Track-Ausschnitt auslesen"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "Abspielen"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "Aktueller Sektor:    0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "Ausl: Leerlauf"
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Kod: Ttl 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
 msgstr "Kod: Leerlauf"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr "Gesamtanzeigen:"
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "Start-Sektor"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "End-Sektor"
 
-#: src/rip.c:384
-#, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "Titel %d in die DDJ-Datenbank einfügen\n"
-
-#: src/rip.c:609
+#: src/rip.c:600
 msgid "Error: can't open m3u file."
 msgstr "Fehler: m3u-Datei kann nicht geöffnet werden."
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr "In KillRip\n"
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr "Gesamte kodierte Größe ist nun: %d\n"
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "Ausl: Ttl %d (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr "Ausl: %6.2f%%"
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "Auslesen abgeschlossen\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr "Teilweises Auslesen von %d, Anzahl wavs %d\n"
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "Nächster Titel ist %d, insgesamt %d\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "Prüfen, ob ein weiterer Titel ausgelesen werden muss\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "Kod: Ttl %d (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr "Kod: %6.2f%%"
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "Kodieren auf CPU %d fertig\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "Wird gelöscht [%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "Auslesen ist abgeschlossen\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "KeinKünstler"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "KeinTitel"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1164,7 +1083,7 @@
 "Es wurde keine CD im Laufwerk gefunden. Wenn eine CD im Laufwerk ist, dann "
 "prüfen Sie bitte die CD-ROM-Einstellungen unter Konfiguration->CD."
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1174,7 +1093,7 @@
 "Prüfen Sie Ihre Ausleseeinstellungen und stellen Sie sicher, dass der "
 "vollständige Pfad zum Programm angegeben ist."
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1184,7 +1103,7 @@
 "Prüfen Sie Ihre Kodierer-Einstellungen und stellen Sie sicher, dass der "
 "vollständige Pfad zum Kodierer angegeben ist."
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1192,105 +1111,90 @@
 "Keine Titel ausgewählt,\n"
 "ganze CD auslesen?\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "Die ganze CD wird ausgelesen\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr "In RipNextTrack\n"
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Erster markierter Titel ist %d\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr "Auslesen beginnt!\n"
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "Kein Schreibzugriff zum Schreiben der Wav-Datei"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "Titel %d wird nach %s ausgelesen\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Ausl: Ttl %d (0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "Datei %s wurde bereits ausgelesen, wird übersprungen …\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "Kein Platz mehr im Ausgabeordner"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "CDPRip wird aufgerufen\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Titel %d wurde zur %s-Liste hinzugefügt\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "Keine freien CPUs\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Kod Titel %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 msgid "No write access to write encoded file."
 msgstr "Kein Schreibzugriff zum Schreiben der kodierten Datei."
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i: Wird zu %s kodiert\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Kod: Ttl %d (0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr "In CalulateAll\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr "Es wird gerade nichts ausgelesen, also Kodierwerte auf 0 setzen\n"
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Gesamte ausgelesene Größe: %d\n"
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Gesamte kodierte Größe: %d\n"
 
-#: src/tray.c:57
+#: src/tray.c:59
 msgid "Artist"
 msgstr "Künstler"
 
-#: src/tray.c:58
+#: src/tray.c:60
 msgid "Title"
 msgstr "Titel"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1299,17 +1203,17 @@
 "%s - %s\n"
 "%02d:%02d von %02d:%02d"
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Titel %02d wird ausgelesen:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Titel %02d wird ausgelesen:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1318,7 +1222,7 @@
 "%s - %s\n"
 "%s%s%s"
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1327,26 +1231,26 @@
 "%s - %s\n"
 "Untätig"
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr "Pause"
 
-#: src/tray.c:196
+#: src/tray.c:186
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr "Voriger"
 
-#: src/tray.c:209
+#: src/tray.c:199
 msgid "Next"
 msgstr "Nächster"
 
-#: src/tray.c:217
+#: src/tray.c:207
 msgid "Rip and Encode"
 msgstr "Auslesen und kodieren"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr "Beenden"

grip-4.1.1.tar.gz/po/en@boldquot.header Added

@@ -0,0 +1,25 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+# This catalog furthermore displays the text between the quotation marks in
+# bold face, assuming the VT100/XTerm escape sequences.
+#

grip-4.1.1.tar.gz/po/en@quot.header Added

@@ -0,0 +1,22 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#

grip-4.1.1.tar.gz/po/es.gmo Added

grip-3.10.1.tar.gz/po/es.po -> grip-4.1.1.tar.gz/po/es.po Changed

@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grip 3.6.0\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
 "PO-Revision-Date: 2018-04-06 21:57+0200\n"
 "Last-Translator: Francisco Javier Serrador <fserrador@gmail.com>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
@@ -21,49 +21,41 @@
 "X-Generator: Virtaal 0.7.1\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "Especifica la geometría de la ventana principal"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "GEOMETRIA"
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr ""
 "Especifique el fichero de configuración a utilizar (en su directorio "
 "personal)"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr "CONFIG"
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "Especifica el dispositivo cdrom a usar"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "DISPOSITIVO"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "Especifica el dispositivo SCSCI genérico a usar"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "Iniciar en modo reducido (sólo CD)"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr "Modo «local» -- no buscar la informacion del disco en la red"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "No redireccionar E/S"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "Correr en modo prolijo (depuración)"
 
@@ -71,16 +63,12 @@
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "Error: no se pudo inicializar [%s]\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr "Grip iniciado correctamente\n"
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
@@ -88,73 +76,38 @@
 "Hay trabajos en proceso\n"
 "¿Realmente quieres cerrar?"
 
-#: src/grip.c:401
-msgid "Status"
-msgstr "Estado"
-
-#: src/grip.c:416
-msgid "General"
-msgstr "General"
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "Extraer"
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
-msgstr "Codificar"
+#: src/grip.c:380
+#, fuzzy
+#| msgid "Error: Unable to create temporary file."
+msgid "Unable to open help file"
+msgstr "Error: no pude crear un fichero temporal."
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "Distribución de Contenidos"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "Reproduciendo CD"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "Extrayendo CD"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "Configurar Grip"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "P+F"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "Obtener Más Ayuda"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "Declarando Defectos"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "Acerca de..."
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr "Versión %s"
 
-#: src/grip.c:641
+#: src/grip.c:505
 msgid "Error: Trying to show homepage failed."
 msgstr "Error: intentando mostrar página inicial fallada."
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr "Creado por Grip"
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -165,348 +118,356 @@
 "Necesitará reconfigurar Grip\n"
 "Se ha guardado su fichero de configuración antiguo añadiéndole un -old."
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "servidor es %s, puerto: %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 msgid "Error: Unable to save config file."
 msgstr "Error: no pude guardar el fichero de configuración."
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "Configurar"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "Dispositivo CDROM"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "No interrumpir la música al salir/iniciar"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "Rebobinar cuando se pare"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "Arrancar con la primer pista si no se está tocando"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "Autoreproducir al insertar un disco"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "Remezclar antes de tocar"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr "Hacer algo si falla la expulsión"
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr "Consultar a la unidad de disco si hay discos nuevos"
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr "Intervalo de consulta (segundos)"
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "Extractor:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "Ejecutable del extractor"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "Línea de órdenes para extraer"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "Desactivar paranoia"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "Desactivar paranoia adicional"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "Desactivar rayones"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "detección"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "reparar"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr "Calcular el ajuste de ganancia"
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "Formato de fichero de extracción"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 msgid "Rip file format (Multi-artist)"
 msgstr "Formato de fichero de extracción (Multi-artista)"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "Dispositivo SCSI genérico"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "Extractor"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "Valor «nice» del extractor"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "Nº máximo de .wav sin codificar"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "Autoextraer al insertar"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "Hacer «beep» al terminar de extraer"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "Auto-expulsar al terminar de extraer"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "Retardo de auto-expulsión"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr "Retardo antes de extraer"
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr "Retraso en la codificación hasta que el disco se extraiga"
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr "Parar la unidad de CDROM entre pistas"
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "Orden de filtro onda"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "Orden de filtro de disco"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "Opciones"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "Extraer"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "Codificador:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr "Ejecutable de codificación"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr "Línea de órdenes para el codificador"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 msgid "Encoder file extension"
 msgstr "Extensión del fichero codificado"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 msgid "Encoder file format"
 msgstr "Formato de fichero codificado"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 msgid "Encode file format (Multi-artist)"
 msgstr "Formato de fichero codificado (Multi-artista)"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "Codificador"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr "Borrar .wav despues de codificar"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "Insertar la información en una base de datos SQL"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr "Crear ficheros .m3u"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "Usar direcciones relativas en los ficheros .m3u"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "Formato de fichero M3U"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Tasa de bit de codificación (kbits/seg)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "Número de CPU a emplear"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 msgid "Encoder 'nice' value"
 msgstr "Valor «nice» del codificador"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 msgid "Encoder filter command"
 msgstr "Orden de filtro de codificación"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 msgid "Execute command after encode"
 msgstr "Función ejecutiva tras codificar"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "Codificar"
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr "Añadir etiquetas ID3 a los ficheros codificados"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Añadir etiquetas ID3v2 a los ficheros codificados"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr "Sólo marcar ficheros que terminan en «.mp3»"
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "Comentarios en ID3"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr "Codificación del conjunto de caracteres ID3v1"
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 msgid "ID3v2 Character set encoding"
 msgstr "Codificación del conjunto de caracteres ID3v2"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "Servidor BD"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "Ruta al CGI"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "Servidor primario"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "Servidor secundario"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr "Correo-e para mandar a a la BD"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 msgid "DB Character set encoding"
 msgstr "Conjunto de caracteres para codificación de BD"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "Usar extensiones freedb"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "Busqueda de información automática"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "Usar servidor Proxy"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Obtener el servidor desde var. ent. 'http-proxy'"
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "Servidor proxy"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "Puerto del proxy"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "Nombre de usuario para el proxy"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "Contraseña Proxy"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "Direccion de correo-e"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "Programa de actualización CD"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "No modificar nombres a minúsculas"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr "Permitir bits altos en los nombres de ficheros"
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr "Reemplazar caracteres incompatibles por números hexadecimales"
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "No modificar espacios a guión bajo"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr "Escribe fichero m3s utilizando capacidadas no-posix '\\'s"
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -514,19 +475,19 @@
 "Caracteres que no se deben quitar\n"
 "de los nombres de fichero"
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr "Mostrar icono de bandeja"
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "Misc"
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 msgid "Error: Unable to save ripper config."
 msgstr "Error: no pude guardar la configuración del extractor."
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 msgid "Error: Unable to save encoder config."
 msgstr "Error: no pude guardar la configuración del codificador."
 
@@ -565,7 +526,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr "No puedo hacer una búsqueda mientras estoy extrayendo."
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "Disco desconocido"
@@ -575,219 +535,192 @@
 msgid "Track %02d"
 msgstr "Pista %02d"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "Consultando %s (por medio de %s) para el disco %02x.\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "Consutando %s para el disco %02x.\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "No se encontró coincidencia\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"Coincidencia para «%s / %s»\n"
-"Descargando datos...\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "Finalizado\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "Error al guardar los datos del disco\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 msgid "Length"
 msgstr "Longitud"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "Pistas"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr "Seleccione precia entrada CDDB."
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr "Seleccione siguiente registro CDDB."
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "Pista"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr "DoNextDiscDBEntry.\n"
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
 msgstr "Ningún datos de disco. Volviendo.\n"
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
 msgstr "Ya al último índice. Volviendo.\n"
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 msgid "Done.\n"
 msgstr "Finalizado.\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
 msgstr "DoPrevDiscDBEntry.\n"
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
 msgstr "Siempre al primer índice. volviendo.\n"
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 msgid "Error saving disc data."
 msgstr "Error al guardar los datos del disco."
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "Reproducción en rotación"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "Conmutar reproducción en bucle"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "Estado de la extracción"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "Reproducir pista / pausa"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "Rebobinar"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "Avance rápido"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "Ir a la pista anterior"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "Ir a la pista siguiente"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "Conmutar modos de reproducción"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "Siguiente Disco"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "Parar reproducción"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "Expulsar disco"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr "Analizar Contenido Distribuído"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "Conmutar control de volumen"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "Conmutar editor de pistas"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Iniciar/abortar consulta a DiscDB"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "Conmutar lista de pistas"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Salir de Grip"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 msgid "Cannot fast forward while ripping."
 msgstr "No puedo avanzar mientras esté extrayendo datos."
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 msgid "Cannot rewind while ripping."
 msgstr "No puede retroceder mientras esté extrayendo datos."
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 msgid "Cannot switch discs while ripping."
 msgstr "No puedo cambiar de discos mientras esté extrayendo datos."
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "Expulsar disco\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 msgid "Cannot eject while ripping."
 msgstr "No puede expulsar mientras esté extrayendo datos."
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr "Hay disco -- expulsando\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 msgid "Cannot play while ripping."
 msgstr "No puedo reproducir mientras esté extrayendo datos."
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 msgid "Cannot switch tracks while ripping."
 msgstr "No puedo cambiar de pistas mientras esté extrayendo datos."
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "Comprobando un nuevo disco\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat encontró un disco, verificando pistas\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "Tenemos un disco válido\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "No hay pistas de longitud cero\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "CDStat dice que no hay disco\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Sector actual: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "Sin Disco"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -799,24 +732,36 @@
 "\n"
 "¿Deseas enviar la información del disco?"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 msgid "Error: Unable to create temporary file."
 msgstr "Error: no pude crear un fichero temporal."
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 msgid "Error: Unable to write disc data."
 msgstr "Error: no pude escribir los datos del disco."
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Enviando entrada a %s\n"
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 msgid "Error: Unable to execute mail command."
 msgstr "Error: no pude ejecutar orden de correo."
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr ""
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr ""
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr ""
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "Mensaje de sistema"
 
@@ -850,79 +795,79 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Error: no pude abrir %s para escribir\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "Título del disco"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "Nombre de pista"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr "O"
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "Artista del disco"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "Género ID3:"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "Año del disco"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "Nombre de pista"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "Artista de la pista"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr "O"
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "Partir:"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "Título/Artista"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "Artista/Título"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr "Partir caracteres"
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "Varios artistas"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "Guardar la información del disco"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "Enviar la informacion del disco"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 msgid "No disc present."
 msgstr "No se ha encontrado ningún disco."
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 msgid "Cannot submit. No disc is present."
 msgstr "No se pueden enviar los datos. No se ha encontrado ningún disco."
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 msgid "You must enter a disc title."
 msgstr "Debes poner un título al disco."
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 msgid "You must enter a disc artist."
 msgstr "Debes poner al artista del disco."
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -941,7 +886,7 @@
 "\n"
 "¿Desea continuar de todos modos?"
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -953,11 +898,11 @@
 "\n"
 "¿Desea continuar?"
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "Selección de género"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -966,19 +911,18 @@
 "para realizar el envío.\n"
 "Especifique un género DiscDB a continuación"
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "Género DiscDB"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "Enviar"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "campo ID3 desconocido\n"
@@ -989,179 +933,156 @@
 msgstr ""
 "Error: no se pudo traducir el nombre de fichero. No hay un usuario %s\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "Falló la ejecución\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "Error: tipo de registro equivocado\n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 msgid "Error: Reading config file\n"
 msgstr "Error: leyendo fichero de configuración\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "Error: fichero de configuración inválido\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "Extraer+Codificar"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "Extrae y codifica las pistas seleccionadas"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "Sólo Extraer"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "Extrae pero no codifica las pistas seleccionadas"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr "Interrumpir extracción y codificación"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "Mata todos los procesos activos de extracción y codificación"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "Interrumpir sólo la extracción"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "Mata al proceso de extracción"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "Análisis DDJ"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "Introduzca la información de disco en la base de datos DigitalDJ"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "Extraer pista parcial"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "Sector actual:       0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "Ext: inactivo"
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Codif: Pis 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
 msgstr "Codif: Inactiva"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr "Indicadores globales:"
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "Sector de comienzo"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "Sector final"
 
-#: src/rip.c:384
-#, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "Insertando la pista %d en la base de datos ddj\n"
-
-#: src/rip.c:609
+#: src/rip.c:600
 msgid "Error: can't open m3u file."
 msgstr "Error: no se pudo abrir el fichero m3u."
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr "En «KillRip»\n"
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr "El tamaño total de codificación es: %d\n"
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "Ext: Pis %d (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr "Ext: %6.2f%%"
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "Extracción finalizada\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr "Ext. parcial %d  núm. wavs %d\n"
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "La pista siguiente es %d, el total es %d\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "Comprobando si es necesario extraer otra pista\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "Codif: Pis %d (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr "Codif: %6.2f%%"
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "Finalizó la codificación en la CPU %d\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "Borrando [%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "Extracción está finalizada\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "SinArtista"
 
 # No poner el acento, se utiliza para crear directorios
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "SinTitulo"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1170,7 +1091,7 @@
 "configuración de su dispositivo CDROM en Config->CD si tiene un disco en la "
 "unidad."
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1180,7 +1101,7 @@
 "Compruebe su configuración de extracción y asegúrese de que especifica la "
 "ruta completa al ejecutable para la extracción."
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1190,7 +1111,7 @@
 "Compruebe la configuración de su codificador y asegúrese de que especifica "
 "una ruta completa al ejecutable de codificación."
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1198,109 +1119,94 @@
 "No ha seleccionado ninguna pista.\n"
 "¿Desea extraer todo el CD?\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "Extrayendo todo el CD\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr "En «RipNextTrack»\n"
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "La primera pista comprobada es %d\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr "¡Comienza la extracción!\n"
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "No tiene acceso de escritura para poder escribir en el fichero wav"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "Extrayendo pista %d a %s\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Ext: Pis %d (0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "Ya se ha extraído el fichero %s. Omitiéndolo...\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "No queda espacio en el directorio de salida"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "Llamando a «CDPRip»\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Se añadió la pista %d a la lista %s\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "No hay CPU disponibles\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Codif pista %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 msgid "No write access to write encoded file."
 msgstr ""
 "No tiene acceso de escritura para poder escribir en el fichero de "
 "codificación."
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i: Codificando a %s\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Codif: Pis %d (0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr "En «CalculateAll»\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 "No estamos extrayendo ahora, ponemos a cero los valores de codificación\n"
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "El tamaño total de extracción es: %d\n"
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "El tamaño total de codificación es: %d\n"
 
-#: src/tray.c:57
+#: src/tray.c:59
 msgid "Artist"
 msgstr "Artista"
 
 # No poner el acento, se utiliza para crear directorios
-#: src/tray.c:58
+#: src/tray.c:60
 msgid "Title"
 msgstr "Título"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1309,17 +1215,17 @@
 "%s - %s\n"
 "%02d:%02d de %02d:%02d"
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Extrayendo  Pista %02d:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Codificando Pista %02d:\t%6.2f%% (%6.2f%%)"
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1328,7 +1234,7 @@
 "%s - %s\n"
 "%s%s%s"
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1337,30 +1243,106 @@
 "%s - %s\n"
 "Inactivo"
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr "Pausar"
 
-#: src/tray.c:196
+#: src/tray.c:186
 msgid "Stop"
 msgstr "Detener"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/tray.c:209
+#: src/tray.c:199
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/tray.c:217
+#: src/tray.c:207
 msgid "Rip and Encode"
 msgstr "Extracción y Codificación"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr "Salir"
 
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "Especifica la geometría de la ventana principal"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "GEOMETRIA"
+
+#~ msgid "Grip started successfully\n"
+#~ msgstr "Grip iniciado correctamente\n"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid "Playing CDs"
+#~ msgstr "Reproduciendo CD"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "Extrayendo CD"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "Configurar Grip"
+
+#~ msgid "FAQ"
+#~ msgstr "P+F"
+
+#~ msgid "Getting More Help"
+#~ msgstr "Obtener Más Ayuda"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "Declarando Defectos"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "Consultando %s (por medio de %s) para el disco %02x.\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "Consutando %s para el disco %02x.\n"
+
+#~ msgid "No match\n"
+#~ msgstr "No se encontró coincidencia\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "Coincidencia para «%s / %s»\n"
+#~ "Descargando datos...\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "Expulsar disco\n"
+
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "Insertando la pista %d en la base de datos ddj\n"
+
+#~ msgid "Rip finished\n"
+#~ msgstr "Extracción finalizada\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "Finalizó la codificación en la CPU %d\n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "Borrando [%s]\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "Extracción está finalizada\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "Extrayendo pista %d a %s\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "Ya se ha extraído el fichero %s. Omitiéndolo...\n"
+
+#~ msgid "%i: Encoding to %s\n"
+#~ msgstr "%i: Codificando a %s\n"
+
 #~ msgid ""
 #~ "This is a development version of Grip. If you encounter problems, you are "
 #~ "encouraged to revert to the latest stable version."

grip-4.1.1.tar.gz/po/fi.gmo Added

grip-3.10.1.tar.gz/po/fi.po -> grip-4.1.1.tar.gz/po/fi.po Changed

@@ -11,8 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grip 3.1.8\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
 "PO-Revision-Date: 2004-03-30 12:00+0300\n"
 "Last-Translator: Flammie Pirinen <flammie@gnome-fi.org>\n"
 "Language-Team: Finnish <lokalisointi-laatu@lists.linux-aktivaattori.org>\n"
@@ -22,47 +22,39 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "Määrittele pääikkunan sijainti ja mitat"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "MITAT"
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr "Määrittele käytettävä asetustiedosto (kotihakemistossasi)"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr "ASETUKSET"
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "Määrittele käytettävä CD-aseman laitetiedosto"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "LAITE"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "Määrittele käytettävä SCSI-laitetiedosto"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "Käynnistä \"pienessä\" (CD-soitin)-tilassa"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr "\"Paikallinen\" tila -- älä hae levyn tietoja verkosta"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "Älä käytä I/O-uudelleenohjausta"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "Suorita yksityiskohtaisessa vianetsintätilassa"
 
@@ -70,16 +62,12 @@
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "Virhe: Alustus ei onnistunut [%s]\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr "Grip käynnistyi onnistuneesti\n"
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
@@ -87,74 +75,38 @@
 "Työ on kesken\n"
 "Haluatko varmasti lopettaa?"
 
-#: src/grip.c:401
-msgid "Status"
-msgstr "Tila"
-
-#: src/grip.c:416
-msgid "General"
-msgstr "Yleiset"
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "Kopiointi"
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
-msgstr "Koodaus"
+#: src/grip.c:380
+#, fuzzy
+msgid "Unable to open help file"
+msgstr "Virhe: Väliaikaistiedoston luonti ei onnistu"
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "Ohje"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "Sisällysluettelo"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "CD-levyjen soitto"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "CD-levyjen kopiointi"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "Gripin asetusten tekeminen"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "VUKK"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "Lisäohjeiden hakeminen"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "Ohjelmavirheiden raportointi"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "Tietoja"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr "Versio %s"
 
-#: src/grip.c:641
+#: src/grip.c:505
 #, fuzzy
 msgid "Error: Trying to show homepage failed."
 msgstr "Virhe: Asetustiedostoa ei voitu tallentaa"
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr "Tehty Gripillä"
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -164,356 +116,364 @@
 "Gripin asetukset täytyy tehdä uudelleen.\n"
 "Vanha asetustiedostosi tallennettiin -old-päätteellä."
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "palvelin on %s, portti %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 #, fuzzy
 msgid "Error: Unable to save config file."
 msgstr "Virhe: Asetustiedostoa ei voitu tallentaa"
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "Asetukset"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "CD-aseman laitetiedosto"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Älä keskeytä soittoa aloitettaessa tai lopetettaessa"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "Kelaa alkuun pysäytettäessä"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "Aloita ensimmäisestä raidasta jos ei soiteta"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "Soita levyä heti asemaan asettamisen jälkeen"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "Sekoita ennen jokaista soittokertaa"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr "Kierrä rikkinäinen levynpoistotoiminto"
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr "Tarkkaile asemaa uuden levyn varalta"
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr "Tarkkailuväli sekunteina"
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "Kopioija:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "Kopiointiohjelma"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "Kopioinnin komentojono"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "Poista virheenkorjaus"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "Poista tarkempi virheenkorjaus"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "Poista naarmujen"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "tunnistus"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "korjaus"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr "Laske GAIN-säätöarvot"
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "Levykopion tiedostonimi"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 #, fuzzy
 msgid "Rip file format (Multi-artist)"
 msgstr "Levykopion tiedostonimi"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "SCSI-laitetiedosto"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "Kopioija"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "Kopioinnin 'nice'-arvo"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "Suurin koodaamattomien .wav-tiedostojen määrä"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "Kopioi automaattisesti"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "Äänimerkki valmistuttua"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "Poista levy kopioinnin jälkeen"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "Poiston viive"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr "Tauko ennen kopiointia"
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr "Aloita koodaus vasta levyn kopioiduttua"
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr "Pysäytä CD-asema raitojen välillä"
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "Wav-tiedostojen suodatuskomento"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "Levyn suodatuskomento"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "Asetukset"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "Kopiointi"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "Koodaaja:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr "Koodausohjelma"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr "Koodauksen komentorivi"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 #, fuzzy
 msgid "Encoder file extension"
 msgstr "Koodauksen tiedostopääte"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 #, fuzzy
 msgid "Encoder file format"
 msgstr "Koodattava tiedostonimi"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 #, fuzzy
 msgid "Encode file format (Multi-artist)"
 msgstr "Koodattava tiedostonimi"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "Koodaaja"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr "Poista .wav-tiedosto koodauksen jälkeen"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "Syötä tiedot SQL-kantaan"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr "Tee .m3u-soittolistat"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "Käytä .m3u-soittolistoissa suhteellisia polkuja"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "M3U:n tiedostonimi"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Koodauksen bittinopeus (kilobittiä sekunnissa)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "Käytettävien prosessorien määrä"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 #, fuzzy
 msgid "Encoder 'nice' value"
 msgstr "Koodauksen 'nice'-arvo"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 #, fuzzy
 msgid "Encoder filter command"
 msgstr "Koodauksen filtteröintikomento"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 #, fuzzy
 msgid "Execute command after encode"
 msgstr "Poista .wav-tiedosto koodauksen jälkeen"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "Koodaus"
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr "Lisää ID3-merkinnät koodattuihin tiedostoihin"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Lisää ID3v2-merkinnät koodattuihin tiedostoihin"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr "Merkitse vain .mp3-tiedostot"
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "ID3-kommenttikenttä"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr "ID3v1-merkistökoodaus"
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 msgid "ID3v2 Character set encoding"
 msgstr "ID3v2-merkistökoodaus"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "Tietokantapalvelin"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "CGI-polku"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "Ensisijainen palvelin"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "Toissijainen palvelin"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr "Tietokantaan lähettämisen postiosoite"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 msgid "DB Character set encoding"
 msgstr "Tietokannan merkistökoodaus"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "Käytä freedb-laajennuksia"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "Tee levyn tietojen haut automaattisesti"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "Käytä välityspalvelinta"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Hae palvelin 'http_proxy'-ympäristömuuttujasta"
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "Välipalvelin"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "Välipalvelimen portti"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "Välipalvelimen käyttäjänimi"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "Välipalvelimen salasana"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "Välipalvelin"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "Sähköpostiosoite"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "CD-päivitysohjelma"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "Älä muuta tiedostonimiä pienaakkosiksi"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr "Hyväksy korkeat bitit tiedostonimissä"
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr ""
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "Älä muuta välilyöntejä alaviivoiksi"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -521,20 +481,20 @@
 "Merkit joita ei poisteta\n"
 "tiedostonimistä"
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr ""
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "Muut"
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 #, fuzzy
 msgid "Error: Unable to save ripper config."
 msgstr "Virhe: Kopioijan asetustiedostoa ei voitu tallentaa"
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 #, fuzzy
 msgid "Error: Unable to save encoder config."
 msgstr "Virhe: Koodaajan asetustiedostoa ei voitu tallentaa"
@@ -574,7 +534,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr "Ei voida hakea kopioitaessa"
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "Tuntematon levy"
@@ -584,227 +543,200 @@
 msgid "Track %02d"
 msgstr "Raita %02d"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "Haetaan osoitteesta %s (%s:n kautta) tietoja levylle %02x.\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "Haetaan osoitteesta %s tietoja levylle %02x.\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "Ei vastinetta\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"Vastine löydetty \"%s / %s\"\n"
-"Ladataan tietoja...\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "Valmis\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "Virhe levyn tietoja tallennettaessa\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 msgid "Length"
 msgstr "Pituus"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "Raidat"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "Raita"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 #, fuzzy
 msgid "Done.\n"
 msgstr "Valmis\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 #, fuzzy
 msgid "Error saving disc data."
 msgstr "Virhe levyn tietoja tallennettaessa"
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "Kierrätä soittotapaa"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "Aseta soittolistan toisto"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "Kopiointitila"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "Soita raita / Keskeytä soitto"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "Kelaa taaksepäin"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "Kelaa eteenpäin"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "Edelliseen raitaan"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "Seuraavaan raitaan"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "Vaihda soittotavan asetuksia"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "Seuraava levy"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "Pysäytä soitto"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "Poista levy asemasta"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr "Lue levyn sisältö"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "Vaihda äänenvoimakkuussäädintä"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "Vaihda levyn tietoja"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Käynnistä tai lopeta DiscDB-haku"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "Vaihda raitojen näyttöä"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Poistu Gripistä"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 #, fuzzy
 msgid "Cannot fast forward while ripping."
 msgstr "Kopioitaessa ei voi kelata eteenpäin"
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 #, fuzzy
 msgid "Cannot rewind while ripping."
 msgstr "Kopioitaessa ei voi kelata taaksepäin"
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 #, fuzzy
 msgid "Cannot switch discs while ripping."
 msgstr "Kopioitaessa ei voi vaihtaa levyä"
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "Poista levy asemasta\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 #, fuzzy
 msgid "Cannot eject while ripping."
 msgstr "Kopioitaessa ei voi poistaa levyä asemasta"
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr "Ota levy -- poistetaan asemasta\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 #, fuzzy
 msgid "Cannot play while ripping."
 msgstr "Kopioitaessa ei voida soittaa"
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 #, fuzzy
 msgid "Cannot switch tracks while ripping."
 msgstr "Kopioitaessa ei voida vaihtaa raitoja"
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "Luetaan uutta levyä\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat löysi levyn, luetaan raitoja\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "Levy on toimiva!\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "Ei epätyhjiä raitoja\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "CDStat ei huomannut levyä\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Nykyinen sektori: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "Ei levyä"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -816,27 +748,39 @@
 "\n"
 "Lähetetäänkö levyn tiedot?"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 #, fuzzy
 msgid "Error: Unable to create temporary file."
 msgstr "Virhe: Väliaikaistiedoston luonti ei onnistu"
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 #, fuzzy
 msgid "Error: Unable to write disc data."
 msgstr "Virhe: Levyn tietoja ei voitu kirjoittaa"
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Postitetaan tiedot osoitteeseen %s\n"
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 #, fuzzy
 msgid "Error: Unable to execute mail command."
 msgstr "Virhe: Koodaajan asetustiedostoa ei voitu tallentaa"
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr ""
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr ""
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr ""
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "Järjestelmäviesti"
 
@@ -870,86 +814,86 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Virhe: kohdetta %s ei voitu avata kirjoittamista varten\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "Levyn nimi"
 
-# this is assumed to be longest string of dialog in source file ::)
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "  Raidan nimi  "
-
-#: src/discedit.c:84
-msgid "W"
-msgstr "W"
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "Levyn artisti"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "ID3-tyylilaji"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "Levyn vuosi"
 
-#: src/discedit.c:196
+# this is assumed to be longest string of dialog in source file ::)
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "  Raidan nimi  "
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "Raidan artisti"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr "W"
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "Jaa:"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "Raita/Artisti"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "Artisti/Raita"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr "Jakomerkit"
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "Monta artistia"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "Tallenna levyn tiedot"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "Lähetä levyn tiedot"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 #, fuzzy
 msgid "No disc present."
 msgstr "Levyä ei ole saatavilla"
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 #, fuzzy
 msgid "Cannot submit. No disc is present."
 msgstr ""
 "Ei voida lähettää tietoja\n"
 "kun levyä ei ole"
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 #, fuzzy
 msgid "You must enter a disc title."
 msgstr "Levyn nimi on syötettävä"
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 #, fuzzy
 msgid "You must enter a disc artist."
 msgstr "Levyn artisti on syötettävä"
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -966,7 +910,7 @@
 "\n"
 "Jatketaanko?"
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -978,11 +922,11 @@
 "\n"
 "Jatketaanko?"
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "Tyylilajivalinta"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -990,19 +934,18 @@
 "Lähetettäessä pitäisi valita joku muu tyylilaji kuin\n"
 "'unknown', kokeilepa valita jotain tuosta alta"
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "DiscDB-tyylilaji"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "Lähetä"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "Peruuta"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "tuntematon ID3-kenttä\n"
@@ -1012,194 +955,171 @@
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr "Virhe: Tiedostonimeä ei voitu kääntää. Käyttäjää %s ei ole\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "Suoritus epäonnistui\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "Virhe: Virheellinen kentän tyyppi\n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 #, fuzzy
 msgid "Error: Reading config file\n"
 msgstr "Virhe: Väärä asetustiedosto\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "Virhe: Väärä asetustiedosto\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "Kopioi ja koodaa"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "Kopioi ja koodaa valitut raidat"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "Kopioi ainoastaan"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "Kopioi valitut raidat koodaamatta"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr "Peruuta kopiointi ja koodaus"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "Lopeta kaikki aktiiviset kopiointi- ja koodausprosessit"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "Keskeytä kopiointi ainoastaan"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "Lopeta kopiointiprosessi"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "DDJ-haku"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "Syötä levyn tiedot DigitalDJ-kantaan"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "Kopioi osittainen raita"
 
 # ei vaan mahdu
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "Soi"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "Nykyinen sektori: 0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "Kopiointi: Jouten"
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Koodaus: Raita 99 (99,9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
 msgstr "Koodaus: Jouten"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr "Yhteensä:"
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "Alkussektori"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "Loppusektori"
 
-#: src/rip.c:384
-#, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "Syötetänä raidan %d tiedot ddj-kantaan\n"
-
-#: src/rip.c:609
+#: src/rip.c:600
 #, fuzzy
 msgid "Error: can't open m3u file."
 msgstr "Virhe: m3u-tiedostoa ei voitu avata\n"
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr "Komennossa KillRip\n"
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr "Nyt koodattavan kokonaiskoko: %d\n"
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "Kopiointi: Raita %d (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr "Kopiointi: %6.2f%%"
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "Kopiointi päättyi\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr "Osittainen kopiointi %d, waveja %d\n"
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "Seuraava raita %d/%d\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "Tarkastetaan josko uutta raitaa pitää kopioida\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "Koodaus: Raita %d (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr "Koodaus: %6.2f%%"
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "Prosessori %d pääsi koodauksensa loppuun\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "Poistetaan [%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "Kopiointi loppui\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "EiArtistia"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "Nimetön"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
 msgstr ""
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
 "executable."
 msgstr ""
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 #, fuzzy
 msgid ""
 "Invalid encoder executable.\n"
@@ -1209,7 +1129,7 @@
 "Toimimaton koodauskomento\n"
 "Tarkista koodausasetuksesi"
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1217,165 +1137,226 @@
 "Ei raitoja valittuna\n"
 "Kopioidaanko koko CD?\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "Kopioidaan koko CD\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr "Komennossa RipNextTrack\n"
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Ensimmäinen tarkastettu raita on %d\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr "Kopioidaan pois!\n"
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "Ei kirjoitusoikeuksia wav-tiedostoon"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "Kopioidaan raita %d tiedostoon %s\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Kopiointi: Raita %d (0,0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "Tiedosto %s on jo kopioitu, ohitamme... \n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "Tila loppui hakemistossa"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "Kutsutaan komentoa CDPRip\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Lisättiin raita %d listaan %s\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "Ei vapaita prosessoreja\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Koodaataan raitaa %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 #, fuzzy
 msgid "No write access to write encoded file."
 msgstr "Ei kirjoitusoikeutta koodattuun tiedostoon"
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i: Koodataan kohteeseen %s\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Koodaus: Raita %d (0,0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr "Komennossa CalculateAll:\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr "Emme kopioi nyt joten nollatkaamme koodausarvoja\n"
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Kopion kokonaiskoko: %d\n"
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Koodauksen kokonaiskoko: %d\n"
 
-#: src/tray.c:57
+#: src/tray.c:59
 #, fuzzy
 msgid "Artist"
 msgstr "EiArtistia"
 
-#: src/tray.c:58
+#: src/tray.c:60
 #, fuzzy
 msgid "Title"
 msgstr "Nimetön"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
 "%02d:%02d of %02d:%02d"
 msgstr ""
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr ""
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr ""
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
 "%s%s%s"
 msgstr ""
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
 "Idle"
 msgstr ""
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr ""
 
-#: src/tray.c:196
+#: src/tray.c:186
 #, fuzzy
 msgid "Stop"
 msgstr "Pysäytä soitto"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr ""
 
-#: src/tray.c:209
+#: src/tray.c:199
 #, fuzzy
 msgid "Next"
 msgstr "Seuraava levy"
 
-#: src/tray.c:217
+#: src/tray.c:207
 #, fuzzy
 msgid "Rip and Encode"
 msgstr "Peruuta kopiointi ja koodaus"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr ""
 
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "Määrittele pääikkunan sijainti ja mitat"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "MITAT"
+
+#~ msgid "Grip started successfully\n"
+#~ msgstr "Grip käynnistyi onnistuneesti\n"
+
+#~ msgid "Status"
+#~ msgstr "Tila"
+
+#~ msgid "General"
+#~ msgstr "Yleiset"
+
+#~ msgid "Playing CDs"
+#~ msgstr "CD-levyjen soitto"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "CD-levyjen kopiointi"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "Gripin asetusten tekeminen"
+
+#~ msgid "FAQ"
+#~ msgstr "VUKK"
+
+#~ msgid "Getting More Help"
+#~ msgstr "Lisäohjeiden hakeminen"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "Ohjelmavirheiden raportointi"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "Haetaan osoitteesta %s (%s:n kautta) tietoja levylle %02x.\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "Haetaan osoitteesta %s tietoja levylle %02x.\n"
+
+#~ msgid "No match\n"
+#~ msgstr "Ei vastinetta\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "Vastine löydetty \"%s / %s\"\n"
+#~ "Ladataan tietoja...\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "Poista levy asemasta\n"
+
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "Syötetänä raidan %d tiedot ddj-kantaan\n"
+
+#~ msgid "Rip finished\n"
+#~ msgstr "Kopiointi päättyi\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "Prosessori %d pääsi koodauksensa loppuun\n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "Poistetaan [%s]\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "Kopiointi loppui\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "Kopioidaan raita %d tiedostoon %s\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "Tiedosto %s on jo kopioitu, ohitamme... \n"
+
+#~ msgid "%i: Encoding to %s\n"
+#~ msgstr "%i: Koodataan kohteeseen %s\n"
+
 #~ msgid ""
 #~ "This is a development version of Grip. If you encounter problems, you are "
 #~ "encouraged to revert to the latest stable version."

grip-4.1.1.tar.gz/po/fr.gmo Added

grip-3.10.1.tar.gz/po/fr.po -> grip-4.1.1.tar.gz/po/fr.po Changed

@@ -1,14 +1,14 @@
 # French translation file for grip
 # This file is distributed under the same license as the grip package.
 # Copyright (c) Éric Lassauge <lassauge@users.sf.net>, http://lassauge.free.fr/, 2002-2005
-# Stéphane Aulery <lkppo@free.fr>, 2017.
+# Stéphane Aulery <lkppo@free.fr>, 2017, 2019.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: grip 3.5.2\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
-"PO-Revision-Date: 2017-08-21 23:15+0200\n"
+"Project-Id-Version: grip 3.6.0\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
+"PO-Revision-Date: 2019-05-12 02:56+0200\n"
 "Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -18,50 +18,42 @@
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "Spécifier la geométrie de la fenêtre principale"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "GÉOMÉTRIE"
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr ""
 "Spécifier le fichier de configuration à utiliser (dans votre rép. perso)"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr "CONFIGURATION"
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "Spécifier le périphérique CDROM à utiliser"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "PÉRIPHÉRIQUE"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "Spécifier le périphérique SCSI générique à utiliser"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "Lancer en mode « small » (CD uniquement)"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr ""
 "Mode « local » -- pas de recherche d’information sur le disque à partir du "
 "réseau"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "Ne pas rediriger les E/S"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "Lancer en mode verbeux (debug)"
 
@@ -69,16 +61,12 @@
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "Erreur : impossible d’initialiser [%s]\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr "Démarrage réussi de Grip\n"
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
@@ -86,73 +74,38 @@
 "Travail en cours.\n"
 "Voulez vous vraiment arrêter ?"
 
-#: src/grip.c:401
-msgid "Status"
-msgstr "État"
-
-#: src/grip.c:416
-msgid "General"
-msgstr "Général"
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "Extraction"
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
-msgstr "Encodage"
+#: src/grip.c:380
+#, fuzzy
+#| msgid "Error: Unable to create temporary file."
+msgid "Unable to open help file"
+msgstr "Erreur : impossible de créer un fichier temporaire."
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "Aide"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "Table des matières"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "Lecture CDs"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "Extraction CDs"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "Configuration de Grip"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "FAQ"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "Plus d’aide"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "Signaler les erreurs"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "À propos de…"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr "Version %s"
 
-#: src/grip.c:641
+#: src/grip.c:505
 msgid "Error: Trying to show homepage failed."
 msgstr "Erreur : l’affichage de la page d’acceuil a échoué."
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr "Créé par Grip"
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -162,349 +115,357 @@
 "Grip utilisera les valeurs par défaut et vous devrez le reconfigurer\n"
 "Votre ancien fichier a été sauvé avec l’extension -old."
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "Le serveur est %s, port %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 msgid "Error: Unable to save config file."
 msgstr "Erreur : impossible de sauver le fichier de configuration."
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "Configuration"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "Périphérique CDROM"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Ne pas interrompre la musique lors du démarrage ou de l’arrêt de Grip"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "Revenir au début lors de l’arrêt"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "Démarrer avec la première piste"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "Lecture automatique à l’insertion"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "Mélanger avant chaque lecture"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr "Contourner les problèmes d’éjection erronée"
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr "Interroger le lecteur pour un nouveau disque"
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr "Intervalle d’interrogation (secondes)"
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "Extracteur :"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "Programme d’extraction"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "Ligne de commande de l’extracteur"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "Désactiver le mode « paranoïa »"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "Désactiver le mode « extra paranoïa »"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "Désactiver la détection des rayures"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "Détection"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "Réparation"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr "Calcul du gain d’ajustement"
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "Format du fichier d’extraction"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 msgid "Rip file format (Multi-artist)"
 msgstr "Format du fichier d’extraction (Multi-artist)"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "Périphérique SCSI générique"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "Extracteur"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "Valeur de « nice » pour l’extraction"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "Nombre max de fichiers WAV non codés"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "Extraction automatique à l’insertion"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "Biper après l’extraction"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "Éjection automatique après l’extraction"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "Délai d’éjection automatique"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr "Délai avant l’extraction"
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr "Retarder l’encodage après la fin de l’extraction du disque"
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr "Arrête le CDROM entre les pistes"
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "Commande du filtre de fichier WAV"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "Commande du filtre pour le disque"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "Options"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "Extraction"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "Encodeur :"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr "Programme d’encodage"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr "Ligne de commande de l’encodeur"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 msgid "Encoder file extension"
 msgstr "Extension de fichier d’encodeur"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 msgid "Encoder file format"
 msgstr "Format du fichier d’encodeur"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 msgid "Encode file format (Multi-artist)"
 msgstr "Format du fichier encodé (Multi-artist)"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "Encodeur"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr "Effacer les fichiers WAV après encodage"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "Insérer les informations dans la base de données SQL"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr "Créer des fichiers M3U"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "Utiliser des chemins relatifs dans les fichiers M3U"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "Format des fichiers M3U"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Débit binaire du codage (kbits/sec)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "Nombre de processeurs à utiliser"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 msgid "Encoder 'nice' value"
 msgstr "Valeur de « nice » de l’encodeur"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 msgid "Encoder filter command"
 msgstr "Commande du filtre de l’encodeur"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 msgid "Execute command after encode"
 msgstr "Exécute la commande après l’encodage"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "Encodage"
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr "Ajouter les informations ID3 aux fichiers encodés"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Ajouter les informations ID3v2 aux fichiers encodés"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr "N’ajouter les informations ID3 qu’aux fichiers de suffixe « .mp3 »"
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "Champ commentaire ID3"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr "Codage du jeu de caractères ID3v1"
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 msgid "ID3v2 Character set encoding"
 msgstr "Codage du jeu de caractères ID3v2"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "Serveur DB"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "Chemin du script CGI"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "Serveur primaire"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "Serveur secondaire"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr "courriel pour la soumission DB"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 msgid "DB Character set encoding"
 msgstr "Jeu de caractères de DB"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "Utiliser les extensions freedb"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "Lancer la recherche de disque automatiquement"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "Utiliser un serveur proxy"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Récupérer le serveur depuis la variable d'environnement « http_proxy »"
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "Serveur proxy"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "Port du proxy"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "Nom d’utilisateur du proxy"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "Mot de passe du proxy"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "courriel"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "Programme de mise à jour de CD"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "Ne pas passer les fichiers en minuscules"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr "Autoriser les caractères 8 bits dans les noms de fichiers"
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr ""
 "Remplace les caractères incompatibles par leur représentation hexadécimale"
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "Ne pas changer les espaces en caractères de soulignement (_)"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr "Ecrit les fichiers M3U en utilisant la syntaxe non Posix '\\'s"
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -512,19 +473,19 @@
 "Caractères à ne pas enlever\n"
 "dans les noms de fichiers"
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr "Affiche l’icône dans la barre des tâches"
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "Divers"
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 msgid "Error: Unable to save ripper config."
 msgstr "Erreur : impossible de sauver la configuration de l’extracteur."
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 msgid "Error: Unable to save encoder config."
 msgstr "Erreur : impossible de sauver la configuration de l’encodeur."
 
@@ -564,7 +525,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr "Recherche impossible pendant l’extraction."
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "Disque inconnu"
@@ -574,220 +534,192 @@
 msgid "Track %02d"
 msgstr "Piste %02d"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "Recherche %s (via %s) sur le disque %02x.\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "Recherche %s sur le disque %02x.\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "Pas de correspondance\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"Correspondance pour \"%s / %s\"\n"
-"Téléchargement des données…\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "Terminé\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "Erreur d’enregistrement des données du disque\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 msgid "Length"
 msgstr "Durée"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "Pistes"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
-msgstr ""
+msgstr "Sélection de l'entrée CDDB précédente."
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
-msgstr ""
+msgstr "Sélection de l'entrée CDDB suivante."
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "Piste"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
-msgstr ""
+msgstr "TraiterEntréeDisqueSuivante.\n"
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
-msgstr ""
+msgstr "Disque sans données. Retour.\n"
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
-msgstr ""
+msgstr "Déjà sur le dernier indice. Retour\n"
 
-#: src/cdplay.c:472 src/cdplay.c:499
-#, fuzzy
+#: src/cdplay.c:458 src/cdplay.c:485
 msgid "Done.\n"
-msgstr "Terminé\n"
+msgstr "Terminé.\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
-msgstr ""
+msgstr "TraiterEntréeDisquePrécédente.\n"
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
-msgstr ""
+msgstr "Déjà sur le premier indice. Retour.\n"
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 msgid "Error saving disc data."
 msgstr "Erreur d’enregistrement des données du disque."
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "Mode de lecture par rotation"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "Passer en lecture continu"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "État d’extraction"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "Lire la piste / mettre en pause"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "Retour"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "Avance rapide"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "Aller à la piste précédente"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "Aller à la piste suivante"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "Changer les options de lecture"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "Disque suivant"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "Arrêter la lecture"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "Éjecter le disque"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr "Analyse du disque"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "Basculer l’affichage du contrôle de volume"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "Basculer l’éditeur de disque"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Démarrer/arrêter la recherche DiscDB"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "Basculer l’affichage des pistes"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Sortir de Grip"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 msgid "Cannot fast forward while ripping."
 msgstr "Avance rapide impossible pendant l’extraction."
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 msgid "Cannot rewind while ripping."
 msgstr "Retour arrière impossible pendant l’extraction."
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 msgid "Cannot switch discs while ripping."
 msgstr "Changement de disque impossible pendant l’extraction."
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "Éjection du disque\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 msgid "Cannot eject while ripping."
 msgstr "Éjection impossible pendant l’extraction."
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr "Disque présent -- éjection\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 msgid "Cannot play while ripping."
 msgstr "Lecture impossible pendant l’extraction."
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 msgid "Cannot switch tracks while ripping."
 msgstr "Changement de piste impossible pendant l’extraction."
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "Vérification de la présence d’un nouveau disque\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDstat a trouvé un disque, vérification des pistes\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "Disque valide détecté !\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "Pas de piste de durée non-nulle\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "CDstat n’a pas trouvé de disque\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Secteur courant : %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "Pas de disque"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -799,24 +731,36 @@
 "\n"
 "Voulez-vous soumettre les informations de ce disque ?"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 msgid "Error: Unable to create temporary file."
 msgstr "Erreur : impossible de créer un fichier temporaire."
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 msgid "Error: Unable to write disc data."
 msgstr "Erreur : impossible d’enregistrer les données du disque."
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Envoi de l’entrée à %s\n"
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 msgid "Error: Unable to execute mail command."
 msgstr "Erreur : impossible d’exécuter la commande mail."
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr ""
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr ""
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr ""
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "Message système"
 
@@ -850,79 +794,79 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Erreur : impossible d’ouvrir %s en écriture\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "Titre du disque"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "Nom de la piste"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr "E"
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "Artiste"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "Genre ID3 :"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "Année"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "Nom de la piste"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "Artiste de la piste"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr "E"
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "Découpage :"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "Titre / Artiste"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "Artiste/Titre"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr "Découper les caractères"
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "Collectif"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "Enregistrer les informations du disque"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "Soumettre les informations du disque"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 msgid "No disc present."
 msgstr "Pas de disque présent."
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 msgid "Cannot submit. No disc is present."
 msgstr "Soumission impossible :disque manquant."
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 msgid "You must enter a disc title."
 msgstr "Donnez un titre au disque."
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 msgid "You must enter a disc artist."
 msgstr "Donnez un artiste au disque."
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -939,7 +883,7 @@
 "\n"
 "Continuer ?"
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -951,11 +895,11 @@
 "\n"
 "Continuer ?"
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "Sélection du genre"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -963,19 +907,18 @@
 "Soumettre des informations nécessite un genre défini.\n"
 "Choisissez un des genres DiscDB ci-dessous :"
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "Genre DiscDB"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "Soumettre"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "Annuler"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "Champ ID3 inconnu\n"
@@ -986,178 +929,155 @@
 msgstr ""
 "Erreur : impossible de changer le nom de fichier. Utilisateur %s inconnu\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "Exécution échouée\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "Erreur : entrée de type erroné\n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 msgid "Error: Reading config file\n"
 msgstr "Erreur de lecture du fichier de configuration\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "Erreur : fichier de configuration invalide\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "Extraction + encodage"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "Extraction et encodage des pistes sélectionnées"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "Extraction seule"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "Extraction sans encoder les pistes sélectionnées"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr "Annuler l’extraction et l’encodage"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "Tuer tous les processus d’extraction et d’encodage"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "Annuler seulement l’extraction"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "Tuer les processus d’extraction"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "Recherche DDJ"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "Insérer les informations du disque dans la base de données DigitalDJ"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "Extraction partielle de piste"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "Lire"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "Secteur courant :      0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
-msgstr "Ext : innocupé"
+msgstr "Ext : inoccupé"
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Cod : piste 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
-msgstr "Enc : innocupé"
+msgstr "Enc : inoccupé"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr "Indicateurs généraux :"
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "Premier secteur"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "Dernier secteur"
 
-#: src/rip.c:384
-#, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "Insertion de la piste %d dans la base de données SQL\n"
-
-#: src/rip.c:609
+#: src/rip.c:600
 msgid "Error: can't open m3u file."
 msgstr "Erreur : impossible d’ouvrir le fichier M3U."
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr "Dans ArrêtExt\n"
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr "Taille totale de l’encodage en cours : %d\n"
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "Ext : piste %d (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr "Extr : %6.2f%%"
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "Extraction terminée\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr "Extraction partielle de %d sur %d WAV\n"
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "Piste suivante %d / %d\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "Cocher si vous avez besoin d’extraire une autre piste\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "Enc : piste %d (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr "Enc : %6.2f%%"
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "Encodage terminé sur le CPU %d\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "Destruction [%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "Extraction terminée\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "Sans artiste"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "Sans titre"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1166,7 +1086,7 @@
 "lecteur, vérifiez la configuration du périphérique CDRom sous "
 "« Configuration > CD »."
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1176,7 +1096,7 @@
 "Vérifier la configuration, et assurez vous de donnner le chemin complet vers "
 "le programme d’extraction."
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1186,7 +1106,7 @@
 "Vérifier la configuration, et assurez vous de donner le chemin complet vers "
 "l’encodeur."
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1194,105 +1114,90 @@
 "Pas de piste sélectionnée.\n"
 "Extraction de tout le CD ?\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "Extraction intégrale du CD\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr "Dans ExtractionPisteSuivante\n"
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "La première piste choisie est la %d\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr "Extraction !\n"
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "Pas d’accès en écriture au fichier WAV"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "Extraction piste %d vers %s\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Ext : piste %d (0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "Le fichier %s est déjà extrait. Passage au suivant…\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "Plus d’espace disponible dans le répertoire destination"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "Appel à CDPRip\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Ajout de la piste %d dans la liste %s\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "Pas de CPU disponible\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Enc piste %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 msgid "No write access to write encoded file."
 msgstr "Pas d’accès en écriture au fichier encodé."
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i : encodage vers %s\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Enc : piste %d (0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr "Dans CalculeTout\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr "Pas d’extraction en cours, on met à zéro les valeurs d’encodage\n"
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Taille totale de l’extraction : %d\n"
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Taille totale de l’encodage : %d\n"
 
-#: src/tray.c:57
+#: src/tray.c:59
 msgid "Artist"
 msgstr "Artiste"
 
-#: src/tray.c:58
+#: src/tray.c:60
 msgid "Title"
 msgstr "Titre"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1301,17 +1206,17 @@
 "%s - %s\n"
 "%02d:%02d de %02d:%02d"
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Extraction de la piste %02d:\t%6.2f%% (%6.2f%%)"
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Encodage de la piste %02d:\t%6.2f%% (%6.2f%%)"
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1320,35 +1225,111 @@
 "%s - %s\n"
 "%s%s%s"
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
 "Idle"
 msgstr ""
 "%s - %s\n"
-"Innocupé"
+"Inoccupé"
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr "Pause"
 
-#: src/tray.c:196
+#: src/tray.c:186
 msgid "Stop"
 msgstr "Arrêter"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr "Précédant"
 
-#: src/tray.c:209
+#: src/tray.c:199
 msgid "Next"
 msgstr "Suivant"
 
-#: src/tray.c:217
+#: src/tray.c:207
 msgid "Rip and Encode"
 msgstr "Extraire et encoder"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr "Quitter"
+
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "Spécifier la geométrie de la fenêtre principale"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "GÉOMÉTRIE"
+
+#~ msgid "Grip started successfully\n"
+#~ msgstr "Démarrage réussi de Grip\n"
+
+#~ msgid "Status"
+#~ msgstr "État"
+
+#~ msgid "General"
+#~ msgstr "Général"
+
+#~ msgid "Playing CDs"
+#~ msgstr "Lecture CDs"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "Extraction CDs"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "Configuration de Grip"
+
+#~ msgid "FAQ"
+#~ msgstr "FAQ"
+
+#~ msgid "Getting More Help"
+#~ msgstr "Plus d’aide"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "Signaler les erreurs"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "Recherche %s (via %s) sur le disque %02x.\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "Recherche %s sur le disque %02x.\n"
+
+#~ msgid "No match\n"
+#~ msgstr "Pas de correspondance\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "Correspondance pour \"%s / %s\"\n"
+#~ "Téléchargement des données…\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "Éjection du disque\n"
+
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "Insertion de la piste %d dans la base de données SQL\n"
+
+#~ msgid "Rip finished\n"
+#~ msgstr "Extraction terminée\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "Encodage terminé sur le CPU %d\n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "Destruction [%s]\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "Extraction terminée\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "Extraction piste %d vers %s\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "Le fichier %s est déjà extrait. Passage au suivant…\n"
+
+#~ msgid "%i: Encoding to %s\n"
+#~ msgstr "%i : encodage vers %s\n"

grip-4.1.1.tar.gz/po/fur.gmo Added

grip-3.10.1.tar.gz/po/fur.po -> grip-4.1.1.tar.gz/po/fur.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grip-3.4.2\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
 "PO-Revision-Date: 2017-07-27 15:50+0200\n"
 "Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
 "Language-Team: Friulian <f.t.public@gmail.com>\n"
@@ -19,47 +19,39 @@
 "X-Generator: Poedit 2.0.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "Specifiche la gjeometrie dal barcon principâl"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "GJEOMETRIE"
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr "Specifiche il file di configurazion di doprâ (inte tô cartele home)"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr "CONFIGURAZION"
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "Specifiche il dispositîf cdrom di doprâ"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "DISPOSITÎF"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "Specifiche il dispositîf scsi gjeneric di doprâ"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "Invie in modalitât “piçule” (dome-cd)"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr "Modalitât “locâl” -- no sta cirî su internet lis informazions sul disc"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "No sta fâ l'indreçament di direzion I/O"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "Eseguìs in modalitât lungje/fetose (debug)"
 
@@ -67,16 +59,12 @@
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "Erôr: impussibil inizializâ [%s]\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr "Grip si è inviât cun sucès\n"
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
@@ -84,74 +72,39 @@
 "Lavôr in cors.\n"
 "Distudâ pardabon?"
 
-#: src/grip.c:401
-msgid "Status"
-msgstr "Stât"
-
-#: src/grip.c:416
-msgid "General"
-msgstr "Gjenerâl"
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "Estrazion"
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
-msgstr "Codifiche"
+#: src/grip.c:380
+#, fuzzy
+#| msgid "Error: Unable to create temporary file."
+msgid "Unable to open help file"
+msgstr "Erôr: Impussibil creâ il file temporani."
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "Jutori"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "Tabele dai contignûts"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "Riproduzion dai CD"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "Estrazion dai CD"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "Configure Grip"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "FAQ"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "Par vê plui jutori"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "Segnalazion erôrs"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "Informazions"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr "Version %s"
 
-#: src/grip.c:641
+#: src/grip.c:505
 #, fuzzy
 msgid "Error: Trying to show homepage failed."
 msgstr "Erôr: impussibil salvâ il file di configurazion."
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr "Creât di Grip"
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -162,348 +115,356 @@
 "Al coventarà tornâ a configurâ Grip.\n"
 "Il to vecjo file di configurazion al è stât salvât zontant tal non \"-old\"."
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "il servidôr al è %s, puarte %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 msgid "Error: Unable to save config file."
 msgstr "Erôr: impussibil salvâ il file di configurazion."
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "Configurazion"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "Dispositîf CDRom"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "No sta interompi la riproduzion in jessude o tal inviament"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "Torne fâs sù al inizi se al ven fermât"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "Tache cun la prin toc/linie se nol è in riproduzion"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "Riprodûs in automatic al inseriment dal disc"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "Torne messede prime di ogni riproduzion"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr "Soluzion se no si rive a parâ fûr"
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr "Consulte la unitât dal disc par savê se e à un gnûf disc"
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr "Interval par consultâ (seconts)"
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "Estratôr:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "Eseguibil dal estratôr"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "Rie di comant par estrai"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "Disabilite paranoia"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "Disabilite lis opzions extra di paranoia"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "Disabilite lis sgriadis"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "rilevament"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "comedament"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr "Calcole il justament dal vuadagn"
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "Formât dal file di estrazion"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 msgid "Rip file format (Multi-artist)"
 msgstr "Formât dal file di estrazion (artiscj-multiplis)"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "Dispositîf SCSI gjeneric"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "Estratôr"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "Valôr 'nice' dal estratôr"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "Numar massim di file .wav no codificâts"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "Estrai in automatic al inseriment"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "Beep dopo vê estrat"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "Pare fûr in automatic dopo vê estrat"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "Ritart tal parâ fûr in automatic"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr "Ritart prime di estrai"
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr "Ritarde la codifiche fintremai che il disc nol sedi estrat"
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr "Ferme la unitât cdrom tra i tocs/liniis"
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "Comant dal filtri wav"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "Comant dal filtri disc"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "Opzions"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "Estrazion"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "Codificadôr:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr "Eseguibil dal codificadôr"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr "Rie di comant dal codificadôr"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 msgid "Encoder file extension"
 msgstr "Estension dal file dal codificadôr"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 msgid "Encoder file format"
 msgstr "Formât dal file dal codificadôr"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 msgid "Encode file format (Multi-artist)"
 msgstr "Formât dal file codificât (artiscj-multiplis)"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "Codificadôr"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr "Elimine il file .wav dopo vê codificât"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "Inserìs informazions te base di dâts SQL"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr "Cree i file .m3u"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "Dopre i percors relatîfs tai file .m3u"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "Formât dal file M3U"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Velocitât di codifiche (kbits/s)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "Numar di CPU di doprâ"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 msgid "Encoder 'nice' value"
 msgstr "Valôr 'nice' dal codificadôr"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 msgid "Encoder filter command"
 msgstr "Comant dal filtri dal codificadôr"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 msgid "Execute command after encode"
 msgstr "Eseguìs il comant dopo vê codificât"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "Codifiche"
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr "Zonte etichetis ID3 ai file codificâts"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Zonte etichetis ID3v2 ai file codificâts"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr "Met etichetis dome ai file che a finissin cun '.mp3'"
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "Cjamp coment ID3"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr "Codifiche de cumbinazion di caratars ID3v1"
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 msgid "ID3v2 Character set encoding"
 msgstr "Codifiche de cumbinazion di caratars ID3v2"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "Servidôr Base Dâts"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "Percors CGI"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "Servidôr primari"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "Servidôr secondari"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr "E-mail par inviâ ae Base Dâts"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 msgid "DB Character set encoding"
 msgstr "Codifiche de cumbinazion di caratars des Basis di Dâts (DB)"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "Dopre estensions freedb"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "Fâs in automatic lis ricercjis sul disc"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "Dopre servidôr proxy"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Individue il servidôr leint la variabile di ambient 'http_proxy'"
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "Servidôr proxy"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "Puarte dal proxy"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "Non utent dal proxy"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "Password dal proxy"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "Direzion e-mail"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "Program di inzornament CD"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "No sta meti in minuscul i nons dai file"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr "Permet i bit alts tai nons dai file"
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr "Sostituìs i caratars incompatibii cun numars esadecimâi"
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "No sta cambiâ i spazis cun liniis bassis"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr "Scrîf i file m3u doprant lis sbaris '\\' che no son conformis a posix"
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -511,19 +472,19 @@
 "Caratar di no gjavâ\n"
 "tai nons dai file"
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr "Mostre icone te guantiere di notifiche"
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "Variis"
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 msgid "Error: Unable to save ripper config."
 msgstr "Erôr: impussibil salvâ la configurazion dal estratôr."
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 msgid "Error: Unable to save encoder config."
 msgstr "Erôr: impussibil salvâ la configurazion dal codificadôr."
 
@@ -561,7 +522,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr "Impussibil fâ ricercjis intant che si fâs estrazions."
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "Disc no cognossût"
@@ -571,220 +531,193 @@
 msgid "Track %02d"
 msgstr "Linie %02d"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "Daûr a interogâ %s (par mieç di %s) pal disc %02x.\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "Daûr a interogâ %s pal disc %02x.\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "Nissune corispuindince\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"Coincidence par \"%s / %s\"\n"
-"Daûr a discjariâ dâts...\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "Fat\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "Erôr tal salvâ i dâts dal disc\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 msgid "Length"
 msgstr "Lungjece"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "Liniis/Tocs"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "Linie/Toc"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 #, fuzzy
 msgid "Done.\n"
 msgstr "Fat\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 msgid "Error saving disc data."
 msgstr "Erôr tal salvâ i dâts dal disc."
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "Riproduzion cicliche"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "Comute riproduzion cicliche"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "Stât de estrazion"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "Riprodûs toc / met in pause la riproduzion"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "Fâs sù"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "Indenant veloç"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "Va al toc prime"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "Va al prossim toc"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "Comute lis opzions de modalitât di riproduzion"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "Prossim disc"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "Ferme riproduzion"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "Pare fûr il disc"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr "Analize contignûts dal disc"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "Comute il control dal volum"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "Comute l'editôr dal disc"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Inizie/termine la ricercje DiscDB"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "Comute visualizazion linie/toc"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Jes di Grip"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 msgid "Cannot fast forward while ripping."
 msgstr "Impussibil lâ indenant veloç intant che fâs estrazions."
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 msgid "Cannot rewind while ripping."
 msgstr "Impussibil fâ sù intant che si fâs estrazions."
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 msgid "Cannot switch discs while ripping."
 msgstr "Impussibil cambiâ discs intant che si fâs estrazions."
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "Pare fûr il disc\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 msgid "Cannot eject while ripping."
 msgstr "Impussibil parâ fûr intant che si fâs estrazions."
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr "Cjo il disc -- daûr a parâ fûr\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 msgid "Cannot play while ripping."
 msgstr "Impussibil riprodusi intant che si fâs estrazions."
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 msgid "Cannot switch tracks while ripping."
 msgstr "Impussibil cambiâ liniis/tocs intant che si fâs estrazions."
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "Daûr a cirî un gnûf disc\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat al à cjatât un disc, control des liniis\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "O vin un disc valit!\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "Nissune linie di lungjece divierse di zero\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "CDStat al à dite: nissun disc\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Setôr atuâl: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "Nissun disc"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -796,25 +729,37 @@
 "\n"
 "Inviâ cheste informazion sul disc?"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 msgid "Error: Unable to create temporary file."
 msgstr "Erôr: Impussibil creâ il file temporani."
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 msgid "Error: Unable to write disc data."
 msgstr "Erôr: impussibil scrivi i dâts dal disc."
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Notifiche imission a %s\n"
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 #, fuzzy
 msgid "Error: Unable to execute mail command."
 msgstr "Erôr: impussibil salvâ la configurazion dal codificadôr."
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr ""
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr ""
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr ""
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "Messaç di sisteme"
 
@@ -848,79 +793,79 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Erôr: impussibil vierzi %s pe scriture\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "Titul disc"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "Non linie"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr "W"
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "Artist disc"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "Gjenar ID3:"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "An disc"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "Non linie"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "Artist dal toc"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr "W"
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "Divît:"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "Titul/Artist"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "Artist/Titul"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr "Divît i caratars"
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "Artiscj-multiplis"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "Salve informazions disc"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "Invie informazions disc"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 msgid "No disc present."
 msgstr "Nissun disc presint."
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 msgid "Cannot submit. No disc is present."
 msgstr "Impussibil inviâ. Nol è presint nissun disc."
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 msgid "You must enter a disc title."
 msgstr "Si scugne inserî il titul di un disc."
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 msgid "You must enter a disc artist."
 msgstr "Si scugne inserî l'artist di un disc."
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -938,7 +883,7 @@
 "\n"
 "Continuâ?"
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -950,11 +895,11 @@
 "\n"
 "Continuâ?"
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "Selezion gjenar"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -962,19 +907,18 @@
 "Par inviâ si scugne dâ un gjenar diviers di 'no cognossût'\n"
 "Selezione un gjenar DiscDB chi sot"
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "Gjenar DiscDB"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "Invie"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "Anule"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "cjamp ID3 no cognossût\n"
@@ -984,179 +928,156 @@
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr "Erôr: impussibil tradusi il non dal file. Utent %s inesistent\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "Esecuzion falide\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "Erôr: gjenar di vôs sbaliade\n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 #, fuzzy
 msgid "Error: Reading config file\n"
 msgstr "Erôr: file di configurazion no valit\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "Erôr: file di configurazion no valit\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "Estrai e codifiche"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "Estrai e codifiche i tocs selezionâts"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "Dome estrai"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "Estrai ma no sta codificâ i tocs selezionâts"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr "Interomp estrazion e codifiche"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "Cope ducj i procès di estrazion e codifiche atîfs"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "Interomp dome la estrazion"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "Cope i procès di estrazion"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "Analisi DDJ"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "Inserìs la informazion dal disc su la base di dâts DigitalDJ"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "Estrai une linie parziâl"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "Riprodûs"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "Setôr atuâl:           0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "Estr: inative"
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Cod: lin 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
 msgstr "Cod: inative"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr "Indicadôrs complessîfs:"
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "Setôr iniziâl"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "Setôr finâl"
 
-#: src/rip.c:384
-#, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "Daûr a inserî il toc %d inte base di dâts ddj\n"
-
-#: src/rip.c:609
+#: src/rip.c:600
 msgid "Error: can't open m3u file."
 msgstr "Erôr: impussibil vierzi il file m3u."
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr "In KillRip\n"
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr "Cumò la dimension de codifiche totâl e je: %d\n"
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "Estr: toc %d (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr "Estr: %6.2f%%"
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "Estrazion finide\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr "Estr. parziâl %d  num. wavs %d\n"
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "La prossime linie e je %d, il totâl al è %d\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "Controle se si scugne estrai une altre linie\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "Cod: toc %d (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr "Cod: %6.2f%%"
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "Codifiche finide su la cpu %d\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "Daûr a eliminâ [%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "La estrazion e je finide\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "CenceArtist"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "CenceTitul"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1164,7 +1085,7 @@
 "Nol è stât rilevât nissun disc te unitât. Se si à un disc te unitât, "
 "controlâ lis impostazions dal dispositîf CDRom sot Config->CD."
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1174,7 +1095,7 @@
 "Controla la configurazion de estrazion e sigurâsi che e specifichi il "
 "percors complet dal eseguibil estratôr."
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1184,7 +1105,7 @@
 "Controlâ la configurazion de codifiche e sigurâsi che e specifichi il "
 "percors complet dal eseguibil codificadôr."
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1192,106 +1113,91 @@
 "Nissune linie/toc selezionade.\n"
 "Estrai il CD intîr?\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "Daûr a estrai il CD intîr\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr "In RipNextTrack\n"
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "La prime linie controlade e je %d\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr "E vie a tirâ fûr!\n"
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "No si à l'acès in scriture par scrivi il file wav"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "Daûr a estrai la linie %d a %s\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Estr: toc %d (0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "Il file %s al è za stât estrat. Lu si salte...\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "Finît il spazi te cartele di jessude"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "Daûr a clamâ CDPRip\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "La linie %d e je stade zontade ae liste %s\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "Nissune cpu disponibile\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Cod linie %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 msgid "No write access to write encoded file."
 msgstr "No si à l'acès in scriture par scrivi il file codificât."
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i: daûr a codificâ a %s\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Cod: toc %d (0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr "In CalculateAll\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 "Cumò no si è daûr a estrai, duncje metin a zero i valôrs di codifiche\n"
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "La dimension totâl di estrazion e je: %d\n"
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "La dimension totâl di codifiche e je: %d\n"
 
-#: src/tray.c:57
+#: src/tray.c:59
 msgid "Artist"
 msgstr "Artist"
 
-#: src/tray.c:58
+#: src/tray.c:60
 msgid "Title"
 msgstr "Titul"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1300,17 +1206,17 @@
 "%s - %s\n"
 "%02d:%02d di %02d:%02d"
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Estrazion  toc %02d:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Codifiche toc %02d:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1319,7 +1225,7 @@
 "%s - %s\n"
 "%s%s%s"
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1328,26 +1234,102 @@
 "%s - %s\n"
 "Inatîf"
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr "Pause"
 
-#: src/tray.c:196
+#: src/tray.c:186
 msgid "Stop"
 msgstr "Ferme"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr "Precedent"
 
-#: src/tray.c:209
+#: src/tray.c:199
 msgid "Next"
 msgstr "Sucessîf"
 
-#: src/tray.c:217
+#: src/tray.c:207
 msgid "Rip and Encode"
 msgstr "Estrai e codifiche"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr "Jes"
+
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "Specifiche la gjeometrie dal barcon principâl"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "GJEOMETRIE"
+
+#~ msgid "Grip started successfully\n"
+#~ msgstr "Grip si è inviât cun sucès\n"
+
+#~ msgid "Status"
+#~ msgstr "Stât"
+
+#~ msgid "General"
+#~ msgstr "Gjenerâl"
+
+#~ msgid "Playing CDs"
+#~ msgstr "Riproduzion dai CD"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "Estrazion dai CD"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "Configure Grip"
+
+#~ msgid "FAQ"
+#~ msgstr "FAQ"
+
+#~ msgid "Getting More Help"
+#~ msgstr "Par vê plui jutori"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "Segnalazion erôrs"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "Daûr a interogâ %s (par mieç di %s) pal disc %02x.\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "Daûr a interogâ %s pal disc %02x.\n"
+
+#~ msgid "No match\n"
+#~ msgstr "Nissune corispuindince\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "Coincidence par \"%s / %s\"\n"
+#~ "Daûr a discjariâ dâts...\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "Pare fûr il disc\n"
+
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "Daûr a inserî il toc %d inte base di dâts ddj\n"
+
+#~ msgid "Rip finished\n"
+#~ msgstr "Estrazion finide\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "Codifiche finide su la cpu %d\n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "Daûr a eliminâ [%s]\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "La estrazion e je finide\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "Daûr a estrai la linie %d a %s\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "Il file %s al è za stât estrat. Lu si salte...\n"
+
+#~ msgid "%i: Encoding to %s\n"
+#~ msgstr "%i: daûr a codificâ a %s\n"

grip-3.10.1.tar.gz/po/grip.pot -> grip-4.1.1.tar.gz/po/grip.pot Changed

@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Mike Oliphant and Johnny A. Solbu
+# This file is distributed under the same license as the grip package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
+"Project-Id-Version: grip 4.1.1\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\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,47 +17,39 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr ""
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr ""
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr ""
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr ""
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr ""
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr ""
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr ""
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr ""
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr ""
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr ""
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr ""
 
@@ -65,454 +57,421 @@
 msgid "Grip"
 msgstr ""
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr ""
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr ""
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
 msgstr ""
 
-#: src/grip.c:401
-msgid "Status"
-msgstr ""
-
-#: src/grip.c:416
-msgid "General"
-msgstr ""
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr ""
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
+#: src/grip.c:380
+msgid "Unable to open help file"
 msgstr ""
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr ""
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr ""
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr ""
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr ""
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr ""
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr ""
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr ""
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr ""
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr ""
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr ""
 
-#: src/grip.c:641
+#: src/grip.c:505
 msgid "Error: Trying to show homepage failed."
 msgstr ""
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr ""
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
 "Your old config file has been saved with -old appended."
 msgstr ""
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr ""
 
-#: src/grip.c:1042
+#: src/grip.c:891
 msgid "Error: Unable to save config file."
 msgstr ""
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr ""
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr ""
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr ""
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr ""
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr ""
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr ""
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr ""
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr ""
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr ""
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr ""
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr ""
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr ""
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr ""
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr ""
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr ""
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr ""
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr ""
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr ""
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr ""
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr ""
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr ""
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 msgid "Rip file format (Multi-artist)"
 msgstr ""
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr ""
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr ""
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr ""
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr ""
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr ""
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr ""
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr ""
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr ""
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr ""
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr ""
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr ""
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr ""
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr ""
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr ""
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr ""
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr ""
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr ""
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr ""
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 msgid "Encoder file extension"
 msgstr ""
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 msgid "Encoder file format"
 msgstr ""
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 msgid "Encode file format (Multi-artist)"
 msgstr ""
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr ""
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr ""
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr ""
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr ""
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr ""
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr ""
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr ""
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr ""
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 msgid "Encoder 'nice' value"
 msgstr ""
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 msgid "Encoder filter command"
 msgstr ""
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 msgid "Execute command after encode"
 msgstr ""
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr ""
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr ""
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr ""
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr ""
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr ""
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr ""
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 msgid "ID3v2 Character set encoding"
 msgstr ""
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr ""
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr ""
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr ""
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr ""
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr ""
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr ""
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 msgid "DB Character set encoding"
 msgstr ""
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr ""
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr ""
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr ""
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr ""
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr ""
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr ""
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr ""
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr ""
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr ""
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr ""
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr ""
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr ""
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr ""
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr ""
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr ""
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr ""
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
 msgstr ""
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr ""
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr ""
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 msgid "Error: Unable to save ripper config."
 msgstr ""
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 msgid "Error: Unable to save encoder config."
 msgstr ""
 
@@ -550,7 +509,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr ""
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr ""
@@ -560,217 +518,192 @@
 msgid "Track %02d"
 msgstr ""
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr ""
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr ""
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr ""
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr ""
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr ""
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 msgid "Length"
 msgstr ""
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr ""
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr ""
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 msgid "Done.\n"
 msgstr ""
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 msgid "Error saving disc data."
 msgstr ""
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr ""
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr ""
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr ""
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr ""
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr ""
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr ""
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr ""
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr ""
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr ""
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr ""
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr ""
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr ""
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr ""
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr ""
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr ""
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr ""
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr ""
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr ""
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 msgid "Cannot fast forward while ripping."
 msgstr ""
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 msgid "Cannot rewind while ripping."
 msgstr ""
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 msgid "Cannot switch discs while ripping."
 msgstr ""
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr ""
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 msgid "Cannot eject while ripping."
 msgstr ""
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr ""
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 msgid "Cannot play while ripping."
 msgstr ""
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 msgid "Cannot switch tracks while ripping."
 msgstr ""
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr ""
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr ""
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr ""
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr ""
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr ""
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr ""
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr ""
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -778,24 +711,36 @@
 "Do you wish to submit this disc information?"
 msgstr ""
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 msgid "Error: Unable to create temporary file."
 msgstr ""
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 msgid "Error: Unable to write disc data."
 msgstr ""
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr ""
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 msgid "Error: Unable to execute mail command."
 msgstr ""
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr ""
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr ""
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr ""
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr ""
 
@@ -829,79 +774,79 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr ""
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr ""
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr ""
-
-#: src/discedit.c:84
-msgid "W"
-msgstr ""
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr ""
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr ""
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr ""
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr ""
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr ""
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr ""
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr ""
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr ""
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr ""
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr ""
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr ""
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr ""
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr ""
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 msgid "No disc present."
 msgstr ""
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 msgid "Cannot submit. No disc is present."
 msgstr ""
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 msgid "You must enter a disc title."
 msgstr ""
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 msgid "You must enter a disc artist."
 msgstr ""
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -912,7 +857,7 @@
 "Continue?"
 msgstr ""
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -920,29 +865,28 @@
 "Continue?"
 msgstr ""
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr ""
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
 msgstr ""
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr ""
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr ""
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr ""
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr ""
@@ -952,352 +896,314 @@
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr ""
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr ""
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr ""
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 msgid "Error: Reading config file\n"
 msgstr ""
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr ""
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr ""
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr ""
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr ""
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr ""
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr ""
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr ""
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr ""
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr ""
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr ""
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr ""
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr ""
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr ""
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr ""
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr ""
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr ""
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
 msgstr ""
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr ""
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr ""
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr ""
 
-#: src/rip.c:384
-#, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr ""
-
-#: src/rip.c:609
+#: src/rip.c:600
 msgid "Error: can't open m3u file."
 msgstr ""
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr ""
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr ""
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr ""
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr ""
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr ""
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr ""
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr ""
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr ""
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr ""
 
-#: src/rip.c:1032
-#, c-format
-msgid "Enc: %6.2f%%"
-msgstr ""
-
 #: src/rip.c:1042
 #, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr ""
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr ""
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
+msgid "Enc: %6.2f%%"
 msgstr ""
 
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr ""
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr ""
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
 msgstr ""
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
 "executable."
 msgstr ""
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
 "encoder executable."
 msgstr ""
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
 msgstr ""
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr ""
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr ""
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr ""
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr ""
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr ""
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr ""
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr ""
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr ""
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr ""
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr ""
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr ""
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr ""
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr ""
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 msgid "No write access to write encoded file."
 msgstr ""
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr ""
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr ""
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr ""
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr ""
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr ""
 
-#: src/tray.c:57
+#: src/tray.c:59
 msgid "Artist"
 msgstr ""
 
-#: src/tray.c:58
+#: src/tray.c:60
 msgid "Title"
 msgstr ""
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
 "%02d:%02d of %02d:%02d"
 msgstr ""
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr ""
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr ""
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
 "%s%s%s"
 msgstr ""
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
 "Idle"
 msgstr ""
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr ""
 
-#: src/tray.c:196
+#: src/tray.c:186
 msgid "Stop"
 msgstr ""
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr ""
 
-#: src/tray.c:209
+#: src/tray.c:199
 msgid "Next"
 msgstr ""
 
-#: src/tray.c:217
+#: src/tray.c:207
 msgid "Rip and Encode"
 msgstr ""
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr ""

grip-4.1.1.tar.gz/po/hu.gmo Added

grip-3.10.1.tar.gz/po/hu.po -> grip-4.1.1.tar.gz/po/hu.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grip 3.6.0\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
 "PO-Revision-Date: 2018-01-20 16:19+0100\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -19,47 +19,39 @@
 "X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "A főablak geometriájának megadása"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "GEOMETRIA"
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr "A használandó beállítófájl megadása (a saját könyvtárban)"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr "BEÁLLÍTÁS"
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "A használandó CDROM eszköz megadása"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "ESZKÖZ"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "A használandó általános SCSI eszköz megadása"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "Indítás „kis” (csak CD) módban"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr "„Helyi” mód -- ne keressen lemezinformációkat a hálózaton"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "Ne végezzen I/O átirányítás"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "Futtatás bőbeszédű (hibakereső) módban"
 
@@ -67,16 +59,12 @@
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "Hiba: nem sikerült előkészíteni [%s]\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr "A Grip sikeresen elindítva\n"
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
@@ -84,73 +72,38 @@
 "A feldolgozás folyamatban van.\n"
 "Valóban leállítja?"
 
-#: src/grip.c:401
-msgid "Status"
-msgstr "Állapot"
-
-#: src/grip.c:416
-msgid "General"
-msgstr "Általános"
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "Beolvasás"
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
-msgstr "Kódolás"
+#: src/grip.c:380
+#, fuzzy
+#| msgid "Error: Unable to create temporary file."
+msgid "Unable to open help file"
+msgstr "Hiba: nem sikerült létrehozni átmeneti fájlt."
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "Súgó"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "Tartalomjegyzék"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "CD lejátszása"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "CD beolvasása"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "A Grip beállítása"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "GyIK"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "További segítség"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "Hibák jelentése"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "Névjegy"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr "%s verzió"
 
-#: src/grip.c:641
+#: src/grip.c:505
 msgid "Error: Trying to show homepage failed."
 msgstr "Hiba: a honlap megjelenítésének kísérlete sikertelen."
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr "Létrehozta: Grip"
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -160,348 +113,356 @@
 "A Grip újbóli beállítása szükséges.\n"
 "A régi beállítófájlja „-old” hozzáadásával elmentve."
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "a kiszolgáló: %s, port: %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 msgid "Error: Unable to save config file."
 msgstr "Hiba: nem sikerült elmenteni a beállítófájlt."
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "Beállítások"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "CDROM eszköz"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Ne szakítsa meg a lejátszást kilépéskor vagy indításkor"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "Visszatekerés megállításkor"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "Indítás az első sávval, ha nincs lejátszás"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "Automatikus lejátszás a lemez behelyezésekor"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "Újrakeverés minden lejátszás előtt"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr "Hibás kiadás megkerülése"
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr "Lemezmeghajtó lekérdezése új lemezekért"
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr "Lekérdezési időköz (másodperc)"
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "Beolvasó:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "Beolvasó futtatható program"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "Beolvasás parancssora"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "Paranoia letiltása"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "További paranoia letiltása"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "Karcolás letiltása"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "felismerés"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "javítás"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr "Jelszint igazítás kiszámítása"
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "Beolvasás fájlformátuma"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 msgid "Rip file format (Multi-artist)"
 msgstr "Beolvasás fájlformátuma (több előadó)"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "Általános SCSI eszköz"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "Beolvasó"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "Beolvasás „nice” értéke"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "Kódolatlan .WAV fájlok legnagyobb száma"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "Automatikus beolvasás lemez behelyezésekor"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "Csipogás a beolvasás befejezésekor"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "Automatikus kiadás beolvasás után"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "Automatikus kiadás késleltetése"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr "Késleltetés beolvasás előtt"
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr "Kódolás késleltetése, amíg a lemez beolvasás alatt van"
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr "CDROM meghajtó megállítása a sávok között"
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "WAV szűrő parancs"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "Lemez szűrő parancs"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "Beállítások"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "Beolvasás"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "Kódoló:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr "Kódoló futtatható program"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr "Kódoló parancssora"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 msgid "Encoder file extension"
 msgstr "Kódoló fájlkiterjesztése"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 msgid "Encoder file format"
 msgstr "Kódoló fájlformátuma"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 msgid "Encode file format (Multi-artist)"
 msgstr "Kódoló fájlformátuma (több előadó)"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "Kódoló"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr "WAV fájlok törlése kódolás után"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "Információk beszúrása SQL adatbázisba"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr "M3U fájlok létrehozása"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "Relatív útvonalak használata az M3U fájlokban"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "M3U fájlformátum"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Kódolás bitsebessége (kbit/sec)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "Használandó processzorok száma"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 msgid "Encoder 'nice' value"
 msgstr "Kódoló „nice” értéke"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 msgid "Encoder filter command"
 msgstr "Kódoló szűrő parancs"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 msgid "Execute command after encode"
 msgstr "Parancs végrehajtása kódolás után"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "Kódolás"
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr "ID3 címkék hozzáadása a kódolt fájlokhoz"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr "ID3v2 információk hozzáadása a kódolt fájlokhoz"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr "Csak MP3 fájlokat címkézzen"
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "ID3 megjegyzés mező"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr "ID3v1 karakterkészlet kódolása"
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 msgid "ID3v2 Character set encoding"
 msgstr "ID3v2 karakterkészlet kódolása"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "Adatbázis-kiszolgáló"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "CGI útvonal"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "Elsődleges kiszolgáló"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "Másodlagos kiszolgáló"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr "Adatbázis hozzáadási e-mail"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 msgid "DB Character set encoding"
 msgstr "Adatbázis karakterkészlet kódolása"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "Freedb kiterjesztések használata"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "Automatikus lemezkeresések végrehajtása"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "Proxy kiszolgáló használata"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Kiszolgáló lekérése a „http_proxy” környezeti változóból"
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "Proxy kiszolgáló"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "Proxy port"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "Proxy felhasználónév"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "Proxy jelszó"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "E-mail cím"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "CD frissítő program"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "Ne alakítsa kisbetűssé a fájlneveket"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr "Magas bitek engedélyezése a fájlnevekben"
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr "Összeférhetetlen karakterek helyettesítése hexadecimális számokkal"
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "Ne cserélje ki a szóközöket aláhúzás karakterre"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr "M3U fájlok kiírása nem Posix megfelelő „\\”s használatával"
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -509,19 +470,19 @@
 "Fájlnevekből nem kivágandó\n"
 "karakterek"
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr "Tálcaikon megjelenítése"
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "Egyéb"
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 msgid "Error: Unable to save ripper config."
 msgstr "Hiba: nem sikerült elmenteni a beolvasó beállításait."
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 msgid "Error: Unable to save encoder config."
 msgstr "Hiba: nem sikerült elmenteni a kódoló beállításait."
 
@@ -561,7 +522,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr "Nem lehet keresést végezni beolvasás közben."
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "Ismeretlen lemez"
@@ -571,219 +531,192 @@
 msgid "Track %02d"
 msgstr "%02d. sáv"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "%s lekérdezése (ezen keresztül:%s) a(z) %02x lemezhez.\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "%s lekérdezése a(z) %02x lemezhez.\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "Nincs találat\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"Találat: „%s / %s”\n"
-"Adatok letöltése…\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "Kész\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "Hiba a lemezadatok mentésekor\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 msgid "Length"
 msgstr "Hossz"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "Sávok"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr "Előző CDDB bejegyzés kiválasztása."
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr "következő CDDB bejegyzés kiválasztása."
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "Sáv"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr "DoNextDiscDBEntry.\n"
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
 msgstr "Nincsenek lemezadatok. Visszatérés.\n"
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
 msgstr "Már az utolsó indexnél van. Visszatérés.\n"
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 msgid "Done.\n"
 msgstr "Kész.\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
 msgstr "DoPrevDiscDBEntry.\n"
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
 msgstr "Már az első indexnél van. Visszatérés.\n"
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 msgid "Error saving disc data."
 msgstr "Hiba a lemezadatok mentésekor."
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "Lejátszási mód forgatása"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "Ismétlés ki/be"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "Beolvasás állapota"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "Sáv lejátszása / lejátszás szüneteltetése"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "Visszatekerés"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "Gyors előre tekerés"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "Ugrás az előző sávra"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "Ugrás a következő sávra"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "Lejátszási mód lehetőségek váltása"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "Következő lemez"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "Lejátszás megállítása"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "Lemez kiadása"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr "Lemeztartalom vizsgálata"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "Hangerőszabályzó ki/be"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "Lemezszerkesztő ki/be"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "DiscDB lekérdezés előkészítése/megszakítása"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "Sávmegjelenítés ki/be"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Kilépés a Grip programból"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 msgid "Cannot fast forward while ripping."
 msgstr "Nem lehet gyorsan előre tekerni beolvasás közben."
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 msgid "Cannot rewind while ripping."
 msgstr "Nem lehet visszatekerni beolvasás közben."
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 msgid "Cannot switch discs while ripping."
 msgstr "Nem lehet lemezt váltani beolvasás közben."
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "Lemez kiadása\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 msgid "Cannot eject while ripping."
 msgstr "Nem lehet kiadni beolvasás közben."
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr "Van lemez -- kiadás\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 msgid "Cannot play while ripping."
 msgstr "Nem lehet lejátszani beolvasás közben."
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 msgid "Cannot switch tracks while ripping."
 msgstr "Nem lehet sávot váltani beolvasás közben."
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "Új lemez keresése\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "A CDStat új lemezt talált, sávok ellenőrzése\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "Érvényes lemez található!\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "Nincsenek nem nulla hosszúságú sávok\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "A CDStat szerint nincs lemez\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Jelenlegi szektor: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "Nincs lemez"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -795,24 +728,36 @@
 "\n"
 "Szeretné beküldeni a lemezinformációkat?"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 msgid "Error: Unable to create temporary file."
 msgstr "Hiba: nem sikerült létrehozni átmeneti fájlt."
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 msgid "Error: Unable to write disc data."
 msgstr "Hiba: nem sikerült kiírni a lemezadatokat."
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Bejegyzés elküldés ide: %s\n"
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 msgid "Error: Unable to execute mail command."
 msgstr "Hiba: nem sikerült végrehajtani a levélküldési parancsot."
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr ""
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr ""
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr ""
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "Rendszerüzenet"
 
@@ -846,79 +791,79 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Hiba: nem sikerült a(z) %s megnyitása írásra\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "Lemez címe"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "Sáv neve"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr "W"
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "Lemez előadója"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "ID3 műfaj:"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "Lemez éve"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "Sáv neve"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "Sáv előadója"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr "W"
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "Darabolás:"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "Cím/előadó"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "Előadó/cím"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr "Daraboló karakterek"
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "Több előadó"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "Lemezinformációk mentése"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "Lemezinformációk beküldése"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 msgid "No disc present."
 msgstr "Nincs elérhető lemez."
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 msgid "Cannot submit. No disc is present."
 msgstr "Nem sikerült beküldeni. Nincs elérhető lemez."
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 msgid "You must enter a disc title."
 msgstr "Meg kell adnia egy lemezcímet."
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 msgid "You must enter a disc artist."
 msgstr "Meg kell adnia a lemez előadóját."
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -936,7 +881,7 @@
 "\n"
 "Folytatja?"
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -948,11 +893,11 @@
 "\n"
 "Folytatja?"
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "Műfaj kiválasztása"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -960,19 +905,18 @@
 "A beküldéshez az „ismeretlentől” eltérő műfaj kiválasztása\n"
 "szükséges. Válasszon egy DiscDB műfajt az alábbiak közül"
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "DiscDB műfaj"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "Beküldés"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "Mégse"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "ismeretlen ID3 mező\n"
@@ -983,178 +927,155 @@
 msgstr ""
 "Hiba: nem sikerült lefordítani a fájlnevet. Nincs ilyen felhasználó: %s\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "A futtatás sikertelen\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "Hiba: rossz bejegyzéstípus\n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 msgid "Error: Reading config file\n"
 msgstr "Hiba: beállítófájl olvasása\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "Hiba: érvénytelen beállítófájl\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "Beolvasás + kódolás"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "A kiválasztott sávok beolvasása és kódolása"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "Csak beolvasás"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "A kiválasztott sávok beolvasása, nincs kódolás"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr "Beolvasás és kódolás megszakítása"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "Az összes aktív beolvasási és kódolási folyamat kilövése"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "Csak beolvasás megszakítása"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "A beolvasási folyamat kilövése"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "DDJ vizsgálat"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "Lemezinformációk beszúrása a DigitalDJ adatbázisba"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "Részleges sáv beolvasás"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "Lejátszás"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "Jelenlegi szektor:   0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "Beolvasás: üresjárat"
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Kódolás: Sáv 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
 msgstr "Kódolás: üresjárat"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr "Teljes feldolgozás:"
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "Kezdeti szektor"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "Végső szektor"
 
-#: src/rip.c:384
-#, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "%d. sáv beszúrása the DDJ adatbázisba\n"
-
-#: src/rip.c:609
+#: src/rip.c:600
 msgid "Error: can't open m3u file."
 msgstr "Hiba: nem sikerült megnyitni az M3U fájlt."
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr "A beolvasás kilövésében\n"
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr "A mostani teljes kódolási méret: %d\n"
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "Beolvasás: Sáv %d (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr "Beolvasás: %6.2f%%"
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "Beolvasás befejezve\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr "%d. részlet beolvasása  WAV fájlok száma: %d\n"
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "Következő sáv: %d, összes: %d\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "Annak ellenőrzése, hogy szükséges-e egy másik sáv beolvasása\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "Kódolás: Sáv %d (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr "Kódolás: %6.2f%%"
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "A(z) %d. processzoron a kódolás befejezve\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "Törlés: [%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "Beolvasás befejezve\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "NincsElőadó"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "NincsCím"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1162,7 +1083,7 @@
 "Nem észlelhető lemez a meghajtóban. Ha van lemez a meghajtóban, akkor "
 "ellenőrizze a CDROM eszköz beállítását a Beállítások->CD menüben."
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1172,7 +1093,7 @@
 "Ellenőrizze a beolvasó beállításait, és győződjön meg arról, hogy teljes "
 "útvonalat ad-e meg a beolvasó futtatható programhoz."
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1182,7 +1103,7 @@
 "Ellenőrizze a kódoló beállításait, és győződjön meg arról, hogy teljes "
 "útvonalat ad-e meg a kódoló futtatható programhoz."
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1190,105 +1111,90 @@
 "Nincsenek sávok kiválasztva.\n"
 "Beolvassa a teljes CD-t?\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "Teljes CD beolvasása\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr "A következő sáv beolvasásában\n"
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Az első bejelölt sáv: %d\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr "Beolvasás!\n"
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "Nincs írási jogosultság a WAV fájl kiírásához"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "%d. sáv beolvasása ide: %s\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Beolvasás: Sáv %d (0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "A(z) %s fájl már be lett olvasva. Kihagyás…\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "Elfogyott a hely a kimeneti könyvtárban"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "CDPRip meghívása\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "A(z) %d. sáv hozzáadva a(z) %s listához\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "Nincsenek szabad processzorok\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Kódolt sáv: %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 msgid "No write access to write encoded file."
 msgstr "Nincs írási jogosultság a kódolt fájl kiírásához."
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i: Kódolás ide: %s\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Kódolás: Sáv %d (0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr "Az összes kiszámításában\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr "Most épp beolvasunk, ezért nullázzuk a kódolási értéket\n"
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Teljes beolvasási méret: %d\n"
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Teljes kódolási méret: %d\n"
 
-#: src/tray.c:57
+#: src/tray.c:59
 msgid "Artist"
 msgstr "Előadó"
 
-#: src/tray.c:58
+#: src/tray.c:60
 msgid "Title"
 msgstr "Cím"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1297,17 +1203,17 @@
 "%s - %s\n"
 "%02d:%02d - %02d:%02d"
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Beolvasás: Sáv %02d:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Kódolás:   Sáv %02d:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1316,7 +1222,7 @@
 "%s - %s\n"
 "%s%s%s"
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1325,26 +1231,102 @@
 "%s - %s\n"
 "Üresjárat"
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr "Szünet"
 
-#: src/tray.c:196
+#: src/tray.c:186
 msgid "Stop"
 msgstr "Leállítás"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr "Előző"
 
-#: src/tray.c:209
+#: src/tray.c:199
 msgid "Next"
 msgstr "Következő"
 
-#: src/tray.c:217
+#: src/tray.c:207
 msgid "Rip and Encode"
 msgstr "Beolvasás és kódolás"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr "Kilépés"
+
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "A főablak geometriájának megadása"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "GEOMETRIA"
+
+#~ msgid "Grip started successfully\n"
+#~ msgstr "A Grip sikeresen elindítva\n"
+
+#~ msgid "Status"
+#~ msgstr "Állapot"
+
+#~ msgid "General"
+#~ msgstr "Általános"
+
+#~ msgid "Playing CDs"
+#~ msgstr "CD lejátszása"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "CD beolvasása"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "A Grip beállítása"
+
+#~ msgid "FAQ"
+#~ msgstr "GyIK"
+
+#~ msgid "Getting More Help"
+#~ msgstr "További segítség"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "Hibák jelentése"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "%s lekérdezése (ezen keresztül:%s) a(z) %02x lemezhez.\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "%s lekérdezése a(z) %02x lemezhez.\n"
+
+#~ msgid "No match\n"
+#~ msgstr "Nincs találat\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "Találat: „%s / %s”\n"
+#~ "Adatok letöltése…\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "Lemez kiadása\n"
+
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "%d. sáv beszúrása the DDJ adatbázisba\n"
+
+#~ msgid "Rip finished\n"
+#~ msgstr "Beolvasás befejezve\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "A(z) %d. processzoron a kódolás befejezve\n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "Törlés: [%s]\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "Beolvasás befejezve\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "%d. sáv beolvasása ide: %s\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "A(z) %s fájl már be lett olvasva. Kihagyás…\n"
+
+#~ msgid "%i: Encoding to %s\n"
+#~ msgstr "%i: Kódolás ide: %s\n"

grip-4.1.1.tar.gz/po/insert-header.sin Added

grip-4.1.1.tar.gz/po/it.gmo Added

grip-3.10.1.tar.gz/po/it.po -> grip-4.1.1.tar.gz/po/it.po Changed

@@ -2,65 +2,57 @@
 # This file is distributed under the same license as the grip package.
 # Copyright © 2017, Free Software Foundation, Inc.
 # Kostantino <inverness1ATvirgilio.it>, 2005.
-# Sebastiano Pistore <sebastianopistore.info@protonmail.ch>\n", 2017
+# Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>\n", 2017-2020
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: grip 3.6.0\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
-"PO-Revision-Date: 2017-10-29 18:56+0100\n"
-"Last-Translator: Sebastiano Pistore <sebastianopistore.info@protonmail.ch>\n"
+"Project-Id-Version: grip 4.1.0\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
+"PO-Revision-Date: 2020-02-07 17:00+0100\n"
+"Last-Translator: Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
-"X-Generator: Poedit 2.0.4\n"
+"X-Generator: Poedit 2.2.3\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "Specifica la geometria della finestra principale"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "GEOMETRIA"
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr "Specifica il file di configurazione da usare (nella tua cartella home)"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr "CONFIGURAZIONE"
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "Specifica il dispositivo cdrom da usare"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "DISPOSITIVO"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "Specifica il dispositivo scsi generico da usare"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "Lancia in modalità \"ridotto\" (solo cd)"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr ""
 "Modalità \"locale\" -- non cercare su internet le informazioni sul disco"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "Non fare la ridirezione I/O"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "Avvia in modalità prolissa (debug)"
 
@@ -68,16 +60,12 @@
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "Errore: non è possibile inizializzare [%s]\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr "Grip è stato avviato con successo!\n"
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
@@ -85,73 +73,36 @@
 "Sto svolgendo il lavoro richiesto!\n"
 "Vuoi davvero chiudere tutto?"
 
-#: src/grip.c:401
-msgid "Status"
-msgstr "Status"
-
-#: src/grip.c:416
-msgid "General"
-msgstr "Generale"
+#: src/grip.c:380
+msgid "Unable to open help file"
+msgstr "Impossibile aprire il file del manuale"
 
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "Estrazione"
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
-msgstr "Codifica"
-
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "Table Of Contents"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "Riproduzione del CD"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "Estrazione del CD"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "Configurazione di Grip"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "FAQ"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "Ottieni più aiuto"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "Segnala gli errori"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "Chi siamo"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr "Versione %s"
 
-#: src/grip.c:641
+#: src/grip.c:505
 msgid "Error: Trying to show homepage failed."
 msgstr "Errore: impossibile raggiungere la homepage."
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr "Creato con Grip"
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -162,348 +113,356 @@
 "Avrai bisogno di configurare Grip di nuovo.\n"
 "Il tuo vecchio file di configurazione è stato salvato con l'estensione 'old'."
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "il server è %s, la porta è %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 msgid "Error: Unable to save config file."
 msgstr "Errore: non è possibile salvare il file di configurazione."
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "Configurazione"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "Dispositivo CDRom"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Non interrompere la riproduzione in uscita o all'avvio"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "Riavvolgi se fermato"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "Parti con la prima traccia se non in riproduzione"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "Riproduci automaticamente a disco inserito"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "Rimescola prima di ogni riproduzione"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr "Intervieni sull'espulsione fallita"
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr "Controlla il dispositivo per un nuovo disco"
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr "Intervallo di controllo (secondi)"
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "Estrattore:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "Eseguibile dell'estrattore"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "Linea di comando per estrarre"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "Disabilita Paranoia"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "Disabilita le opzioni extra di Paranoia"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "Disabilita scratch"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "rilevamento"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "riparazione"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr "Calcola l'aggiustamento di guadagno"
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "Estrai il formato del file"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 msgid "Rip file format (Multi-artist)"
 msgstr "Estrai formato del file (più artisti)"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "Dispositivo SCSI generico"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "Estrattore"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "Valore 'simpatico' dell'estrattore"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "Numero massimo di file .wav non codificati"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "Estrai automaticamente all'inserimento"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "Emettere un bip a fine estrazione"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "Espellere disco a fine estrazione"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "Ritardo prima dell'espulsione"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr "Ritardo prima dell'estrazione"
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr "Ritarda la codifica finché il disco non è stato estratto"
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr "Ferma il dispositivo cdrom tra le tracce"
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "Comando del filtro wav"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "Comando del filtro disco"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "Opzioni"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "Estrazione"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "Codificatore:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr "Eseguibile del codificatore"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr "Linea di comando del codificatore"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 msgid "Encoder file extension"
 msgstr "Estensione file encoder"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 msgid "Encoder file format"
 msgstr "Formato file dell'encoder"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 msgid "Encode file format (Multi-artist)"
 msgstr "Codifica formato del file (più artisti)"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "Codificatore"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr "Cancella i file .wav dopo la codifica"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "Inserisci le informazione nell'archivio SQL"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr "Crea i file .m3u"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "Usa i percorsi relativi nei files .m3u"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "Formato dei file M3U"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Velocità di codifica (kbits/sec)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "Numero di CPU da usare"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 msgid "Encoder 'nice' value"
-msgstr ""
+msgstr "Valore 'simpatico' dell'encoder"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 msgid "Encoder filter command"
 msgstr ""
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 msgid "Execute command after encode"
 msgstr "Eseguire comando dopo la codifica"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "Codifica"
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr "Aggiungi gli identificativi ID3 ai files codificati"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Aggiungi gli identificativi ID3v2 ai file codificati"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr "Identificativo solo per i file terminanti in '.mp3'"
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "Campo del commento ID3"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr "Codifica dei caratteri ID3v1"
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 msgid "ID3v2 Character set encoding"
 msgstr "Codifica dei caratteri ID3v2"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "Server DB"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "Percorso CGI"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "Server primario"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "Server secondario"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr "Invia posta elettronica a DB Submit"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 msgid "DB Character set encoding"
 msgstr "Codifica dei caratteri DB"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "Usa le estensioni freedb"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "Esegui automaticamente le ricerche sul disco"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "Usare un server proxy"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Individua server dalla variabile d'ambiente 'http_proxy'"
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "Server proxy"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "Porta proxy"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "Nome dell'utente per il proxy"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "Password per il proxy"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "Indirizzo di posta elettronica"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "Programma di aggiornamento del CD"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "Non cambiare in minuscolo i nomi dei file"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr "Abilita il bit alto nei nomi dei file"
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr "Sostituisci caratteri incompatibili con numeri esadecimali"
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "Non cambiare gli spazi in trattini"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -511,20 +470,20 @@
 "Caratteri da non ridurre\n"
 "nei nomi di file"
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr "Mostrare l'icona del cassetto"
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "Varie"
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 msgid "Error: Unable to save ripper config."
 msgstr ""
 "Errore: non è possibile salvare il file di configurazione dell'estrattore."
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 msgid "Error: Unable to save encoder config."
 msgstr ""
 "Errore: non è possibile salvare il file di configurazione del codificatore."
@@ -565,229 +524,201 @@
 msgid "Cannot do lookup while ripping."
 msgstr "Non posso compiere alcuna ricerca durante un'estrazione."
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
-msgstr "Il disco è sconosciuto"
+msgstr "Disco sconosciuto"
 
 #: src/cdplay.c:131
 #, c-format
 msgid "Track %02d"
 msgstr "Traccia %02d"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "Ricerca %s (su %s) per il disco %02x.\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "Ricerca %s per il disco %02x.\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "Non è stato trovato alcun riscontro\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"È stato trovato un riscontro per \"%s / %s\"\n"
-"Sto scaricando i dati...\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "Fatto\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "Si è verificato un errore salvando i dati del disco\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 msgid "Length"
 msgstr "Durata"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "Tracce"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "Traccia"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
-msgstr ""
+msgstr "Nessun dato sul disco. Ritorno.\n"
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 msgid "Done.\n"
 msgstr "Fatto.\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
-msgstr ""
+msgstr "DoPrevDiscDBEntry.\n"
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 msgid "Error saving disc data."
 msgstr "Si è verificato un errore mentre salvavo i dati del disco."
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "Modalità di esecuzione ciclica"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "Avvia/Ferma l'esecuzione ciclica"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "Stato dell'estrazione"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "Riproduci traccia / Pausa riproduzione"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "Riavvolgi"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "Avanti veloce"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "Vai alla traccia precedente"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "Vai alla traccia successiva"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "Mostra/Nascondi le opzioni in riproduzione"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "Prossimo disco"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "Ferma l'esecuzione"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "Espelli il disco"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr "Esamina i contenuti del disco"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "Mostra/Nascondi il controllo del volume"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "Mostra/Nascondi l'editor del disco"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Inizia/termina la ricerca DiscoDB"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "Mostra/Nascondi la visualizzazione delle tracce"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Esci da Grip"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 msgid "Cannot fast forward while ripping."
 msgstr "Con posso fare l'avanzamento veloce durante un'estrazione."
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 msgid "Cannot rewind while ripping."
 msgstr "Non posso riavvolgere durante un'estrazione."
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 msgid "Cannot switch discs while ripping."
 msgstr "Non posso cambiare dischi durante un'estrazione."
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "Espelli il disco\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 msgid "Cannot eject while ripping."
 msgstr "Non posso espellere alcun disco durante un'estrazione."
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
-msgstr "Ecco il disco... in espulsione\n"
+msgstr "Ecco il disco -- espulsione\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 msgid "Cannot play while ripping."
 msgstr "Non posso riprodurre nulla durante un'estrazione."
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 msgid "Cannot switch tracks while ripping."
 msgstr "Non posso cambiare traccia durante un'estrazione."
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "Controllo per un nuovo disco\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "StatusCD ha trovato un disco, controllo le tracce\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "Abbiamo un disco valido!\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "Nessuna traccia di lunghezza zero\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "StatusCD dice che non c'è alcun disco\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Settore corrente: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "Nessun disco"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -799,24 +730,36 @@
 "\n"
 "Vuoi davvero inviare questa informazione riguardo il disco?"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 msgid "Error: Unable to create temporary file."
 msgstr "Errore: non è possibile creare alcun file temporaneo."
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 msgid "Error: Unable to write disc data."
 msgstr "Errore: non è possibile scrivere i dati del disco."
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Notifica l'immissione a %s\n"
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 msgid "Error: Unable to execute mail command."
 msgstr ""
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr "Attenzione"
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr "Informazioni"
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr "Domanda"
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "Messaggio di sistema"
 
@@ -850,79 +793,79 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Errore: non è possibile aprire %s in scrittura\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "Titolo del disco"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "Titolo della traccia"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr "W"
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "Artista del disco"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "Genere ID3:"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "Anno del disco"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "Titolo della traccia"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "Artista della traccia"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr "W"
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "Dividi:"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "Titolo/Artista"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "Artista/Titolo"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr "Dividi i caratteri"
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "Multiartista"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "Salva le informazioni del disco"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "Invia le informazioni del disco"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 msgid "No disc present."
 msgstr "Non è presente alcun disco."
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 msgid "Cannot submit. No disc is present."
 msgstr "Non posso inviare nulla! Non è presente alcun disco."
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 msgid "You must enter a disc title."
 msgstr "Devi immettere il titolo di un disco."
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 msgid "You must enter a disc artist."
 msgstr "È necessario inserire un'artista."
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -940,7 +883,7 @@
 "\n"
 "Continuo?"
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -952,11 +895,11 @@
 "\n"
 "Continuo?"
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "Selezione del genere"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -964,19 +907,18 @@
 "L'invio richiede un genere diverso da 'sconosciuto'\n"
 "Per favore scegli un genere DiscoDB più sotto"
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "Genere DiscDB"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "Invia"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "Cancella"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "campo ID3 sconosciuto\n"
@@ -988,178 +930,155 @@
 "Errore: non posso tradurre il nome del file. \n"
 "Non esiste l'utente %s\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "L'esecuzione è fallita\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "Errore: è stata immessa una voce errata\n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 msgid "Error: Reading config file\n"
 msgstr "Errore: lettura file di configurazione\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "Errore: file di configurazione non valido\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "Estrai e codifica"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "Estrai e codifica le tracce selezionate"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "Estrai solamente"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "Estrai ma non codificare le tracce selezionate"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr "Interrompi l'estrazione e la codifica"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "Termina tutti i processi attivi di estrazione e codifica"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "Interrompi l'estrazione soltanto"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "Interrompi il processo di estrazione"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "Scansione DDJ"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "Inserisci le informazione del disco nell'archivio DigitalDJ"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "Estrai una traccia parziale"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "Riproduci"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "Settore attuale:      0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "Estrazione: in attesa"
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Codifica: Trc 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
 msgstr "Codifica: in attesa"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr "Indicatori complessivi:"
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "Inizio del settore"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "Fine del settore"
 
-#: src/rip.c:384
-#, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "Sto inserendo la traccia %d nell'archivio DDJ\n"
-
-#: src/rip.c:609
+#: src/rip.c:600
 msgid "Error: can't open m3u file."
 msgstr "Errore: impossibile aprire il file m3u."
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr "In TerminaRip\n"
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr "La dimensione del totale codificato ora è: %d\n"
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "Estrai: Trc %d (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr "Estrai: %6.2f%%"
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "Estrazione completata\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr "Estrai parzialmente %d  numero wav %d\n"
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "La prossima traccia è %d, il totale è %d\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "Controlla se dobbiamo estrarre un'altra traccia\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "Codifica: Trc %d (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr "Codifica: %6.2f%%"
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "È stata terminata la codifica sulla cpu %d \n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "Cancellazione [%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "L'estrazione è terminata\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "Nessun artista"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "Nessun titolo"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1168,7 +1087,7 @@
 "impostazioni del tuo lettore CDRom in Config->CD se è presente un disco nel "
 "dispositivo."
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1178,7 +1097,7 @@
 "Controlla la tua configurazione  ed assicurati che specifichi il percorso "
 "completo all'eseguibile dell'estrattore."
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1188,7 +1107,7 @@
 "Controlla la tua configurazione  ed assicurati che specifichi il percorso "
 "completo all'eseguibile del codificatore."
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1196,106 +1115,91 @@
 "Non è stata selezionata alcuna traccia.\n"
 "Estrarre l'intero CD?\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "Estrarre l'intero CD\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr "In EstraiProssimaTraccia\n"
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "La prima traccia controllata è %d\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr "L'estrazione è andata a buon fine!\n"
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "Nessun accesso in scrittura al file .wav"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "Estrazione traccia %d su %s\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Estrai: Trc %d (0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "Il file %s è già stato estratto. Viene saltato...\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "Non c'è più spazio nella directory di output"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "Sto richiamando CDPRip\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "La traccia %d è stata aggiunta alla lista %s\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "Nessuna CPU disponibile\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Codifica la traccia %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 msgid "No write access to write encoded file."
 msgstr "Non vi sono accessi in scrittura al file codificato."
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i: Codifica su %s\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Codifica: Trc %d (0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr "In Calcola tutto\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 "Non stiamo estraendo nulla adesso, così azzeriamo i valori di codifica\n"
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "La dimensione del totale estratto è: %d\n"
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "La dimensione del totale codificato è: %d\n"
 
-#: src/tray.c:57
+#: src/tray.c:59
 msgid "Artist"
 msgstr "Artista"
 
-#: src/tray.c:58
+#: src/tray.c:60
 msgid "Title"
 msgstr "Titolo"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1304,17 +1208,17 @@
 "%s - %s\n"
 "%02d:%02d di %02d:%02d"
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Estrazione traccia in corso %02d:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Codifica traccia in corso %02d:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1323,7 +1227,7 @@
 "%s - %s\n"
 "%s%s%s"
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1332,30 +1236,106 @@
 "%s - %s\n"
 "In attesa"
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/tray.c:196
+#: src/tray.c:186
 msgid "Stop"
 msgstr "Stop"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr "Precedente"
 
-#: src/tray.c:209
+#: src/tray.c:199
 msgid "Next"
 msgstr "Successivo"
 
-#: src/tray.c:217
+#: src/tray.c:207
 msgid "Rip and Encode"
 msgstr "Estrai e codifica"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr "Esci"
 
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "Specifica la geometria della finestra principale"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "GEOMETRIA"
+
+#~ msgid "Grip started successfully\n"
+#~ msgstr "Grip è stato avviato con successo!\n"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "General"
+#~ msgstr "Generale"
+
+#~ msgid "Playing CDs"
+#~ msgstr "Riproduzione del CD"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "Estrazione del CD"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "Configurazione di Grip"
+
+#~ msgid "FAQ"
+#~ msgstr "FAQ"
+
+#~ msgid "Getting More Help"
+#~ msgstr "Ottieni più aiuto"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "Segnala gli errori"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "Ricerca %s (su %s) per il disco %02x.\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "Ricerca %s per il disco %02x.\n"
+
+#~ msgid "No match\n"
+#~ msgstr "Non è stato trovato alcun riscontro\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "È stato trovato un riscontro per \"%s / %s\"\n"
+#~ "Sto scaricando i dati...\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "Espelli il disco\n"
+
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "Sto inserendo la traccia %d nell'archivio DDJ\n"
+
+#~ msgid "Rip finished\n"
+#~ msgstr "Estrazione completata\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "È stata terminata la codifica sulla cpu %d \n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "Cancellazione [%s]\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "L'estrazione è terminata\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "Estrazione traccia %d su %s\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "Il file %s è già stato estratto. Viene saltato...\n"
+
+#~ msgid "%i: Encoding to %s\n"
+#~ msgstr "%i: Codifica su %s\n"
+
 #~ msgid ""
 #~ "This is a development version of Grip. If you encounter problems, you are "
 #~ "encouraged to revert to the latest stable version."

grip-4.1.1.tar.gz/po/ja.gmo Added

grip-3.10.1.tar.gz/po/ja.po -> grip-4.1.1.tar.gz/po/ja.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grip 3.1.9\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
 "PO-Revision-Date: 2004-04-04 12:27+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -16,47 +16,39 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "メインウィンドウの位置を指定する"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "GEOMETRY"
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr "使用する (${HOME}配下にある) 設定ファイルを指定する"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr "CONFIG"
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "使用する CD-ROM デバイスを指定する"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "DEVICE"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "使用する汎用 SCSI デバイスを指定する"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "\"スモール\" モード (CD-ROM のみ) で起動する"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr "\"ローカル\" モード -- インターネットから曲情報を問い合わせない"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "入力/出力の切替を行わない"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "詳細モード (デバッグ用) モードで起動する"
 
@@ -64,16 +56,12 @@
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "エラー: [%s] を初期化できません\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr ""
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
@@ -81,74 +69,38 @@
 "処理中です。\n"
 "本当に終了しますか？"
 
-#: src/grip.c:401
-msgid "Status"
-msgstr "ステータス"
-
-#: src/grip.c:416
-msgid "General"
-msgstr "全般"
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "切り出し"
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
-msgstr "エンコーダ"
+#: src/grip.c:380
+#, fuzzy
+msgid "Unable to open help file"
+msgstr "エラー: 作業用ファイルが作成できません"
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "ヘルプ"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "目次"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "音楽 CD の演奏"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "音楽 CD の切り出し"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "Grip の設定"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "FAQ"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "詳細なヘルプ"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "バグの報告"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "情報"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr "バージョン %s"
 
-#: src/grip.c:641
+#: src/grip.c:505
 #, fuzzy
 msgid "Error: Trying to show homepage failed."
 msgstr "エラー: 設定ファイルを保存できません"
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr "Created by Grip"
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -158,356 +110,364 @@
 "Grip を再設定する必要があります。\n"
 "古い設定ファイルに '-old' を付けて保存しました。"
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "サーバ: %s  ポート番号: %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 #, fuzzy
 msgid "Error: Unable to save config file."
 msgstr "エラー: 設定ファイルを保存できません"
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "設定"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "CD-ROM デバイス"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "終了時/起動時に再生割り込みをしない"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "終了時に巻き戻す"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "再生しない時に最初のトラックから開始する"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "ディスク挿入時に自動的に演奏する"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "再生する度にシャッフルする"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr "不良時に取り出す"
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr "ディスク・ドライブを定期的に確認する"
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr "確認する間隔 (秒)"
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "切り出しツール:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "実行ファイル"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "オプション"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "Paranoia を使用しない"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "拡張 Paranoia を使用しない"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "Scratch を使用しない"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "検出する"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "修復する"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr "ゲインの調整値を計算する"
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "ファイルの書式"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 #, fuzzy
 msgid "Rip file format (Multi-artist)"
 msgstr "ファイルの書式"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "一般的な SCSI デバイス"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "切り出し"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "優先度 (nice 値)"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "エンコーディングしない最大ファイル数"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "挿入時に自動的に切り出す"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "完了したらビープ音を鳴らす"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "完了したら自動的に取り出す"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "自動取り出しまでの待機時間"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr "切り出す前に遅延する"
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr "切り出しが完了するまでエンコーディングを遅らせる"
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr "次のトラックに移動する際に CD-ROM を停止する"
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "フィルタコマンド(WAV)"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "フィルタコマンド(DISK)"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "オプション"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "切り出し"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "エンコーダ:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr "実行型式"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr "コマンドライン引数"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 #, fuzzy
 msgid "Encoder file extension"
 msgstr "ファイルの拡張子"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 #, fuzzy
 msgid "Encoder file format"
 msgstr "ファイルの書式"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 #, fuzzy
 msgid "Encode file format (Multi-artist)"
 msgstr "ファイルの書式"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "エンコーダ"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr "完了後に .wav ファイルを削除する"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "SQLデータベースに追加する"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr ".m3uファイルを作成する"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr ".m3uファイルの中に関係するディレクトリを使用する"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "m3u ファイル書式"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "ビットレート (Kビット/秒)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "使用する CPU の数"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 #, fuzzy
 msgid "Encoder 'nice' value"
 msgstr "優先度 (nice 値)"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 #, fuzzy
 msgid "Encoder filter command"
 msgstr "フィルタ・コマンド"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 #, fuzzy
 msgid "Execute command after encode"
 msgstr "完了後に .wav ファイルを削除する"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "エンコーダ"
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr "ID3 タグを追加する"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr "ID3v2 タグを追加する"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr "拡張子が '.mp3' の場合にのみタグを付ける"
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "ID3 コメント"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr "ID3v1 の文字エンコーディング"
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 msgid "ID3v2 Character set encoding"
 msgstr "ID3v2 の文字エンコーディング"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "DB サーバ"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "CGI のパス"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "プライマリ"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "セカンダリ"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr "DB 確認メール"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 msgid "DB Character set encoding"
 msgstr "DB の文字エンコーディング"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "FreeDB を使用する"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "ディスク情報を自動的に取得する"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "プロキシサーバを使う"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr "環境変数 $http_proxy からサーバを取得する"
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "サーバ名"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "ポート番号"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "ユーザ名"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "パスワード"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "プロキシ"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "E-Mail アドレス"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "CD 更新プログラム"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "ファイル名の半角英字を小文字にしない"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr "ファイル名に日本語 (EUC-JP) を使用する"
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr ""
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "空白をアンダースコア (_) に変換しない"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -515,20 +475,20 @@
 "ファイル名として\n"
 "許可する半角記号"
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr ""
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "その他"
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 #, fuzzy
 msgid "Error: Unable to save ripper config."
 msgstr "エラー: 切り出しの設定を保存できません"
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 #, fuzzy
 msgid "Error: Unable to save encoder config."
 msgstr "エラー: エンコーディングの設定を保存できません"
@@ -569,7 +529,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr "切り出し中に検索はできません"
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "不明なディスク"
@@ -579,227 +538,200 @@
 msgid "Track %02d"
 msgstr "トラック %02d"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "%s (%s を経由 : ディスク %02x) の問い合わせ中です\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "%s (DISC %02x) の問い合わせ中です\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "一致しませんでした\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"\"%s / %s\" が一致しました\n"
-"データのダウンロード中...\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "完了\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "ディスクのデータ保存中にエラー\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 msgid "Length"
 msgstr "演奏時間"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "トラック"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "トラック"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 #, fuzzy
 msgid "Done.\n"
 msgstr "完了\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 #, fuzzy
 msgid "Error saving disc data."
 msgstr "ディスクデータの保存中にエラー"
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "再生モードの切り替え"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "ループ再生の切り替え"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "切り出し状況"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "トラックの再生/演奏を一時停止します"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "巻き戻します"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "早送りします"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "前のトラックにジャンプします"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "次のトラックにジャンプします"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "再生オプションを切り替えます"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "次のディスク"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "演奏を停止します"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "ディスクを取り出します"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr "ディスクの内容をスキャンします"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "ボリューム・コントロールに切り替えます"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "ディスク・エディタに切り替えます"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "DiscDB 検索を開始したり停止します"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "トラック番号表示に切り替えます"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Grip を終了します"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 #, fuzzy
 msgid "Cannot fast forward while ripping."
 msgstr "切り出し中に早送りはできません"
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 #, fuzzy
 msgid "Cannot rewind while ripping."
 msgstr "切り出し中に巻き戻しはできません"
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 #, fuzzy
 msgid "Cannot switch discs while ripping."
 msgstr "切り出し中にディスクの交換はできません"
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "ディスクを取り出して下さい\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 #, fuzzy
 msgid "Cannot eject while ripping."
 msgstr "切り出し中に取り出せません"
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr "ディスクがあります -- 取り出し中\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 #, fuzzy
 msgid "Cannot play while ripping."
 msgstr "切り出し中に再生はできません"
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 #, fuzzy
 msgid "Cannot switch tracks while ripping."
 msgstr "切り出し中にトラックの交換はできません"
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "新しいディスクをチェックする\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat はディスクを見つけました。トラックをチェックします\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "おかしなディスクがあります！\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "長さが 0 でないトラックがありません\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "CDStat よりディスクが無いとの報告です\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "現在のセクタ: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "ディスクがありません"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -811,27 +743,39 @@
 "\n"
 "このディスク情報を送信しますか？"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 #, fuzzy
 msgid "Error: Unable to create temporary file."
 msgstr "エラー: 作業用ファイルが作成できません"
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 #, fuzzy
 msgid "Error: Unable to write disc data."
 msgstr "エラー: ディスクデータを書き込めません"
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "エントリ %s をメール中です\n"
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 #, fuzzy
 msgid "Error: Unable to execute mail command."
 msgstr "エラー: エンコーディングの設定を保存できません"
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr ""
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr ""
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr ""
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "システム・メッセージ"
 
@@ -865,85 +809,85 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "エラー: 書き込みモードで %s ファイルを開けません\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "タイトル"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "トラック名"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr "W"
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "演奏者"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "ジャンル:"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "制作年"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "トラック名"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "演奏者"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr "W"
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "分割:"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "タイトル/演奏者"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "演奏家/タイトル"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr "分割文字"
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "複数の演奏者"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "ディスク情報の保存"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "ディスク情報を送信"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 #, fuzzy
 msgid "No disc present."
 msgstr "ディスクがありません"
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 #, fuzzy
 msgid "Cannot submit. No disc is present."
 msgstr ""
 "送信できません\n"
 "現在、ディスクはありません"
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 #, fuzzy
 msgid "You must enter a disc title."
 msgstr "このディスクのタイトルを入力して下さい"
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 #, fuzzy
 msgid "You must enter a disc artist."
 msgstr "このディスクの演奏者を入力して下さい"
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -961,7 +905,7 @@
 "\n"
 "続行しますか？"
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -973,11 +917,11 @@
 "\n"
 "続行しますか？"
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "ジャンルの選択"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -985,19 +929,18 @@
 "'不明' 以外のジャンルを指定して下さい\n"
 "以下の DiscDB ジャンルを一つ選択して下さい"
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "DiscDB ジャンル"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "送信"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "キャンセル"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "不明な ID3 フィールド\n"
@@ -1007,193 +950,170 @@
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr "エラー: ファイル名を変換できません。 %s というユーザはありません\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "実行に失敗しました\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "エラー: エントリの種類が不正です\n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 #, fuzzy
 msgid "Error: Reading config file\n"
 msgstr "エラー: 設定ファイルが正しくありません\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "エラー: 設定ファイルが正しくありません\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "一括作成"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "選択したトラックの切り出しとエンコーディングの両方を実行します"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "切り出しのみ実行"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "選択したトラックの切り出しのみ実行します"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr "一括作成の中止"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "切り出しとエンコーディングの両方の処理を強制終了します"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "切り出し処理の中止"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "切り出し処理のみ強制終了します"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "DDJ スキャンの実行"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "ディスク情報を DigitalDJ データベースに追加します"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "トラックの一部を切り出す"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "再生"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "現在のセクタ:     0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "切り出し: 待機中"
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "エンコーディング: 99曲目 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
 msgstr "エンコーディング: 待機中"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr "全トラックの進捗:"
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "開始セクタ"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "終了セクタ"
 
-#: src/rip.c:384
-#, fuzzy, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "SQLデータベースに追加する"
-
-#: src/rip.c:609
+#: src/rip.c:600
 #, fuzzy
 msgid "Error: can't open m3u file."
 msgstr "エラー: m3u ファイルを開けません\n"
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr "切り出しの停止中\n"
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr "現在のエンコーディング合計サイズ: %d\n"
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "切り出し: %d曲目 (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr "切り出し: %6.2f%%"
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "切り出し終了\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr "%d 分割で %d個のwavに切り出し\n"
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "次のトラックは %d 全部で %d です\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "他のトラックを切り出す必要があるか確認して下さい\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "エンコーディング: %d曲目 (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr "エンコーディング: %6.2f%%"
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "CPU %d でのエンコーディングが終了しました\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "[%s] を削除中です\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "切り出し終了\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "演奏者なし"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "タイトルなし"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
 msgstr ""
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
 "executable."
 msgstr ""
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 #, fuzzy
 msgid ""
 "Invalid encoder executable.\n"
@@ -1203,7 +1123,7 @@
 "エンコーダが正しくありません。\n"
 "切り出しの設定を確認して下さい。"
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1211,165 +1131,224 @@
 "トラックが指定されていません。\n"
 "音楽 CD 全体を切り出しますか？\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "音楽 CD 全体の切り出し\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr "次のトラックを切り出し中\n"
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "最初にチェックしたトラックは %d です\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr "切り出し中止！\n"
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "WAV ファイルに対する書き込み権限がありません"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "トラック %d を %s に切り出し中\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "切り出し: %d曲目 (0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "ファイル %s は既に切り出し済みです。スキップします...\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "出力するために必要な空き容量がありません"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "CDPRipを呼び出しています。\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "%d トラックを %s リストに追加しました\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "CPUに空きがありません\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr "エンコーディングのトラック %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 #, fuzzy
 msgid "No write access to write encoded file."
 msgstr "エンコーディング・ファイルに対する書き込み権限がありません"
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i: %s へエンコーディング中\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "エンコーディング: %d曲目 (0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr "全て計算中\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr "現在、切り出ししていないので、エンコーディング値を 0にして下さい\n"
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "切り出しの合計サイズ: %d\n"
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "エンコーディングの合計サイズ: %d\n"
 
-#: src/tray.c:57
+#: src/tray.c:59
 #, fuzzy
 msgid "Artist"
 msgstr "演奏者なし"
 
-#: src/tray.c:58
+#: src/tray.c:60
 #, fuzzy
 msgid "Title"
 msgstr "タイトルなし"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
 "%02d:%02d of %02d:%02d"
 msgstr ""
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr ""
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr ""
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
 "%s%s%s"
 msgstr ""
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
 "Idle"
 msgstr ""
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr ""
 
-#: src/tray.c:196
+#: src/tray.c:186
 #, fuzzy
 msgid "Stop"
 msgstr "演奏を停止します"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr ""
 
-#: src/tray.c:209
+#: src/tray.c:199
 #, fuzzy
 msgid "Next"
 msgstr "次のディスク"
 
-#: src/tray.c:217
+#: src/tray.c:207
 #, fuzzy
 msgid "Rip and Encode"
 msgstr "一括作成の中止"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr ""
 
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "メインウィンドウの位置を指定する"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "GEOMETRY"
+
+#~ msgid "Status"
+#~ msgstr "ステータス"
+
+#~ msgid "General"
+#~ msgstr "全般"
+
+#~ msgid "Playing CDs"
+#~ msgstr "音楽 CD の演奏"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "音楽 CD の切り出し"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "Grip の設定"
+
+#~ msgid "FAQ"
+#~ msgstr "FAQ"
+
+#~ msgid "Getting More Help"
+#~ msgstr "詳細なヘルプ"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "バグの報告"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "%s (%s を経由 : ディスク %02x) の問い合わせ中です\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "%s (DISC %02x) の問い合わせ中です\n"
+
+#~ msgid "No match\n"
+#~ msgstr "一致しませんでした\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "\"%s / %s\" が一致しました\n"
+#~ "データのダウンロード中...\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "ディスクを取り出して下さい\n"
+
+#, fuzzy
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "SQLデータベースに追加する"
+
+#~ msgid "Rip finished\n"
+#~ msgstr "切り出し終了\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "CPU %d でのエンコーディングが終了しました\n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "[%s] を削除中です\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "切り出し終了\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "トラック %d を %s に切り出し中\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "ファイル %s は既に切り出し済みです。スキップします...\n"
+
+#~ msgid "%i: Encoding to %s\n"
+#~ msgstr "%i: %s へエンコーディング中\n"
+
 #~ msgid ""
 #~ "This is a development version of Grip. If you encounter problems, you are "
 #~ "encouraged to revert to the latest stable version."

grip-4.1.1.tar.gz/po/ko.gmo Added

grip-4.1.1.tar.gz/po/ko.po Added

@@ -0,0 +1,1325 @@
+# Korean Translations for Grip
+# Mike Oliphant	<grip@nostatic.org>
+# Johnny A. Solbu <johnny@solbu.net>
+# This file is distributed under the same license as the grip package.
+# SooHyun Kim <soohyunkim@kw.ac.kr>, 2019-2020.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: grip 4.1.0\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
+"PO-Revision-Date: 2020-02-05 22:31+0900\n"
+"Last-Translator: SooHyun Kim <soohyunkim@kw.ac.kr>\n"
+"Language-Team: Korean <translation-team-ko@googlegroups.com>\n"
+"Language: ko\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/main.c:60
+msgid "Specify the config file to use (in your home dir)"
+msgstr "사용할 설정 파일 지정(홈 디렉토리의)"
+
+#: src/main.c:61
+msgid "CONFIG"
+msgstr "설정"
+
+#: src/main.c:68
+msgid "Specify the cdrom device to use"
+msgstr "사용할 CD롬 장치 지정"
+
+#: src/main.c:69 src/main.c:77
+msgid "DEVICE"
+msgstr "장치"
+
+#: src/main.c:76
+msgid "Specify the generic scsi device to use"
+msgstr "사용할 제네릭 SCSI 장치 지정"
+
+#: src/main.c:84
+msgid "Launch in \"small\" (cd-only) mode"
+msgstr "\"소형\" (CD 전용) 모드로 실행"
+
+#: src/main.c:92
+msgid "\"Local\" mode -- do not look up disc info on the net"
+msgstr "\"로컬\" 모드 -- 인터넷에서 디스크 정보를 찾지 않음"
+
+#: src/main.c:100
+msgid "Do not do I/O redirection"
+msgstr "I/O 리다이렉션 사용 안함"
+
+#: src/main.c:108
+msgid "Run in verbose (debug) mode"
+msgstr "상세 (디버그) 모드로 실행"
+
+#: src/grip.c:187
+msgid "Grip"
+msgstr "Grip"
+
+#: src/grip.c:222
+#, c-format
+msgid "Error: Unable to initialize [%s]\n"
+msgstr "오류: [%s]을(를) 초기화 할 수 없음\n"
+
+#: src/grip.c:325
+msgid ""
+"Work is in progress.\n"
+"Really shut down?"
+msgstr ""
+"작업이 진행중입니다.\n"
+"정말로 종료하시겠습니까?"
+
+#: src/grip.c:380
+msgid "Unable to open help file"
+msgstr "도움말 파일 열기 실패"
+
+#: src/grip.c:396
+msgid "Help"
+msgstr "도움말"
+
+#: src/grip.c:401
+msgid "Table Of Contents"
+msgstr "목차"
+
+#: src/grip.c:421
+msgid "About"
+msgstr "정보"
+
+#: src/grip.c:436
+#, c-format
+msgid "Version %s"
+msgstr "버전 %s"
+
+#: src/grip.c:505
+msgid "Error: Trying to show homepage failed."
+msgstr "오류: 홈페이지 표시 실패."
+
+#: src/grip.c:782
+msgid "Created by Grip"
+msgstr "Grip에 의해 생성됨"
+
+#: src/grip.c:800
+msgid ""
+"Your config file is out of date -- resetting to defaults.\n"
+"You will need to re-configure Grip.\n"
+"Your old config file has been saved with -old appended."
+msgstr ""
+"설정 파일이 만료되었습니다. -- 기본 설정으로 초기화합니다.\n"
+"Grip을 다시 설정하여야 합니다.\n"
+"기존 설정 파일은 -old가 파일 이름 뒤에 추가되어 저장되었습니다."
+
+#: src/grip.c:868
+#, c-format
+msgid "server is %s, port %d\n"
+msgstr "서버: %s, 포트: %d\n"
+
+#: src/grip.c:891
+msgid "Error: Unable to save config file."
+msgstr "오류: 설정 파일 저장 실패."
+
+#: src/gripcfg.c:94
+msgid "Config"
+msgstr "설정"
+
+#: src/gripcfg.c:102
+msgid "CDRom device"
+msgstr "CD롬 장치"
+
+#: src/gripcfg.c:107
+msgid "Don't interrupt playback on exit/startup"
+msgstr "종료/시작시에도 재생 계속하기"
+
+#: src/gripcfg.c:111
+msgid "Rewind when stopped"
+msgstr "멈췄을 때 되감기"
+
+#: src/gripcfg.c:116
+msgid "Startup with first track if not playing"
+msgstr "재생 중이 아닐때는 첫 트랙부터 시작하기"
+
+#: src/gripcfg.c:121
+msgid "Auto-play on disc insert"
+msgstr "디스크 삽입시 자동 재생"
+
+#: src/gripcfg.c:126
+msgid "Reshuffle before each playback"
+msgstr "매번 재생할 때 마다 목록 섞기"
+
+#: src/gripcfg.c:131
+msgid "Work around faulty eject"
+msgstr "불완전한 꺼내기 피하기"
+
+#: src/gripcfg.c:136
+msgid "Poll disc drive for new disc"
+msgstr "새 디스크를 위해 드라이브 폴링"
+
+#: src/gripcfg.c:140
+msgid "Poll interval (seconds)"
+msgstr "폴링 간격 (초)"
+
+#: src/gripcfg.c:148
+msgid "CD"
+msgstr "CD"
+
+#: src/gripcfg.c:163
+msgid "Ripper:"
+msgstr "리퍼:"
+
+#: src/gripcfg.c:208
+msgid "Ripping executable"
+msgstr "리퍼 실행파일"
+
+#: src/gripcfg.c:213
+msgid "Rip command-line"
+msgstr "리핑 명령행"
+
+#: src/gripcfg.c:224
+msgid "Disable paranoia"
+msgstr "paranoia 비활성화"
+
+#: src/gripcfg.c:229
+msgid "Disable extra paranoia"
+msgstr "추가적인 paranoia 비활성화"
+
+#: src/gripcfg.c:235
+msgid "Disable scratch"
+msgstr "스크래치"
+
+#: src/gripcfg.c:239
+msgid "detection"
+msgstr "검사 비활성화"
+
+#: src/gripcfg.c:243
+msgid "repair"
+msgstr "복구 비활성화"
+
+#: src/gripcfg.c:251
+msgid "Calculate gain adjustment"
+msgstr "게인 조정값 계산"
+
+#: src/gripcfg.c:259
+msgid "Rip file format"
+msgstr "리핑 파일 형식"
+
+#: src/gripcfg.c:264
+msgid "Rip file format (Multi-artist)"
+msgstr "리핑 파일 형식 (다중 아티스트)"
+
+#: src/gripcfg.c:268
+msgid "Generic SCSI device"
+msgstr "제네릭 SCSI 장치"
+
+#: src/gripcfg.c:276
+msgid "Ripper"
+msgstr "리퍼"
+
+#: src/gripcfg.c:285
+msgid "Rip 'nice' value"
+msgstr "리퍼 'nice' 값"
+
+#: src/gripcfg.c:289
+msgid "Max non-encoded .wav's"
+msgstr "인코딩되지 않은 최대 .wav 개수"
+
+#: src/gripcfg.c:295
+msgid "Auto-rip on insert"
+msgstr "삽입시 자동으로 리핑"
+
+#: src/gripcfg.c:299
+msgid "Beep after rip"
+msgstr "리핑 완료후 비프음 울리기"
+
+#: src/gripcfg.c:309
+msgid "Auto-eject after rip"
+msgstr "리핑 완료 후 자동으로 꺼내기"
+
+#: src/gripcfg.c:313
+msgid "Auto-eject delay"
+msgstr "자동 꺼내기 딜레이"
+
+#: src/gripcfg.c:321
+msgid "Delay before ripping"
+msgstr "리핑 전 딜레이"
+
+#: src/gripcfg.c:326
+msgid "Delay encoding until disc is ripped"
+msgstr "디스크가 리핑될 때 까지 인코딩 미루기"
+
+#: src/gripcfg.c:331
+msgid "Stop cdrom drive between tracks"
+msgstr "트랙 사이에서 CD 드라이브 멈추기"
+
+#: src/gripcfg.c:335
+msgid "Wav filter command"
+msgstr "Wav 필터 명령어"
+
+#: src/gripcfg.c:340
+msgid "Disc filter command"
+msgstr "디스크 필터 명령어"
+
+#: src/gripcfg.c:348 src/gripcfg.c:493
+msgid "Options"
+msgstr "옵션"
+
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "리핑"
+
+#: src/gripcfg.c:370
+msgid "Encoder:"
+msgstr "인코더:"
+
+#: src/gripcfg.c:405
+msgid "Encoder executable"
+msgstr "인코더 실행파일"
+
+#: src/gripcfg.c:410
+msgid "Encoder command-line"
+msgstr "인코더 명령행"
+
+#: src/gripcfg.c:416
+msgid "Encoder file extension"
+msgstr "인코딩 파일 확장자"
+
+#: src/gripcfg.c:421
+msgid "Encoder file format"
+msgstr "인코딩 파일 형식"
+
+#: src/gripcfg.c:427
+msgid "Encode file format (Multi-artist)"
+msgstr "인코딩 파일 형식(다중 아티스트)"
+
+#: src/gripcfg.c:435
+msgid "Encoder"
+msgstr "인코더"
+
+#: src/gripcfg.c:445
+msgid "Delete .wav after encoding"
+msgstr "인코딩 이후 .wav 삭제"
+
+#: src/gripcfg.c:450
+msgid "Insert info into SQL database"
+msgstr "SQL 데이터베이스에 정보 삽입"
+
+#: src/gripcfg.c:454
+msgid "Create .m3u files"
+msgstr ".m3u 파일 생성"
+
+#: src/gripcfg.c:459
+msgid "Use relative paths in .m3u files"
+msgstr ".m3u 파일에 상대경로 사용"
+
+#: src/gripcfg.c:463
+msgid "M3U file format"
+msgstr "M3U 파일 형식"
+
+#: src/gripcfg.c:468
+msgid "Encoding bitrate (kbits/sec)"
+msgstr "인코딩 비트레이트 (kbit/sec)"
+
+#: src/gripcfg.c:472
+msgid "Number of CPUs to use"
+msgstr "사용할 CPU 개수"
+
+#: src/gripcfg.c:476
+msgid "Encoder 'nice' value"
+msgstr "인코더 'nice' 값"
+
+#: src/gripcfg.c:480
+msgid "Encoder filter command"
+msgstr "인코더 필터 명령어"
+
+#: src/gripcfg.c:485
+msgid "Execute command after encode"
+msgstr "인코딩 이후 명령 실행"
+
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "인코딩"
+
+#: src/gripcfg.c:509
+msgid "Add ID3 tags to encoded files"
+msgstr "인코딩된 파일에 ID3 태그 추가"
+
+#: src/gripcfg.c:515
+msgid "Add ID3v2 tags to encoded files"
+msgstr "인코딩된 파일에 ID3v2 태그 추가"
+
+#: src/gripcfg.c:521
+msgid "Only tag files ending in '.mp3'"
+msgstr "'.mp3'으로 끝나는 파일에만 태그 추가"
+
+#: src/gripcfg.c:525
+msgid "ID3 comment field"
+msgstr "ID3 비고 영역"
+
+#: src/gripcfg.c:530
+msgid "ID3v1 Character set encoding"
+msgstr "ID3v1 문자열 인코딩"
+
+#: src/gripcfg.c:536
+msgid "ID3v2 Character set encoding"
+msgstr "ID3v2 문자열 인코딩"
+
+#: src/gripcfg.c:544
+msgid "ID3"
+msgstr "ID3"
+
+#: src/gripcfg.c:560 src/gripcfg.c:580
+msgid "DB server"
+msgstr "DB 서버"
+
+#: src/gripcfg.c:564 src/gripcfg.c:584
+msgid "CGI path"
+msgstr "CGI 경로"
+
+#: src/gripcfg.c:571
+msgid "Primary Server"
+msgstr "주 서버"
+
+#: src/gripcfg.c:591
+msgid "Secondary Server"
+msgstr "보조 서버"
+
+#: src/gripcfg.c:601
+msgid "DB Submit email"
+msgstr "DB 제출 이메일"
+
+#: src/gripcfg.c:606
+msgid "DB Character set encoding"
+msgstr "DB 문자열 인코딩"
+
+#: src/gripcfg.c:611
+msgid "Use freedb extensions"
+msgstr "freedb 확장 사용하기"
+
+#: src/gripcfg.c:616
+msgid "Perform disc lookups automatically"
+msgstr "자동으로 디스크 정보 검색하기"
+
+#: src/gripcfg.c:624
+msgid "DiscDB"
+msgstr "DiscDB"
+
+#: src/gripcfg.c:633
+msgid "Use proxy server"
+msgstr "프록시 서버 사용"
+
+#: src/gripcfg.c:640
+msgid "Get server from 'http_proxy' env. var"
+msgstr "'http_proxy' 환경 변수에서 서버 가져오기"
+
+#: src/gripcfg.c:644
+msgid "Proxy server"
+msgstr "프록시 서버"
+
+#: src/gripcfg.c:648
+msgid "Proxy port"
+msgstr "프록시 포트"
+
+#: src/gripcfg.c:652
+msgid "Proxy username"
+msgstr "프록시 사용자명"
+
+#: src/gripcfg.c:658
+msgid "Proxy password"
+msgstr "프록시 비밀번호"
+
+#: src/gripcfg.c:666
+msgid "Proxy"
+msgstr "프록시"
+
+#: src/gripcfg.c:675
+msgid "Email address"
+msgstr "이메일 주소"
+
+#: src/gripcfg.c:679
+msgid "CD update program"
+msgstr "CD 업데이트 프로그램"
+
+#: src/gripcfg.c:684
+msgid "Do not lowercase filenames"
+msgstr "파일명 소문자로 바꾸지 않기"
+
+#: src/gripcfg.c:689
+msgid "Allow high bits in filenames"
+msgstr "높은 비트를 가진 파일명 허용"
+
+#: src/gripcfg.c:694
+msgid "Replace incompatible characters by hexadecimal numbers"
+msgstr "호환되지 않는 문자열을 16진수 숫자로 치환"
+
+#: src/gripcfg.c:699
+msgid "Do not change spaces to underscores"
+msgstr "공백을 언더바로 바꾸지 않기"
+
+#: src/gripcfg.c:704
+msgid "Write m3u files using non-posix compliant '\\'s"
+msgstr "비-POSIX 호환 '\\' 이용하여 m3u 파일 작성"
+
+#: src/gripcfg.c:709
+msgid ""
+"Characters to not strip\n"
+"in filenames"
+msgstr ""
+"파일명에서 제거하지 않을\n"
+"문자들"
+
+#: src/gripcfg.c:714
+msgid "Show tray icon"
+msgstr "트레이 아이콘 보이기"
+
+#: src/gripcfg.c:721
+msgid "Misc"
+msgstr "기타"
+
+#: src/gripcfg.c:827
+msgid "Error: Unable to save ripper config."
+msgstr "오류: 리핑 설정 저장 실패."
+
+#: src/gripcfg.c:901
+msgid "Error: Unable to save encoder config."
+msgstr "오류: 인코더 설정 저장 실패."
+
+#: src/cddev.c:174 src/cddev.c:604
+#, c-format
+msgid "Drive status is %d\n"
+msgstr "드라이브 상태는 %d 입니다.\n"
+
+#: src/cddev.c:176
+msgid "Drive doesn't support drive status check (assume CDS_NO_INFO)\n"
+msgstr ""
+"드라이브가 드라이브 상태 점검을 지원하지 않습니다. (CDS_NO_INFO로 추정합니"
+"다)\n"
+
+#: src/cddev.c:179
+msgid "No disc\n"
+msgstr "디스크 없음\n"
+
+#: src/cddev.c:284 src/cddev.c:293 src/cddev.c:310 src/cddev.c:337
+msgid "Error: Failed to read disc contents\n"
+msgstr "오류: 디스크 내용을 읽을 수 없음\n"
+
+#: src/cddev.c:607
+msgid "Drive doesn't support drive status check\n"
+msgstr "드라이브가 드라이브 상태 점검을 지원하지 않습니다\n"
+
+#: src/cddev.c:627 src/cddev.c:632
+#, c-format
+msgid "Unlock failed: %d"
+msgstr "잠금 해제 실패: %d"
+
+#: src/cddev.c:636
+msgid "CDIOCEJECT"
+msgstr "CDIOCEJECT"
+
+#: src/cdplay.c:90
+msgid "Cannot do lookup while ripping."
+msgstr "리핑 중에는 정보를 요청할 수 없습니다."
+
+#: src/cdplay.c:127
+msgid "Unknown Disc"
+msgstr "알수 없는 디스크"
+
+#: src/cdplay.c:131
+#, c-format
+msgid "Track %02d"
+msgstr "트랙 %02d"
+
+#: src/cdplay.c:234
+msgid "Done\n"
+msgstr "완료\n"
+
+#: src/cdplay.c:237
+msgid "Error saving disc data\n"
+msgstr "디스크 데이터 저장 실패\n"
+
+#: src/cdplay.c:254 src/cdplay.c:365
+msgid "Length"
+msgstr "길이"
+
+#: src/cdplay.c:309
+msgid "Tracks"
+msgstr "트랙"
+
+#: src/cdplay.c:326
+msgid "Select previous CDDB entry."
+msgstr "이전 CDDB 항목 선택."
+
+#: src/cdplay.c:334
+msgid "Select next CDDB entry."
+msgstr "다음 CDDB 항목 선택."
+
+#: src/cdplay.c:354
+msgid "Track"
+msgstr "트랙"
+
+#: src/cdplay.c:441
+msgid "DoNextDiscDBEntry.\n"
+msgstr "DoNextDiscDBEntry.\n"
+
+#: src/cdplay.c:444 src/cdplay.c:471
+msgid "No disc data. Returning.\n"
+msgstr "디스크에 데이터가 없습니다. 돌아갑니다.\n"
+
+#: src/cdplay.c:449
+msgid "Already at last index. Returning.\n"
+msgstr "이미 마지막 인덱스에 있습니다. 돌아갑니다.\n"
+
+#: src/cdplay.c:458 src/cdplay.c:485
+msgid "Done.\n"
+msgstr "완료.\n"
+
+#: src/cdplay.c:468
+msgid "DoPrevDiscDBEntry.\n"
+msgstr "DoPrevDiscDBEntry.\n"
+
+#: src/cdplay.c:476
+msgid "Already at first index. Returning.\n"
+msgstr "이미 첫 인덱스에 있습니다. 돌아갑니다.\n"
+
+#: src/cdplay.c:712 src/discedit.c:398
+msgid "Error saving disc data."
+msgstr "디스크 데이터 저장 실패."
+
+#: src/cdplay.c:783
+msgid "Rotate play mode"
+msgstr "재생 모드 변경"
+
+#: src/cdplay.c:803
+msgid "Toggle loop play"
+msgstr "반복 재생 토글"
+
+#: src/cdplay.c:881 src/rip.c:231
+msgid "Rip status"
+msgstr "리핑 상태"
+
+#: src/cdplay.c:948
+msgid "Play track / Pause play"
+msgstr "트랙 재생하기 / 재생 일시정지"
+
+#: src/cdplay.c:959
+msgid "Rewind"
+msgstr "되감기"
+
+#: src/cdplay.c:970
+msgid "FastForward"
+msgstr "빨리감기"
+
+#: src/cdplay.c:980
+msgid "Go to previous track"
+msgstr "이전 트랙으로"
+
+#: src/cdplay.c:989
+msgid "Go to next track"
+msgstr "다음 트랙으로"
+
+#: src/cdplay.c:998
+msgid "Toggle play mode options"
+msgstr "재생 모드 옵션 토글"
+
+#: src/cdplay.c:1008
+msgid "Next Disc"
+msgstr "다음 디스크"
+
+#: src/cdplay.c:1022
+msgid "Stop play"
+msgstr "재생 정지"
+
+#: src/cdplay.c:1032
+msgid "Eject disc"
+msgstr "디스크 꺼내기"
+
+#: src/cdplay.c:1041
+msgid "Scan Disc Contents"
+msgstr "디스크 내용 스캔"
+
+#: src/cdplay.c:1049
+msgid "Toggle Volume Control"
+msgstr "음량 조절기 토글"
+
+#: src/cdplay.c:1058
+msgid "Toggle disc editor"
+msgstr "디스크 편집기 토글"
+
+#: src/cdplay.c:1068
+msgid "Initiate/abort DiscDB lookup"
+msgstr "DiscDB 찾기 시작/취소"
+
+#: src/cdplay.c:1078
+msgid "Toggle track display"
+msgstr "트랙 디스플레이 토글"
+
+#: src/cdplay.c:1085
+msgid "Exit Grip"
+msgstr "Grip 나가기"
+
+#: src/cdplay.c:1252
+msgid "Cannot fast forward while ripping."
+msgstr "리핑중에는 빨리감을 수 없습니다."
+
+#: src/cdplay.c:1283
+msgid "Cannot rewind while ripping."
+msgstr "리핑중에는 되감을 수 없습니다."
+
+#: src/cdplay.c:1314
+msgid "Cannot switch discs while ripping."
+msgstr "리핑 중에는 디스크를 바꿀 수 없습니다."
+
+#: src/cdplay.c:1334
+msgid "Cannot eject while ripping."
+msgstr "리핑중에는 디스크를 꺼낼 수 없습니다."
+
+#: src/cdplay.c:1344
+msgid "Have disc -- ejecting\n"
+msgstr "디스크 있음 -- 꺼내는 중\n"
+
+#: src/cdplay.c:1411
+msgid "Cannot play while ripping."
+msgstr "리핑 중에는 재생할 수 없습니다."
+
+#: src/cdplay.c:1479 src/cdplay.c:1510
+msgid "Cannot switch tracks while ripping."
+msgstr "리핑 중에는 트랙을 바꿀 수 없습니다."
+
+#: src/cdplay.c:1601
+msgid "Checking for a new disc\n"
+msgstr "새로운 디스크 확인중\n"
+
+#: src/cdplay.c:1606
+msgid "CDStat found a disc, checking tracks\n"
+msgstr "CDStat이 디스크를 찾음, 트랙 확인중\n"
+
+#: src/cdplay.c:1609
+msgid "We have a valid disc!\n"
+msgstr "유효한 디스크가 있음!\n"
+
+#: src/cdplay.c:1636
+msgid "No non-zero length tracks\n"
+msgstr "길이가 0인 트랙이 없음\n"
+
+#: src/cdplay.c:1645
+msgid "CDStat said no disc\n"
+msgstr "CDStat에서 디스크가 없다고 응답함\n"
+
+#: src/cdplay.c:1794 src/cdplay.c:1816
+#, c-format
+msgid "Current sector: %6d"
+msgstr "현재 섹터: %6d"
+
+#: src/cdplay.c:1917
+msgid "No Disc"
+msgstr "디스크 없음"
+
+#: src/cdplay.c:1968
+msgid ""
+"This disc has been found on your secondary server,\n"
+"but not on your primary server.\n"
+"\n"
+"Do you wish to submit this disc information?"
+msgstr ""
+"이 디스크는 보조 서버에서는 발견되었지만 주 서버에는 없습니다.\n"
+"디스크 정보를 제출하시겠습니까?"
+
+#: src/cdplay.c:1996 src/cdplay.c:2005
+msgid "Error: Unable to create temporary file."
+msgstr "오류: 임시 파일 생성 실패."
+
+#: src/cdplay.c:2023
+msgid "Error: Unable to write disc data."
+msgstr "오류: 디스크 데이터 쓰기 실패."
+
+#: src/cdplay.c:2032
+#, c-format
+msgid "Mailing entry to %s\n"
+msgstr "%s로 목록 메일 전송중\n"
+
+#: src/cdplay.c:2037
+msgid "Error: Unable to execute mail command."
+msgstr "오류: 메일 명령 실행할 수 없음."
+
+#: src/dialog.c:39
+msgid "Warning"
+msgstr "경고"
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr "정보"
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr "질문"
+
+#: src/dialog.c:83
+msgid "System Message"
+msgstr "시스템 메시지"
+
+#: src/discdb.c:209
+#, c-format
+msgid "URI is %s\n"
+msgstr "URL은 %s 입니다\n"
+
+#: src/discdb.c:290
+#, c-format
+msgid "Query is [%s]\n"
+msgstr "질의는 [%s] 입니다\n"
+
+#: src/discdb.c:792
+#, c-format
+msgid "Stat error %d on %s\n"
+msgstr "%2$s에서 State 오류 %1$d 발생\n"
+
+#: src/discdb.c:796
+#, c-format
+msgid "Creating directory %s\n"
+msgstr "%s 디렉토리 생성중\n"
+
+#: src/discdb.c:801
+#, c-format
+msgid "Error: %s exists, but is a file\n"
+msgstr "오류: %s가 존재하지만 파일입니다\n"
+
+#: src/discdb.c:808
+#, c-format
+msgid "Error: Unable to open %s for writing\n"
+msgstr "오류: %s를 쓰기용으로 열 수 없습니다.\n"
+
+#: src/discedit.c:61
+msgid "Disc title"
+msgstr "디스크 제목"
+
+#: src/discedit.c:62
+msgid "Disc artist"
+msgstr "디스크 아티스트"
+
+#: src/discedit.c:63
+msgid "ID3 genre:"
+msgstr "ID3 장르:"
+
+#: src/discedit.c:64
+msgid "Disc year"
+msgstr "발매연도"
+
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "트랙 이름"
+
+#: src/discedit.c:66
+msgid "Track artist"
+msgstr "트랙 아티스트"
+
+#: src/discedit.c:92
+msgid "W"
+msgstr "W"
+
+#: src/discedit.c:221
+msgid "Split:"
+msgstr "나누기:"
+
+#: src/discedit.c:225
+msgid "Title/Artist"
+msgstr "제목/아티스트"
+
+#: src/discedit.c:232
+msgid "Artist/Title"
+msgstr "아티스트/제목"
+
+#: src/discedit.c:240
+msgid "Split chars"
+msgstr "구분자"
+
+#: src/discedit.c:262
+msgid "Multi-artist"
+msgstr "다중 아티스트"
+
+#: src/discedit.c:273
+msgid "Save disc info"
+msgstr "디스크 정보 저장"
+
+#: src/discedit.c:282
+msgid "Submit disc info"
+msgstr "디스크 정보 제출"
+
+#: src/discedit.c:401
+msgid "No disc present."
+msgstr "제공된 디스크가 없습니다."
+
+#: src/discedit.c:555
+msgid "Cannot submit. No disc is present."
+msgstr "제출할 수 없습니다. 제공된 디스크가 없습니다."
+
+#: src/discedit.c:570
+msgid "You must enter a disc title."
+msgstr "디스크 제목을 반드시 입력해야 합니다."
+
+#: src/discedit.c:577
+msgid "You must enter a disc artist."
+msgstr "디스크 아티스트를 반드시 입력해야 합니다."
+
+#: src/discedit.c:586
+msgid ""
+"You are about to submit this disc information\n"
+"to a commercial CDDB server, which will then\n"
+"own the data that you submit. These servers make\n"
+"a profit out of your effort. We suggest that you\n"
+"support free servers instead.\n"
+"\n"
+"Continue?"
+msgstr ""
+"지금 디스크 정보를 상업적 CDDB 서버에 제출하려고 하고 있습니다.\n"
+"이 서버들은 당신이 만든 결과를 이용해 수익을 창출할 것입니다.\n"
+"대신 무료 서버를 사용하는 것을 추천합니다.\n"
+"\n"
+"그래도 계속 하시겠습니까?"
+
+#: src/discedit.c:594
+msgid ""
+"You are about to submit this\n"
+"disc information via email.\n"
+"\n"
+"Continue?"
+msgstr ""
+"지금 이 디스크 정보를\n"
+"이메일을 통해 제출합니다.\n"
+"\n"
+"계속 하시겠습니까?"
+
+#: src/discedit.c:612
+msgid "Genre selection"
+msgstr "장르 선택"
+
+#: src/discedit.c:616
+msgid ""
+"Submission requires a genre other than 'unknown'\n"
+"Please select a DiscDB genre below"
+msgstr ""
+"제출하려면 장르를 'unknown'으로 설정할 수 없습니다.\n"
+"다른 DiscDB 장르를 선택해 주십시오"
+
+#: src/discedit.c:626
+msgid "DiscDB genre"
+msgstr "DiscDB 장르"
+
+#: src/discedit.c:646
+msgid "Submit"
+msgstr "제출"
+
+#: src/discedit.c:657
+msgid "Cancel"
+msgstr "취소"
+
+#: src/id3.c:335
+msgid "unknown ID3 field\n"
+msgstr "알 수 없는 ID3 필드\n"
+
+#: src/launch.c:121
+#, c-format
+msgid "Error: unable to translate filename. No such user as %s\n"
+msgstr "오류: 파일 이름 해석 불가. %s 이름을 가진 사용자 없음\n"
+
+#: src/launch.c:315
+msgid "Exec failed\n"
+msgstr "실행 실패\n"
+
+#: src/parsecfg.c:59
+msgid "Error: Bad entry type\n"
+msgstr "오류: 잘못된 항목 형식\n"
+
+#: src/parsecfg.c:82
+msgid "Error: Reading config file\n"
+msgstr "오류: 설정 파일 읽을 수 없음\n"
+
+#: src/parsecfg.c:88
+msgid "Error: Invalid config file\n"
+msgstr "오류: 유효하지 않은 설정 파일\n"
+
+#: src/rip.c:105
+msgid "Rip+Encode"
+msgstr "리핑+인코딩"
+
+#: src/rip.c:107
+msgid "Rip and encode selected tracks"
+msgstr "선택한 트랙을 리핑 및 인코딩"
+
+#: src/rip.c:113
+msgid "Rip Only"
+msgstr "리핑만 하기"
+
+#: src/rip.c:115
+msgid "Rip but do not encode selected tracks"
+msgstr "리핑은 하지만 트랙을 인코딩하지는 않음"
+
+#: src/rip.c:121
+msgid "Abort Rip and Encode"
+msgstr "리핑 및 인코딩 취소"
+
+#: src/rip.c:123
+msgid "Kill all active rip and encode processes"
+msgstr "현재 실행중인 리핑과 인코딩 작업 모두 강제 중지"
+
+#: src/rip.c:131
+msgid "Abort Ripping Only"
+msgstr "리핑만 취소"
+
+#: src/rip.c:133
+msgid "Kill rip process"
+msgstr "리핑 프로세스 강제종료"
+
+#: src/rip.c:139
+msgid "DDJ Scan"
+msgstr "DDJ 스캔"
+
+#: src/rip.c:141
+msgid "Insert disc information into the DigitalDJ database"
+msgstr "DigitalDJ 데이터베이스에 디스크 정보 삽입"
+
+#: src/rip.c:156
+msgid "Rip partial track"
+msgstr "부분 트랙 리핑"
+
+#: src/rip.c:167 src/tray.c:176
+msgid "Play"
+msgstr "재생"
+
+#: src/rip.c:174
+msgid "Current sector:      0"
+msgstr "현재 섹터:      0"
+
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
+msgid "Rip: Idle"
+msgstr "리핑: 대기중"
+
+#: src/rip.c:210
+msgid "Enc: Trk 99 (99.9x)"
+msgstr "인코딩: 트랙 99 (99.9x)"
+
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
+msgid "Enc: Idle"
+msgstr "인코딩: 대기중"
+
+#: src/rip.c:265
+msgid "Overall indicators:"
+msgstr "전체 상태:"
+
+#: src/rip.c:328
+msgid "Start sector"
+msgstr "시작 섹터"
+
+#: src/rip.c:333
+msgid "End sector"
+msgstr "끝나는 섹터"
+
+#: src/rip.c:600
+msgid "Error: can't open m3u file."
+msgstr "오류: m3u 파일을 열지 못함."
+
+#: src/rip.c:693
+msgid "In KillRip\n"
+msgstr "KillRip 진입\n"
+
+#: src/rip.c:720
+#, c-format
+msgid "Now total enc size is: %d\n"
+msgstr "현재 총 인코딩 크기: %d\n"
+
+#: src/rip.c:886
+#, c-format
+msgid "Rip: Trk %d (%3.1fx)"
+msgstr "리핑: 트랙 %d (%3.1fx)"
+
+#: src/rip.c:919
+#, c-format
+msgid "Rip: %6.2f%%"
+msgstr "리핑: %6.2f%%"
+
+#: src/rip.c:967
+#, c-format
+msgid "Rip partial %d  num wavs %d\n"
+msgstr "%d 부분 리핑  Wav 개수 %d\n"
+
+#: src/rip.c:970
+#, c-format
+msgid "Next track is %d, total is %d\n"
+msgstr "새 트랙은 %d번 이고 총 개수는 %d개 입니다.\n"
+
+#: src/rip.c:976
+msgid "Check if we need to rip another track\n"
+msgstr "다른 트랙도 인코딩 해야 하는지 확인\n"
+
+#: src/rip.c:1024
+#, c-format
+msgid "Enc: Trk %d (%3.1fx)"
+msgstr "인코딩: 트랙 %d (%3.1fx)"
+
+#: src/rip.c:1042
+#, c-format
+msgid "Enc: %6.2f%%"
+msgstr "인코딩: %6.2f%%"
+
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
+msgid "NoArtist"
+msgstr "아티스트 없음"
+
+#: src/rip.c:1272
+msgid "NoTitle"
+msgstr "제목없음"
+
+#: src/rip.c:1369
+msgid ""
+"No disc was detected in the drive. If you have a disc in your drive, please "
+"check your CDRom device setting under Config->CD."
+msgstr ""
+"드라이브에 CD가 감지되지 않았습니다. 드라이브에 CD가 들어있다면 설정->CD 에"
+"서 CD롬 장치 설정을 확인해주세요."
+
+#: src/rip.c:1384
+msgid ""
+"Invalid rip executable.\n"
+"Check your rip config, and ensure it specifies the full path to the ripper "
+"executable."
+msgstr ""
+"유효하지 않은 리핑 실행파일.\n"
+"리핑 설정을 열고 리퍼 실행파일이 전체 절대 경로로 지정되어 있는지 확인해주시"
+"기 바랍니다."
+
+#: src/rip.c:1395
+msgid ""
+"Invalid encoder executable.\n"
+"Check your encoder config, and ensure it specifies the full path to the "
+"encoder executable."
+msgstr ""
+"유효하지 않은 인코더 실행파일.\n"
+"인코더 설정을 열고 인코더 실행파일이 전체 절대 경로로 지정되었는지 확인해주시"
+"기 바랍니다."
+
+#: src/rip.c:1431
+msgid ""
+"No tracks selected.\n"
+"Rip whole CD?\n"
+msgstr ""
+"트랙이 선택되지 않았습니다.\n"
+"전체 CD를 리핑할까요?\n"
+
+#: src/rip.c:1457
+msgid "Ripping whole CD\n"
+msgstr "전체 CD 리핑\n"
+
+#: src/rip.c:1499
+msgid "In RipNextTrack\n"
+msgstr "RipNextTrack 진입\n"
+
+#: src/rip.c:1507
+#, c-format
+msgid "First checked track is %d\n"
+msgstr "처음으로 검사한 트랙은 %d입니다\n"
+
+#: src/rip.c:1517
+msgid "Ripping away!\n"
+msgstr "리핑 시작!\n"
+
+#: src/rip.c:1567
+msgid "No write access to write wav file"
+msgstr "Wav 파일을 쓰기 위한 쓰기 권한이 없음"
+
+#: src/rip.c:1583
+#, c-format
+msgid "Rip: Trk %d (0.0x)"
+msgstr "리핑: 트랙 %d (0.0x)"
+
+#: src/rip.c:1608 src/rip.c:1862
+msgid "Out of space in output directory"
+msgstr "출력 디렉토리에 남은 용량 없음"
+
+#: src/rip.c:1686
+msgid "Calling CDPRip\n"
+msgstr "CDPRip 호출중\n"
+
+#: src/rip.c:1767
+#, c-format
+msgid "Added track %d to %s list\n"
+msgstr "%d 트랙을 %s 리스트에 추가함\n"
+
+#: src/rip.c:1795
+msgid "No free cpus\n"
+msgstr "유휴 CPU 없음\n"
+
+#: src/rip.c:1811
+#, c-format
+msgid "Enc track %d\n"
+msgstr "트랙 %d 인코딩\n"
+
+#: src/rip.c:1837
+msgid "No write access to write encoded file."
+msgstr "인코딩된 파일을 쓰기 위한 쓰기 권한이 없습니다."
+
+#: src/rip.c:1851
+#, c-format
+msgid "Enc: Trk %d (0.0x)"
+msgstr "인코딩: 트랙 %d (0.0x)"
+
+#: src/rip.c:1918
+msgid "In CalculateAll\n"
+msgstr "CalculateAll 진입\n"
+
+#: src/rip.c:1924
+msgid "We aren't ripping now, so let's zero encoding values\n"
+msgstr "리핑중이 아니므로 인코딩 값을 0으로 설정합니다.\n"
+
+#: src/rip.c:1940
+#, c-format
+msgid "Total rip size is: %d\n"
+msgstr "총 리핑 크기: %d\n"
+
+#: src/rip.c:1941
+#, c-format
+msgid "Total enc size is: %d\n"
+msgstr "총 인코딩 크기: %d\n"
+
+#: src/tray.c:59
+msgid "Artist"
+msgstr "아티스트"
+
+#: src/tray.c:60
+msgid "Title"
+msgstr "제목"
+
+#: src/tray.c:85
+#, c-format
+msgid ""
+"%s - %s\n"
+"%02d:%02d of %02d:%02d"
+msgstr ""
+"%1$s - %2$s\n"
+"%5$02d:%6$02d 중 %3$02d:%4$02d"
+
+#: src/tray.c:89
+#, c-format
+msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
+msgstr "트랙 리핑 %02d:\t%6.2f%% (%6.2f%% )"
+
+#: src/tray.c:90
+#, c-format
+msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
+msgstr "트랙 인코딩 %02d:\t%6.2f%% (%6.2f%% )"
+
+#: src/tray.c:91
+#, c-format
+msgid ""
+"%s - %s\n"
+"%s%s%s"
+msgstr ""
+"%s - %s\n"
+"%s%s%s"
+
+#: src/tray.c:94
+#, c-format
+msgid ""
+"%s - %s\n"
+"Idle"
+msgstr ""
+"%s - %s\n"
+"대기중"
+
+#: src/tray.c:181
+msgid "Pause"
+msgstr "일시정지"
+
+#: src/tray.c:186
+msgid "Stop"
+msgstr "정지"
+
+#: src/tray.c:194
+msgid "Previous"
+msgstr "이전"
+
+#: src/tray.c:199
+msgid "Next"
+msgstr "다음"
+
+#: src/tray.c:207
+msgid "Rip and Encode"
+msgstr "리핑 및 인코딩"
+
+#: src/tray.c:214
+msgid "Quit"
+msgstr "나가기"
+
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "메인 윈도우의 크기를 지정"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "GEOMETRY"
+
+#~ msgid "Playing CDs"
+#~ msgstr "CD 재생하기"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "CD 리핑하기"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "Grip 설정"
+
+#~ msgid "FAQ"
+#~ msgstr "자주 묻는 질문"
+
+#~ msgid "Getting More Help"
+#~ msgstr "도움말 더 보기"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "버그 리포팅"
+
+#~ msgid "Grip started successfully\n"
+#~ msgstr "Grip이 성공적으로 시작됨\n"
+
+#~ msgid "Status"
+#~ msgstr "상태"
+
+#~ msgid "General"
+#~ msgstr "일반"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "디스크 %3$02x에 대해 %2$s를 통해 %1$s 질의중.\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "디스크 %2$02x에 대해 %1$s 질의중.\n"
+
+#~ msgid "No match\n"
+#~ msgstr "일치 결과 없음\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "\"%s / %s\" 일치\n"
+#~ "데이터 다운로드중...\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "디스크 꺼내기\n"
+
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "ddj 데이터베이스에 %d 트랙 삽입중\n"
+
+#~ msgid "Rip finished\n"
+#~ msgstr "리핑 완료\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "CPU %d에서 인코딩 완료\n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "[%s] 삭제\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "리핑 완료\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "트랙 %d를 %s에 리핑중\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "%s 는 이미 리핑되었습니다. 생략합니다...\n"
+
+#~ msgid "%i: Encoding to %s\n"
+#~ msgstr "%i: %s로 인코딩\n"

grip-4.1.1.tar.gz/po/meson.build Added

grip-4.1.1.tar.gz/po/nb.gmo Added

grip-3.10.1.tar.gz/po/nb.po -> grip-4.1.1.tar.gz/po/nb.po Changed

@@ -1,17 +1,17 @@
 # Norwegian Bokmal translations for the grip package.
-# Copyright (C) 2017 Johnny A. Solbu <johnny@solbu.net>
+# Copyright (C) 2020 Mike Oliphant and Johnny A. Solbu (msgids)
 # This file is distributed under the same license as the grip package.
-# Johnny A. Solbu <johnny@solbu.net>, 2017.
+# Johnny A. Solbu <johnny@solbu.net>, 2017 - 2020
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: grip 3.6.0\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
-"PO-Revision-Date: 2017-10-04 10:43+0200\n"
+"Project-Id-Version: grip 4.1.0\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
+"PO-Revision-Date: 2020-02-05 09:54+0100\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb_NO\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,47 +19,39 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.7.1\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "Angi hovedvinduets geometri"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "GEOMETRI"
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr "Angi konfigurasjonsfilen som skal brukes (i hjemmekatalogen din)"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr "INNSTILLINGER"
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "Angi hvilken cdrom-enhet som skal brukes"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "ENHET"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "Angi hvilken generisk scsi-enhet som skal brukes"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "Start i «liten» modus (kun cd)"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr "«Lokal» modus – ikke let opp plateinfo på internett"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "Ikke omdiriger I/O"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "Kjør i detaljert modus (feilsøking)"
 
@@ -67,16 +59,12 @@
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "Feil: Kan ikke initialisere [%s]\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr "Grip startet med hell\n"
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
@@ -84,73 +72,36 @@
 "Arbeid pågår.\n"
 "Virkelig slå av?"
 
-#: src/grip.c:401
-msgid "Status"
-msgstr "Status"
-
-#: src/grip.c:416
-msgid "General"
-msgstr "Generelt"
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "Ripp"
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
-msgstr "Omkode"
+#: src/grip.c:380
+msgid "Unable to open help file"
+msgstr "Kunne ikke åpne hjelpefilen"
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "Innholdsfortegnelse"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "Spille CD-er"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "Rippe CD-er"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "Konfigurere Grip"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "FAQ"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "Finne mer hjelp"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "Rapportere feil"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "Om"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr "Versjon %s"
 
-#: src/grip.c:641
+#: src/grip.c:505
 msgid "Error: Trying to show homepage failed."
 msgstr "Feil: Kunne ikke åpne hjemmesiden."
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr "Laget med Grip"
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -160,348 +111,356 @@
 "Du trenger å rekonfigurere Grip.\n"
 "Din gamle konfigurasjonfil er lagret med «-old» lagt til."
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "tjener er %s, port %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 msgid "Error: Unable to save config file."
 msgstr "Feil: Kan ikke lagre konfigurasjonsfilen."
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "Innstillinger"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "CDrom-enhet"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Ikke avbryt avspilling ved avslutting/oppstart"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "Spol tilbake når stanset"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "Start med første spor hvis det ikke spiller av"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "Autoavspill plater ved innsettelse"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "Endre rekkefølgen før hver avspilling"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr "Omgå defekt utløser"
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr "Sjekk stasjonen for ny plate"
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr "Sjekk-intervall"
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "Ripper:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "Rippe-program"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "Rippe-kommandolinje"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "Slå av paranoia"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "Slå av ekstra paranoia"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "Deaktiver riper"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "oppdagelse"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "reparasjon"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr "Beregn forsterkningsjustering"
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "Rippeformat"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 msgid "Rip file format (Multi-artist)"
 msgstr "Rippe-filformat (Multi-artist)"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "Generisk SCSI-enhet"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "Ripper"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "Ripp «nice»-verdi"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "Maksimum ikkekodede .wav-filer"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "Autorippe plater ved innsettelse"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "Bip etter ripping"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "Auto-løs ut etter ripping"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "Auto-løs utforsinkelse"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr "Forsinkelse før ripping"
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr "Utsett koding til platen er rippet"
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr "Stans cdrom-enheten mellom sporene"
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "Wav-filterkommando"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "Plate-filterkommando"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "Innstillinger"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "Ripp"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "Koder:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr "Kjørbar enkoderfil"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr "Enkoder-kommandolinje"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 msgid "Encoder file extension"
 msgstr "Enkoder-filetternavn"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 msgid "Encoder file format"
 msgstr "Enkoder-filformat"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 msgid "Encode file format (Multi-artist)"
 msgstr "Enkoder-filformat (Multi-artist)"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "Koder"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr "Slett .wav etter omkoding"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "Sett inn i SQL-database"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr "Lag .m3u-filer"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "Bruk relative stier i .m3u-filer"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "M3U-filformat"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Bitrate for koding (kbits/sek)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "Antall CPU-er som skal brukes"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 msgid "Encoder 'nice' value"
 msgstr "Omkoder «nice»-verdi"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 msgid "Encoder filter command"
 msgstr "Enkoder-filterkommando"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 msgid "Execute command after encode"
 msgstr "Kjør kommando etter koding"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "Omkode"
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr "Legg til ID3-tagger i kodede filer."
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Legg til ID3v2-tagger i kodede filer."
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr "Kun tagg filer som slutter på «.mp3»"
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "ID3 kommentarfelt"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr "ID3v1 tegnsett"
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 msgid "ID3v2 Character set encoding"
 msgstr "ID3v2 tegnsett"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "DB-server"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "CGI-sti"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "Hovedserver"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "Sekundærserver"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr "DB Send e-post"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 msgid "DB Character set encoding"
 msgstr "DB tegnsett"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "Bruk freedb-utvidelser"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "Utfør plateoppslag automatisk"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "DiskDB"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "Bruk proxy-tjener"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Hent server fra miljøvariabelen «http_proxy»"
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "Proxy-tjener"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "Proxy-port"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "Proxy-brukernavn"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "Proxy-passord"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "E-postadresse"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "CD-oppdateringsprogram"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "Ikke endre til små bokstaver i filnavn"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr "Tillat høye bit-er i filnavn"
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr "Erstatt inkompatible tegn med heksadesimale tall"
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "Ikke endre mellomrom i filnavn"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr "Skriv M3U-filer ved bruk av ikke-POSIX-kompatible «\\»"
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -509,19 +468,19 @@
 "Tegn som ikke skal\n"
 "strippes i filnavn"
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr "Vis systemkurvikon"
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "Diverse"
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 msgid "Error: Unable to save ripper config."
 msgstr "Feil: Kan ikke lagre rippe-oppsett."
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 msgid "Error: Unable to save encoder config."
 msgstr "Feil: Kan ikke lagre omkodingsoppsett."
 
@@ -559,7 +518,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr "Kan ikke gjøre oppslag under ripping"
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "Ukjent plate"
@@ -569,219 +527,192 @@
 msgid "Track %02d"
 msgstr "Spor %02d"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "Søker %s (gjennom %s) etter plate %02x.\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "Søker %s etter plate %02x.\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "Ingen treff\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"Treff for \"%s / %s\"\n"
-"Laster ned data…\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "Utført\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "Feil ved lagring av data\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 msgid "Length"
 msgstr "Lengde"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "Spor"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr "Velg forrige CDDB-oppføring."
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr "Velg neste CDDB-oppføring."
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "Spor"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr "DoNextDiscDBEntry.\n"
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
 msgstr "Ingen platedata. Returnerer.\n"
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
 msgstr "Allerede ved siste plate-indeks. Returnerer.\n"
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 msgid "Done.\n"
 msgstr "Ferdig.\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
 msgstr "DoPrevDiscDBEntry.\n"
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
 msgstr "Allerede ved første plate-indeks. Returnerer.\n"
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 msgid "Error saving disc data."
 msgstr "Feil ved lagring av platedata"
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "Roter spillemodus"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "inverter loop-spilling"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "Rippestatus"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "Spill spor / Pause avspilling"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "Spol tilbake"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "Spol fremover"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "Gå til forrige spor"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "Gå til neste spor"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "Inverter spillemodusvalg"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "Neste plate"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "Stopp avspilling"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "Løs ut plate"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr "Skann plateinnhold"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "Veksle volumkontroll"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "Inverter plateredigerer"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Start/avbryt DiskDB-oppslag"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "Veksle sporvisning"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Avslutt Grip"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 msgid "Cannot fast forward while ripping."
 msgstr "Kan ikke spole frem under ripping."
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 msgid "Cannot rewind while ripping."
 msgstr "Kan ikke spole tilbake under ripping."
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 msgid "Cannot switch discs while ripping."
 msgstr "Kan ikke bytte plater under ripping."
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "Løs ut plate\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 msgid "Cannot eject while ripping."
 msgstr "Kan ikke løse ut under ripping."
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr "Har plate – løser ut\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 msgid "Cannot play while ripping."
 msgstr "Kan ikke spille av under ripping."
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 msgid "Cannot switch tracks while ripping."
 msgstr "Kan ikke bytte spor under ripping."
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "Ser etter ny plate\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat fant en ny plate, sjekker spor\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "Vi har en gyldig plate!\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "Ingen ikke-null-lengde spor\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "CDStat sa ingen plate\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Gjeldende sektor: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "Ingen plate"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -793,24 +724,36 @@
 "\n"
 "Ønsker du å sende inn denne plateinformasjonen? "
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 msgid "Error: Unable to create temporary file."
 msgstr "Feil: Kan ikke opprette midlertidig fil."
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 msgid "Error: Unable to write disc data."
 msgstr "Feil: Kan ikke skrive platedata."
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Mailer oppføringen til %s\n"
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 msgid "Error: Unable to execute mail command."
 msgstr "Feil: Kunne ikke kjøre e-postkommandoen."
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr "Advarsel"
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr "Informasjon"
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr "Spørsmål"
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "Systemmelding"
 
@@ -844,79 +787,79 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Feil: kunne ikke åpne %s for skriving\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "Disktittel"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "Spornavn"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr "W"
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "Disk-artist"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "ID3-sjanger"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "Disk-år"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "Spornavn"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "Spor-artist"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr "W"
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "Splitt:"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "Tittel/Artist"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "Artist/Tittel"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr "Splittegn"
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "Multi-artist"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "lagre plateinformasjon"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "Send inn plateinformasjon"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 msgid "No disc present."
 msgstr "Ingen plate tilstede."
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 msgid "Cannot submit. No disc is present."
 msgstr "Kan ikke sende inn: Ingen plate tilstede."
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 msgid "You must enter a disc title."
 msgstr "Du må angi en platetittel."
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 msgid "You must enter a disc artist."
 msgstr "Du må angi en plateartist."
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -934,7 +877,7 @@
 "\n"
 "Fortsette?"
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -946,11 +889,11 @@
 "\n"
 "Fortsette?"
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "Sjangervalg"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -958,19 +901,18 @@
 "Innlevering krever en sjanger annet enn «unknown»\n"
 "Velg DiscDB-sjangeren nedenfor"
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "DiscDB-sjanger"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "Send inn"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "Avbryt"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "ukjent ID3-felt\n"
@@ -980,178 +922,155 @@
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr "Feil: Kan ikke oversette filnavn. Ingen slik bruker som %s\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "Kjøring feilet\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "Feil: dårlig oppføringstype \n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 msgid "Error: Reading config file\n"
 msgstr "Feil ved lesing av konfigfilen\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "Feil: ugyldig konfigurasjonsfil\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "Ripp+Omkode"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "Rippe og omkode valgte spor"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "Kun ripping"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "Rippe men ikke omkode valgte spor"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr "Avbryt ripping og omkoding"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "Drep alle aktive rippe-, og omkodingsprosesser"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "Avbryt kun ripping"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "Drep rippeprosessen"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "DDJ-skanning"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "Sett inn plateinformasjonen i DigitalDJ-databasen"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "Rip delvis spor"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "Spill av"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "Gjeldende sektor:      0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "Rip: inaktiv"
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Koding: spor 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
 msgstr "Koding: inaktiv"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr "Total-indikatorer:"
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "Startsektor"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "Sluttsektor"
 
-#: src/rip.c:384
-#, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "Setter inn sporet %d i ddj-databasen\n"
-
-#: src/rip.c:609
+#: src/rip.c:600
 msgid "Error: can't open m3u file."
 msgstr "Feil: kan ikke åpne m3u-fil."
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr "I KillRip\n"
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr "Totalt omkodingsstørrelse er nå: %d\n"
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "Ripp: Spor %d (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr "Ripp: %6.2f%%"
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "Ripping avsluttet\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr "Ripp delvis %d  antall wav-filer %d\n"
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "Neste spor er %d, totalt er %d\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "Sjekk om vi trenger å rippe enda et spor\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "Kode: Spor %d (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr "Kode: %6.2f%%"
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "Ferdig med koding på cpu %d\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "Sletter [%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "Rippingen er ferdig\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "Ingen Artist"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "Ingen Tittel"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1159,7 +1078,7 @@
 "Ingen plate ble påvist i stasjonen. Hvis du har en plate i stasjonen kan du "
 "sjekke cdrom-enhetinnstillingen under Innstillinger-> CD."
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1169,7 +1088,7 @@
 "Sjekk ripp-konfigurasjonen og sørg for at den angir den fullstendige banen "
 "til rippekommandofilen."
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1179,7 +1098,7 @@
 "Sjekk omkodings-konfigurasjonen og sørg for at den angir den fullstendige "
 "banen til kodekommandofilen."
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1187,105 +1106,90 @@
 "Ingen spor valg.\n"
 "Ripp hele CD-en?\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "Ripper hele CD-en\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr "I RipNextTrack\n"
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Første kontrollerte spor er %d\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr "Ripper i vei!\n"
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "Ingen skrivetilgang for å lagre wav-fil"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "Ripper spor %d til %s\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Ripp: Spor %d (0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "Filen %s er allerede rippet. Hopper over…\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "Tomfor plass i lagringskatalogen"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "Kaller CDPRip\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "La til spor %d i %ss liste\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "Ingen ledige cpu-er\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Kode spor %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 msgid "No write access to write encoded file."
 msgstr "Ingen skrivetilgang for å lagre enkodet fil."
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i: Enkoder til %s\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Kode: Spor %d (0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr "I CalculateAll\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr "Vi ripper ikke nå, så la oss nulle ut kodingsverdier\n"
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Total rippestørrelse er: %d\n"
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Total enkodingsstørrelse er: %d\n"
 
-#: src/tray.c:57
+#: src/tray.c:59
 msgid "Artist"
 msgstr "Artist"
 
-#: src/tray.c:58
+#: src/tray.c:60
 msgid "Title"
 msgstr "Tittel"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1294,17 +1198,17 @@
 "%s - %s\n"
 "%02d:%02d av %02d:%02d"
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Ripper Spor %02d:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Koder Spor %02d:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1313,7 +1217,7 @@
 "%s - %s\n"
 "%s%s%s"
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1322,26 +1226,102 @@
 "%s - %s\n"
 "inaktiv"
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr "Pause"
 
-#: src/tray.c:196
+#: src/tray.c:186
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr "Forige"
 
-#: src/tray.c:209
+#: src/tray.c:199
 msgid "Next"
 msgstr "Neste"
 
-#: src/tray.c:217
+#: src/tray.c:207
 msgid "Rip and Encode"
 msgstr "Rippe og omkode"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr "Avslutt"
+
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "Angi hovedvinduets geometri"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "GEOMETRI"
+
+#~ msgid "Grip started successfully\n"
+#~ msgstr "Grip startet med hell\n"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "General"
+#~ msgstr "Generelt"
+
+#~ msgid "Playing CDs"
+#~ msgstr "Spille CD-er"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "Rippe CD-er"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "Konfigurere Grip"
+
+#~ msgid "FAQ"
+#~ msgstr "FAQ"
+
+#~ msgid "Getting More Help"
+#~ msgstr "Finne mer hjelp"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "Rapportere feil"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "Søker %s (gjennom %s) etter plate %02x.\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "Søker %s etter plate %02x.\n"
+
+#~ msgid "No match\n"
+#~ msgstr "Ingen treff\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "Treff for \"%s / %s\"\n"
+#~ "Laster ned data…\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "Løs ut plate\n"
+
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "Setter inn sporet %d i ddj-databasen\n"
+
+#~ msgid "Rip finished\n"
+#~ msgstr "Ripping avsluttet\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "Ferdig med koding på cpu %d\n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "Sletter [%s]\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "Rippingen er ferdig\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "Ripper spor %d til %s\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "Filen %s er allerede rippet. Hopper over…\n"
+
+#~ msgid "%i: Encoding to %s\n"
+#~ msgstr "%i: Enkoder til %s\n"

grip-4.1.1.tar.gz/po/nl.gmo Added

grip-3.10.1.tar.gz/po/nl.po -> grip-4.1.1.tar.gz/po/nl.po Changed

@@ -1,15 +1,17 @@
 # Dutch translations for Grip.
 # This file is distributed under the same license as the grip package.
 #
+# “Diese Einsamkeit -- keine Bananen!”
+#
 # Sander Brabander <sanderfox@quicknet.nl>, 2004.
-# Benno Schulenberg <benno@vertaalt.nl>, 2017.
+# Benno Schulenberg <benno@vertaalt.nl>, 2017, 2019, 2020.
 msgid ""
 msgstr ""
-"Project-Id-Version: grip 3.4.0\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
-"PO-Revision-Date: 2017-04-18 16:09+0100\n"
-"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
+"Project-Id-Version: grip 4.1.0\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
+"PO-Revision-Date: 2020-02-06 16:28+0100\n"
+"Last-Translator: Benno Schulenberg <vertaling@coevern.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
@@ -18,47 +20,39 @@
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "de afmetingen voor het hoofdvenster"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "AFMETINGEN"
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr "het te gebruiken configuratiebestand (in uw thuismap)"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr "CONFBESTAND"
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "het te gebruiken CDRom-apparaat"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "APPARAAT"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "het te gebruiken algemene SCSI-apparaat"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "In \"kleine\" modus starten (alleen CD)"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr "\"Locale\" modus -- geen schijfinfo op het internet opzoeken"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "Geen I/O-omleiding gebruiken"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "In breedsprakige modus draaien (debug)"
 
@@ -66,91 +60,49 @@
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "Fout: kan [%s] niet initialiseren\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr "Grip is met succes gestart\n"
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
 msgstr ""
-"Werk is in uitvoering.\n"
+"Er is werk in uitvoering.\n"
 "Weet u zeker dat u wilt afsluiten?"
 
-#: src/grip.c:401
-msgid "Status"
-msgstr "Status"
-
-#: src/grip.c:416
-msgid "General"
-msgstr "Algemeen"
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "Rippen"
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
-msgstr "Coderen"
+#: src/grip.c:380
+msgid "Unable to open help file"
+msgstr "Kan hulpbestand niet openen"
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "Hulp"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "Inhoudsopgave"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "CD's afspelen"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "CD's rippen"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "Grip configureren"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "FAQ"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "Meer hulp verkrijgen"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "Bugs rapporteren"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "Over"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr "Versie %s"
 
-#: src/grip.c:641
-#, fuzzy
+#: src/grip.c:505
 msgid "Error: Trying to show homepage failed."
-msgstr "Fout: kan configuratiebestand niet opslaan"
+msgstr "Fout: kan de webpagina niet tonen."
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr "Gemaakt door Grip"
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -160,350 +112,356 @@
 "U zult Grip opnieuw moeten instellen.\n"
 "Uw oude configuratiebestand is opgeslagen met '-old' eraan toegevoegd."
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "server is %s, poort %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 msgid "Error: Unable to save config file."
 msgstr "Fout: kan configuratiebestand niet opslaan"
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "Configuratie"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "CDRom-apparaat"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Afspelen niet onderbreken bij afsluiten/opstarten"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "Terugspoelen wanneer gestopt"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "Starten met het eerste nummer als er niets speelt"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "Auto-afspelen bij invoegen van een CD"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "Opnieuw husselen vóór elke keer afspelen"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr "Om gebrekkige uitwerping heenwerken"
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr "CD-speler polsen voor nieuwe CD"
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr "Polsinterval (seconden)"
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "Ripper:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "Rip-programmabestand"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "Rip-opdrachtregel"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "Paranoia uitschakelen"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "Extra paranoia uitschakelen"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "Scratch uitschakelen"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "detectie"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "herstel"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr "Gain-aanpassing berekenen"
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "Rip-bestandsindeling"
 
-#: src/gripcfg.c:275
-#, fuzzy
+#: src/gripcfg.c:264
 msgid "Rip file format (Multi-artist)"
-msgstr "Rip-bestandsindeling"
+msgstr "Rip-bestandsindeling (multi-artiest)"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "Algemeen SCSI-apparaat"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "Ripper"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "Rip-beleefdheidswaarde"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "Max niet-gecodeerde .wav's"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "Auto-rippen bij invoeren"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "Piepen na het rippen"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "Auto-uitwerpen na het rippen"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "Auto-uitwerpvertraging"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr "Vertraging voor het rippen"
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr "Coderen uitstellen totdat de schijf geript is"
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr "CD-speler stoppen tussen de nummers"
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "Wav-filteropdracht"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "Schijf-filteropdracht"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "Opties"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "Rippen"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "Encoder:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr "Encoder-programmabestand"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr "Encoder-opdrachtregel"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 msgid "Encoder file extension"
 msgstr "Bestandsextensie voor codering"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 msgid "Encoder file format"
 msgstr "Bestandsindeling voor codering"
 
-#: src/gripcfg.c:438
-#, fuzzy
+#: src/gripcfg.c:427
 msgid "Encode file format (Multi-artist)"
-msgstr "Bestandsindeling voor codering"
+msgstr "Bestandsindeling voor codering (multi-artiest)"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "Coderingsprogramma"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr ".wav na het coderen verwijderen"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "Informatie aan SQL-database toevoegen"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr ".m3u-bestanden aanmaken"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "Relatieve paden gebruiken in .m3u-bestanden"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "M3U-bestandsindeling"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Coderings-bitrate (kbit/sec)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "Aantal te gebruiken CPU's"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 msgid "Encoder 'nice' value"
 msgstr "Encoder-beleefdheidswaarde"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 msgid "Encoder filter command"
 msgstr "Encoder-filteropdracht"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 msgid "Execute command after encode"
 msgstr "Opdracht uitvoeren na het coderen"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "Coderen"
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr "ID3-tags toevoegen aan gecodeerde bestanden"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr "ID3v2-tags toevoegen aan gecodeerde bestanden"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr "Alleen bestanden die eindigen op '.mp3' taggen"
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "ID3-commentaarveld"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr "ID3v1-tekensetcodering"
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 msgid "ID3v2 Character set encoding"
 msgstr "ID3v2-tekensetcodering"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "DB-server"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "CGI-pad"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "Primaire server"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "Secundaire server"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr "DB-e-mail verzenden"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 msgid "DB Character set encoding"
 msgstr "DB-tekensetcodering"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "Freedb-extensies gebruiken"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "Schijven automatisch opzoeken"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "Proxy-server gebruiken"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Server uit 'http_proxy'-omgevingsvariabele halen"
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "Proxy-server"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "Proxy-poort"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "Proxy-gebruikersnaam"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "Proxy-wachtwoord"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "E-mailadres"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "CD-update-programma"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "Bestandsnamen niet in kleine letters omzetten"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr "Hoge bits in bestandsnamen toestaan"
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr "Incompatibele tekens vervangen door hexadecimale getallen"
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "Spaties niet vervangen door liggende streepjes"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr "m3u-bestanden schrijven met niet-Posix '\\'"
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -511,19 +469,19 @@
 "Tekens om niet te strippen\n"
 "in bestandsnamen"
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr "Systeemvakpictogram tonen"
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "Diversen"
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 msgid "Error: Unable to save ripper config."
 msgstr "Fout: kan ripper-configuratie niet opslaan."
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 msgid "Error: Unable to save encoder config."
 msgstr "Fout: kan encoder-configuratie niet opslaan."
 
@@ -563,7 +521,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr "Kan niet opzoeken tijdens het rippen."
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "Onbekende schijf"
@@ -573,220 +530,192 @@
 msgid "Track %02d"
 msgstr "Nummer %02d"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "Opvragen van %s (door %s) voor schijf %02x.\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "Opvragen van %s voor schijf %02x.\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "Geen overeenkomst\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"Overeenkomst voor \"%s / %s\"\n"
-"Gegevens aan het downloaden...\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "Klaar\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "Fout bij het opslaan van schijfgegevens\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 msgid "Length"
 msgstr "Lengte"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "Nummers"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
-msgstr ""
+msgstr "Vorige CDDB-item selecteren."
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
-msgstr ""
+msgstr "Volgende CDDB-item selecteren."
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "Nummer"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
-msgstr ""
+msgstr "VolgendDiscDBItem.\n"
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
-msgstr ""
+msgstr "Geen disc-gegevens.  Terugkerend.\n"
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
-msgstr ""
+msgstr "Al op laatste index.  Terugkerend.\n"
 
-#: src/cdplay.c:472 src/cdplay.c:499
-#, fuzzy
+#: src/cdplay.c:458 src/cdplay.c:485
 msgid "Done.\n"
-msgstr "Klaar\n"
+msgstr "Klaar.\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
-msgstr ""
+msgstr "VorigDiscDBItem.\n"
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
-msgstr ""
+msgstr "Al op eerste index.  Terugkerend.\n"
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 msgid "Error saving disc data."
 msgstr "Fout tijdens het opslaan van schijfgegevens."
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "Afspeelmodus roteren"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "Lus-afspelen omschakelen"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "Rip-status"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "Afspelen / Pauzeren"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "Terugspoelen"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "Snelvooruit"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "Naar voorgaande nummer"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "Naar volgende nummer"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "Afspeelmodusopties omschakelen"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "Volgende schijf"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "Stoppen met afspelen"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "Schijf uitwerpen"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr "Schijfinhoud scannen"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "Volumeregelaar omschakelen"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "Schijfbewerker omschakelen"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Opzoeken in DiscDB starten/afbreken"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "Nummervenster omschakelen"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Grip afsluiten"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 msgid "Cannot fast forward while ripping."
 msgstr "Kan niet vooruitspoelen tijdens het rippen."
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 msgid "Cannot rewind while ripping."
 msgstr "Kan niet terugspoelen tijdens het rippen."
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 msgid "Cannot switch discs while ripping."
 msgstr "Kan niet van schijf wisselen tijdens het rippen."
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "Schijf uitwerpen\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 msgid "Cannot eject while ripping."
 msgstr "Kan niet uitwerpen tijdens het rippen."
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr "Heb de schijf -- bezig met uitwerpen\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 msgid "Cannot play while ripping."
 msgstr "Kan niet afspelen tijdens het rippen."
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 msgid "Cannot switch tracks while ripping."
 msgstr "Kan niet van nummer wisselen tijdens het rippen."
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "Controleren op een nieuwe schijf\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat heeft een schijf gevonden, bezig met checken van nummers\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "We hebben een geldige schijf!\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "Geen nummers met een niet-nul lengte\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "CDStat gaf aan dat er geen schijf is\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Huidige sector: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "Geen schijf"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -798,25 +727,36 @@
 "\n"
 "Wilt u deze schijfinformatie verzenden?"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 msgid "Error: Unable to create temporary file."
 msgstr "Fout: kan geen tijdelijk bestand aanmaken."
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 msgid "Error: Unable to write disc data."
 msgstr "Fout: kan schijfgegevens niet schrijven"
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Item wordt gemaild naar %s\n"
 
-#: src/cdplay.c:2055
-#, fuzzy
+#: src/cdplay.c:2037
 msgid "Error: Unable to execute mail command."
-msgstr "Fout: kan encoder-configuratie niet opslaan."
+msgstr "Fout: kan mail-commando niet uitvoeren."
+
+#: src/dialog.c:39
+msgid "Warning"
+msgstr "Waarschuwing"
 
-#: src/dialog.c:44
+#: src/dialog.c:43
+msgid "Information"
+msgstr "Informatie"
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr "Vraag"
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "Systeemmelding"
 
@@ -850,81 +790,81 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Fout: kan %s niet openen om te schrijven\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "Schijftitel"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "Titel"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr "W"
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "Schijfartiest"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "ID3-genre:"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "Schijfjaar"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "Titel"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "Artiest"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr "W"
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "Splitsen:"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "Titel/Artiest"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "Artiest/Titel"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr "Splitstekens"
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "Multi-artiest"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "Schijfinfo opslaan"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "Schijfinfo verzenden"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 msgid "No disc present."
 msgstr "Geen schijf aanwezig."
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 msgid "Cannot submit. No disc is present."
 msgstr ""
 "Kan niet verzenden.\n"
 "Geen schijf aanwezig."
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 msgid "You must enter a disc title."
 msgstr "U moet een schijftitel invoeren."
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 msgid "You must enter a disc artist."
 msgstr "U moet een artiestnaam invoeren."
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -942,7 +882,7 @@
 "\n"
 "Doorgaan?"
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -954,11 +894,11 @@
 "\n"
 "Doorgaan?"
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "Genre-selectie"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -966,19 +906,18 @@
 "Verzending vraagt om een genre anders dan 'onbekend'.\n"
 "Selecteer alstublieft hieronder een DiscDB-genre."
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "DiscDB-genre"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "Verzenden"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "Annuleren"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "onbekend ID3-veld\n"
@@ -988,179 +927,155 @@
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr "Fout: kan bestandsnaam niet vertalen.  Gebruiker %s bestaat niet.\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "Uitvoering is mislukt\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "Fout: onjuist item-type\n"
 
-#: src/parsecfg.c:81
-#, fuzzy
+#: src/parsecfg.c:82
 msgid "Error: Reading config file\n"
-msgstr "Fout: ongeldig configuratiebestand\n"
+msgstr "Fout: lezen van configuratiebestand\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "Fout: ongeldig configuratiebestand\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "Rippen+Coderen"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "Rippen en geselecteerde nummers coderen"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "Alleen rippen"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "Rippen maar geselecteerde nummers niet coderen"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr "Rippen en coderen afbreken"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "Alle actieve rip- en codeerprocessen beëindigen"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "Alleen het rippen afbreken"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "Rip-proces beëindigen"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "DDJ Scan"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "Schijfinformatie toevoegen aan de DigitalDJ-database"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "Gedeelte van nummer rippen"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "Afspelen"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "Huidige sector:      0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "Rip: inactief"
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Cod: Nr 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
 msgstr "Cod: inactief"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr "Overzichtsindicatoren:"
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "Startsector"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "Eindsector"
 
-#: src/rip.c:384
-#, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "Toevoegen van nummer %d aan de DDJ-database\n"
-
-#: src/rip.c:609
+#: src/rip.c:600
 msgid "Error: can't open m3u file."
 msgstr "Fout: kan m3u-bestand niet openen."
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr "in KillRip\n"
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr "Totale gecodeerde grootte is: %d\n"
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "Rip: Nr %d (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr "Rip: %6.2f%%"
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "Rippen is voltooid\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr "Rippen, gedeelte %d, aantal wavs %d\n"
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "Volgende nummer is %d, totaal is %d\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "Controleren of we een ander nummer moeten rippen\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "Cod: Nr %d (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr "Cod: %6.2f%%"
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "Klaar met coderen op CPU %d\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "Verwijderen van [%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "Rippen is voltooid\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "GeenArtiest"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "GeenTitel"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1168,7 +1083,7 @@
 "Geen schijf gedetecteerd in het station.  Als er toch een schijf in de "
 "speler zit, controleer dan de apparaatinstellingen onder Config->CD."
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1178,7 +1093,7 @@
 "Controleer uw rip-instellingen, en of het volledige pad naar het uitvoerbare "
 "bestand van de ripper gegeven is."
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1188,7 +1103,7 @@
 "Controleer uw encoder-instellingen, en of het volledige pad naar het "
 "uitvoerbare bestand van de encoder gegeven is."
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1196,106 +1111,91 @@
 "Geen nummers geselecteerd.\n"
 "Hele CD rippen?\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "Rippen van hele CD\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr "in RipNextTrack\n"
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Eerste gecheckte nummer is %d\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr "Bezig met rippen!\n"
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "Geen schrijftoegang om wav-bestand te schrijven"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "Rippen van nummer %d naar %s\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Rip: Nr %d (0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "Bestand %s is al geript.  Wordt overgeslagen...\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "Er is geen ruimte meer in de uitvoermap"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "Aanroepen van CDPRip\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Nummer %d is toegevoegd aan %s-lijst\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "Geen vrije CPU's\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Coderen van nummer %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 msgid "No write access to write encoded file."
 msgstr "Geen schrijftoegang om gecodeerd bestand te schrijven"
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i: Coderen naar %s\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Cod: Nr %d (0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr "in CalculateAll\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 "We rippen nu niet, dus laten zetten we coderingswaarden op nul zetten\n"
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Totale rip-grootte is: %d\n"
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Totale gecodeerde grootte is: %d\n"
 
-#: src/tray.c:57
+#: src/tray.c:59
 msgid "Artist"
 msgstr "Artiest"
 
-#: src/tray.c:58
+#: src/tray.c:60
 msgid "Title"
 msgstr "Titel"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1304,17 +1204,17 @@
 "%s - %s\n"
 "%02d:%02d van %02d:%02d"
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Rippen van nummer  %02d:\t%6.2f%% (%6.2f%%)"
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Coderen van nummer %02d:\t%6.2f%% (%6.2f%%)"
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1323,7 +1223,7 @@
 "%s - %s\n"
 "%s%s%s"
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1332,26 +1232,99 @@
 "%s - %s\n"
 "inactief"
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr "Pauzeren"
 
-#: src/tray.c:196
+#: src/tray.c:186
 msgid "Stop"
 msgstr "Stoppen"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr "Vorige"
 
-#: src/tray.c:209
+#: src/tray.c:199
 msgid "Next"
 msgstr "Volgende"
 
-#: src/tray.c:217
+#: src/tray.c:207
 msgid "Rip and Encode"
 msgstr "Rippen en coderen"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr "Afsluiten"
+
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "de afmetingen voor het hoofdvenster"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "AFMETINGEN"
+
+#~ msgid "Playing CDs"
+#~ msgstr "CD's afspelen"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "CD's rippen"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "Grip configureren"
+
+#~ msgid "FAQ"
+#~ msgstr "FAQ"
+
+#~ msgid "Getting More Help"
+#~ msgstr "Meer hulp verkrijgen"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "Bugs rapporteren"
+
+#~ msgid "Grip started successfully\n"
+#~ msgstr "Grip is met succes gestart\n"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "General"
+#~ msgstr "Algemeen"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "Opvragen van %s (door %s) voor schijf %02x.\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "Opvragen van %s voor schijf %02x.\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "Overeenkomst voor \"%s / %s\"\n"
+#~ "Gegevens aan het downloaden...\n"
+
+#~ msgid "No match\n"
+#~ msgstr "Geen overeenkomst\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "Schijf uitwerpen\n"
+
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "Toevoegen van nummer %d aan de DDJ-database\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "Klaar met coderen op CPU %d\n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "Verwijderen van [%s]\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "Rippen is voltooid\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "Rippen van nummer %d naar %s\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "Bestand %s is al geript.  Wordt overgeslagen...\n"
+
+#~ msgid "%i: Encoding to %s\n"
+#~ msgstr "%i: Coderen naar %s\n"

grip-4.1.1.tar.gz/po/pl.gmo Added

grip-3.10.1.tar.gz/po/pl.po -> grip-4.1.1.tar.gz/po/pl.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grip.old\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
 "PO-Revision-Date: 2005-03-10 11:22+0200\n"
 "Last-Translator: Piotr Adamocha <piotr@adamocha.net>\n"
 "Language-Team: Poland\n"
@@ -16,47 +16,39 @@
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "Okre¶l wymiary g³ównego okna"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "WYMIARY"
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr "Okre¶l plik konfiguracyjny do u¿ycia (w Twoim katalogu domowym)"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr "KONFIGURACJA"
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "Okre¶l napêd CD do u¿ycia"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "URZ¡DZENIE"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "Okre¶l standardowe urz±dzenie scsi do u¿ycia"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "Uruchom w trybie zminimalizowanym (tylko cd)"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr "Tryb \"lokalny\" -- nie sprawdzaj danych o p³ycie w internecie"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "Nie u¿ywaj przekierowania I/O"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "Uruchom w trybie debugowania"
 
@@ -64,16 +56,12 @@
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "B³±d: Nie mo¿na zainicjalizowaæ [%s]\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr "Uruchomienie Grip'a zakoñczy³o siê sukcesem\n"
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
@@ -81,74 +69,39 @@
 "Program pracuje.\n"
 "Czy na pewno chcesz zakoñczyæ?"
 
-#: src/grip.c:401
-msgid "Status"
-msgstr "Status"
-
-#: src/grip.c:416
-msgid "General"
-msgstr "G³ówny"
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "Ripuj"
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
-msgstr "Zakoduj"
+#: src/grip.c:380
+#, fuzzy
+#| msgid "Error: Unable to create temporary file."
+msgid "Unable to open help file"
+msgstr "B³±d: Nie mo¿na stworzyæ pliku tymczasowego."
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "Zawarto¶æ"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "Odgrywanie p³yt CD"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "Ripowanie p³yt CD"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "Konfiguracja Grip'a"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "FAQ"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "Wiêcej pomocy"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "Zg³aszanie b³êdów"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "O programie"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr "Wersja %s"
 
-#: src/grip.c:641
+#: src/grip.c:505
 #, fuzzy
 msgid "Error: Trying to show homepage failed."
 msgstr "B³±d: Nie mo¿na zapisaæ pliku konfiguracyjnego"
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr "Stworzone w Grip"
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -159,355 +112,363 @@
 "Twój stary plik konfiguracyjny zosta³ zapisany z do³±czeniem \"-old\" do "
 "nazwy."
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "serwer to %s, port %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 msgid "Error: Unable to save config file."
 msgstr "B³±d: Nie mo¿na zapisaæ pliku konfiguracyjnego"
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "Konfiguracja"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "Napêd CD"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Nie przerywaj grania podczas wyj¶cia/uruchomienia"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "Przewiñ kiedy zatrzymane"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "Rozpocznij od pierwszej ¶cie¿ki je¶li nie odtwarza"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "Auto-play podczas w³o¿enia dysku"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "Przetasuj przed ka¿dym odtwarzaniem"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr "Obej¶cie b³êdu wysuniêcia"
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr "Sprawd¼ napêd w poszukiwaniu nowego dysku"
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr "Okres sprawdzania (w sekundach)"
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "Riper:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "Program ripuj±cy"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "Linia komend ripowania"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "Wy³±cz tryb paranoia"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "Wy³±cz tryb extra paranoia"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "Wy³±cz zarysowanie"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "detekcja"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "naprawa"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr "Oblicz regulacjê wzmocnienia"
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "Format ripowanego pliku"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 #, fuzzy
 msgid "Rip file format (Multi-artist)"
 msgstr "Format ripowanego pliku"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "Standardowe urz±dzenie SCSI"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "Ripper"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "'mi³a' warto¶æ ripowania"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "Maksymalna ilo¶æ niezakodowanych plików .wav"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "Auto-ripowanie podczas w³o¿enia"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "D¼wiêk po zripowaniu"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "Auto-wysuwanie po zripowaniu"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "Przerwa auto-wysuniêcia"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr "Przerwa przed ripowaniem"
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr "Wstrzymaj kodowanie podczas ripowania dysku"
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr "Zatrzymuj napêd cd pomiêdzy ¶cie¿kami"
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "Komenda filtra Wav"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "Komenda filtra dysku"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "Opcje"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "Ripuj"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "Program koduj±cy:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr "Plik programu koduj±cego:"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr "Linia komend prog. koduj±cego"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 #, fuzzy
 msgid "Encoder file extension"
 msgstr "Rozszerzenie kodowanego pliku"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 #, fuzzy
 msgid "Encoder file format"
 msgstr "Format kodowanego pliku"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 #, fuzzy
 msgid "Encode file format (Multi-artist)"
 msgstr "Format kodowanego pliku"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr ""
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr "Usuñ .wav po kodowaniu"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "Wstaw informacjê do bazy SQL"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr "Twórz pliki .m3u"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "U¿ywaj relatywnych ¶cie¿ek w plikach .m3u"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "Format pliku M3U"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Próbkowanie kodowania (kbitów/sek)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "Ilo¶æ CPU do u¿ycia"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 #, fuzzy
 msgid "Encoder 'nice' value"
 msgstr "'mi³a' warto¶æ kodowania"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 #, fuzzy
 msgid "Encoder filter command"
 msgstr "Komenda filtra kodowania"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 #, fuzzy
 msgid "Execute command after encode"
 msgstr "Usuñ .wav po kodowaniu"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "Zakoduj"
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr "Dodaj tagi ID3 do zakodowanych plików"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Dodaj tagi ID3v2 do zakodowanych plików"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr "Taguj tylko pliki z rozszerzeniem .mp3"
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "Pole komentarza ID3"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr "Kodowanie znaków ID3v1"
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 msgid "ID3v2 Character set encoding"
 msgstr "Kodowanie znaków ID3v2"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "Serwer bazy danych"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "¦cie¿ka CGI"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "G³ówny serwer"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "Serwer pomocniczy"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr "Email wysy³any do bazy danych"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 msgid "DB Character set encoding"
 msgstr "Kodowanie znaków bazy danych"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "U¿ywaj rozszerzeñ freedb"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "Automatycznie wykonuj sprawdzanie dysku"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "Baza danych p³yt"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "U¿yj serwera proxy"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr "U¿yj serwera ze zmiennej ¶rod. 'http_proxy'"
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "Serwer proxy"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "Port proxy"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "Nazwa u¿ytkownika dla proxy"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "Has³o dla proxy"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "Adres email"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "Program uaktalniania CD"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "Nie zmieniaj nazw plików na ma³e litery"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr "Dopu¶æ wysokie bity w nazwach plików"
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr ""
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "Nie zmianiaj spacji do podkre¶leñ"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -515,19 +476,19 @@
 "Znaki do usuniêcia\n"
 "w plikach"
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr "Poka¿ ikonê w tacce systemowej"
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "Ró¿ne"
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 msgid "Error: Unable to save ripper config."
 msgstr "B³±d: Nie mo¿na zapisaæ konfiguracji rippera."
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 msgid "Error: Unable to save encoder config."
 msgstr "B³±d: Nie mo¿na zapisaæ konfiguracji enkodera."
 
@@ -565,7 +526,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr "Nie mo¿na wykonaæ sprawdzenia podczas ripowania"
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "Nieznany dysk"
@@ -575,220 +535,193 @@
 msgid "Track %02d"
 msgstr "¦cie¿ka %02d"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "Zapytanie %s (przez %s) dla dysku %02x.\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "Zapytanie %s dla dysku %02x.\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "Nie dopasowano\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"Dopasowano dla \"%s %s\"\n"
-"Pobieram dane...\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "Wykonano\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "B³±d podczas zapisywania danych dysku\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 msgid "Length"
 msgstr "D³ugo¶æ"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "¦cie¿ki"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "¦cie¿ka"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 #, fuzzy
 msgid "Done.\n"
 msgstr "Wykonano\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 msgid "Error saving disc data."
 msgstr "B³±d podczas zapisywania danych dysku"
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "Obróæ tryb odtwarzania"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "Zmieñ pêtle odtwarzania"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "Status ripowania"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "Odtwarzaj / Pauzuj ¶cie¿kê"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "Cofnij"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "Przewin do przodu"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "Do poprzedniej ¶cie¿ki"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "Do nastêpnej ¶cie¿ki"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "Zmieñ tryb odtwarzania"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "Nastêpny dysk"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "Zatrzymaj odtwarzanie"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "Wysuñ dysk"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr "Skanuj zawarto¶æ dysku"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "Zmieñ sterowanie g³o¶no¶ci±"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "Zmieñ edytor dysku"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Rozpocznij/przerwij sprawdzanie bazy danych dysków"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "Zmieñ wy¶wietlanie ¶cie¿ki"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Opu¶æ Grip"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 msgid "Cannot fast forward while ripping."
 msgstr "Nie mo¿na szybko przewijaæ podczas ripowania."
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 msgid "Cannot rewind while ripping."
 msgstr "Nie mo¿na przewijaæ podczas ripowania."
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 msgid "Cannot switch discs while ripping."
 msgstr "Nie mo¿na zmieniaæ dyskow podczas ripowania"
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "Wysuñ dysk\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 msgid "Cannot eject while ripping."
 msgstr "Nie mo¿na wysun±æ podczas ripowania."
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr "Mam dysk -- wysuwanie\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 msgid "Cannot play while ripping."
 msgstr "Nie mo¿na odtwarzaæ podczas ripowania."
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 msgid "Cannot switch tracks while ripping."
 msgstr "Nie mo¿na zmieniaæ ¶cie¿ek podczas ripowania."
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "Sprawd¼ w poszukiwaniu nowego dysku\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat znalaz³ dysk, trwa sprawdzanie ¶cie¿ek\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "Mamy prawid³owy dysk!\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "Brak niezerowych d³ugo¶ci ¶cie¿ek\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "CDStat zwróci³ komunikat o braku dysku\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Aktualny sektor: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "Brak dysku"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -800,25 +733,37 @@
 "\n"
 "Czy chcesz wys³aæ informacje o dysku?"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 msgid "Error: Unable to create temporary file."
 msgstr "B³±d: Nie mo¿na stworzyæ pliku tymczasowego."
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 msgid "Error: Unable to write disc data."
 msgstr "B³±d: Nie mo¿na zapisaæ danych."
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Wysy³am wiadomo¶æ do %s\n"
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 #, fuzzy
 msgid "Error: Unable to execute mail command."
 msgstr "B³±d: Nie mo¿na zapisaæ konfiguracji enkodera."
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr ""
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr ""
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr ""
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "Wiadomo¶æ systemowa"
 
@@ -852,79 +797,79 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "B³±d: Nie mo¿na otworzyæ %s do zapisu\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "Tytu³ dysku"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "Nazwa ¶cie¿ki"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr "W"
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "Wykonawca"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "Gatunek ID3:"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "Rok p³yty"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "Nazwa ¶cie¿ki"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "Wykonawca ¶cie¿ki"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr "W"
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "Podziel:"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "Tytu³/Wykonawca"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "Wykonawca/Tytu³"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr "Podziel znaki"
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "Wielu wykonawców"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "Zapisz informacje o dysku"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "Wy¶lij informacje o dysku"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 msgid "No disc present."
 msgstr "Brak dysku."
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 msgid "Cannot submit. No disc is present."
 msgstr "Nie mo¿na wys³aæ. Brak dysku."
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 msgid "You must enter a disc title."
 msgstr "Musisz wpisaæ tytu³ p³yty."
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 msgid "You must enter a disc artist."
 msgstr "Musisz wpisaæ wykonawcê p³yty."
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -942,7 +887,7 @@
 "\n"
 "Kontynuowaæ?"
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -954,11 +899,11 @@
 "\n"
 "Kontynuowaæ?"
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "Wybór gatunku"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -966,19 +911,18 @@
 "Wys³anie wymaga gatunku ró¿nego od 'nieznany'\n"
 "Poni¿ej wybierz gatunek DiscDB"
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "Gatunek DiscDB"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "Wy¶lij"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "Anuluj"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "nieznane pole ID3\n"
@@ -990,179 +934,156 @@
 "B³±d: nie mo¿na przet³umaczyæ nazwy pliku. Nie ma takiego u¿ytkownika jak "
 "%s\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "Wykonanie nie powiod³o siê\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "B³±d: Z³y rodzaj wpisu\n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 #, fuzzy
 msgid "Error: Reading config file\n"
 msgstr "B³±d: Nieprawid³owy plik konfiguracyjny\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "B³±d: Nieprawid³owy plik konfiguracyjny\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "Ripuj i enkoduj"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "Ripuj i enkoduj wybrane ¶cie¿ki"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "Tylko ripuj"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "Ripuj, ale nie enkoduj wybranych ¶cie¿ek"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr "Przerwij ripowanie i enk."
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "Zabij wszystkie aktywne procesy ripowania i enkodowania"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "Przerwij ripowanie"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "Zabij proces ripowania"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "Skan DDJ"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "Wstaw informacje o dysku do bazy danych DigitalDJ"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "Ripuj czê¶ciow± ¶cie¿kê"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "Graj"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "Aktualny sektor:      0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "Rip: Bezczynny"
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Enk: ¦¿k 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
 msgstr "Enk: Bezczynny"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr "Ca³kowite wska¼niki:"
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "Sektor pocz±tkowy"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "Sektor koñcowy"
 
-#: src/rip.c:384
-#, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "Wstawiam ¶cie¿kê nr %d do bazy danych DDJ\n"
-
-#: src/rip.c:609
+#: src/rip.c:600
 msgid "Error: can't open m3u file."
 msgstr "B³±d: nie mo¿na otworzyæ pliku m3u."
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr "Podczas zabijania procesu ripowania\n"
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr "Aktualnie ca³kowity rozmiar enkodowania wynosi: %d\n"
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "Ripowanie: ¦¿k %d (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr "Ripowanie: %6.2f%%"
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "Ripowanie zakoñczono\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr "Ripuj czê¶æiowo %d liczbê wav'ów %d\n"
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "Nastêpna ¶cie¿ka to %d, w sumie %d\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "Sprawd¼ czy potrzeba ripowaæ inn± ¶cie¿kê\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "Enk: ¦¿k %d (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr "Enk: %6.2f%%"
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "Ukoñczono enkodowanie na procesorze %d\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "Usuwanie [%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "Ripowanie zakoñczono\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "Brak wykonawcy"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "Brak tytu³u"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1170,7 +1091,7 @@
 "Nie wykryto p³yty w napêdzie. Je¿eli jednak p³yta jest w napêdzie sprawd¼ "
 "ustawienia napêdu CD w Konfiguracji->CD"
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1180,7 +1101,7 @@
 "Sprawd¼ konfiguracjê ripowania i upewnij siê, ¿e poda³e¶ pe³n± ¶cie¿kê do "
 "programu ripuj±cego."
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1190,7 +1111,7 @@
 "Sprawd¼ konfiguracjê enkodowania i upewnij siê, ¿e poda³e¶ pe³n± ¶cie¿kê do "
 "programu enkoduj±cego."
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1198,164 +1119,225 @@
 "Nie wybrano ¶cie¿ek.\n"
 "Zripowaæ ca³± p³ytê CD?\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "Ripowanie ca³ej p³yty CD\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr "W nastêpnej ¶cie¿ce ripowania\n"
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Pierwsza sprawdzona ¶cie¿ka to %d\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr "Rozpoczêto ripowanie!\n"
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "Brak prawa zapisu do zapisywanego pliku wav"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "Ripowanie ¶cie¿ki %d do %s\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Rip: ¦¿k %d (0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "Plik %s zosta³ wcze¶niej zripowany. Pomijam go...\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "Brak miejsca w katalogu wyj¶ciowym"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "Wzywam CDPRip\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Dodano ¶cie¿kê %d do listy %s\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "Brak wolnych procesorów\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Enk ¶cie¿kê %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 msgid "No write access to write encoded file."
 msgstr "Brak prawa zapisu do zapisu zenkodowanego pliku."
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i: Enkodowanie do %s\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Enk: ¦¿k %d (0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr "W ca³kowitym przeliczeniu\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr "Teraz nie ripujemy, wiêc zzerujmy warto¶ci enkodowania\n"
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Ca³kowity rozmiar ripowania: %d\n"
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Ca³kowity rozmiar enkodowania: %d\n"
 
-#: src/tray.c:57
+#: src/tray.c:59
 #, fuzzy
 msgid "Artist"
 msgstr "Brak wykonawcy"
 
-#: src/tray.c:58
+#: src/tray.c:60
 #, fuzzy
 msgid "Title"
 msgstr "Brak tytu³u"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
 "%02d:%02d of %02d:%02d"
 msgstr ""
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr ""
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr ""
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
 "%s%s%s"
 msgstr ""
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
 "Idle"
 msgstr ""
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr ""
 
-#: src/tray.c:196
+#: src/tray.c:186
 #, fuzzy
 msgid "Stop"
 msgstr "Zatrzymaj odtwarzanie"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr ""
 
-#: src/tray.c:209
+#: src/tray.c:199
 #, fuzzy
 msgid "Next"
 msgstr "Nastêpny dysk"
 
-#: src/tray.c:217
+#: src/tray.c:207
 #, fuzzy
 msgid "Rip and Encode"
 msgstr "Przerwij ripowanie i enk."
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr ""
 
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "Okre¶l wymiary g³ównego okna"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "WYMIARY"
+
+#~ msgid "Grip started successfully\n"
+#~ msgstr "Uruchomienie Grip'a zakoñczy³o siê sukcesem\n"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "General"
+#~ msgstr "G³ówny"
+
+#~ msgid "Playing CDs"
+#~ msgstr "Odgrywanie p³yt CD"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "Ripowanie p³yt CD"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "Konfiguracja Grip'a"
+
+#~ msgid "FAQ"
+#~ msgstr "FAQ"
+
+#~ msgid "Getting More Help"
+#~ msgstr "Wiêcej pomocy"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "Zg³aszanie b³êdów"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "Zapytanie %s (przez %s) dla dysku %02x.\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "Zapytanie %s dla dysku %02x.\n"
+
+#~ msgid "No match\n"
+#~ msgstr "Nie dopasowano\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "Dopasowano dla \"%s %s\"\n"
+#~ "Pobieram dane...\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "Wysuñ dysk\n"
+
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "Wstawiam ¶cie¿kê nr %d do bazy danych DDJ\n"
+
+#~ msgid "Rip finished\n"
+#~ msgstr "Ripowanie zakoñczono\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "Ukoñczono enkodowanie na procesorze %d\n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "Usuwanie [%s]\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "Ripowanie zakoñczono\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "Ripowanie ¶cie¿ki %d do %s\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "Plik %s zosta³ wcze¶niej zripowany. Pomijam go...\n"
+
+#~ msgid "%i: Encoding to %s\n"
+#~ msgstr "%i: Enkodowanie do %s\n"
+
 #~ msgid ""
 #~ "This is a development version of Grip. If you encounter problems, you are "
 #~ "encouraged to revert to the latest stable version."

grip-4.1.1.tar.gz/po/pt_BR.gmo Added

grip-3.10.1.tar.gz/po/pt_BR.po -> grip-4.1.1.tar.gz/po/pt_BR.po Changed

@@ -1,14 +1,14 @@
 # Brazilian Portuguese translation for grip.
-# Copyright (C) 2017 Free Software Foundation, Inc.
+# Copyright (C) 2020 Mike Oliphant and Johnny A. Solbu (msgids)
 # This file is distributed under the same license as the grip package.
 # Wellington Terumi Uemura <wellingtonuemura@hotmail.com>, 2002.
-# Rafael Fontenelle <rafaelff@gnome.org>, 2017.
+# Rafael Fontenelle <rafaelff@gnome.org>, 2017-2020.
 msgid ""
 msgstr ""
-"Project-Id-Version: grip 3.6.0\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
-"PO-Revision-Date: 2017-10-08 13:15-0200\n"
+"Project-Id-Version: grip 4.1.0\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
+"PO-Revision-Date: 2020-02-05 08:15-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
 "net>\n"
@@ -20,47 +20,39 @@
 "X-Generator: Virtaal 1.0.0-beta1\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "Especifica o tamanho da janela principal"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "GEOMETRY"
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr "Especifica o arquivo de configuração a ser usado (no seu HOME)"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr "CONFIGURAÇÃO"
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "Especifica a unidade de CD-ROM a ser usada"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "DISPOSITIVO"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "Especifica uma unidade SCSI genérica a ser usada"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "Inicia em modo \"pequeno\" (somente cd)"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr "Modo \"Local\" -- não procura por informações do disco na net"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "Não faz redirecionamento de E/S"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "Executa em modo detalhado (depuração)"
 
@@ -68,16 +60,12 @@
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "Erro: Não foi possível inicializar [%s]\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr "Grip inicializado com sucesso\n"
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
@@ -85,73 +73,36 @@
 "Trabalho em progresso.\n"
 "Realmente deseja sair?"
 
-#: src/grip.c:401
-msgid "Status"
-msgstr "Status"
-
-#: src/grip.c:416
-msgid "General"
-msgstr "Geral"
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "Extrair"
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
-msgstr "Codificar"
+#: src/grip.c:380
+msgid "Unable to open help file"
+msgstr "Não foi possível abrir arquivo de ajuda"
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "Índice"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "Reproduzindo CDs"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "Extraindo CDs"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "Configurando Grip"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "Perguntas frequentes"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "Buscando mais ajuda"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "Relatando erros"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "Sobre"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr "Versão %s"
 
-#: src/grip.c:641
+#: src/grip.c:505
 msgid "Error: Trying to show homepage failed."
 msgstr "Erro: Tentativa de mostrar página inicial falhou."
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr "Criado por Grip"
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -161,354 +112,361 @@
 "Você vai precisar reconfigurar o Grip.\n"
 "A sua configuração antiga foi arquivada em ~/.grip-old."
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "servidor é %s, porta %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 msgid "Error: Unable to save config file."
 msgstr "Erro: Não foi possível salvar o arquivo de configuração."
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "Configuração"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "Dispositivo de CD-ROM"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Não interromper a reprodução ao sair/inicializar"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "Retroceder quando parar"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "Inicializar com a primeira faixa, se não estiver reproduzindo"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "Reproduzir automaticamente ao inserir um disco"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "Reembaralhar as músicas antes de cada reprodução"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr "Tentar contornar falha de ejeção de CD"
 
 # Em que pese monitorar não seja melhor tradução para poll, me pareceu melhor aqui -- Rafael
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr "Monitorar unidade de disco por novo disco"
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr "Intervalo de monitoração (segundos)"
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "Extrator:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "Executável extrator"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "Linha de comando do extrator"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "Desabilitar paranoia"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "Desabilitar paranoia extra"
 
-# Texto reorganizado para atender a idade original de 'scratch detection' ou 'scratch detection' -- Rafael
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
-msgstr "Arranhos: desabilitar"
+msgstr "Desabilitar arranho"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "detecção"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "correção"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr "Calcular ajuste de ganho"
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "Formato do arquivo extraído"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 msgid "Rip file format (Multi-artist)"
 msgstr "Formato do arquivo extraído (Múltiplos artistas)"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "Dispositivo SCSI genérico"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "Extrator"
 
 # nice é programa de priorização de trabalho; não traduzir -- Rafael
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "Valor \"nice\" na extração"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "Máximo de arquivos .wav não codificados"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "Extrair automaticamente ao inserir"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "Alerta sonoro após extração"
 
 # Mensagem tem que ser curta, para o texto não ser cortado na GUI -- Rafael
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "Autoejetar após extrair"
 
 # Mensagem tem que ser curta, para o texto não ser cortado na GUI -- Rafael
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "Atraso de autoejeção"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr "Atrasar o início da extração"
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr "Atrasar a codificação até que o disco esteja extraído"
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr "Parar a unidade de cdrom entre faixas"
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "Comando do filtro do Wav"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "Comando do filtro do disco"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "Opções"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "Extrair"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "Codificador:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr "Executável codificador"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr "Linha de comando do codificador"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 msgid "Encoder file extension"
 msgstr "Extensão do arquivo codificado"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 msgid "Encoder file format"
 msgstr "Formato do arquivo codificado"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 msgid "Encode file format (Multi-artist)"
 msgstr "Formato de arquivo codificado (Múltiplos artistas)"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "Codificador"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr "Excluir .wav após a codificação"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "Inserir informações no banco de dados SQL"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr "Criar arquivos .m3u"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "Usar caminhos relativos em arquivos .m3u"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "Formato do arquivo M3U"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Taxa de bits da codificação (kbits/s)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "Quantidade de CPUs para usar na codificação"
 
 # nice é programa de priorização de trabalho; não traduzir -- Rafael
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 msgid "Encoder 'nice' value"
 msgstr "Valor \"nice\" do codificador"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 msgid "Encoder filter command"
 msgstr "Comando do filtro do codificador"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 msgid "Execute command after encode"
 msgstr "Executar comando após a codificação"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "Codificar"
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr "Adicionar etiquetas ID3 aos arquivos codificados"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Adicionar etiquetas ID3v2 aos arquivos codificados"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr "Apenas adicionar etiqueta a arquivos terminando com \".mp3\""
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "Campo de comentários ID3"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr "Conjunto de caracteres de ID3v1"
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 msgid "ID3v2 Character set encoding"
 msgstr "Conjunto de caracteres de ID3v2"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "Servidor de BD"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "Caminho do CGI"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "Servidor primário"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "Servidor secundário"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr "Enviar e-mail ao BD"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 msgid "DB Character set encoding"
 msgstr "Conjunto de caracteres do banco de dados"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "Usar extensões do FreeDB"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "Fazer procura por discos automaticamente"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "Banco de dados"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "Usar servidor proxy"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Obter servidor da variável \"http_proxy\""
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "Servidor proxy"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "Porta do proxy"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "Nome de usuário no proxy"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "Senha do proxy"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "Endereço de e-mail"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "Programa de atualização de CD"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "Não escrever nomes de arquivos em letras minúsculas"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr "Permitir bits altos em nomes de arquivos"
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr "Substituir caracteres incompatíveis por números hexadecimais"
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "Não trocar espaços por sublinhado"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr "Escrever arquivos m3u usando \"\\\"s não compatíveis com posix"
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -516,19 +474,19 @@
 "Caracteres que não serão removidos\n"
 "do nome dos arquivos"
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr "Mostrar ícone na área de notificação"
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "Outros"
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 msgid "Error: Unable to save ripper config."
 msgstr "Erro: Não foi possível salvar a configuração do extrator."
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 msgid "Error: Unable to save encoder config."
 msgstr "Erro: Não foi possível salvar a configuração do codificador."
 
@@ -567,7 +525,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr "Não é possível procurar durante a extração."
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "Disco desconhecido"
@@ -577,219 +534,192 @@
 msgid "Track %02d"
 msgstr "Faixa %02d"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "Perguntando %s (através de %s) por disco %02x.\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "Perguntando %s por disco %02x.\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "Nada foi encontrado\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"Ocorrência para \"%s / %s\"\n"
-"Descarregando dados...\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "Feito\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "Erro, gravando dados do disco\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 msgid "Length"
 msgstr "Duração"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "Faixas"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr "Seleciona a entrada CDDB anterior."
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr "Seleciona a próxima entrada CDDB."
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "Faixa"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr "FazerProxEntradaBDDisco.\n"
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
 msgstr "Nenhum dado de disco. Retornando.\n"
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
 msgstr "Já no último índice. Retornando.\n"
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 msgid "Done.\n"
 msgstr "Feito.\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
 msgstr "FazerEntradaBDDiscoAnt.\n"
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
 msgstr "Já no primeiro índice. Retornando.\n"
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 msgid "Error saving disc data."
 msgstr "Erro, gravando dados do disco."
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "Rotacionar modo de reprodução"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "Ativar reprodução infinita"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "Estado da extração"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "Reproduz a faixa / Pausa a reprodução"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "Retrocede"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "Avança"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "Vai para a faixa anterior"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "Vai para a próxima faixa"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "Ativa opções do modo de reprodução"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "Próximo disco"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "Para a reprodução"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "Ejeta o disco"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr "Lê o conteúdo do disco"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "Ativa o controle de volume"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "Ativa editor de disco"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Inicializa/Aborta procura no banco de dados de disco"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "Mostra a faixa"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Sai do Grip"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 msgid "Cannot fast forward while ripping."
 msgstr "Não é possível avançar durante a extração."
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 msgid "Cannot rewind while ripping."
 msgstr "Não é possível retroceder durante a extração."
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 msgid "Cannot switch discs while ripping."
 msgstr "Não é possível trocar de discos durante a extração."
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "Ejetar o disco\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 msgid "Cannot eject while ripping."
 msgstr "Não é possível ejetar durante a extração."
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr "Há disco -- ejetando\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 msgid "Cannot play while ripping."
 msgstr "Não é possível reproduzir durante a extração."
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 msgid "Cannot switch tracks while ripping."
 msgstr "Não é possível trocar de faixa durante a extração."
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "Verificando se há um novo disco\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "O CDStat encontrou um disco, verificando faixas\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "Nós temos um disco válido!\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "Nenhuma faixa de tamanho não zero\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "O CDStat disse: sem disco\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Setor atual: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "Sem disco"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -801,24 +731,36 @@
 "\n"
 "Você deseja enviar as informações deste disco?"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 msgid "Error: Unable to create temporary file."
 msgstr "Erro: Não foi possível criar arquivo temporário."
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 msgid "Error: Unable to write disc data."
 msgstr "Erro: Não foi possível gravar os dados do disco."
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Enviando entradas para %s\n"
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 msgid "Error: Unable to execute mail command."
 msgstr "Erro: Não foi possível executar comando de e-mail."
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr "Aviso"
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr "Informação"
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr "Pergunta"
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "Mensagem do sistema"
 
@@ -853,79 +795,79 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Erro: Não foi possível abrir o %s para escrita\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "Título do disco"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "Nome da faixa"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr "G"
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "Artista do disco"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "Gênero ID3:"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "Ano do disco"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "Nome da faixa"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "Artista da faixa"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr "G"
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "Separar:"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "Título/Artista"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "Artista/Título"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr "Separar caracteres"
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "Múltiplos artistas"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "Salvar informação do disco"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "Enviar informação do disco"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 msgid "No disc present."
 msgstr "Nenhum disco presente."
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 msgid "Cannot submit. No disc is present."
 msgstr "Não foi possível enviar. Nenhum disco está presente."
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 msgid "You must enter a disc title."
 msgstr "Você precisa digitar um nome para o disco."
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 msgid "You must enter a disc artist."
 msgstr "Você precisa digitar um nome de artista para o disco."
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -943,7 +885,7 @@
 "\n"
 "Deseja continuar?"
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -955,11 +897,11 @@
 "\n"
 "Deseja continuar?"
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "Selecione o gênero"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -967,19 +909,18 @@
 "Para enviar é necessário um outro gênero que não seja \"unknown\" \n"
 "Por favor, selecione um gênero do disco na lista abaixo"
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "Gênero do disco"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "Enviar"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "campo ID3 desconhecido\n"
@@ -990,178 +931,155 @@
 msgstr ""
 "Erro: Não foi possível traduzir o nome do arquivo. Usuário inexistente %s\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "Exec falhou\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "Erro: Tipo de entrada inválida\n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 msgid "Error: Reading config file\n"
 msgstr "Erro: Lendo arquivo de configuração\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "Erro: Arquivo de configuração inválido\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "Extrair e codificar"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "Extrai e codifica as faixas selecionadas"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "Só Extrair"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "Extrai, mas não codifica as faixas selecionadas"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr "Abortar extração e codificação"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "Mata todos os processos ativos de extração e de codificação"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "Abortar somente a extração"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "Mata o processo de extração"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "Pesquisa DDJ"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "Insere as informações do disco no banco de dados DigitalDJ"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "Extrair parcialmente a faixa"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "Reproduzir"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "Setor atual:      0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "Extrator: ocioso"
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Codificador: Faixa 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
 msgstr "Codificador: ocioso"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr "Indicadores gerais:"
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "Inicio do setor"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "Fim do setor"
 
-#: src/rip.c:384
-#, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "Inserir faixa %d no banco de dados ddj\n"
-
-#: src/rip.c:609
+#: src/rip.c:600
 msgid "Error: can't open m3u file."
 msgstr "Erro: não foi possível abrir o arquivo m3u."
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr "Em KillRip\n"
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr "Tamanho total codificado agora é: %d\n"
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "Extrator: Faixa %d (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr "Extrator: %6.2f%%"
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "Extração concluída\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr "Extrair parcialmente %d núm wavs %d\n"
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "Próxima faixa é %d, o total é %d\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "Verificar se precisamos extrair outra faixa\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "Codificador: Faixa %d (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr "Codificador: %6.2f%%"
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "A codificação na CPU %d foi concluída\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "Excluindo [%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "A extração foi concluída\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "Sem artista"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "Sem título"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1170,7 +1088,7 @@
 "por favor verifique suas configurações do dispositivo de CDRom sob "
 "Configuração->CD."
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1180,7 +1098,7 @@
 "Verifique a configuração do seu extrator e certifique-se de que ela "
 "especifica o caminho completo para o executável do extrator."
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1190,7 +1108,7 @@
 "Verifique a configuração do seu codificador e certifique-se de que ela "
 "especifica o caminho completo para o executável do codificador."
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1198,106 +1116,91 @@
 "Nenhuma faixa selecionada.\n"
 "Extrair o CD inteiro?\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "Extraindo o CD inteiro\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr "Extrair faixa seguinte\n"
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "A primeira faixa verificada é %d\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr "Extraindo!\n"
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "Sem acesso de escrita para escrever o arquivo wav"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "Extraindo faixa %d para %s\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Extrator: Faixa %d (0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "O arquivo %s já foi extraído. Pulando...\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "Sem espaço no diretório de saída"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "Chamando CDPRi\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Adicionada faixa %d para a lista %s\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "Nenhuma CPU livre\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Codificar faixa %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 msgid "No write access to write encoded file."
 msgstr "Sem acesso de escrita para escrever o arquivo codificado."
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i: Codificando para %s\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Codificador: Faixa %d (0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr "Em CalculateAll\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 "Não estamos extraindo agora, então vamos zerar os valores de codificação\n"
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Tamanho total extraído é: %d\n"
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Tamanho total codificado é: %d\n"
 
-#: src/tray.c:57
+#: src/tray.c:59
 msgid "Artist"
 msgstr "Artista"
 
-#: src/tray.c:58
+#: src/tray.c:60
 msgid "Title"
 msgstr "Título"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1306,17 +1209,17 @@
 "%s - %s\n"
 "%02d:%02d de %02d:%02d"
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Extraindo faixa %02d:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Codific. faixa %02d:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1325,7 +1228,7 @@
 "%s - %s\n"
 "%s%s%s"
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1334,30 +1237,106 @@
 "%s - %s\n"
 "Ocioso"
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr "Pausar"
 
-#: src/tray.c:196
+#: src/tray.c:186
 msgid "Stop"
 msgstr "Parar"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/tray.c:209
+#: src/tray.c:199
 msgid "Next"
 msgstr "Próxima"
 
-#: src/tray.c:217
+#: src/tray.c:207
 msgid "Rip and Encode"
 msgstr "Extrair e codificar"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr "Sair"
 
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "Especifica o tamanho da janela principal"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "GEOMETRY"
+
+#~ msgid "Grip started successfully\n"
+#~ msgstr "Grip inicializado com sucesso\n"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "General"
+#~ msgstr "Geral"
+
+#~ msgid "Playing CDs"
+#~ msgstr "Reproduzindo CDs"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "Extraindo CDs"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "Configurando Grip"
+
+#~ msgid "FAQ"
+#~ msgstr "Perguntas frequentes"
+
+#~ msgid "Getting More Help"
+#~ msgstr "Buscando mais ajuda"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "Relatando erros"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "Perguntando %s (através de %s) por disco %02x.\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "Perguntando %s por disco %02x.\n"
+
+#~ msgid "No match\n"
+#~ msgstr "Nada foi encontrado\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "Ocorrência para \"%s / %s\"\n"
+#~ "Descarregando dados...\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "Ejetar o disco\n"
+
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "Inserir faixa %d no banco de dados ddj\n"
+
+#~ msgid "Rip finished\n"
+#~ msgstr "Extração concluída\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "A codificação na CPU %d foi concluída\n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "Excluindo [%s]\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "A extração foi concluída\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "Extraindo faixa %d para %s\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "O arquivo %s já foi extraído. Pulando...\n"
+
+#~ msgid "%i: Encoding to %s\n"
+#~ msgstr "%i: Codificando para %s\n"
+
 #, fuzzy
 #~ msgid "Encode file extension"
 #~ msgstr "Extrair arquivo em formato"

grip-4.1.1.tar.gz/po/quot.sed Added

grip-4.1.1.tar.gz/po/remove-potcdate.sin Added

grip-4.1.1.tar.gz/po/ru.gmo Added

grip-3.10.1.tar.gz/po/ru.po -> grip-4.1.1.tar.gz/po/ru.po Changed

@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grip 3.6.0\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
 "PO-Revision-Date: 2018-09-28 11:00+0300\n"
 "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@d07.ru>\n"
@@ -22,47 +22,39 @@
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: Poedit 2.1.1\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "Укажите геометрию главного окна"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "ГЕОМЕТРИЯ"
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr "Укажите используемый конфигурационный файл (в домашнем каталоге)"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr "КОНФИГ"
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "Укажите используемый привод CD-ROM"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "УСТРОЙСТВО"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "Укажите используемое SCSI-устройство"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "Запуск в \"маленьком\" режиме (только CD)"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr "\"Локальный\" режим — не искать информацию о диске в сети"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "Не выполнять перенаправление ввода/вывода"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "Запуск в режиме расширенной диагностики (отладочном режиме)"
 
@@ -70,16 +62,12 @@
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "Ошибка: невозможно инициализировать [%s]\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr "Grip успешно запущен\n"
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
@@ -87,73 +75,38 @@
 "Работа не завершена.\n"
 "Действительно прервать?"
 
-#: src/grip.c:401
-msgid "Status"
-msgstr "Статус"
-
-#: src/grip.c:416
-msgid "General"
-msgstr "Общее"
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "Извлечение"
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
-msgstr "Сжатие"
+#: src/grip.c:380
+#, fuzzy
+#| msgid "Error: Unable to create temporary file."
+msgid "Unable to open help file"
+msgstr "Ошибка: невозможно создать временный файл."
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "Помощь"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "Содержание"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "Проигрывание CD"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "Извлечение треков"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "Конфигурирование Grip"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "ЧАВО"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "Дальнейшая информация"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "Сообщить об ошибке"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "О программе"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr "Версия %s"
 
-#: src/grip.c:641
+#: src/grip.c:505
 msgid "Error: Trying to show homepage failed."
 msgstr "Ошибка: не удалось показать домашнюю страницу."
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr "Создано в Grip"
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -163,348 +116,356 @@
 "Вам нужно переконфигурировать Grip.\n"
 "Ваш старый конфигурационный файл записан с добавлением -old."
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "сервер %s, порт %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 msgid "Error: Unable to save config file."
 msgstr "Ошибка: невозможно сохранить конфигурационный файл."
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "Конфигурация"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "Привод CD-ROM"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Не прекращать проигрывание при выходе/старте"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "Перематывать при остановке"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "Стартовать с первого трека, если не проигрывается"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "Автоматически проигрывать при установке диска"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "Перемешивать перед каждым проигрыванием"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr "Обходить неправильный выброс диска"
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr "Опрашивать привод на наличие нового диска"
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr "Интервал опроса (сек)"
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "Программа извлечения:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "Исполнимый файл"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "Командная строка"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "Отключить paranoia"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "Отключить дополнительную параною"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "Царапины"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "не определять"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "не восстанавливать"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr "Вычислить коэффициент усиления"
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "Формат извлечённого файла"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 msgid "Rip file format (Multi-artist)"
 msgstr "Формат извлечённого файла (несколько исполнителей)"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "Основное SCSI-устройство"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "Программа извлечения"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "Значение 'отлично' для извлечения"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "Максимум несжатых wav'ов"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "Автостарт при установке диска"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "Сигнал после освобождения диска"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "Автовыброс после освобождения диска"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "Задержка автовыброса"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr "Задержка перед стартом"
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr "Задержка сжатия пока диск извлекается"
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr "Останавливать привод между треками"
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "Команда wav-фильтра"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "Команда фильтра дисков"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "Опции"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "Извлечение"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "Программа сжатия:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr "Исполнимый файл"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr "Командная строка"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 msgid "Encoder file extension"
 msgstr "Расширение"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 msgid "Encoder file format"
 msgstr "Формат файлов"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 msgid "Encode file format (Multi-artist)"
 msgstr "Формат файлов (несколько исполнителей)"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "Программа сжатия"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr "Удалять .wav после сжатия"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "Вносить информацию в SQL БД"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr "Создавать m3u-файлы"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "Использовать относительные пути в m3u-файлах"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "Формат M3U-файла"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Битрейт (кбит/сек)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "Сколько процессоров использовать"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 msgid "Encoder 'nice' value"
 msgstr "Приоритетность процесса сжатия"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 msgid "Encoder filter command"
 msgstr "Команда фильтрации сжатия"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 msgid "Execute command after encode"
 msgstr "Выполнить команду после сжатия"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "Сжатие"
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr "Добавлять тэги ID3 в сжатые файлы"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Добавлять тэги ID3v2 в сжатые файлы"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr "Тэги только в mp3-файлах"
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "Поле комментария ID3"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr "Набор символов сжатия ID3v1"
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 msgid "ID3v2 Character set encoding"
 msgstr "Набор символов сжатия ID3v2"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "Сервер БД"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "Путь CGI"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "Основной сервер"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "Вторичный сервер"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr "Эл. почта для отправки в DB"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 msgid "DB Character set encoding"
 msgstr "Набор символов сжатия БД"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "Использовать расширения freedb"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "Выполнять поиск диска автоматически"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "CDDB"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "Использовать прокси-сервер"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Взять сервер из переменной окружения 'http_proxy'"
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "Сервер"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "Порт"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "Имя пользователя"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "Пароль"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "Прокси"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "Электронная почта"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "Программа обновления CD"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "Не приводить к нижнему регистру имена файлов"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr "Разрешить русские буквы в именах"
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr "Заменять несовместимые символы шестнадцатеричными числами"
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "Не заменять пробелы на подчеркивание"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr "Записывать файлы m3u с использованием несовместимых с POSIX '\\'"
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -512,20 +473,20 @@
 "Не удалять эти символы\n"
 "в именах файлов"
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr "Показывать иконку в трее"
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "Разное"
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 msgid "Error: Unable to save ripper config."
 msgstr ""
 "Ошибка: невозможно сохранить конфигурационный файл программы извлечения."
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 msgid "Error: Unable to save encoder config."
 msgstr "Ошибка: невозможно сохранить конфигурационный файл программы сжатия."
 
@@ -563,7 +524,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr "Невозможно выполнить поиск во время извлечения."
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "Неизвестный диск"
@@ -573,219 +533,192 @@
 msgid "Track %02d"
 msgstr "Трек %02d"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "Запрос %s (через %s) для диска %02x.\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "Запрос %s для диска %02x.\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "Нет совпадения\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"Совпадение для \"%s / %s\"\n"
-"Загрузка данных...\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "Всё\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "Ошибка сохранения данных о диске\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 msgid "Length"
 msgstr "Длина"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "Треки"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr "Выбрать предыдущую запись CDDB."
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr "Выбрать следующую запись CDDB."
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "Трек"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr "DoNextDiscDBEntry.\n"
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
 msgstr "Нет данных на диске. Возвращение.\n"
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
 msgstr "Уже на последней позиции в указателе. Возвращение.\n"
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 msgid "Done.\n"
 msgstr "Выполнено.\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
 msgstr "DoPrevDiscDBEntry.\n"
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
 msgstr "Уже на первой позиции в указателе. Возвращение.\n"
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 msgid "Error saving disc data."
 msgstr "Ошибка сохранения данных о диске."
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "Порядок проигрывания"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "Циклическое проигрывание"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "Статус извлечения"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "Играть трек / Пауза"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "Перемотать назад"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "Перемотать вперёд"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "Перейти к предыдущему треку"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "Перейти к следующему треку"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "Переключение опций проигрывания"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "Следующий диск"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "Остановить проигрывание"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "Выброс диска"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr "Сканирование содержимого диска"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "Регулятор громкости"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "Редактор диска"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Инициировать/оборвать запрос к CDDB"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "Переключение режима отображения"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Выход из Grip"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 msgid "Cannot fast forward while ripping."
 msgstr "Нельзя перематывать вперёд во время извлечения."
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 msgid "Cannot rewind while ripping."
 msgstr "Нельзя перематывать назад во время извлечения."
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 msgid "Cannot switch discs while ripping."
 msgstr "Нельзя сменить диск во время извлечения."
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "Выброс диска\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 msgid "Cannot eject while ripping."
 msgstr "Нельзя выбросить диск во время извлечения."
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr "Имею диск -- выбрасываю\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 msgid "Cannot play while ripping."
 msgstr "Нельзя воспроизводить диск во время извлечения."
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 msgid "Cannot switch tracks while ripping."
 msgstr "Нельзя сменить трек во время извлечения."
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "Проверка на наличие нового диска\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat обнаружил диск, поиск треков\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "У нас правильный диск!\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "Отсутствуют непустые треки\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "CDStat сообщил, что диска нет\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Текущий сектор: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "Нет диска"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -797,24 +730,36 @@
 "\n"
 "Отправить информацию о диске?"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 msgid "Error: Unable to create temporary file."
 msgstr "Ошибка: невозможно создать временный файл."
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 msgid "Error: Unable to write disc data."
 msgstr "Ошибка: невозможно записать данные о диске."
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Отсылка данных на %s\n"
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 msgid "Error: Unable to execute mail command."
 msgstr "Ошибка: не удалось выполнить команду mail."
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr ""
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr ""
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr ""
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "Системное сообщение"
 
@@ -848,79 +793,79 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Ошибка: невозможно открыть %s для записи\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "Назв. CD"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "Имя трека"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr "W"
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "Исполнит."
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "Стиль ID3:"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "Год диска"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "Имя трека"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "Исполн. трека"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr "W"
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "Разбиение:"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "Название/Исп."
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "Исп./Название"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr "Символы разделения"
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "Сборник"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "Сохранить инф. о диске"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "Отослать информацию"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 msgid "No disc present."
 msgstr "Не установлен диск."
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 msgid "Cannot submit. No disc is present."
 msgstr "Не могу отослать. Не установлен диск."
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 msgid "You must enter a disc title."
 msgstr "Вы должны ввести название диска."
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 msgid "You must enter a disc artist."
 msgstr "Вы должны ввести исполнителя."
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -938,7 +883,7 @@
 "\n"
 "Продолжить?"
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -950,11 +895,11 @@
 "\n"
 "Продолжить?"
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "Выбор жанра"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -962,19 +907,18 @@
 "Отправка требует жанр, отличный от 'неизвестный'\n"
 "Пожалуйста, выберите нижеследующий жанр"
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "Жанр"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "Отправить"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "Отменить"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "неизвестное поле ID3\n"
@@ -985,180 +929,157 @@
 msgstr ""
 "Ошибка: невозможно перевести имя файла. Пользователь %s не существует\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "Exec не удался\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "Ошибка: Плохой тип записи\n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 msgid "Error: Reading config file\n"
 msgstr "Ошибка: Чтение конфигурационного файла\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "Ошибка: Плохой конфигурационный файл\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "Извлечь и сжать"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "Извлечь и сжать выбранные треки"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "Только извлечь"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "Извлечь, но не сжимать выбранные треки"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr "Прервать всё"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "Убить все активные процессы извлечения и сжатия"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "Прервать извлечение"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "Прервать процесс извлечения"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "Поиск БД DDJ"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "Вставить информацию о диске в базу данных DigitalDJ"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "Извлечь часть трека"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "Проиграть"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "Текущий сектор:     0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "Извлечение: стоп"
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Сжатие: Трек 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
 msgstr "Сжатие: стоп"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr "Общее состояние:"
 
 # src/rip.c:280
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "Нач. сектор"
 
 # src/rip.c:285
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "Кон. сектор"
 
-#: src/rip.c:384
-#, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "Вносить информацию о треке %d в DDJ БД\n"
-
-#: src/rip.c:609
+#: src/rip.c:600
 msgid "Error: can't open m3u file."
 msgstr "Ошибка: невозможно открыть m3u-файл."
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr "Убить извлечение\n"
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr "Текущий размер: %d\n"
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "Извлечение: трек %d (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr "Извлечение: %6.2f%%"
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "Извлечение окончено\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr "Частичное %d извлечение нескольких %d wav\n"
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "Следующий трек %d, всего %d\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "Проверить, должны ли мы извлечь другой трек\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "Сжатие: трек %d (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr "Сжатие: %6.2f%%"
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "Закончено сжатие на процессоре %d\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "Удаление [%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "Извлечение окончено\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "БезИсполнителя"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "БезНазвания"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1166,7 +1087,7 @@
 "Не удаётся определить диск в приводе. Если диск вставлен, то проверьте "
 "настройки привода CD-ROM в разделе \"Конфигурация->CD\"."
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1176,7 +1097,7 @@
 "Проверьте конфигурацию вашей программы извлечения и убедитесь, что указан "
 "полный путь до исполнимого файла программы извлечения."
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1186,7 +1107,7 @@
 "Проверьте конфигурацию вашей программы сжатия и убедитесь, что указан полный "
 "путь до исполнимого файла программы сжатия."
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1194,106 +1115,91 @@
 "Нет выбранных треков.\n"
 "Извлечь все?\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "Извлечение всех треков\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr "Извлечь следующий трек\n"
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Первый отмеченный трек %d\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr "Извлекаю!\n"
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "Нет доступа на запись для сохранения wav-файла"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "Извлечение трека %d в %s\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Сжатие: трек %d (0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "Файл %s уже был получен. Пропускаю...\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "Нет места в каталоге для записи"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "Вызов CDPRip\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Добавлен трек %d в список %s\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "Нет свободных процессоров\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Сжать трек %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 msgid "No write access to write encoded file."
 msgstr "Нет доступа на запись для сохранения сжатого файла."
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i: сжатие в %s\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Сжатие: трек %d (0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr "Вычислить всё\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 "Мы не извлекаем сейчас, значит, позволительны нулевые значения сжатия\n"
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Общий объём извлечённого: %d\n"
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Общий объём сжатого: %d\n"
 
-#: src/tray.c:57
+#: src/tray.c:59
 msgid "Artist"
 msgstr "Исполнитель"
 
-#: src/tray.c:58
+#: src/tray.c:60
 msgid "Title"
 msgstr "Заголовок"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1302,17 +1208,17 @@
 "%s - %s\n"
 "%02d:%02d из %02d:%02d"
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Извлекается  трек %02d:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Кодируется трек %02d:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1321,7 +1227,7 @@
 "%s - %s\n"
 "%s%s%s"
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1330,30 +1236,106 @@
 "%s - %s\n"
 "Стоп"
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr "Пауза"
 
-#: src/tray.c:196
+#: src/tray.c:186
 msgid "Stop"
 msgstr "Стоп"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr "Предыдущий"
 
-#: src/tray.c:209
+#: src/tray.c:199
 msgid "Next"
 msgstr "Следующий"
 
-#: src/tray.c:217
+#: src/tray.c:207
 msgid "Rip and Encode"
 msgstr "Извлечь и сжать"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr "Выход"
 
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "Укажите геометрию главного окна"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "ГЕОМЕТРИЯ"
+
+#~ msgid "Grip started successfully\n"
+#~ msgstr "Grip успешно запущен\n"
+
+#~ msgid "Status"
+#~ msgstr "Статус"
+
+#~ msgid "General"
+#~ msgstr "Общее"
+
+#~ msgid "Playing CDs"
+#~ msgstr "Проигрывание CD"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "Извлечение треков"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "Конфигурирование Grip"
+
+#~ msgid "FAQ"
+#~ msgstr "ЧАВО"
+
+#~ msgid "Getting More Help"
+#~ msgstr "Дальнейшая информация"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "Сообщить об ошибке"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "Запрос %s (через %s) для диска %02x.\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "Запрос %s для диска %02x.\n"
+
+#~ msgid "No match\n"
+#~ msgstr "Нет совпадения\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "Совпадение для \"%s / %s\"\n"
+#~ "Загрузка данных...\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "Выброс диска\n"
+
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "Вносить информацию о треке %d в DDJ БД\n"
+
+#~ msgid "Rip finished\n"
+#~ msgstr "Извлечение окончено\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "Закончено сжатие на процессоре %d\n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "Удаление [%s]\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "Извлечение окончено\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "Извлечение трека %d в %s\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "Файл %s уже был получен. Пропускаю...\n"
+
+#~ msgid "%i: Encoding to %s\n"
+#~ msgstr "%i: сжатие в %s\n"
+
 #~ msgid ""
 #~ "This is a development version of Grip. If you encounter problems, you are "
 #~ "encouraged to revert to the latest stable version."

grip-4.1.1.tar.gz/po/sr.gmo Added

grip-3.10.1.tar.gz/po/sr.po -> grip-4.1.1.tar.gz/po/sr.po Changed

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grip 3.6.0\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
 "PO-Revision-Date: 2017-11-05 08:47+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -20,47 +20,39 @@
 "X-Project-Style: gnome\n"
 "Generated-By: Babel 1.0dev\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "Наводи геометрију главног прозора"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "ГЕОМЕТРИЈА"
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr "Наводи датотеку подешавања за употребу (у вашој личној фасцикли)"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr "ПОДЕШАВАЊА"
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "Наводи уређај цд-рома за коришћење"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "УРЕЂАЈ"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "Наводи општи сцси уређај за коришћење"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "Покреће се у „small“ (само цд) режиму"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr "„Local“ режим — не тражи податке о диску на мрежи"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "Не ради У/И усмеравање"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "Ради у режиму опширности (прочишћавања)"
 
@@ -68,16 +60,12 @@
 msgid "Grip"
 msgstr "Грип"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "Грешка: Не могу да покренем [%s]\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr "Грип је успешно покренут\n"
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
@@ -85,73 +73,38 @@
 "Посао је у току.\n"
 "Да угасим?"
 
-#: src/grip.c:401
-msgid "Status"
-msgstr "Стање"
-
-#: src/grip.c:416
-msgid "General"
-msgstr "Опште"
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "Извлачење"
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
-msgstr "Кодирање"
+#: src/grip.c:380
+#, fuzzy
+#| msgid "Error: Unable to create temporary file."
+msgid "Unable to open help file"
+msgstr "Грешка: Не могу да направим привремену датотеку."
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "Помоћ"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "Табела садржаја"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "Пуштање ЦД-а"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "Извлачење са ЦД-а"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "Подешавање Грипа"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "ЧПП"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "Добавите још помоћи"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "Пријављивање грешака"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "О програму"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr "Издање %s"
 
-#: src/grip.c:641
+#: src/grip.c:505
 msgid "Error: Trying to show homepage failed."
 msgstr "Грешка: Покушај приказа матичне странице није успео."
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr "Направљено Грипом"
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -161,304 +114,312 @@
 "Треба поново да подесите Грип.\n"
 "Ваша стара датотека подешавања је сачувана са придодатом опцијом „-old“."
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "сервер је „%s“, порт %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 msgid "Error: Unable to save config file."
 msgstr "Грешка: Не могу да сачувам датотеку подешавања."
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "Подешавања"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "ЦД-РОМ уређај"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Не прекидај пуштање при изласку/покретању"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "Премотај на заустављање"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "Покрени се са првом нумером ако не пушташ"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "Сам пусти након убацивања диска"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "Измешај пре сваког пуштања"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr "Прескочи погрешно избацивање"
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr "Очисти уређај диска за нови диск"
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr "Интервал чишћења (у секундама)"
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "ЦД"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "Извлачивач:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "Извршна извлачења"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "Линија наредбе извлачења"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "Искључи параноју"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "Искључи додатну параноју"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "Искључи „scratch“"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "откривање"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "оправка"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr "Израчунај дотеривање појачања"
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "Формат излазне датотеке"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 msgid "Rip file format (Multi-artist)"
 msgstr "Формат излазне датотеке (Више извођача)"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "Општи СЦСИ уређај"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "Извлачивач"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "„nice“ вредност извлачења"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "Највише некодираних „.wav“-са"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "Сам извуци приликом убацивања"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "Запишти након извалачења"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "Сам избаци након извлачења"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "Застој ауто-избацивања"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr "Застој пре извлачења"
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr "Одложи кодирање док извлачиш са диска"
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr "Заустави цд уређај између нумера"
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "Наредба вав филтера"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "Наредба диск филтера"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "Опције"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "Извлачење"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "Енкодер:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr "Извршна енкодера"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr "Линија наредбе енкодера"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 msgid "Encoder file extension"
 msgstr "Проширење датотеке енкодера"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 msgid "Encoder file format"
 msgstr "Запис датотеке енкодера"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 msgid "Encode file format (Multi-artist)"
 msgstr "Формат датотеке енкодера (Више извођача)"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "Енкодер"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr "Обриши „.wav“ након кодирања"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "Уметни информације у СКуЛ базу података"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr "Направи „.m3u“ датотеке"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "Користи релативне путање у .m3u“ датотекама"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "Формат датотеке „M3U“"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Проток битова кодирања (у килобитовима по секунди)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "Број процесора за коришћење"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 msgid "Encoder 'nice' value"
 msgstr "„nice“ вредност енкодера"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 msgid "Encoder filter command"
 msgstr "Наредба филтера енкодера"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 msgid "Execute command after encode"
 msgstr "Изврши наредбу након кодирања"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "Кодирање"
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr "Додај ИД3 ознаке кодираним датотекама"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Додај ИД3в2 ознаке кодираним датотекама"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr "Само датотеке ознаке са завршетком на „.mp3“"
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "Поље ИД3 коментара"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr "Кодирање скупа ИД3в1 знакова"
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 msgid "ID3v2 Character set encoding"
 msgstr "Кодирање скупа ИД3в2 знакова"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "ИД3"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "Сервер БП"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "ЦГИ путања"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "Главни сервер"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "Помоћни сервер"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr "Е-пошта слања БП"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 msgid "DB Character set encoding"
 msgstr "Кодирање скупа знакова БП"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "Користи проширења слободне БП"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "Сам обави претрагу диска"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "БП диска"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "Користи посреднички сервер"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Добави сервер из променљиве окружења „http_proxy“"
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "Посреднички сервер"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "Порт посредника"
 
@@ -469,23 +430,23 @@
 # For consistent translation, here is the English text:
 #  msgstr "you must give the user name explicitly to this command"
 # Please translate the English msgstr, not the msgid.
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "Корисничко име посредника"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "Лозинка посредника"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "Посредник"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "Адреса е-поште"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "Програм ажурирања ЦД-а"
 
@@ -499,7 +460,7 @@
 # For consistent translation, here is the English text:
 #  msgstr "file \"$filename\" may not be a test"
 # Please translate the English msgstr, not the msgid.
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "Не пиши називе датотека малим словима"
 
@@ -514,23 +475,23 @@
 # For consistent translation, here is the English text:
 #  msgstr "attributes text left in the \"$filename\" file"
 # Please translate the English msgstr, not the msgid.
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr "Допусти високе битове у називима датотека"
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr "Замени несагласне знакове хексадецималним бројевима"
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "Не мењај размаке у подвлаке"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr "Записуј „m3u“ користећи не-посикс комплијант „'\\'s“"
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -538,19 +499,19 @@
 "Знакови који морају остати\n"
 "у називима датотека"
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr "Прикажи иконицу фиоке"
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "Разно"
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 msgid "Error: Unable to save ripper config."
 msgstr "Грешка: Не могу да сачувам подешавања извлачивача."
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 msgid "Error: Unable to save encoder config."
 msgstr "Грешка: Не могу да сачувам подешавања енкодера."
 
@@ -588,7 +549,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr "Не могу да претражујем док извлачим."
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "Непознат диск"
@@ -598,221 +558,194 @@
 msgid "Track %02d"
 msgstr "%02d. нумера"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "Пропитујем „%s“ (кроз „%s“) за диск %02x.\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "Пропитујем „%s“ за диск %02x.\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "Нема поклапања\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"Поклапање за „%s / %s“\n"
-"Преузимам податке...\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "Готово\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "Грешка чувања података диска\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 msgid "Length"
 msgstr "Трајање"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "Нумере"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr "Изаберите претходни унос БПЦД-а."
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr "Изаберите следећи унос БПЦД-а."
 
 #
 # File: libhylafax/FaxClient.c++, line: 1746
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "Нумера"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr "Одради следећи унос БП диска.\n"
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
 msgstr "Нема података о диску. Враћам се.\n"
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
 msgstr "Већ сам на последњем индексу. Враћам се.\n"
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 msgid "Done.\n"
 msgstr "Готово.\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
 msgstr "Одради претходни унос БП диска.\n"
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
 msgstr "Већ сам на првом индексу. Враћам се.\n"
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 msgid "Error saving disc data."
 msgstr "Грешка чувања података диска."
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "Окрените режим пуштања"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "Окините понављање пуштања"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "Стање извлачења"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "Пустите нумеру / Паузирајте пуштање"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "Премотајте уназад"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "Брзо премотајте унапред"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "Идите на претходну нумеру"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "Идите на следећу нумеру"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "Окините опције режима пуштања"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "Следећи диск"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "Зауставите пуштање"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "Избаците диск"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr "Прегледајте садржај диска"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "Окините управљање гласноћом"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "Окините уређивача диска"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Покрените/прекините претрагу БП диска"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "Окините приказ нумере"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Изађите из програма"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 msgid "Cannot fast forward while ripping."
 msgstr "Не могу брзо да премотам унапред док извлачим."
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 msgid "Cannot rewind while ripping."
 msgstr "Не могу да премотам уназад док извлачим."
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 msgid "Cannot switch discs while ripping."
 msgstr "Не могу да променим диск док извлачим."
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "Избаците диск\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 msgid "Cannot eject while ripping."
 msgstr "Не могу да избацим док извлачим."
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr "Има диска — избацујем\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 msgid "Cannot play while ripping."
 msgstr "Не могу да пуштам док извлачим."
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 msgid "Cannot switch tracks while ripping."
 msgstr "Не могу да променим нумере док извлачим."
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "Проверавам има ли новог диска\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "„CDStat“ је нашао диск, проверавам нумер\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "Имамо исправан диск!\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "Нема нумера не-нулте дужине\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "„CDStat“ рече да нема диска\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Текући сектор: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "Нема диска"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -824,24 +757,36 @@
 "\n"
 "Да ли желите да предате ове податке о диску?"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 msgid "Error: Unable to create temporary file."
 msgstr "Грешка: Не могу да направим привремену датотеку."
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 msgid "Error: Unable to write disc data."
 msgstr "Грешка: Не могу да запишем податке диска."
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Шаљем поштом унос на „%s“\n"
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 msgid "Error: Unable to execute mail command."
 msgstr "Грешка: Не могу да извршим наредбу поште."
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr ""
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr ""
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr ""
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "Порука система"
 
@@ -875,79 +820,79 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Грешка: Не могу да отворим „%s“ за писање\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "Наслов диска"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "Назив нумере"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr "W"
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "Извођач"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "ИД3 жанр:"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "Година диска"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "Назив нумере"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "Извођач нумере"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr "W"
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "Подели:"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "Наслов/Извођач"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "Извођач/Наслов"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr "Знаци поделе"
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "Више извођача"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "Сачувај податке диска"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "Пошаљи податке диска"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 msgid "No disc present."
 msgstr "Нема никаквог диска."
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 msgid "Cannot submit. No disc is present."
 msgstr "Не могу да пошаљем. Нема никаквог диска."
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 msgid "You must enter a disc title."
 msgstr "Морате унети наслов диска."
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 msgid "You must enter a disc artist."
 msgstr "Морате унети извођача диска."
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -965,7 +910,7 @@
 "\n"
 "Да наставим?"
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -977,11 +922,11 @@
 "\n"
 "Да наставим?"
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "Избор жанра"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -989,19 +934,18 @@
 "За предају је потребан жанр а не „непознат“\n"
 "Испод изаберите жанр БП диска"
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "Жанр БП диска"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "Пошаљи"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "Откажи"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "Непознато поље ИД3\n"
@@ -1012,178 +956,155 @@
 msgstr ""
 "Грешка: не могу да преведем назив датотеке. Нема таквог корисника као „%s“\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "Извршни није успео\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "Грешка: Лоша врста уноса\n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 msgid "Error: Reading config file\n"
 msgstr "Грешка: Читајући датотеку подешавања\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "Грешка: Неисправна датотека подешавања\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "Извуци+кодирај"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "Извуците и кодирајте изабране нумере"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "Само извуци"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "Извуците али не кодирајте изабране нумере"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr "Прекини извлачење и кодирање"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "Убијте све активне процесе извлачења и кодирања"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "Прекини само извлачење"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "Убијте процес извлачења"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "ДДЈ преглед"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "Уметните податке о диску у ДигиталнуДЈ базу података"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "Извуците делимичну нумеру"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "Пусти"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "Текући сектор:       0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "Извлачење: Мирујем"
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Енк: Нум 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
 msgstr "Кодирање: Мирујем"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr "Свеукупни указивачи:"
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "Почетни сектор"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "Крајњи сектор"
 
-#: src/rip.c:384
-#, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "Убацујем %d. нумеру у ддј базу података\n"
-
-#: src/rip.c:609
+#: src/rip.c:600
 msgid "Error: can't open m3u file."
 msgstr "Грешка: Не могу да отворим „m3u“ датотеку."
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr "У „KillRip“\n"
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr "Укупна величина енкодера је: %d\n"
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "Извлачење: %d. нумера (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr "Извлачење: %6.2f%%"
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "Извлачење је завршено\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr "Делимично извуци %d  број „wav“-са %d\n"
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "Следећа нумера је %d, укупно их је %d\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "Проверавам да ли треба да извучемо још неку нумеру\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "Кодирање: %d. нумера (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr "Енк: %6.2f%%"
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "Завршено је кодирање на процесору %d\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "Бришем [%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "Извлачење је завршено\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "Нема извођача"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "Нема наслова"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1191,7 +1112,7 @@
 "Нисам нашао диск у уређају. Ако сте ставили диск у уређај, проверите ваша "
 "подешавања ЦД уређаја у изборнику „Подешавања→ЦД“."
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1201,7 +1122,7 @@
 "Проверите ваша подешавања извлачења, и уверите се да је наведена пуна путања "
 "до његове извршне датотеке."
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1211,7 +1132,7 @@
 "Проверите ваша подешавања енкодера, и уверите се да је наведена пуна путања "
 "до његове извршне датотеке."
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1219,105 +1140,90 @@
 "Нисте изабрали нумере.\n"
 "Да извучем читав ЦД?\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "Извлачим читав ЦД\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr "У „RipNextTrack“\n"
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Прва проверена нумера је %d\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr "Извлачим!\n"
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "Немате права писања за вав датотеку"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "Извлачим %d. нумеру у „%s“\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Извлачење: %d. нумера (0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "Датотека „%s“ је већ извучена. Прескачем...\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "Нема места у директоријуму излаза"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "Позивам „CDPRip“\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Додата је %d. нумера на списак „%s“\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "Нема слободних процесора\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Кодирам %d. нумеру\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 msgid "No write access to write encoded file."
 msgstr "Немам права писања за кодирану датотеку."
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i: Кодирам у „%s“\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Енк: Нум %d (0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr "У „CalculateAll“\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr "Сада не извлачимо, зато имамо нулте вредности кодирања\n"
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Укупна величина извлачења: %d\n"
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Укупна величина кодирања: %d\n"
 
-#: src/tray.c:57
+#: src/tray.c:59
 msgid "Artist"
 msgstr "Извођач"
 
-#: src/tray.c:58
+#: src/tray.c:60
 msgid "Title"
 msgstr "Наслов"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1326,17 +1232,17 @@
 "%s — %s\n"
 "%02d:%02d од %02d:%02d"
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Извлачим  Нумера %02d:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Кодирам нумеру %02d:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1345,7 +1251,7 @@
 "%s — %s\n"
 "%s%s%s"
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1354,26 +1260,102 @@
 "%s — %s\n"
 "Мирујем"
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr "Застани"
 
-#: src/tray.c:196
+#: src/tray.c:186
 msgid "Stop"
 msgstr "Заустави"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr "Претходно"
 
-#: src/tray.c:209
+#: src/tray.c:199
 msgid "Next"
 msgstr "Следеће"
 
-#: src/tray.c:217
+#: src/tray.c:207
 msgid "Rip and Encode"
 msgstr "Извуци и кодирај"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr "Изађи"
+
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "Наводи геометрију главног прозора"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "ГЕОМЕТРИЈА"
+
+#~ msgid "Grip started successfully\n"
+#~ msgstr "Грип је успешно покренут\n"
+
+#~ msgid "Status"
+#~ msgstr "Стање"
+
+#~ msgid "General"
+#~ msgstr "Опште"
+
+#~ msgid "Playing CDs"
+#~ msgstr "Пуштање ЦД-а"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "Извлачење са ЦД-а"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "Подешавање Грипа"
+
+#~ msgid "FAQ"
+#~ msgstr "ЧПП"
+
+#~ msgid "Getting More Help"
+#~ msgstr "Добавите још помоћи"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "Пријављивање грешака"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "Пропитујем „%s“ (кроз „%s“) за диск %02x.\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "Пропитујем „%s“ за диск %02x.\n"
+
+#~ msgid "No match\n"
+#~ msgstr "Нема поклапања\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "Поклапање за „%s / %s“\n"
+#~ "Преузимам податке...\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "Избаците диск\n"
+
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "Убацујем %d. нумеру у ддј базу података\n"
+
+#~ msgid "Rip finished\n"
+#~ msgstr "Извлачење је завршено\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "Завршено је кодирање на процесору %d\n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "Бришем [%s]\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "Извлачење је завршено\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "Извлачим %d. нумеру у „%s“\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "Датотека „%s“ је већ извучена. Прескачем...\n"
+
+#~ msgid "%i: Encoding to %s\n"
+#~ msgstr "%i: Кодирам у „%s“\n"

grip-4.1.1.tar.gz/po/stamp-po Changed

grip-4.1.1.tar.gz/po/uk.gmo Added

grip-3.10.1.tar.gz/po/uk.po -> grip-4.1.1.tar.gz/po/uk.po Changed

@@ -2,15 +2,15 @@
 # Copyright (C) 2016, Grip developers
 # This file is distributed under the same license as the grip package.
 #
-# Yuri Chornoivan <yurchor@ukr.net>, 2017.
+# Yuri Chornoivan <yurchor@ukr.net>, 2017, 2020.
 msgid ""
 msgstr ""
-"Project-Id-Version: grip-3.6.0\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
-"PO-Revision-Date: 2017-12-31 13:00+0200\n"
+"Project-Id-Version: grip-4.1.0\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
+"PO-Revision-Date: 2020-02-05 12:09+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
+"Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,51 +18,43 @@
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 20.03.70\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "Визначити геометричні параметри головного вікна"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "ГЕОМЕТРІЯ"
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr ""
 "Вказати файл налаштувань, яким слід скористатися (у вашому домашньому "
 "каталозі)"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr "НАЛАШТУВАННЯ"
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "Вказати пристрій CDROM, яким слід скористатися"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "ПРИСТРІЙ"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "Вказати загальний пристрій SCSI, яким слід скористатися"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "Запустити у «малому» режимі (лише КД)"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr "«Локальний» режим — не шукати дані диска у інтернеті"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "Не виконувати переспрямовування введення-виведення"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "Запустити у режимі докладних повідомлень (діагностика)"
 
@@ -70,16 +62,12 @@
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "Помилка: не вдалося ініціалізувати [%s]\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr "Grip успішно запущено\n"
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
@@ -87,73 +75,36 @@
 "Виконується завдання.\n"
 "Справді хочете завершити роботу?"
 
-#: src/grip.c:401
-msgid "Status"
-msgstr "Стан"
-
-#: src/grip.c:416
-msgid "General"
-msgstr "Загальне"
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "Видобування"
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
-msgstr "Кодування"
+#: src/grip.c:380
+msgid "Unable to open help file"
+msgstr "Не вдалося відкрити файл довідки"
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "Довідка"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "Зміст"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "Відтворення компакт-дисків"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "Видобування даних з КД"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "Налаштовування Grip"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "Поширені питання"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "Отримання додаткової довідки"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "Надсилання звітів щодо вад"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "Про програму"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr "Версія %s"
 
-#: src/grip.c:641
+#: src/grip.c:505
 msgid "Error: Trying to show homepage failed."
 msgstr "Помилка: не вдалося показати домашню сторінку."
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr "Створено Grip"
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -163,348 +114,356 @@
 "Вам доведеться повторно налаштувати Grip.\n"
 "Ваш старий файл налаштувань збережено із додаванням до назви «-old»."
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "сервер %s, порт %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 msgid "Error: Unable to save config file."
 msgstr "Помилка: не вдалося зберегти файл налаштувань."
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "Налаштування"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "Пристрій CDROM"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Не переривати відтворення при виході/запуску"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "Переходити до початку, якщо зупинено"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "Запускати з першою композицією, якщо не відтворюється"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "Автоматично відтворювати після вставляння диска"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "Перемішувати композиції перед кожним відтворенням"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr "Обходити помилкове виштовхування диска"
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr "Опитувати пристрій читання щодо нових дисків"
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr "Інтервал опитування (у секундах)"
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "КД"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "Засіб видобування:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "Програма видобування"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "Рядок команди видобування"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "Вимкнути paranoia"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "Вимкнути додаткову paranoia"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "Вимкнути подряпини"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "виявлення"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "відновлення"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr "Обчислювати підсилення"
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "Формат файлів для видобування"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 msgid "Rip file format (Multi-artist)"
 msgstr "Формат файлів для видобування (декілька виконавців)"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "Загальний пристрій SCSI"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "Видирач"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "Пріоритетність процесу видобування"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "Макс. незакодованих .wav"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "Автоматично видобувати після вставлення"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "Гудок після видирання"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "Автоматично виштовхувати після видобування"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "Затримка автовиштовхування"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr "Затримка перед видобуванням"
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr "Затримати кодування до завершення видобування"
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr "Зупиняти диск CDROM між доріжками"
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "Команда фільтрування wav"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "Команда фільтрування дисків"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "Параметри"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "Видобування"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "Кодувальник:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr "Засіб кодування"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr "Командний рядок засобу кодування"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 msgid "Encoder file extension"
 msgstr "Суфікс назв закодованих файлів"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 msgid "Encoder file format"
 msgstr "Формат кодування файлів"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 msgid "Encode file format (Multi-artist)"
 msgstr "Формат кодування файлів (декілька виконавців)"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "Кодувальник"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr "Вилучати .wav після кодування"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "Додавати дані до бази даних SQL"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr "Створювати файли .m3u"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "Використовувати відносні шляхи у файлах .m3u"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "Формат файлів M3U"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Бітова швидкість (кбіт/с)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "Кількість процесорів для використання"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 msgid "Encoder 'nice' value"
 msgstr "Пріоритетність процесу кодування"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 msgid "Encoder filter command"
 msgstr "Команда фільтрування кодування"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 msgid "Execute command after encode"
 msgstr "Виконати команду після кодування"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "Кодування"
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr "Додати мітки ID3 до закодованих файлів"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Додати мітки ID3v2 до закодованих файлів"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr "Додавати мітки тільки до .mp3"
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "Поле коментаря ID3"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr "Кодування символів ID3v1"
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 msgid "ID3v2 Character set encoding"
 msgstr "Кодування символів ID3v2"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "Сервер БД"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "Шлях CGI"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "Основний сервер"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "Допоміжний сервер"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr "Адреса для надсилання до БД"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 msgid "DB Character set encoding"
 msgstr "Кодування символів БД"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "Використовувати розширення freedb"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "Виконувати автоматичний пошук дисків"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "Використовувати проксі-сервер"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Визначити сервер за змінною http_proxy"
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "Проксі-сервер"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "Порт проксі-сервера"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "Користувач проксі"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "Пароль до проксі"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "Проксі"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "Адреса ел. пошти"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "Програма оновлення КД"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "Не переводити назви файлів у нижній регістр"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr "Дозволити нелатинські літери у назвах файлів"
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr "Замінювати несумісні символи на шістнадцяткові числа"
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "Не замінювати пробіли підкреслюваннями"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr "Записувати файли m3u із використанням несумісних з POSIX «\\»"
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -512,19 +471,19 @@
 "Символи, які не слід обрізати\n"
 "з назв файлів"
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr "Показувати піктограму у лотку"
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "Інше"
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 msgid "Error: Unable to save ripper config."
 msgstr "Помилка: не вдалося зберегти налаштування засобу видобування."
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 msgid "Error: Unable to save encoder config."
 msgstr "Помилка: не вдалося зберегти налаштування засобу кодування."
 
@@ -564,7 +523,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr "Не можна виконувати пошук під час видобування."
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "Невідомий диск"
@@ -574,219 +532,192 @@
 msgid "Track %02d"
 msgstr "Доріжка %02d"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "Опитуємо %s (за допомогою %s) щодо диска %02x.\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "Опитуємо %s щодо диска %02x.\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "Немає відповідників\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"Відповідник до «%s / %s»\n"
-"Отримуємо дані…\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "Виконано\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "Помилка під час спроби зберегти дані диска\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 msgid "Length"
 msgstr "Тривалість"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "Доріжки"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr "Вибрати попередній запис CDDB."
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr "Вибрати наступний запис CDDB."
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "Доріжка"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr "DoNextDiscDBEntry.\n"
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
 msgstr "Немає даних на диску. Повертаємося.\n"
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
 msgstr "Вже на останній позиції у покажчику. Повертаємося.\n"
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 msgid "Done.\n"
 msgstr "Виконано.\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
 msgstr "DoPrevDiscDBEntry.\n"
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
 msgstr "Вже на першій позиції у покажчику. Повертаємося.\n"
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 msgid "Error saving disc data."
 msgstr "Помилка під час збереження даних диска."
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "Режим ротації відтворення"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "Увімкнути/Вимкнути циклічне відтворення"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "Стан видобування"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "Відтворити доріжку / Призупинити відтворення"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "Перемотати до початку"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "ШвидкВперед"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "Перехід до попередньої композиції"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "Перейти до наступної доріжки"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "Увімкнути/Вимкнути параметри режиму відтворення"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "Наступний диск"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "Зупинити відтворення"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "Виштовхнути диск"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr "Сканувати вміст диска"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "Увімкнути/Вимкнути керування гучністю"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "Увімкнути/Вимкнути редактор диска"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Почати/Перервати пошук у БД дисків"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "Увімкнути/Вимкнути показ доріжки"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Вийти з Grip"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 msgid "Cannot fast forward while ripping."
 msgstr "Не можна перемотувати до кінця, доки триває видобування."
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 msgid "Cannot rewind while ripping."
 msgstr "Не можна перемотувати, доки триває видобування."
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 msgid "Cannot switch discs while ripping."
 msgstr "Не можна перемикати диски, доки триває видобування."
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "Виштовхнути диск\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 msgid "Cannot eject while ripping."
 msgstr "Не можна виштовхувати диск, доки триває видобування."
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr "Маємо диск — виштовхуємо\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 msgid "Cannot play while ripping."
 msgstr "Не можна відтворювати дані, доки триває видобування."
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 msgid "Cannot switch tracks while ripping."
 msgstr "Не можна перемикати доріжки, доки триває видобування."
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "Перевіряємо, чи є новий диск\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat виявлено диск, шукаємо доріжки\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "Маємо коректний диск!\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "Доріжки ненульової тривалості\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "CDStat повідомила, що диска немає\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Поточний сектор: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "Немає диска"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -798,24 +729,36 @@
 "\n"
 "Хочете надіслати дані щодо цього диска?"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 msgid "Error: Unable to create temporary file."
 msgstr "Помилка: не вдалося створити тимчасовий файл."
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 msgid "Error: Unable to write disc data."
 msgstr "Помилка: не вдалося записати дані диска."
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Надсилаємо запис електронною поштою до %s\n"
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 msgid "Error: Unable to execute mail command."
 msgstr "Помилка: не вдалося виконати команду mail."
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr "Попередження"
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr "Інформація"
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr "Питання"
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "Повідомлення системи"
 
@@ -849,79 +792,79 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Помилка: не вдалося відкрити %s для запису\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "Назва диска"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "Назва доріжки"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr "W"
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "Виконавець диска"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "Жанр ID3:"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "Рік диска"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "Назва доріжки"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "Виконавець доріжки"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr "W"
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "Розділити:"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "Назва/Виконавець"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "Виконавець/Назва"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr "Символи розділення"
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "Декілька виконавців"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "Зберегти дані диска"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "Надіслати дані диска"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 msgid "No disc present."
 msgstr "Немає диска."
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 msgid "Cannot submit. No disc is present."
 msgstr "Неможливо надіслати. Немає диска."
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 msgid "You must enter a disc title."
 msgstr "Вам слід вказати назву диска."
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 msgid "You must enter a disc artist."
 msgstr "Вам слід вказати виконавця диска."
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -939,7 +882,7 @@
 "\n"
 "Надіслати дані?"
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -951,11 +894,11 @@
 "\n"
 "Зробити це?"
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "Вибір жанру"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -963,19 +906,18 @@
 "Для надсилання слід вказати жанр відмінний від «невідомий».\n"
 "Будь ласка, виберіть нижче жанр для DiscDB"
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "Жанр у DiscDB"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "Надіслати"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "Скасувати"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "невідоме поле ID3\n"
@@ -985,178 +927,155 @@
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr "Помилка: не вдалося перекласти назву файла. Немає користувача %s\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "Помилка запуску\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "Помилка: помилковий тип запису\n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 msgid "Error: Reading config file\n"
 msgstr "Помилка: читаємо файл налаштувань\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "Помилка: некоректний файл налаштувань\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "Видобути+Закодувати"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "Видобути і закодувати позначені доріжки"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "Лише видобути"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "Видобути, але не кодувати позначені доріжки"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr "Перервати видобування і кодування"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "Вбити усі активні процеси видобування і кодування"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "Перервати лише видобування"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "Завершити процес видобування"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "Сканування DDJ"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "Вставити дані диска до бази даних DigitalDJ"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "Видобути окрему доріжку"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "Пуск"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "Поточний сектор:"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "Вид.: бездіяльний"
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Код.: Дор. 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
 msgstr "Код.: бездіяльний"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr "Загалом індикаторів:"
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "Початковий сектор"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "Кінцевий сектор"
 
-#: src/rip.c:384
-#, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "Вставляємо доріжку %d до бази даних ddj\n"
-
-#: src/rip.c:609
+#: src/rip.c:600
 msgid "Error: can't open m3u file."
 msgstr "Помилка: не вдалося відкрити файл m3u."
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr "У KillRip\n"
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr "Зараз загальний об’єм закодованого: %d\n"
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "Вид.: дор. %d (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr "Вид.: %6.2f%%"
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "Видобування завершено\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr "Вид. окремо %d  к-ть wav: %d\n"
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "Наступна доріжка — %d, загалом — %d\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "Перевірити, чи слід видобувати ще доріжки\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "Код.: дор. %d (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr "Код.: %6.2f%%"
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "Завершено кодування на процесорі %d\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "Вилучаємо [%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "Видобування завершено\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "НемаєВиконавця"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "НемаєНазви"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1165,7 +1084,7 @@
 "будь ласка, перевірте, чи правильно встановлено пристрій для читання компакт "
 "дисків за допомогою меню «Налаштування -> КД»."
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1175,7 +1094,7 @@
 "Перевірте налаштування вашого засобу видобування і переконайтеся, що шлях до "
 "виконуваного файла засобу видобування вказано повністю."
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1185,7 +1104,7 @@
 "Перевірте налаштування вашого засобу кодування і переконайтеся, що шлях до "
 "виконуваного файла засобу кодування вказано повністю."
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1193,105 +1112,90 @@
 "Не позначено доріжок.\n"
 "Видобути увесь компакт-диск?\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "Видобуваємо увесь компакт-диск\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr "У RipNextTrack\n"
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Першою позначеною доріжкою є %d\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr "Видобуваємо!\n"
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "Немає доступу на запис до файла wav"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "Видобуваємо доріжку %d до %s\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Вид.: дор. %d (0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "Файл %s вже видобуто. Пропускаємо…\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "Немає вільного місця у каталозі для запису результатів"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "Викликаємо CDPRip\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Додано доріжку %d до списку %s\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "Немає вільних процесорів\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Кодуємо доріжку %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 msgid "No write access to write encoded file."
 msgstr "Немає доступ до запису закодованого файла."
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i: кодуємо до %s\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "Код.: дор. %d (0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr "У CalculateAll\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr "Зараз ми видобуваємо дані, отже занулюємо значення кодування\n"
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Загалом видобуто: %d\n"
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Загалом закодовано: %d\n"
 
-#: src/tray.c:57
+#: src/tray.c:59
 msgid "Artist"
 msgstr "Виконавець"
 
-#: src/tray.c:58
+#: src/tray.c:60
 msgid "Title"
 msgstr "Назва"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1300,17 +1204,17 @@
 "%s - %s\n"
 "%02d:%02d з %02d:%02d"
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Видобуваємо доріжку %02d:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Кодуємо доріжку %02d:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1319,7 +1223,7 @@
 "%s - %s\n"
 "%s%s%s"
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1328,26 +1232,26 @@
 "%s - %s\n"
 "бездіяльний"
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr "Пауза"
 
-#: src/tray.c:196
+#: src/tray.c:186
 msgid "Stop"
 msgstr "Стоп"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr "Назад"
 
-#: src/tray.c:209
+#: src/tray.c:199
 msgid "Next"
 msgstr "Далі"
 
-#: src/tray.c:217
+#: src/tray.c:207
 msgid "Rip and Encode"
 msgstr "Видобути і закодувати"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr "Вийти"

grip-4.1.1.tar.gz/po/vi.gmo Added

grip-3.10.1.tar.gz/po/vi.po -> grip-4.1.1.tar.gz/po/vi.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grip 3.5.2\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
 "PO-Revision-Date: 2017-08-06 06:33+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,47 +19,39 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "Xác định vị trí của sổ chính"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "TỌA_ĐỘ"
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr "Chỉ định tập tin cấu hình muốn dùng (trong thư mục cá nhân của bạn)"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr "CẤU_HÌNH"
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "Chỉ định thiết bị cdrom muốn dùng"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "THIẾT_BỊ"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "Chỉ định thiết bị scsi chung muốn dùng"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "Khởi chạy trong chế độ “small” (chỉ-cd)"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr "Chế độ “Local” -- không tìm kiếm thông tin đĩa trên mạng"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "Đừng chuyển hướng V/R"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "Chạy trong chế độ chi tiết (gỡ lỗi)"
 
@@ -67,16 +59,12 @@
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "Lỗi: Không thể khởi tạo [%s]\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr "Bộ trích nhạc đã khởi chạy thành công\n"
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
@@ -84,73 +72,38 @@
 "Công việc vẫn đang được xử lý.\n"
 "Có thực sự muốn tắt không?"
 
-#: src/grip.c:401
-msgid "Status"
-msgstr "Tình trạng"
-
-#: src/grip.c:416
-msgid "General"
-msgstr "Chung"
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "Trích nhạc"
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
-msgstr "Mã hóa"
+#: src/grip.c:380
+#, fuzzy
+#| msgid "Error: Unable to create temporary file."
+msgid "Unable to open help file"
+msgstr "Lỗi: Không thể tạo tập tin tạm thời."
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "Trợ giúp"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "Mục lục"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "Phát CD"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "Trích nhạc từ CD"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "Cấu hình Grip"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "FAQ"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "Muốn xem thêm trợ giúp"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "Thông báo lỗi"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "Giới thiệu"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr "Phiên bản %s"
 
-#: src/grip.c:641
+#: src/grip.c:505
 msgid "Error: Trying to show homepage failed."
 msgstr "Lỗi: Gặp lỗi khi cố hiển thị trang thông tin điện tử."
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr "Đã được tạo bởi Grip"
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -160,348 +113,356 @@
 "Bạn sẽ cần cấu hình lại Grip.\n"
 "Tập tin cấu hình cũ của bạn đã được ghi lại với -old treo thêm."
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "máy phục vụ là %s, cổng %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 msgid "Error: Unable to save config file."
 msgstr "Lỗi: Không thể lưu lại tập tin cấu hình."
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "Cấu hình"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "Thiết bị CDRom"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Đừng ngắt phát lại khi thoát/khởi động"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "Tua lại khi dừng"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "Bắt đầu với rãnh đầu tiên nếu không phát"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "Tự phát khi đĩa được đưa vào"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "Xáo trộn lại trước mỗi lần phát"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr "Công việc xung quanh khiếm khuyết đẩy đĩa ra"
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr "Thăm dò ổ đĩa để tìm đía mới"
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr "Khoảng nhịp thăm dò (giây)"
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "CD"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "Bộ trích nhạc:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "Lệnh thực thi rút trích"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "Dòng lệnh trích nhạc"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "Tắt đoán nhận"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "Tắt đoán nhận mở rộng"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "Tắt xước"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "phát hiện"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "sửa chữa"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr "Tính toán sự chỉnh sửa độ khuyếch đại"
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "Định dạng tập tin trích nhạc"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 msgid "Rip file format (Multi-artist)"
 msgstr "Định dạng tập tin trích nhạc (Nhiều-nghệ-sỹ)"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "Thiết bị SCSI đa dụng"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "Bộ trích nhạc"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "Giá trị “nice” trích nhạc"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "Chưa-mã-hóa tối đa của wav"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "Tự trích nhạc khi đưa đĩa vào"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "Kêu bíp sau khi trích nhạc"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "Tự động đẩy đĩa ra sau khi trích nhạc"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "Độ trễ tự động đẩy đĩa ra"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr "Độ trễ trước khi trích nhạc"
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr "Độ trễ mã hóa cho đến khi đĩa được trích xong"
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr "Dừng đĩa cdrom giữa các rãnh"
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "Lệnh lọc wav"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "Lệnh lọc đĩa"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "Các tùy chọn"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "Trích nhạc"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "Bộ mã hóa:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr "Phần mềm thực thi mã hóa"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr "Dòng lệnh mã hóa"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 msgid "Encoder file extension"
 msgstr "Đuôi tập tin bộ mã hóa"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 msgid "Encoder file format"
 msgstr "Định dạng tập tin bộ mã hóa"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 msgid "Encode file format (Multi-artist)"
 msgstr "Định dạng tập tin bộ mã hóa (Nhiều-nghệ-sỹ)"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "Bộ mã hóa:"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr "Xóa .wav sau khi mã hóa"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "Chèn thông tin vào cơ sở dữ liệu SQL"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr "Tạo các tập tin .m3u"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "Dùng đường dẫn tương đối trong tập tin .m3u"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "Định dạng tập tin M3U"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "Tốc độ bít mã hóa (kbits/giây)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "Số bộ xử lý cần dùng"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 msgid "Encoder 'nice' value"
 msgstr "Giá trị “nice” cho bộ mã hóa"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 msgid "Encoder filter command"
 msgstr "Lệnh lọc bộ mã hóa"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 msgid "Execute command after encode"
 msgstr "Lệnh thực hiện sau khi mã hóa"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "Mã hóa"
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr "Thêm thẻ ID3 vào tập tin đã mã hóa"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr "Thêm thẻ ID3v2 vào tập tin đã mã hóa"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr "Chỉ đánh thẻ các các tập tin kết thúc bằng “.mp3”"
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "Trường chú thích ID3"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr "Bảng mã bộ ký tự ID3v1"
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 msgid "ID3v2 Character set encoding"
 msgstr "Bảng mã bộ ký tự ID3v2"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "ID3"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "Máy phục vụ DB"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "Đường dẫn CGI"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "Máy phục vụ chính"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "Máy phục vụ phụ"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr "Thư điện tử đệ trình DB"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 msgid "DB Character set encoding"
 msgstr "Bảng mã bộ ký tự DB"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "Dùng phần mở rộng freedb"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "Thực hiện tìm kiếm đĩa một cách tự động"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "DiscDB"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "Dùng máy phục vụ ủy nhiệm"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr "Lấy máy phục vụ từ biến môi trường “http_proxy”"
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "Máy chủ ủy nhiệm"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "Cổng ủy nhiệm"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "Tên người dùng ủy nhiệm"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "Mật khẩu máy chủ ủy nhiệm"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "Ủy nhiệm"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "Địa chỉ thư điện tử"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "Chương trình cập nhật CD"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "Đừng chuyển đổi tên tập tin sang chữ thường"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr "Cho phép các bít cao trong tên tập tin"
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr "Thay thế các ký tự không tương thích bằng các số thập lục phân."
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "Đừng đổi khoảng trắng thành gạch dưới"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr "Ghi các tập tin m3u sử dụng “\\”s tương thích không-posix"
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -509,19 +470,19 @@
 "Các ký tự sẽ không cắt bỏ\n"
 "trong các tên tập tin"
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr "Hiện biểu tượng khay hệ thống"
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "Linh tinh"
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 msgid "Error: Unable to save ripper config."
 msgstr "Lỗi: Không thể lưu cấu hình bộ trích nhạc."
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 msgid "Error: Unable to save encoder config."
 msgstr "Lỗi: Không thể lưu cấu hình bộ mã hóa."
 
@@ -559,7 +520,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr "Không thể thực hiện việc tìm kiếm khi đang trích xuất nhạc."
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "Không biết Đĩa"
@@ -569,220 +529,193 @@
 msgid "Track %02d"
 msgstr "Rãnh %02d"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "Truy vấn %s (thông qua %s) cho đĩa %02x.\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "Đang truy vấn %s cho đĩa %02x.\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "Không khớp\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"Khớp cho “%s / %s”\n"
-"Đang tải dữ liệu về…\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "Xong\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "Gặp lỗi khi lưu dữ liệu đĩa\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 msgid "Length"
 msgstr "Độ dài"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "Rãnh"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "Rãnh"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 #, fuzzy
 msgid "Done.\n"
 msgstr "Xong\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 msgid "Error saving disc data."
 msgstr "Gặp lỗi khi lưu dữ liệu đĩa."
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "Chế độ phát quay"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "Bật/tắt phát lặp"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "Tình trạng trích nhạc"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "Phát rãnh hay dừng phát"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "Tua lại"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "Chuyển-tiếp-nhanh"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "Chuyển đến rãnh kế trước"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "Chuyển đến rãnh kế tiếp"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "Bật/tắt các tùy chọn chế độ phát"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "Đĩa kế"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "Dừng phát"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "Đẩy đĩa ra"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr "Quét nội dung đĩa"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "Bật/tắt điều khiển âm lượng"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "Bật/tắt bộ soạn thảo đĩa"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "Bắt đầu hay bãi bỏ tìm kiếm DiscDB"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "Bật/tắt hiển thị rãnh"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Thoát khỏi Grip"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 msgid "Cannot fast forward while ripping."
 msgstr "Không thể tua nhanh trong khi đang trích nhạc."
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 msgid "Cannot rewind while ripping."
 msgstr "Không thể tua trong khi đang trích nhạc."
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 msgid "Cannot switch discs while ripping."
 msgstr "Không thể chuyển đĩa trong khi đang trích nhạc."
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "Đẩy đĩa ra\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 msgid "Cannot eject while ripping."
 msgstr "Không thể đẩy đĩa ra trong khi đang trích nhạc."
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr "Có đĩa -- đang đẩy ra\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 msgid "Cannot play while ripping."
 msgstr "Không thể phát khi đang trích nhạc."
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 msgid "Cannot switch tracks while ripping."
 msgstr "Không thể chuyển rãnh trong khi đang trích nhạc."
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "Đang kiểm tra cho đĩa mới\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat tìm thấy một đĩa, đang kiểm tra các rãnh\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "Chúng ta có một đĩa không hợp lệ!\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "Không có rãnh nào có chiều dài khác không\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "CDStat nói rằng không có đĩa\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "Cung hiện tại: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "Không có đĩa"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -794,24 +727,36 @@
 "\n"
 "Bạn có muốn gửi thông tin đĩa này không?"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 msgid "Error: Unable to create temporary file."
 msgstr "Lỗi: Không thể tạo tập tin tạm thời."
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 msgid "Error: Unable to write disc data."
 msgstr "Lỗi: Không thể ghi dữ liệu đĩa."
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "Đang gửi mục tin đến %s\n"
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 msgid "Error: Unable to execute mail command."
 msgstr "Lỗi: Không thể thực hiện lệnh gửi thư."
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr ""
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr ""
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr ""
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "Lời nhắn từ hệ thống"
 
@@ -845,79 +790,79 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "Lỗi: Không thể mở %s để ghi\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "Tựa đề đĩa"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "Tên rãnh"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr "W"
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "Nghệ sỹ đĩa"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "Thể loại ID3:"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "Năm của đĩa"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "Tên rãnh"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "Nghệ sỹ của rãnh"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr "W"
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "Chia nhỏ:"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "Tựa đề/Nghệ sĩ"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "Nghệ sĩ/Tựa đề"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr "Các ký tự chia nhỏ"
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "Nhiều-nghệ-sỹ"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "Lưu lại thông tin về đĩa"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "Đệ trình thông tin về đĩa"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 msgid "No disc present."
 msgstr "Không có đĩa nào hiện diện."
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 msgid "Cannot submit. No disc is present."
 msgstr "Không thể gửi. Không có đĩa nào hiện diện."
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 msgid "You must enter a disc title."
 msgstr "Bạn cần phải nhập một tiêu đề cho đĩa."
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 msgid "You must enter a disc artist."
 msgstr "Bạn cần phải nhập một nghệ sỹ cho đĩa."
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -935,7 +880,7 @@
 "\n"
 "Tiếp tục?"
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -947,11 +892,11 @@
 "\n"
 "Tiếp tục?"
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "Chọn thể loại"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -959,19 +904,18 @@
 "Việc đệ trình yêu cầu một thể loại khác “unknown”\n"
 "Vui lòng chọn thể loại DiscDB bên dưới"
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "Thể loại DiscDB"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "Gửi"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "Thôi"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "trường ID3 chưa biết\n"
@@ -981,178 +925,155 @@
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr "Lỗi: không thể biên dịch tên tập tin. Không có người nào là %s\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "Exec gặp lỗi\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "Lỗi: Sai kiểu mục tin\n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 msgid "Error: Reading config file\n"
 msgstr "Lỗi: Gặp lỗi khi đọc tập tin cấu hình\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "Lỗi: tập tin cấu hình không hợp lệ\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "Trích+Mã hóa"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "Trích và mã hóa các rãnh được chọn"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "Chỉ trích"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "Trích nhưng không mã hóa các rãnh đã chọn"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr "Về Trích nhạc và Mã hóa"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "Giết mọi tiến trình trích và mã hóa nhạc"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "Chỉ giới thiệu về trích nhạc"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "Giết tiến trình trích nhạc"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "DDJ Scan"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "Chèn thông tin đĩa vào cơ sở dữ liệu DigitalDJ"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "Trích rãnh cụ thể"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "Phát"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "Cung từ hiện tại:      0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "Trích nhạc: Nghỉ"
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "Mhóa: Rãnh 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
 msgstr "Mhóa: Nghỉ"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr "Bộ chỉ thị tổng thể:"
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "Cung từ đầu"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "Cung từ cuối"
 
-#: src/rip.c:384
-#, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "Đang chèn rãnh %d vào cơ sở dữ liệu ddj\n"
-
-#: src/rip.c:609
+#: src/rip.c:600
 msgid "Error: can't open m3u file."
 msgstr "Lỗi: không thể mở tập tin m3u."
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr "Trong KillRip\n"
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr "Hiện giờ, cỡ mã hóa tổng thể là: %d\n"
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "Trích nhạc: Rãnh %d (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr "Trích nhạc: %6.2f%%"
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "Trích nhạc đã hoàn tất\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr "Trích từng phần %d số wav %d\n"
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "Rãnh kế là %d, tổng là %d\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "Chọn nếu chúng ta muốn trích nhạc từ rãnh khác\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "Mhóa: Rãnh %d (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr "Mhóa: %6.2f%%"
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "Đã hoàn tất mã hóa trên cpu %d\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "Đang xóa [%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "Việc trích nhạc đã hoàn tất\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "KhôngNghệSỹ"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "KhôngTiêuĐề"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1160,7 +1081,7 @@
 "Không tìm thấy đĩa trong ổ đĩa. Nếu bạn có một đĩa trong ổ đĩa, vui lòng "
 "kiểm tra các cài đặt thiết bị CDRom dưới Cấu hình->CD."
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1170,7 +1091,7 @@
 "Hãy kiểm tra lại cấu hình rip, và đảm bảo rằng nó được đưa ra với đường dẫn "
 "phần mềm thực thi rip dạng đầy đủ."
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1180,7 +1101,7 @@
 "Hãy kiểm tra lại cấu hình mã hóa, và đảm bảo rằng nó được đưa ra với đường "
 "dẫn phần mềm thực thi mã hóa dạng đầy đủ."
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1188,107 +1109,92 @@
 "Chưa chọn rãnh nào.\n"
 "Trích nhạc từ toàn bộ CD?\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "Đang trích toàn bộ CD\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr "Trong RipNextTrack\n"
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "Rãnh đã được kiểm tra đầu tiên là %d\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr "Cứ trích đi!\n"
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "Không có quyền ghi để ghi tập tin wav"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "Trích nhạc rãnh %d thành %s\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "Trích: Rãnh %d (0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "Tập tin %s đã được trích rồi. Nên bỏ qua…\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "Hết chỗ trống trong thư mục xuất"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "Đang gọi CDPRip\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "Đã thêm %d rãnh vào trong danh sách %s\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "Không còn cpu rảnh rỗi\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr "Mã hóa rãnh %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 msgid "No write access to write encoded file."
 msgstr "Không có quyền ghi để ghi tập tin đã được mã hóa."
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i: Đang mã hóa thành %s\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "MHóa: Rãnh %d (0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr "Trong CalculateAll\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 "Chúng tôi hiện đang không trích nhạc, vậy thì hãy làm cho các giá trị mã hóa "
 "thành số không\n"
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr "Kích cỡ trích nhạc tổng thể là: %d\n"
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr "Kích cỡ mã hóa tổng thể là: %d\n"
 
-#: src/tray.c:57
+#: src/tray.c:59
 msgid "Artist"
 msgstr "Nghệ sĩ"
 
-#: src/tray.c:58
+#: src/tray.c:60
 msgid "Title"
 msgstr "Tiêu đề"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1297,17 +1203,17 @@
 "%s - %s\n"
 "%02d:%02d trên %02d:%02d"
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Đang trích  Rãnh %02d:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr "Đang mã hóa rãnh %02d:\t%6.2f%% (%6.2f%% )"
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1316,7 +1222,7 @@
 "%s - %s\n"
 "%s%s%s"
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1325,26 +1231,102 @@
 "%s - %s\n"
 "Nghỉ"
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr "Tạm dừng"
 
-#: src/tray.c:196
+#: src/tray.c:186
 msgid "Stop"
 msgstr "Dừng"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr "Kế trước"
 
-#: src/tray.c:209
+#: src/tray.c:199
 msgid "Next"
 msgstr "Kế tiếp"
 
-#: src/tray.c:217
+#: src/tray.c:207
 msgid "Rip and Encode"
 msgstr "Trích nhạc và Mã hóa"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr "Thoát"
+
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "Xác định vị trí của sổ chính"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "TỌA_ĐỘ"
+
+#~ msgid "Grip started successfully\n"
+#~ msgstr "Bộ trích nhạc đã khởi chạy thành công\n"
+
+#~ msgid "Status"
+#~ msgstr "Tình trạng"
+
+#~ msgid "General"
+#~ msgstr "Chung"
+
+#~ msgid "Playing CDs"
+#~ msgstr "Phát CD"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "Trích nhạc từ CD"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "Cấu hình Grip"
+
+#~ msgid "FAQ"
+#~ msgstr "FAQ"
+
+#~ msgid "Getting More Help"
+#~ msgstr "Muốn xem thêm trợ giúp"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "Thông báo lỗi"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "Truy vấn %s (thông qua %s) cho đĩa %02x.\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "Đang truy vấn %s cho đĩa %02x.\n"
+
+#~ msgid "No match\n"
+#~ msgstr "Không khớp\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "Khớp cho “%s / %s”\n"
+#~ "Đang tải dữ liệu về…\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "Đẩy đĩa ra\n"
+
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "Đang chèn rãnh %d vào cơ sở dữ liệu ddj\n"
+
+#~ msgid "Rip finished\n"
+#~ msgstr "Trích nhạc đã hoàn tất\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "Đã hoàn tất mã hóa trên cpu %d\n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "Đang xóa [%s]\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "Việc trích nhạc đã hoàn tất\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "Trích nhạc rãnh %d thành %s\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "Tập tin %s đã được trích rồi. Nên bỏ qua…\n"
+
+#~ msgid "%i: Encoding to %s\n"
+#~ msgstr "%i: Đang mã hóa thành %s\n"

grip-4.1.1.tar.gz/po/zh_CN.gmo Added

grip-3.10.1.tar.gz/po/zh_CN.po -> grip-4.1.1.tar.gz/po/zh_CN.po Changed

@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the grip package.
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # Merlin Ma <merlin@turbolinux.com.cn>, 2002.
-# Boyuan Yang <073plan@gmail.com>, 2018.
+# Boyuan Yang <073plan@gmail.com>, 2018, 2019.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: grip 3.6.0\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
-"PO-Revision-Date: 2018-05-26 17:11+0800\n"
+"Project-Id-Version: grip 4.0.0\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
+"PO-Revision-Date: 2019-10-05 15:44-0400\n"
 "Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -17,49 +17,41 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
-"X-Generator: Poedit 2.0.7\n"
+"X-Generator: Poedit 2.2.4\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "指定主窗口的位置几何属性"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "几何属性"
-
-#: src/main.c:65
+#: src/main.c:60
 msgid "Specify the config file to use (in your home dir)"
 msgstr "请指定要使用的配制文件(在您的主目录中)"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr "配置"
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "指定 CDROM 设备"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "设备"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "指定要使用的常规 SCSI 设备"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "运行于小模式 (CD-only)"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr "运行于本地模式──不查询网络"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "不做 I/O 重定向"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "运行于除错模式"
 
@@ -67,16 +59,12 @@
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "错误: 无法初始化 [%s]\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr "Grip 成功启动\n"
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
@@ -84,73 +72,38 @@
 "正在工作中。\n"
 "真的要关闭吗？"
 
-#: src/grip.c:401
-msgid "Status"
-msgstr "状态"
-
-#: src/grip.c:416
-msgid "General"
-msgstr "通用"
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "抓轨"
-
-#: src/grip.c:446 src/gripcfg.c:511
-msgid "Encode"
-msgstr "编码"
+#: src/grip.c:380
+#, fuzzy
+#| msgid "Error: Unable to create temporary file."
+msgid "Unable to open help file"
+msgstr "错误: 无法创建临时文件。"
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "帮助"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "目录"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "播放 CD"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "CD 抓轨"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "配置 Grip"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "常见问题解答"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "获得更多帮助"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "报告错误"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "关于"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr "版本 %s"
 
-#: src/grip.c:641
+#: src/grip.c:505
 msgid "Error: Trying to show homepage failed."
 msgstr "错误：尝试显示主页失败。"
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr "由 Grip 创建"
 
-#: src/grip.c:938
+#: src/grip.c:800
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
 "You will need to re-configure Grip.\n"
@@ -160,366 +113,374 @@
 "您可能需要重新配置 Grip。\n"
 "旧的配置文件已经被附加 -old 作为文件名保存."
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "服务器是 %s, 端口 %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 msgid "Error: Unable to save config file."
 msgstr "错误: 无法保存配置文件。"
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "配置"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "CDROM 设备"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "退出和启动的时候不中断放音"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "停止时后退到曲首"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "如果没有开始播放则从第一首开始"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "CD 插入时自动播放"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "每次播放前重新打乱播放次序"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr "修正错误的弹出"
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr "轮询盘片驱动器以查找新光盘"
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr "轮询间隔（秒）"
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "光盘"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "抓轨工具:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "抓轨程序"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "抓轨器运行参数"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "禁用 paranoia"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "禁用外部 paranoia"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "禁用擦痕"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "侦测"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "修复"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr "计算增益调整"
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "抓轨文件格式"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 msgid "Rip file format (Multi-artist)"
 msgstr "抓轨文件格式（多艺术家）"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "常规 SCSI 设备"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "抓轨工具"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "抓轨 'nice' 优先值"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "最大待编码的 .wav 文件数"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "光盘插入自动抓轨"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "抓轨完成后响铃"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "抓轨完成后自动弹出光盘"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "自动弹出延迟"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr "抓轨前延迟"
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr "延迟编码直到碟片完成抓轨"
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr "在曲目之间停止 CDROM 驱动器"
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "WAV 过滤器命令"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "光盘过滤器命令"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "选项"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "抓轨"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "编码器:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 msgid "Encoder executable"
 msgstr "编码器程序"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 msgid "Encoder command-line"
 msgstr "编码器命令行"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 msgid "Encoder file extension"
 msgstr "编码器文件扩展名"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 msgid "Encoder file format"
 msgstr "编码器文件格式"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 msgid "Encode file format (Multi-artist)"
 msgstr "编码文件格式（多艺术家）"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "编码器"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr "编码后删除 .wav 文件"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "插入信息到 SQL 数据库"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr "创建 .m3u 文件"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "在 .m3u 文件中使用相对路径"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "M3U 文件格式"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "编码比特率 (kbits/sec)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "CPU 使用数目"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 msgid "Encoder 'nice' value"
 msgstr "编码器 'nice' 优先值"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 msgid "Encoder filter command"
 msgstr "编码器过滤器命令"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 msgid "Execute command after encode"
 msgstr "编码后执行命令"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+msgid "Encode"
+msgstr "编码"
+
+#: src/gripcfg.c:509
 msgid "Add ID3 tags to encoded files"
 msgstr "填入 ID3 标签到编码后的文件"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 msgid "Add ID3v2 tags to encoded files"
 msgstr "填入 ID3v2 标签到编码后的文件"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr "仅将标签写到 .mp3 结尾的文件"
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "ID3 注释信息"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr "ID3v1 字符集编码"
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 msgid "ID3v2 Character set encoding"
 msgstr "ID3v2 字符集编码"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "标签"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "数据库服务器"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "CGI 路径"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "主服务器"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "从服务器"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr "DB 提交电子邮件"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 msgid "DB Character set encoding"
 msgstr "数据库字符集编码"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "使用 FreeDB 扩展"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "自动进行光盘查询"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "CD数据库"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "使用代理服务器"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr "从‘http_proxy’变量指定代理服务器"
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "代理服务器"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "代理服务器端口"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "代理服务器用户名"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "代理服务器口令"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "代理服务器"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "电子邮件"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "CD 更新程序"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "不要将文件名转换成小写字母"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr "允许文件名的高8位"
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr "将不兼容的字符替换为十六进制数字"
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "不要将空格转换成下划线"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr "使用非 posix 兼容的 '\\' 写入 m3u 文件"
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
 msgstr "文件名中不去除的字符"
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr "显示托盘图标"
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "杂项"
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 msgid "Error: Unable to save ripper config."
 msgstr "错误: 无法保存抓轨配置。"
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 msgid "Error: Unable to save encoder config."
 msgstr "错误: 无法保存编码器配置。"
 
@@ -557,7 +518,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr "无法在抓轨过程中查询。"
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "未知光盘"
@@ -567,219 +527,192 @@
 msgid "Track %02d"
 msgstr "Track %02d"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "正在 (通过 %2$s) 向 %1$s 查询光盘 %3$02x。\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "正在向 %s 查询光盘 %02x。\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "不匹配\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"正在匹配 \"%s / %s\"\n"
-"正在下载数据...\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "完成\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "保存光盘数据错误\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 msgid "Length"
 msgstr "长度"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "曲目"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr "选择上一个 CDDB 条目。"
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr "选择下一个 CDDB 条目。"
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "曲目"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr "DoNextDiscDBEntry.\n"
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
 msgstr "没有碟片数据。将返回。\n"
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
-msgstr ""
+msgstr "已位于索引末尾。将返回。\n"
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 msgid "Done.\n"
 msgstr "完成。\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
 msgstr "DoNextDiscDBEntry.\n"
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
-msgstr ""
+msgstr "已位于索引头部。将返回。\n"
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 msgid "Error saving disc data."
 msgstr "保存光盘信息时出错。"
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "循环播放模式"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "切换循环播放"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "抓轨状态"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "播放/暂停"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "倒退"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "快进"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "上一曲"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "下一曲"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "切换放音模式选项"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "下一光盘"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "停止放音"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "弹出光盘"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 msgid "Scan Disc Contents"
 msgstr "扫描光盘内容"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "切换音量控制"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "切换光盘编辑器"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "初始化/取消光盘查询"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "切换曲目显示"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "退出 Grip"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 msgid "Cannot fast forward while ripping."
 msgstr "抓轨过程中不能快进。"
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 msgid "Cannot rewind while ripping."
 msgstr "抓轨过程中不能倒退。"
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 msgid "Cannot switch discs while ripping."
 msgstr "抓轨过程中不能切换光盘。"
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "弹出光盘\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 msgid "Cannot eject while ripping."
 msgstr "不能在抓轨过程中弹出光盘。"
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr "有光盘──正在弹出\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 msgid "Cannot play while ripping."
 msgstr "抓轨过程中不能播放。"
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 msgid "Cannot switch tracks while ripping."
 msgstr "抓轨过程中不能改变曲目。"
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "正在检查新光盘\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat 发现光盘，正在检查曲目\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "光盘合法!\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "没有非零长度的曲目\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "CDStat 说无光盘\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "当前扇区: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "无光盘"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -791,24 +724,36 @@
 "\n"
 "您是否想提交此光盘信息？"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 msgid "Error: Unable to create temporary file."
 msgstr "错误: 无法创建临时文件。"
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 msgid "Error: Unable to write disc data."
 msgstr "错误: 无法写入光盘数据。"
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "发送邮件到 %s\n"
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 msgid "Error: Unable to execute mail command."
 msgstr "错误: 无法执行 mail 命令。"
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr ""
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr ""
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr ""
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "系统消息"
 
@@ -842,79 +787,79 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "错误: 无法打开 %s 进行写操作\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "光盘标题"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "音轨曲名"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr ""
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "光盘作者"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "ID3类别:"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "出品日期"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "音轨曲名"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "曲目作者"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr "W"
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "分割:"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "标题/作者"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "作者/标题"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr "分割符"
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "多作者"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "保存光盘信息"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "提交光盘信息"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 msgid "No disc present."
 msgstr "没有碟片。"
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 msgid "Cannot submit. No disc is present."
 msgstr "无法提交。没有碟片。"
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 msgid "You must enter a disc title."
 msgstr "您必须输入碟片标题。"
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 msgid "You must enter a disc artist."
 msgstr "您必须输入碟片艺术家名称。"
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -932,7 +877,7 @@
 "\n"
 "您还要继续吗?"
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -940,15 +885,15 @@
 "Continue?"
 msgstr ""
 "您将通过电子邮件来\n"
-"提交此光盘信息.\n"
+"提交此光盘信息。\n"
 "\n"
-"继续吗?"
+"继续吗？"
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "选择类别"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -956,19 +901,18 @@
 "您需要指定具体的音乐类别\n"
 "请从下列选择一个 DiscDB 类别"
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "DiscDB 类别"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "提交"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "取消"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "未知的 ID3 域\n"
@@ -978,178 +922,155 @@
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr "错误: 无法转换文件名。无此用户 %s\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "执行失败\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "错误: 坏的项类型\n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 msgid "Error: Reading config file\n"
 msgstr "错误: 读取配置文件\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "错误: 非法的配置文件\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "抓轨后编码"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "抓轨和编码选中的曲目"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "只抓轨"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "只抓轨不编码"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr "停止抓轨和编码"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "杀掉所有抓轨和编码进程"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "仅取消抓轨"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "杀掉抓轨进程"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "DDJ 扫描"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "插入光盘信息到 DigitalDJ 数据库"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "抓取部分音轨"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "放音"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "当前扇区:      0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "抓轨: 空闲"
 
-#: src/rip.c:209
+#: src/rip.c:210
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "编码: 曲目 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 msgid "Enc: Idle"
 msgstr "编码: 空闲"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr ""
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "起始扇区"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "终止扇区"
 
-#: src/rip.c:384
-#, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "正在插入曲目 %d 到 ddj 数据库中\n"
-
-#: src/rip.c:609
+#: src/rip.c:600
 msgid "Error: can't open m3u file."
 msgstr "错误：无法打开 m3u 文件。"
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr "在 KillRip 中\n"
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr "目前编码总大小为：%d\n"
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "抓轨: 曲目 %d (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr "抓轨：%6.2f%%"
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "完成抓轨\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr ""
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "下一首是 %d, 总共 %d 首\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "检查是否需要抓取其他曲目\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "编码: 曲目 %d (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr "编码: %6.2f%%"
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "完成编码在处理器 %d\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "正在删除 [%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "抓轨完成\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "无作者"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "无标题"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
@@ -1157,7 +1078,7 @@
 "驱动器中未探测到碟片。如果您已经将碟片插入驱动器，请在 配置->光盘 中检查您的 "
 "CDROM 设备配置。"
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
@@ -1166,7 +1087,7 @@
 "无效的抓轨可执行文件。\n"
 "请检查您的抓轨配置，并确保已指定了抓轨工具可执行文件的完整路径。"
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 msgid ""
 "Invalid encoder executable.\n"
 "Check your encoder config, and ensure it specifies the full path to the "
@@ -1175,7 +1096,7 @@
 "非法的编码器程序。\n"
 "请检查您的编码器设置，并确保已指定了编码器可执行文件的完整路径。"
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1183,105 +1104,90 @@
 "没有选择曲目。\n"
 "抓取整张光盘吗？\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "正在抓取整张光盘\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr "在抓取下一轨\n"
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "第一个检查的曲目是 %d\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr ""
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "没有写 wav 文件的权限"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "正在抓取曲目 %d 到 %s\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "抓轨: 曲目 %d (0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "文件 %s 已经抓过。跳过...\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "输出目录空间不足"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "调用 CDPRip\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, c-format
 msgid "Added track %d to %s list\n"
 msgstr "添加曲目 %d 到 %s 队列\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "没有空闲的处理器\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, c-format
 msgid "Enc track %d\n"
 msgstr "编码 曲目 %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 msgid "No write access to write encoded file."
 msgstr "没有写编码后的文件的权限。"
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i: 编码到 %s\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "编码: 曲目 %d (0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr "在 CalculateAll 中\n"
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr ""
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr ""
 
-#: src/tray.c:57
+#: src/tray.c:59
 msgid "Artist"
 msgstr "艺术家"
 
-#: src/tray.c:58
+#: src/tray.c:60
 msgid "Title"
 msgstr "标题"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1290,17 +1196,17 @@
 "%s - %s\n"
 "%02d:%02d 共 %02d:%02d"
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr ""
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr ""
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1309,7 +1215,7 @@
 "%s - %s\n"
 "%s%s%s"
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
@@ -1318,30 +1224,106 @@
 "%s - %s\n"
 "空闲"
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr "暂停"
 
-#: src/tray.c:196
+#: src/tray.c:186
 msgid "Stop"
 msgstr "停止"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr "上一个"
 
-#: src/tray.c:209
+#: src/tray.c:199
 msgid "Next"
 msgstr "下一个"
 
-#: src/tray.c:217
+#: src/tray.c:207
 msgid "Rip and Encode"
 msgstr "抓轨并编码"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr "退出"
 
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "指定主窗口的位置几何属性"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "几何属性"
+
+#~ msgid "Playing CDs"
+#~ msgstr "播放 CD"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "CD 抓轨"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "配置 Grip"
+
+#~ msgid "FAQ"
+#~ msgstr "常见问题解答"
+
+#~ msgid "Getting More Help"
+#~ msgstr "获得更多帮助"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "报告错误"
+
+#~ msgid "Grip started successfully\n"
+#~ msgstr "Grip 成功启动\n"
+
+#~ msgid "Status"
+#~ msgstr "状态"
+
+#~ msgid "General"
+#~ msgstr "通用"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "正在 (通过 %2$s) 向 %1$s 查询光盘 %3$02x。\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "正在向 %s 查询光盘 %02x。\n"
+
+#~ msgid "No match\n"
+#~ msgstr "不匹配\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "正在匹配 \"%s / %s\"\n"
+#~ "正在下载数据...\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "弹出光盘\n"
+
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "正在插入曲目 %d 到 ddj 数据库中\n"
+
+#~ msgid "Rip finished\n"
+#~ msgstr "完成抓轨\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "完成编码在处理器 %d\n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "正在删除 [%s]\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "抓轨完成\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "正在抓取曲目 %d 到 %s\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "文件 %s 已经抓过。跳过...\n"
+
+#~ msgid "%i: Encoding to %s\n"
+#~ msgstr "%i: 编码到 %s\n"
+
 #~ msgid ""
 #~ "Invalid rip executable\n"
 #~ "Check your rip config"

grip-4.1.1.tar.gz/po/zh_HK.gmo Added

grip-3.10.1.tar.gz/po/zh_HK.po -> grip-4.1.1.tar.gz/po/zh_HK.po Changed

@@ -6,58 +6,50 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grip 3.0.0\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
 "PO-Revision-Date: 2002-04-25 18:30+0800\n"
 "Last-Translator: Anthony Fok <anthony@thizlinux.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
-"Language: zh_TW\n"
+"Language: zh_HK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=big5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "«ü©w¥Dµøµ¡ªº¦ì¸m´X¦óÄÝ©Ê"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "´X¦óÄÝ©Ê"
-
-#: src/main.c:65
+#: src/main.c:60
 #, fuzzy
 msgid "Specify the config file to use (in your home dir)"
 msgstr "«ü©wn¨Ï¥Îªº CDROM ¸Ë¸m"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr ""
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "«ü©wn¨Ï¥Îªº CDROM ¸Ë¸m"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "¸Ë¸m"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "«ü©wn¨Ï¥Îªº³q¥Î SCSI ¸Ë¸m"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "¥H¡u¤p«¬¡v (CD-only) ¼Ò¦¡±Ò°Ê"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr "¥H¡u¥»¦a¡v¼Ò¦¡¢w¢w¤£¤Wºô¸ô¬d¸ß¸ê°T"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "¤£°µ I/O «©w¦V"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "¥H°£¿ù¼Ò¦¡°õ¦æ"
 
@@ -65,16 +57,12 @@
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "¿ù»~: µLªkªì©l¤Æ [%s]\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr ""
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
@@ -82,76 +70,38 @@
 "¥¿¦b¤u§@¤¤¡C\n"
 "¯uªºnÃö³¬¶Ü¡H"
 
-#: src/grip.c:401
-#, fuzzy
-msgid "Status"
-msgstr "§ìyª¬ºA"
-
-#: src/grip.c:416
-msgid "General"
-msgstr ""
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "§ìy"
-
-#: src/grip.c:446 src/gripcfg.c:511
+#: src/grip.c:380
 #, fuzzy
-msgid "Encode"
-msgstr "½s½X¾¹"
+msgid "Unable to open help file"
+msgstr "¿ù»~: µLªk«Ø¥ß¼È¦sÀÉ"
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "»¡©ú"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "¥Ø¿ý"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "¼½©ñ CD"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "CD §ìy"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "³]©w Grip"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "±`¨£°ÝÃD¸Ñµª"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "¨ú±o§ó¦h»²§U"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "³ø§i¿ù»~"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "Ãö©ó"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr ""
 
-#: src/grip.c:641
+#: src/grip.c:505
 #, fuzzy
 msgid "Error: Trying to show homepage failed."
 msgstr "¿ù»~: µLªkÀx¦s³]©wÀÉ"
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr ""
 
-#: src/grip.c:938
+#: src/grip.c:800
 #, fuzzy
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
@@ -162,362 +112,371 @@
 "±z¥i¯à»Ýn«·s³]©w Grip¡C\n"
 "ÂÂªº³]©wÀÉ¤w¸g³QÀx¦s¬° ~/.grip-old¡C"
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "¦øªA¾¹¬O %s¡A³s±µ°ð %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 #, fuzzy
 msgid "Error: Unable to save config file."
 msgstr "¿ù»~: µLªkÀx¦s³]©wÀÉ"
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "³]©w"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "CDROM ¸Ë¸m"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Â÷¶}©Î±Ò°Êªº®ÉÔ¤£¤¤Â_¼½©ñ"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "°±¤î®É«á°h¨ì¦±º"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "¦pªG¨S¦³¶}©l¼½©ñ«h±q²Ä¤@º¶}©l"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "CD ´¡¤J®É¦Û°Ê¼½©ñ"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "¨C¦¸¼½©ñ«e«·s¥´¶Ã¼½©ñ¦¸§Ç"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr "×¥¿¿ù»~ªº¼u¥X"
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr ""
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr ""
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "¥úºÐ"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "§ìy¤u¨ã:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "§ìyµ{¦¡"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "§ìy¾¹°õ¦æ°Ñ¼Æ"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "°±¥Î paranoia"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "°±¥Î¥~³¡ paranoia"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "°±¥ÎÀ¿²ª"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "°»´ú"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "×´_"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr "pºâ¼W¯q½Õ¾ã"
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "§ìyÀÉ®×®æ¦¡"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 #, fuzzy
 msgid "Rip file format (Multi-artist)"
 msgstr "§ìyÀÉ®×®æ¦¡"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "³q¥Î SCSI ¸Ë¸m"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "§ìy¤u¨ã"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "§ìy 'nice' Àu¥ýÈ"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "³Ì¤j«Ý½s½Xªº .wav ÀÉ®×¼Æ"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "¥úºÐ´¡¤J¦Û°Ê§ìy"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "§ìy§¹¦¨«áÅT¹a"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "§ìy§¹¦¨«á¦Û°Ê¼u¥X¥úºÐ"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "¦Û°Ê¼u¥X©µ¿ð"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr ""
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr ""
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr ""
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "WAV ¹LÂo¾¹©R¥O"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "¥úºÐ¹LÂo¾¹©R¥O"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "¿ï¶µ"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "§ìy"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "½s½X¾¹:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 #, fuzzy
 msgid "Encoder executable"
 msgstr "½s½X¾¹µ{¦¡"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 #, fuzzy
 msgid "Encoder command-line"
 msgstr "½s½X¾¹°õ¦æ°Ñ¼Æ"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 #, fuzzy
 msgid "Encoder file extension"
 msgstr "§ìyÀÉ®×®æ¦¡"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 #, fuzzy
 msgid "Encoder file format"
 msgstr "§ìyÀÉ®×®æ¦¡"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 #, fuzzy
 msgid "Encode file format (Multi-artist)"
 msgstr "§ìyÀÉ®×®æ¦¡"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "½s½X¾¹"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr "½s½X«á§R°£ .wav ÀÉ®×"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "§â¸ê°T´¡¤J SQL ¸ê®Æ®w"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr "«Ø¥ß .m3u ÀÉ®×"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "¦b .m3u ÀÉ®×¤¤¨Ï¥Î¬Û¹ï¸ô®|"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "M3U ÀÉ®×®æ¦¡"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "½s½X¦ì¤¸²v (kbits/sec)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "CPU ¨Ï¥Î¼Æ¥Ø"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 #, fuzzy
 msgid "Encoder 'nice' value"
 msgstr "§ìy 'nice' Àu¥ýÈ"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 #, fuzzy
 msgid "Encoder filter command"
 msgstr "¥úºÐ¹LÂo¾¹©R¥O"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 #, fuzzy
 msgid "Execute command after encode"
 msgstr "½s½X«á§R°£ .wav ÀÉ®×"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+#, fuzzy
+msgid "Encode"
+msgstr "½s½X¾¹"
+
+#: src/gripcfg.c:509
 #, fuzzy
 msgid "Add ID3 tags to encoded files"
 msgstr "¶ñ¤J ID3 ¼ÐÅÒ¨ì MP3 ÀÉ®×"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 #, fuzzy
 msgid "Add ID3v2 tags to encoded files"
 msgstr "¶ñ¤J ID3v2 ¼ÐÅÒ¨ì MP3 ÀÉ®×"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr ""
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "ID3 µùÄÀ¸ê°T"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr ""
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 #, fuzzy
 msgid "ID3v2 Character set encoding"
 msgstr "½s½X«á§R°£ .wav ÀÉ®×"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "¼ÐÅÒ"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "¸ê®Æ®w¦øªA¾¹"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "CGI ¸ô®|"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "¥D¦øªA¾¹"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "¦¸¦øªA¾¹"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr "DB ´£¥æ¹q¤l¶l¥ó"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 #, fuzzy
 msgid "DB Character set encoding"
 msgstr "½s½X«á§R°£ .wav ÀÉ®×"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "¨Ï¥Î FreeDB ÂX®i"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "¦Û°Ê¶i¦æ¥úºÐ¬d¸ß"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "CD¸ê®Æ®w"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "¨Ï¥Î¥N²z¦øªA¾¹"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr "±q 'http_proxy' Àô¹ÒÅÜ¼Æ«ü©w¥N²z¦øªA¾¹"
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "¥N²z¦øªA¾¹"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "¥N²z¦øªA¾¹³s±µ°ð"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "¥N²z¦øªA¾¹¨Ï¥ÎªÌ¦WºÙ"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "¥N²z¦øªA¾¹±K½X"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "¥N²z¦øªA¾¹"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "¹q¤l¶l¥ó"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "CD §ó·sµ{¦¡"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "¤£n±NÀÉ®×¦WÂà´«¦¨¤p¼g¦r¥À"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr "¤¹³\ÀÉ¦W§t°ª 8 ¦ì¦r¤¸"
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr ""
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "¤£n±NªÅ®æÂà´«¦¨©³½u"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -525,20 +484,20 @@
 "ÀÉ¦W¤¤¤£¥h°£ªº¦r²Å\n"
 " "
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr ""
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "Âø¶µ"
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 #, fuzzy
 msgid "Error: Unable to save ripper config."
 msgstr "¿ù»~: µLªkÀx¦s³]©wÀÉ"
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 #, fuzzy
 msgid "Error: Unable to save encoder config."
 msgstr "¿ù»~: µLªkÀx¦s³]©wÀÉ"
@@ -578,7 +537,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr "µLªk¦b§ìy¹Lµ{¤¤¬d¸ß"
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "¥¼ª¾¥úºÐ"
@@ -588,229 +546,202 @@
 msgid "Track %02d"
 msgstr "Track %02d"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "¥¿¦b (³z¹L %2$s) ¦V %1$s ¬d¸ß¥úºÐ %3$02x¡C\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "¥¿¦b¦V %s ¬d¸ß¥úºÐ %02x¡C\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "¤£¤Ç°t\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"¥¿¦b¤Ç°t \"%s / %s\"\n"
-"¥¿¦b¤U¸ü¸ê®Æ...\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "§¹¦¨\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "Àx¦s¥úºÐ¸ê®Æ¿ù»~\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 #, fuzzy
 msgid "Length"
 msgstr "ªø«×"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "¦±¥Ø"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "¦±¥Ø"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 #, fuzzy
 msgid "Done.\n"
 msgstr "§¹¦¨\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 #, fuzzy
 msgid "Error saving disc data."
 msgstr "Àx¦s¥úºÐ¸ê°T¿ù»~"
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "´`Àô¼½©ñ¼Ò¦¡"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "¤Á´«´`Àô¼½©ñ"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "§ìyª¬ºA"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "¼½©ñ/¼È°±"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "Ë°h"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "§Ö¶i"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "¤W¤@¦±"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "¤U¤@¦±"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "¤Á´«¼½©ñ¼Ò¦¡¿ï¶µ"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "¤U¤@¥úºÐ"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "°±¤î¼½©ñ"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "¼u¥X¥úºÐ"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 #, fuzzy
 msgid "Scan Disc Contents"
 msgstr "¥Ø¿ý"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "¤Á´«µ¶q±±¨î"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "¤Á´«¥úºÐ½s¿è¾¹"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "ªì©l¤Æ/¨ú®ø¥úºÐ¬d¸ß"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "¤Á´«¦±¥ØÅã¥Ü"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Â÷¶} Grip"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 #, fuzzy
 msgid "Cannot fast forward while ripping."
 msgstr "§ìy¹Lµ{¤¤¤£¯à§Ö¶i"
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 #, fuzzy
 msgid "Cannot rewind while ripping."
 msgstr "§ìy¹Lµ{¤¤¤£¯àË°h"
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 #, fuzzy
 msgid "Cannot switch discs while ripping."
 msgstr "§ìy¹Lµ{¤¤¤£¯à¤Á´«¥úºÐ"
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "¼u¥X¥úºÐ\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 #, fuzzy
 msgid "Cannot eject while ripping."
 msgstr "¤£¯à¦b§ìy¹Lµ{¤¤¼u¥X¥úºÐ"
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr "¦³¥úºÐ¢w¢w¥¿¦b¼u¥X\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 #, fuzzy
 msgid "Cannot play while ripping."
 msgstr "§ìy¹Lµ{¤¤¤£¯à¼½©ñ"
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 #, fuzzy
 msgid "Cannot switch tracks while ripping."
 msgstr "§ìy¹Lµ{¤¤¤£¯à§ïÅÜ¦±¥Ø"
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "¥¿¦bÀË¬d·s¥úºÐ\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat µo²{¥úºÐ¡A¥¿¦bÀË¬d¦±¥Ø\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "¥úºÐ¦³®Ä¡I\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "¨S¦³«D¹sªø«×ªº¦±¥Ø\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "CDStat »¡µL¥úºÐ\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "·í«e®°°Ï: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "µL¥úºÐ"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -822,27 +753,39 @@
 "\n"
 "±z¬O§_·Q´£¥æ¦¹¥úºÐ¸ê°T¡H"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 #, fuzzy
 msgid "Error: Unable to create temporary file."
 msgstr "¿ù»~: µLªk«Ø¥ß¼È¦sÀÉ"
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 #, fuzzy
 msgid "Error: Unable to write disc data."
 msgstr "¿ù»~: µLªk¼g¤J¥úºÐ¸ê®Æ"
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "µo°e¶l¥ó¨ì %s\n"
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 #, fuzzy
 msgid "Error: Unable to execute mail command."
 msgstr "¿ù»~: µLªkÀx¦s³]©wÀÉ"
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr ""
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr ""
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr ""
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "¨t²Î®ø®§"
 
@@ -876,85 +819,85 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "¿ù»~: µLªk¶}±Ò %s ¶i¦æ¼g¤J\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "¥úºÐ¼ÐÃD"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "µy¦±¦W"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr ""
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "¥úºÐ§@ªÌ"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "ID3 Ãþ§O:"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "¥X«~¤é´Á"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "µy¦±¦W"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "¦±¥Ø§@ªÌ"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr ""
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "¤À³Î:"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "¼ÐÃD/§@ªÌ"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "§@ªÌ/¼ÐÃD"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr "¤À³Î²Å"
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "¦h§@ªÌ"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "Àx¦s¥úºÐ¸ê°T"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "´£¥æ¥úºÐ¸ê°T"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 #, fuzzy
 msgid "No disc present."
 msgstr "¨S¦³¥úºÐ"
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 #, fuzzy
 msgid "Cannot submit. No disc is present."
 msgstr ""
 "¤£¯à´£¥æ\n"
 "¨S¦³¥úºÐ"
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 #, fuzzy
 msgid "You must enter a disc title."
 msgstr "±z¥²¶·¿é¤J¥úºÐ¼ÐÃD"
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 #, fuzzy
 msgid "You must enter a disc artist."
 msgstr "±z¥²¶·¿é¤J¤@Ó§@ªÌ"
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -965,7 +908,7 @@
 "Continue?"
 msgstr ""
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -973,11 +916,11 @@
 "Continue?"
 msgstr ""
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "¿ï¾ÜÃþ§O"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -985,19 +928,18 @@
 "±z»Ýn«ü©w¨ãÅéªºµ¼ÖÃþ§O\n"
 "½Ð±q¤U¦C¿ï¾Ü¤@Ó DiscDB Ãþ§O"
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "DiscDB Ãþ§O"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "´£¥æ"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "¨ú®ø"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "¥¼ª¾ªº ID3 °ì\n"
@@ -1007,195 +949,172 @@
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr "¿ù»~: µLªkÂà´«ÀÉ¦W¡CµL¦¹¨Ï¥ÎªÌ %s\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "°õ¦æ¥¢±Ñ\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "¿ù»~: Ãaªº¶µ¥ØÃþ«¬\n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 #, fuzzy
 msgid "Error: Reading config file\n"
 msgstr "¿ù»~: µL®Äªº³]©wÀÉ\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "¿ù»~: µL®Äªº³]©wÀÉ\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "§ìy«á½s½X"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "§ìy©M½s½X¿ï¤¤ªº¦±¥Ø"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "¥u§ìy"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "¥u§ìy¤£½s½X"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr "°±¤î§ìy©M½s½X"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "±þ±¼©Ò¦³§ìy©M½s½X¶iµ{"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "¥u¨ú®ø§ìy"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "±þ±¼§ìy¶iµ{"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "DDJ ±½´y"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "§â¥úºÐ¸ê°T´¡¤J DigitalDJ ¸ê®Æ®w"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "§ì¨ú³¡¤Àµy"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "¼½©ñ"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "¥Ø«e®°°Ï:      0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "§ìy: ¶¢¸m"
 
-#: src/rip.c:209
+#: src/rip.c:210
 #, fuzzy
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "½s½X: ¦±¥Ø 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 #, fuzzy
 msgid "Enc: Idle"
 msgstr "½s½X: ¶¢¸m"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr ""
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "°_©l®°°Ï"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "²×¤î®°°Ï"
 
-#: src/rip.c:384
-#, fuzzy, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "§â¸ê°T´¡¤J SQL ¸ê®Æ®w"
-
-#: src/rip.c:609
+#: src/rip.c:600
 #, fuzzy
 msgid "Error: can't open m3u file."
 msgstr "¿ù»~: ¤£¯à¶}±Ò m3u ÀÉ®×\n"
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr ""
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr ""
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "§ìy: ¦±¥Ø %d (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr ""
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "§¹¦¨§ìy\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr ""
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "¤U¤@º¬O %d¡AÁ`¦@ %d º\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "ÀË¬d¬O§_»Ýn§ì¨ú¨ä¥L¦±¥Ø\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, fuzzy, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "½s½X: ¦±¥Ø %d (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr ""
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "§¹¦¨½s½X¦b³B²z¾¹ %d\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "¥¿¦b§R°£ [%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "§ìy§¹¦¨\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "µL§@ªÌ"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "µL¼ÐÃD"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
 msgstr ""
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
 "executable."
 msgstr ""
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 #, fuzzy
 msgid ""
 "Invalid encoder executable.\n"
@@ -1205,7 +1124,7 @@
 "µL®Äªº§ìyµ{¦¡\n"
 "½ÐÀË¬d§Aªº§ìy¾¹³]©w"
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1213,165 +1132,222 @@
 "¨S¦³¿ï¾Ü¦±¥Ø¡C\n"
 "§ì¨ú¾ã¤ù¥úºÐ¶Ü¡H\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "¥¿¦b§ì¨ú¾ã¤ù¥úºÐ\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr "¦b§ì¨ú¤U¤@y\n"
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "²Ä¤@ÓÀË¬dªº¦±¥Ø¬O %d\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr ""
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "¨S¦³¼g¤J wav ÀÉ®×ªºÅv"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "¥¿¦b§ì¨ú¦±¥Ø %d ¨ì %s\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "§ìy: ¦±¥Ø %d (0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "ÀÉ®× %s ¤w¸g§ì¹L¡C¸õ¹L...\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "¿é¥X¥Ø¿ýªÅ¶¡¤£¨¬"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "©I¥s CDPRip\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, fuzzy, c-format
 msgid "Added track %d to %s list\n"
 msgstr "²K¥[¦±¥Ø %d ¨ì½s½X¶¤¦C\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "¨S¦³¶¢¸mªº³B²z¾¹\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, fuzzy, c-format
 msgid "Enc track %d\n"
 msgstr "MP3 ¦±¥Ø %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 #, fuzzy
 msgid "No write access to write encoded file."
 msgstr "¨S¦³¼g¤J mp3 ÀÉ®×ªºÅv"
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i: ½s½X¨ì %s\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, fuzzy, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "§ìy: ¦±¥Ø %d (0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr ""
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr ""
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr ""
 
-#: src/tray.c:57
+#: src/tray.c:59
 #, fuzzy
 msgid "Artist"
 msgstr "µL§@ªÌ"
 
-#: src/tray.c:58
+#: src/tray.c:60
 #, fuzzy
 msgid "Title"
 msgstr "µL¼ÐÃD"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
 "%02d:%02d of %02d:%02d"
 msgstr ""
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr ""
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr ""
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
 "%s%s%s"
 msgstr ""
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
 "Idle"
 msgstr ""
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr ""
 
-#: src/tray.c:196
+#: src/tray.c:186
 #, fuzzy
 msgid "Stop"
 msgstr "°±¤î¼½©ñ"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr ""
 
-#: src/tray.c:209
+#: src/tray.c:199
 #, fuzzy
 msgid "Next"
 msgstr "¤U¤@¥úºÐ"
 
-#: src/tray.c:217
+#: src/tray.c:207
 #, fuzzy
 msgid "Rip and Encode"
 msgstr "°±¤î§ìy©M½s½X"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr ""
 
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "«ü©w¥Dµøµ¡ªº¦ì¸m´X¦óÄÝ©Ê"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "´X¦óÄÝ©Ê"
+
+#, fuzzy
+#~ msgid "Status"
+#~ msgstr "§ìyª¬ºA"
+
+#~ msgid "Playing CDs"
+#~ msgstr "¼½©ñ CD"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "CD §ìy"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "³]©w Grip"
+
+#~ msgid "FAQ"
+#~ msgstr "±`¨£°ÝÃD¸Ñµª"
+
+#~ msgid "Getting More Help"
+#~ msgstr "¨ú±o§ó¦h»²§U"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "³ø§i¿ù»~"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "¥¿¦b (³z¹L %2$s) ¦V %1$s ¬d¸ß¥úºÐ %3$02x¡C\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "¥¿¦b¦V %s ¬d¸ß¥úºÐ %02x¡C\n"
+
+#~ msgid "No match\n"
+#~ msgstr "¤£¤Ç°t\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "¥¿¦b¤Ç°t \"%s / %s\"\n"
+#~ "¥¿¦b¤U¸ü¸ê®Æ...\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "¼u¥X¥úºÐ\n"
+
+#, fuzzy
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "§â¸ê°T´¡¤J SQL ¸ê®Æ®w"
+
+#~ msgid "Rip finished\n"
+#~ msgstr "§¹¦¨§ìy\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "§¹¦¨½s½X¦b³B²z¾¹ %d\n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "¥¿¦b§R°£ [%s]\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "§ìy§¹¦¨\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "¥¿¦b§ì¨ú¦±¥Ø %d ¨ì %s\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "ÀÉ®× %s ¤w¸g§ì¹L¡C¸õ¹L...\n"
+
+#~ msgid "%i: Encoding to %s\n"
+#~ msgstr "%i: ½s½X¨ì %s\n"
+
 #~ msgid ""
 #~ "Invalid rip executable\n"
 #~ "Check your rip config"

grip-4.1.1.tar.gz/po/zh_TW.gmo Added

grip-3.10.1.tar.gz/po/zh_TW.po -> grip-4.1.1.tar.gz/po/zh_TW.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grip 3.0.0\n"
-"Report-Msgid-Bugs-To: https://sourceforge.net/projects/grip\n"
-"POT-Creation-Date: 2018-12-27 22:45+0100\n"
+"Report-Msgid-Bugs-To: https://sourceforge.net/p/grip/bugs/\n"
+"POT-Creation-Date: 2020-03-08 16:56+0100\n"
 "PO-Revision-Date: 2002-04-25 18:30+0800\n"
 "Last-Translator: Anthony Fok <anthony@thizlinux.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -16,48 +16,40 @@
 "Content-Type: text/plain; charset=big5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/main.c:56
-msgid "Specify the geometry of the main window"
-msgstr "«ü©w¥Dµøµ¡ªº¦ì¸m´X¦óÄÝ©Ê"
-
-#: src/main.c:57
-msgid "GEOMETRY"
-msgstr "´X¦óÄÝ©Ê"
-
-#: src/main.c:65
+#: src/main.c:60
 #, fuzzy
 msgid "Specify the config file to use (in your home dir)"
 msgstr "«ü©wn¨Ï¥Îªº CDROM ¸Ë¸m"
 
-#: src/main.c:66
+#: src/main.c:61
 msgid "CONFIG"
 msgstr ""
 
-#: src/main.c:74
+#: src/main.c:68
 msgid "Specify the cdrom device to use"
 msgstr "«ü©wn¨Ï¥Îªº CDROM ¸Ë¸m"
 
-#: src/main.c:75 src/main.c:84
+#: src/main.c:69 src/main.c:77
 msgid "DEVICE"
 msgstr "¸Ë¸m"
 
-#: src/main.c:83
+#: src/main.c:76
 msgid "Specify the generic scsi device to use"
 msgstr "«ü©wn¨Ï¥Îªº³q¥Î SCSI ¸Ë¸m"
 
-#: src/main.c:92
+#: src/main.c:84
 msgid "Launch in \"small\" (cd-only) mode"
 msgstr "¥H¡u¤p«¬¡v (CD-only) ¼Ò¦¡±Ò°Ê"
 
-#: src/main.c:101
+#: src/main.c:92
 msgid "\"Local\" mode -- do not look up disc info on the net"
 msgstr "¥H¡u¥»¦a¡v¼Ò¦¡¢w¢w¤£¤Wºô¸ô¬d¸ß¸ê°T"
 
-#: src/main.c:110
+#: src/main.c:100
 msgid "Do not do I/O redirection"
 msgstr "¤£°µ I/O «©w¦V"
 
-#: src/main.c:119
+#: src/main.c:108
 msgid "Run in verbose (debug) mode"
 msgstr "¥H°£¿ù¼Ò¦¡°õ¦æ"
 
@@ -65,16 +57,12 @@
 msgid "Grip"
 msgstr "Grip"
 
-#: src/grip.c:244
+#: src/grip.c:222
 #, c-format
 msgid "Error: Unable to initialize [%s]\n"
 msgstr "¿ù»~: µLªkªì©l¤Æ [%s]\n"
 
-#: src/grip.c:336
-msgid "Grip started successfully\n"
-msgstr ""
-
-#: src/grip.c:350
+#: src/grip.c:325
 msgid ""
 "Work is in progress.\n"
 "Really shut down?"
@@ -82,76 +70,38 @@
 "¥¿¦b¤u§@¤¤¡C\n"
 "¯uªºnÃö³¬¶Ü¡H"
 
-#: src/grip.c:401
-#, fuzzy
-msgid "Status"
-msgstr "§ìyª¬ºA"
-
-#: src/grip.c:416
-msgid "General"
-msgstr ""
-
-#: src/grip.c:431 src/gripcfg.c:366 src/cdplay.c:277 src/cdplay.c:390
-#: src/rip.c:95
-msgid "Rip"
-msgstr "§ìy"
-
-#: src/grip.c:446 src/gripcfg.c:511
+#: src/grip.c:380
 #, fuzzy
-msgid "Encode"
-msgstr "½s½X¾¹"
+msgid "Unable to open help file"
+msgstr "¿ù»~: µLªk«Ø¥ß¼È¦sÀÉ"
 
-#: src/grip.c:491
+#: src/grip.c:396
 msgid "Help"
 msgstr "»¡©ú"
 
-#: src/grip.c:496
+#: src/grip.c:401
 msgid "Table Of Contents"
 msgstr "¥Ø¿ý"
 
-#: src/grip.c:502
-msgid "Playing CDs"
-msgstr "¼½©ñ CD"
-
-#: src/grip.c:508
-msgid "Ripping CDs"
-msgstr "CD §ìy"
-
-#: src/grip.c:514
-msgid "Configuring Grip"
-msgstr "³]©w Grip"
-
-#: src/grip.c:520
-msgid "FAQ"
-msgstr "±`¨£°ÝÃD¸Ñµª"
-
-#: src/grip.c:526
-msgid "Getting More Help"
-msgstr "¨ú±o§ó¦h»²§U"
-
-#: src/grip.c:532
-msgid "Reporting Bugs"
-msgstr "³ø§i¿ù»~"
-
-#: src/grip.c:552
+#: src/grip.c:421
 msgid "About"
 msgstr "Ãö©ó"
 
-#: src/grip.c:571
+#: src/grip.c:436
 #, c-format
 msgid "Version %s"
 msgstr ""
 
-#: src/grip.c:641
+#: src/grip.c:505
 #, fuzzy
 msgid "Error: Trying to show homepage failed."
 msgstr "¿ù»~: µLªkÀx¦s³]©wÀÉ"
 
-#: src/grip.c:920
+#: src/grip.c:782
 msgid "Created by Grip"
 msgstr ""
 
-#: src/grip.c:938
+#: src/grip.c:800
 #, fuzzy
 msgid ""
 "Your config file is out of date -- resetting to defaults.\n"
@@ -162,362 +112,371 @@
 "±z¥i¯à»Ýn«·s³]©w Grip¡C\n"
 "ÂÂªº³]©wÀÉ¤w¸g³QÀx¦s¬° ~/.grip-old¡C"
 
-#: src/grip.c:1021
+#: src/grip.c:868
 #, c-format
 msgid "server is %s, port %d\n"
 msgstr "¦øªA¾¹¬O %s¡A³s±µ°ð %d\n"
 
-#: src/grip.c:1042
+#: src/grip.c:891
 #, fuzzy
 msgid "Error: Unable to save config file."
 msgstr "¿ù»~: µLªkÀx¦s³]©wÀÉ"
 
-#: src/gripcfg.c:104
+#: src/gripcfg.c:94
 msgid "Config"
 msgstr "³]©w"
 
-#: src/gripcfg.c:112
+#: src/gripcfg.c:102
 msgid "CDRom device"
 msgstr "CDROM ¸Ë¸m"
 
-#: src/gripcfg.c:117
+#: src/gripcfg.c:107
 msgid "Don't interrupt playback on exit/startup"
 msgstr "Â÷¶}©Î±Ò°Êªº®ÉÔ¤£¤¤Â_¼½©ñ"
 
-#: src/gripcfg.c:121
+#: src/gripcfg.c:111
 msgid "Rewind when stopped"
 msgstr "°±¤î®É«á°h¨ì¦±º"
 
-#: src/gripcfg.c:126
+#: src/gripcfg.c:116
 msgid "Startup with first track if not playing"
 msgstr "¦pªG¨S¦³¶}©l¼½©ñ«h±q²Ä¤@º¶}©l"
 
-#: src/gripcfg.c:131
+#: src/gripcfg.c:121
 msgid "Auto-play on disc insert"
 msgstr "CD ´¡¤J®É¦Û°Ê¼½©ñ"
 
-#: src/gripcfg.c:136
+#: src/gripcfg.c:126
 msgid "Reshuffle before each playback"
 msgstr "¨C¦¸¼½©ñ«e«·s¥´¶Ã¼½©ñ¦¸§Ç"
 
-#: src/gripcfg.c:141
+#: src/gripcfg.c:131
 msgid "Work around faulty eject"
 msgstr "×¥¿¿ù»~ªº¼u¥X"
 
-#: src/gripcfg.c:146
+#: src/gripcfg.c:136
 msgid "Poll disc drive for new disc"
 msgstr ""
 
-#: src/gripcfg.c:150
+#: src/gripcfg.c:140
 msgid "Poll interval (seconds)"
 msgstr ""
 
-#: src/gripcfg.c:158
+#: src/gripcfg.c:148
 msgid "CD"
 msgstr "¥úºÐ"
 
-#: src/gripcfg.c:174
+#: src/gripcfg.c:163
 msgid "Ripper:"
 msgstr "§ìy¤u¨ã:"
 
-#: src/gripcfg.c:219
+#: src/gripcfg.c:208
 msgid "Ripping executable"
 msgstr "§ìyµ{¦¡"
 
-#: src/gripcfg.c:224
+#: src/gripcfg.c:213
 msgid "Rip command-line"
 msgstr "§ìy¾¹°õ¦æ°Ñ¼Æ"
 
-#: src/gripcfg.c:235
+#: src/gripcfg.c:224
 msgid "Disable paranoia"
 msgstr "°±¥Î paranoia"
 
-#: src/gripcfg.c:240
+#: src/gripcfg.c:229
 msgid "Disable extra paranoia"
 msgstr "°±¥Î¥~³¡ paranoia"
 
-#: src/gripcfg.c:246
+#: src/gripcfg.c:235
 msgid "Disable scratch"
 msgstr "°±¥ÎÀ¿²ª"
 
-#: src/gripcfg.c:250
+#: src/gripcfg.c:239
 msgid "detection"
 msgstr "°»´ú"
 
-#: src/gripcfg.c:254
+#: src/gripcfg.c:243
 msgid "repair"
 msgstr "×´_"
 
-#: src/gripcfg.c:262
+#: src/gripcfg.c:251
 msgid "Calculate gain adjustment"
 msgstr "pºâ¼W¯q½Õ¾ã"
 
-#: src/gripcfg.c:270
+#: src/gripcfg.c:259
 msgid "Rip file format"
 msgstr "§ìyÀÉ®×®æ¦¡"
 
-#: src/gripcfg.c:275
+#: src/gripcfg.c:264
 #, fuzzy
 msgid "Rip file format (Multi-artist)"
 msgstr "§ìyÀÉ®×®æ¦¡"
 
-#: src/gripcfg.c:279
+#: src/gripcfg.c:268
 msgid "Generic SCSI device"
 msgstr "³q¥Î SCSI ¸Ë¸m"
 
-#: src/gripcfg.c:287
+#: src/gripcfg.c:276
 msgid "Ripper"
 msgstr "§ìy¤u¨ã"
 
-#: src/gripcfg.c:296
+#: src/gripcfg.c:285
 msgid "Rip 'nice' value"
 msgstr "§ìy 'nice' Àu¥ýÈ"
 
-#: src/gripcfg.c:300
+#: src/gripcfg.c:289
 msgid "Max non-encoded .wav's"
 msgstr "³Ì¤j«Ý½s½Xªº .wav ÀÉ®×¼Æ"
 
-#: src/gripcfg.c:306
+#: src/gripcfg.c:295
 msgid "Auto-rip on insert"
 msgstr "¥úºÐ´¡¤J¦Û°Ê§ìy"
 
-#: src/gripcfg.c:310
+#: src/gripcfg.c:299
 msgid "Beep after rip"
 msgstr "§ìy§¹¦¨«áÅT¹a"
 
-#: src/gripcfg.c:320
+#: src/gripcfg.c:309
 msgid "Auto-eject after rip"
 msgstr "§ìy§¹¦¨«á¦Û°Ê¼u¥X¥úºÐ"
 
-#: src/gripcfg.c:324
+#: src/gripcfg.c:313
 msgid "Auto-eject delay"
 msgstr "¦Û°Ê¼u¥X©µ¿ð"
 
-#: src/gripcfg.c:332
+#: src/gripcfg.c:321
 msgid "Delay before ripping"
 msgstr ""
 
-#: src/gripcfg.c:337
+#: src/gripcfg.c:326
 msgid "Delay encoding until disc is ripped"
 msgstr ""
 
-#: src/gripcfg.c:342
+#: src/gripcfg.c:331
 msgid "Stop cdrom drive between tracks"
 msgstr ""
 
-#: src/gripcfg.c:346
+#: src/gripcfg.c:335
 msgid "Wav filter command"
 msgstr "WAV ¹LÂo¾¹©R¥O"
 
-#: src/gripcfg.c:351
+#: src/gripcfg.c:340
 msgid "Disc filter command"
 msgstr "¥úºÐ¹LÂo¾¹©R¥O"
 
-#: src/gripcfg.c:359 src/gripcfg.c:504
+#: src/gripcfg.c:348 src/gripcfg.c:493
 msgid "Options"
 msgstr "¿ï¶µ"
 
-#: src/gripcfg.c:381
+#: src/gripcfg.c:355 src/cdplay.c:263 src/cdplay.c:376 src/rip.c:96
+msgid "Rip"
+msgstr "§ìy"
+
+#: src/gripcfg.c:370
 msgid "Encoder:"
 msgstr "½s½X¾¹:"
 
-#: src/gripcfg.c:416
+#: src/gripcfg.c:405
 #, fuzzy
 msgid "Encoder executable"
 msgstr "½s½X¾¹µ{¦¡"
 
-#: src/gripcfg.c:421
+#: src/gripcfg.c:410
 #, fuzzy
 msgid "Encoder command-line"
 msgstr "½s½X¾¹°õ¦æ°Ñ¼Æ"
 
-#: src/gripcfg.c:427
+#: src/gripcfg.c:416
 #, fuzzy
 msgid "Encoder file extension"
 msgstr "§ìyÀÉ®×®æ¦¡"
 
-#: src/gripcfg.c:432
+#: src/gripcfg.c:421
 #, fuzzy
 msgid "Encoder file format"
 msgstr "§ìyÀÉ®×®æ¦¡"
 
-#: src/gripcfg.c:438
+#: src/gripcfg.c:427
 #, fuzzy
 msgid "Encode file format (Multi-artist)"
 msgstr "§ìyÀÉ®×®æ¦¡"
 
-#: src/gripcfg.c:446
+#: src/gripcfg.c:435
 msgid "Encoder"
 msgstr "½s½X¾¹"
 
-#: src/gripcfg.c:456
+#: src/gripcfg.c:445
 msgid "Delete .wav after encoding"
 msgstr "½s½X«á§R°£ .wav ÀÉ®×"
 
-#: src/gripcfg.c:461
+#: src/gripcfg.c:450
 msgid "Insert info into SQL database"
 msgstr "§â¸ê°T´¡¤J SQL ¸ê®Æ®w"
 
-#: src/gripcfg.c:465
+#: src/gripcfg.c:454
 msgid "Create .m3u files"
 msgstr "«Ø¥ß .m3u ÀÉ®×"
 
-#: src/gripcfg.c:470
+#: src/gripcfg.c:459
 msgid "Use relative paths in .m3u files"
 msgstr "¦b .m3u ÀÉ®×¤¤¨Ï¥Î¬Û¹ï¸ô®|"
 
-#: src/gripcfg.c:474
+#: src/gripcfg.c:463
 msgid "M3U file format"
 msgstr "M3U ÀÉ®×®æ¦¡"
 
-#: src/gripcfg.c:479
+#: src/gripcfg.c:468
 msgid "Encoding bitrate (kbits/sec)"
 msgstr "½s½X¦ì¤¸²v (kbits/sec)"
 
-#: src/gripcfg.c:483
+#: src/gripcfg.c:472
 msgid "Number of CPUs to use"
 msgstr "CPU ¨Ï¥Î¼Æ¥Ø"
 
-#: src/gripcfg.c:487
+#: src/gripcfg.c:476
 #, fuzzy
 msgid "Encoder 'nice' value"
 msgstr "§ìy 'nice' Àu¥ýÈ"
 
-#: src/gripcfg.c:491
+#: src/gripcfg.c:480
 #, fuzzy
 msgid "Encoder filter command"
 msgstr "¥úºÐ¹LÂo¾¹©R¥O"
 
-#: src/gripcfg.c:496
+#: src/gripcfg.c:485
 #, fuzzy
 msgid "Execute command after encode"
 msgstr "½s½X«á§R°£ .wav ÀÉ®×"
 
-#: src/gripcfg.c:520
+#: src/gripcfg.c:500
+#, fuzzy
+msgid "Encode"
+msgstr "½s½X¾¹"
+
+#: src/gripcfg.c:509
 #, fuzzy
 msgid "Add ID3 tags to encoded files"
 msgstr "¶ñ¤J ID3 ¼ÐÅÒ¨ì MP3 ÀÉ®×"
 
-#: src/gripcfg.c:526
+#: src/gripcfg.c:515
 #, fuzzy
 msgid "Add ID3v2 tags to encoded files"
 msgstr "¶ñ¤J ID3v2 ¼ÐÅÒ¨ì MP3 ÀÉ®×"
 
-#: src/gripcfg.c:532
+#: src/gripcfg.c:521
 msgid "Only tag files ending in '.mp3'"
 msgstr ""
 
-#: src/gripcfg.c:536
+#: src/gripcfg.c:525
 msgid "ID3 comment field"
 msgstr "ID3 µùÄÀ¸ê°T"
 
-#: src/gripcfg.c:541
+#: src/gripcfg.c:530
 msgid "ID3v1 Character set encoding"
 msgstr ""
 
-#: src/gripcfg.c:547
+#: src/gripcfg.c:536
 #, fuzzy
 msgid "ID3v2 Character set encoding"
 msgstr "½s½X«á§R°£ .wav ÀÉ®×"
 
-#: src/gripcfg.c:555
+#: src/gripcfg.c:544
 msgid "ID3"
 msgstr "¼ÐÅÒ"
 
-#: src/gripcfg.c:572 src/gripcfg.c:592
+#: src/gripcfg.c:560 src/gripcfg.c:580
 msgid "DB server"
 msgstr "¸ê®Æ®w¦øªA¾¹"
 
-#: src/gripcfg.c:576 src/gripcfg.c:596
+#: src/gripcfg.c:564 src/gripcfg.c:584
 msgid "CGI path"
 msgstr "CGI ¸ô®|"
 
-#: src/gripcfg.c:583
+#: src/gripcfg.c:571
 msgid "Primary Server"
 msgstr "¥D¦øªA¾¹"
 
-#: src/gripcfg.c:603
+#: src/gripcfg.c:591
 msgid "Secondary Server"
 msgstr "¦¸¦øªA¾¹"
 
-#: src/gripcfg.c:613
+#: src/gripcfg.c:601
 msgid "DB Submit email"
 msgstr "DB ´£¥æ¹q¤l¶l¥ó"
 
-#: src/gripcfg.c:618
+#: src/gripcfg.c:606
 #, fuzzy
 msgid "DB Character set encoding"
 msgstr "½s½X«á§R°£ .wav ÀÉ®×"
 
-#: src/gripcfg.c:623
+#: src/gripcfg.c:611
 msgid "Use freedb extensions"
 msgstr "¨Ï¥Î FreeDB ÂX®i"
 
-#: src/gripcfg.c:628
+#: src/gripcfg.c:616
 msgid "Perform disc lookups automatically"
 msgstr "¦Û°Ê¶i¦æ¥úºÐ¬d¸ß"
 
-#: src/gripcfg.c:636
+#: src/gripcfg.c:624
 msgid "DiscDB"
 msgstr "CD¸ê®Æ®w"
 
-#: src/gripcfg.c:645
+#: src/gripcfg.c:633
 msgid "Use proxy server"
 msgstr "¨Ï¥Î¥N²z¦øªA¾¹"
 
-#: src/gripcfg.c:652
+#: src/gripcfg.c:640
 msgid "Get server from 'http_proxy' env. var"
 msgstr "±q 'http_proxy' Àô¹ÒÅÜ¼Æ«ü©w¥N²z¦øªA¾¹"
 
-#: src/gripcfg.c:656
+#: src/gripcfg.c:644
 msgid "Proxy server"
 msgstr "¥N²z¦øªA¾¹"
 
-#: src/gripcfg.c:660
+#: src/gripcfg.c:648
 msgid "Proxy port"
 msgstr "¥N²z¦øªA¾¹³s±µ°ð"
 
-#: src/gripcfg.c:664
+#: src/gripcfg.c:652
 msgid "Proxy username"
 msgstr "¥N²z¦øªA¾¹¨Ï¥ÎªÌ¦WºÙ"
 
-#: src/gripcfg.c:670
+#: src/gripcfg.c:658
 msgid "Proxy password"
 msgstr "¥N²z¦øªA¾¹±K½X"
 
-#: src/gripcfg.c:678
+#: src/gripcfg.c:666
 msgid "Proxy"
 msgstr "¥N²z¦øªA¾¹"
 
-#: src/gripcfg.c:687
+#: src/gripcfg.c:675
 msgid "Email address"
 msgstr "¹q¤l¶l¥ó"
 
-#: src/gripcfg.c:691
+#: src/gripcfg.c:679
 msgid "CD update program"
 msgstr "CD §ó·sµ{¦¡"
 
-#: src/gripcfg.c:696
+#: src/gripcfg.c:684
 msgid "Do not lowercase filenames"
 msgstr "¤£n±NÀÉ®×¦WÂà´«¦¨¤p¼g¦r¥À"
 
-#: src/gripcfg.c:701
+#: src/gripcfg.c:689
 msgid "Allow high bits in filenames"
 msgstr "¤¹³\ÀÉ¦W§t°ª 8 ¦ì¦r¤¸"
 
-#: src/gripcfg.c:706
+#: src/gripcfg.c:694
 msgid "Replace incompatible characters by hexadecimal numbers"
 msgstr ""
 
-#: src/gripcfg.c:711
+#: src/gripcfg.c:699
 msgid "Do not change spaces to underscores"
 msgstr "¤£n±NªÅ®æÂà´«¦¨©³½u"
 
-#: src/gripcfg.c:716
+#: src/gripcfg.c:704
 msgid "Write m3u files using non-posix compliant '\\'s"
 msgstr ""
 
-#: src/gripcfg.c:721
+#: src/gripcfg.c:709
 msgid ""
 "Characters to not strip\n"
 "in filenames"
@@ -525,20 +484,20 @@
 "ÀÉ¦W¤¤¤£¥h°£ªº¦r²Å\n"
 " "
 
-#: src/gripcfg.c:726
+#: src/gripcfg.c:714
 msgid "Show tray icon"
 msgstr ""
 
-#: src/gripcfg.c:733
+#: src/gripcfg.c:721
 msgid "Misc"
 msgstr "Âø¶µ"
 
-#: src/gripcfg.c:839
+#: src/gripcfg.c:827
 #, fuzzy
 msgid "Error: Unable to save ripper config."
 msgstr "¿ù»~: µLªkÀx¦s³]©wÀÉ"
 
-#: src/gripcfg.c:913
+#: src/gripcfg.c:901
 #, fuzzy
 msgid "Error: Unable to save encoder config."
 msgstr "¿ù»~: µLªkÀx¦s³]©wÀÉ"
@@ -578,7 +537,6 @@
 msgid "Cannot do lookup while ripping."
 msgstr "µLªk¦b§ìy¹Lµ{¤¤¬d¸ß"
 
-#. "misc"
 #: src/cdplay.c:127
 msgid "Unknown Disc"
 msgstr "¥¼ª¾¥úºÐ"
@@ -588,229 +546,202 @@
 msgid "Track %02d"
 msgstr "Track %02d"
 
-#: src/cdplay.c:185
-#, c-format
-msgid "Querying %s (through %s) for disc %02x.\n"
-msgstr "¥¿¦b (³z¹L %2$s) ¦V %1$s ¬d¸ß¥úºÐ %3$02x¡C\n"
-
-#: src/cdplay.c:190
-#, c-format
-msgid "Querying %s for disc %02x.\n"
-msgstr "¥¿¦b¦V %s ¬d¸ß¥úºÐ %02x¡C\n"
-
-#: src/cdplay.c:212
-msgid "No match\n"
-msgstr "¤£¤Ç°t\n"
-
-#: src/cdplay.c:239
-#, c-format
-msgid ""
-"Match for \"%s / %s\"\n"
-"Downloading data...\n"
-msgstr ""
-"¥¿¦b¤Ç°t \"%s / %s\"\n"
-"¥¿¦b¤U¸ü¸ê®Æ...\n"
-
-#: src/cdplay.c:248
+#: src/cdplay.c:234
 msgid "Done\n"
 msgstr "§¹¦¨\n"
 
-#: src/cdplay.c:251
+#: src/cdplay.c:237
 msgid "Error saving disc data\n"
 msgstr "Àx¦s¥úºÐ¸ê®Æ¿ù»~\n"
 
-#: src/cdplay.c:268 src/cdplay.c:379
+#: src/cdplay.c:254 src/cdplay.c:365
 #, fuzzy
 msgid "Length"
 msgstr "ªø«×"
 
-#: src/cdplay.c:323
+#: src/cdplay.c:309
 msgid "Tracks"
 msgstr "¦±¥Ø"
 
-#: src/cdplay.c:340
+#: src/cdplay.c:326
 msgid "Select previous CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:348
+#: src/cdplay.c:334
 msgid "Select next CDDB entry."
 msgstr ""
 
-#: src/cdplay.c:368
+#: src/cdplay.c:354
 msgid "Track"
 msgstr "¦±¥Ø"
 
-#: src/cdplay.c:455
+#: src/cdplay.c:441
 msgid "DoNextDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:458 src/cdplay.c:485
+#: src/cdplay.c:444 src/cdplay.c:471
 msgid "No disc data. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:463
+#: src/cdplay.c:449
 msgid "Already at last index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:472 src/cdplay.c:499
+#: src/cdplay.c:458 src/cdplay.c:485
 #, fuzzy
 msgid "Done.\n"
 msgstr "§¹¦¨\n"
 
-#: src/cdplay.c:482
+#: src/cdplay.c:468
 msgid "DoPrevDiscDBEntry.\n"
 msgstr ""
 
-#: src/cdplay.c:490
+#: src/cdplay.c:476
 msgid "Already at first index. Returning.\n"
 msgstr ""
 
-#: src/cdplay.c:726 src/discedit.c:390
+#: src/cdplay.c:712 src/discedit.c:398
 #, fuzzy
 msgid "Error saving disc data."
 msgstr "Àx¦s¥úºÐ¸ê°T¿ù»~"
 
-#: src/cdplay.c:797
+#: src/cdplay.c:783
 msgid "Rotate play mode"
 msgstr "´`Àô¼½©ñ¼Ò¦¡"
 
-#: src/cdplay.c:817
+#: src/cdplay.c:803
 msgid "Toggle loop play"
 msgstr "¤Á´«´`Àô¼½©ñ"
 
-#: src/cdplay.c:895 src/rip.c:230
+#: src/cdplay.c:881 src/rip.c:231
 msgid "Rip status"
 msgstr "§ìyª¬ºA"
 
-#: src/cdplay.c:962
+#: src/cdplay.c:948
 msgid "Play track / Pause play"
 msgstr "¼½©ñ/¼È°±"
 
-#: src/cdplay.c:973
+#: src/cdplay.c:959
 msgid "Rewind"
 msgstr "Ë°h"
 
-#: src/cdplay.c:984
+#: src/cdplay.c:970
 msgid "FastForward"
 msgstr "§Ö¶i"
 
-#: src/cdplay.c:994
+#: src/cdplay.c:980
 msgid "Go to previous track"
 msgstr "¤W¤@¦±"
 
-#: src/cdplay.c:1003
+#: src/cdplay.c:989
 msgid "Go to next track"
 msgstr "¤U¤@¦±"
 
-#: src/cdplay.c:1012
+#: src/cdplay.c:998
 msgid "Toggle play mode options"
 msgstr "¤Á´«¼½©ñ¼Ò¦¡¿ï¶µ"
 
-#: src/cdplay.c:1022
+#: src/cdplay.c:1008
 msgid "Next Disc"
 msgstr "¤U¤@¥úºÐ"
 
-#: src/cdplay.c:1036
+#: src/cdplay.c:1022
 msgid "Stop play"
 msgstr "°±¤î¼½©ñ"
 
-#: src/cdplay.c:1046
+#: src/cdplay.c:1032
 msgid "Eject disc"
 msgstr "¼u¥X¥úºÐ"
 
-#: src/cdplay.c:1055
+#: src/cdplay.c:1041
 #, fuzzy
 msgid "Scan Disc Contents"
 msgstr "¥Ø¿ý"
 
-#: src/cdplay.c:1063
+#: src/cdplay.c:1049
 msgid "Toggle Volume Control"
 msgstr "¤Á´«µ¶q±±¨î"
 
-#: src/cdplay.c:1072
+#: src/cdplay.c:1058
 msgid "Toggle disc editor"
 msgstr "¤Á´«¥úºÐ½s¿è¾¹"
 
-#: src/cdplay.c:1082
+#: src/cdplay.c:1068
 msgid "Initiate/abort DiscDB lookup"
 msgstr "ªì©l¤Æ/¨ú®ø¥úºÐ¬d¸ß"
 
-#: src/cdplay.c:1092
+#: src/cdplay.c:1078
 msgid "Toggle track display"
 msgstr "¤Á´«¦±¥ØÅã¥Ü"
 
-#: src/cdplay.c:1099
+#: src/cdplay.c:1085
 msgid "Exit Grip"
 msgstr "Â÷¶} Grip"
 
-#: src/cdplay.c:1266
+#: src/cdplay.c:1252
 #, fuzzy
 msgid "Cannot fast forward while ripping."
 msgstr "§ìy¹Lµ{¤¤¤£¯à§Ö¶i"
 
-#: src/cdplay.c:1297
+#: src/cdplay.c:1283
 #, fuzzy
 msgid "Cannot rewind while ripping."
 msgstr "§ìy¹Lµ{¤¤¤£¯àË°h"
 
-#: src/cdplay.c:1328
+#: src/cdplay.c:1314
 #, fuzzy
 msgid "Cannot switch discs while ripping."
 msgstr "§ìy¹Lµ{¤¤¤£¯à¤Á´«¥úºÐ"
 
-#: src/cdplay.c:1346
-msgid "Eject disc\n"
-msgstr "¼u¥X¥úºÐ\n"
-
-#: src/cdplay.c:1350
+#: src/cdplay.c:1334
 #, fuzzy
 msgid "Cannot eject while ripping."
 msgstr "¤£¯à¦b§ìy¹Lµ{¤¤¼u¥X¥úºÐ"
 
-#: src/cdplay.c:1360
+#: src/cdplay.c:1344
 msgid "Have disc -- ejecting\n"
 msgstr "¦³¥úºÐ¢w¢w¥¿¦b¼u¥X\n"
 
-#: src/cdplay.c:1427
+#: src/cdplay.c:1411
 #, fuzzy
 msgid "Cannot play while ripping."
 msgstr "§ìy¹Lµ{¤¤¤£¯à¼½©ñ"
 
-#: src/cdplay.c:1495 src/cdplay.c:1526
+#: src/cdplay.c:1479 src/cdplay.c:1510
 #, fuzzy
 msgid "Cannot switch tracks while ripping."
 msgstr "§ìy¹Lµ{¤¤¤£¯à§ïÅÜ¦±¥Ø"
 
-#: src/cdplay.c:1617
+#: src/cdplay.c:1601
 msgid "Checking for a new disc\n"
 msgstr "¥¿¦bÀË¬d·s¥úºÐ\n"
 
-#: src/cdplay.c:1622
+#: src/cdplay.c:1606
 msgid "CDStat found a disc, checking tracks\n"
 msgstr "CDStat µo²{¥úºÐ¡A¥¿¦bÀË¬d¦±¥Ø\n"
 
-#: src/cdplay.c:1625
+#: src/cdplay.c:1609
 msgid "We have a valid disc!\n"
 msgstr "¥úºÐ¦³®Ä¡I\n"
 
-#: src/cdplay.c:1652
+#: src/cdplay.c:1636
 msgid "No non-zero length tracks\n"
 msgstr "¨S¦³«D¹sªø«×ªº¦±¥Ø\n"
 
-#: src/cdplay.c:1661
+#: src/cdplay.c:1645
 msgid "CDStat said no disc\n"
 msgstr "CDStat »¡µL¥úºÐ\n"
 
-#: src/cdplay.c:1810 src/cdplay.c:1832
+#: src/cdplay.c:1794 src/cdplay.c:1816
 #, c-format
 msgid "Current sector: %6d"
 msgstr "·í«e®°°Ï: %6d"
 
-#: src/cdplay.c:1933
+#: src/cdplay.c:1917
 msgid "No Disc"
 msgstr "µL¥úºÐ"
 
-#: src/cdplay.c:1985
+#: src/cdplay.c:1968
 msgid ""
 "This disc has been found on your secondary server,\n"
 "but not on your primary server.\n"
@@ -822,27 +753,39 @@
 "\n"
 "±z¬O§_·Q´£¥æ¦¹¥úºÐ¸ê°T¡H"
 
-#: src/cdplay.c:2014 src/cdplay.c:2023
+#: src/cdplay.c:1996 src/cdplay.c:2005
 #, fuzzy
 msgid "Error: Unable to create temporary file."
 msgstr "¿ù»~: µLªk«Ø¥ß¼È¦sÀÉ"
 
-#: src/cdplay.c:2041
+#: src/cdplay.c:2023
 #, fuzzy
 msgid "Error: Unable to write disc data."
 msgstr "¿ù»~: µLªk¼g¤J¥úºÐ¸ê®Æ"
 
-#: src/cdplay.c:2050
+#: src/cdplay.c:2032
 #, c-format
 msgid "Mailing entry to %s\n"
 msgstr "µo°e¶l¥ó¨ì %s\n"
 
-#: src/cdplay.c:2055
+#: src/cdplay.c:2037
 #, fuzzy
 msgid "Error: Unable to execute mail command."
 msgstr "¿ù»~: µLªkÀx¦s³]©wÀÉ"
 
-#: src/dialog.c:44
+#: src/dialog.c:39
+msgid "Warning"
+msgstr ""
+
+#: src/dialog.c:43
+msgid "Information"
+msgstr ""
+
+#: src/dialog.c:64
+msgid "Question"
+msgstr ""
+
+#: src/dialog.c:83
 msgid "System Message"
 msgstr "¨t²Î®ø®§"
 
@@ -876,85 +819,85 @@
 msgid "Error: Unable to open %s for writing\n"
 msgstr "¿ù»~: µLªk¶}±Ò %s ¶i¦æ¼g¤J\n"
 
-#: src/discedit.c:67
+#: src/discedit.c:61
 msgid "Disc title"
 msgstr "¥úºÐ¼ÐÃD"
 
-#: src/discedit.c:74 src/discedit.c:176
-msgid "Track name"
-msgstr "µy¦±¦W"
-
-#: src/discedit.c:84
-msgid "W"
-msgstr ""
-
-#: src/discedit.c:110
+#: src/discedit.c:62
 msgid "Disc artist"
 msgstr "¥úºÐ§@ªÌ"
 
-#: src/discedit.c:127
+#: src/discedit.c:63
 msgid "ID3 genre:"
 msgstr "ID3 Ãþ§O:"
 
-#: src/discedit.c:158
+#: src/discedit.c:64
 msgid "Disc year"
 msgstr "¥X«~¤é´Á"
 
-#: src/discedit.c:196
+#: src/discedit.c:65
+msgid "Track name"
+msgstr "µy¦±¦W"
+
+#: src/discedit.c:66
 msgid "Track artist"
 msgstr "¦±¥Ø§@ªÌ"
 
-#: src/discedit.c:213
+#: src/discedit.c:92
+msgid "W"
+msgstr ""
+
+#: src/discedit.c:221
 msgid "Split:"
 msgstr "¤À³Î:"
 
-#: src/discedit.c:217
+#: src/discedit.c:225
 msgid "Title/Artist"
 msgstr "¼ÐÃD/§@ªÌ"
 
-#: src/discedit.c:224
+#: src/discedit.c:232
 msgid "Artist/Title"
 msgstr "§@ªÌ/¼ÐÃD"
 
-#: src/discedit.c:232
+#: src/discedit.c:240
 msgid "Split chars"
 msgstr "¤À³Î²Å"
 
-#: src/discedit.c:254
+#: src/discedit.c:262
 msgid "Multi-artist"
 msgstr "¦h§@ªÌ"
 
-#: src/discedit.c:265
+#: src/discedit.c:273
 msgid "Save disc info"
 msgstr "Àx¦s¥úºÐ¸ê°T"
 
-#: src/discedit.c:274
+#: src/discedit.c:282
 msgid "Submit disc info"
 msgstr "´£¥æ¥úºÐ¸ê°T"
 
-#: src/discedit.c:393
+#: src/discedit.c:401
 #, fuzzy
 msgid "No disc present."
 msgstr "¨S¦³¥úºÐ"
 
-#: src/discedit.c:543
+#: src/discedit.c:555
 #, fuzzy
 msgid "Cannot submit. No disc is present."
 msgstr ""
 "¤£¯à´£¥æ\n"
 "¨S¦³¥úºÐ"
 
-#: src/discedit.c:558
+#: src/discedit.c:570
 #, fuzzy
 msgid "You must enter a disc title."
 msgstr "±z¥²¶·¿é¤J¥úºÐ¼ÐÃD"
 
-#: src/discedit.c:565
+#: src/discedit.c:577
 #, fuzzy
 msgid "You must enter a disc artist."
 msgstr "±z¥²¶·¿é¤J¤@Ó§@ªÌ"
 
-#: src/discedit.c:575
+#: src/discedit.c:586
 msgid ""
 "You are about to submit this disc information\n"
 "to a commercial CDDB server, which will then\n"
@@ -965,7 +908,7 @@
 "Continue?"
 msgstr ""
 
-#: src/discedit.c:584
+#: src/discedit.c:594
 msgid ""
 "You are about to submit this\n"
 "disc information via email.\n"
@@ -973,11 +916,11 @@
 "Continue?"
 msgstr ""
 
-#: src/discedit.c:601
+#: src/discedit.c:612
 msgid "Genre selection"
 msgstr "¿ï¾ÜÃþ§O"
 
-#: src/discedit.c:605
+#: src/discedit.c:616
 msgid ""
 "Submission requires a genre other than 'unknown'\n"
 "Please select a DiscDB genre below"
@@ -985,19 +928,18 @@
 "±z»Ýn«ü©w¨ãÅéªºµ¼ÖÃþ§O\n"
 "½Ð±q¤U¦C¿ï¾Ü¤@Ó DiscDB Ãþ§O"
 
-#: src/discedit.c:615
+#: src/discedit.c:626
 msgid "DiscDB genre"
 msgstr "DiscDB Ãþ§O"
 
-#: src/discedit.c:635
+#: src/discedit.c:646
 msgid "Submit"
 msgstr "´£¥æ"
 
-#: src/discedit.c:646
+#: src/discedit.c:657
 msgid "Cancel"
 msgstr "¨ú®ø"
 
-#. Doh!
 #: src/id3.c:335
 msgid "unknown ID3 field\n"
 msgstr "¥¼ª¾ªº ID3 °ì\n"
@@ -1007,195 +949,172 @@
 msgid "Error: unable to translate filename. No such user as %s\n"
 msgstr "¿ù»~: µLªkÂà´«ÀÉ¦W¡CµL¦¹¨Ï¥ÎªÌ %s\n"
 
-#: src/launch.c:312 src/rip.c:1638
+#: src/launch.c:315
 msgid "Exec failed\n"
 msgstr "°õ¦æ¥¢±Ñ\n"
 
-#: src/parsecfg.c:58
+#: src/parsecfg.c:59
 msgid "Error: Bad entry type\n"
 msgstr "¿ù»~: Ãaªº¶µ¥ØÃþ«¬\n"
 
-#: src/parsecfg.c:81
+#: src/parsecfg.c:82
 #, fuzzy
 msgid "Error: Reading config file\n"
 msgstr "¿ù»~: µL®Äªº³]©wÀÉ\n"
 
-#: src/parsecfg.c:87
+#: src/parsecfg.c:88
 msgid "Error: Invalid config file\n"
 msgstr "¿ù»~: µL®Äªº³]©wÀÉ\n"
 
-#: src/rip.c:104
+#: src/rip.c:105
 msgid "Rip+Encode"
 msgstr "§ìy«á½s½X"
 
-#: src/rip.c:106
+#: src/rip.c:107
 msgid "Rip and encode selected tracks"
 msgstr "§ìy©M½s½X¿ï¤¤ªº¦±¥Ø"
 
-#: src/rip.c:112
+#: src/rip.c:113
 msgid "Rip Only"
 msgstr "¥u§ìy"
 
-#: src/rip.c:114
+#: src/rip.c:115
 msgid "Rip but do not encode selected tracks"
 msgstr "¥u§ìy¤£½s½X"
 
-#: src/rip.c:120
+#: src/rip.c:121
 msgid "Abort Rip and Encode"
 msgstr "°±¤î§ìy©M½s½X"
 
-#: src/rip.c:122
+#: src/rip.c:123
 msgid "Kill all active rip and encode processes"
 msgstr "±þ±¼©Ò¦³§ìy©M½s½X¶iµ{"
 
-#: src/rip.c:130
+#: src/rip.c:131
 msgid "Abort Ripping Only"
 msgstr "¥u¨ú®ø§ìy"
 
-#: src/rip.c:132
+#: src/rip.c:133
 msgid "Kill rip process"
 msgstr "±þ±¼§ìy¶iµ{"
 
-#: src/rip.c:138
+#: src/rip.c:139
 msgid "DDJ Scan"
 msgstr "DDJ ±½´y"
 
-#: src/rip.c:140
+#: src/rip.c:141
 msgid "Insert disc information into the DigitalDJ database"
 msgstr "§â¥úºÐ¸ê°T´¡¤J DigitalDJ ¸ê®Æ®w"
 
-#: src/rip.c:155
+#: src/rip.c:156
 msgid "Rip partial track"
 msgstr "§ì¨ú³¡¤Àµy"
 
-#: src/rip.c:166 src/tray.c:186
+#: src/rip.c:167 src/tray.c:176
 msgid "Play"
 msgstr "¼½©ñ"
 
-#: src/rip.c:173
+#: src/rip.c:174
 msgid "Current sector:      0"
 msgstr "¥Ø«e®°°Ï:      0"
 
-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:921 src/rip.c:974
-#: src/rip.c:976 src/rip.c:1131 src/rip.c:1132
+#: src/rip.c:205 src/rip.c:222 src/rip.c:270 src/rip.c:923 src/rip.c:980
+#: src/rip.c:984 src/rip.c:1139 src/rip.c:1140
 msgid "Rip: Idle"
 msgstr "§ìy: ¶¢¸m"
 
-#: src/rip.c:209
+#: src/rip.c:210
 #, fuzzy
 msgid "Enc: Trk 99 (99.9x)"
 msgstr "½s½X: ¦±¥Ø 99 (99.9x)"
 
-#: src/rip.c:240 src/rip.c:282 src/rip.c:1102 src/rip.c:1116
+#: src/rip.c:241 src/rip.c:283 src/rip.c:1111 src/rip.c:1125
 #, fuzzy
 msgid "Enc: Idle"
 msgstr "½s½X: ¶¢¸m"
 
-#: src/rip.c:264
+#: src/rip.c:265
 msgid "Overall indicators:"
 msgstr ""
 
-#: src/rip.c:327
+#: src/rip.c:328
 msgid "Start sector"
 msgstr "°_©l®°°Ï"
 
-#: src/rip.c:332
+#: src/rip.c:333
 msgid "End sector"
 msgstr "²×¤î®°°Ï"
 
-#: src/rip.c:384
-#, fuzzy, c-format
-msgid "Inserting track %d into the ddj database\n"
-msgstr "§â¸ê°T´¡¤J SQL ¸ê®Æ®w"
-
-#: src/rip.c:609
+#: src/rip.c:600
 #, fuzzy
 msgid "Error: can't open m3u file."
 msgstr "¿ù»~: ¤£¯à¶}±Ò m3u ÀÉ®×\n"
 
-#: src/rip.c:703
+#: src/rip.c:693
 msgid "In KillRip\n"
 msgstr ""
 
-#: src/rip.c:729
+#: src/rip.c:720
 #, c-format
 msgid "Now total enc size is: %d\n"
 msgstr ""
 
-#: src/rip.c:884
+#: src/rip.c:886
 #, c-format
 msgid "Rip: Trk %d (%3.1fx)"
 msgstr "§ìy: ¦±¥Ø %d (%3.1fx)"
 
-#: src/rip.c:917
+#: src/rip.c:919
 #, c-format
 msgid "Rip: %6.2f%%"
 msgstr ""
 
-#: src/rip.c:937
-msgid "Rip finished\n"
-msgstr "§¹¦¨§ìy\n"
-
-#: src/rip.c:963
+#: src/rip.c:967
 #, c-format
 msgid "Rip partial %d  num wavs %d\n"
 msgstr ""
 
-#: src/rip.c:966
+#: src/rip.c:970
 #, c-format
 msgid "Next track is %d, total is %d\n"
 msgstr "¤U¤@º¬O %d¡AÁ`¦@ %d º\n"
 
-#: src/rip.c:972
+#: src/rip.c:976
 msgid "Check if we need to rip another track\n"
 msgstr "ÀË¬d¬O§_»Ýn§ì¨ú¨ä¥L¦±¥Ø\n"
 
-#: src/rip.c:1014
+#: src/rip.c:1024
 #, fuzzy, c-format
 msgid "Enc: Trk %d (%3.1fx)"
 msgstr "½s½X: ¦±¥Ø %d (%3.1fx)"
 
-#: src/rip.c:1032
+#: src/rip.c:1042
 #, c-format
 msgid "Enc: %6.2f%%"
 msgstr ""
 
-#: src/rip.c:1042
-#, c-format
-msgid "Finished encoding on cpu %d\n"
-msgstr "§¹¦¨½s½X¦b³B²z¾¹ %d\n"
-
-#: src/rip.c:1060
-#, c-format
-msgid "Deleting [%s]\n"
-msgstr "¥¿¦b§R°£ [%s]\n"
-
-#: src/rip.c:1124
-msgid "Ripping is finished\n"
-msgstr "§ìy§¹¦¨\n"
-
-#: src/rip.c:1247 src/rip.c:1253 src/rip.c:1292
+#: src/rip.c:1259 src/rip.c:1266 src/rip.c:1307
 msgid "NoArtist"
 msgstr "µL§@ªÌ"
 
-#: src/rip.c:1258
+#: src/rip.c:1272
 msgid "NoTitle"
 msgstr "µL¼ÐÃD"
 
-#: src/rip.c:1354
+#: src/rip.c:1369
 msgid ""
 "No disc was detected in the drive. If you have a disc in your drive, please "
 "check your CDRom device setting under Config->CD."
 msgstr ""
 
-#: src/rip.c:1367
+#: src/rip.c:1384
 msgid ""
 "Invalid rip executable.\n"
 "Check your rip config, and ensure it specifies the full path to the ripper "
 "executable."
 msgstr ""
 
-#: src/rip.c:1378
+#: src/rip.c:1395
 #, fuzzy
 msgid ""
 "Invalid encoder executable.\n"
@@ -1205,7 +1124,7 @@
 "µL®Äªº§ìyµ{¦¡\n"
 "½ÐÀË¬d§Aªº§ìy¾¹³]©w"
 
-#: src/rip.c:1414
+#: src/rip.c:1431
 msgid ""
 "No tracks selected.\n"
 "Rip whole CD?\n"
@@ -1213,165 +1132,222 @@
 "¨S¦³¿ï¾Ü¦±¥Ø¡C\n"
 "§ì¨ú¾ã¤ù¥úºÐ¶Ü¡H\n"
 
-#: src/rip.c:1440
+#: src/rip.c:1457
 msgid "Ripping whole CD\n"
 msgstr "¥¿¦b§ì¨ú¾ã¤ù¥úºÐ\n"
 
-#: src/rip.c:1480
+#: src/rip.c:1499
 msgid "In RipNextTrack\n"
 msgstr "¦b§ì¨ú¤U¤@y\n"
 
-#: src/rip.c:1487
+#: src/rip.c:1507
 #, c-format
 msgid "First checked track is %d\n"
 msgstr "²Ä¤@ÓÀË¬dªº¦±¥Ø¬O %d\n"
 
-#: src/rip.c:1497
+#: src/rip.c:1517
 msgid "Ripping away!\n"
 msgstr ""
 
-#: src/rip.c:1547
+#: src/rip.c:1567
 msgid "No write access to write wav file"
 msgstr "¨S¦³¼g¤J wav ÀÉ®×ªºÅv"
 
-#: src/rip.c:1561
-#, c-format
-msgid "Ripping track %d to %s\n"
-msgstr "¥¿¦b§ì¨ú¦±¥Ø %d ¨ì %s\n"
-
-#: src/rip.c:1565
+#: src/rip.c:1583
 #, c-format
 msgid "Rip: Trk %d (0.0x)"
 msgstr "§ìy: ¦±¥Ø %d (0.0x)"
 
-#: src/rip.c:1570
-#, c-format
-msgid "File %s has already been ripped. Skipping...\n"
-msgstr "ÀÉ®× %s ¤w¸g§ì¹L¡C¸õ¹L...\n"
-
-#: src/rip.c:1591 src/rip.c:1856
+#: src/rip.c:1608 src/rip.c:1862
 msgid "Out of space in output directory"
 msgstr "¿é¥X¥Ø¿ýªÅ¶¡¤£¨¬"
 
-#: src/rip.c:1673
+#: src/rip.c:1686
 msgid "Calling CDPRip\n"
 msgstr "©I¥s CDPRip\n"
 
-#: src/rip.c:1762
+#: src/rip.c:1767
 #, fuzzy, c-format
 msgid "Added track %d to %s list\n"
 msgstr "²K¥[¦±¥Ø %d ¨ì½s½X¶¤¦C\n"
 
-#: src/rip.c:1789
+#: src/rip.c:1795
 msgid "No free cpus\n"
 msgstr "¨S¦³¶¢¸mªº³B²z¾¹\n"
 
-#: src/rip.c:1805
+#: src/rip.c:1811
 #, fuzzy, c-format
 msgid "Enc track %d\n"
 msgstr "MP3 ¦±¥Ø %d\n"
 
-#: src/rip.c:1830
+#: src/rip.c:1837
 #, fuzzy
 msgid "No write access to write encoded file."
 msgstr "¨S¦³¼g¤J mp3 ÀÉ®×ªºÅv"
 
-#: src/rip.c:1841
-#, c-format
-msgid "%i: Encoding to %s\n"
-msgstr "%i: ½s½X¨ì %s\n"
-
-#: src/rip.c:1845
+#: src/rip.c:1851
 #, fuzzy, c-format
 msgid "Enc: Trk %d (0.0x)"
 msgstr "§ìy: ¦±¥Ø %d (0.0x)"
 
-#: src/rip.c:1915
+#: src/rip.c:1918
 msgid "In CalculateAll\n"
 msgstr ""
 
-#: src/rip.c:1921
+#: src/rip.c:1924
 msgid "We aren't ripping now, so let's zero encoding values\n"
 msgstr ""
 
-#: src/rip.c:1937
+#: src/rip.c:1940
 #, c-format
 msgid "Total rip size is: %d\n"
 msgstr ""
 
-#: src/rip.c:1938
+#: src/rip.c:1941
 #, c-format
 msgid "Total enc size is: %d\n"
 msgstr ""
 
-#: src/tray.c:57
+#: src/tray.c:59
 #, fuzzy
 msgid "Artist"
 msgstr "µL§@ªÌ"
 
-#: src/tray.c:58
+#: src/tray.c:60
 #, fuzzy
 msgid "Title"
 msgstr "µL¼ÐÃD"
 
-#: src/tray.c:83
+#: src/tray.c:85
 #, c-format
 msgid ""
 "%s - %s\n"
 "%02d:%02d of %02d:%02d"
 msgstr ""
 
-#: src/tray.c:87
+#: src/tray.c:89
 #, c-format
 msgid "Ripping  Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr ""
 
-#: src/tray.c:88
+#: src/tray.c:90
 #, c-format
 msgid "Encoding Track %02d:\t%6.2f%% (%6.2f%% )"
 msgstr ""
 
-#: src/tray.c:89
+#: src/tray.c:91
 #, c-format
 msgid ""
 "%s - %s\n"
 "%s%s%s"
 msgstr ""
 
-#: src/tray.c:92
+#: src/tray.c:94
 #, c-format
 msgid ""
 "%s - %s\n"
 "Idle"
 msgstr ""
 
-#: src/tray.c:191
+#: src/tray.c:181
 msgid "Pause"
 msgstr ""
 
-#: src/tray.c:196
+#: src/tray.c:186
 #, fuzzy
 msgid "Stop"
 msgstr "°±¤î¼½©ñ"
 
-#: src/tray.c:204
+#: src/tray.c:194
 msgid "Previous"
 msgstr ""
 
-#: src/tray.c:209
+#: src/tray.c:199
 #, fuzzy
 msgid "Next"
 msgstr "¤U¤@¥úºÐ"
 
-#: src/tray.c:217
+#: src/tray.c:207
 #, fuzzy
 msgid "Rip and Encode"
 msgstr "°±¤î§ìy©M½s½X"
 
-#: src/tray.c:224
+#: src/tray.c:214
 msgid "Quit"
 msgstr ""
 
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "«ü©w¥Dµøµ¡ªº¦ì¸m´X¦óÄÝ©Ê"
+
+#~ msgid "GEOMETRY"
+#~ msgstr "´X¦óÄÝ©Ê"
+
+#, fuzzy
+#~ msgid "Status"
+#~ msgstr "§ìyª¬ºA"
+
+#~ msgid "Playing CDs"
+#~ msgstr "¼½©ñ CD"
+
+#~ msgid "Ripping CDs"
+#~ msgstr "CD §ìy"
+
+#~ msgid "Configuring Grip"
+#~ msgstr "³]©w Grip"
+
+#~ msgid "FAQ"
+#~ msgstr "±`¨£°ÝÃD¸Ñµª"
+
+#~ msgid "Getting More Help"
+#~ msgstr "¨ú±o§ó¦h»²§U"
+
+#~ msgid "Reporting Bugs"
+#~ msgstr "³ø§i¿ù»~"
+
+#~ msgid "Querying %s (through %s) for disc %02x.\n"
+#~ msgstr "¥¿¦b (³z¹L %2$s) ¦V %1$s ¬d¸ß¥úºÐ %3$02x¡C\n"
+
+#~ msgid "Querying %s for disc %02x.\n"
+#~ msgstr "¥¿¦b¦V %s ¬d¸ß¥úºÐ %02x¡C\n"
+
+#~ msgid "No match\n"
+#~ msgstr "¤£¤Ç°t\n"
+
+#~ msgid ""
+#~ "Match for \"%s / %s\"\n"
+#~ "Downloading data...\n"
+#~ msgstr ""
+#~ "¥¿¦b¤Ç°t \"%s / %s\"\n"
+#~ "¥¿¦b¤U¸ü¸ê®Æ...\n"
+
+#~ msgid "Eject disc\n"
+#~ msgstr "¼u¥X¥úºÐ\n"
+
+#, fuzzy
+#~ msgid "Inserting track %d into the ddj database\n"
+#~ msgstr "§â¸ê°T´¡¤J SQL ¸ê®Æ®w"
+
+#~ msgid "Rip finished\n"
+#~ msgstr "§¹¦¨§ìy\n"
+
+#~ msgid "Finished encoding on cpu %d\n"
+#~ msgstr "§¹¦¨½s½X¦b³B²z¾¹ %d\n"
+
+#~ msgid "Deleting [%s]\n"
+#~ msgstr "¥¿¦b§R°£ [%s]\n"
+
+#~ msgid "Ripping is finished\n"
+#~ msgstr "§ìy§¹¦¨\n"
+
+#~ msgid "Ripping track %d to %s\n"
+#~ msgstr "¥¿¦b§ì¨ú¦±¥Ø %d ¨ì %s\n"
+
+#~ msgid "File %s has already been ripped. Skipping...\n"
+#~ msgstr "ÀÉ®× %s ¤w¸g§ì¹L¡C¸õ¹L...\n"
+
+#~ msgid "%i: Encoding to %s\n"
+#~ msgstr "%i: ½s½X¨ì %s\n"
+
 #~ msgid ""
 #~ "Invalid rip executable\n"
 #~ "Check your rip config"

grip-3.10.1.tar.gz/src/Makefile.am -> grip-4.1.1.tar.gz/src/Makefile.am Changed

@@ -1,21 +1,16 @@
 AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) \
 	-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" \
-         -DG_LOG_DOMAIN=\"grip\" -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-        -I../intl -I$(top_srcdir)/intl \
-	-DPREFIX=\""$(prefix)"\" \
-        -DSYSCONFDIR=\""$(sysconfdir)"\" \
-        -DDATADIR=\""$(datadir)"\" \
-        -DLIBDIR=\""$(libdir)"\"
-
+	-DG_LOG_DOMAIN=\"grip\" \
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
 
 
 bin_PROGRAMS = grip
 
-grip_SOURCES =         \
+grip_SOURCES = \
 	cppmain.cc \
-        main.c \
+	main.c \
 	common.h \
-        grip.c \
+	grip.c \
 	grip.h \
 	cddev.c	\
 	cddev.h \
@@ -33,8 +28,6 @@
 	discdb.h \
 	uihelper.c \
 	uihelper.h \
-	status_window.c \
-	status_window.h \
 	xpm.h \
 	dialog.c \
 	dialog.h \
@@ -46,9 +39,7 @@
 	launch.h \
 	gain_analysis.c \
 	gain_analysis.h \
-	eggtrayicon.c \
-	eggtrayicon.h \
 	tray.c \
 	tray.h 
 
-grip_LDADD = @TERMINAL_WIDGET_LIBS@ $(CDPAR_LIBS) $(ID3_LIBS)
+grip_LDADD = $(CDPAR_LIBS) $(ID3_LIBS) $(THREAD_LIBS)

grip-3.10.1.tar.gz/src/Makefile.in -> grip-4.1.1.tar.gz/src/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -80,13 +90,19 @@
 host_triplet = @host@
 bin_PROGRAMS = grip$(EXEEXT)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -95,12 +111,13 @@
 am_grip_OBJECTS = cppmain.$(OBJEXT) main.$(OBJEXT) grip.$(OBJEXT) \
 	cddev.$(OBJEXT) cdplay.$(OBJEXT) discedit.$(OBJEXT) \
 	rip.$(OBJEXT) cdpar.$(OBJEXT) id3.$(OBJEXT) discdb.$(OBJEXT) \
-	uihelper.$(OBJEXT) status_window.$(OBJEXT) dialog.$(OBJEXT) \
-	gripcfg.$(OBJEXT) parsecfg.$(OBJEXT) launch.$(OBJEXT) \
-	gain_analysis.$(OBJEXT) eggtrayicon.$(OBJEXT) tray.$(OBJEXT)
+	uihelper.$(OBJEXT) dialog.$(OBJEXT) gripcfg.$(OBJEXT) \
+	parsecfg.$(OBJEXT) launch.$(OBJEXT) gain_analysis.$(OBJEXT) \
+	tray.$(OBJEXT)
 grip_OBJECTS = $(am_grip_OBJECTS)
 am__DEPENDENCIES_1 =
-grip_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+grip_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -118,8 +135,16 @@
 am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/cddev.Po ./$(DEPDIR)/cdpar.Po \
+	./$(DEPDIR)/cdplay.Po ./$(DEPDIR)/cppmain.Po \
+	./$(DEPDIR)/dialog.Po ./$(DEPDIR)/discdb.Po \
+	./$(DEPDIR)/discedit.Po ./$(DEPDIR)/gain_analysis.Po \
+	./$(DEPDIR)/grip.Po ./$(DEPDIR)/gripcfg.Po ./$(DEPDIR)/id3.Po \
+	./$(DEPDIR)/launch.Po ./$(DEPDIR)/main.Po \
+	./$(DEPDIR)/parsecfg.Po ./$(DEPDIR)/rip.Po ./$(DEPDIR)/tray.Po \
+	./$(DEPDIR)/uihelper.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -183,6 +208,8 @@
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(top_srcdir)/build-aux/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -192,8 +219,6 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CDPAR_LIBS = @CDPAR_LIBS@
@@ -205,7 +230,6 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -217,9 +241,10 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNOME_CFLAGS = @GNOME_CFLAGS@
 GNOME_LIBS = @GNOME_LIBS@
 GREP = @GREP@
@@ -229,23 +254,28 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -263,20 +293,18 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
 POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-TERMINAL_WIDGET_CFLAGS = @TERMINAL_WIDGET_CFLAGS@
-TERMINAL_WIDGET_LIBS = @TERMINAL_WIDGET_LIBS@
+THREAD_LIBS = @THREAD_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -322,6 +350,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -332,18 +361,14 @@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) \
 	-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" \
-         -DG_LOG_DOMAIN=\"grip\" -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-        -I../intl -I$(top_srcdir)/intl \
-	-DPREFIX=\""$(prefix)"\" \
-        -DSYSCONFDIR=\""$(sysconfdir)"\" \
-        -DDATADIR=\""$(datadir)"\" \
-        -DLIBDIR=\""$(libdir)"\"
+	-DG_LOG_DOMAIN=\"grip\" \
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
 
 grip_SOURCES = \
 	cppmain.cc \
-        main.c \
+	main.c \
 	common.h \
-        grip.c \
+	grip.c \
 	grip.h \
 	cddev.c	\
 	cddev.h \
@@ -361,8 +386,6 @@
 	discdb.h \
 	uihelper.c \
 	uihelper.h \
-	status_window.c \
-	status_window.h \
 	xpm.h \
 	dialog.c \
 	dialog.h \
@@ -374,12 +397,10 @@
 	launch.h \
 	gain_analysis.c \
 	gain_analysis.h \
-	eggtrayicon.c \
-	eggtrayicon.h \
 	tray.c \
 	tray.h 
 
-grip_LDADD = @TERMINAL_WIDGET_LIBS@ $(CDPAR_LIBS) $(ID3_LIBS)
+grip_LDADD = $(CDPAR_LIBS) $(ID3_LIBS) $(THREAD_LIBS)
 all: all-am
 
 .SUFFIXES:
@@ -393,17 +414,16 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu src/Makefile
-.PRECIOUS: Makefile
+	  $(AUTOMAKE) --foreign src/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -474,25 +494,29 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cddev.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdpar.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdplay.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cppmain.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/discdb.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/discedit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eggtrayicon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gain_analysis.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grip.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gripcfg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id3.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/launch.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parsecfg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rip.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/status_window.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tray.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uihelper.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cddev.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdpar.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdplay.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cppmain.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dialog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/discdb.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/discedit.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gain_analysis.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grip.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gripcfg.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id3.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/launch.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parsecfg.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rip.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tray.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uihelper.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -594,7 +618,10 @@
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -666,7 +693,23 @@
 clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/cddev.Po
+	-rm -f ./$(DEPDIR)/cdpar.Po
+	-rm -f ./$(DEPDIR)/cdplay.Po
+	-rm -f ./$(DEPDIR)/cppmain.Po
+	-rm -f ./$(DEPDIR)/dialog.Po
+	-rm -f ./$(DEPDIR)/discdb.Po
+	-rm -f ./$(DEPDIR)/discedit.Po
+	-rm -f ./$(DEPDIR)/gain_analysis.Po
+	-rm -f ./$(DEPDIR)/grip.Po
+	-rm -f ./$(DEPDIR)/gripcfg.Po
+	-rm -f ./$(DEPDIR)/id3.Po
+	-rm -f ./$(DEPDIR)/launch.Po
+	-rm -f ./$(DEPDIR)/main.Po
+	-rm -f ./$(DEPDIR)/parsecfg.Po
+	-rm -f ./$(DEPDIR)/rip.Po
+	-rm -f ./$(DEPDIR)/tray.Po
+	-rm -f ./$(DEPDIR)/uihelper.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -712,7 +755,23 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/cddev.Po
+	-rm -f ./$(DEPDIR)/cdpar.Po
+	-rm -f ./$(DEPDIR)/cdplay.Po
+	-rm -f ./$(DEPDIR)/cppmain.Po
+	-rm -f ./$(DEPDIR)/dialog.Po
+	-rm -f ./$(DEPDIR)/discdb.Po
+	-rm -f ./$(DEPDIR)/discedit.Po
+	-rm -f ./$(DEPDIR)/gain_analysis.Po
+	-rm -f ./$(DEPDIR)/grip.Po
+	-rm -f ./$(DEPDIR)/gripcfg.Po
+	-rm -f ./$(DEPDIR)/id3.Po
+	-rm -f ./$(DEPDIR)/launch.Po
+	-rm -f ./$(DEPDIR)/main.Po
+	-rm -f ./$(DEPDIR)/parsecfg.Po
+	-rm -f ./$(DEPDIR)/rip.Po
+	-rm -f ./$(DEPDIR)/tray.Po
+	-rm -f ./$(DEPDIR)/uihelper.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -733,7 +792,7 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
 	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
 	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
@@ -747,6 +806,8 @@
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
 
+.PRECIOUS: Makefile
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

grip-3.10.1.tar.gz/src/cdpar.c -> grip-4.1.1.tar.gz/src/cdpar.c Changed

@@ -42,6 +42,7 @@
 #include "gain_analysis.h"
 
 #include "cdpar.h"
+#include "common.h"
 
 static void PutNum(long num,int f,int endianness,int bytes);
 static void WriteWav(int f,long bytes);
@@ -63,7 +64,6 @@
 
 /* Ugly hack because we can't pass user data to the callback */
 int *global_rip_smile_level;
-FILE *global_output_fp;
 
 static void PutNum(long num,int f,int endianness,int bytes)
 {
@@ -239,7 +239,7 @@
 		long first_sector,long last_sector,
 		char *outfile,int paranoia_mode,int *rip_smile_level,
 		gfloat *rip_percent_done,gboolean *stop_thread_rip_now,
-		gboolean do_gain_calc,FILE *output_fp)
+		gboolean do_gain_calc)
 {
   int force_cdrom_endian=-1;
   int force_cdrom_sectors=-1;
@@ -255,7 +255,6 @@
   cdrom_paranoia *p=NULL;
 
   global_rip_smile_level=rip_smile_level;
-  global_output_fp=output_fp;
 
   /* Query the cdrom/disc; */
 
@@ -265,7 +264,7 @@
   
   if(!d){
     if(!verbose)
-      fprintf(output_fp,"\nUnable to open cdrom drive.\n");
+      Debug(_("Unable to open cdrom drive.\n"));
 
     return FALSE;
   }
@@ -280,26 +279,24 @@
     d->bigendianp=force_cdrom_endian;
     switch(force_cdrom_endian){
     case 0:
-      fprintf(output_fp,
-	      "Forcing CDROM sense to little-endian; ignoring preset and autosense");
+      Debug(_("Forcing CDROM sense to little-endian; ignoring preset and autosense\n"));
       break;
     case 1:
-      fprintf(output_fp,
-	      "Forcing CDROM sense to big-endian; ignoring preset and autosense");
+      Debug(_("Forcing CDROM sense to big-endian; ignoring preset and autosense\n"));
       break;
     }
   }
 
   if(force_cdrom_sectors!=-1){
     if(force_cdrom_sectors<0 || force_cdrom_sectors>100){
-      fprintf(output_fp,"Default sector read size must be 1<= n <= 100\n");
+      Debug(_("Default sector read size must be 1<= n <= 100\n"));
       cdda_close(d);
 
       return FALSE;
     }
 
-    fprintf(output_fp,"Forcing default to read %d sectors; "
-	    "ignoring preset and autosense",force_cdrom_sectors);
+    Debug(_("Forcing default to read %d sectors; "
+	    "ignoring preset and autosense\n"),force_cdrom_sectors);
 
     d->nsectors=force_cdrom_sectors;
     d->bigbuff=force_cdrom_sectors*CD_FRAMESIZE_RAW;
@@ -307,38 +304,35 @@
 
   if(force_cdrom_overlap!=-1){
     if(force_cdrom_overlap<0 || force_cdrom_overlap>75){
-      fprintf(output_fp,"Search overlap sectors must be 0<= n <=75\n");
+      Debug(_("Search overlap sectors must be 0<= n <=75\n"));
       cdda_close(d);
 
       return FALSE;
     }
 
-    fprintf(output_fp,"Forcing search overlap to %d sectors; "
-	    "ignoring autosense",force_cdrom_overlap);
+    Debug(_("Forcing search overlap to %d sectors; "
+	    "ignoring autosense\n"),force_cdrom_overlap);
   }
 
   switch(cdda_open(d)) {
   case -2:case -3:case -4:case -5:
-    fprintf(output_fp,
-	    "\nUnable to open disc.  Is there an audio CD in the drive?");
+    Debug(_("Unable to open disc. Is there an audio CD in the drive?\n"));
     cdda_close(d);
     return FALSE;
   case -6:
-    fprintf(output_fp,
-	    "\nCdparanoia could not find a way to read audio from this drive.");
+    Debug(_("Cdparanoia could not find a way to read audio from this drive.\n"));
     cdda_close(d);
     return FALSE;
   case 0:
     break;
   default:
-    fprintf(output_fp,"\nUnable to open disc.");
+    Debug(_("Unable to open disc.\n"));
     cdda_close(d);
     return FALSE;
   }
 
   if(d->interface==GENERIC_SCSI && d->bigbuff<=CD_FRAMESIZE_RAW) {
-    fprintf(output_fp,
-	    "WARNING: You kernel does not have generic SCSI 'SG_BIG_BUFF'\n"
+    Debug(_("WARNING: You kernel does not have generic SCSI 'SG_BIG_BUFF'\n"
 	    "         set, or it is set to a very small value.  Paranoia\n"
 	    "         will only be able to perform single sector reads\n"
 	    "         making it very unlikely Paranoia can work.\n\n"
@@ -348,20 +342,18 @@
 	    "         before the last #endif:\n\n"
 	    "         #define SG_BIG_BUFF 65536\n\n"
 	    "         and then recompiling the kernel.\n\n"
-	    "         Attempting to continue...\n\n");
+	    "         Attempting to continue...\n\n"));
   }
   
   if(d->nsectors==1){
-    fprintf(output_fp,
-	    "WARNING: The autosensed/selected sectors per read value is\n"
+    Debug(_("WARNING: The autosensed/selected sectors per read value is\n"
 	    "         one sector, making it very unlikely Paranoia can \n"
 	    "         work.\n\n"
-	    "         Attempting to continue...\n\n");
+	    "         Attempting to continue...\n\n"));
   }
 
   if(!cdda_track_audiop(d,track)) {
-    fprintf(output_fp,
-	    "Selected track is not an audio track. Aborting.\n\n");
+    Debug(_("Selected track is not an audio track. Aborting.\n\n"));
     cdda_close(d);
     return FALSE;
   }
@@ -388,7 +380,7 @@
     
   out=open(outfile,O_RDWR|O_CREAT|O_TRUNC,0666);
   if(out==-1){
-    fprintf(output_fp,"Cannot open default output file %s: %s",outfile,
+    Debug(_("Cannot open default output file %s: %s\n"),outfile,
 	    strerror(errno));
     cdda_close(d);
     paranoia_free(p);
@@ -409,9 +401,9 @@
     *rip_percent_done=(gfloat)cursor/(gfloat)last_sector;
 	
     if(mes || err)
-      fprintf(output_fp,"\r                               "
-	      "                                           \r%s%s\n",
-	      mes?mes:"",err?err:"");
+      Debug("\r                               "
+	    "                                           \r%s%s\n",
+	    mes?mes:"",err?err:"");
 	
     if(err)free(err);
     if(mes)free(mes);
@@ -427,7 +419,7 @@
 
 
     if(readbuf==NULL){
-      fprintf(output_fp,"\nparanoia_read: Unrecoverable error, bailing.\n");
+      Debug(_("paranoia_read: Unrecoverable error, bailing.\n"));
       cursor=last_sector+1;
       paranoia_seek(p,cursor,SEEK_SET);      
       break;
@@ -446,7 +438,7 @@
       GainCalc((char *)readbuf);
 	
     if(CDPWrite(out,(char *)readbuf)){
-      fprintf(output_fp,"Error writing output: %s",strerror(errno));
+      Debug(_("Error writing output: %s"),strerror(errno));
 	  
       cdda_close(d);
       paranoia_free(p);

grip-3.10.1.tar.gz/src/cdplay.c -> grip-4.1.1.tar.gz/src/cdplay.c Changed

@@ -86,8 +86,8 @@
   }
   else {
     if(ginfo->ripping_a_disc) {
-      gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                        _("Cannot do lookup while ripping."));
+      DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+                 _("Cannot do lookup while ripping."));
 
       return;
     }
@@ -181,15 +181,6 @@
   disc=&(ginfo->disc);
   ddata=&(ginfo->ddata);
 
-  if(server->use_proxy)
-    LogStatus(ginfo,_("Querying %s (through %s) for disc %02x.\n"),
-	      server->name,
-	      server->proxy->name,
-	      DiscDBDiscid(disc));
-  else
-    LogStatus(ginfo,_("Querying %s for disc %02x.\n"),server->name,
-	      DiscDBDiscid(disc));
-
   strncpy(hello.hello_program,"Grip",256);
   strncpy(hello.hello_version,VERSION,256);
 
@@ -209,7 +200,6 @@
 		DiscDBReadDisc(ginfo, server, &query, 0);
       break;
     case MATCH_NOMATCH:
-      LogStatus(ginfo,_("No match\n"));
       break;
     }
   }
@@ -236,10 +226,6 @@
   else
     hello.proto_version=5;
 
-  LogStatus(ginfo,_("Match for \"%s / %s\"\nDownloading data...\n"),
-		  query->query_list[query_idx].list_artist,
-		  query->query_list[query_idx].list_artist);
-
   entry.entry_genre = query->query_list[query_idx].list_genre;
   entry.entry_id = query->query_list[query_idx].list_id;
 
@@ -722,8 +708,8 @@
 
   if(DiscDBWriteDiscData(&(ginfo->disc),&(ginfo->ddata),NULL,TRUE,FALSE,
                          "utf-8")<0)
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("Error saving disc data."));
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("Error saving disc data."));
 }
 
 static void ToggleLoop(GtkWidget *widget,gpointer data)
@@ -1262,8 +1248,8 @@
   ginfo=(GripInfo *)data;
 
   if(ginfo->ripping_a_disc) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("Cannot fast forward while ripping."));
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("Cannot fast forward while ripping."));
 
     return;
   }
@@ -1293,8 +1279,8 @@
   ginfo=(GripInfo *)data;
 
   if(ginfo->ripping_a_disc) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("Cannot rewind while ripping."));
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("Cannot rewind while ripping."));
 
     return;
   }
@@ -1324,8 +1310,8 @@
   ginfo=(GripInfo *)data;
 
   if(ginfo->ripping_a_disc) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("Cannot switch discs while ripping."));
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("Cannot switch discs while ripping."));
 
     return;
   }
@@ -1343,11 +1329,9 @@
 
   ginfo=(GripInfo *)data;
 
-  LogStatus(ginfo,_("Eject disc\n"));
-
   if(ginfo->ripping_a_disc) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("Cannot eject while ripping."));
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("Cannot eject while ripping."));
 
     return;
   }
@@ -1423,8 +1407,8 @@
   disc=&(ginfo->disc);
 
   if(ginfo->ripping_a_disc) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("Cannot play while ripping."));
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("Cannot play while ripping."));
    
     return;
   }
@@ -1491,8 +1475,8 @@
 void NextTrack(GripInfo *ginfo)
 {
   if(ginfo->ripping_a_disc) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("Cannot switch tracks while ripping."));
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("Cannot switch tracks while ripping."));
     return;
   }
   
@@ -1522,8 +1506,8 @@
 static void PrevTrack(GripInfo *ginfo)
 {
   if(ginfo->ripping_a_disc) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("Cannot switch tracks while ripping."));
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("Cannot switch tracks while ripping."));
     return;
   }
 
@@ -1925,8 +1909,8 @@
     if(*(ginfo->cdupdate)) {
       FillInTrackInfo(ginfo,0,&enc_track);
 
-      TranslateAndLaunch(ginfo->cdupdate,TranslateSwitch,&enc_track,
-			 FALSE,&(ginfo->sprefs),CloseStuff,(void *)ginfo);
+      TranslateAndLaunch(ginfo->cdupdate, TranslateSwitch, &enc_track,
+                         FALSE, &(ginfo->sprefs));
     }
   }
   else {
@@ -1980,13 +1964,11 @@
   }
 
   if(ginfo->ask_submit) {
-    gnome_app_ok_cancel_modal
-      ((GnomeApp *)uinfo->app,
-       _("This disc has been found on your secondary server,\n"
-       "but not on your primary server.\n\n"
-       "Do you wish to submit this disc information?"),
-       SubmitEntry,(gpointer)ginfo);
-    
+    SubmitEntry(ConfirmDialog((GtkWindow *)uinfo->app,
+                              _("This disc has been found on your secondary server,\n"
+                                "but not on your primary server.\n\n"
+                                "Do you wish to submit this disc information?")),
+                ginfo);
     ginfo->ask_submit=FALSE;
   }
 
@@ -2010,8 +1992,8 @@
   fd = mkstemp(filename);
 
   if(fd == -1) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("Error: Unable to create temporary file."));
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("Error: Unable to create temporary file."));
     return;
   }
 
@@ -2019,8 +2001,8 @@
 
   if(!efp) {
     close(fd);
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("Error: Unable to create temporary file."));
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("Error: Unable to create temporary file."));
   }
   else {
     fprintf(efp,"To: %s\nFrom: %s\nSubject: cddb %s %02x\n",
@@ -2037,8 +2019,8 @@
     if(DiscDBWriteDiscData(&(ginfo->disc),&(ginfo->ddata),efp,FALSE,
 			   ginfo->db_use_freedb,ginfo->db_use_freedb?
 			   "UTF-8":ginfo->discdb_encoding)<0) {
-      gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                        _("Error: Unable to write disc data."));
+      DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+                 _("Error: Unable to write disc data."));
       fclose(efp);
     }
     else {
@@ -2051,8 +2033,8 @@
 
       i=system(mailcmd);
       if (i!=0 && WIFEXITED(i)!=0)
-        gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                          _("Error: Unable to execute mail command."));
+        DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+                   _("Error: Unable to execute mail command."));
 
       remove(filename);
     }

grip-3.10.1.tar.gz/src/common.h -> grip-4.1.1.tar.gz/src/common.h Changed

grip-3.10.1.tar.gz/src/dialog.c -> grip-4.1.1.tar.gz/src/dialog.c Changed

@@ -23,12 +23,51 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <gtk/gtk.h>
-#include <gnome.h>
 #include "dialog.h"
 
-void DisplayMsg(char *msg)
+void DisplayMsg(GtkMessageType type, GtkWindow *parent, char *msg)
 {
-  gnome_ok_dialog(msg);
+  gchar *title;
+  const gchar *title_prefix = NULL;
+  GtkWidget *dialog = gtk_message_dialog_new(parent,
+                                             0,
+                                             type,
+                                             GTK_BUTTONS_OK,
+                                             msg, NULL);
+  switch(type) {
+  case GTK_MESSAGE_WARNING:
+    title_prefix = _("Warning");
+    break;
+  case GTK_MESSAGE_INFO:
+  default:
+    title_prefix = _("Information");
+    break;
+  }
+  title = g_strdup_printf("%s (%s)", title_prefix, g_get_prgname());
+  gtk_window_set_title(GTK_WINDOW(dialog), title);
+  g_free(title);
+  g_signal_connect(dialog, "response",
+                   G_CALLBACK (gtk_widget_destroy), NULL);
+  gtk_widget_show (dialog);
+}
+
+gint ConfirmDialog(GtkWindow *parent, char *msg)
+{
+  int result;
+  gchar *title;
+  const gchar *title_prefix;
+  GtkWidget *dialog = gtk_message_dialog_new(parent,
+                                             GTK_DIALOG_MODAL,
+                                             GTK_MESSAGE_QUESTION,
+                                             GTK_BUTTONS_OK_CANCEL,
+                                             msg, NULL);
+  title_prefix = _("Question");
+  title = g_strdup_printf("%s (%s)", title_prefix, g_get_prgname());
+  gtk_window_set_title(GTK_WINDOW(dialog), title);
+  g_free(title);
+  result = gtk_dialog_run(GTK_DIALOG(dialog));
+  gtk_widget_destroy(dialog);
+  return (result == GTK_RESPONSE_OK) ? 0 : 1;
 }
 
 void BoolDialog(char *question,char *yes,GtkSignalFunc yesfunc,

grip-3.10.1.tar.gz/src/dialog.h -> grip-4.1.1.tar.gz/src/dialog.h Changed

grip-3.10.1.tar.gz/src/discdb.c -> grip-4.1.1.tar.gz/src/discdb.c Changed

@@ -158,7 +158,7 @@
 
   uri=g_string_new(NULL);
 
-  g_string_sprintf(uri,"http://%s/%s?cmd=%s&hello=private+free.the.cddb+%s+%s"
+  g_string_printf(uri,"http://%s/%s?cmd=%s&hello=private+free.the.cddb+%s+%s"
 		   "&proto=%d",
 		   server->name,server->cgi_prog,cmd,
 		   hello->hello_program,hello->hello_version,
@@ -188,7 +188,7 @@
     if(server->use_proxy) {
       proxy=g_string_new(NULL);
 
-      g_string_sprintf(proxy,"%s:%d",server->proxy->name,
+      g_string_printf(proxy,"%s:%d",server->proxy->name,
                        server->proxy->port);
       
       curl_easy_setopt(curl_handle,CURLOPT_PROXY,proxy->str);
@@ -197,7 +197,7 @@
 
         user=g_string_new(NULL);
 
-        g_string_sprintf(user,"%s:%s",server->proxy->username,
+        g_string_printf(user,"%s:%s",server->proxy->username,
                          server->proxy->pswd);
         
         curl_easy_setopt(curl_handle,CURLOPT_PROXYUSERPWD,user->str);
@@ -279,13 +279,13 @@
 
   cmd=g_string_new(NULL);
 
-  g_string_sprintfa(cmd,"cddb+query+%08x+%d",DiscDBDiscid(disc),
+  g_string_printf(cmd,"cddb+query+%08x+%d",DiscDBDiscid(disc),
 		    disc->num_tracks);
 
   for(index=0;index<disc->num_tracks;index++)
-    g_string_sprintfa(cmd,"+%d",disc->track[index].start_frame);
+    g_string_append_printf(cmd,"+%d",disc->track[index].start_frame);
 
-  g_string_sprintfa(cmd,"+%d",disc->length.mins*60 + disc->length.secs);
+  g_string_append_printf(cmd,"+%d",disc->length.mins*60 + disc->length.secs);
 
   Debug(_("Query is [%s]\n"),cmd->str);
 
@@ -591,7 +591,7 @@
 
   cmd=g_string_new(NULL);
 
-  g_string_sprintf(cmd,"cddb+read+%s+%08x",DiscDBGenre(entry->entry_genre),
+  g_string_printf(cmd,"cddb+read+%s+%08x",DiscDBGenre(entry->entry_genre),
 		   entry->entry_id);
 
   result=DiscDBMakeRequest(server,hello,cmd->str);
@@ -637,9 +637,9 @@
   if(!disc->have_info) CDStat(disc,TRUE);
 
   id=DiscDBDiscid(disc);
-  
-  g_snprintf(root_dir,256,"%s/.cddb",getenv("HOME"));
-  
+
+  g_snprintf(root_dir, 256, "%s/.cddb", g_get_home_dir());
+
   if(stat(root_dir, &st) < 0)
     return FALSE;
   else {
@@ -668,9 +668,9 @@
   int index,genre;
   char root_dir[256],file[256],inbuf[512];
   struct stat st;
-  
-  g_snprintf(root_dir,256,"%s/.cddb",getenv("HOME"));
-  
+
+  g_snprintf(root_dir, 256, "%s/.cddb", g_get_home_dir());
+
   if(stat(root_dir, &st) < 0) {
     return -1;
   } else {
@@ -784,7 +784,7 @@
   if(!disc->have_info) CDStat(disc,TRUE);
 
   if(!outfile) {
-    g_snprintf(root_dir,256,"%s/.cddb",getenv("HOME"));
+    g_snprintf(root_dir, 256, "%s/.cddb", g_get_home_dir());
     g_snprintf(file,256,"%s/%08x",root_dir,ddata->data_id);
   
     if(stat(root_dir,&st)<0) {
@@ -811,13 +811,8 @@
   }
   else discdb_data=outfile;
 
-#ifndef GRIPCD
   fprintf(discdb_data,"# xmcd CD database file generated by Grip %s\n",
 	  VERSION);
-#else
-  fprintf(discdb_data,"# xmcd CD database file generated by GCD %s\n",
-	  VERSION);
-#endif
   fputs("# \n",discdb_data);
   fputs("# Track frame offsets:\n",discdb_data);

grip-3.10.1.tar.gz/src/discedit.c -> grip-4.1.1.tar.gz/src/discedit.c Changed

@@ -394,11 +394,11 @@
   if(ginfo->have_disc) {
     if(DiscDBWriteDiscData(&(ginfo->disc),&(ginfo->ddata),NULL,TRUE,FALSE,
                            "utf-8")<0)
-      gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                        _("Error saving disc data."));
+      DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+                 _("Error saving disc data."));
   }
-  else gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                         _("No disc present."));
+  else DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+                  _("No disc present."));
 }
 
 static void TitleEditChanged(GtkWidget *widget,gpointer data)
@@ -496,24 +496,26 @@
 static void SeparateFields(char *buf,char *field1,char *field2,char *sep)
 {
   char *tmp;
-  char spare[81];
+  char f1[129];
 
   tmp=strtok(buf,sep);
 
   if(!tmp) return;
 
-  strncpy(spare,g_strstrip(tmp),80);
-
-  spare[80] = 0;
+  strncpy(f1,g_strstrip(tmp),128);
+  f1[128] = 0;
 
   tmp=strtok(NULL,"");
 
   if(tmp) {
-    strncpy(field2,g_strstrip(tmp),80);
+    char f2[129];
+    strncpy(f2,g_strstrip(tmp),128);
+    f2[128] = 0;
+    strcpy(field2,f2);
   }
   else *field2='\0';
 
-  strcpy(field1,spare);
+  strcpy(field1,f1);
 }
 
 static void SplitTitleArtist(GtkWidget *widget,gpointer data)
@@ -549,30 +551,30 @@
   ginfo=(GripInfo *)data;
 
   if(!ginfo->have_disc) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("Cannot submit. No disc is present."));
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("Cannot submit. No disc is present."));
 
     return;
   }
 
   if(!ginfo->ddata.data_genre) {
-    /*    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-          _("Submission requires a genre other than 'unknown'."));*/
+    /* DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+                  _("Submission requires a genre other than 'unknown'.")); */
     GetDiscDBGenre(ginfo);
 
     return;
   }
 
   if(!*ginfo->ddata.data_title) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("You must enter a disc title."));
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("You must enter a disc title."));
 
     return;
   }
 
   if(!*ginfo->ddata.data_artist) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("You must enter a disc artist."));
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("You must enter a disc artist."));
     
     return;
   }
@@ -580,19 +582,18 @@
   len=strlen(ginfo->discdb_submit_email);
 
   if(!strncasecmp(ginfo->discdb_submit_email+(len-9),".cddb.com",9))
-    gnome_app_ok_cancel_modal
-      ((GnomeApp *)ginfo->gui_info.app,
-       _("You are about to submit this disc information\n"
-       "to a commercial CDDB server, which will then\n"
-       "own the data that you submit. These servers make\n"
-       "a profit out of your effort. We suggest that you\n"
-       "support free servers instead.\n\nContinue?"),
-       (GnomeReplyCallback)SubmitEntry,(gpointer)ginfo);
+    SubmitEntry(ConfirmDialog((GtkWindow *)ginfo->gui_info.app,
+                              _("You are about to submit this disc information\n"
+                                "to a commercial CDDB server, which will then\n"
+                                "own the data that you submit. These servers make\n"
+                                "a profit out of your effort. We suggest that you\n"
+                                "support free servers instead.\n\nContinue?")),
+                ginfo);
   else
-    gnome_app_ok_cancel_modal
-      ((GnomeApp *)ginfo->gui_info.app,
-       _("You are about to submit this\ndisc information via email.\n\n"
-       "Continue?"),(GnomeReplyCallback)SubmitEntry,(gpointer)ginfo);
+    SubmitEntry(ConfirmDialog((GtkWindow *)ginfo->gui_info.app,
+                              _("You are about to submit this\ndisc information via email.\n\n"
+                                "Continue?")),
+                ginfo);
 }
 
 /* Make the user pick a DiscDB genre on submit*/

grip-3.10.1.tar.gz/src/grip.c -> grip-4.1.1.tar.gz/src/grip.c Changed

@@ -28,11 +28,9 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <gdk/gdkx.h>
-#include <X11/Xlib.h>
 #include <time.h>
+#include <gdk/gdkx.h> /* GDK_DISPLAY() */
 #include "grip.h"
-#include <libgnomeui/gnome-window-icon.h>
 #include "discdb.h"
 #include "cdplay.h"
 #include "discedit.h"
@@ -45,7 +43,6 @@
 #include "tray.h"
 
 static void ReallyDie(gint reply,gpointer data);
-static void MakeStatusPage(GripInfo *ginfo);
 static void DoHelp(GtkWidget *widget,gpointer data);
 static void MakeHelpPage(GripInfo *ginfo);
 static void MakeAboutPage(GripGUI *uinfo);
@@ -171,7 +168,7 @@
   return FALSE;
 }
 
-GtkWidget *GripNew(const gchar* geometry,char *device,char *scsi_device,
+GtkWidget *GripNew(char *device,char *scsi_device,
 		   char *config_filename,
 		   gboolean force_small,
 		   gboolean local_mode,gboolean no_redirect)
@@ -181,20 +178,21 @@
   GripGUI *uinfo;
   int major,minor,point;
   char buf[256];
+  GList icon_list = {NULL, NULL, NULL};
 
-  gnome_window_icon_set_default_from_file(GNOME_ICONDIR"/gripicon.png");
+  icon_list.data=gdk_pixbuf_new_from_file(GNOME_ICONDIR"/grip.png", NULL);
+  gtk_window_set_default_icon_list(&icon_list);
+
+  app = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_title(GTK_WINDOW(app), _("Grip"));
+  gtk_window_set_screen(GTK_WINDOW(app), gdk_screen_get_default());
 
-  app=gnome_app_new(PACKAGE,_("Grip"));
- 
   ginfo=g_new0(GripInfo,1);
 
   gtk_object_set_user_data(GTK_OBJECT(app),(gpointer)ginfo);
 
   uinfo=&(ginfo->gui_info);
   uinfo->app=app;
-  uinfo->status_window=NULL;
-  uinfo->rip_status_window=NULL;
-  uinfo->encode_status_window=NULL;
   uinfo->track_list=NULL;
 
   uinfo->win_width=WINWIDTH;
@@ -203,26 +201,6 @@
   uinfo->win_width_min=MIN_WINWIDTH;
   uinfo->win_height_min=MIN_WINHEIGHT;
 
-  /*  if(geometry != NULL) {
-    gint x,y,w,h;
-    
-    if(gnome_parse_geometry(geometry, 
-			    &x,&y,&w,&h)) {
-      if(x != -1) {
-	gtk_widget_set_uposition(app,x,y);
-      }
-      
-      if(w != -1) {
-        uinfo->win_width=w;
-        uinfo->win_height=h;
-      }
-    }
-    else {
-      g_error(_("Could not parse geometry string `%s'"), geometry);
-    }
-  }
-  */
-
   if(config_filename && *config_filename)
     g_snprintf(ginfo->config_filename,256,"%s",config_filename);
   else {
@@ -243,7 +221,7 @@
   if(!CDInitDevice(ginfo->cd_device,&(ginfo->disc))) {
     sprintf(buf,_("Error: Unable to initialize [%s]\n"),ginfo->cd_device);
 
-    DisplayMsg(buf);
+    DisplayMsg(GTK_MESSAGE_INFO, NULL, buf);
   }
 
   CDStat(&(ginfo->disc),TRUE);
@@ -287,7 +265,6 @@
   MakeTrackPage(ginfo);
   MakeRipPage(ginfo);
   MakeConfigPage(ginfo);
-  MakeStatusPage(ginfo);
   MakeHelpPage(ginfo);
   MakeAboutPage(uinfo);
   ginfo->tray_icon_made = FALSE;
@@ -313,8 +290,9 @@
     gtk_box_pack_start(GTK_BOX(uinfo->winbox),uinfo->controls,FALSE,FALSE,0);
   gtk_widget_show(uinfo->controls);
   
-  gnome_app_set_contents(GNOME_APP(app),uinfo->winbox);
+  gtk_container_add(GTK_CONTAINER(app), uinfo->winbox);
   gtk_widget_show(uinfo->winbox);
+  gtk_widget_show(app);
 
   CheckNewDisc(ginfo,FALSE);
 
@@ -326,15 +304,13 @@
 
     /* Check if we have a dev release */
     /*if(minor%2) {
-      gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                        _("This is a development version of Grip. If you encounter problems, you are encouraged to revert to the latest stable version."));
+      DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+                 _("This is a development version of Grip. If you encounter problems, you are encouraged to revert to the latest stable version."));
     }*/
   }
 
   g_signal_connect(app, "window-state-event", G_CALLBACK(AppWindowStateCB), ginfo);
 
-  LogStatus(ginfo,_("Grip started successfully\n"));
-
   return app;
 }
 
@@ -344,15 +320,12 @@
 
   ginfo=(GripInfo *)gtk_object_get_user_data(GTK_OBJECT(widget));
   
-#ifndef GRIPCD
   if(ginfo->ripping_a_disc || ginfo->encoding)
-    gnome_app_ok_cancel_modal((GnomeApp *)ginfo->gui_info.app,
-			      _("Work is in progress.\nReally shut down?"),
-			      ReallyDie,(gpointer)ginfo);
-  else ReallyDie(0,ginfo);
-#else
-  ReallyDie(0,ginfo);
-#endif
+    ReallyDie(ConfirmDialog ((GtkWindow *)ginfo->gui_info.app,
+                             _("Work is in progress.\nReally shut down?")),
+              ginfo);
+  else
+    ReallyDie(0,ginfo);
 }
 
 static void ReallyDie(gint reply,gpointer data)
@@ -363,10 +336,8 @@
 
   ginfo=(GripInfo *)data;
 
-#ifndef GRIPCD
   if(ginfo->ripping_a_disc) KillRip(NULL,ginfo);
   if(ginfo->encoding) KillEncode(NULL,ginfo);
-#endif
 
   if(!ginfo->no_interrupt)
     CDStop(&(ginfo->disc));
@@ -390,96 +361,30 @@
   return page;
 }
 
-static void MakeStatusPage(GripInfo *ginfo)
-{
-  GtkWidget *status_page;
-  GtkWidget *vbox,*vbox2;
-  GtkWidget *notebook;
-  GtkWidget *page;
-  GtkWidget *label;
-
-  status_page=MakeNewPage(ginfo->gui_info.notebook,_("Status"));
-
-  vbox2=gtk_vbox_new(FALSE,0);
-  notebook=gtk_notebook_new();
-
-  page=gtk_frame_new(NULL);
-
-  vbox=gtk_vbox_new(FALSE,4);
-  gtk_container_border_width(GTK_CONTAINER(vbox),3);
-
-  ginfo->gui_info.status_window=NewStatusWindow(vbox);
-
-  gtk_container_add(GTK_CONTAINER(page),vbox);
-  gtk_widget_show(vbox);
-
-  label=gtk_label_new(_("General"));
-  gtk_notebook_append_page(GTK_NOTEBOOK(notebook),page,label);
-  gtk_widget_show(page);
-
-
-  page=gtk_frame_new(NULL);
-
-  vbox=gtk_vbox_new(FALSE,4);
-  gtk_container_border_width(GTK_CONTAINER(vbox),3);
-
-  ginfo->gui_info.rip_status_window=NewStatusWindow(vbox);
-
-  gtk_container_add(GTK_CONTAINER(page),vbox);
-  gtk_widget_show(vbox);
-
-  label=gtk_label_new(_("Rip"));
-  gtk_notebook_append_page(GTK_NOTEBOOK(notebook),page,label);
-  /*  gtk_widget_show(page);*/
-
-
-  page=gtk_frame_new(NULL);
-
-  vbox=gtk_vbox_new(FALSE,4);
-  gtk_container_border_width(GTK_CONTAINER(vbox),3);
-
-  ginfo->gui_info.encode_status_window=NewStatusWindow(vbox);
-
-  gtk_container_add(GTK_CONTAINER(page),vbox);
-  gtk_widget_show(vbox);
-
-  label=gtk_label_new(_("Encode"));
-  gtk_notebook_append_page(GTK_NOTEBOOK(notebook),page,label);
-  /*  gtk_widget_show(page);*/
-
-
-  gtk_box_pack_start(GTK_BOX(vbox2),notebook,TRUE,TRUE,0);
-  gtk_widget_show(notebook);
-
-  gtk_container_add(GTK_CONTAINER(status_page),vbox2);
-  gtk_widget_show(vbox2);
-}
-
-void LogStatus(GripInfo *ginfo,char *fmt,...)
+static void DoHelp(GtkWidget *widget, gpointer data)
 {
-  va_list args;
-  char *buf;
-
-  if(!ginfo->gui_info.status_window) return;
-
-  va_start(args,fmt);
+  GdkScreen *screen;
+  GError *error = NULL;
 
-  buf=g_strdup_vprintf(fmt,args);
+  screen = gtk_widget_get_screen (widget);
 
-  va_end(args);
+  gtk_show_uri(screen, "ghelp:grip", gtk_get_current_event_time(), &error);
 
-  StatusWindowWrite(ginfo->gui_info.status_window,buf);
+  if (error != NULL) {
+    GtkWidget *d;
+    GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
 
-  g_free(buf);
-}
-
-static void DoHelp(GtkWidget *widget,gpointer data)
-{
-  char *section;
+    d = gtk_message_dialog_new(GTK_IS_WINDOW(toplevel) ? GTK_WINDOW(toplevel) : NULL,
+                               GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                               GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
+                               "%s", _("Unable to open help file"));
+    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (d),
+                                              "%s", error->message);
+    g_signal_connect (d, "response", G_CALLBACK (gtk_widget_destroy), NULL);
+    gtk_window_present (GTK_WINDOW (d));
 
-  section=(char *)data;
-
-  gnome_help_display("grip.xml",section,NULL);
+    g_error_free (error);
+  }
 }
 
 static void MakeHelpPage(GripInfo *ginfo)
@@ -494,45 +399,9 @@
   gtk_container_border_width(GTK_CONTAINER(vbox),3);
 
   button=gtk_button_new_with_label(_("Table Of Contents"));
-  gtk_signal_connect(GTK_OBJECT(button),"clicked",
-		     GTK_SIGNAL_FUNC(DoHelp),NULL);
-  gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,0);
-  gtk_widget_show(button);
-
-  button=gtk_button_new_with_label(_("Playing CDs"));
-  gtk_signal_connect(GTK_OBJECT(button),"clicked",
-		     GTK_SIGNAL_FUNC(DoHelp),(gpointer)"cdplayer");
-  gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,0);
-  gtk_widget_show(button);
-
-  button=gtk_button_new_with_label(_("Ripping CDs"));
-  gtk_signal_connect(GTK_OBJECT(button),"clicked",
-		     GTK_SIGNAL_FUNC(DoHelp),(gpointer)"ripping");
-  gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,0);
-  gtk_widget_show(button);
-
-  button=gtk_button_new_with_label(_("Configuring Grip"));
-  gtk_signal_connect(GTK_OBJECT(button),"clicked",
-		     GTK_SIGNAL_FUNC(DoHelp),(gpointer)"configure");
-  gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,0);
-  gtk_widget_show(button);
-
-  button=gtk_button_new_with_label(_("FAQ"));
-  gtk_signal_connect(GTK_OBJECT(button),"clicked",
-		     GTK_SIGNAL_FUNC(DoHelp),(gpointer)"faq");
-  gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,0);
-  gtk_widget_show(button);
-
-  button=gtk_button_new_with_label(_("Getting More Help"));
-  gtk_signal_connect(GTK_OBJECT(button),"clicked",
-		     GTK_SIGNAL_FUNC(DoHelp),(gpointer)"morehelp");
-  gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,0);
-  gtk_widget_show(button);
-
-  button=gtk_button_new_with_label(_("Reporting Bugs"));
-  gtk_signal_connect(GTK_OBJECT(button),"clicked",
-		     GTK_SIGNAL_FUNC(DoHelp),(gpointer)"bugs");
-  gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,0);
+  gtk_signal_connect(GTK_OBJECT(button), "clicked",
+                     GTK_SIGNAL_FUNC(DoHelp), NULL);
+  gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
   gtk_widget_show(button);
 
   gtk_container_add(GTK_CONTAINER(help_page),vbox);
@@ -557,11 +426,7 @@
   vbox=gtk_vbox_new(TRUE,5);
   gtk_container_border_width(GTK_CONTAINER(vbox),3);
 
-#ifndef GRIPCD
   logo=Loadxpm(GTK_WIDGET(uinfo->app),grip_xpm);
-#else
-  logo=Loadxpm(GTK_WIDGET(uinfo->app),gcd_xpm);
-#endif
 
   gtk_box_pack_start(GTK_BOX(vbox),logo,FALSE,FALSE,0);
   gtk_widget_show(logo);
@@ -576,7 +441,7 @@
   gtk_box_pack_start(GTK_BOX(vbox2),label,FALSE,FALSE,0);
   gtk_widget_show(label);
 
-  label=gtk_label_new("Copyright\n1998-2005, Mike Oliphant\n2016-2019, Johnny A. Solbu");
+  label=gtk_label_new("Copyright\n1998-2005, Mike Oliphant\n2016-2020, Johnny A. Solbu");
   gtk_widget_set_style(label,uinfo->style_wb);
   gtk_box_pack_start(GTK_BOX(vbox2),label,FALSE,FALSE,0);
   gtk_widget_show(label);
@@ -633,12 +498,11 @@
 
 static void Homepage(GtkWidget *widget,gpointer data)
 {
-  int i;
   GripGUI *uinfo=(GripGUI *)data;
-  i = system("xdg-open " PACKAGE_BUGREPORT);
-  if (i!=0 && WIFEXITED(i)!=0)
-    gnome_app_warning((GnomeApp *)uinfo->app,
-                      _("Error: Trying to show homepage failed."));
+  if (!gtk_show_uri(gtk_widget_get_screen (widget), PACKAGE_BUGREPORT,
+                    gtk_get_current_event_time(), NULL))
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)uinfo->app,
+               _("Error: Trying to show homepage failed."));
 }
 
 static void LoadImages(GripGUI *uinfo)
@@ -680,7 +544,6 @@
   uinfo->play_pix[1]=Loadxpm(uinfo->app,random_xpm);
   uinfo->play_pix[2]=Loadxpm(uinfo->app,playlist_xpm);
 
-#ifndef GRIPCD
   uinfo->rip_pix[0]=Loadxpm(uinfo->app,rip0_xpm);
   uinfo->rip_pix[1]=Loadxpm(uinfo->app,rip1_xpm);
   uinfo->rip_pix[2]=Loadxpm(uinfo->app,rip2_xpm);
@@ -699,7 +562,6 @@
   uinfo->smile_pix[5]=Loadxpm(uinfo->app,smile6_xpm);
   uinfo->smile_pix[6]=Loadxpm(uinfo->app,smile7_xpm);
   uinfo->smile_pix[7]=Loadxpm(uinfo->app,smile8_xpm);
-#endif
 }
 
 void GripUpdate(GtkWidget *app)
@@ -751,7 +613,7 @@
   GripGUI *uinfo=&(ginfo->gui_info);
   char filename[512];
   char renamefile[520];
-  char *proxy_env,*tok;
+  char *proxy_env, *tok;
   char outputdir[256];
   int confret;
   CFGEntry cfg_entries[]={
@@ -927,18 +789,18 @@
   *ginfo->sprefs.allow_these_chars='\0';
   ginfo->show_tray_icon=TRUE;
 
-  sprintf(filename,"%s/%s",getenv("HOME"),ginfo->config_filename);
+  sprintf(filename,"%s/%s", g_get_home_dir(), ginfo->config_filename);
 
   confret=LoadConfig(filename,"GRIP",2,2,cfg_entries);
 
   if(confret<0) {
     /* Check if the config is out of date */
     if(confret==-2) {
-      gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                        _("Your config file is out of date -- "
-                          "resetting to defaults.\n"
-                          "You will need to re-configure Grip.\n"
-                          "Your old config file has been saved with -old appended."));
+      DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+                 _("Your config file is out of date -- "
+                   "resetting to defaults.\n"
+                   "You will need to re-configure Grip.\n"
+                   "Your old config file has been saved with -old appended."));
 
       sprintf(renamefile,"%s-old",filename);
 
@@ -951,7 +813,6 @@
   LoadRipperConfig(ginfo,ginfo->selected_ripper);
   LoadEncoderConfig(ginfo,ginfo->selected_encoder);
 
-#ifndef GRIPCD
   /* Phase out 'outputdir' variable */
 
   if(*outputdir) {
@@ -977,7 +838,6 @@
 
     *outputdir='\0';
   }
-#endif
 
   ginfo->dbserver2.use_proxy=ginfo->dbserver.use_proxy=ginfo->use_proxy;
   ginfo->dbserver2.proxy=ginfo->dbserver.proxy;
@@ -985,44 +845,30 @@
   ginfo->num_cpu=ginfo->edit_num_cpu;
 
   if(!*ginfo->user_email) {
-    char *host;
-    char *user;
-
-    host = getenv("HOST");
-    if(!host)
-      host = getenv("HOSTNAME");
-    if(!host)
-      host = "localhost";
-
-    user = getenv("USER");
-    if(!user) 
-      user = getenv("USERNAME");
-    if(!user)
-      user = "user";
-
-    g_snprintf(ginfo->user_email,256,"%s@%s",user,host);
+    g_snprintf(ginfo->user_email, 256, "%s@%s", g_get_user_name(), g_get_host_name());
   }
 
   if(ginfo->use_proxy_env) {   /* Get proxy info from "http_proxy" */
-    proxy_env=getenv("http_proxy");
+    proxy_env = g_strdup (g_getenv ("http_proxy"));
 
     if(proxy_env) {
-      
       /* Skip the "http://" if it's present */
-      
+
       if(!strncasecmp(proxy_env,"http://",7)) proxy_env+=7;
-      
+
       tok=strtok(proxy_env,":");
       if(tok) strncpy(ginfo->proxy_server.name,tok,255);
 
       /* Make sure ginfo->proxy_server.name is terminated correctly. */
       ginfo->proxy_server.name[255] = 0;
-      
+
       tok=strtok(NULL,"/");
       if(tok) ginfo->proxy_server.port=atoi(tok);
-      
-      Debug(_("server is %s, port %d\n"),ginfo->proxy_server.name,
-	    ginfo->proxy_server.port);
+
+      Debug(_("server is %s, port %d\n"), ginfo->proxy_server.name,
+            ginfo->proxy_server.port);
+
+      g_free (proxy_env);
     }
   }
 }
@@ -1038,11 +884,11 @@
 
   if(ginfo->edit_num_cpu>MAX_NUM_CPU) ginfo->edit_num_cpu=MAX_NUM_CPU;
 
-  g_snprintf(filename,256,"%s/%s",getenv("HOME"),ginfo->config_filename);
+  g_snprintf(filename,256,"%s/%s", g_get_home_dir(), ginfo->config_filename);
 
   if(!SaveConfig(filename,"GRIP",2,cfg_entries))
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("Error: Unable to save config file."));
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("Error: Unable to save config file."));
 
   SaveRipperConfig(ginfo,ginfo->selected_ripper);
   SaveEncoderConfig(ginfo,ginfo->selected_encoder);

grip-3.10.1.tar.gz/src/grip.h -> grip-4.1.1.tar.gz/src/grip.h Changed

@@ -25,13 +25,11 @@
 #define GRIP_H
 
 #include "config.h"
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include "cddev.h"
 #include "discdb.h"
 #include "pthread.h"
 #include "launch.h"
-#include "status_window.h"
-#include "eggtrayicon.h"
 
 #if defined(HAVE_CDDA_INTERFACE_H) || defined(HAVE_CDDA_CDDA_INTERFACE_H)
 #define CDPAR
@@ -118,10 +116,6 @@
   GtkWidget *volume_control;
   gboolean volvis;
 
-  StatusWindow *status_window;
-  StatusWindow *rip_status_window;
-  StatusWindow *encode_status_window;
-
   GtkWidget *play_sector_label;
 
   GtkWidget *partial_rip_box;
@@ -187,9 +181,7 @@
   GtkWidget *play_pix[3];
   
   /* notification area widgets */
-  EggTrayIcon *tray_icon;
-  GtkTooltips *tray_tips;
-  GtkWidget *tray_ebox;
+  GtkStatusIcon *tray_icon;
   GtkWidget *tray_menu;
   GtkWidget *tray_menu_play;
   GtkWidget *tray_menu_pause;
@@ -360,13 +352,12 @@
   size_t all_enclast[MAX_NUM_CPU];
 } GripInfo;
 
-GtkWidget *GripNew(const gchar* geometry,char *device,char *scsi_device,
+GtkWidget *GripNew(char *device,char *scsi_device,
 		   char *config_filename, gboolean force_small,
 		   gboolean local_mode,gboolean no_redirect);
 void GripDie(GtkWidget *widget,gpointer data);
 void GripUpdate(GtkWidget *app);
 GtkWidget *MakeNewPage(GtkWidget *notebook,char *name);
-void LogStatus(GripInfo *ginfo,char *fmt,...);
 void Busy(GripGUI *uinfo);
 void UnBusy(GripGUI *uinfo);
 void CloseStuff(void *user_data);

grip-3.10.1.tar.gz/src/gripcfg.c -> grip-4.1.1.tar.gz/src/gripcfg.c Changed

@@ -20,8 +20,6 @@
  * USA
  */
 
-#include <sys/stat.h>
-#include <unistd.h>
 #include "grip.h"
 #include "gripcfg.h"
 #include "dialog.h"
@@ -47,25 +45,19 @@
   {"",""}
 };
 
-static MP3Encoder encoder_defaults[]={{"oggenc",
-				      "-o %m -a %a -l %d -t %n -b %b %w -N %t -G %g -d %y",
-				      "ogg"},
-		                      {"bladeenc","-%b -QUIT %w %m"},
-				      {"lame","-h --add-id3v2 --tt \"%n\" --ta \"%a\" --tl \"%d\" --ty \"%y\" --tn \"%t\" --tg \"%G\" -b %b %w %m","mp3"},
-				      {"l3enc","-br %b %w %m","mp3"},
-				      {"xingmp3enc","-B %b -Q %w","mp3"},
-				      {"mp3encode","-p 2 -l 3 -b %b %w %m",
-				       "mp3"},
-				      {"gogo","-b %b %w %m","mp3"},
-				      {"flac","--best --replay-gain -T title=\"%n\" -T artist=\"%a\" -T album=\"%d\" -T date=\"%y\" -T tracknumber=\"%t\" -T genre=\"%G\"  -o %m %w","flac"},
-                                      {"faac",
-                                      "-b %b -o %m -w --artist %a --title %n --genre %G --album %d --track %t/%N --year %y %w",
-                                      "m4a"},
-                                      {"opusenc",
-                                       "--bitrate %b --artist %a --title %n --genre %G --album %d --date %y %w %m",
-                                       "opus"},
-				      {"other","",""},
-				      {"",""}
+static MP3Encoder encoder_defaults[]={
+  {"oggenc", "-o %m -a %a -l %d -t %n -b %b %w -N %t -G %g -d %y", "ogg"},
+  {"bladeenc","-%b -QUIT %w %m", "mp3"},
+  {"lame","-h --add-id3v2 --tt \"%n\" --ta \"%a\" --tl \"%d\" --ty \"%y\" --tn \"%t\" --tg \"%G\" -b %b %w %m","mp3"},
+  {"l3enc","-br %b %w %m","mp3"},
+  {"xingmp3enc","-B %b -Q %w","mp3"},
+  {"mp3encode","-p 2 -l 3 -b %b %w %m", "mp3"},
+  {"gogo","-b %b %w %m","mp3"},
+  {"flac","--best --replay-gain -T title=\"%n\" -T artist=\"%a\" -T album=\"%d\" -T date=\"%y\" -T tracknumber=\"%t\" -T genre=\"%G\"  -o %m %w","flac"},
+  {"faac", "-b %b -o %m -w --artist %a --title %n --genre %G --album %d --track %t/%N --year %y %w", "m4a"},
+  {"opusenc", "--bitrate %b --artist %a --title %n --genre %G --album %d --date %y %w %m", "opus"},
+  {"other","",""},
+  {"","",""}
 };
 
 static void UseProxyChanged(GtkWidget *widget,gpointer data)
@@ -90,14 +82,12 @@
   GtkWidget *config_notebook;
   GtkWidget *configpage;
   GtkWidget *button;
-#ifndef GRIPCD
   GtkWidget *hsep;
   GtkWidget *hbox;
   GtkWidget *menu,*optmenu;
   GtkWidget *item;
   MP3Encoder *enc;
   Ripper *rip;
-#endif
 
   uinfo=&(ginfo->gui_info);
 
@@ -159,7 +149,6 @@
   gtk_notebook_append_page(GTK_NOTEBOOK(config_notebook),page,label);
   gtk_widget_show(page);
 
-#ifndef GRIPCD
   page=gtk_frame_new(NULL);
 
   notebook=gtk_notebook_new();
@@ -555,7 +544,6 @@
   label = gtk_label_new(_("ID3"));
   gtk_notebook_append_page(GTK_NOTEBOOK(config_notebook),page,label);
   gtk_widget_show(page);
-#endif
 
   page=gtk_frame_new(NULL);
 
@@ -814,8 +802,8 @@
   if(ripcfg==0) return 0;
 #endif
 
-  sprintf(buf,"%s/%s-%s",getenv("HOME"),ginfo->config_filename,
-          ripper_defaults[ripcfg].name);
+  g_snprintf(buf, 512, "%s/%s-%s", g_get_home_dir(), ginfo->config_filename,
+            ripper_defaults[ripcfg].name);
 
   return (LoadConfig(buf,"GRIP",2,2,rip_cfg_entries)==1);
 }
@@ -831,12 +819,12 @@
   if(ripcfg==0) return;
 #endif
 
-  sprintf(buf,"%s/%s-%s",getenv("HOME"),ginfo->config_filename,
-          ripper_defaults[ripcfg].name);
+  g_snprintf(buf, 512, "%s/%s-%s", g_get_home_dir(), ginfo->config_filename,
+            ripper_defaults[ripcfg].name);
 
   if(!SaveConfig(buf,"GRIP",2,rip_cfg_entries))
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("Error: Unable to save ripper config."));
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("Error: Unable to save ripper config."));
 }
 
 static void EncoderSelected(GtkWidget *widget,gpointer data)
@@ -892,8 +880,8 @@
     ENCODE_CFG_ENTRIES
   };
 
-  sprintf(buf,"%s/%s-%s",getenv("HOME"),ginfo->config_filename,
-          encoder_defaults[encodecfg].name);
+  g_snprintf(buf, 512, "%s/%s-%s", g_get_home_dir(), ginfo->config_filename,
+            encoder_defaults[encodecfg].name);
 
   return (LoadConfig(buf,"GRIP",2,2,encode_cfg_entries)==1);
 }
@@ -905,57 +893,22 @@
     ENCODE_CFG_ENTRIES
   };
 
-  sprintf(buf,"%s/%s-%s",getenv("HOME"),ginfo->config_filename,
-          encoder_defaults[encodecfg].name);
+  g_snprintf(buf, 512, "%s/%s-%s", g_get_home_dir(), ginfo->config_filename,
+            encoder_defaults[encodecfg].name);
 
   if(!SaveConfig(buf,"GRIP",2,encode_cfg_entries))
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("Error: Unable to save encoder config."));
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("Error: Unable to save encoder config."));
 }
 
 void FindExeInPath(char *exename, char *buf, int bsize)
 {
-  char *path;
-  static char **PATH = 0;
-
-  if(!PATH) {
-    const char *env = g_getenv("PATH");
-
-    PATH = g_strsplit(env ? env : "/usr/local/bin:/usr/bin:/bin", ":", 0);
-  }
-
-  path = FindExe(exename, PATH);
+  gchar *absolute_path = g_find_program_in_path (exename);
 
-  if(!path) {
+  if (absolute_path) {
+    g_snprintf(buf, bsize, "%s", absolute_path);
+    g_free (absolute_path);
+  } else {
     g_snprintf(buf, bsize, "%s", exename);
   }
-  else {
-    g_snprintf(buf, bsize, "%s/%s", path, exename);
-  }
 }
-
-char *FindExe(char *exename,char **paths)
-{
-  char **path;
-  char buf[256];
-
-  path=paths;
-
-  while(*path) {
-    g_snprintf(buf,256,"%s/%s",*path,exename);
-
-    if(FileExists(buf)) return *path;
-
-    path++;
-  }
-
-  return NULL;
-}
-
-gboolean FileExists(char *filename)
-{
-  struct stat mystat;
-
-  return (stat(filename,&mystat)>=0);
-}
-

grip-3.10.1.tar.gz/src/gripcfg.h -> grip-4.1.1.tar.gz/src/gripcfg.h Changed

grip-3.10.1.tar.gz/src/id3.c -> grip-4.1.1.tar.gz/src/id3.c Changed

grip-3.10.1.tar.gz/src/launch.c -> grip-4.1.1.tar.gz/src/launch.c Changed

@@ -101,7 +101,7 @@
        Matthew Grossman */
 
     if((*instr=='\0') || (*instr=='/')) {   /* This user's dir */
-      g_string_sprintf(outstr,"%s",getenv("HOME"));
+      g_string_printf(outstr, "%s", g_get_home_dir());
     }
     else {  /* Another user's dir */
       tok=strchr(instr,'/');
@@ -121,7 +121,7 @@
 	g_print(_("Error: unable to translate filename. No such user as %s\n"),
 	       tok);
       else {
-	g_string_sprintf(outstr,"%s",pwd->pw_dir);
+	g_string_printf(outstr,"%s",pwd->pw_dir);
       }
     }
   }
@@ -280,12 +280,10 @@
 
 void TranslateAndLaunch(char *cmd,char *(*trans_func)(char,void *,gboolean *),
 			void *user_data,gboolean do_munge_default,
-			StrTransPrefs *prefs,void (*close_func)(void *),
-			void *close_user_data)
+			StrTransPrefs *prefs)
 {
   GString *args[100];
   char *char_args[21];
-  int pid;
   int arg;
 
   MakeTranslatedArgs(cmd,args,100,trans_func,user_data,do_munge_default,prefs);
@@ -294,6 +292,7 @@
   ArgsToLocale(args);
 */
 
+  /* FIXME: Stack buffer overflow if over 19 args? */
   for(arg=1;args[arg];arg++) {
     char_args[arg]=args[arg]->str;
   }
@@ -302,18 +301,19 @@
   
   char_args[0]=FindRoot(args[0]->str);
 
-  pid=fork();
-  
-  if(pid==0) {
-    if(close_func) close_func(close_user_data);
-
-    execvp(args[0]->str,char_args);
-    
+  if (!g_spawn_sync (NULL,  /* cwd */
+                     char_args,
+                     NULL,  /* envp */
+                     G_SPAWN_SEARCH_PATH,
+                     NULL,  /* child_setup */
+                     NULL,  /* user_data */
+                     NULL,  /* standard_output */
+                     NULL,  /* standard_error */
+                     NULL,  /* exit_status */
+                     NULL)) /* error */
+  {
     Debug(_("Exec failed\n"));
-    _exit(0);
   }
-  
-  waitpid(pid,NULL,0);
 
   for(arg=0;args[arg];arg++) {
     g_string_free(args[arg],TRUE);

grip-3.10.1.tar.gz/src/launch.h -> grip-4.1.1.tar.gz/src/launch.h Changed

grip-3.10.1.tar.gz/src/main.c -> grip-4.1.1.tar.gz/src/main.c Changed

@@ -21,23 +21,18 @@
  */
 
 #include <config.h>
-#include <gnome.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
 #include <stdlib.h>
 
 #include "grip.h"
 
-static gint KillSession(GnomeClient* client, gpointer client_data);
-static gint SaveSession(GnomeClient *client, gint phase, 
-			GnomeSaveStyle save_style,
-			gint is_shutdown, GnomeInteractStyle interact_style,
-			gint is_fast, gpointer client_data);
 static gint TimeOut(gpointer data);
 
 gboolean do_debug=TRUE;
 GtkWidget* grip_app;
 
 /* popt table */
-static char *geometry=NULL;
 static char *config_filename=NULL;
 static char *device=NULL;
 static char *scsi_device=NULL;
@@ -46,88 +41,82 @@
 static int no_redirect=FALSE;
 static int verbose=FALSE;
 
-struct poptOption options[] = {
-  { 
-    "geometry",
-    '\0',
-    POPT_ARG_STRING,
-    &geometry,
-    0,
-    N_("Specify the geometry of the main window"),
-    N_("GEOMETRY")
-  },
+G_GNUC_NORETURN static gboolean
+option_version_cb(const gchar  *option_name,
+                  const gchar  *value,
+                  gpointer      data,
+                  GError      **error)
+{
+  g_print("%s %s\n", PACKAGE, VERSION);
+  exit(0);
+}
+
+static const GOptionEntry options[] = {
   {
     "config",
-    '\0',
-    POPT_ARG_STRING,
+    'c', 0,
+    G_OPTION_ARG_STRING,
     &config_filename,
-    0,
     N_("Specify the config file to use (in your home dir)"),
     N_("CONFIG")
   },
-  { 
+  {
     "device",
-    '\0',
-    POPT_ARG_STRING,
+    'd', 0,
+    G_OPTION_ARG_STRING,
     &device,
-    0,
     N_("Specify the cdrom device to use"),
     N_("DEVICE")
   },
-  { 
+  {
     "scsi-device",
-    '\0',
-    POPT_ARG_STRING,
+    0, 0,
+    G_OPTION_ARG_STRING,
     &scsi_device,
-    0,
     N_("Specify the generic scsi device to use"),
     N_("DEVICE")
   },
-  { 
+  {
     "small",
-    '\0',
-    POPT_ARG_NONE,
+    's', 0,
+    G_OPTION_ARG_NONE,
     &force_small,
-    0,
     N_("Launch in \"small\" (cd-only) mode"),
     NULL
   },
-  { 
+  {
     "local",
-    '\0',
-    POPT_ARG_NONE,
+    'l', 0,
+    G_OPTION_ARG_NONE,
     &local_mode,
-    0,
     N_("\"Local\" mode -- do not look up disc info on the net"),
     NULL
   },
-  { 
+  {
     "no-redirect",
-    '\0',
-    POPT_ARG_NONE,
+    0, 0,
+    G_OPTION_ARG_NONE,
     &no_redirect,
-    0,
     N_("Do not do I/O redirection"),
     NULL
   },
-  { 
+  {
     "verbose",
-    '\0',
-    POPT_ARG_NONE,
+    'v', 0,
+    G_OPTION_ARG_NONE,
     &verbose,
-    0,
     N_("Run in verbose (debug) mode"),
     NULL
   },
   {
-    NULL,
-    '\0',
-    0,
-    NULL,
-    0,
+    "version",
+    0, G_OPTION_FLAG_NO_ARG | G_OPTION_FLAG_HIDDEN,
+    G_OPTION_ARG_CALLBACK,
+    option_version_cb,
     NULL,
     NULL
-  }
+  },
+  { NULL }
 };
 
 void Debug(char *fmt,...)
@@ -150,7 +139,7 @@
 
 int Cmain(int argc, char* argv[])
 {
-  GnomeClient *client;
+  GOptionContext *context;
 
   /* Unbuffer stdout */
   setvbuf(stdout, 0, _IONBF, 0);
@@ -160,28 +149,22 @@
   bindtextdomain(GETTEXT_PACKAGE,GNOMELOCALEDIR);
   textdomain(GETTEXT_PACKAGE);
 
-  gnome_program_init(PACKAGE,VERSION,LIBGNOMEUI_MODULE,argc,argv, 
-		     GNOME_PARAM_POPT_TABLE,options,
-		     GNOME_PROGRAM_STANDARD_PROPERTIES,NULL);
+  context = g_option_context_new (NULL);
+  g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
+  g_option_context_set_ignore_unknown_options (context, TRUE);
+  g_option_context_parse (context, &argc, &argv, NULL);
+
+  gtk_init(&argc, &argv);
 
   bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF8");
   setenv("CHARSET","UTF-8",1);
 
-  /* Session Management */
-  
-  client=gnome_master_client();
-  gtk_signal_connect(GTK_OBJECT(client),"save_yourself",
-		     GTK_SIGNAL_FUNC(SaveSession),argv[0]);
-  gtk_signal_connect(GTK_OBJECT(client),"die",
-		     GTK_SIGNAL_FUNC(KillSession),NULL);
-  
-
   do_debug=verbose;
 
   if(scsi_device) printf("scsi=[%s]\n",scsi_device);
 
   /* Start a new Grip app */
-  grip_app=GripNew(geometry,device,scsi_device,config_filename,
+  grip_app=GripNew(device,scsi_device,config_filename,
 		   force_small,local_mode,
 		   no_redirect);
 
@@ -194,35 +177,6 @@
   return 0;
 }
 
-/* Save the session */
-static gint SaveSession(GnomeClient *client, gint phase,
-			GnomeSaveStyle save_style,
-			gint is_shutdown, GnomeInteractStyle interact_style,
-			gint is_fast, gpointer client_data)
-{
-  gchar** argv;
-  guint argc;
-
-  /* allocate 0-filled, so it will be NULL-terminated */
-  argv = g_malloc0(sizeof(gchar*)*4);
-  argc = 1;
-
-  argv[0] = client_data;
-
-  gnome_client_set_clone_command(client, argc, argv);
-  gnome_client_set_restart_command(client, argc, argv);
-
-  return TRUE;
-}
-
-/* Kill Session */
-static gint KillSession(GnomeClient* client, gpointer client_data)
-{
-  gtk_main_quit();
-
-  return TRUE;
-}
-
 static gint TimeOut(gpointer data)
 {
   GripUpdate(grip_app);

grip-4.1.1.tar.gz/src/meson.build Added

grip-3.10.1.tar.gz/src/parsecfg.c -> grip-4.1.1.tar.gz/src/parsecfg.c Changed

grip-3.10.1.tar.gz/src/rip.c -> grip-4.1.1.tar.gz/src/rip.c Changed

@@ -4,8 +4,8 @@
  *
  *   http://www.nostatic.org/grip
  *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
+ * 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.
  *
@@ -32,6 +32,7 @@
 #include <sys/mount.h>
 #endif
 #include <unistd.h>
+#include <errno.h>
 #include <sys/types.h>
 #include <signal.h>
 #include <sys/wait.h>
@@ -52,25 +53,25 @@
 extern int rip_smile_level;
 #endif
 
-static void RipPartialChanged(GtkWidget *widget,gpointer data);
-static void PlaySegmentCB(GtkWidget *widget,gpointer data);
+static void RipPartialChanged(GtkWidget *widget, gpointer data);
+static void PlaySegmentCB(GtkWidget *widget, gpointer data);
 static GtkWidget *MakeRangeSelects(GripInfo *ginfo);
-static void AddSQLEntry(GripInfo *ginfo,EncodeTrack *enc_track);
-static void DBScan(GtkWidget *widget,gpointer data);
-static char *MakeRelative(char *file1,char *file2);
+static void AddSQLEntry(GripInfo *ginfo, EncodeTrack *enc_track);
+static void DBScan(GtkWidget *widget, gpointer data);
+static char *MakeRelative(char *file1, char *file2);
 static gboolean AddM3U(GripInfo *ginfo);
-static void ID3Add(GripInfo *ginfo,char *file,EncodeTrack *enc_track);
+static void ID3Add(GripInfo *ginfo, char *file, EncodeTrack *enc_track);
 static void DoWavFilter(GripInfo *ginfo);
 static void DoDiscFilter(GripInfo *ginfo);
-static void RipIsFinished(GripInfo *ginfo,gboolean aborted);
+static void RipIsFinished(GripInfo *ginfo, gboolean aborted);
 static void CheckDupNames(GripInfo *ginfo);
-static void RipWholeCD(gint reply,gpointer data);
+static void RipWholeCD(gint reply, gpointer data);
 static int NextTrackToRip(GripInfo *ginfo);
 static gboolean RipNextTrack(GripInfo *ginfo);
 #ifdef CDPAR
 static void ThreadRip(void *arg);
 #endif
-static void AddToEncode(GripInfo *ginfo,int track);
+static void AddToEncode(GripInfo *ginfo, int track);
 static gboolean MP3Encode(GripInfo *ginfo);
 static void CalculateAll(GripInfo *ginfo);
 static size_t CalculateEncSize(GripInfo *ginfo, int track);
@@ -81,7 +82,7 @@
   GripGUI *uinfo;
   GtkWidget *rippage;
   GtkWidget *rangesel;
-  GtkWidget *vbox,*vbox2,*hbox,*hbox2;
+  GtkWidget *vbox, *vbox2, *hbox, *hbox2;
   GtkWidget *button;
   GtkWidget *hsep;
   GtkWidget *check;
@@ -90,230 +91,230 @@
   int label_width;
   PangoLayout *layout;
 
-  uinfo=&(ginfo->gui_info);
+  uinfo = &(ginfo->gui_info);
 
-  rippage=MakeNewPage(uinfo->notebook,_("Rip"));
+  rippage = MakeNewPage(uinfo->notebook, _("Rip"));
 
-  vbox=gtk_vbox_new(FALSE,2);
-  gtk_container_border_width(GTK_CONTAINER(vbox),3);
+  vbox = gtk_vbox_new(FALSE, 2);
+  gtk_container_border_width(GTK_CONTAINER(vbox), 3);
 
-  hbox=gtk_hbox_new(FALSE,5);
+  hbox = gtk_hbox_new(FALSE, 5);
 
-  vbox2=gtk_vbox_new(FALSE,0);
+  vbox2 = gtk_vbox_new(FALSE, 0);
 
-  button=gtk_button_new_with_label(_("Rip+Encode"));
-  gtk_tooltips_set_tip(MakeToolTip(),button,
-		       _("Rip and encode selected tracks"),NULL);
-  gtk_signal_connect(GTK_OBJECT(button),"clicked",
-		     GTK_SIGNAL_FUNC(DoRipEncode),(gpointer)ginfo);
-  gtk_box_pack_start(GTK_BOX(vbox2),button,FALSE,FALSE,0);
+  button = gtk_button_new_with_label(_("Rip+Encode"));
+  gtk_tooltips_set_tip(MakeToolTip(), button,
+                       _("Rip and encode selected tracks"), NULL);
+  gtk_signal_connect(GTK_OBJECT(button), "clicked",
+                     GTK_SIGNAL_FUNC(DoRipEncode), (gpointer)ginfo);
+  gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
   gtk_widget_show(button);
 
-  button=gtk_button_new_with_label(_("Rip Only"));
-  gtk_tooltips_set_tip(MakeToolTip(),button,
-		       _("Rip but do not encode selected tracks"),NULL);
-  gtk_signal_connect(GTK_OBJECT(button),"clicked",
-		     GTK_SIGNAL_FUNC(DoRip),(gpointer)ginfo);
-  gtk_box_pack_start(GTK_BOX(vbox2),button,FALSE,FALSE,0);
+  button = gtk_button_new_with_label(_("Rip Only"));
+  gtk_tooltips_set_tip(MakeToolTip(), button,
+                      _("Rip but do not encode selected tracks"), NULL);
+  gtk_signal_connect(GTK_OBJECT(button), "clicked",
+                     GTK_SIGNAL_FUNC(DoRip), (gpointer)ginfo);
+  gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
   gtk_widget_show(button);
 
-  button=gtk_button_new_with_label(_("Abort Rip and Encode"));
-  gtk_tooltips_set_tip(MakeToolTip(),button,
-		       _("Kill all active rip and encode processes"),NULL);
-  gtk_signal_connect(GTK_OBJECT(button),"clicked",
-		     GTK_SIGNAL_FUNC(KillRip),(gpointer)ginfo);
-  gtk_signal_connect(GTK_OBJECT(button),"clicked",
-		     GTK_SIGNAL_FUNC(KillEncode),(gpointer)ginfo);
-  gtk_box_pack_start(GTK_BOX(vbox2),button,FALSE,FALSE,0);
+  button = gtk_button_new_with_label(_("Abort Rip and Encode"));
+  gtk_tooltips_set_tip(MakeToolTip(), button,
+                       _("Kill all active rip and encode processes"), NULL);
+  gtk_signal_connect(GTK_OBJECT(button), "clicked",
+                     GTK_SIGNAL_FUNC(KillRip), (gpointer)ginfo);
+  gtk_signal_connect(GTK_OBJECT(button), "clicked",
+                     GTK_SIGNAL_FUNC(KillEncode), (gpointer)ginfo);
+  gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
   gtk_widget_show(button);
 
-  button=gtk_button_new_with_label(_("Abort Ripping Only"));
-  gtk_tooltips_set_tip(MakeToolTip(),button,
-		       _("Kill rip process"),NULL);
-  gtk_signal_connect(GTK_OBJECT(button),"clicked",
-		     GTK_SIGNAL_FUNC(KillRip),(gpointer)ginfo);
-  gtk_box_pack_start(GTK_BOX(vbox2),button,FALSE,FALSE,0);
+  button = gtk_button_new_with_label(_("Abort Ripping Only"));
+  gtk_tooltips_set_tip(MakeToolTip(), button,
+                       _("Kill rip process"), NULL);
+  gtk_signal_connect(GTK_OBJECT(button), "clicked",
+                     GTK_SIGNAL_FUNC(KillRip), (gpointer)ginfo);
+  gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
   gtk_widget_show(button);
 
-  button=gtk_button_new_with_label(_("DDJ Scan"));
-  gtk_tooltips_set_tip(MakeToolTip(),button,
-		       _("Insert disc information into the DigitalDJ database"),
-		       NULL);
-  gtk_signal_connect(GTK_OBJECT(button),"clicked",
-		     GTK_SIGNAL_FUNC(DBScan),(gpointer)ginfo);
-  gtk_box_pack_start(GTK_BOX(vbox2),button,FALSE,FALSE,0);
+  button = gtk_button_new_with_label(_("DDJ Scan"));
+  gtk_tooltips_set_tip(MakeToolTip(), button,
+                       _("Insert disc information into the DigitalDJ database"),
+                       NULL);
+  gtk_signal_connect(GTK_OBJECT(button), "clicked",
+                     GTK_SIGNAL_FUNC(DBScan), (gpointer)ginfo);
+  gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
   gtk_widget_show(button);
 
-  gtk_box_pack_start(GTK_BOX(hbox),vbox2,TRUE,TRUE,0);
+  gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 0);
   gtk_widget_show(vbox2);
 
-  partial_rip_frame=gtk_frame_new(NULL);
+  partial_rip_frame = gtk_frame_new(NULL);
 
-  vbox2=gtk_vbox_new(FALSE,0);
-  gtk_container_border_width(GTK_CONTAINER(vbox2),3);
+  vbox2 = gtk_vbox_new(FALSE, 0);
+  gtk_container_border_width(GTK_CONTAINER(vbox2), 3);
 
-  check=MakeCheckButton(NULL,&ginfo->rip_partial,_("Rip partial track"));
-  gtk_signal_connect(GTK_OBJECT(check),"clicked",
-  		     GTK_SIGNAL_FUNC(RipPartialChanged),(gpointer)ginfo);
-  gtk_box_pack_start(GTK_BOX(vbox2),check,FALSE,FALSE,0);
+  check = MakeCheckButton(NULL, &ginfo->rip_partial, _("Rip partial track"));
+  gtk_signal_connect(GTK_OBJECT(check), "clicked",
+                     GTK_SIGNAL_FUNC(RipPartialChanged), (gpointer)ginfo);
+  gtk_box_pack_start(GTK_BOX(vbox2), check, FALSE, FALSE, 0);
   gtk_widget_show(check);
 
-  uinfo->partial_rip_box=gtk_vbox_new(FALSE,0);
-  gtk_widget_set_sensitive(uinfo->partial_rip_box,ginfo->rip_partial);
+  uinfo->partial_rip_box = gtk_vbox_new(FALSE, 0);
+  gtk_widget_set_sensitive(uinfo->partial_rip_box, ginfo->rip_partial);
 
-  hbox2=gtk_hbox_new(FALSE,5);
+  hbox2 = gtk_hbox_new(FALSE, 5);
 
-  button=gtk_button_new_with_label(_("Play"));
-  gtk_signal_connect(GTK_OBJECT(button),"clicked",
-  		     GTK_SIGNAL_FUNC(PlaySegmentCB),
-  		     (gpointer)ginfo);
-  gtk_box_pack_start(GTK_BOX(hbox2),button,TRUE,TRUE,0);
+  button = gtk_button_new_with_label(_("Play"));
+  gtk_signal_connect(GTK_OBJECT(button), "clicked",
+                     GTK_SIGNAL_FUNC(PlaySegmentCB),
+                     (gpointer)ginfo);
+  gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
   gtk_widget_show(button);
 
-  uinfo->play_sector_label=gtk_label_new(_("Current sector:      0"));
-  gtk_box_pack_start(GTK_BOX(hbox2),uinfo->play_sector_label,FALSE,FALSE,0);
+  uinfo->play_sector_label = gtk_label_new(_("Current sector:      0"));
+  gtk_box_pack_start(GTK_BOX(hbox2), uinfo->play_sector_label, FALSE, FALSE, 0);
   gtk_widget_show(uinfo->play_sector_label);
 
-  gtk_box_pack_start(GTK_BOX(uinfo->partial_rip_box),hbox2,FALSE,FALSE,0);
+  gtk_box_pack_start(GTK_BOX(uinfo->partial_rip_box), hbox2, FALSE, FALSE, 0);
   gtk_widget_show(hbox2);
 
-  rangesel=MakeRangeSelects(ginfo);
-  gtk_box_pack_start(GTK_BOX(uinfo->partial_rip_box),rangesel,FALSE,FALSE,0);
+  rangesel = MakeRangeSelects(ginfo);
+  gtk_box_pack_start(GTK_BOX(uinfo->partial_rip_box), rangesel, FALSE, FALSE, 0);
   gtk_widget_show(rangesel);
 
-  gtk_box_pack_start(GTK_BOX(vbox2),uinfo->partial_rip_box,TRUE,TRUE,0);
+  gtk_box_pack_start(GTK_BOX(vbox2), uinfo->partial_rip_box, TRUE, TRUE, 0);
   gtk_widget_show(uinfo->partial_rip_box);
 
-  gtk_container_add(GTK_CONTAINER(partial_rip_frame),vbox2);
+  gtk_container_add(GTK_CONTAINER(partial_rip_frame), vbox2);
   gtk_widget_show(vbox2);
 
-  gtk_box_pack_start(GTK_BOX(hbox),partial_rip_frame,TRUE,TRUE,0);
+  gtk_box_pack_start(GTK_BOX(hbox), partial_rip_frame, TRUE, TRUE, 0);
   gtk_widget_show(partial_rip_frame);
 
-  gtk_box_pack_start(GTK_BOX(vbox),hbox,TRUE,TRUE,0);
+  gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
   gtk_widget_show(hbox);
 
-  hsep=gtk_hseparator_new();
-  gtk_box_pack_start(GTK_BOX(vbox),hsep,TRUE,TRUE,0);
+  hsep = gtk_hseparator_new();
+  gtk_box_pack_start(GTK_BOX(vbox), hsep, TRUE, TRUE, 0);
   gtk_widget_show(hsep);
 
-  vbox2=gtk_vbox_new(FALSE,0);
+  vbox2 = gtk_vbox_new(FALSE, 0);
 
-  hbox=gtk_hbox_new(FALSE,3);
+  hbox=gtk_hbox_new(FALSE, 3);
 
-  uinfo->rip_prog_label=gtk_label_new(_("Rip: Idle"));
+  uinfo->rip_prog_label = gtk_label_new(_("Rip: Idle"));
 
   /* This should be the largest this string can get */
 
-  layout=gtk_widget_create_pango_layout(GTK_WIDGET(uinfo->app),
-					_("Enc: Trk 99 (99.9x)"));
+  layout = gtk_widget_create_pango_layout(GTK_WIDGET(uinfo->app),
+                                          _("Enc: Trk 99 (99.9x)"));
 
 
-  pango_layout_get_size(layout,&label_width,NULL);
+  pango_layout_get_size(layout, &label_width, NULL);
 
-  label_width/=PANGO_SCALE;
+  label_width /= PANGO_SCALE;
 
   g_object_unref(layout);
 
 
-  gtk_widget_set_usize(uinfo->rip_prog_label,label_width,0);
-  gtk_box_pack_start(GTK_BOX(hbox),uinfo->rip_prog_label,FALSE,FALSE,0);
-  gtk_label_set(GTK_LABEL(uinfo->rip_prog_label),_("Rip: Idle"));
+  gtk_widget_set_usize(uinfo->rip_prog_label, label_width, 0);
+  gtk_box_pack_start(GTK_BOX(hbox), uinfo->rip_prog_label, FALSE, FALSE, 0);
+  gtk_label_set(GTK_LABEL(uinfo->rip_prog_label), _("Rip: Idle"));
   gtk_widget_show(uinfo->rip_prog_label);
 
-  uinfo->ripprogbar=gtk_progress_bar_new();
-  gtk_box_pack_start(GTK_BOX(hbox),uinfo->ripprogbar,FALSE,FALSE,0);
+  uinfo->ripprogbar = gtk_progress_bar_new();
+  gtk_box_pack_start(GTK_BOX(hbox), uinfo->ripprogbar, FALSE, FALSE, 0);
   gtk_widget_show(uinfo->ripprogbar);
 
-  uinfo->smile_indicator=NewBlankPixmap(uinfo->app);
-  gtk_tooltips_set_tip(MakeToolTip(),uinfo->smile_indicator,
-		       _("Rip status"),NULL);
-  gtk_box_pack_start(GTK_BOX(hbox),uinfo->smile_indicator,FALSE,FALSE,0);
+  uinfo->smile_indicator = NewBlankPixmap(uinfo->app);
+  gtk_tooltips_set_tip(MakeToolTip(), uinfo->smile_indicator,
+                       _("Rip status"), NULL);
+  gtk_box_pack_start(GTK_BOX(hbox), uinfo->smile_indicator, FALSE, FALSE, 0);
   gtk_widget_show(uinfo->smile_indicator);
 
-  gtk_box_pack_start(GTK_BOX(vbox2),hbox,FALSE,FALSE,0);
+  gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
   gtk_widget_show(hbox);
 
-  for(mycpu=0;mycpu<ginfo->num_cpu;mycpu++){
-    hbox=gtk_hbox_new(FALSE,3);
+  for(mycpu=0;mycpu < ginfo->num_cpu;mycpu++){
+    hbox = gtk_hbox_new(FALSE, 3);
 
-    uinfo->mp3_prog_label[mycpu]=gtk_label_new(_("Enc: Idle"));
-    gtk_widget_set_usize(uinfo->mp3_prog_label[mycpu],label_width,0);
+    uinfo->mp3_prog_label[mycpu] = gtk_label_new(_("Enc: Idle"));
+    gtk_widget_set_usize(uinfo->mp3_prog_label[mycpu], label_width, 0);
 
-    gtk_box_pack_start(GTK_BOX(hbox),uinfo->mp3_prog_label[mycpu],
-		       FALSE,FALSE,0);
+    gtk_box_pack_start(GTK_BOX(hbox), uinfo->mp3_prog_label[mycpu],
+                       FALSE, FALSE, 0);
     gtk_widget_show(uinfo->mp3_prog_label[mycpu]);
 
-    uinfo->mp3progbar[mycpu]=gtk_progress_bar_new();
+    uinfo->mp3progbar[mycpu] = gtk_progress_bar_new();
 
-    gtk_box_pack_start(GTK_BOX(hbox),uinfo->mp3progbar[mycpu],FALSE,FALSE,0);
+    gtk_box_pack_start(GTK_BOX(hbox), uinfo->mp3progbar[mycpu], FALSE, FALSE, 0);
     gtk_widget_show(uinfo->mp3progbar[mycpu]);
 
-    gtk_box_pack_start(GTK_BOX(vbox2),hbox,FALSE,FALSE,0);
+    gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
     gtk_widget_show(hbox);
   }
-  
-  gtk_box_pack_start(GTK_BOX(vbox),vbox2,TRUE,TRUE,0);
+
+  gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
   gtk_widget_show(vbox2);
 
-  hsep=gtk_hseparator_new();
-  gtk_box_pack_start(GTK_BOX(vbox),hsep,TRUE,TRUE,0);
+  hsep = gtk_hseparator_new();
+  gtk_box_pack_start(GTK_BOX(vbox), hsep, TRUE, TRUE, 0);
   gtk_widget_show(hsep);
-  
-  vbox2=gtk_vbox_new(FALSE,0);
-  uinfo->all_label=gtk_label_new(_("Overall indicators:"));
-  gtk_box_pack_start(GTK_BOX(vbox2),uinfo->all_label,FALSE,FALSE,0);
+
+  vbox2 = gtk_vbox_new(FALSE, 0);
+  uinfo->all_label = gtk_label_new(_("Overall indicators:"));
+  gtk_box_pack_start(GTK_BOX(vbox2), uinfo->all_label, FALSE, FALSE, 0);
   gtk_widget_show(uinfo->all_label);
-  
-  hbox=gtk_hbox_new(FALSE,2);
-  uinfo->all_rip_label=gtk_label_new(_("Rip: Idle"));
-  gtk_widget_set_usize(uinfo->all_rip_label,label_width,0);
-  gtk_box_pack_start(GTK_BOX(hbox),uinfo->all_rip_label,FALSE,FALSE,0);
+
+  hbox = gtk_hbox_new(FALSE, 2);
+  uinfo->all_rip_label = gtk_label_new(_("Rip: Idle"));
+  gtk_widget_set_usize(uinfo->all_rip_label, label_width, 0);
+  gtk_box_pack_start(GTK_BOX(hbox), uinfo->all_rip_label, FALSE, FALSE, 0);
   gtk_widget_show(uinfo->all_rip_label);
-  
-  uinfo->all_ripprogbar=gtk_progress_bar_new();
-  gtk_box_pack_start(GTK_BOX(hbox),uinfo->all_ripprogbar,FALSE,FALSE,0);
+
+  uinfo->all_ripprogbar = gtk_progress_bar_new();
+  gtk_box_pack_start(GTK_BOX(hbox), uinfo->all_ripprogbar, FALSE, FALSE, 0);
   gtk_widget_show(uinfo->all_ripprogbar);
 
-  gtk_box_pack_start(GTK_BOX(vbox2),hbox,FALSE,FALSE,0);
+  gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
   gtk_widget_show(hbox);
- 
-  hbox=gtk_hbox_new(FALSE,2);
-  uinfo->all_enc_label=gtk_label_new(_("Enc: Idle"));
-  gtk_widget_set_usize(uinfo->all_enc_label,label_width,0);
-  gtk_box_pack_start(GTK_BOX(hbox),uinfo->all_enc_label,FALSE,FALSE,0);
+
+  hbox=gtk_hbox_new(FALSE, 2);
+  uinfo->all_enc_label = gtk_label_new(_("Enc: Idle"));
+  gtk_widget_set_usize(uinfo->all_enc_label, label_width, 0);
+  gtk_box_pack_start(GTK_BOX(hbox), uinfo->all_enc_label, FALSE, FALSE, 0);
   gtk_widget_show(uinfo->all_enc_label);
 
-  uinfo->all_encprogbar=gtk_progress_bar_new();
-  gtk_box_pack_start(GTK_BOX(hbox),uinfo->all_encprogbar,FALSE,FALSE,0);
+  uinfo->all_encprogbar = gtk_progress_bar_new();
+  gtk_box_pack_start(GTK_BOX(hbox), uinfo->all_encprogbar, FALSE, FALSE, 0);
   gtk_widget_show(uinfo->all_encprogbar);
-  
-  gtk_box_pack_start(GTK_BOX(vbox2),hbox,FALSE,FALSE,0);
+
+  gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
   gtk_widget_show(hbox);
-  
-  gtk_box_pack_start(GTK_BOX(vbox),vbox2,TRUE,TRUE,0);
+
+  gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
   gtk_widget_show(vbox2);
 
-  gtk_container_add(GTK_CONTAINER(rippage),vbox);
+  gtk_container_add(GTK_CONTAINER(rippage), vbox);
   gtk_widget_show(vbox);
 }
 
-static void RipPartialChanged(GtkWidget *widget,gpointer data)
+static void RipPartialChanged(GtkWidget *widget, gpointer data)
 {
   GripInfo *ginfo;
 
-  ginfo=(GripInfo *)data;
+  ginfo = (GripInfo *)data;
 
-  gtk_widget_set_sensitive(ginfo->gui_info.partial_rip_box,ginfo->rip_partial);
+  gtk_widget_set_sensitive(ginfo->gui_info.partial_rip_box, ginfo->rip_partial);
 }
 
-static void PlaySegmentCB(GtkWidget *widget,gpointer data)
+static void PlaySegmentCB(GtkWidget *widget, gpointer data)
 {
   GripInfo *ginfo;
 
-  ginfo=(GripInfo *)data;
+  ginfo = (GripInfo *)data;
 
-  PlaySegment(ginfo,CURRENT_TRACK);
+  PlaySegment(ginfo, CURRENT_TRACK);
 }
 
 static GtkWidget *MakeRangeSelects(GripInfo *ginfo)
@@ -321,22 +322,22 @@
   GtkWidget *vbox;
   GtkWidget *numentry;
 
-  vbox=gtk_vbox_new(FALSE,0);
+  vbox = gtk_vbox_new(FALSE, 0);
 
-  numentry=MakeNumEntry(&(ginfo->gui_info.start_sector_entry),
-			&ginfo->start_sector,_("Start sector"),10);
-  gtk_box_pack_start(GTK_BOX(vbox),numentry,FALSE,FALSE,0);
+  numentry = MakeNumEntry(&(ginfo->gui_info.start_sector_entry),
+                          &ginfo->start_sector, _("Start sector"), 10);
+  gtk_box_pack_start(GTK_BOX(vbox), numentry, FALSE, FALSE, 0);
   gtk_widget_show(numentry);
-  
-  numentry=MakeNumEntry(&(ginfo->gui_info.end_sector_entry),
-			&ginfo->end_sector,_("End sector"),10);
-  gtk_box_pack_start(GTK_BOX(vbox),numentry,FALSE,FALSE,0);
+
+  numentry = MakeNumEntry(&(ginfo->gui_info.end_sector_entry),
+                          &ginfo->end_sector, _("End sector"), 10);
+  gtk_box_pack_start(GTK_BOX(vbox), numentry, FALSE, FALSE, 0);
   gtk_widget_show(numentry);
-  
+
   return vbox;
 }
 
-static void DBScan(GtkWidget *widget,gpointer data)
+static void DBScan(GtkWidget *widget, gpointer data)
 {
   GripInfo *ginfo;
   int track;
@@ -344,29 +345,30 @@
   GString *str;
   char *format;
 
-  ginfo=(GripInfo *)data;
+  ginfo = (GripInfo *)data;
+
+  if(!ginfo->have_disc)
+    return;
 
-  if(!ginfo->have_disc) return;
+  for(track=0;track < ginfo->disc.num_tracks;track++) {
+    FillInTrackInfo(ginfo, track, &enc_track);
 
-  for(track=0;track<ginfo->disc.num_tracks;track++) {
-    FillInTrackInfo(ginfo,track,&enc_track);
-    
-    str=g_string_new(NULL);
+    str = g_string_new(NULL);
 
     format = (ginfo->ddata.data_multi_artist)
                 ? ginfo->mp3fileformat_multi
                 : ginfo->mp3fileformat;
-    TranslateString(format,str,TranslateSwitch,
-		    &enc_track,TRUE,&(ginfo->sprefs));
-    
-    g_snprintf(enc_track.mp3_filename,256,"%s",str->str);
-    g_string_free(str,TRUE);
-    
-    AddSQLEntry(ginfo,&enc_track);
+    TranslateString(format, str, TranslateSwitch,
+                    &enc_track, TRUE, &(ginfo->sprefs));
+
+    g_snprintf(enc_track.mp3_filename, 256, "%s", str->str);
+    g_string_free(str, TRUE);
+
+    AddSQLEntry(ginfo, &enc_track);
   }
 }
 
-static void AddSQLEntry(GripInfo *ginfo,EncodeTrack *enc_track)
+static void AddSQLEntry(GripInfo *ginfo, EncodeTrack *enc_track)
 {
   int sqlpid;
   char track_str[4];
@@ -375,51 +377,49 @@
   char playtime_str[6];
   char year_str[5];
 
-  g_snprintf(track_str,4,"%d",enc_track->track_num);
-  g_snprintf(frame_str,11,"%d",enc_track->start_frame);
-  g_snprintf(length_str,11,"%d",enc_track->end_frame-enc_track->start_frame);
-  g_snprintf(playtime_str,6,"%d:%d",enc_track->mins,enc_track->secs);
-  g_snprintf(year_str,5,"%d",enc_track->song_year);
+  g_snprintf(track_str, 4, "%d", enc_track->track_num);
+  g_snprintf(frame_str, 11, "%d", enc_track->start_frame);
+  g_snprintf(length_str, 11, "%d", enc_track->end_frame-enc_track->start_frame);
+  g_snprintf(playtime_str, 6, "%d:%d", enc_track->mins, enc_track->secs);
+  g_snprintf(year_str, 5, "%d", enc_track->song_year);
 
-  LogStatus(ginfo,_("Inserting track %d into the ddj database\n"),
-	    enc_track->track_num);
+  sqlpid = fork();
 
-  sqlpid=fork();
-
-  if(sqlpid==0) {
+  if(sqlpid == 0) {
     CloseStuff(ginfo);
 
     if(*enc_track->song_artist)
-      execlp("mp3insert","mp3insert",
-	    "-p",enc_track->mp3_filename,
-	    "-a",enc_track->disc_artist,
-	    "-i",enc_track->song_artist,
-	    "-t",enc_track->song_name,"-d",enc_track->disc_name,
-	    "-g",ID3GenreString(enc_track->id3_genre),"-y",year_str,
-	    "-n",track_str,
-	    "-f",frame_str,"-l",length_str,"-m",playtime_str,NULL);
+      execlp("mp3insert", "mp3insert",
+             "-p", enc_track->mp3_filename,
+             "-a", enc_track->disc_artist,
+             "-i", enc_track->song_artist,
+             "-t", enc_track->song_name,
+             "-d", enc_track->disc_name,
+             "-g", ID3GenreString(enc_track->id3_genre),
+             "-y", year_str,
+             "-n", track_str,
+             "-f", frame_str,
+             "-l", length_str,
+             "-m", playtime_str,
+             NULL);
     else
-      execlp("mp3insert","mp3insert",
-	    "-p",enc_track->mp3_filename,
-	    "-a",enc_track->disc_artist,
-	    "-t",enc_track->song_name,"-d",enc_track->disc_name,
-	    "-g",ID3GenreString(enc_track->id3_genre),"-y",year_str,
-	    "-n",track_str,
-	    "-f",frame_str,"-l",length_str,"-m",playtime_str,NULL);
-    
+      execlp("mp3insert", "mp3insert",
+             "-p", enc_track->mp3_filename,
+             "-a", enc_track->disc_artist,
+             "-t", enc_track->song_name,
+             "-d", enc_track->disc_name,
+             "-g", ID3GenreString(enc_track->id3_genre),
+             "-y", year_str,
+             "-n", track_str,
+             "-f", frame_str,
+             "-l", length_str,
+             "-m", playtime_str,
+             NULL);
+
     _exit(0);
   }
 
-  waitpid(sqlpid,NULL,0);
-}
-
-gboolean IsDir(char *path)
-{
-  struct stat mystat;
-
-  if(stat(path,&mystat)!=0) return FALSE;
-
-  return S_ISDIR(mystat.st_mode);
+  waitpid(sqlpid, NULL, 0);
 }
 
 unsigned long long BytesLeftInFS(char *path)
@@ -429,33 +429,33 @@
 #ifdef HAVE_SYS_STATVFS_H
   struct statvfs stat;
 #else
- struct statfs stat;
+  struct statfs stat;
 #endif
 
-  if(!IsDir(path)) {
-    for(pos=strlen(path);pos&&(path[pos]!='/');pos--);
-    
-    if(path[pos]!='/') return 0;
-    
+  if(!g_file_test(path, G_FILE_TEST_IS_DIR)) {
+    for(pos=strlen(path);pos && (path[pos] != '/');pos--);
+
+    if(path[pos] != '/') return 0;
+
     path[pos]='\0';
 
 #ifdef HAVE_SYS_STATVFS_H
-    if(statvfs(path,&stat)!=0) return 0;
+    if(statvfs(path, &stat) != 0) return 0;
 #else
-    if(statfs(path,&stat)!=0) return 0;
+    if(statfs(path, &stat) != 0) return 0;
 #endif
 
     path[pos]='/';
   }
   else
 #ifdef HAVE_SYS_STATVFS_H
-    if(statvfs(path,&stat)!=0) return 0;
+    if(statvfs(path, &stat) != 0) return 0;
 #else
-    if(statfs(path,&stat)!=0) return 0;
+    if(statfs(path, &stat) != 0) return 0;
 #endif
 
-  bytesleft=stat.f_bavail;
-  bytesleft*=stat.f_bsize;
+  bytesleft = stat.f_bavail;
+  bytesleft *= stat.f_bsize;
 
   return bytesleft;
 }
@@ -465,8 +465,8 @@
 {
   char *c;
 
-  for(c=str+strlen(str);c>str;c--) {
-    if(*c=='/') return c+1;
+  for(c=str+strlen(str);c > str;c--) {
+    if(*c == '/') return c+1;
   }
 
   return c;
@@ -476,97 +476,87 @@
 gboolean CanWrite(char *path)
 {
   char *c;
-  gboolean can_write=FALSE;
+  gboolean can_write = FALSE;
 
   /* First find the filename part, if any */
-  for(c=path+strlen(path);c>path;c--) {
-    if(*c=='/') break;
+  for(c=path+strlen(path);c > path;c--) {
+    if(*c == '/') break;
   }
 
   /* This is kinda clumsy -- temporarily hack the string to get only the
    path part */
-  if(c!=path) {
-    *c='\0';
+  if(c != path) {
+    *c = '\0';
   }
 
-  if(!access(path,W_OK)) {
-    can_write=TRUE;
+  if(!access(path, W_OK)) {
+    can_write = TRUE;
   }
 
   /* Put back the '/' */
-  if(c!=path) {
-    *c='/';
+  if(c != path) {
+    *c = '/';
   }
 
   return can_write;
 }
 
-void MakeDirs(char *path)
+static void MakeDirs(char *path)
 {
-  char dir[256];
-  char *s;
-  int len;
-
-  for(len=0,s=path;*s;s++,len++) {
-    if(*s=='/') {
-      strncpy(dir,path,len);
-      dir[len]='\0';
-
-      if(!FileExists(dir))
-	mkdir(dir,0777);
-    }
-  }
+  char *dir = g_path_get_dirname(path);
+  g_mkdir_with_parents(dir, 0777);
+  g_free(dir);
 }
 
 char *MakePath(char *str)
 {
   int len;
 
-  len=strlen(str)-1;
+  len = strlen(str) - 1;
 
-  if(str[len]!='/') {
-    str[len+1]='/';
-    str[len+2]='\0';
+  if(str[len] != '/') {
+    str[len+1] = '/';
+    str[len+2] = '\0';
   }
 
   return str;
 }
 
 /* Make file1 relative to file2 */
-static char *MakeRelative(char *file1,char *file2)
+static char *MakeRelative(char *file1, char *file2)
 {
-  int pos, pos2=0, slashcnt, i;
-  char *rel=file1;
-  char tem[PATH_MAX]="";
+  int pos, pos2 = 0, slashcnt, i;
+  char *rel = file1;
+  char tem[PATH_MAX] = "";
 
   slashcnt=0;
 
   /* This part finds relative names assuming m3u is not branched in a
      different directory from mp3 */
   for(pos=0;file2[pos];pos++) {
-    if(pos&&(file2[pos]=='/')) {
-      if(!strncmp(file1,file2,pos)) {
-	rel=file1+pos+1;
-	pos2=pos;
+    if(pos && (file2[pos] == '/')) {
+      if(!strncmp(file1, file2, pos)) {
+        rel = file1 + pos + 1;
+        pos2 = pos;
       }
     }
   }
 
   /* Now check to see if the m3u file branches to a different directory. */
   for(pos2=pos2+1;file2[pos2];pos2++) {
-    if(file2[pos2]=='/'){             
+    if(file2[pos2] == '/') {
       slashcnt++;
     }
-  } 
+  }
 
   /* Now add correct number of "../"s to make the path relative */
-  for(i=0;i<slashcnt;i++) {
-    strcpy(tem,"../");
-    strncat(tem,rel,PATH_MAX - strlen(rel) - 3);
-    strcpy(rel,tem);
+  for(i=0;i < slashcnt;i++) {
+    strcpy(tem, "../");
+    strncat(tem, rel, PATH_MAX - strlen(rel) - 3);
+    strcpy(rel, tem);
   }
 
-  return rel; 
+  return rel;
 }
 
 static gboolean AddM3U(GripInfo *ginfo)
@@ -581,90 +571,89 @@
   char *conv_str;
   char *non_posix_name_filter;
   char line_terminator[3];
-  gsize rb,wb;
+  gsize rb, wb;
   char *format;
 
-  if(!ginfo->have_disc) return FALSE;
-  
-  str=g_string_new(NULL);
+  if(!ginfo->have_disc)
+    return FALSE;
+
+  str = g_string_new(NULL);
 
   /* Use track 0 to fill in M3u switches */
-  FillInTrackInfo(ginfo,0,&enc_track);
+  FillInTrackInfo(ginfo, 0, &enc_track);
 
-  TranslateString(ginfo->m3ufileformat,str,TranslateSwitch,
-		    &enc_track,TRUE,&(ginfo->sprefs));
+  TranslateString(ginfo->m3ufileformat, str, TranslateSwitch,
+                  &enc_track, TRUE, &(ginfo->sprefs));
 
-  conv_str=g_filename_from_utf8(str->str,strlen(str->str),&rb,&wb,NULL);
+  conv_str = g_filename_from_utf8(str->str, strlen(str->str), &rb, &wb, NULL);
 
   if(!conv_str)
-    conv_str=g_strdup(str->str);
+    conv_str = g_strdup(str->str);
 
-  g_snprintf(m3unam,PATH_MAX,"%s",conv_str);
+  g_snprintf(m3unam, PATH_MAX, "%s", conv_str);
 
   MakeDirs(conv_str);
 
-  fp=fopen(conv_str, "w");
+  fp = fopen(conv_str, "w");
   if(fp==NULL) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("Error: can't open m3u file."));
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("Error: can't open m3u file."));
     return FALSE;
   }
   g_free(conv_str);
-  
-  for(i=0;i<ginfo->disc.num_tracks;i++) {
+
+  for(i=0;i < ginfo->disc.num_tracks;i++) {
     /* Only add to the m3u if the track is selected for ripping */
-    if(TrackIsChecked(&(ginfo->gui_info),i)) {
-      g_string_truncate(str,0);
+    if(TrackIsChecked(&(ginfo->gui_info), i)) {
+      g_string_truncate(str, 0);
 
-      FillInTrackInfo(ginfo,i,&enc_track);
+      FillInTrackInfo(ginfo, i, &enc_track);
       format = (ginfo->ddata.data_multi_artist)
                 ? ginfo->mp3fileformat_multi
                 : ginfo->mp3fileformat;
-      TranslateString(format,str,TranslateSwitch,
-		      &enc_track,TRUE,&(ginfo->sprefs));
+      TranslateString(format, str, TranslateSwitch,
+                      &enc_track, TRUE, &(ginfo->sprefs));
 
-      conv_str=g_filename_from_utf8(str->str,strlen(str->str),&rb,&wb,NULL);
+      conv_str = g_filename_from_utf8(str->str, strlen(str->str),
+                                      &rb, &wb, NULL);
 
       if(!conv_str)
-    	conv_str=g_strdup(str->str);
+        conv_str = g_strdup(str->str);
 
-      g_snprintf(tmp,PATH_MAX,"%s",conv_str);
-      relnam=MakeRelative(tmp,m3unam);
+      g_snprintf(tmp, PATH_MAX, "%s", conv_str);
+      relnam = MakeRelative(tmp, m3unam);
 
       if(ginfo->sprefs.non_posix_m3u_directory_paths) {
         sprintf (line_terminator, "\r\n");
 
 
-	for (non_posix_name_filter=conv_str; *non_posix_name_filter; non_posix_name_filter++) {
-			if (*non_posix_name_filter == '/'){
-				*non_posix_name_filter = '\\';
-			}
-	}
-	for (non_posix_name_filter=relnam; *non_posix_name_filter; non_posix_name_filter++) {
-			if (*non_posix_name_filter == '/'){
-				*non_posix_name_filter = '\\';
-			}
-	}
+        for (non_posix_name_filter=conv_str; *non_posix_name_filter; non_posix_name_filter++) {
+          if (*non_posix_name_filter == '/'){
+            *non_posix_name_filter = '\\';
+          }
+        }
+        for (non_posix_name_filter=relnam; *non_posix_name_filter; non_posix_name_filter++) {
+          if (*non_posix_name_filter == '/') {
+            *non_posix_name_filter = '\\';
+          }
+        }
       }
       else
       {
-	sprintf (line_terminator, "\n");
-
+        sprintf (line_terminator, "\n");
       }
 
       if(ginfo->rel_m3u) {
-
-
-	fprintf(fp,"%s%s",relnam, line_terminator);
+        fprintf(fp, "%s%s", relnam, line_terminator);
+      } else {
+        fprintf(fp, "%s%s", conv_str, line_terminator);
       }
-      else 
-	fprintf(fp,"%s%s",conv_str, line_terminator);
       g_free(conv_str);
-     }
+    }
   }
 
-  g_string_free(str,TRUE);
-  
+  g_string_free(str, TRUE);
+
   fclose(fp);
 
   return TRUE;
@@ -677,13 +666,14 @@
   char testchar;
   GString *str;
 
-  if (!ginfo->have_disc) return;
+  if (!ginfo->have_disc)
+    return;
 
   str=g_string_new(NULL);
 
   FillInTrackInfo(ginfo, 0, &enc_track);
   TranslateString(ginfo->m3ufileformat, str, TranslateSwitch,
-		  &enc_track, TRUE, &(ginfo->sprefs));
+                  &enc_track, TRUE, &(ginfo->sprefs));
 
   fp=fopen(str->str, "r");
   if (fp==NULL)
@@ -695,82 +685,85 @@
   return;
 }
 
-void KillRip(GtkWidget *widget,gpointer data)
+void KillRip(GtkWidget *widget, gpointer data)
 {
   GripInfo *ginfo;
   int track;
 
   Debug(_("In KillRip\n"));
-  ginfo=(GripInfo *)data;
+  ginfo = (GripInfo *)data;
 
-  if(!ginfo->ripping_a_disc) return;
+  if(!ginfo->ripping_a_disc)
+    return;
 
-  ginfo->all_ripsize=0;
-  ginfo->all_ripdone=0;
-  ginfo->all_riplast=0;
+  ginfo->all_ripsize = 0;
+  ginfo->all_ripdone = 0;
+  ginfo->all_riplast = 0;
 
-  ginfo->stop_rip=TRUE;
-  ginfo->ripping_a_disc=FALSE;
+  ginfo->stop_rip = TRUE;
+  ginfo->ripping_a_disc = FALSE;
 
   if(ginfo->ripping) {
     /* Need to decrement num_wavs since we didn't finish ripping
        the current track */
     if(ginfo->doencode && ginfo->num_wavs>0)
       ginfo->num_wavs--;
-    
+
     /* Need to decrement all_mp3size */
-    for (track=0;track<ginfo->disc.num_tracks;++track) {
-      if ((!IsDataTrack(&(ginfo->disc),track)) &&
-	  (TrackIsChecked(&(ginfo->gui_info),track))) {
-	ginfo->all_encsize-=CalculateEncSize(ginfo,track);
+    for (track=0;track < ginfo->disc.num_tracks;++track) {
+      if ((!IsDataTrack(&(ginfo->disc), track)) &&
+          (TrackIsChecked(&(ginfo->gui_info), track))) {
+        ginfo->all_encsize -= CalculateEncSize(ginfo, track);
       }
     }
 
-    Debug(_("Now total enc size is: %d\n"),ginfo->all_encsize);
-    
+    Debug(_("Now total enc size is: %d\n"), ginfo->all_encsize);
+
     if(ginfo->using_builtin_cdp) {
 #ifdef CDPAR
       ginfo->stop_thread_rip_now=TRUE;
 #endif
     }
-    else kill(ginfo->rippid,SIGKILL);
+    else kill(ginfo->rippid, SIGKILL);
   }
 }
 
-void KillEncode(GtkWidget *widget,gpointer data)
+void KillEncode(GtkWidget *widget, gpointer data)
 {
   GripInfo *ginfo;
   int mycpu;
   GList *elist;
   EncodeTrack *enc_track;
 
-  ginfo=(GripInfo *)data;
+  ginfo = (GripInfo *)data;
 
   if(!ginfo->encoding) return;
 
-  ginfo->stop_encode=TRUE;
-  ginfo->num_wavs=0;
-  ginfo->all_encsize=0;
-  ginfo->all_encdone=0;
+  ginfo->stop_encode = TRUE;
+  ginfo->num_wavs = 0;
+  ginfo->all_encsize = 0;
+  ginfo->all_encdone = 0;
 
-  for(mycpu=0;mycpu<ginfo->num_cpu;mycpu++){
-    if(ginfo->encoding&(1<<mycpu)) kill(ginfo->mp3pid[mycpu],SIGKILL);
-      ginfo->all_enclast[mycpu]=0;
+  for(mycpu=0;mycpu < ginfo->num_cpu;mycpu++) {
+    if(ginfo->encoding & (1<<mycpu))
+      kill(ginfo->mp3pid[mycpu], SIGKILL);
+    /* TODO: This was previously indented as if part of the "if"; check the logic over */
+    ginfo->all_enclast[mycpu] = 0;
   }
-  
+
   elist=ginfo->encode_list;
-  
+
   /* Remove all entries in the encode list */
   while(elist) {
-    enc_track=(EncodeTrack *)elist->data;
-    elist=elist->next;
-    
-    ginfo->encode_list=g_list_remove(elist,enc_track);
+    enc_track = (EncodeTrack *)elist->data;
+    elist = elist->next;
+
+    ginfo->encode_list = g_list_remove(elist, enc_track);
     g_free(enc_track);
   }
 }
 
-static void ID3Add(GripInfo *ginfo,char *file,EncodeTrack *enc_track)
+static void ID3Add(GripInfo *ginfo, char *file, EncodeTrack *enc_track)
 {
   char year[5];
   GString *comment;
@@ -778,62 +771,70 @@
 
   /* If we only want to tag mp3 files, look for the correct extension */
   if(ginfo->tag_mp3_only) {
-    len=strlen(file);
+    len = strlen(file);
 
-    if(len<4 || strcasecmp(file+(len-4),".mp3")) {
+    if(len < 4 || strcasecmp(file + (len - 4), ".mp3")) {
       return;
     }
   }
 
-  comment=g_string_new(NULL);
-  TranslateString(ginfo->id3_comment,comment,TranslateSwitch,enc_track,
-		  FALSE,&(ginfo->sprefs));
+  comment = g_string_new(NULL);
+  TranslateString(ginfo->id3_comment, comment, TranslateSwitch, enc_track,
+                  FALSE, &(ginfo->sprefs));
 
-  g_snprintf(year,5,"%d",enc_track->song_year);
+  g_snprintf(year, 5, "%d", enc_track->song_year);
 
   /* If we've got id3lib, we have the option of doing v2 tags */
 #ifdef HAVE_ID3V2
   if(ginfo->doid3v2) {
-    ID3v2TagFile(file,(*(enc_track->song_name))?enc_track->song_name:"Unknown",
-		 (*(enc_track->song_artist))?enc_track->song_artist:
-		 (*(enc_track->disc_artist))?enc_track->disc_artist:"Unknown",
-		 (*(enc_track->disc_name))?enc_track->disc_name:"Unknown",
-		 year,comment->str,enc_track->id3_genre,
-		 enc_track->track_num+1,ginfo->id3v2_encoding);
+    ID3v2TagFile(file,
+                 (*(enc_track->song_name)) ? enc_track->song_name : "Unknown",
+                 (*(enc_track->song_artist)) ? enc_track->song_artist :
+                   (*(enc_track->disc_artist)) ? enc_track->disc_artist : "Unknown",
+                 (*(enc_track->disc_name)) ? enc_track->disc_name : "Unknown",
+                 year,
+                 comment->str,
+                 enc_track->id3_genre,
+                 enc_track->track_num + 1,
+                 ginfo->id3v2_encoding);
   }
 #endif
   if(ginfo->doid3) {
-    ID3v1TagFile(file,(*(enc_track->song_name))?enc_track->song_name:"Unknown",
-		 (*(enc_track->song_artist))?enc_track->song_artist:
-		 (*(enc_track->disc_artist))?enc_track->disc_artist:"Unknown",
-		 (*(enc_track->disc_name))?enc_track->disc_name:"Unknown",
-		 year,comment->str,enc_track->id3_genre,
-		 enc_track->track_num+1,ginfo->id3_encoding);
+    ID3v1TagFile(file,
+                 (*(enc_track->song_name)) ? enc_track->song_name : "Unknown",
+                 (*(enc_track->song_artist)) ? enc_track->song_artist :
+                   (*(enc_track->disc_artist)) ? enc_track->disc_artist : "Unknown",
+                 (*(enc_track->disc_name)) ? enc_track->disc_name : "Unknown",
+                 year,
+                 comment->str,
+                 enc_track->id3_genre,
+                 enc_track->track_num + 1,
+                 ginfo->id3_encoding);
   }
 
-  g_string_free(comment,TRUE);
+  g_string_free(comment, TRUE);
 }
 
 static void DoWavFilter(GripInfo *ginfo)
 {
   EncodeTrack enc_track;
 
-  FillInTrackInfo(ginfo,ginfo->rip_track,&enc_track);
-  strcpy(enc_track.wav_filename,ginfo->ripfile);
+  FillInTrackInfo(ginfo, ginfo->rip_track, &enc_track);
+  strcpy(enc_track.wav_filename, ginfo->ripfile);
 
-  TranslateAndLaunch(ginfo->wav_filter_cmd,TranslateSwitch,&enc_track,
-		     FALSE,&(ginfo->sprefs),CloseStuff,(void *)ginfo);
+  TranslateAndLaunch(ginfo->wav_filter_cmd, TranslateSwitch, &enc_track,
+                     FALSE, &(ginfo->sprefs));
 }
 
 static void DoDiscFilter(GripInfo *ginfo)
 {
   EncodeTrack enc_track;
 
-  FillInTrackInfo(ginfo,ginfo->rip_track,&enc_track);
-  strcpy(enc_track.wav_filename,ginfo->ripfile);
+  FillInTrackInfo(ginfo, ginfo->rip_track, &enc_track);
+  strcpy(enc_track.wav_filename, ginfo->ripfile);
 
-  TranslateAndLaunch(ginfo->disc_filter_cmd,TranslateSwitch,&enc_track,
-		     FALSE,&(ginfo->sprefs),CloseStuff,(void *)ginfo);
+  TranslateAndLaunch(ginfo->disc_filter_cmd, TranslateSwitch, &enc_track,
+                     FALSE, &(ginfo->sprefs));
 }
 
 void UpdateRipProgress(GripInfo *ginfo)
@@ -841,325 +842,333 @@
   GripGUI *uinfo;
   struct stat mystat;
   int quarter;
-  gfloat percent=0;
+  gfloat percent = 0;
   int mycpu;
   char buf[PATH_MAX];
   time_t now;
-  gfloat elapsed=0;
+  gfloat elapsed = 0;
   gfloat speed;
-  gboolean result=FALSE;
+  gboolean result = FALSE;
   char *conv_str;
-  gsize rb,wb;
-  
-  uinfo=&(ginfo->gui_info);
+  gsize rb, wb;
+
+  uinfo = &(ginfo->gui_info);
 
   if(ginfo->ripping) {
-    if(stat(ginfo->ripfile,&mystat)>=0) {
-      percent=(gfloat)mystat.st_size/(gfloat)ginfo->ripsize;
-      if(percent>1.0) percent=1.0;
+    if(stat(ginfo->ripfile, &mystat) >= 0) {
+      percent = (gfloat)mystat.st_size / (gfloat)ginfo->ripsize;
+      if(percent>1.0)
+        percent = 1.0;
     }
     else {
-      percent=0;
+      percent = 0;
     }
-   
-   	ginfo->rip_percent = percent;
-   
-    gtk_progress_bar_update(GTK_PROGRESS_BAR(uinfo->ripprogbar),percent);
+
+    ginfo->rip_percent = percent;
+
+    gtk_progress_bar_update(GTK_PROGRESS_BAR(uinfo->ripprogbar), percent);
 
     now = time(NULL);
     elapsed = (gfloat)(now - ginfo->rip_started);
 
     /* 1x is 44100*2*2 = 176400 bytes/sec */
     if(elapsed < 0.1f) /* 1/10 sec. */
-      speed=0.0f; /* Avoid divide-by-0 at start */ 
+      speed = 0.0f; /* Avoid divide-by-0 at start */
     else
-      speed=(gfloat)(mystat.st_size)/(176400.0f*elapsed);
-    
+      speed = (gfloat)(mystat.st_size) / (176400.0f*elapsed);
+
     /* startup */
     if(speed >= 50.0f) {
       speed = 0.0f;
       ginfo->rip_started = now;
     }
-    
-    sprintf(buf,_("Rip: Trk %d (%3.1fx)"),ginfo->rip_track+1,speed);
-	
-    gtk_label_set(GTK_LABEL(uinfo->rip_prog_label),buf);
-
-    quarter=(int)(percent*4.0);
-	
-    if(quarter<4)
+
+    sprintf(buf, _("Rip: Trk %d (%3.1fx)"), ginfo->rip_track + 1, speed);
+
+    gtk_label_set(GTK_LABEL(uinfo->rip_prog_label), buf);
+
+    quarter=(int)(percent * 4.0);
+
+    if(quarter < 4)
       CopyPixmap(GTK_PIXMAP(uinfo->rip_pix[quarter]),
-		 GTK_PIXMAP(uinfo->rip_indicator));
+                 GTK_PIXMAP(uinfo->rip_indicator));
 
 #ifdef CDPAR
     if(ginfo->using_builtin_cdp) {
       if(uinfo->minimized)
-	CopyPixmap(GTK_PIXMAP(uinfo->smile_pix[ginfo->rip_smile_level]),
-		   GTK_PIXMAP(uinfo->lcd_smile_indicator));
+        CopyPixmap(GTK_PIXMAP(uinfo->smile_pix[ginfo->rip_smile_level]),
+                   GTK_PIXMAP(uinfo->lcd_smile_indicator));
       else
-	CopyPixmap(GTK_PIXMAP(uinfo->smile_pix[ginfo->rip_smile_level]),
-		   GTK_PIXMAP(uinfo->smile_indicator));
+        CopyPixmap(GTK_PIXMAP(uinfo->smile_pix[ginfo->rip_smile_level]),
+                   GTK_PIXMAP(uinfo->smile_indicator));
     }
 #endif
-    
+
     /* Overall rip */
-    if(ginfo->rip_started!=now && !ginfo->rip_partial && ginfo->ripping 
+    if(ginfo->rip_started != now && !ginfo->rip_partial && ginfo->ripping
        && !ginfo->stop_rip) {
-      ginfo->all_ripdone+=mystat.st_size-ginfo->all_riplast;
-      ginfo->all_riplast=mystat.st_size;
-      percent=(gfloat)(ginfo->all_ripdone)/(gfloat)(ginfo->all_ripsize);
-      
-      if(percent>1.0)
-	percent=0.0;
-      
+      ginfo->all_ripdone += mystat.st_size-ginfo->all_riplast;
+      ginfo->all_riplast = mystat.st_size;
+      percent = (gfloat)(ginfo->all_ripdone) / (gfloat)(ginfo->all_ripsize);
+
+      if(percent > 1.0)
+        percent = 0.0;
+
       ginfo->rip_tot_percent = percent;
-      
-      sprintf(buf,_("Rip: %6.2f%%"),percent*100.0);
-      gtk_label_set(GTK_LABEL(uinfo->all_rip_label),buf);
-      gtk_progress_bar_update(GTK_PROGRESS_BAR(uinfo->all_ripprogbar),percent);
+
+      sprintf(buf, _("Rip: %6.2f%%"), percent * 100.0);
+      gtk_label_set(GTK_LABEL(uinfo->all_rip_label), buf);
+      gtk_progress_bar_update(GTK_PROGRESS_BAR(uinfo->all_ripprogbar), percent);
     } else if (ginfo->stop_rip) {
-      gtk_label_set(GTK_LABEL(uinfo->all_rip_label),_("Rip: Idle"));
-	 
-      gtk_progress_bar_update(GTK_PROGRESS_BAR(uinfo->all_ripprogbar),0.0);
+      gtk_label_set(GTK_LABEL(uinfo->all_rip_label), _("Rip: Idle"));
+
+      gtk_progress_bar_update(GTK_PROGRESS_BAR(uinfo->all_ripprogbar), 0.0);
     }
 
     /* Check if a rip finished */
-    if((ginfo->using_builtin_cdp&&!ginfo->in_rip_thread) ||
-       (!ginfo->using_builtin_cdp&&waitpid(ginfo->rippid,NULL,WNOHANG))) {
-      if(!ginfo->using_builtin_cdp) waitpid(ginfo->rippid,NULL,0);
-      else {
-	CopyPixmap(GTK_PIXMAP(uinfo->empty_image),
-		   GTK_PIXMAP(uinfo->lcd_smile_indicator));
-	CopyPixmap(GTK_PIXMAP(uinfo->empty_image),
-		   GTK_PIXMAP(uinfo->smile_indicator));
+    if((ginfo->using_builtin_cdp && !ginfo->in_rip_thread) ||
+       (!ginfo->using_builtin_cdp && waitpid(ginfo->rippid, NULL, WNOHANG)))
+    {
+      if(!ginfo->using_builtin_cdp) {
+        waitpid(ginfo->rippid, NULL, 0);
+      } else {
+        CopyPixmap(GTK_PIXMAP(uinfo->empty_image),
+                   GTK_PIXMAP(uinfo->lcd_smile_indicator));
+        CopyPixmap(GTK_PIXMAP(uinfo->empty_image),
+                   GTK_PIXMAP(uinfo->smile_indicator));
       }
 
-      LogStatus(ginfo,_("Rip finished\n"));
-      ginfo->all_riplast=0;
-      ginfo->ripping=FALSE;
-      SetChecked(uinfo,ginfo->rip_track,FALSE);
+      ginfo->all_riplast = 0;
+      ginfo->ripping = FALSE;
+      SetChecked(uinfo, ginfo->rip_track, FALSE);
 
 #ifdef CDPAR
       /* Get the title gain */
       if(ginfo->using_builtin_cdp && ginfo->calc_gain) {
-	ginfo->track_gain_adjustment=GetTitleGain();
+        ginfo->track_gain_adjustment = GetTitleGain();
       }
 #endif
 
       /* Do filtering of .wav file */
 
-      if(*ginfo->wav_filter_cmd) DoWavFilter(ginfo);
+      if(*ginfo->wav_filter_cmd)
+        DoWavFilter(ginfo);
 
-      gtk_progress_bar_update(GTK_PROGRESS_BAR(uinfo->ripprogbar),0.0);
+      gtk_progress_bar_update(GTK_PROGRESS_BAR(uinfo->ripprogbar), 0.0);
       CopyPixmap(GTK_PIXMAP(uinfo->empty_image),
-		 GTK_PIXMAP(uinfo->rip_indicator));
+                 GTK_PIXMAP(uinfo->rip_indicator));
 
       if(!ginfo->stop_rip) {
-	if(ginfo->doencode) {
-	  AddToEncode(ginfo,ginfo->rip_track);
-	  MP3Encode(ginfo);
-	}
-
-	Debug(_("Rip partial %d  num wavs %d\n"),ginfo->rip_partial,
-	      ginfo->num_wavs);
-
-	Debug(_("Next track is %d, total is %d\n"),
-	      NextTrackToRip(ginfo),ginfo->disc.num_tracks);
-
-	if(!ginfo->rip_partial&&
-	   (ginfo->num_wavs<ginfo->max_wavs||
-	    NextTrackToRip(ginfo)==ginfo->disc.num_tracks)) {
-	  Debug(_("Check if we need to rip another track\n"));
-	  if(!RipNextTrack(ginfo)) RipIsFinished(ginfo,FALSE);
-	  else { gtk_label_set(GTK_LABEL(uinfo->rip_prog_label),_("Rip: Idle"));  }
-	}
-	else { gtk_label_set(GTK_LABEL(uinfo->rip_prog_label),_("Rip: Idle"));  }
+        if(ginfo->doencode) {
+          AddToEncode(ginfo, ginfo->rip_track);
+          MP3Encode(ginfo);
+        }
+
+        Debug(_("Rip partial %d  num wavs %d\n"), ginfo->rip_partial,
+              ginfo->num_wavs);
+
+        Debug(_("Next track is %d, total is %d\n"),
+              NextTrackToRip(ginfo), ginfo->disc.num_tracks);
+
+        if(!ginfo->rip_partial&&
+           (ginfo->num_wavs < ginfo->max_wavs||
+            NextTrackToRip(ginfo) == ginfo->disc.num_tracks)) {
+          Debug(_("Check if we need to rip another track\n"));
+          if(!RipNextTrack(ginfo))
+            RipIsFinished(ginfo, FALSE);
+          else {
+            gtk_label_set(GTK_LABEL(uinfo->rip_prog_label), _("Rip: Idle"));
+          }
+        }
+        else {
+          gtk_label_set(GTK_LABEL(uinfo->rip_prog_label), _("Rip: Idle"));
+        }
       }
       else {
-	RipIsFinished(ginfo,TRUE);
+        RipIsFinished(ginfo, TRUE);
       }
     }
   }
   else {
     if(ginfo->stop_rip) {
-      RipIsFinished(ginfo,TRUE);
+      RipIsFinished(ginfo, TRUE);
     }
   }
-  
+
   /* Check if an encode finished */
-  for(mycpu=0;mycpu<ginfo->num_cpu;mycpu++){
-    if(ginfo->encoding&(1<<mycpu)) {
-      if(stat(ginfo->mp3file[mycpu],&mystat)>=0) {
-        percent=(gfloat)mystat.st_size/(gfloat)ginfo->mp3size[mycpu];
-        if(percent>1.0) percent=1.0;
+  for(mycpu=0;mycpu < ginfo->num_cpu;mycpu++){
+    if(ginfo->encoding & (1<<mycpu)) {
+      if(stat(ginfo->mp3file[mycpu], &mystat)>=0) {
+        percent = (gfloat)mystat.st_size / (gfloat)ginfo->mp3size[mycpu];
+        if(percent > 1.0)
+          percent = 1.0;
       }
       else {
-        percent=0;
-      } 
+        percent = 0;
+      }
+
+      ginfo->enc_percent = percent;
 
-	  ginfo->enc_percent = percent;
-	
       gtk_progress_bar_update(GTK_PROGRESS_BAR(uinfo->mp3progbar[mycpu]),
-			      percent);
-       
+                              percent);
+
       now = time(NULL);
       elapsed = (gfloat)(now - ginfo->mp3_started[mycpu]);
 
       if(elapsed < 0.1f) /* 1/10 sec. */
-	speed=0.0f;
+        speed = 0.0f;
       else
-	speed=(gfloat)mystat.st_size/
-	  ((gfloat)ginfo->kbits_per_sec * 128.0f * elapsed);
-      
-      sprintf(buf,_("Enc: Trk %d (%3.1fx)"),
-	      ginfo->mp3_enc_track[mycpu]+1,speed);
-	  
-      gtk_label_set(GTK_LABEL(uinfo->mp3_prog_label[mycpu]),buf);
- 
-      quarter=(int)(percent*4.0);
- 
-      if(quarter<4)
+        speed = (gfloat)mystat.st_size /
+          ((gfloat)ginfo->kbits_per_sec * 128.0f * elapsed);
+
+      sprintf(buf, _("Enc: Trk %d (%3.1fx)"),
+              ginfo->mp3_enc_track[mycpu] + 1, speed);
+
+      gtk_label_set(GTK_LABEL(uinfo->mp3_prog_label[mycpu]), buf);
+
+      quarter = (int)(percent * 4.0);
+
+      if(quarter < 4)
         CopyPixmap(GTK_PIXMAP(uinfo->mp3_pix[quarter]),
-		   GTK_PIXMAP(uinfo->mp3_indicator[mycpu]));
-      if (!ginfo->rip_partial && !ginfo->stop_encode && 
-	  now!=ginfo->mp3_started[mycpu]) {
-	ginfo->all_encdone+=mystat.st_size-ginfo->all_enclast[mycpu];
-	ginfo->all_enclast[mycpu]=mystat.st_size;
-	percent=(gfloat)(ginfo->all_encdone)/(gfloat)(ginfo->all_encsize);
-	if (percent>1.0)
-	  percent=1.0;
-	ginfo->enc_tot_percent = percent;
-	sprintf(buf,_("Enc: %6.2f%%"),percent*100.0);
-	gtk_label_set(GTK_LABEL(uinfo->all_enc_label),buf);
-	gtk_progress_bar_update(GTK_PROGRESS_BAR(uinfo->all_encprogbar),
-				percent);
+                   GTK_PIXMAP(uinfo->mp3_indicator[mycpu]));
+      if (!ginfo->rip_partial && !ginfo->stop_encode &&
+          now != ginfo->mp3_started[mycpu]) {
+        ginfo->all_encdone += mystat.st_size-ginfo->all_enclast[mycpu];
+        ginfo->all_enclast[mycpu] = mystat.st_size;
+        percent = (gfloat)(ginfo->all_encdone) / (gfloat)(ginfo->all_encsize);
+        if (percent > 1.0)
+          percent = 1.0;
+        ginfo->enc_tot_percent = percent;
+        sprintf(buf, _("Enc: %6.2f%%"), percent * 100.0);
+        gtk_label_set(GTK_LABEL(uinfo->all_enc_label), buf);
+        gtk_progress_bar_update(GTK_PROGRESS_BAR(uinfo->all_encprogbar),
+                                percent);
       }
-      
-      if(waitpid(ginfo->mp3pid[mycpu],NULL,WNOHANG)) {
-        waitpid(ginfo->mp3pid[mycpu],NULL,0);
-        ginfo->encoding&=~(1<<mycpu);
-
-	LogStatus(ginfo,_("Finished encoding on cpu %d\n"),mycpu);
-	ginfo->all_enclast[mycpu]=0;
-        gtk_progress_bar_update(GTK_PROGRESS_BAR(uinfo->mp3progbar[mycpu]),
-				0.0);
+
+      if(waitpid(ginfo->mp3pid[mycpu], NULL, WNOHANG)) {
+        waitpid(ginfo->mp3pid[mycpu], NULL, 0);
+        ginfo->encoding &= ~(1<<mycpu);
+
+        ginfo->all_enclast[mycpu] = 0;
+        gtk_progress_bar_update(GTK_PROGRESS_BAR(uinfo->mp3progbar[mycpu]), 0.0);
         CopyPixmap(GTK_PIXMAP(uinfo->empty_image),
-		   GTK_PIXMAP(uinfo->mp3_indicator[mycpu]));
+                   GTK_PIXMAP(uinfo->mp3_indicator[mycpu]));
 
-        if(ginfo->doencode) ginfo->num_wavs--;
+        if(ginfo->doencode)
+          ginfo->num_wavs--;
 
         if(!ginfo->stop_encode) {
-	  if(ginfo->delete_wavs) {
-            conv_str=g_filename_to_utf8(ginfo->rip_delete_file[mycpu],
-                                        strlen(ginfo->rip_delete_file[mycpu]),
-                                        &rb,&wb,NULL);
+          if(ginfo->delete_wavs) {
+            conv_str = g_filename_to_utf8(ginfo->rip_delete_file[mycpu],
+                                          strlen(ginfo->rip_delete_file[mycpu]),
+                                          &rb, &wb, NULL);
 
             if(!conv_str)
-              conv_str=g_strdup(ginfo->rip_delete_file[mycpu]);
-
-	    LogStatus(ginfo,_("Deleting [%s]\n"),conv_str,&rb,&wb,NULL);
+              conv_str = g_strdup(ginfo->rip_delete_file[mycpu]);
 
             g_free(conv_str);
 
-	    unlink(ginfo->rip_delete_file[mycpu]);
-	  }
+            unlink(ginfo->rip_delete_file[mycpu]);
+          }
 
           if(ginfo->doid3 || ginfo->doid3v2)
-	    ID3Add(ginfo,ginfo->mp3file[mycpu],
-		   ginfo->encoded_track[mycpu]);
-
-	  if(ginfo->add_to_db) AddSQLEntry(ginfo,ginfo->encoded_track[mycpu]);
+            ID3Add(ginfo, ginfo->mp3file[mycpu],
+                   ginfo->encoded_track[mycpu]);
+
+          if(ginfo->add_to_db)
+            AddSQLEntry(ginfo, ginfo->encoded_track[mycpu]);
+
+          if(*ginfo->mp3_filter_cmd)
+            TranslateAndLaunch(ginfo->mp3_filter_cmd, TranslateSwitch,
+                               ginfo->encoded_track[mycpu], FALSE,
+                               &(ginfo->sprefs));
+
+          if(ginfo->ripping_a_disc && !ginfo->rip_partial&&
+             !ginfo->ripping && ginfo->num_wavs < ginfo->max_wavs) {
+            if(RipNextTrack(ginfo))
+              ginfo->doencode = TRUE;
+            else
+              RipIsFinished(ginfo, FALSE);
+          }
 
-	  if(*ginfo->mp3_filter_cmd)
-	    TranslateAndLaunch(ginfo->mp3_filter_cmd,TranslateSwitch,
-			       ginfo->encoded_track[mycpu],FALSE,
-			       &(ginfo->sprefs),CloseStuff,(void *)ginfo);
+          /* Check if last encode finished */
+          if(*ginfo->execute_after_encode_cmd && !ginfo->rip_partial&&
+             !ginfo->ripping&&!ginfo->encode_list)
+            TranslateAndLaunch(ginfo->execute_after_encode_cmd, TranslateSwitch,
+                               ginfo->encoded_track[mycpu], FALSE,
+                               &(ginfo->sprefs));
 
+          g_free(ginfo->encoded_track[mycpu]);
 
-          if(ginfo->ripping_a_disc&&!ginfo->rip_partial&&
-	     !ginfo->ripping&&ginfo->num_wavs<ginfo->max_wavs) {
-	    if(RipNextTrack(ginfo)) ginfo->doencode=TRUE;
-	    else RipIsFinished(ginfo,FALSE);
+          if(!ginfo->rip_partial&&ginfo->encode_list) {
+            MP3Encode(ginfo);
           }
-
-	  /* Check if last encode finished */
-	  if(*ginfo->execute_after_encode_cmd&&!ginfo->rip_partial&&
-	     !ginfo->ripping&&!ginfo->encode_list)
-	    TranslateAndLaunch(ginfo->execute_after_encode_cmd,TranslateSwitch,
-			       ginfo->encoded_track[mycpu],FALSE,
-			       &(ginfo->sprefs),CloseStuff,(void *)ginfo);
-
-	  g_free(ginfo->encoded_track[mycpu]);
-         
-	  if(!ginfo->rip_partial&&ginfo->encode_list) {
-	    MP3Encode(ginfo);
-	  }
         }
-	else ginfo->stop_encode=FALSE;
+        else ginfo->stop_encode = FALSE;
 
-        if(!(ginfo->encoding&(1<<mycpu))) {
-	  gtk_label_set(GTK_LABEL(uinfo->mp3_prog_label[mycpu]),
-			_("Enc: Idle"));
- 	    }
+        if(!(ginfo->encoding & (1<<mycpu))) {
+          gtk_label_set(GTK_LABEL(uinfo->mp3_prog_label[mycpu]),
+                        _("Enc: Idle"));
+        }
       }
-    }  
+    }
   }
   /* Check if we have any encoding process (now or in future) */
-  for (mycpu=0;mycpu<ginfo->num_cpu;++mycpu) {
+  for (mycpu=0;mycpu < ginfo->num_cpu;++mycpu) {
     if (ginfo->encoding & (1<<mycpu)) {
-      result=TRUE;
+      result = TRUE;
       break;
     }
   }
-  if ((!result || ginfo->stop_encode) && 
+  if ((!result || ginfo->stop_encode) &&
       !ginfo->encode_list && !ginfo->ripping) {
-    gtk_label_set(GTK_LABEL(uinfo->all_enc_label),_("Enc: Idle"));
-    gtk_progress_bar_update(GTK_PROGRESS_BAR(uinfo->all_encprogbar),0.0);
+    gtk_label_set(GTK_LABEL(uinfo->all_enc_label), _("Enc: Idle"));
+    gtk_progress_bar_update(GTK_PROGRESS_BAR(uinfo->all_encprogbar), 0.0);
   }
 }
 
-static void RipIsFinished(GripInfo *ginfo,gboolean aborted)
+static void RipIsFinished(GripInfo *ginfo, gboolean aborted)
 {
   GripGUI *uinfo;
-  LogStatus(ginfo,_("Ripping is finished\n"));
 
-  uinfo=&(ginfo->gui_info);
-  ginfo->all_ripsize=0;
-  ginfo->all_ripdone=0;
-  ginfo->all_riplast=0;
+  uinfo = &(ginfo->gui_info);
+  ginfo->all_ripsize = 0;
+  ginfo->all_ripdone = 0;
+  ginfo->all_riplast = 0;
 
-  gtk_label_set(GTK_LABEL(uinfo->rip_prog_label),_("Rip: Idle"));
-  gtk_label_set(GTK_LABEL(uinfo->all_rip_label),_("Rip: Idle"));
-  gtk_progress_bar_update(GTK_PROGRESS_BAR(uinfo->all_ripprogbar),0.0);
+  gtk_label_set(GTK_LABEL(uinfo->rip_prog_label), _("Rip: Idle"));
+  gtk_label_set(GTK_LABEL(uinfo->all_rip_label), _("Rip: Idle"));
+  gtk_progress_bar_update(GTK_PROGRESS_BAR(uinfo->all_ripprogbar), 0.0);
 
-  ginfo->stop_rip=FALSE;
-  ginfo->ripping=FALSE;
-  ginfo->ripping_a_disc=FALSE;
-  ginfo->rip_finished=time(NULL);
+  ginfo->stop_rip = FALSE;
+  ginfo->ripping = FALSE;
+  ginfo->ripping_a_disc = FALSE;
+  ginfo->rip_finished = time(NULL);
 
   /* Re-open the cdrom device if it was closed */
-  if(ginfo->disc.cd_desc<0) CDInitDevice(ginfo->disc.devname,&(ginfo->disc));
+  if(ginfo->disc.cd_desc<0)
+    CDInitDevice(ginfo->disc.devname, &(ginfo->disc));
 
   /* Do post-rip stuff only if we weren't explicitly aborted */
   if(!aborted) {
-    if(ginfo->beep_after_rip) printf("%c%c",7,7);
-  
+    if(ginfo->beep_after_rip)
+      printf("%c%c", 7, 7);
+
 #ifdef CDPAR
     if(ginfo->using_builtin_cdp && ginfo->calc_gain) {
       GList *plist;
 
-      ginfo->disc_gain_adjustment=GetAlbumGain();
+      ginfo->disc_gain_adjustment = GetAlbumGain();
 
       /* Apply disc gain to all tracks on pending list */
       for(plist = g_list_first(ginfo->pending_list); plist != NULL;
                                plist = g_list_next(plist)) {
-        EncodeTrack *enc_track = (EncodeTrack *) plist->data;
+        EncodeTrack *enc_track = (EncodeTrack *)plist->data;
         enc_track->disc_gain_adjustment = ginfo->disc_gain_adjustment;
       }
-
     }
 #endif
-  
+
     if(*ginfo->disc_filter_cmd)
       DoDiscFilter(ginfo);
 
@@ -1167,132 +1176,138 @@
       ginfo->encode_list = g_list_concat(ginfo->encode_list,
                                          ginfo->pending_list);
       ginfo->pending_list = NULL;
-      
+
       /* Start an encoder on all free CPUs
        * This is really only useful the first time through */
       while (MP3Encode(ginfo));
     }
-    
+
     if(ginfo->eject_after_rip) {
       /* Reset rip_finished since we're ejecting */
-      ginfo->rip_finished=0;
+      ginfo->rip_finished = 0;
+
+      EjectDisc(NULL, ginfo);
 
-      EjectDisc(NULL,ginfo);
-      
-      if(ginfo->eject_delay) ginfo->auto_eject_countdown=ginfo->eject_delay;
+      if(ginfo->eject_delay)
+        ginfo->auto_eject_countdown = ginfo->eject_delay;
     }
   }
 }
 
-char *TranslateSwitch(char switch_char,void *data,gboolean *munge)
+char *TranslateSwitch(char switch_char, void *data, gboolean *munge)
 {
   static char res[PATH_MAX];
   EncodeTrack *enc_track;
 
-  enc_track=(EncodeTrack *)data;
+  enc_track = (EncodeTrack *)data;
 
   switch(switch_char) {
   case 'b':
-    g_snprintf(res,PATH_MAX,"%d",enc_track->ginfo->kbits_per_sec);
-    *munge=FALSE;
+    g_snprintf(res, PATH_MAX, "%d", enc_track->ginfo->kbits_per_sec);
+    *munge = FALSE;
     break;
   case 'c':
-    g_snprintf(res,PATH_MAX,"%s",enc_track->ginfo->cd_device);
-    *munge=FALSE;
+    g_snprintf(res, PATH_MAX, "%s", enc_track->ginfo->cd_device);
+    *munge = FALSE;
     break;
   case 'C':
     if(*enc_track->ginfo->force_scsi) {
-      g_snprintf(res,PATH_MAX,"%s",enc_track->ginfo->force_scsi);
+      g_snprintf(res, PATH_MAX, "%s", enc_track->ginfo->force_scsi);
     }
     else {
-      g_snprintf(res,PATH_MAX,"%s",enc_track->ginfo->cd_device);
+      g_snprintf(res, PATH_MAX, "%s", enc_track->ginfo->cd_device);
     }
-    *munge=FALSE;
+    *munge = FALSE;
     break;
   case 'w':
-    g_snprintf(res,PATH_MAX,"%s",enc_track->wav_filename);
-    *munge=FALSE;
+    g_snprintf(res, PATH_MAX, "%s", enc_track->wav_filename);
+    *munge = FALSE;
     break;
   case 'm':
-    g_snprintf(res,PATH_MAX,"%s",enc_track->mp3_filename);
-    *munge=FALSE;
+    g_snprintf(res, PATH_MAX, "%s", enc_track->mp3_filename);
+    *munge = FALSE;
     break;
   case 't':
-    g_snprintf(res,PATH_MAX,"%02d",enc_track->track_num+1);
-    *munge=FALSE;
+    g_snprintf(res, PATH_MAX, "%02d", enc_track->track_num + 1);
+    *munge = FALSE;
     break;
   case 'N':
-    g_snprintf(res,PATH_MAX,"%02d",enc_track->ginfo->prog_totaltracks);
-    *munge=FALSE;
+    g_snprintf(res, PATH_MAX, "%02d", enc_track->ginfo->prog_totaltracks);
+    *munge = FALSE;
     break;
   case 's':
-    g_snprintf(res,PATH_MAX,"%d",enc_track->ginfo->start_sector);
-    *munge=FALSE;
+    g_snprintf(res, PATH_MAX, "%d", enc_track->ginfo->start_sector);
+    *munge = FALSE;
     break;
   case 'e':
-    g_snprintf(res,PATH_MAX,"%d",enc_track->ginfo->end_sector);
-    *munge=FALSE;
+    g_snprintf(res, PATH_MAX, "%d", enc_track->ginfo->end_sector);
+    *munge = FALSE;
     break;
   case 'n':
     if(*(enc_track->song_name))
-      g_snprintf(res,PATH_MAX,"%s",enc_track->song_name);
-    else g_snprintf(res,PATH_MAX,"Track%02d",enc_track->track_num+1);
+      g_snprintf(res, PATH_MAX, "%s", enc_track->song_name);
+    else
+      g_snprintf(res, PATH_MAX, "Track%02d", enc_track->track_num + 1);
     break;
   case 'a':
     if(*(enc_track->song_artist))
-      g_snprintf(res,PATH_MAX,"%s",enc_track->song_artist);
+      g_snprintf(res, PATH_MAX, "%s", enc_track->song_artist);
     else {
       if(*(enc_track->disc_artist))
-	g_snprintf(res,PATH_MAX,"%s",enc_track->disc_artist);
-      else strncpy(res,_("NoArtist"),PATH_MAX - 1);
+        g_snprintf(res, PATH_MAX, "%s", enc_track->disc_artist);
+      else
+        strncpy(res, _("NoArtist"), PATH_MAX - 1);
     }
     break;
   case 'A':
     if(*(enc_track->disc_artist))
-      g_snprintf(res,PATH_MAX,"%s",enc_track->disc_artist);
-    else strncpy(res,_("NoArtist"),PATH_MAX - 1);
+      g_snprintf(res, PATH_MAX, "%s", enc_track->disc_artist);
+    else
+      strncpy(res, _("NoArtist"), PATH_MAX - 1);
     break;
   case 'd':
     if(*(enc_track->disc_name))
-      g_snprintf(res,PATH_MAX,"%s",enc_track->disc_name);
-    else strncpy(res,_("NoTitle"),PATH_MAX - 1);
+      g_snprintf(res, PATH_MAX, "%s", enc_track->disc_name);
+    else
+      strncpy(res, _("NoTitle"), PATH_MAX - 1);
     break;
   case 'i':
-    g_snprintf(res,PATH_MAX,"%08x",enc_track->discid);
-    *munge=FALSE;
+    g_snprintf(res, PATH_MAX, "%08x", enc_track->discid);
+    *munge = FALSE;
     break;
   case 'y':
-    g_snprintf(res,PATH_MAX,"%d",enc_track->song_year);
-    *munge=FALSE;
+    g_snprintf(res, PATH_MAX, "%d", enc_track->song_year);
+    *munge = FALSE;
     break;
   case 'g':
-    g_snprintf(res,PATH_MAX,"%d",enc_track->id3_genre);
-    *munge=FALSE;
+    g_snprintf(res, PATH_MAX, "%d", enc_track->id3_genre);
+    *munge = FALSE;
     break;
   case 'G':
-    g_snprintf(res,PATH_MAX,"%s",ID3GenreString(enc_track->id3_genre));
+    g_snprintf(res, PATH_MAX, "%s", ID3GenreString(enc_track->id3_genre));
     break;
 #ifdef CDPAR
   case 'r':
-    g_snprintf(res,PATH_MAX,"%+6.2f",enc_track->track_gain_adjustment);
-    *munge=FALSE;
+    g_snprintf(res, PATH_MAX, "%+6.2f", enc_track->track_gain_adjustment);
+    *munge = FALSE;
     break;
   case 'R':
-    g_snprintf(res,PATH_MAX,"%+6.2f",enc_track->disc_gain_adjustment);
-    *munge=FALSE;
+    g_snprintf(res, PATH_MAX, "%+6.2f", enc_track->disc_gain_adjustment);
+    *munge = FALSE;
     break;
 #endif
   case 'x':
-    g_snprintf(res,PATH_MAX,"%s",enc_track->ginfo->mp3extension);
-    *munge=FALSE;
+    g_snprintf(res, PATH_MAX, "%s", enc_track->ginfo->mp3extension);
+    *munge = FALSE;
+    break;
+  case 'I':
+    if(*(enc_track->disc_artist))
+      g_snprintf(res, 2, "%s", enc_track->disc_artist);
+    else
+      strncpy(res, _("NoArtist"), 2);
     break;
-	case 'I':
-		if(*(enc_track->disc_artist))
-			g_snprintf(res,2,"%s",enc_track->disc_artist);
-		else strncpy(res,_("NoArtist"),2);        
-		break;
   default:
-    *res='\0';
+    *res = '\0';
     break;
   }
 
@@ -1302,159 +1317,163 @@
 
 static void CheckDupNames(GripInfo *ginfo)
 {
-  int track,track2;
+  int track, track2;
   int numdups[MAX_TRACKS];
   int count;
   char buf[256];
 
-  for(track=0;track<ginfo->disc.num_tracks;track++)
-    numdups[track]=0;
+  for(track=0;track < ginfo->disc.num_tracks;track++)
+    numdups[track] = 0;
 
-  for(track=0;track<(ginfo->disc.num_tracks-1);track++) {
+  for(track=0;track < (ginfo->disc.num_tracks - 1);track++) {
     if(!numdups[track]) {
-      count=0;
+      count = 0;
 
-      for(track2=track+1;track2<ginfo->disc.num_tracks;track2++) {
-	if(!strcmp(ginfo->ddata.data_track[track].track_name,
-		   ginfo->ddata.data_track[track2].track_name))
-	  numdups[track2]=++count;
+      for(track2=track+1;track2 < ginfo->disc.num_tracks;track2++) {
+        if(!strcmp(ginfo->ddata.data_track[track].track_name,
+                   ginfo->ddata.data_track[track2].track_name))
+          numdups[track2] = ++count;
       }
     }
   }
 
-  for(track=0;track<ginfo->disc.num_tracks;track++) {
+  for(track=0;track < ginfo->disc.num_tracks;track++) {
     if(numdups[track]) {
-      g_snprintf(buf,260,"%s (%d)",ginfo->ddata.data_track[track].track_name,
-		 numdups[track]+1);
+      g_snprintf(buf, 260, "%s (%d)", ginfo->ddata.data_track[track].track_name,
+                 numdups[track] + 1);
 
-      strcpy(ginfo->ddata.data_track[track].track_name,buf);
+      strcpy(ginfo->ddata.data_track[track].track_name, buf);
     }
   }
 }
 
-void DoRipEncode(GtkWidget *widget,gpointer data)
+void DoRipEncode(GtkWidget *widget, gpointer data)
 {
   GripInfo *ginfo;
 
-  ginfo=(GripInfo *)data;
+  ginfo = (GripInfo *)data;
 
-  DoRip(NULL,(gpointer)ginfo);
+  DoRip(NULL, (gpointer)ginfo);
 }
 
-void DoRip(GtkWidget *widget,gpointer data)
+void DoRip(GtkWidget *widget, gpointer data)
 {
   GripInfo *ginfo;
   gboolean result;
   char buf[sizeof(ginfo->ripexename) > sizeof(ginfo->mp3exename) ? sizeof(ginfo->ripexename) : sizeof(ginfo->mp3exename)];
 
-  ginfo=(GripInfo *)data;
+  ginfo = (GripInfo *)data;
 
   if(!ginfo->have_disc) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("No disc was detected in the drive. If you have a disc in your drive, please check your CDRom device setting under Config->CD."));
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("No disc was detected in the drive. If you have a disc in your drive, please check your CDRom device setting under Config->CD."));
     return;
   }
 
-  if(widget) ginfo->doencode=FALSE;
-  else ginfo->doencode=TRUE;
+  if(widget)
+    ginfo->doencode = FALSE;
+  else
+    ginfo->doencode = TRUE;
 
   /* Let's find the ripper in the path; this changes the config */
   FindExeInPath(ginfo->ripexename, buf, sizeof(buf));
   strncpy(ginfo->ripexename, buf, sizeof(ginfo->ripexename));
 
-  if(!ginfo->using_builtin_cdp&&!FileExists(ginfo->ripexename)) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("Invalid rip executable.\nCheck your rip config, and ensure it specifies the full path to the ripper executable."));
+  if (!ginfo->using_builtin_cdp && !g_file_test(ginfo->ripexename, G_FILE_TEST_IS_EXECUTABLE)) {
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("Invalid rip executable.\nCheck your rip config, and ensure it specifies the full path to the ripper executable."));
 
-    ginfo->doencode=FALSE;
+    ginfo->doencode = FALSE;
     return;
   }
 
   /* the same for mp3exename */
   FindExeInPath(ginfo->mp3exename, buf, sizeof(buf));
   strncpy(ginfo->mp3exename, buf, sizeof(ginfo->mp3exename));
-  if(ginfo->doencode&&!FileExists(ginfo->mp3exename)) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("Invalid encoder executable.\nCheck your encoder config, and ensure it specifies the full path to the encoder executable."));
+  if (ginfo->doencode && !g_file_test(ginfo->mp3exename, G_FILE_TEST_IS_EXECUTABLE)) {
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("Invalid encoder executable.\nCheck your encoder config, and ensure it specifies the full path to the encoder executable."));
 
-    ginfo->doencode=FALSE;
+    ginfo->doencode = FALSE;
     return;
   }
 
   CDStop(&(ginfo->disc));
-  ginfo->stopped=TRUE;
+  ginfo->stopped = TRUE;
 
   /* Close the device so as not to conflict with ripping */
   CDCloseDevice(&(ginfo->disc));
-    
+
   if(ginfo->ripping) {
-    ginfo->doencode=FALSE;
+    ginfo->doencode = FALSE;
     return;
   }
 
 #ifdef CDPAR
   /* Initialize gain calculation */
-  if(ginfo->using_builtin_cdp && ginfo->calc_gain) 
+  if(ginfo->using_builtin_cdp && ginfo->calc_gain)
     InitGainAnalysis(44100);
 #endif
 
   CheckDupNames(ginfo);
 
   if(ginfo->rip_partial)
-    ginfo->rip_track=CURRENT_TRACK;
+    ginfo->rip_track = CURRENT_TRACK;
   else {
-    if(ginfo->add_m3u) AddM3U(ginfo);
-    SetCurrentTrackIndex(ginfo,0);
-    ginfo->rip_track=0;
+    if(ginfo->add_m3u)
+      AddM3U(ginfo);
+    SetCurrentTrackIndex(ginfo, 0);
+    ginfo->rip_track = 0;
   }
 
-  if(NextTrackToRip(ginfo)==ginfo->disc.num_tracks) {
-    gnome_app_ok_cancel_modal
-      ((GnomeApp *)ginfo->gui_info.app,
-       _("No tracks selected.\nRip whole CD?\n"),
-       RipWholeCD,(gpointer)ginfo);
+  if(NextTrackToRip(ginfo) == ginfo->disc.num_tracks) {
+    RipWholeCD(ConfirmDialog((GtkWindow *)ginfo->gui_info.app,
+                             _("No tracks selected.\nRip whole CD?\n")),
+               ginfo);
     return;
   }
-  
-  ginfo->stop_rip=FALSE;
+
+  ginfo->stop_rip = FALSE;
 
   CalculateAll(ginfo);
 
-  result=RipNextTrack(ginfo);
+  result = RipNextTrack(ginfo);
 
   if(!result) {
-    ginfo->doencode=FALSE;
+    ginfo->doencode = FALSE;
   }
 }
 
-static void RipWholeCD(gint reply,gpointer data)
+static void RipWholeCD(gint reply, gpointer data)
 {
   int track;
   GripInfo *ginfo;
 
   if(reply) {
-    RemoveM3U((GripInfo *) data);
+    RemoveM3U((GripInfo *)data);
     return;
   }
 
   Debug(_("Ripping whole CD\n"));
 
   ginfo=(GripInfo *)data;
-  
-  for(track=0;track<ginfo->disc.num_tracks;++track)
-    SetChecked(&(ginfo->gui_info),track,TRUE);
 
-  if(ginfo->doencode) DoRip(NULL,(gpointer)ginfo);
-  else DoRip((GtkWidget *)1,(gpointer)ginfo);
+  for(track=0;track < ginfo->disc.num_tracks;++track)
+    SetChecked(&(ginfo->gui_info), track, TRUE);
+
+  if(ginfo->doencode)
+    DoRip(NULL, (gpointer)ginfo);
+  else
+    DoRip((GtkWidget *)1, (gpointer)ginfo);
 }
 
 static int NextTrackToRip(GripInfo *ginfo)
 {
   int track;
 
-  for(track=0;(track<ginfo->disc.num_tracks)&&
-	(!TrackIsChecked(&(ginfo->gui_info),track)||
-	IsDataTrack(&(ginfo->disc),track));track++);
+  for(track=0;(track < ginfo->disc.num_tracks) &&
+      (!TrackIsChecked(&(ginfo->gui_info), track) ||
+       IsDataTrack(&(ginfo->disc), track));track++);
 
   return track;
 }
@@ -1471,80 +1490,81 @@
   GString *str;
   EncodeTrack enc_track;
   char *conv_str, *utf8_ripfile;
-  gsize rb,wb;
+  gsize rb, wb;
   const char *charset;
   char *format;
 
-  uinfo=&(ginfo->gui_info);
+  uinfo = &(ginfo->gui_info);
 
   Debug(_("In RipNextTrack\n"));
 
-  if(ginfo->ripping) return FALSE;
+  if(ginfo->ripping)
+    return FALSE;
 
   if(!ginfo->rip_partial)
-    ginfo->rip_track=NextTrackToRip(ginfo);
+    ginfo->rip_track = NextTrackToRip(ginfo);
 
-  Debug(_("First checked track is %d\n"),ginfo->rip_track+1);
+  Debug(_("First checked track is %d\n"), ginfo->rip_track+1);
 
   /* See if we are finished ripping */
-  if(ginfo->rip_track==ginfo->disc.num_tracks) {
+  if(ginfo->rip_track == ginfo->disc.num_tracks) {
     return FALSE;
   }
 
   /* We have a track to rip */
 
-  if(ginfo->have_disc&&ginfo->rip_track>=0) {
+  if(ginfo->have_disc && ginfo->rip_track>=0) {
     Debug(_("Ripping away!\n"));
 
     /*    if(!ginfo->rip_partial){
-      gtk_clist_select_row(GTK_CLIST(uinfo->trackclist),ginfo->rip_track,0);
+      gtk_clist_select_row(GTK_CLIST(uinfo->trackclist), ginfo->rip_track, 0);
       }*/
 
-    CopyPixmap(GTK_PIXMAP(uinfo->rip_pix[0]),GTK_PIXMAP(uinfo->rip_indicator));
+    CopyPixmap(GTK_PIXMAP(uinfo->rip_pix[0]), GTK_PIXMAP(uinfo->rip_indicator));
 
     if(ginfo->stop_between_tracks)
       CDStop(&(ginfo->disc));
 
     if(!ginfo->rip_partial) {
-      ginfo->start_sector=0;
-      ginfo->end_sector=(ginfo->disc.track[ginfo->rip_track+1].start_frame-1)-
-	ginfo->disc.track[ginfo->rip_track].start_frame;
+      ginfo->start_sector = 0;
+      ginfo->end_sector = (ginfo->disc.track[ginfo->rip_track+1].start_frame-1) -
+        ginfo->disc.track[ginfo->rip_track].start_frame;
 
       /* Compensate for the gap before a data track */
-      if((ginfo->rip_track<(ginfo->disc.num_tracks-1)&&
-	  IsDataTrack(&(ginfo->disc),ginfo->rip_track+1)&&
-	  (ginfo->end_sector-ginfo->start_sector)>11399))
-	ginfo->end_sector-=11400;
+      if((ginfo->rip_track < (ginfo->disc.num_tracks-1) &&
+          IsDataTrack(&(ginfo->disc), ginfo->rip_track+1) &&
+          (ginfo->end_sector-ginfo->start_sector) > 11399))
+        ginfo->end_sector -= 11400;
     }
 
-    ginfo->ripsize=44+((ginfo->end_sector-ginfo->start_sector)+1)*2352;
+    ginfo->ripsize = 44 + ((ginfo->end_sector-ginfo->start_sector) + 1) * 2352;
 
-    str=g_string_new(NULL);
-    FillInTrackInfo(ginfo,ginfo->rip_track,&enc_track);
+    str = g_string_new(NULL);
+    FillInTrackInfo(ginfo, ginfo->rip_track, &enc_track);
 
     format = (ginfo->ddata.data_multi_artist)
                 ? ginfo->ripfileformat_multi
                 : ginfo->ripfileformat;
-    TranslateString(format,str,TranslateSwitch,
-		    &enc_track,TRUE,&(ginfo->sprefs));
+    TranslateString(format, str, TranslateSwitch,
+                    &enc_track, TRUE, &(ginfo->sprefs));
 
     g_get_charset(&charset);
 
-    conv_str=g_filename_from_utf8(str->str,strlen(str->str),&rb,&wb,NULL);
+    conv_str = g_filename_from_utf8(str->str, strlen(str->str), &rb, &wb, NULL);
 
     if(!conv_str) {
-      conv_str=g_strdup(str->str);
+      conv_str = g_strdup(str->str);
     }
 
-    g_snprintf(ginfo->ripfile,256,"%s",conv_str);
+    g_snprintf(ginfo->ripfile, 256, "%s", conv_str);
 
     g_free(conv_str);
-    g_string_free(str,TRUE);
+    g_string_free(str, TRUE);
 
     MakeDirs(ginfo->ripfile);
     if(!CanWrite(ginfo->ripfile)) {
-      gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                        _("No write access to write wav file"));
+      DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+                 _("No write access to write wav file"));
       return FALSE;
     }
 
@@ -1553,110 +1573,105 @@
       sleep(5);
     }
 
-    utf8_ripfile=g_filename_to_utf8(ginfo->ripfile,strlen(ginfo->ripfile),
-                                    &rb,&wb,NULL);
-
-    if(!utf8_ripfile) utf8_ripfile=strdup(ginfo->ripfile);
+    utf8_ripfile = g_filename_to_utf8(ginfo->ripfile, strlen(ginfo->ripfile),
+                                      &rb, &wb, NULL);
 
-    LogStatus(ginfo,_("Ripping track %d to %s\n"),
-	      ginfo->rip_track+1,utf8_ripfile);
+    if(!utf8_ripfile)
+      utf8_ripfile = strdup(ginfo->ripfile);
 
     ginfo->rip_started = time(NULL);
-    sprintf(tmp,_("Rip: Trk %d (0.0x)"),ginfo->rip_track+1);
-    gtk_label_set(GTK_LABEL(uinfo->rip_prog_label),tmp);
-
-    if(stat(ginfo->ripfile,&mystat)>=0) {
-      if(mystat.st_size == ginfo->ripsize) { 
-	LogStatus(ginfo,_("File %s has already been ripped. Skipping...\n"),\
-	          utf8_ripfile);
+    sprintf(tmp, _("Rip: Trk %d (0.0x)"), ginfo->rip_track+1);
+    gtk_label_set(GTK_LABEL(uinfo->rip_prog_label), tmp);
 
+    if(stat(ginfo->ripfile, &mystat) >= 0) {
+      if(mystat.st_size == ginfo->ripsize) {
         g_free(utf8_ripfile);
 
-	if(ginfo->doencode) ginfo->num_wavs++;
-	ginfo->ripping=TRUE;
-	ginfo->ripping_a_disc=TRUE;
-	ginfo->all_ripdone+=CalculateWavSize(ginfo,ginfo->rip_track);
-	ginfo->all_riplast=0;
-	return TRUE;
+        if(ginfo->doencode)
+          ginfo->num_wavs++;
+        ginfo->ripping = TRUE;
+        ginfo->ripping_a_disc = TRUE;
+        ginfo->all_ripdone += CalculateWavSize(ginfo, ginfo->rip_track);
+        ginfo->all_riplast = 0;
+        return TRUE;
       }
-      else unlink(ginfo->ripfile);
+      else
+        unlink(ginfo->ripfile);
     }
 
     g_free(utf8_ripfile);
 
-    bytesleft=BytesLeftInFS(ginfo->ripfile);
+    bytesleft = BytesLeftInFS(ginfo->ripfile);
 
-    if(bytesleft<(ginfo->ripsize*1.5)) {
-      gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                        _("Out of space in output directory"));
+    if(bytesleft < (ginfo->ripsize * 1.5)) {
+      DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+                 _("Out of space in output directory"));
 
       return FALSE;
     }
 
 #ifdef CDPAR
-    if(ginfo->selected_ripper==0) {
-      ginfo->in_rip_thread=TRUE;
+    if(ginfo->selected_ripper == 0) {
+      ginfo->in_rip_thread = TRUE;
 
-      pthread_create(&ginfo->cdp_thread,NULL,(void *)ThreadRip,
-		     (void *)ginfo);
+      pthread_create(&ginfo->cdp_thread, NULL, (void *)ThreadRip,
+                     (void *)ginfo);
       pthread_detach(ginfo->cdp_thread);
     }
     else {
 #endif
-      strcpy(enc_track.wav_filename,ginfo->ripfile);
+      strcpy(enc_track.wav_filename, ginfo->ripfile);
 
-      MakeTranslatedArgs(ginfo->ripcmdline,args,100,TranslateSwitch,
-			 &enc_track,FALSE,&(ginfo->sprefs));
+      MakeTranslatedArgs(ginfo->ripcmdline, args, 100, TranslateSwitch,
+                         &enc_track, FALSE, &(ginfo->sprefs));
 
 /*
       ArgsToLocale(args);
 */
 
       for(arg=0;args[arg];arg++) {
-	char_args[arg+1]=args[arg]->str;
+        char_args[arg+1] = args[arg]->str;
       }
 
-      char_args[arg+1]=NULL;
+      char_args[arg+1] = NULL;
 
-      char_args[0]=FindRoot(ginfo->ripexename);
+      char_args[0] = FindRoot(ginfo->ripexename);
 
-      ginfo->curr_pipe_fd=
-	GetStatusWindowPipe(ginfo->gui_info.rip_status_window);
+      ginfo->rippid = fork();
 
-      ginfo->rippid=fork();
-      
-      if(ginfo->rippid==0) {
+      if(ginfo->rippid == 0) {
         int i;
-	CloseStuff(ginfo);
+        CloseStuff(ginfo);
         errno=0;
-        i=nice(ginfo->ripnice);
-        if (errno && i==-1) {
+        i = nice(ginfo->ripnice);
+        if (errno && i == -1) {
           perror("nice:");
         }
-	execvp(ginfo->ripexename,char_args);
-	
-	LogStatus(ginfo,_("Exec failed\n"));
-	_exit(0);
+        execvp(ginfo->ripexename, char_args);
+
+        _exit(0);
       }
       else {
-	ginfo->curr_pipe_fd=-1;
+        ginfo->curr_pipe_fd = -1;
       }
 
       for(arg=0;args[arg];arg++) {
-	g_string_free(args[arg],TRUE);
+        g_string_free(args[arg], TRUE);
       }
 #ifdef CDPAR
     }
 #endif
 
-    ginfo->ripping=TRUE;
-    ginfo->ripping_a_disc=TRUE;
+    ginfo->ripping = TRUE;
+    ginfo->ripping_a_disc = TRUE;
 
-    if(ginfo->doencode) ginfo->num_wavs++;
+    if(ginfo->doencode)
+      ginfo->num_wavs++;
 
     return TRUE;
   }
-  else return FALSE;
+  else
+    return FALSE;
 }
 
 #ifdef CDPAR
@@ -1664,102 +1679,92 @@
 {
   GripInfo *ginfo;
   int paranoia_mode;
-  int dup_output_fd;
-  FILE *output_fp;
   int i;
 
-  ginfo=(GripInfo *)arg;
+  ginfo = (GripInfo *)arg;
 
   Debug(_("Calling CDPRip\n"));
 
-  paranoia_mode=PARANOIA_MODE_FULL^PARANOIA_MODE_NEVERSKIP; 
+  paranoia_mode = PARANOIA_MODE_FULL ^ PARANOIA_MODE_NEVERSKIP;
   if(ginfo->disable_paranoia)
-    paranoia_mode=PARANOIA_MODE_DISABLE;
+    paranoia_mode = PARANOIA_MODE_DISABLE;
   else if(ginfo->disable_extra_paranoia) {
-    paranoia_mode|=PARANOIA_MODE_OVERLAP;
-    paranoia_mode&=~PARANOIA_MODE_VERIFY;
+    paranoia_mode |= PARANOIA_MODE_OVERLAP;
+    paranoia_mode &= ~PARANOIA_MODE_VERIFY;
   }
   if(ginfo->disable_scratch_detect)
-    paranoia_mode&=
-      ~(PARANOIA_MODE_SCRATCH|PARANOIA_MODE_REPAIR);
-  if(ginfo->disable_scratch_repair) 
-    paranoia_mode&=~PARANOIA_MODE_REPAIR;
-  
-  ginfo->rip_smile_level=0;
-  
-  i=nice(ginfo->ripnice);
-  if (errno && i==-1) {
+    paranoia_mode &= ~(PARANOIA_MODE_SCRATCH | PARANOIA_MODE_REPAIR);
+  if(ginfo->disable_scratch_repair)
+    paranoia_mode &= ~PARANOIA_MODE_REPAIR;
+
+  ginfo->rip_smile_level = 0;
+
+  i = nice(ginfo->ripnice);
+  if (errno && i == -1) {
     perror("nice:");
   }
 
-  dup_output_fd=dup(GetStatusWindowPipe(ginfo->gui_info.rip_status_window));
-  output_fp=fdopen(dup_output_fd,"w");
-  setlinebuf(output_fp);
-
-  CDPRip(ginfo->cd_device,ginfo->force_scsi,ginfo->rip_track+1,
-	 ginfo->start_sector,
-	 ginfo->end_sector,ginfo->ripfile,paranoia_mode,
-	 &(ginfo->rip_smile_level),&(ginfo->rip_percent_done),
-	 &(ginfo->stop_thread_rip_now),ginfo->calc_gain,
-	 output_fp);
+  CDPRip(ginfo->cd_device, ginfo->force_scsi, ginfo->rip_track + 1,
+         ginfo->start_sector,
+         ginfo->end_sector, ginfo->ripfile, paranoia_mode,
+         &(ginfo->rip_smile_level), &(ginfo->rip_percent_done),
+         &(ginfo->stop_thread_rip_now), ginfo->calc_gain);
 
-  fclose(output_fp);
- 
-  ginfo->in_rip_thread=FALSE;
+  ginfo->in_rip_thread = FALSE;
 
   pthread_exit(0);
 }
 #endif /* ifdef CDPAR */
 
-void FillInTrackInfo(GripInfo *ginfo,int track,EncodeTrack *new_track)
+void FillInTrackInfo(GripInfo *ginfo, int track, EncodeTrack *new_track)
 {
-  new_track->ginfo=ginfo;
+  new_track->ginfo = ginfo;
 
-  new_track->wav_filename[0]='\0';
-  new_track->mp3_filename[0]='\0';
+  new_track->wav_filename[0] = '\0';
+  new_track->mp3_filename[0] = '\0';
 
-  new_track->track_num=track;
-  new_track->start_frame=ginfo->disc.track[track].start_frame;
-  new_track->end_frame=ginfo->disc.track[track+1].start_frame-1;
+  new_track->track_num = track;
+  new_track->start_frame = ginfo->disc.track[track].start_frame;
+  new_track->end_frame = ginfo->disc.track[track+1].start_frame - 1;
 #ifdef CDPAR
-  new_track->track_gain_adjustment=ginfo->track_gain_adjustment;
-  new_track->disc_gain_adjustment=0.0;
+  new_track->track_gain_adjustment = ginfo->track_gain_adjustment;
+  new_track->disc_gain_adjustment = 0.0;
 #endif
 
   /* Compensate for the gap before a data track */
-  if((track<(ginfo->disc.num_tracks-1)&&
-      IsDataTrack(&(ginfo->disc),track+1)&&
-      (new_track->end_frame-new_track->start_frame)>11399))
-    new_track->end_frame-=11400;
-
-  new_track->mins=ginfo->disc.track[track].length.mins;
-  new_track->secs=ginfo->disc.track[track].length.secs;
-  new_track->song_year=ginfo->ddata.data_year;
-  g_snprintf(new_track->song_name,256,"%s",
-	     ginfo->ddata.data_track[track].track_name);
-  g_snprintf(new_track->song_artist,256,"%s",
-	     ginfo->ddata.data_track[track].track_artist);
-  g_snprintf(new_track->disc_name,256,"%s",ginfo->ddata.data_title);
-  g_snprintf(new_track->disc_artist,256,"%s",ginfo->ddata.data_artist);
-  new_track->id3_genre=ginfo->ddata.data_id3genre;
-  new_track->discid=ginfo->ddata.data_id;
+  if((track < (ginfo->disc.num_tracks-1) &&
+      IsDataTrack(&(ginfo->disc), track + 1) &&
+      (new_track->end_frame - new_track->start_frame) > 11399))
+    new_track->end_frame -= 11400;
+
+  new_track->mins = ginfo->disc.track[track].length.mins;
+  new_track->secs = ginfo->disc.track[track].length.secs;
+  new_track->song_year = ginfo->ddata.data_year;
+  g_snprintf(new_track->song_name, 256, "%s",
+             ginfo->ddata.data_track[track].track_name);
+  g_snprintf(new_track->song_artist, 256, "%s",
+             ginfo->ddata.data_track[track].track_artist);
+  g_snprintf(new_track->disc_name, 256, "%s", ginfo->ddata.data_title);
+  g_snprintf(new_track->disc_artist, 256, "%s", ginfo->ddata.data_artist);
+  new_track->id3_genre = ginfo->ddata.data_id3genre;
+  new_track->discid = ginfo->ddata.data_id;
 }
 
-static void AddToEncode(GripInfo *ginfo,int track)
+static void AddToEncode(GripInfo *ginfo, int track)
 {
   EncodeTrack *new_track;
 
-  new_track=(EncodeTrack *)g_new(EncodeTrack,1);
+  new_track = (EncodeTrack *)g_new(EncodeTrack, 1);
 
-  FillInTrackInfo(ginfo,track,new_track);
-  strcpy(new_track->wav_filename,ginfo->ripfile);
+  FillInTrackInfo(ginfo, track, new_track);
+  strcpy(new_track->wav_filename, ginfo->ripfile);
 
   if (!ginfo->delayed_encoding)
-    ginfo->encode_list=g_list_append(ginfo->encode_list,new_track);
+    ginfo->encode_list = g_list_append(ginfo->encode_list, new_track);
   else
-    ginfo->pending_list=g_list_append(ginfo->pending_list,new_track);
+    ginfo->pending_list = g_list_append(ginfo->pending_list, new_track);
 
-  Debug(_("Added track %d to %s list\n"),track+1,
+  Debug(_("Added track %d to %s list\n"), track + 1,
           ginfo->delayed_encoding ? "pending" : "encoding");
 }
 
@@ -1776,130 +1781,128 @@
   int encode_track;
   int cpu;
   char *conv_str;
-  gsize rb,wb;
+  gsize rb, wb;
   char *format;
 
-  uinfo=&(ginfo->gui_info);
+  uinfo = &(ginfo->gui_info);
 
-  if(!ginfo->encode_list) return FALSE;
+  if(!ginfo->encode_list)
+    return FALSE;
 
-  for(cpu=0;(cpu<ginfo->num_cpu)&&(ginfo->encoding&(1<<cpu));cpu++);
+  for(cpu=0;(cpu < ginfo->num_cpu) && (ginfo->encoding & (1<<cpu));cpu++);
 
-  if(cpu==ginfo->num_cpu) {
+  if(cpu == ginfo->num_cpu) {
     Debug(_("No free cpus\n"));
     return FALSE;
   }
 
-  enc_track=(EncodeTrack *)(g_list_first(ginfo->encode_list)->data);
-  encode_track=enc_track->track_num;
+  enc_track = (EncodeTrack *)(g_list_first(ginfo->encode_list)->data);
+  encode_track = enc_track->track_num;
 
-  ginfo->encode_list=g_list_remove(ginfo->encode_list,enc_track);
-  ginfo->encoded_track[cpu]=enc_track;
+  ginfo->encode_list = g_list_remove(ginfo->encode_list, enc_track);
+  ginfo->encoded_track[cpu] = enc_track;
 
   CopyPixmap(GTK_PIXMAP(uinfo->mp3_pix[0]),
-	     GTK_PIXMAP(uinfo->mp3_indicator[cpu]));
-  
+             GTK_PIXMAP(uinfo->mp3_indicator[cpu]));
+
   ginfo->mp3_started[cpu] = time(NULL);
   ginfo->mp3_enc_track[cpu] = encode_track;
 
-  Debug(_("Enc track %d\n"),encode_track+1);
+  Debug(_("Enc track %d\n"), encode_track + 1);
 
-  strcpy(ginfo->rip_delete_file[cpu],enc_track->wav_filename);
+  strcpy(ginfo->rip_delete_file[cpu], enc_track->wav_filename);
 
-  str=g_string_new(NULL);
+  str = g_string_new(NULL);
 
   format = (ginfo->ddata.data_multi_artist)
                 ? ginfo->mp3fileformat_multi
                 : ginfo->mp3fileformat;
-  TranslateString(format,str,TranslateSwitch,
-		  enc_track,TRUE,&(ginfo->sprefs));
+  TranslateString(format, str, TranslateSwitch,
+                  enc_track, TRUE, &(ginfo->sprefs));
 
-  conv_str=g_filename_from_utf8(str->str,strlen(str->str),&rb,&wb,NULL);
+  conv_str = g_filename_from_utf8(str->str, strlen(str->str),
+                                  &rb, &wb, NULL);
 
   if(!conv_str)
-    conv_str=g_strdup(str->str);
+    conv_str = g_strdup(str->str);
 
-  g_snprintf(ginfo->mp3file[cpu],256,"%s",conv_str);
+  g_snprintf(ginfo->mp3file[cpu], 256, "%s", conv_str);
 
   g_free(conv_str);
-  g_string_free(str,TRUE);
+  g_string_free(str, TRUE);
 
   MakeDirs(ginfo->mp3file[cpu]);
   if(!CanWrite(ginfo->mp3file[cpu])) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("No write access to write encoded file."));
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("No write access to write encoded file."));
     return FALSE;
   }
-  
-  bytesleft=BytesLeftInFS(ginfo->mp3file[cpu]);
-  
-  conv_str=g_filename_to_utf8(ginfo->mp3file[cpu],strlen(ginfo->mp3file[cpu]),
-                              &rb,&wb,NULL);
 
-  if(!conv_str) conv_str=strdup(ginfo->mp3file[cpu]);
+  bytesleft = BytesLeftInFS(ginfo->mp3file[cpu]);
 
-  LogStatus(ginfo,_("%i: Encoding to %s\n"),cpu+1,conv_str);
+  conv_str = g_filename_to_utf8(ginfo->mp3file[cpu], strlen(ginfo->mp3file[cpu]),
+                                &rb, &wb, NULL);
+
+  if(!conv_str)
+    conv_str = strdup(ginfo->mp3file[cpu]);
 
   g_free(conv_str);
-  
-  sprintf(tmp,_("Enc: Trk %d (0.0x)"),encode_track+1);
-  gtk_label_set(GTK_LABEL(uinfo->mp3_prog_label[cpu]),tmp);
-  
+
+  sprintf(tmp, _("Enc: Trk %d (0.0x)"), encode_track + 1);
+  gtk_label_set(GTK_LABEL(uinfo->mp3_prog_label[cpu]), tmp);
+
   unlink(ginfo->mp3file[cpu]);
-  
-  ginfo->mp3size[cpu]=
-    (int)((gfloat)((enc_track->end_frame-enc_track->start_frame)+1)*
-	  (gfloat)(ginfo->kbits_per_sec*1024)/600.0);
-  
-  if(bytesleft<(ginfo->mp3size[cpu]*1.5)) {
-    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-                      _("Out of space in output directory"));
-    
+
+  ginfo->mp3size[cpu] =
+    (int)((gfloat)((enc_track->end_frame - enc_track->start_frame) + 1) *
+          (gfloat)(ginfo->kbits_per_sec * 1024) / 600.0);
+
+  if(bytesleft < (ginfo->mp3size[cpu] * 1.5)) {
+    DisplayMsg(GTK_MESSAGE_WARNING, (GtkWindow *)ginfo->gui_info.app,
+               _("Out of space in output directory"));
+
     return FALSE;
   }
-  
-  strcpy(enc_track->mp3_filename,ginfo->mp3file[cpu]);
 
-  MakeTranslatedArgs(ginfo->mp3cmdline,args,100,TranslateSwitch,
-		     enc_track,FALSE,&(ginfo->sprefs));
+  strcpy(enc_track->mp3_filename, ginfo->mp3file[cpu]);
+
+  MakeTranslatedArgs(ginfo->mp3cmdline, args, 100, TranslateSwitch,
+                     enc_track, FALSE, &(ginfo->sprefs));
 
 /*
   ArgsToLocale(args);
 */
-  
+
   for(arg=0;args[arg];arg++) {
     char_args[arg+1]=args[arg]->str;
   }
-  
-  char_args[arg+1]=NULL;
-  
-  char_args[0]=FindRoot(ginfo->mp3exename);
 
-  ginfo->curr_pipe_fd=
-    GetStatusWindowPipe(ginfo->gui_info.encode_status_window);
+  char_args[arg+1] = NULL;
 
-  ginfo->mp3pid[cpu]=fork();
-  
-  if(ginfo->mp3pid[cpu]==0) {
+  char_args[0] = FindRoot(ginfo->mp3exename);
+
+  ginfo->mp3pid[cpu] = fork();
+
+  if(ginfo->mp3pid[cpu] == 0) {
     int i;
     CloseStuff(ginfo);
     setsid();
-    i=nice(ginfo->mp3nice);
-    if (errno && i==-1) {
+    i = nice(ginfo->mp3nice);
+    if (errno && i == -1) {
       perror("nice:");
     }
-    execvp(ginfo->mp3exename,char_args);
+    execvp(ginfo->mp3exename, char_args);
     _exit(0);
   }
   else {
-    ginfo->curr_pipe_fd=-1;
+    ginfo->curr_pipe_fd = -1;
   }
 
   for(arg=0;args[arg];arg++) {
-    g_string_free(args[arg],TRUE);
+    g_string_free(args[arg], TRUE);
   }
 
-  ginfo->encoding|=(1<<cpu);
+  ginfo->encoding |= (1<<cpu);
 
   return TRUE;
 }
@@ -1910,56 +1913,56 @@
   int track;
   GripGUI *uinfo;
 
-  uinfo=&(ginfo->gui_info);
+  uinfo = &(ginfo->gui_info);
 
   Debug(_("In CalculateAll\n"));
 
-  ginfo->all_ripsize=0;
-  ginfo->all_ripdone=0;
-  ginfo->all_riplast=0;
+  ginfo->all_ripsize = 0;
+  ginfo->all_ripdone = 0;
+  ginfo->all_riplast = 0;
   if (!ginfo->encoding) {
     Debug(_("We aren't ripping now, so let's zero encoding values\n"));
-    ginfo->all_encsize=0;
-    ginfo->all_encdone=0;
-    for (cpu=0;cpu<ginfo->num_cpu;++cpu)
-      ginfo->all_enclast[cpu]=0;
+    ginfo->all_encsize = 0;
+    ginfo->all_encdone = 0;
+    for (cpu=0;cpu < ginfo->num_cpu;++cpu)
+      ginfo->all_enclast[cpu] = 0;
   }
   if (ginfo->rip_partial)
     return;
-  
-  for (track=0;track<ginfo->disc.num_tracks;++track) {
-    if (!IsDataTrack(&(ginfo->disc),track) &&
-	(TrackIsChecked(uinfo,track))) {
-      ginfo->all_ripsize+=CalculateWavSize(ginfo,track);
-      ginfo->all_encsize+=CalculateEncSize(ginfo,track);
+
+  for (track=0;track < ginfo->disc.num_tracks;++track) {
+    if (!IsDataTrack(&(ginfo->disc), track) &&
+        (TrackIsChecked(uinfo, track))) {
+      ginfo->all_ripsize += CalculateWavSize(ginfo, track);
+      ginfo->all_encsize += CalculateEncSize(ginfo, track);
     }
   }
-  Debug(_("Total rip size is: %d\n"),ginfo->all_ripsize);
-  Debug(_("Total enc size is: %d\n"),ginfo->all_encsize);
+  Debug(_("Total rip size is: %d\n"), ginfo->all_ripsize);
+  Debug(_("Total enc size is: %d\n"), ginfo->all_encsize);
 }
 
 static size_t CalculateWavSize(GripInfo *ginfo, int track)
 {
   int frames;
-  
-  frames=(ginfo->disc.track[track+1].start_frame-1)-
+
+  frames=(ginfo->disc.track[track+1].start_frame-1) -
     ginfo->disc.track[track].start_frame;
-  if ((track<(ginfo->disc.num_tracks)-1) &&
-      (IsDataTrack(&(ginfo->disc),track+1)) &&
-      (frames>11399))
-    frames-=11400;
-  return frames*2352;
+  if ((track < (ginfo->disc.num_tracks) - 1) &&
+      (IsDataTrack(&(ginfo->disc), track + 1)) &&
+      (frames > 11399))
+    frames -= 11400;
+  return frames * 2352;
 }
 
 static size_t CalculateEncSize(GripInfo *ginfo, int track)
 {
-  double tmp_encsize=0.0;
+  double tmp_encsize = 0.0;
   /* It's not the best way, but i couldn't find anything better */
-  tmp_encsize=(double)((ginfo->disc.track[track].length.mins*60+
-			ginfo->disc.track[track].length.secs-2)*
-		       ginfo->kbits_per_sec*1024/8);
-  tmp_encsize-=tmp_encsize*0.0154;
-  if (ginfo->add_m3u) 
-    tmp_encsize+=128;
+  tmp_encsize = (double)((ginfo->disc.track[track].length.mins * 60 +
+                          ginfo->disc.track[track].length.secs - 2) *
+                          ginfo->kbits_per_sec * 1024 / 8);
+  tmp_encsize -= tmp_encsize * 0.0154;
+  if (ginfo->add_m3u)
+    tmp_encsize += 128;
   return (size_t)tmp_encsize;
 }

grip-3.10.1.tar.gz/src/rip.h -> grip-4.1.1.tar.gz/src/rip.h Changed

grip-3.10.1.tar.gz/src/tray.c -> grip-4.1.1.tar.gz/src/tray.c Changed

@@ -20,6 +20,8 @@
  * USA
  */
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include "cdplay.h"
 #include "tray.h"
 #include "rip.h"
@@ -66,7 +68,7 @@
 			MakeTrayIcon(ginfo);
 	} else {
 		if (uinfo->tray_icon) {
-			gtk_widget_destroy(GTK_WIDGET(uinfo->tray_icon));
+			g_object_unref(uinfo->tray_icon);
 			uinfo->tray_icon = NULL;
 		}
 		ginfo->tray_icon_made = FALSE;
@@ -92,11 +94,11 @@
 				text = g_strdup_printf(_("%s - %s\nIdle"), artist, title);
 			}
 		}
-	
-		gtk_tooltips_set_tip(GTK_TOOLTIPS(uinfo->tray_tips), uinfo->tray_ebox, text, NULL);
-	
-		if (riptext) g_free(riptext);
-		if (enctext) g_free(enctext);
+
+		gtk_status_icon_set_tooltip_text (uinfo->tray_icon, text);
+
+		g_free(riptext);
+		g_free(enctext);
 		g_free(text);
 	}
 }
@@ -163,76 +165,62 @@
 
 static void MakeTrayIcon(GripInfo *ginfo)
 {
-	GtkWidget *image, *mentry, *hb, *img;
+	GtkWidget *mentry, *hb, *img;
 	GripGUI *uinfo = &(ginfo->gui_info);
-	
-	uinfo->tray_icon = egg_tray_icon_new("Grip");	
-	
-	uinfo->tray_ebox = gtk_event_box_new();
-	
-	gtk_container_set_border_width(GTK_CONTAINER(uinfo->tray_icon), 0);
-	
-	gtk_container_add(GTK_CONTAINER(uinfo->tray_icon), uinfo->tray_ebox);
-		
-	image = gtk_image_new_from_file(GNOME_ICONDIR"/griptray.png");
-	
-	gtk_container_add(GTK_CONTAINER(uinfo->tray_ebox), image);
-	
-	uinfo->tray_tips = gtk_tooltips_new();
-	
+
+	uinfo->tray_icon = gtk_status_icon_new_from_file(GNOME_ICONDIR"/griptray.png");
+
 	uinfo->tray_menu = gtk_menu_new();
-	
+
 	img = (GtkWidget*)Loadxpm(uinfo->app, menuplay_xpm);
 	uinfo->tray_menu_play = (GtkWidget*)BuildMenuItemXpm(img, _("Play"));
 	g_signal_connect(uinfo->tray_menu_play, "activate", G_CALLBACK(PlayCB), ginfo);
 	gtk_menu_shell_append(GTK_MENU_SHELL(uinfo->tray_menu), uinfo->tray_menu_play);
-	
+
 	img = (GtkWidget*)Loadxpm(uinfo->app, menupause_xpm);
 	uinfo->tray_menu_pause = (GtkWidget*)BuildMenuItemXpm(img, _("Pause"));
 	g_signal_connect(uinfo->tray_menu_pause, "activate", G_CALLBACK(PauseCB), ginfo);
 	gtk_menu_shell_append(GTK_MENU_SHELL(uinfo->tray_menu), uinfo->tray_menu_pause);
-	
+
 	img = (GtkWidget*)Loadxpm(uinfo->app, menustop_xpm);
 	mentry = (GtkWidget*)BuildMenuItemXpm(img, _("Stop"));
 	g_signal_connect(mentry, "activate", G_CALLBACK(StopCB), ginfo);
 	gtk_menu_shell_append(GTK_MENU_SHELL(uinfo->tray_menu), mentry);
-	
+
 	hb = gtk_separator_menu_item_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(uinfo->tray_menu), hb);
-	
+
 	img = (GtkWidget*)Loadxpm(uinfo->app, menuprev_xpm);
 	mentry = (GtkWidget*)BuildMenuItemXpm(img, _("Previous"));
 	g_signal_connect(mentry, "activate", G_CALLBACK(PrevCB), ginfo);
 	gtk_menu_shell_append(GTK_MENU_SHELL(uinfo->tray_menu), mentry);
-	
+
 	img = (GtkWidget*)Loadxpm(uinfo->app, menunext_xpm);
 	mentry = (GtkWidget*)BuildMenuItemXpm(img, _("Next"));
 	g_signal_connect(mentry, "activate", G_CALLBACK(NextCB), ginfo);
 	gtk_menu_shell_append(GTK_MENU_SHELL(uinfo->tray_menu), mentry);
-	
+
 	hb = gtk_separator_menu_item_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(uinfo->tray_menu), hb);
-	
+
 	img = (GtkWidget*)Loadxpm(uinfo->app, rip1_xpm);
 	mentry = (GtkWidget*)BuildMenuItemXpm(img, _("Rip and Encode"));
 	g_signal_connect(mentry, "activate", G_CALLBACK(RipEncCB), ginfo);
 	gtk_menu_shell_append(GTK_MENU_SHELL(uinfo->tray_menu), mentry);
-	
+
 	hb = gtk_separator_menu_item_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(uinfo->tray_menu), hb);
 
 	mentry = (GtkWidget*)BuildMenuItem(GTK_STOCK_QUIT, _("Quit"), TRUE);
 	g_signal_connect(mentry, "activate", G_CALLBACK(QuitCB), ginfo);
 	gtk_menu_shell_append(GTK_MENU_SHELL(uinfo->tray_menu), mentry);
-		
-	g_signal_connect(uinfo->tray_ebox, "button-press-event", G_CALLBACK(TrayIconButtonPress), ginfo);
-	
+
+	g_signal_connect(uinfo->tray_icon, "button-press-event", G_CALLBACK(TrayIconButtonPress), ginfo);
+
 	gtk_widget_show_all(uinfo->tray_menu);
-	
+
 	gtk_widget_hide(uinfo->tray_menu_pause);
-	
-	gtk_widget_show_all(GTK_WIDGET(uinfo->tray_icon));	
-		
+
 	ginfo->tray_icon_made = TRUE;
 }
 
@@ -259,9 +247,11 @@
 				
 		return TRUE;
 	}
-		
+
 	if (event->button == 3) {
-		gtk_menu_popup(GTK_MENU(uinfo->tray_menu), NULL, NULL, NULL, NULL, event->button, event->time);
+		gtk_menu_popup(GTK_MENU(uinfo->tray_menu), NULL, NULL,
+		               gtk_status_icon_position_menu, uinfo->tray_icon,
+		               event->button, event->time);
 		
 		return TRUE;
 	}

grip-3.10.1.tar.gz/src/xpm.h -> grip-4.1.1.tar.gz/src/xpm.h Changed

Build Results
RPM Lint

Refresh

Comments for request 5112 0

Request History

Aloysius created request over 4 years ago

update to 4.1.1

hillwood accepted request over 4 years ago