rev 10481 - in kde-extras/eva/trunk/debian: . patches
Anthony Fok
foka at alioth.debian.org
Mon May 5 20:19:18 UTC 2008
Author: foka
Date: 2008-05-05 20:19:17 +0000 (Mon, 05 May 2008)
New Revision: 10481
Added:
kde-extras/eva/trunk/debian/patches/
kde-extras/eva/trunk/debian/patches/02_autotools_update.diff
kde-extras/eva/trunk/debian/patches/03_libtool_update.diff
kde-extras/eva/trunk/debian/patches/06_fix_ftbfs_with_gcc43.diff
kde-extras/eva/trunk/debian/patches/08_translation_update.diff
Removed:
kde-extras/eva/trunk/debian/README.Debian
Modified:
kde-extras/eva/trunk/debian/changelog
kde-extras/eva/trunk/debian/control
kde-extras/eva/trunk/debian/copyright
kde-extras/eva/trunk/debian/docs
kde-extras/eva/trunk/debian/rules
Log:
Synchronized with Debian upload of eva (0.4.921+svn42-1):
eva (0.4.921+svn42-1) unstable; urgency=low
[ Zhengpeng Hou ]
* Initial release for Debian.
- Taken from the eva-qt3-bugfix branch in upstream SVN,
SVN revision 42, 2008-04-19. (Closes: #349997, #470856)
* Repackaged from scratch, switched from debhelper to cdbs.
[ Anthony Fok ]
* Added myself as an Uploader.
* 08_translation_update.diff: Fixed some typos and revised evo.po for
both zh_CN and zh_TW.
* Fixed Chinese encoding issues in "06_fix_ftbfs_with_gcc43.diff".
* Added Vcs-Svn: https://evaq.svn.sourceforge.net/svnroot/evaq
* Re-added debian/docs to ensure README.zh gets installed.
-- Anthony Fok <foka at debian.org> Tue, 06 May 2008 04:13:41 +0800
Deleted: kde-extras/eva/trunk/debian/README.Debian
Modified: kde-extras/eva/trunk/debian/changelog
===================================================================
--- kde-extras/eva/trunk/debian/changelog 2008-05-05 19:59:16 UTC (rev 10480)
+++ kde-extras/eva/trunk/debian/changelog 2008-05-05 20:19:17 UTC (rev 10481)
@@ -1,6 +1,37 @@
-eva (0.4.921.dfsg+svn20080215-1) unstable; urgency=low
+eva (0.4.921+svn42-1) unstable; urgency=low
- * Initial release. (Closes: #349997, #470856)
- * Drop out the documents for dfsg compatibility.
+ [ Zhengpeng Hou ]
+ * Initial release for Debian.
+ - Taken from the eva-qt3-bugfix branch in upstream SVN,
+ SVN revision 42, 2008-04-19. (Closes: #349997, #470856)
+ * Repackaged from scratch, switched from debhelper to cdbs.
+ [ Anthony Fok ]
+ * Added myself as an Uploader.
+ * 08_translation_update.diff: Fixed some typos and revised evo.po for
+ both zh_CN and zh_TW.
+ * Fixed Chinese encoding issues in "06_fix_ftbfs_with_gcc43.diff".
+ * Added Vcs-Svn: https://evaq.svn.sourceforge.net/svnroot/evaq
+ * Re-added debian/docs to ensure README.zh gets installed.
+
+ -- Anthony Fok <foka at debian.org> Tue, 06 May 2008 04:13:41 +0800
+
+eva (0.4.9+svn20080215-0ubuntu1) hardy; urgency=low
+
+ * New upstream SVN release, upstream has switched to
+ svn now.
+
-- ZhengPeng Hou <zhengpeng-hou at ubuntu.com> Fri, 15 Feb 2008 12:41:06 +0800
+
+eva (0.4.1+cvs20070403-0ubuntu1) feisty; urgency=low
+
+ * New upstream CVS release, fix some critical issues.
+
+ -- ZhengPeng Hou <zhengpeng-hou at ubuntu.com> Thu, 5 Apr 2007 06:06:24 +0800
+
+eva (0.4.1+cvs20070130-0ubuntu1) feisty; urgency=low
+
+ * Initial release for Ubuntu universe.
+
+ -- ZhengPeng Hou <zhengpeng-hou at ubuntu.com> Tue, 30 Jan 2007 10:01:41 +0800
+
Modified: kde-extras/eva/trunk/debian/control
===================================================================
--- kde-extras/eva/trunk/debian/control 2008-05-05 19:59:16 UTC (rev 10480)
+++ kde-extras/eva/trunk/debian/control 2008-05-05 20:19:17 UTC (rev 10481)
@@ -2,9 +2,10 @@
Section: kde
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: Zhengpeng Hou <zhengpeng-hou at ubuntu.com>, Shaodong Di <gnuyhlfh at gmail.com>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, chrpath, kdelibs4-dev
+Uploaders: Zhengpeng Hou <zhengpeng-hou at ubuntu.com>, Shaodong Di <gnuyhlfh at gmail.com>, Anthony Fok <foka at debian.org>
+Build-Depends: debhelper (>= 5.0.0), cdbs, automake, kdelibs4-dev
Standards-Version: 3.7.3
+Vcs-Svn: https://evaq.svn.sourceforge.net/svnroot/evaq
Homepage: http://sourceforge.net/projects/evaq
Package: eva
Modified: kde-extras/eva/trunk/debian/copyright
===================================================================
--- kde-extras/eva/trunk/debian/copyright 2008-05-05 19:59:16 UTC (rev 10480)
+++ kde-extras/eva/trunk/debian/copyright 2008-05-05 20:19:17 UTC (rev 10481)
@@ -1,16 +1,44 @@
-This package was debianized by Hou ZhengPeng <zhengpeng.hou at gmail.com> on
+This package was debianized by Hou Zhengrpeng <zhengpeng.hou at gmail.com> on
Sun, 9 Apr 2006 19:50:55 +0800.
-It was downloaded http://sourceforge.net/projects/evaq
+It was downloaded from http://sourceforge.net/projects/evaq/
-Upstream Authors: casper tlmcasper at 163.com
- yunfan yunfan_zg at 163.com
+Upstream Authors: casper <tlmcasper at 163.com>
+ yunfan <yunfan_zg at 163.com>
-Copyright:
- Copyright (C) 2005, 2006, 2007 by casper tlmcasper at 163.com
- Copyright (C) 2005, 2006, 2007 by yunfan yunfan_zg at 163.com
+Copyright:
+ Copyright (C) 2004-2008 casper <tlmcasper at 163.com>
+ Copyright (C) 2004-2008 yunfan <yunfan_zg at 163.com>
+
+ with the following exceptions:
+ src/ui/evadetailswindow.cpp
+ src/ui/evadetailswindow.h
+ Copyright (C) 2004 by zsyddl
+ src/api/regiongrabber.h
+ src/api/regiongrabber.cpp
+ Copyright (C) 2003 Nadeem Hasan <nhasan at kde.org>
+ src/api/qmdcodec.h
+ src/api/qmdcodec.cpp
+ Copyright (C) 2000-2001 Dawit Alemayehu <adawit at kde.org>
+ Copyright (C) 2001 Rik Hemsley (rikkus) <rik at kde.org>
+ src/evascriptmanager.cpp
+ src/evascriptmanager.h
+ Copyright (C) 2004-2006 Mark Kretschmann <markey at web.de>
+ src/libeva/md5.c
+ src/libeva/md5.h
+ Copyright (C) 1999 Aladdin Enterprises
+ src/libeva/evacrypt.cpp
+ src/libeva/evacrypt.h
+ Copyright (C) 2004 Puzzlebird
+ src/libeva/evaweather.cpp
+ src/libeva/evaweather.h
+ Copyright (C) 2006 Studio KUMA Written by Stark Wong <starkwong at hotmail.com>
+ src/evaidt.cpp
+ Copyright (C) 2004 by nwillis
+
License:
+
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
@@ -29,6 +57,6 @@
Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
The Debian packaging is:
- (C) 2008 Zhengpeng Hou <zhengpeng-hou at ubuntu.com>
- (C) 2008 Shaodong Di <gnuyhlfh at gmail.com>
-and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+ Copyright (C) 2008 Zhengpeng Hou <zhengpeng-hou at ubuntu.com>
+ Copyright (C) 2008 Shaodong Di <gnuyhlfh at gmail.com>
+and is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
Modified: kde-extras/eva/trunk/debian/docs
===================================================================
--- kde-extras/eva/trunk/debian/docs 2008-05-05 19:59:16 UTC (rev 10480)
+++ kde-extras/eva/trunk/debian/docs 2008-05-05 20:19:17 UTC (rev 10481)
@@ -1,5 +1 @@
-AUTHORS
-NEWS
-README
README.zh
-TODO
Added: kde-extras/eva/trunk/debian/patches/02_autotools_update.diff
===================================================================
--- kde-extras/eva/trunk/debian/patches/02_autotools_update.diff (rev 0)
+++ kde-extras/eva/trunk/debian/patches/02_autotools_update.diff 2008-05-05 20:19:17 UTC (rev 10481)
@@ -0,0 +1,1071 @@
+diff -Nrua a/admin/depcomp b/admin/depcomp
+--- a/admin/depcomp 2008-04-25 16:48:06.000000000 +0000
++++ b/admin/depcomp 2008-04-25 16:51:04.000000000 +0000
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # depcomp - compile a program generating dependencies as side-effects
+
+-scriptversion=2005-07-09.11
++scriptversion=2007-03-29.01
+
+-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 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
+@@ -91,7 +92,20 @@
+ ## 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"
++## 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 -eq 0; then :
+ else
+@@ -201,34 +215,39 @@
+ # current directory. Also, the AIX compiler puts `$object:' at the
+ # start of each line; $object doesn't have directory information.
+ # Version 6 uses the directory in both cases.
+- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+- tmpdepfile="$stripped.u"
++ 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$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 -f "$tmpdepfile"; then :
+- else
+- stripped=`echo "$stripped" | sed 's,^.*/,,'`
+- tmpdepfile="$stripped.u"
+- fi
+-
+ if test $stat -eq 0; then :
+ else
+- rm -f "$tmpdepfile"
++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ exit $stat
+ fi
+
++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
++ do
++ test -f "$tmpdepfile" && break
++ done
+ if test -f "$tmpdepfile"; then
+- outname="$stripped.o"
+ # Each line is of the form `foo.o: dependent.h'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
++ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
++ # That's a tab and a space in the [].
++ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ else
+ # The sourcefile does not contain any dependencies, so just
+ # store a dummy comment line, to avoid errors with the Makefile
+@@ -276,6 +295,46 @@
+ 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.
++ 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$base.d
++ tmpdepfile2=$dir.libs/$base.d
++ "$@" -Wc,+Maked
++ else
++ tmpdepfile1=$dir$base.d
++ tmpdepfile2=$dir$base.d
++ "$@" +Maked
++ fi
++ stat=$?
++ if test $stat -eq 0; then :
++ else
++ 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,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
++ # Add `dependent.h:' lines.
++ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
++ else
++ echo "#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'.
+@@ -288,13 +347,13 @@
+
+ if test "$libtool" = yes; then
+ # With Tru64 cc, shared objects can also be used to make a
+- # static library. This mecanism is used in libtool 1.4 series to
++ # static library. This mechanism is used in libtool 1.4 series to
+ # handle both shared and static libraries in a single compilation.
+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+ #
+ # With libtool 1.5 this exception was removed, and libtool now
+ # generates 2 separate objects for the 2 libraries. These two
+- # compilations output dependencies in in $dir.libs/$base.o.d and
++ # 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
+diff -Nrua a/admin/install-sh b/admin/install-sh
+--- a/admin/install-sh 2008-04-25 16:48:06.000000000 +0000
++++ b/admin/install-sh 2008-04-25 16:51:04.000000000 +0000
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # install - install a program, script, or datafile
+
+-scriptversion=2005-11-07.23
++scriptversion=2006-12-25.00
+
+ # This originates from X11R5 (mit/util/scripts/install.sh), which was
+ # later released in X11R6 (xc/config/util/install.sh) with the
+@@ -39,52 +39,68 @@
+ # 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.
++# from scratch.
++
++nl='
++'
++IFS=" "" $nl"
+
+ # set DOITPROG to echo to test this script
+
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+-doit="${DOITPROG-}"
++doit=${DOITPROG-}
++if test -z "$doit"; then
++ doit_exec=exec
++else
++ doit_exec=$doit
++fi
+
+-# put in absolute paths if you don't have them in your path; or use env. vars.
++# Put in absolute file names if you don't have them in your path;
++# or use environment 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}"
++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_glob='?'
++initialize_posix_glob='
++ test "$posix_glob" != "?" || {
++ if (set -f) 2>/dev/null; then
++ posix_glob=
++ else
++ posix_glob=:
++ fi
++ }
++'
+
+-posix_glob=
+ posix_mkdir=
+
+-# Symbolic mode for testing mkdir with directories.
+-# It is the same as 755, but also tests that "u+" works.
+-test_mode=u=rwx,g=rx,o=rx,u+wx
+-
+ # Desired mode of installed file.
+ mode=0755
+
+-# Desired mode of newly created intermediate directories.
+-# It is empty if not known yet.
+-intermediate_mode=
+-
++chgrpcmd=
+ chmodcmd=$chmodprog
+ chowncmd=
+-chgrpcmd=
+-stripcmd=
++mvcmd=$mvprog
+ rmcmd="$rmprog -f"
+-mvcmd="$mvprog"
++stripcmd=
++
+ src=
+ dst=
+ dir_arg=
+-dstarg=
++dst_arg=
++
++copy_on_change=false
+ no_target_directory=
+
+-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
++usage="\
++Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+ or: $0 [OPTION]... SRCFILES... DIRECTORY
+ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+ or: $0 [OPTION]... -d DIRECTORIES...
+@@ -94,81 +110,86 @@
+ In the 4th, create DIRECTORIES.
+
+ Options:
+--c (ignored)
+--d create directories instead of installing files.
+--g GROUP $chgrpprog installed files to GROUP.
+--m MODE $chmodprog installed files to MODE.
+--o USER $chownprog installed files to USER.
+--s $stripprog installed files.
+--t DIRECTORY install into DIRECTORY.
+--T report an error if DSTFILE is a directory.
+---help display this help and exit.
+---version display version info and exit.
++ --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 CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
++ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
++ RMPROG STRIPPROG
+ "
+
+-while test -n "$1"; do
++while test $# -ne 0; do
+ case $1 in
+- -c) shift
+- continue;;
++ -c) ;;
+
+- -d) dir_arg=true
+- shift
+- continue;;
++ -C) copy_on_change=true;;
++
++ -d) dir_arg=true;;
+
+ -g) chgrpcmd="$chgrpprog $2"
+- shift
+- shift
+- continue;;
++ shift;;
+
+ --help) echo "$usage"; exit $?;;
+
+ -m) mode=$2
+- shift
+- shift
+- continue;;
++ case $mode in
++ *' '* | *' '* | *'
++'* | *'*'* | *'?'* | *'['*)
++ echo "$0: invalid mode: $mode" >&2
++ exit 1;;
++ esac
++ shift;;
+
+ -o) chowncmd="$chownprog $2"
+- shift
+- shift
+- continue;;
+-
+- -s) stripcmd=$stripprog
+- shift
+- continue;;
+-
+- -t) dstarg=$2
+- shift
+- shift
+- continue;;
+-
+- -T) no_target_directory=true
+- shift
+- continue;;
++ shift;;
++
++ -s) stripcmd=$stripprog;;
++
++ -t) dst_arg=$2
++ shift;;
++
++ -T) no_target_directory=true;;
+
+ --version) echo "$0 $scriptversion"; exit $?;;
+
+- *) # When -d is used, all remaining arguments are directories to create.
+- # When -t is used, the destination is already specified.
+- test -n "$dir_arg$dstarg" && break
+- # Otherwise, the last argument is the destination. Remove it from $@.
+- for arg
+- do
+- if test -n "$dstarg"; then
+- # $@ is not empty: it contains at least $arg.
+- set fnord "$@" "$dstarg"
+- shift # fnord
+- fi
+- shift # arg
+- dstarg=$arg
+- done
++ --) shift
+ break;;
++
++ -*) echo "$0: invalid option: $1" >&2
++ exit 1;;
++
++ *) break;;
+ esac
++ shift
+ done
+
+-if test -z "$1"; then
++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
++ done
++fi
++
++if test $# -eq 0; then
+ if test -z "$dir_arg"; then
+ echo "$0: no input file specified." >&2
+ exit 1
+@@ -178,13 +199,38 @@
+ exit 0
+ fi
+
+-test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15
++if test -z "$dir_arg"; then
++ trap '(exit $?); exit' 1 2 13 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 starting with `-'.
+ case $src in
+- -*) src=./$src ;;
++ -*) src=./$src;;
+ esac
+
+ if test -n "$dir_arg"; then
+@@ -202,22 +248,22 @@
+ exit 1
+ fi
+
+- if test -z "$dstarg"; then
++ if test -z "$dst_arg"; then
+ echo "$0: no destination specified." >&2
+ exit 1
+ fi
+
+- dst=$dstarg
++ dst=$dst_arg
+ # Protect names starting with `-'.
+ case $dst in
+- -*) dst=./$dst ;;
++ -*) dst=./$dst;;
+ esac
+
+ # If destination is a directory, append the input filename; won't work
+ # if double slashes aren't ignored.
+ if test -d "$dst"; then
+ if test -n "$no_target_directory"; then
+- echo "$0: $dstarg: Is a directory" >&2
++ echo "$0: $dst_arg: Is a directory" >&2
+ exit 1
+ fi
+ dstdir=$dst
+@@ -230,14 +276,25 @@
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
+- X"$dst" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$dst" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'
+ `
+
+ test -d "$dstdir"
+@@ -250,83 +307,131 @@
+ if test $dstdir_status != 0; then
+ case $posix_mkdir in
+ '')
+- posix_mkdir=false
+- if $mkdirprog -m $test_mode -p -- / >/dev/null 2>&1; then
+- posix_mkdir=true
+- else
+- # Remove any dirs left behind by ancient mkdir implementations.
+- rmdir ./-m "$test_mode" ./-p ./-- 2>/dev/null
+- fi ;;
+- esac
+-
+- if
+- $posix_mkdir && {
++ # 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, create it using the same intermediate mode that
+- # mkdir -p would use when creating intermediate directories.
+- # POSIX says that this mode is "$(umask -S),u+wx", so use that
+- # if umask -S works.
+-
++ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+- mkdir_mode=$mode
++ mkdir_mode=-m$mode
+ else
+- case $intermediate_mode in
+- '')
+- if umask_S=`(umask -S) 2>/dev/null`; then
+- intermediate_mode=$umask_S,u+wx
+- else
+- intermediate_mode=$test_mode
+- fi ;;
+- esac
+- mkdir_mode=$intermediate_mode
++ mkdir_mode=
+ fi
+
+- $mkdirprog -m "$mkdir_mode" -p -- "$dstdir"
+- }
++ 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.
++ ;;
++ *)
++ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
++ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
++
++ if (umask $mkdir_umask &&
++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/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-writeable bit of parent directory when it shouldn't.
++ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
++ ls_ld_tmpdir=`ls -ld "$tmpdir"`
++ case $ls_ld_tmpdir in
++ d????-?r-*) different_mode=700;;
++ d????-?--*) different_mode=755;;
++ *) false;;
++ esac &&
++ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
++ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
++ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
++ }
++ }
++ then posix_mkdir=:
++ fi
++ rmdir "$tmpdir/d" "$tmpdir"
++ else
++ # Remove any dirs left behind by ancient mkdir implementations.
++ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
++ fi
++ trap '' 0;;
++ esac;;
++ esac
++
++ if
++ $posix_mkdir && (
++ umask $mkdir_umask &&
++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
++ )
+ then :
+ else
+
+- # 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.
++ # 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
+- /*) pathcomp=/ ;;
+- -*) pathcomp=./ ;;
+- *) pathcomp= ;;
++ /*) prefix='/';;
++ -*) prefix='./';;
++ *) prefix='';;
+ esac
+
+- case $posix_glob in
+- '')
+- if (set -f) 2>/dev/null; then
+- posix_glob=true
+- else
+- posix_glob=false
+- fi ;;
+- esac
++ eval "$initialize_posix_glob"
+
+ oIFS=$IFS
+ IFS=/
+- $posix_glob && set -f
++ $posix_glob set -f
+ set fnord $dstdir
+ shift
+- $posix_glob && set +f
++ $posix_glob set +f
+ IFS=$oIFS
+
++ prefixes=
++
+ for d
+ do
+- test "x$d" = x && continue
++ test -z "$d" && continue
+
+- pathcomp=$pathcomp$d
+- if test ! -d "$pathcomp"; then
+- $mkdirprog "$pathcomp"
+- # Don't fail if two instances are running concurrently.
+- test -d "$pathcomp" || exit 1
++ 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
+- pathcomp=$pathcomp/
++ prefix=$prefix/
+ done
+- obsolete_mkdir_used=true
++
++ 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
+
+@@ -334,7 +439,7 @@
+ { 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
++ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+ else
+
+ # Make a couple of temp file names in the proper directory.
+@@ -345,7 +450,7 @@
+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+ # Copy the file name to the temp name.
+- $doit $cpprog "$src" "$dsttmp" &&
++ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+ # and set any options; do chmod last to preserve setuid bits.
+ #
+@@ -353,41 +458,54 @@
+ # 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"; } &&
+-
+- # Now 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.
+- {
+- if test -f "$dst"; then
+- $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
+- }
+- else
+- :
+- fi
+- } &&
+-
+- # Now rename the file to the real destination.
+- $doit $mvcmd "$dsttmp" "$dst"
+- }
+- } || exit 1
++ { 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` &&
++
++ eval "$initialize_posix_glob" &&
++ $posix_glob set -f &&
++ set X $old && old=:$2:$4:$5:$6 &&
++ set X $new && new=:$2:$4:$5:$6 &&
++ $posix_glob 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
+diff -Nrua a/admin/missing b/admin/missing
+--- a/admin/missing 2008-04-25 16:48:06.000000000 +0000
++++ b/admin/missing 2008-04-25 16:51:04.000000000 +0000
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Common stub for a few missing GNU programs while installing.
+
+-scriptversion=2004-09-07.08
++scriptversion=2006-05-10.23
+
+-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+ # Free Software Foundation, Inc.
+ # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
+
+@@ -19,8 +19,8 @@
+
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -33,6 +33,8 @@
+ fi
+
+ run=:
++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
++sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+ # In the cases where this matters, `missing' is being run in the
+ # srcdir already.
+@@ -44,7 +46,7 @@
+
+ msg="missing on your system"
+
+-case "$1" in
++case $1 in
+ --run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+@@ -77,6 +79,7 @@
+ aclocal touch file \`aclocal.m4'
+ autoconf touch file \`configure'
+ autoheader touch file \`config.h.in'
++ autom4te touch the output file, or create a stub one
+ 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
+@@ -87,12 +90,12 @@
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+ Send bug reports to <bug-automake at gnu.org>."
+- exit 0
++ exit $?
+ ;;
+
+ -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+ echo "missing $scriptversion (GNU Automake)"
+- exit 0
++ exit $?
+ ;;
+
+ -*)
+@@ -106,7 +109,7 @@
+ # Now exit if we have it, but it failed. Also exit now if we
+ # don't have it and --version was passed (most likely to detect
+ # the program).
+-case "$1" in
++case $1 in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+@@ -135,7 +138,7 @@
+
+ # If it does not exist, or fails to run (possibly an outdated version),
+ # try to emulate it.
+-case "$1" in
++case $1 in
+ aclocal*)
+ echo 1>&2 "\
+ WARNING: \`$1' is $msg. You should only need it if
+@@ -164,7 +167,7 @@
+ test -z "$files" && files="config.h"
+ touch_files=
+ for f in $files; do
+- case "$f" in
++ case $f in
+ *:*) touch_files="$touch_files "`echo "$f" |
+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+ *) touch_files="$touch_files $f.in";;
+@@ -192,8 +195,8 @@
+ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+@@ -214,25 +217,25 @@
+ 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
++ if test $# -ne 1; then
+ eval LASTARG="\${$#}"
+- case "$LASTARG" in
++ case $LASTARG in
+ *.y)
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.c
+ fi
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.h
+ fi
+ ;;
+ esac
+ fi
+- if [ ! -f y.tab.h ]; then
++ if test ! -f y.tab.h; then
+ echo >y.tab.h
+ fi
+- if [ ! -f y.tab.c ]; then
++ if test ! -f y.tab.c; then
+ echo 'main() { return 0; }' >y.tab.c
+ fi
+ ;;
+@@ -244,18 +247,18 @@
+ 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
++ if test $# -ne 1; then
+ eval LASTARG="\${$#}"
+- case "$LASTARG" in
++ case $LASTARG in
+ *.l)
+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" lex.yy.c
+ fi
+ ;;
+ esac
+ fi
+- if [ ! -f lex.yy.c ]; then
++ if test ! -f lex.yy.c; then
+ echo 'main() { return 0; }' >lex.yy.c
+ fi
+ ;;
+@@ -267,11 +270,9 @@
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+- if test -z "$file"; then
+- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+- fi
+- if [ -f "$file" ]; then
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
++ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+@@ -288,11 +289,24 @@
+ 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'`
++ # The file to touch is that specified with -o ...
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -z "$file"; then
+- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+- fi
++ # ... or it is the one specified with @setfilename ...
++ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
++ file=`sed -n '
++ /^@setfilename/{
++ s/.* \([^ ]*\) *$/\1/
++ p
++ q
++ }' $infile`
++ # ... or it is derived from the source name (dir/f.texi becomes f.info)
++ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
++ fi
++ # If the file does not exist, the user really needs makeinfo;
++ # let's fail without touching anything.
++ test -f $file || exit 1
+ touch $file
+ ;;
+
+@@ -310,13 +324,13 @@
+ fi
+ firstarg="$1"
+ if shift; then
+- case "$firstarg" in
++ case $firstarg in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+- case "$firstarg" in
++ case $firstarg in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" "$@" && exit 0
+diff -Nrua a/admin/mkinstalldirs b/admin/mkinstalldirs
+--- a/admin/mkinstalldirs 2008-04-25 16:48:06.000000000 +0000
++++ b/admin/mkinstalldirs 2008-04-25 16:51:04.000000000 +0000
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # mkinstalldirs --- make directory hierarchy
+
+-scriptversion=2005-06-29.22
++scriptversion=2006-05-11.19
+
+ # Original author: Noah Friedman <friedman at prep.ai.mit.edu>
+ # Created: 1993-05-16
+@@ -11,6 +11,9 @@
+ # bugs to <bug-automake at gnu.org> or send patches to
+ # <automake-patches at gnu.org>.
+
++nl='
++'
++IFS=" "" $nl"
+ errstatus=0
+ dirmode=
+
+diff -Nrua a/admin/ylwrap b/admin/ylwrap
+--- a/admin/ylwrap 2008-04-25 16:48:06.000000000 +0000
++++ b/admin/ylwrap 2008-04-25 16:51:04.000000000 +0000
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # ylwrap - wrapper for lex/yacc invocations.
+
+-scriptversion=2005-05-14.22
++scriptversion=2007-11-22.22
+
+-# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
++# 2007 Free Software Foundation, Inc.
+ #
+ # Written by Tom Tromey <tromey at cygnus.com>.
+ #
+@@ -101,14 +101,14 @@
+ # FIXME: add hostname here for parallel makes that run commands on
+ # other machines. But that might take us over the 14-char limit.
+ dirname=ylwrap$$
+-trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
++trap "cd '`pwd`'; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
+ mkdir $dirname || exit 1
+
+ cd $dirname
+
+ case $# in
+- 0) $prog "$input" ;;
+- *) $prog "$@" "$input" ;;
++ 0) "$prog" "$input" ;;
++ *) "$prog" "$@" "$input" ;;
+ esac
+ ret=$?
+
Added: kde-extras/eva/trunk/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/eva/trunk/debian/patches/03_libtool_update.diff (rev 0)
+++ kde-extras/eva/trunk/debian/patches/03_libtool_update.diff 2008-05-05 20:19:17 UTC (rev 10481)
@@ -0,0 +1,8960 @@
+diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
+--- a/admin/libtool.m4.in 2008-04-25 16:48:06.000000000 +0000
++++ b/admin/libtool.m4.in 2008-04-25 16:51:04.000000000 +0000
+@@ -1,28 +1,13 @@
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
+-## Free Software Foundation, Inc.
++## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007,
++## 2008 Free Software Foundation, Inc.
+ ## Originally by Gordon Matzigkeit <gord at 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-##
+-## As a special exception to the GNU General Public License, if you
+-## distribute this file as part of a program that contains a
+-## configuration script generated by Autoconf, you may include it under
+-## the same distribution terms that you use for the rest of that program.
++## This file is free software; the Free Software Foundation gives
++## unlimited permission to copy and/or distribute it, with or without
++## modifications, as long as this notice is preserved.
+
+-# serial 47 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-3 AC_PROG_LIBTOOL
+
+
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -82,7 +67,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ AC_SUBST(LIBTOOL)dnl
+
+ # Prevent multiple expansion
+@@ -110,7 +95,6 @@
+ AC_REQUIRE([AC_OBJEXT])dnl
+ AC_REQUIRE([AC_EXEEXT])dnl
+ dnl
+-
+ AC_LIBTOOL_SYS_MAX_CMD_LEN
+ AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+ AC_LIBTOOL_OBJDIR
+@@ -132,7 +116,7 @@
+
+ # Sed substitution that helps us do robust quoting. It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
+ [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+ # Same as above, but do not quote variable references.
+@@ -152,7 +136,7 @@
+ default_ofile=libtool
+ can_build_shared=yes
+
+-# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -172,6 +156,7 @@
+ test -z "$AS" && AS=as
+ test -z "$CC" && CC=cc
+ test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+ test -z "$LN_S" && LN_S="ln -s"
+@@ -184,22 +169,24 @@
+ test -z "$ac_objext" && ac_objext=o
+
+ # Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++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="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ ;;
+ *)
+- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ ;;
+ esac
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+
++_LT_CC_BASENAME([$compiler])
++
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+@@ -209,6 +196,8 @@
+ ;;
+ esac
+
++_LT_REQUIRED_DARWIN_CHECKS
++
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ enable_win32_dll=yes, enable_win32_dll=no)
+@@ -240,11 +229,129 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ ])# _LT_AC_SYS_COMPILER
+
+
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
++AC_DEFUN([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++ case $cc_temp in
++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++])
++
++
++# _LT_COMPILER_BOILERPLATE
++# ------------------------
++# Check for compiler boilerplate output or warnings with
++# the simple compiler test code.
++AC_DEFUN([_LT_COMPILER_BOILERPLATE],
++[AC_REQUIRE([LT_AC_PROG_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.
++AC_DEFUN([_LT_LINKER_BOILERPLATE],
++[AC_REQUIRE([LT_AC_PROG_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
++# --------------------------
++# Check for some things on darwin
++AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
++ case $host_os in
++ rhapsody* | darwin*)
++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
++
++ 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.
++ echo "int foo(void){return 1;}" > conftest.c
++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++ -dynamiclib ${wl}-single_module conftest.c
++ if test -f libconftest.dylib; then
++ lt_cv_apple_cc_single_mod=yes
++ rm -rf libconftest.dylib*
++ fi
++ rm conftest.c
++ 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"
++ ])
++ case $host_os in
++ rhapsody* | darwin1.[[0123]])
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++ darwin1.*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ darwin*)
++ # 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" != ":"; then
++ _lt_dsymutil="~$DSYMUTIL \$lib || :"
++ else
++ _lt_dsymutil=
++ fi
++ ;;
++ esac
++])
++
+ # _LT_AC_SYS_LIBPATH_AIX
+ # ----------------------
+ # Links a minimal program and checks the executable
+@@ -254,12 +361,20 @@
+ # If we don't find anything, use the default library path according
+ # to the aix ld manual.
+ AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_LINK_IFELSE(AC_LANG_PROGRAM,[
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi],[])
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi],[])
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ ])# _LT_AC_SYS_LIBPATH_AIX
+
+@@ -317,15 +432,15 @@
+
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+- if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+- echo_test_string="`eval $cmd`" &&
++ if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++ echo_test_string=`eval $cmd` &&
+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+ then
+ break
+@@ -490,18 +605,21 @@
+ rm -rf conftest*
+ ;;
+
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|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
++ case `/usr/bin/file conftest.o` in
+ *32-bit*)
+- LINUX_64_MODE="32"
+ 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*)
++ ppc64-*linux*|powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+@@ -513,8 +631,10 @@
+ esac
+ ;;
+ *64-bit*)
+- LINUX_64_MODE="64"
+ 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"
+ ;;
+@@ -547,6 +667,26 @@
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
++sparc*-*solaris*)
++ # Find out which ABI we are using.
++ echo 'int i;' > conftest.$ac_ext
++ if AC_TRY_EVAL(ac_compile); then
++ case `/usr/bin/file conftest.o` in
++ *64-bit*)
++ case $lt_cv_prog_gnu_ld in
++ yes*) LD="${LD-ld} -m elf64_sparc" ;;
++ *)
++ 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*
++ ;;
++
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+@@ -570,7 +710,7 @@
+ AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ 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.
+@@ -578,7 +718,7 @@
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -588,8 +728,10 @@
+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+- # So say no if there are warnings
+- if test ! -s conftest.err; then
++ # So say no if there are warnings other than the usual output.
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ $2=yes
+ fi
+ fi
+@@ -609,22 +751,28 @@
+ # ------------------------------------------------------------
+ # Check whether the given compiler option works
+ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+-[AC_CACHE_CHECK([$1], [$2],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $3"
+- printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+- # The compiler can only warn and ignore the option if not recognized
++ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&AS_MESSAGE_LOG_FD
++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if diff conftest.exp conftest.er2 >/dev/null; then
++ $2=yes
++ fi
+ else
+ $2=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+ ])
+
+@@ -643,7 +791,7 @@
+ AC_MSG_CHECKING([the maximum length of command line arguments])
+ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+ i=0
+- testring="ABCD"
++ teststring="ABCD"
+
+ case $build_os in
+ msdosdjgpp*)
+@@ -672,24 +820,77 @@
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+- *)
+- # If test is not a shell built-in, we'll probably end up computing a
+- # maximum length that is only half of the actual maximum length, but
+- # we can't tell.
+- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
+- = "XX$testring") >/dev/null 2>&1 &&
+- new_result=`expr "X$testring" : ".*" 2>&1` &&
+- lt_cv_sys_max_cmd_len=$new_result &&
+- test $i != 17 # 1/2 MB should be enough
+- do
+- i=`expr $i + 1`
+- testring=$testring$testring
+- done
+- testring=
+- # 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`
++ amigaos*)
++ # On AmigaOS with pdksh, this test takes hours, literally.
++ # So we just punt and use a minimum line length of 8192.
++ lt_cv_sys_max_cmd_len=8192;
++ ;;
++
++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++ # This has been around since 386BSD, at least. Likely further.
++ if test -x /sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++ elif test -x /usr/sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++ else
++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
++ fi
++ # And add a safety zone
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++ ;;
++
++ interix*)
++ # We know the value 262144 and hardcode it with a safety zone (like BSD)
++ lt_cv_sys_max_cmd_len=196608
++ ;;
++
++ osf*)
++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++ # nice to cause kernel panics so lets avoid the loop below.
++ # First set a reasonable default.
++ lt_cv_sys_max_cmd_len=16384
++ #
++ if test -x /sbin/sysconfig; then
++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++ *1*) lt_cv_sys_max_cmd_len=-1 ;;
++ esac
++ fi
++ ;;
++ sco3.2v5*)
++ lt_cv_sys_max_cmd_len=102400
++ ;;
++ sysv5* | sco5v6* | sysv4.2uw2*)
++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
++ if test -n "$kargmax"; then
++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
++ else
++ lt_cv_sys_max_cmd_len=32768
++ fi
++ ;;
++ *)
++ 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
++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++ = "XX$teststring") >/dev/null 2>&1 &&
++ new_result=`expr "X$teststring" : ".*" 2>&1` &&
++ lt_cv_sys_max_cmd_len=$new_result &&
++ test $i != 17 # 1/2 MB should be enough
++ do
++ i=`expr $i + 1`
++ teststring=$teststring$teststring
++ done
++ 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
+ ])
+@@ -702,7 +903,7 @@
+
+
+ # _LT_AC_CHECK_DLFCN
+-# --------------------
++# ------------------
+ AC_DEFUN([_LT_AC_CHECK_DLFCN],
+ [AC_CHECK_HEADERS(dlfcn.h)dnl
+ ])# _LT_AC_CHECK_DLFCN
+@@ -710,7 +911,7 @@
+
+ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+ # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+-# ------------------------------------------------------------------
++# ---------------------------------------------------------------------
+ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "$cross_compiling" = yes; then :
+@@ -776,17 +977,19 @@
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ /* dlclose (self); */
+ }
++ else
++ puts (dlerror ());
+
+ exit (status);
+ }]
+ EOF
+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
++ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) $1 ;;
+ x$lt_dlneed_uscore) $2 ;;
+- x$lt_unknown|x*) $3 ;;
++ x$lt_dlunknown|x*) $3 ;;
+ esac
+ else :
+ # compilation failed
+@@ -798,7 +1001,7 @@
+
+
+ # AC_LIBTOOL_DLOPEN_SELF
+-# -------------------
++# ----------------------
+ AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "x$enable_dlopen" != xyes; then
+@@ -835,12 +1038,12 @@
+ 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="-dld"],
++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [AC_CHECK_FUNC([dlopen],
+ [lt_cv_dlopen="dlopen"],
+ [AC_CHECK_LIB([dl], [dlopen],
+@@ -848,7 +1051,7 @@
+ [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="-dld"])
++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ ])
+ ])
+ ])
+@@ -869,7 +1072,7 @@
+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+ save_LDFLAGS="$LDFLAGS"
+- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+ save_LIBS="$LIBS"
+ LIBS="$lt_cv_dlopen_libs $LIBS"
+@@ -882,7 +1085,7 @@
+ ])
+
+ if test "x$lt_cv_dlopen_self" = xyes; then
+- LDFLAGS="$LDFLAGS $link_static_flag"
++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+ AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+ lt_cv_dlopen_self_static, [dnl
+ _LT_AC_TRY_DLOPEN_SELF(
+@@ -914,7 +1117,8 @@
+ # ---------------------------------
+ # Check to see if options -c and -o are simultaneously supported by compiler
+ AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+@@ -922,14 +1126,7 @@
+ mkdir conftest
+ cd conftest
+ mkdir out
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
+- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+- # that will create temporary files in the current directory regardless of
+- # the output directory. Thus, making CWD read-only will cause this test
+- # to fail, enabling locking or at least warning the user not to do parallel
+- # builds.
+- chmod -w .
++ 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
+@@ -937,7 +1134,7 @@
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -949,13 +1146,18 @@
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+- if test ! -s out/conftest.err; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ fi
+ fi
+- chmod u+w .
+- $rm conftest* out/*
+- rmdir out
++ chmod u+w . 2>&AS_MESSAGE_LOG_FD
++ $rm conftest*
++ # SGI C++ compiler will create directory out/ii_files/ for
++ # template instantiation
++ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++ $rm out/* && rmdir out
+ cd ..
+ rmdir conftest
+ $rm conftest*
+@@ -1014,8 +1216,8 @@
+ [AC_MSG_CHECKING([how to hardcode library paths into programs])
+ _LT_AC_TAGVAR(hardcode_action, $1)=
+ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+- test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
++ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
++ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+@@ -1064,6 +1266,7 @@
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
++ old_striplib="$STRIP -S"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+@@ -1072,7 +1275,7 @@
+ *)
+ AC_MSG_RESULT([no])
+ ;;
+- esac
++ esac
+ fi
+ ])# AC_LIBTOOL_SYS_LIB_STRIP
+
+@@ -1081,11 +1284,12 @@
+ # -----------------------------
+ # PORTME Fill in your ld.so characteristics
+ AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+-[AC_MSG_CHECKING([dynamic linker characteristics])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([dynamic linker characteristics])
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -1095,7 +1299,58 @@
+ 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"
++m4_if($1,[],[
++if test "$GCC" = yes; then
++ case $host_os in
++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++ *) lt_awk_arg="/^libraries:/" ;;
++ esac
++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
++ # if the path contains ";" then we assume it to be the separator
++ # otherwise default to the standard path separator (i.e. ":") - it is
++ # assumed that no part of a normal pathname contains ";" but that should
++ # okay in the real world where ";" in dirpaths is itself problematic.
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
++ # 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; }
++}'`
++ sys_lib_search_path_spec=`echo $lt_search_path_spec`
++else
++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi])
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+
+@@ -1113,7 +1368,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[[4-9]]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -1160,7 +1415,7 @@
+ amigaos*)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+
+ beos*)
+@@ -1169,7 +1424,7 @@
+ shlibpath_var=LIBRARY_PATH
+ ;;
+
+-bsdi4*)
++bsdi[[45]]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -1185,7 +1440,7 @@
+
+ cygwin* | mingw* | pw32*)
+ version_type=windows
+- shrext=".dll"
++ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+@@ -1197,7 +1452,8 @@
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+- $install_prog $dir/$dlname \$dldir/$dlname'
++ $install_prog $dir/$dlname \$dldir/$dlname~
++ chmod a+x \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+@@ -1227,7 +1483,7 @@
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
+ ;;
+@@ -1250,13 +1506,9 @@
+ soname_spec='${libname}${release}${major}$shared_ext'
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+- if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+- else
+- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+- fi
++ 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'
+ ;;
+
+@@ -1273,20 +1525,17 @@
+ dynamic_linker=no
+ ;;
+
+-kfreebsd*-gnu*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
+- hardcode_into_libs=yes
+- dynamic_linker='GNU ld.so'
+- ;;
+-
+-freebsd*)
+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++ # DragonFly does not have aout. When/if they implement a new
++ # versioning mechanism, adjust this.
++ if test -x /usr/bin/objformat; then
++ objformat=`/usr/bin/objformat`
++ else
++ case $host_os in
++ freebsd[[123]]*) objformat=aout ;;
++ *) objformat=elf ;;
++ esac
++ fi
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+@@ -1304,14 +1553,19 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.[01]* | freebsdelf3.[01]*)
++ freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+- *) # from 3.2 on
++ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
++ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
++ *) # from 4.6 on, and DragonFly
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
+ esac
+ ;;
+
+@@ -1331,9 +1585,9 @@
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+- case "$host_cpu" in
++ case $host_cpu in
+ ia64*)
+- shrext='.so'
++ shrext_cmds='.so'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -1348,7 +1602,7 @@
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ hppa*64*)
+- shrext='.sl'
++ shrext_cmds='.sl'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -1359,7 +1613,7 @@
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ *)
+- shrext='.sl'
++ shrext_cmds='.sl'
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -1371,6 +1625,18 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
++interix[[3-9]]*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+@@ -1414,29 +1680,26 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+- libsuff=
+- if test "x$LINUX_64_MODE" = x64; then
+- # Some platforms are per default 64-bit, so there's no /lib64
+- if test -d /lib64 -a ! -h /lib64; then
+- libsuff=64
+- fi
+- fi
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
++ # Append ld.so.conf contents to the search path
++ if test -f /etc/ld.so.conf; then
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/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;/^$/d' | tr '\n' ' '`
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ fi
++
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+ # powerpc, because MkLinux only supported shared libraries with the
+ # GNU dynamic linker. Since this was broken with cross compilers,
+@@ -1446,6 +1709,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -1455,7 +1730,7 @@
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+@@ -1483,8 +1758,13 @@
+
+ openbsd*)
+ version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
+ need_lib_prefix=no
+- need_version=no
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -1504,7 +1784,7 @@
+
+ os2*)
+ libname_spec='$name'
+- shrext=".dll"
++ shrext_cmds=".dll"
+ need_lib_prefix=no
+ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+@@ -1522,11 +1802,8 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
+-sco3.2v5*)
+- version_type=osf
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
++rdos*)
++ dynamic_linker=no
+ ;;
+
+ solaris*)
+@@ -1554,7 +1831,7 @@
+ need_version=yes
+ ;;
+
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+@@ -1587,6 +1864,29 @@
+ fi
+ ;;
+
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ version_type=freebsd-elf
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ hardcode_into_libs=yes
++ if test "$with_gnu_ld" = yes; then
++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++ shlibpath_overrides_runpath=no
++ else
++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++ shlibpath_overrides_runpath=yes
++ case $host_os in
++ sco3.2v5*)
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++ ;;
++ esac
++ fi
++ sys_lib_dlsearch_path_spec='/usr/lib'
++ ;;
++
+ uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -1600,13 +1900,26 @@
+ esac
+ AC_MSG_RESULT([$dynamic_linker])
+ test "$dynamic_linker" = no && can_build_shared=no
++
++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
+ ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+
+
+ # _LT_AC_TAGCONFIG
+ # ----------------
+ AC_DEFUN([_LT_AC_TAGCONFIG],
+-[AC_ARG_WITH([tags],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_ARG_WITH([tags],
+ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+ [include additional configurations @<:@automatic@:>@])],
+ [tagnames="$withval"])
+@@ -1624,6 +1937,9 @@
+ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+ fi
+ fi
++ if test -z "$LTCFLAGS"; then
++ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++ fi
+
+ # Extract list of available tagged configurations in $ofile.
+ # Note that this assumes the entire list is on one line.
+@@ -1650,7 +1966,9 @@
+
+ case $tagname in
+ CXX)
+- if test -n "$CXX" && test "X$CXX" != "Xno"; then
++ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
+ AC_LIBTOOL_LANG_CXX_CONFIG
+ else
+ tagname=""
+@@ -1712,7 +2030,7 @@
+
+ # AC_LIBTOOL_WIN32_DLL
+ # --------------------
+-# declare package support for building win32 dll's
++# declare package support for building win32 DLLs
+ AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+ [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+ ])# AC_LIBTOOL_WIN32_DLL
+@@ -1750,7 +2068,7 @@
+
+ # AC_DISABLE_SHARED
+ # -----------------
+-#- set the default shared flag to --disable-shared
++# set the default shared flag to --disable-shared
+ AC_DEFUN([AC_DISABLE_SHARED],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_SHARED(no)
+@@ -1862,7 +2180,7 @@
+
+ # AC_PATH_TOOL_PREFIX
+ # -------------------
+-# find a file program which can recognise shared library
++# find a file program which can recognize shared library
+ AC_DEFUN([AC_PATH_TOOL_PREFIX],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_MSG_CHECKING([for $1])
+@@ -1886,7 +2204,7 @@
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+@@ -1925,7 +2243,7 @@
+
+ # AC_PATH_MAGIC
+ # -------------
+-# find a file program which can recognise a shared library
++# find a file program which can recognize a shared library
+ AC_DEFUN([AC_PATH_MAGIC],
+ [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+@@ -1996,7 +2314,7 @@
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ lt_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+- # but apparently some GNU ld's only accept -v.
++ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+@@ -2028,7 +2346,7 @@
+ AC_DEFUN([AC_PROG_LD_GNU],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+ lt_cv_prog_gnu_ld=yes
+@@ -2055,6 +2373,15 @@
+ *) reload_flag=" $reload_flag" ;;
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++ darwin*)
++ if test "$GCC" = yes; then
++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++ else
++ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++ fi
++ ;;
++esac
+ ])# AC_PROG_LD_RELOAD_FLAG
+
+
+@@ -2063,7 +2390,7 @@
+ # how to check for library dependencies
+ # -- PORTME fill in with the dynamic library characteristics
+ AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+-[AC_CACHE_CHECK([how to recognise dependent libraries],
++[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=
+@@ -2080,7 +2407,7 @@
+ # whether `pass_all' will *always* work, you probably want this one.
+
+ case $host_os in
+-aix4* | aix5*)
++aix[[4-9]]*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -2088,44 +2415,42 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-bsdi4*)
++bsdi[[45]]*)
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+ lt_cv_file_magic_cmd='/usr/bin/file -L'
+ lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
+
+ cygwin*)
+- lt_cv_deplibs_check_method=pass_all
++ # func_win32_libid is a shell function defined in ltmain.sh
++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++ lt_cv_file_magic_cmd='func_win32_libid'
+ ;;
+-
++
+ mingw* | pw32*)
+- # win32_libid is a shell function defined in ltmain.sh
+- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+- lt_cv_file_magic_cmd='win32_libid'
++ # Base MSYS/MinGW do not provide the 'file' command needed by
++ # func_win32_libid shell function, so use a weaker test based on 'objdump',
++ # 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
++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++ lt_cv_file_magic_cmd='$OBJDUMP -f'
++ fi
+ ;;
+
+ darwin* | rhapsody*)
+- # this will be overwritten by pass_all, but leave it in just in case
+- lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+- lt_cv_file_magic_cmd='/usr/bin/file -L'
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
+- lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
+- ;;
+- *) # Darwin 1.3 on
+- lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+- ;;
+- esac
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-freebsd* | kfreebsd*-gnu)
++freebsd* | dragonfly*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ case $host_cpu in
+ i*86 )
+ # Not sure whether the presence of OpenBSD here was a mistake.
+ # Let's accept both of them until this is cleared up.
+- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ ;;
+@@ -2141,7 +2466,7 @@
+
+ hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+- case "$host_cpu" in
++ case $host_cpu in
+ ia64*)
+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+@@ -2157,43 +2482,27 @@
+ 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 $host_os in
+- irix5* | nonstopux*)
+- # this will be overridden with pass_all, but let us keep it just in case
+- lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+- ;;
+- *)
+- case $LD in
+- *-32|*"-32 ") libmagic=32-bit;;
+- *-n32|*"-n32 ") libmagic=N32;;
+- *-64|*"-64 ") libmagic=64-bit;;
+- *) libmagic=never-match;;
+- esac
+- # this will be overridden with pass_all, but let us keep it just in case
+- lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
+- ;;
++ case $LD in
++ *-32|*"-32 ") libmagic=32-bit;;
++ *-n32|*"-n32 ") libmagic=N32;;
++ *-64|*"-64 ") libmagic=64-bit;;
++ *) libmagic=never-match;;
+ esac
+- lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+ # This must be Linux ELF.
+-linux*)
+- case $host_cpu in
+- alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
+- lt_cv_deplibs_check_method=pass_all ;;
+- # the debian people say, arm and glibc 2.3.1 works for them with pass_all
+- arm* )
+- lt_cv_deplibs_check_method=pass_all ;;
+- *)
+- # glibc up to 2.1.1 does not perform some relocations on ARM
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
+- esac
+- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
++linux* | k*bsd*-gnu)
++ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ else
+@@ -2212,32 +2521,26 @@
+ ;;
+
+ openbsd*)
+- lt_cv_file_magic_cmd=/usr/bin/file
+- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+ else
+- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ fi
+ ;;
+
+ osf3* | osf4* | osf5*)
+- # this will be overridden with pass_all, but let us keep it just in case
+- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+- lt_cv_file_magic_test_file=/shlib/libc.so
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-sco3.2v5*)
++rdos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+ solaris*)
+ lt_cv_deplibs_check_method=pass_all
+- lt_cv_file_magic_test_file=/lib/libc.so
+ ;;
+
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+ case $host_vendor in
+ motorola)
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+@@ -2258,10 +2561,13 @@
+ siemens)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
++ pc)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
+ esac
+ ;;
+
+-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ esac
+@@ -2281,36 +2587,43 @@
+ # Let the user override the test.
+ lt_cv_path_NM="$NM"
+ else
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+- IFS="$lt_save_ifs"
+- test -z "$ac_dir" && ac_dir=.
+- tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+- # Check to see if the nm accepts a BSD-compat flag.
+- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+- # nm: unknown option "B" ignored
+- # Tru64's nm complains that /dev/null is an invalid object file
+- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+- */dev/null* | *'Invalid file or object type'*)
+- lt_cv_path_NM="$tmp_nm -B"
+- break
+- ;;
+- *)
+- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+- */dev/null*)
+- lt_cv_path_NM="$tmp_nm -p"
++ lt_nm_to_check="${ac_tool_prefix}nm"
++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++ lt_nm_to_check="$lt_nm_to_check nm"
++ fi
++ for lt_tmp_nm in $lt_nm_to_check; do
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++ IFS="$lt_save_ifs"
++ test -z "$ac_dir" && ac_dir=.
++ tmp_nm="$ac_dir/$lt_tmp_nm"
++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++ # Check to see if the nm accepts a BSD-compat flag.
++ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++ # nm: unknown option "B" ignored
++ # Tru64's nm complains that /dev/null is an invalid object file
++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++ */dev/null* | *'Invalid file or object type'*)
++ lt_cv_path_NM="$tmp_nm -B"
+ break
+ ;;
+ *)
+- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+- continue # so that we can try to find one that supports BSD flags
++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++ */dev/null*)
++ lt_cv_path_NM="$tmp_nm -p"
++ break
++ ;;
++ *)
++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++ continue # so that we can try to find one that supports BSD flags
++ ;;
++ esac
+ ;;
+ esac
+- esac
+- fi
++ fi
++ done
++ IFS="$lt_save_ifs"
+ done
+- IFS="$lt_save_ifs"
+ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi])
+ NM="$lt_cv_path_NM"
+@@ -2342,13 +2655,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl convenience library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
+-# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will
+-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
+-# '${top_srcdir}/' (note the single quotes!). If your package is not
+-# flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-convenience to the configure arguments. Note that
++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
++# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
++# (note the single quotes!). If your package is not flat and you're not
++# using automake, define top_builddir and top_srcdir appropriately in
++# the Makefiles.
+ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ case $enable_ltdl_convenience in
+@@ -2367,13 +2680,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl installable library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments. Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
+-# DIRECTORY is not provided and an installed libltdl is not found, it is
+-# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/'
+-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+-# quotes!). If your package is not flat and you're not using automake,
+-# define top_builddir and top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-install to the configure arguments. Note that
++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
++# and an installed libltdl is not found, it is assumed to be `libltdl'.
++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
++# '${top_srcdir}/' (note the single quotes!). If your package is not
++# flat and you're not using automake, define top_builddir and top_srcdir
++# appropriately in the Makefiles.
+ # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+@@ -2411,10 +2724,21 @@
+ # ---------------
+ AC_DEFUN([_LT_AC_LANG_CXX],
+ [AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+ ])# _LT_AC_LANG_CXX
+
++# _LT_AC_PROG_CXXCPP
++# ------------------
++AC_DEFUN([_LT_AC_PROG_CXXCPP],
++[
++AC_REQUIRE([AC_PROG_CXX])
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
++ AC_PROG_CXXCPP
++fi
++])# _LT_AC_PROG_CXXCPP
+
+ # AC_LIBTOOL_F77
+ # --------------
+@@ -2454,7 +2778,7 @@
+
+
+ # AC_LIBTOOL_RC
+-# --------------
++# -------------
+ # enable support for Windows resource files
+ AC_DEFUN([AC_LIBTOOL_RC],
+ [AC_REQUIRE([LT_AC_PROG_RC])
+@@ -2480,43 +2804,16 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++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);}\n'
++lt_simple_link_test_code='int main(){return(0);}'
+
+ _LT_AC_SYS_COMPILER
+
+-#
+-# Check for any special shared library compilation flags.
+-#
+-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
+-if test "$GCC" = no; then
+- case $host_os in
+- sco3.2v5*)
+- _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
+- ;;
+- esac
+-fi
+-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
+- AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
+- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then :
+- else
+- AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
+- _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
+- fi
+-fi
+-
+-
+-#
+-# Check to make sure the static flag actually works.
+-#
+-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
+- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+- $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
+- [],
+- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+-
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
+
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+@@ -2530,9 +2827,9 @@
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
++AC_LIBTOOL_DLOPEN_SELF
+
+-# Report which librarie types wil actually be built
++# Report which library types will actually be built
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+
+@@ -2541,7 +2838,7 @@
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+@@ -2550,48 +2847,11 @@
+ fi
+ ;;
+
+-aix4*)
++aix[[4-9]]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+- ;;
+- darwin* | rhapsody*)
+- if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- ;;
+- 10.*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
+- esac
+- output_verbose_link_cmd='echo'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
++ ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+
+@@ -2616,7 +2876,7 @@
+ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+ [AC_LANG_PUSH(C++)
+ AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -2628,6 +2888,7 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+ _LT_AC_TAGVAR(module_cmds, $1)=
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+@@ -2643,23 +2904,28 @@
+ _LT_AC_TAGVAR(predeps, $1)=
+ _LT_AC_TAGVAR(postdeps, $1)=
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+
+ # Source file extension for C++ test sources.
+-ac_ext=cc
++ac_ext=cpp
+
+ # Object file extension for compiled C++ test sources.
+ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++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); }\n'
++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_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+@@ -2670,18 +2936,18 @@
+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+- unset lt_cv_prog_gnu_ld
++ $as_unset lt_cv_prog_gnu_ld
+ fi
+ if test -n "${lt_cv_path_LDCXX+set}"; then
+ lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+- unset lt_cv_path_LD
++ $as_unset lt_cv_path_LD
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
+ CC=${CXX-"c++"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+@@ -2699,8 +2965,8 @@
+ # 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_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+@@ -2726,7 +2992,7 @@
+ # 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_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
++ _LT_AC_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
+@@ -2748,7 +3014,7 @@
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- aix4* | aix5*)
++ 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.
+@@ -2756,8 +3022,23 @@
+ exp_sym_flag='-Bexport'
+ no_entry_flag=""
+ else
+- # KDE requires run time linking. Make it the default.
+- aix_use_runtimelinking=yes
++ aix_use_runtimelinking=no
++
++ # Test if we are trying to use run time linking or normal
++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++ # need to do runtime linking.
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|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
+@@ -2774,7 +3055,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+ if test "$GXX" = yes; then
+- case $host_os in aix4.[012]|aix4.[012].*)
++ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -2782,7 +3063,7 @@
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ :
+ else
+ # We have old collect2
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -2793,8 +3074,12 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ fi
++ ;;
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -2803,15 +3088,16 @@
+ shared_flag='-G'
+ else
+ if test "$aix_use_runtimelinking" = yes; then
+- shared_flag='-qmkshrobj ${wl}-G'
++ shared_flag='${wl}-G'
+ else
+- shared_flag='-qmkshrobj'
++ shared_flag='${wl}-bM:SRE'
+ fi
+ fi
+ fi
+
+- # Let the compiler handle the export list.
+- _LT_AC_TAGVAR(always_export_symbols, $1)=no
++ # It seems that -bexpall does not export symbols beginning with
++ # underscore (_), so it is better to generate a list of symbols to export.
++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+@@ -2820,13 +3106,12 @@
+ _LT_AC_SYS_LIBPATH_AIX
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an empty executable.
+ _LT_AC_SYS_LIBPATH_AIX
+@@ -2835,16 +3120,26 @@
+ # -berok will link without error, but may produce a broken library.
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+- # -bexpall does not export symbols beginning with underscore (_)
+- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ # Exported symbols can be pulled into shared objects from archives
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+- # This is similar to how AIX traditionally builds it's shared libraries.
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
++
++ beos*)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
++ # support --undefined. This deserves some investigation. FIXME
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
++
+ chorus*)
+ case $cc_basename in
+ *)
+@@ -2858,12 +3153,12 @@
+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is; otherwise, prepend...
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -2872,70 +3167,53 @@
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+- $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+-
+- darwin* | rhapsody*)
+- if test "$GXX" = yes; then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
++ darwin* | rhapsody*)
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
++ if test "$GXX" = yes ; then
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_AC_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_AC_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}"
++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++ _LT_AC_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
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- ;;
+- 10.*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+- ;;
+- esac
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ esac
+ fi
+- ;;
+- esac
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+- fi
+- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- else
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- fi
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
++ ;;
+
+ dgux*)
+ case $cc_basename in
+- ec++)
++ ec++*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- ghcx)
++ ghcx*)
+ # Green Hills C++ Compiler
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -2946,14 +3224,14 @@
+ ;;
+ esac
+ ;;
+- freebsd[12]*)
++ freebsd[[12]]*)
+ # C++ shared libraries reported to be fairly broken before switch to ELF
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ freebsd-elf*)
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ ;;
+- freebsd* | kfreebsd*-gnu)
++ freebsd* | dragonfly*)
+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+ # conventions
+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+@@ -2970,12 +3248,12 @@
+ # location of the library.
+
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- aCC)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ aCC*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+@@ -2984,11 +3262,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; echo $list'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${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_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -2998,33 +3276,20 @@
+ ;;
+ hpux10*|hpux11*)
+ if test $with_gnu_ld = no; then
+- case "$host_cpu" in
+- hppa*64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+- ;;
+- ia64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- ;;
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++ case $host_cpu in
++ hppa*64*|ia64*) ;;
+ *)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
+ esac
+ fi
+- case "$host_cpu" in
+- hppa*64*)
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- ;;
+- ia64*)
++ case $host_cpu in
++ hppa*64*|ia64*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+- # but as the default
+- # location of the library.
+ ;;
+ *)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+@@ -3035,17 +3300,20 @@
+ esac
+
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- aCC)
+- case "$host_cpu" in
+- hppa*64*|ia64*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++ aCC*)
++ case $host_cpu in
++ hppa*64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ esac
+ # Commands to make compiler produce verbose output that lists
+@@ -3061,12 +3329,15 @@
+ *)
+ if test "$GXX" = yes; then
+ if test $with_gnu_ld = no; then
+- case "$host_cpu" in
+- ia64*|hppa*64*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++ case $host_cpu in
++ hppa*64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ esac
+ fi
+@@ -3077,11 +3348,25 @@
+ ;;
+ esac
+ ;;
++ interix[[3-9]]*)
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++ # Instead, shared libraries are loaded at an image base (0x10000000 by
++ # default) and relocated if they conflict, which is a slow very memory
++ # consuming and fragmenting process. To avoid this, we pick a random,
++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ ;;
+ irix5* | irix6*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # SGI C++
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+ # Archives containing C++ object files must be created using
+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+@@ -3092,9 +3377,9 @@
+ *)
+ if test "$GXX" = yes; then
+ if test "$with_gnu_ld" = no; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+ fi
+ fi
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+@@ -3103,16 +3388,16 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
+- linux*)
++ linux* | k*bsd*-gnu)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+- _LT_AC_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 $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
+- _LT_AC_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 $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++ _LT_AC_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_AC_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.
+@@ -3130,20 +3415,44 @@
+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ ;;
+- icpc)
++ icpc*)
+ # Intel C++
+ with_gnu_ld=yes
++ # version 8.0 and above of icpc choke on multiply defined symbols
++ # if we add $predep_objects and $postdep_objects, however 7.1 and
++ # earlier do not add the objects themselves.
++ case `$CC -V 2>&1` in
++ *"Version 7."*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++ *) # Version 8.0 or newer
++ tmp_idyn=
++ case $host_cpu in
++ ia64*) tmp_idyn=' -i_dynamic';;
++ esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++ esac
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ ;;
+- cxx)
++ pgCC* | pgcpp*)
++ # Portland Group C++ compiler
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ ;;
++ cxx*)
+ # Compaq C++
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+ runpath_var=LD_RUN_PATH
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -3159,6 +3468,29 @@
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $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; echo $list'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ _LT_AC_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; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++ # Not sure whether something based on
++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++ # would be better.
++ output_verbose_link_cmd='echo'
++
++ # Archives containing C++ object files must be created using
++ # "CC -xar", where "CC" is the Sun C++ compiler. This is
++ # necessary to make sure instantiated templates are included
++ # in the archive.
++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+ lynxos*)
+@@ -3171,7 +3503,7 @@
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+@@ -3181,7 +3513,7 @@
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+ wlarc=
+@@ -3192,15 +3524,35 @@
+ # Workaround some broken pre-1.5 toolchains
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+ ;;
++ openbsd2*)
++ # C++ shared libraries are fairly broken
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ openbsd*)
++ if test -f /usr/libexec/ld.so; then
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ fi
++ output_verbose_link_cmd='echo'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
+ osf3*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+- _LT_AC_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 $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++ _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3210,14 +3562,14 @@
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+
+ ;;
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- cxx)
++ cxx*)
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3235,7 +3587,7 @@
+ *)
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3254,13 +3606,13 @@
+ ;;
+ osf4* | osf5*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+- _LT_AC_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 $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++ _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3269,17 +3621,17 @@
+ # the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+ ;;
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- cxx)
++ cxx*)
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ echo "-hidden">> $lib.exp~
+- $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+ $rm $lib.exp'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -3298,7 +3650,7 @@
+ *)
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3319,27 +3671,14 @@
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- sco*)
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case $cc_basename in
+- CC)
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
+- *)
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
+- esac
+- ;;
+ sunos4*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.x
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- lcc)
++ lcc*)
+ # Lucid
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -3352,36 +3691,28 @@
+ ;;
+ solaris*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
++ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ case $host_os in
+- solaris2.[0-5] | solaris2.[0-5].*) ;;
++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+- # The C++ compiler is used as linker so we must use $wl
+- # flag to pass the commands to the underlying system
+- # linker.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+ ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- #
+- # There doesn't appear to be a way to prevent this compiler from
+- # explicitly linking system object files so we need to strip them
+- # from the output so that they don't get included in the library
+- # dependencies.
+- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+@@ -3389,9 +3720,9 @@
+ # in the archive.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+ ;;
+- gcx)
++ gcx*)
+ # Green Hills C++ Compiler
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++ _LT_AC_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_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+@@ -3401,9 +3732,9 @@
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ if $CC --version | grep -v '^2\.7' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++ $CC -shared -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
+@@ -3412,9 +3743,9 @@
+ else
+ # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # platform.
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $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
+@@ -3423,16 +3754,73 @@
+ fi
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++ case $host_os in
++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++ *)
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ ;;
++ esac
+ fi
+ ;;
+ esac
+ ;;
+- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ runpath_var='LD_RUN_PATH'
++
++ case $cc_basename in
++ CC*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ esac
++ ;;
++ sysv5* | sco3.2v5* | sco5v6*)
++ # Note: We can NOT use -z defs as we might desire, because we do not
++ # link with -lc, and that would cause any symbols used from libc to
++ # always be unresolved, which means just about no library would
++ # ever link correctly. If we're not using GNU ld we use -z text
++ # though, which does catch some bad symbols but isn't as heavy-handed
++ # as -z defs.
++ # For security reasons, it is highly recommended that you always
++ # use absolute paths for naming shared libraries, and exclude the
++ # DT_RUNPATH tag from executables and libraries. But doing so
++ # requires that you compile everything twice, which is a pain.
++ # So that behaviour is only enabled if SCOABSPATH is set to a
++ # non-empty value in the environment. Most likely only useful for
++ # creating official distributions of packages.
++ # This is a hack until libtool officially supports absolute path
++ # names for shared libraries.
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++ runpath_var='LD_RUN_PATH'
++
++ case $cc_basename in
++ CC*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ esac
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -3469,8 +3857,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+
+ AC_LIBTOOL_CONFIG($1)
+
+@@ -3488,12 +3874,13 @@
+ ])# AC_LIBTOOL_LANG_CXX_CONFIG
+
+ # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+-# ------------------------
++# ------------------------------------
+ # Figure out "hidden" library dependencies from verbose
+ # compiler output when linking a shared library.
+ # Parse the compiler output and extract the necessary
+ # objects, libraries and library flags.
+-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ 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
+@@ -3542,7 +3929,7 @@
+ # The `*' in the case matches for architectures that use `case' in
+ # $output_verbose_cmd can trigger glob expansion during the loop
+ # eval without this substitution.
+- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+
+ for p in `eval $output_verbose_link_cmd`; do
+ case $p in
+@@ -3582,7 +3969,7 @@
+ fi
+ ;;
+
+- *.$objext|*.$libext)
++ *.$objext)
+ # This assumes that the test object file only shows up
+ # once in the compiler output.
+ if test "$p" = "conftest.$objext"; then
+@@ -3618,13 +4005,74 @@
+
+ $rm -f confest.$objext
+
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
++if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
++
++# PORTME: override above test on systems where it is broken
++ifelse([$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_AC_TAGVAR(predep_objects,$1)=
++ _LT_AC_TAGVAR(postdep_objects,$1)=
++ _LT_AC_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_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++ fi
++ ;;
++ esac
++ ;;
++
++solaris*)
++ case $cc_basename in
++ CC*)
++ # 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_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++ fi
++ ;;
++ esac
++ ;;
++esac
++])
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+ ])# AC_LIBTOOL_POSTDEP_PREDEP
+
+ # AC_LIBTOOL_LANG_F77_CONFIG
+-# ------------------------
++# --------------------------
+ # Ensure that the configuration vars for the C compiler are
+ # suitably defined. Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+@@ -3660,20 +4108,31 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code=" subroutine t\n return\n end\n"
++lt_simple_compile_test_code="\
++ subroutine t
++ return
++ end
++"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code=" program t\n end\n"
++lt_simple_link_test_code="\
++ program t
++ end
++"
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+@@ -3683,7 +4142,7 @@
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+@@ -3691,8 +4150,10 @@
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+-aix4*)
+- test "$enable_shared" = yes && enable_static=no
++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])
+@@ -3702,8 +4163,6 @@
+ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+-
+ _LT_AC_TAGVAR(GCC, $1)="$G77"
+ _LT_AC_TAGVAR(LD, $1)="$LD"
+
+@@ -3713,8 +4172,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-
+
+ AC_LIBTOOL_CONFIG($1)
+
+@@ -3740,23 +4197,30 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++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) {}; }\n'
++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_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+@@ -3768,8 +4232,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+
+ AC_LIBTOOL_CONFIG($1)
+
+@@ -3779,7 +4241,7 @@
+
+
+ # AC_LIBTOOL_LANG_RC_CONFIG
+-# --------------------------
++# -------------------------
+ # Ensure that the configuration vars for the Windows resource compiler are
+ # suitably defined. Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+@@ -3795,7 +4257,7 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++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"
+@@ -3803,11 +4265,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+ AC_LIBTOOL_CONFIG($1)
+@@ -3833,11 +4300,12 @@
+ # without removal of \ escapes.
+ if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+- fi
++ fi
+ # Now quote all the things that may contain metacharacters while being
+ # careful not to overquote the AC_SUBSTed values. We take copies of the
+ # variables and quote the copies for generation of the libtool script.
+- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
++ SED SHELL STRIP \
+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+ deplibs_check_method reload_flag reload_cmds need_locks \
+@@ -3863,6 +4331,7 @@
+ _LT_AC_TAGVAR(predeps, $1) \
+ _LT_AC_TAGVAR(postdeps, $1) \
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
+ _LT_AC_TAGVAR(archive_cmds, $1) \
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+ _LT_AC_TAGVAR(postinstall_cmds, $1) \
+@@ -3878,6 +4347,7 @@
+ _LT_AC_TAGVAR(module_cmds, $1) \
+ _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
++ _LT_AC_TAGVAR(fix_srcfile_path, $1) \
+ _LT_AC_TAGVAR(exclude_expsyms, $1) \
+ _LT_AC_TAGVAR(include_expsyms, $1); do
+
+@@ -3887,7 +4357,7 @@
+ _LT_AC_TAGVAR(archive_cmds, $1) | \
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+ _LT_AC_TAGVAR(module_cmds, $1) | \
+- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
++ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+ extract_expsyms_cmds | reload_cmds | finish_cmds | \
+@@ -3924,7 +4394,7 @@
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -3953,11 +4423,11 @@
+ SED=$lt_SED
+
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++Xsed="$SED -e 1s/^X//"
+
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+@@ -3988,6 +4458,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -3999,6 +4475,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+
+@@ -4018,7 +4497,7 @@
+ NM=$lt_NM
+
+ # A symbol stripping program
+-STRIP=$STRIP
++STRIP=$lt_STRIP
+
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -4049,7 +4528,7 @@
+ libext="$libext"
+
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -4064,7 +4543,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+
+ # Do we need the lib prefix for modules?
+@@ -4152,6 +4631,10 @@
+ # shared library.
+ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+@@ -4240,7 +4723,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
++fix_srcfile_path=$lt_fix_srcfile_path
+
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+@@ -4293,7 +4776,10 @@
+ # If there is no Makefile yet, we rely on a make rule to execute
+ # `config.status --recheck' to rerun these tests and create the
+ # libtool script then.
+- test -f Makefile && make "$ltmain"
++ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++ if test -f "$ltmain_in"; then
++ test -f Makefile && make "$ltmain"
++ fi
+ fi
+ ])# AC_LIBTOOL_CONFIG
+
+@@ -4320,6 +4806,7 @@
+ # ---------------------------------
+ AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+ [AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([LT_AC_PROG_SED])
+ AC_REQUIRE([AC_PROG_NM])
+ AC_REQUIRE([AC_OBJEXT])
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+@@ -4335,9 +4822,6 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+
+@@ -4359,14 +4843,30 @@
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
+ ;;
++linux* | k*bsd*-gnu)
++ if test "$host_cpu" = ia64; then
++ symcode='[[ABCDGIRSTW]]'
++ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
++ fi
++ ;;
+ irix* | nonstopux*)
+ symcode='[[BCDEGRST]]'
+ ;;
+ osf*)
+ symcode='[[BCDEGQRST]]'
+ ;;
+-solaris* | sysv5*)
+- symcode='[[BDT]]'
++solaris*)
++ symcode='[[BDRT]]'
++ ;;
++sco3.2v5*)
++ symcode='[[DT]]'
++ ;;
++sysv4.2uw2*)
++ symcode='[[DT]]'
++ ;;
++sysv5* | sco5v6* | unixware* | OpenUNIX*)
++ symcode='[[ABDT]]'
+ ;;
+ sysv4)
+ symcode='[[DFNSTU]]'
+@@ -4384,14 +4884,17 @@
+ # If we're using GNU nm, then use its standard symbol codes.
+ case `$NM -V 2>&1` in
+ *GNU* | *'with BFD'*)
+- symcode='[[ABCDGISTW]]' ;;
++ symcode='[[ABCDGIRSTW]]' ;;
+ esac
+
+ # Try without a prefix undercore, then with it.
+ for ac_symprfx in "" "_"; do
+
++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++ symxfrm="\\1 $ac_symprfx\\2 \\2"
++
+ # Write the raw and C identifiers.
+- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+
+ # Check to see that the pipe works correctly.
+ pipe_works=no
+@@ -4481,7 +4984,7 @@
+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+ cat conftest.$ac_ext >&5
+ fi
+- rm -f conftest* conftst*
++ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+ if test "$pipe_works" = yes; then
+@@ -4530,13 +5033,16 @@
+ # like `-m68040'.
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+- mingw* | os2* | pw32*)
++ mingw* | cygwin* | os2* | pw32*)
+ # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+@@ -4547,6 +5053,10 @@
+ # DJGPP does not support shared libraries at all
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $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_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+@@ -4555,7 +5065,7 @@
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ ;;
+ *)
+@@ -4569,7 +5079,7 @@
+ esac
+ else
+ case $host_os in
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+@@ -4580,18 +5090,28 @@
+ ;;
+ chorus*)
+ case $cc_basename in
+- cxch68)
++ cxch68*)
+ # Green Hills C++ Compiler
+ # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ ;;
+ esac
+ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ ;;
++ esac
++ ;;
+ dgux*)
+ case $cc_basename in
+- ec++)
++ ec++*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ ;;
+- ghcx)
++ ghcx*)
+ # Green Hills C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+@@ -4599,22 +5119,22 @@
+ ;;
+ esac
+ ;;
+- freebsd* | kfreebsd*-gnu)
++ freebsd* | dragonfly*)
+ # FreeBSD uses GNU C++
+ ;;
+ hpux9* | hpux10* | hpux11*)
+ case $cc_basename in
+- CC)
++ CC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ if test "$host_cpu" != ia64; then
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ fi
+ ;;
+- aCC)
++ aCC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+- case "$host_cpu" in
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -4627,9 +5147,13 @@
+ ;;
+ esac
+ ;;
++ interix*)
++ # This is c89, which is MS Visual C++ (no shared libs)
++ # Anyone wants to do a port?
++ ;;
+ irix5* | irix6* | nonstopux*)
+ case $cc_basename in
+- CC)
++ CC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ # CC pic flag -KPIC is the default.
+@@ -4638,20 +5162,26 @@
+ ;;
+ esac
+ ;;
+- linux*)
++ linux* | k*bsd*-gnu)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # KAI C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+- icpc)
++ icpc* | ecpc*)
+ # Intel C++
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+- ;;
+- cxx)
++ ;;
++ pgCC* | pgcpp*)
++ # Portland Group C++ compiler.
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++ cxx*)
+ # Compaq C++
+ # Make sure the PIC flag is empty. It appears that all Alpha
+ # Linux and Compaq Tru64 Unix objects are PIC.
+@@ -4659,6 +5189,14 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++ ;;
++ esac
+ ;;
+ esac
+ ;;
+@@ -4668,25 +5206,25 @@
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ ;;
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ ;;
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+- cxx)
++ cxx*)
+ # Digital/Compaq C++
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # Make sure the PIC flag is empty. It appears that all Alpha
+@@ -4700,24 +5238,15 @@
+ ;;
+ psos*)
+ ;;
+- sco*)
+- case $cc_basename in
+- CC)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+- ;;
+- *)
+- ;;
+- esac
+- ;;
+ solaris*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ ;;
+- gcx)
++ gcx*)
+ # Green Hills C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ ;;
+@@ -4727,12 +5256,12 @@
+ ;;
+ sunos4*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.x
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+- lcc)
++ lcc*)
+ # Lucid
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+@@ -4742,7 +5271,7 @@
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ ;;
+@@ -4750,7 +5279,14 @@
+ ;;
+ esac
+ ;;
+- unixware*)
++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++ case $cc_basename in
++ CC*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++ esac
+ ;;
+ vxworks*)
+ ;;
+@@ -4781,14 +5317,17 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+
+ darwin* | rhapsody*)
+@@ -4797,6 +5336,11 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ ;;
+
++ 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.
+@@ -4813,7 +5357,7 @@
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -4839,18 +5383,29 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+ fi
+ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ ;;
++ esac
++ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -4873,18 +5428,41 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+- linux*)
+- case $CC in
++ linux* | k*bsd*-gnu)
++ case $cc_basename in
+ icc* | ecc*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
++ pgcc* | pgf77* | pgf90* | pgf95*)
++ # Portland Group compilers (*not* the Pentium gcc compiler,
++ # which looks to be a dead project)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
+ ccc*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # All Alpha code is PIC.
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C 5.9
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ ;;
++ *Sun\ F*)
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+
+@@ -4894,15 +5472,19 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+- sco3.2v5*)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
++ rdos*)
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+ solaris*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ case $cc_basename in
++ f77* | f90* | f95*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
++ *)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++ esac
+ ;;
+
+ sunos4*)
+@@ -4911,7 +5493,7 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++ sysv4 | sysv4.2uw2* | sysv4.3*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -4924,6 +5506,17 @@
+ fi
+ ;;
+
++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++
++ unicos*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++ ;;
++
+ uts4*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -4942,7 +5535,7 @@
+ #
+ if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
+ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+ "" | " "*) ;;
+@@ -4951,7 +5544,7 @@
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+ fi
+-case "$host_os" in
++case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+@@ -4960,6 +5553,16 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+ ;;
+ esac
++
++#
++# Check to make sure the static flag actually works.
++#
++wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
++ $lt_tmp_static_flag,
++ [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+ ])
+
+
+@@ -4967,11 +5570,12 @@
+ # ------------------------------------
+ # See if the linker supports building shared libraries.
+ AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ ifelse([$1],[CXX],[
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+- aix4* | aix5*)
++ 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
+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+@@ -4984,12 +5588,16 @@
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ ;;
+ cygwin* | mingw*)
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
++ ;;
++ linux* | k*bsd*-gnu)
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ ;;
+ *)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+ esac
++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ ],[
+ runpath_var=
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -5010,7 +5618,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+ _LT_AC_TAGVAR(module_cmds, $1)=
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)=
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ # include_expsyms should be a list of space-separated symbols to be *always*
+@@ -5020,14 +5628,17 @@
+ # 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_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
++ _LT_AC_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=
+-
++ # Just being paranoid about ensuring that cc_basename is set.
++ _LT_CC_BASENAME([$compiler])
+ case $host_os in
+ cygwin* | mingw* | pw32*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+@@ -5037,6 +5648,10 @@
+ with_gnu_ld=no
+ fi
+ ;;
++ interix*)
++ # we just hope/assume this is gcc and not c89 (= MSVC++)
++ with_gnu_ld=yes
++ ;;
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+@@ -5047,9 +5662,30 @@
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
++ # Set some defaults for GNU ld with shared library support. These
++ # are reset later if shared libraries are not supported. Putting them
++ # here allows them to be overridden if necessary.
++ runpath_var=LD_RUN_PATH
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ # ancient GNU ld didn't support --whole-archive et. al.
++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ else
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++ fi
++ supports_anon_versioning=no
++ case `$LD -v 2>/dev/null` in
++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++ *\ 2.11.*) ;; # other 2.11 versions
++ *) supports_anon_versioning=yes ;;
++ esac
++
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[[3-9]]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -5084,7 +5720,7 @@
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+@@ -5094,13 +5730,13 @@
+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is; otherwise, prepend...
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -5109,23 +5745,79 @@
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
++
++ interix[[3-9]]*)
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++ # Instead, shared libraries are loaded at an image base (0x10000000 by
++ # default) and relocated if they conflict, which is a slow very memory
++ # consuming and fragmenting process. To avoid this, we pick a random,
++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ ;;
++
++ gnu* | linux* | k*bsd*-gnu)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ tmp_addflag=
++ case $cc_basename,$host_cpu in
++ pgcc*) # Portland Group C compiler
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag'
++ ;;
++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag -Mnomain' ;;
++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
++ tmp_addflag=' -i_dynamic' ;;
++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
++ tmp_addflag=' -i_dynamic -nofor_main' ;;
++ ifc* | ifort*) # Intel Fortran compiler
++ tmp_addflag=' -nofor_main' ;;
++ esac
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*) # Sun C 5.9
++ _LT_AC_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; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_sharedflag='-G' ;;
++ *Sun\ F*) # Sun Fortran 8.3
++ tmp_sharedflag='-G' ;;
++ *)
++ tmp_sharedflag='-shared' ;;
++ esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++ if test $supports_anon_versioning = yes; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ $echo "local: *; };" >> $output_objdir/$libname.ver~
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ fi
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ else
+- ld_shlibs=no
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+ else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ fi
+ ;;
+
+- solaris* | sysv5*)
++ solaris*)
+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ cat <<EOF 1>&2
+@@ -5139,13 +5831,40 @@
+
+ EOF
+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_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_AC_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_AC_TAGVAR(ld_shlibs, $1)=no
++ cat <<_LT_EOF 1>&2
++
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems. Therefore, libtool
++*** is disabling shared libraries support. We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++_LT_EOF
++ ;;
++ *)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
++ esac
++ ;;
++
+ sunos4*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ wlarc=
+@@ -5155,24 +5874,19 @@
+
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_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_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+
+- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
+- runpath_var=LD_RUN_PATH
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+- # ancient GNU ld didn't support --whole-archive et. al.
+- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+- else
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+- fi
++ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
++ runpath_var=
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -5184,14 +5898,14 @@
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+- if test "$GCC" = yes && test -z "$link_static_flag"; then
++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+ fi
+ ;;
+
+- aix4* | aix5*)
++ 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.
+@@ -5206,9 +5920,21 @@
+ else
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+ fi
++ aix_use_runtimelinking=no
++
++ # Test if we are trying to use run time linking or normal
++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++ # need to do runtime linking.
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|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
+
+- # KDE requires run time linking. Make it the default.
+- aix_use_runtimelinking=yes
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
+@@ -5225,7 +5951,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+ if test "$GCC" = yes; then
+- case $host_os in aix4.[012]|aix4.[012].*)
++ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -5233,7 +5959,7 @@
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ :
+ else
+ # We have old collect2
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -5244,8 +5970,12 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ fi
++ ;;
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -5253,30 +5983,30 @@
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+- if test "$aix_use_runtimelinking" = yes; then
+- shared_flag='-qmkshrobj ${wl}-G'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag='${wl}-G'
+ else
+- shared_flag='-qmkshrobj'
+- fi
++ shared_flag='${wl}-bM:SRE'
++ fi
+ fi
+ fi
+
+- # Let the compiler handle the export list.
+- _LT_AC_TAGVAR(always_export_symbols, $1)=no
++ # It seems that -bexpall does not export symbols beginning with
++ # underscore (_), so it is better to generate a list of symbols to export.
++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # Determine the default libpath from the value encoded in an empty executable.
+- _LT_AC_SYS_LIBPATH_AIX
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ _LT_AC_SYS_LIBPATH_AIX
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an empty executable.
+ _LT_AC_SYS_LIBPATH_AIX
+@@ -5285,13 +6015,11 @@
+ # -berok will link without error, but may produce a broken library.
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+- # -bexpall does not export symbols beginning with underscore (_)
+- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ # Exported symbols can be pulled into shared objects from archives
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+- # This is similar to how AIX traditionally builds it's shared libraries.
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
+@@ -5304,7 +6032,7 @@
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+
+- bsdi4*)
++ bsdi[[45]]*)
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+ ;;
+
+@@ -5314,69 +6042,68 @@
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+- shrext=".dll"
++ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ # The linker will automatically build a .lib file if we build a DLL.
+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+ # FIXME: Should let the user specify the lib program.
+- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+- fix_srcfile_path='`cygpath -w "$srcfile"`'
++ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
++ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
+ darwin* | rhapsody*)
+- if test "$GXX" = yes ; then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- ;;
+- 10.*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
++ case $host_os in
++ rhapsody* | darwin1.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
+ esac
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+- fi
+- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- else
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- fi
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
++ if test "$GCC" = yes ; then
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_AC_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_AC_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}"
++ else
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ esac
++ fi
+ ;;
+
+ dgux*)
+@@ -5409,8 +6136,8 @@
+ ;;
+
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+- freebsd* | kfreebsd*-gnu)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
++ freebsd* | dragonfly*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -5418,7 +6145,7 @@
+
+ hpux9*)
+ if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${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_AC_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
+@@ -5432,47 +6159,62 @@
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
+
+- hpux10* | hpux11*)
++ hpux10*)
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+- case "$host_cpu" in
+- hppa*64*|ia64*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ fi
++ if test "$with_gnu_ld" = no; then
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++
++ # hardcode_minus_L: Not really in the search PATH,
++ # but as the default location of the library.
++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++ fi
++ ;;
++
++ hpux11*)
++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++ case $host_cpu in
++ hppa*64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ else
+- case "$host_cpu" in
+- hppa*64*|ia64*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++ case $host_cpu in
++ hppa*64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ fi
+ if test "$with_gnu_ld" = no; then
+- case "$host_cpu" in
+- hppa*64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++ case $host_cpu in
++ hppa*64*|ia64*)
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- ;;
+- ia64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-
+- # hardcode_minus_L: Not really in the search PATH,
+- # but as the default location of the library.
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ ;;
+ *)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+@@ -5486,7 +6228,7 @@
+
+ irix5* | irix6* | nonstopux*)
+ if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+@@ -5496,7 +6238,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -5516,23 +6258,28 @@
+ ;;
+
+ openbsd*)
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ if test -f /usr/libexec/ld.so; then
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ else
++ case $host_os in
++ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
+ else
+- case $host_os in
+- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+- ;;
+- *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+- ;;
+- esac
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+@@ -5540,14 +6287,14 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+- _LT_AC_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 $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
++ _LT_AC_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_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ ;;
+
+ osf3*)
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+@@ -5559,13 +6306,13 @@
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ else
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -5573,21 +6320,15 @@
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
+
+- sco3.2v5*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+- runpath_var=LD_RUN_PATH
+- hardcode_runpath_var=yes
+- ;;
+-
+ solaris*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+ if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ wlarc='${wl}'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
++ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+ else
++ wlarc=''
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -5596,8 +6337,17 @@
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++ *)
++ # The compiler driver will combine 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_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ else
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++ fi
++ ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+@@ -5606,7 +6356,7 @@
+ 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_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+ fi
+@@ -5654,36 +6404,45 @@
+ fi
+ ;;
+
+- sysv4.2uw2*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- hardcode_runpath_var=yes
+- runpath_var=LD_RUN_PATH
+- ;;
++ runpath_var='LD_RUN_PATH'
+
+- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
+- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+ if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+- runpath_var='LD_RUN_PATH'
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+- sysv5*)
+- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+- # $CC -shared without GNU ld will not create a library from C++
+- # object files and a static libstdc++, better avoid it by now
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++ sysv5* | sco3.2v5* | sco5v6*)
++ # Note: We can NOT use -z defs as we might desire, because we do not
++ # link with -lc, and that would cause any symbols used from libc to
++ # always be unresolved, which means just about no library would
++ # ever link correctly. If we're not using GNU ld we use -z text
++ # though, which does catch some bad symbols but isn't as heavy-handed
++ # as -z defs.
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
++
++ if test "$GCC" = yes; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ fi
+ ;;
+
+ uts4*)
+@@ -5701,11 +6460,6 @@
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+ test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -5725,14 +6479,15 @@
+ # to ld, don't add -lc before -lgcc.
+ AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+ $rm conftest*
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
++ 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_AC_TAGVAR(lt_prog_compiler_wl, $1)
++ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+@@ -5827,6 +6582,30 @@
+ [AC_CHECK_TOOL(RC, windres, no)
+ ])
+
++
++# Cheap backport of AS_EXECUTABLE_P and required macros
++# from Autoconf 2.59; we should not use $as_executable_p directly.
++
++# _AS_TEST_PREPARE
++# ----------------
++m4_ifndef([_AS_TEST_PREPARE],
++[m4_defun([_AS_TEST_PREPARE],
++[if test -x / >/dev/null 2>&1; then
++ as_executable_p='test -x'
++else
++ as_executable_p='test -f'
++fi
++])])# _AS_TEST_PREPARE
++
++# AS_EXECUTABLE_P
++# ---------------
++# Check whether a file is executable.
++m4_ifndef([AS_EXECUTABLE_P],
++[m4_defun([AS_EXECUTABLE_P],
++[AS_REQUIRE([_AS_TEST_PREPARE])dnl
++$as_executable_p $1[]dnl
++])])# AS_EXECUTABLE_P
++
+ ############################################################
+ # NOTE: This macro has been submitted for inclusion into #
+ # GNU Autoconf as AC_PROG_SED. When it is available in #
+@@ -5849,18 +6628,19 @@
+ 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
++ 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 && break
++ test ! -f $lt_ac_sed && continue
+ cat /dev/null > conftest.in
+ lt_ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+@@ -5887,5 +6667,6 @@
+ done
+ ])
+ SED=$lt_cv_path_SED
++AC_SUBST([SED])
+ AC_MSG_RESULT([$SED])
+ ])
+diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
+--- a/admin/ltmain.sh 2008-04-25 16:48:06.000000000 +0000
++++ b/admin/ltmain.sh 2008-04-25 16:51:04.000000000 +0000
+@@ -1,8 +1,8 @@
+ # ltmain.sh - Provide generalized library-building support services.
+ # NOTE: Changing this file will not affect anything until you rerun configure.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
++# 2007, 2008 Free Software Foundation, Inc.
+ # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ #
+ # This program is free software; you can redistribute it and/or modify
+@@ -24,6 +24,42 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+
++basename="s,^.*/,,g"
++
++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
++# is ksh but when the shell is invoked as "sh" and the current value of
++# the _XPG environment variable is not equal to 1 (one), the special
++# positional parameter $0, within a function call, is the name of the
++# function.
++progpath="$0"
++
++# The name of this program:
++progname=`echo "$progpath" | $SED $basename`
++modename="$progname"
++
++# Global variables:
++EXIT_SUCCESS=0
++EXIT_FAILURE=1
++
++PROGRAM=ltmain.sh
++PACKAGE=libtool
++VERSION="1.5.26 Debian 1.5.26-3"
++TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
++
++# Be Bourne compatible (taken from Autoconf:_AS_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
++
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+@@ -36,7 +72,7 @@
+ :
+ else
+ # Restart under the correct shell, and then maybe $echo will work.
+- exec $SHELL "$0" --no-reexec ${1+"$@"}
++ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+ fi
+
+ if test "X$1" = X--fallback-echo; then
+@@ -45,19 +81,9 @@
+ cat <<EOF
+ $*
+ EOF
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+-# The name of this program.
+-progname=`$echo "$0" | ${SED} 's%^.*/%%'`
+-modename="$progname"
+-
+-# Constants.
+-PROGRAM=ltmain.sh
+-PACKAGE=libtool
+-VERSION=1.5a
+-TIMESTAMP=" (1.1240 2003/06/26 06:55:19)"
+-
+ default_mode=
+ help="Try \`$progname --help' for more information."
+ magic="%%%MAGIC variable%%%"
+@@ -70,14 +96,15 @@
+ Xsed="${SED}"' -e 1s/^X//'
+ sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+ # test EBCDIC or ASCII
+-case `echo A|tr A '\301'` in
+- A) # EBCDIC based system
+- SP2NL="tr '\100' '\n'"
+- NL2SP="tr '\r\n' '\100\100'"
++case `echo X|tr X '\101'` in
++ A) # ASCII based system
++ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
++ SP2NL='tr \040 \012'
++ NL2SP='tr \015\012 \040\040'
+ ;;
+- *) # Assume ASCII based system
+- SP2NL="tr '\040' '\012'"
+- NL2SP="tr '\015\012' '\040\040'"
++ *) # EBCDIC based system
++ SP2NL='tr \100 \n'
++ NL2SP='tr \r\n \100\100'
+ ;;
+ esac
+
+@@ -86,20 +113,30 @@
+ # These must not be set unconditionally because not all systems understand
+ # e.g. LANG=C (notably SCO).
+ # We save the old values to restore during execute mode.
+-if test "${LC_ALL+set}" = set; then
+- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+-fi
+-if test "${LANG+set}" = set; then
+- save_LANG="$LANG"; LANG=C; export LANG
++lt_env=
++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_env=\"$lt_var=\$$lt_var \$lt_env\"
++ $lt_var=C
++ export $lt_var
++ fi"
++done
++
++if test -n "$lt_env"; then
++ lt_env="env $lt_env"
+ fi
+
+ # Make sure IFS has a sensible default
+-: ${IFS=" "}
++lt_nl='
++'
++IFS=" $lt_nl"
+
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+ $echo "$modename: not configured to build any kind of library" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Global variables.
+@@ -111,17 +148,62 @@
+ show="$echo"
+ show_help=
+ execute_dlfiles=
++duplicate_deps=no
++preserve_args=
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
++extracted_archives=
++extracted_serial=0
+
+ #####################################
+ # Shell function definitions:
+ # This seems to be the best place for them
+
++# func_mktempdir [string]
++# Make a temporary directory that won't clash with other running
++# libtool processes, and avoids race conditions if possible. If
++# given, STRING is the basename for that directory.
++func_mktempdir ()
++{
++ my_template="${TMPDIR-/tmp}/${1-$progname}"
++
++ if test "$run" = ":"; then
++ # Return a directory name, but don't create it in dry-run mode
++ my_tmpdir="${my_template}-$$"
++ else
++
++ # If mktemp works, use that first and foremost
++ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
++
++ if test ! -d "$my_tmpdir"; then
++ # Failing that, at least try and use $RANDOM to avoid a race
++ my_tmpdir="${my_template}-${RANDOM-0}$$"
++
++ save_mktempdir_umask=`umask`
++ umask 0077
++ $mkdir "$my_tmpdir"
++ umask $save_mktempdir_umask
++ fi
++
++ # If we're not in dry-run mode, bomb out on failure
++ test -d "$my_tmpdir" || {
++ $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
++ exit $EXIT_FAILURE
++ }
++ fi
++
++ $echo "X$my_tmpdir" | $Xsed
++}
++
++
++# func_win32_libid arg
++# return the library type of file 'arg'
++#
+ # Need a lot of goo to handle *both* DLLs and import libs
+ # Has to be a shell function in order to 'eat' the argument
+ # that is supplied when $file_magic_command is called.
+-win32_libid () {
++func_win32_libid ()
++{
+ win32_libid_type="unknown"
+ win32_fileres=`file -L $1 2>/dev/null`
+ case $win32_fileres in
+@@ -130,17 +212,22 @@
+ ;;
+ *ar\ archive*) # could be an import, or static
+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+- grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
++ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+ win32_nmres=`eval $NM -f posix -A $1 | \
+- sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
+- if test "X$win32_nmres" = "Ximport" ; then
+- win32_libid_type="x86 archive import"
+- else
+- win32_libid_type="x86 archive static"
+- fi
++ $SED -n -e '1,100{
++ / I /{
++ s,.*,import,
++ p
++ q
++ }
++ }'`
++ case $win32_nmres in
++ import*) win32_libid_type="x86 archive import";;
++ *) win32_libid_type="x86 archive static";;
++ esac
+ fi
+ ;;
+- *DLL*)
++ *DLL*)
+ win32_libid_type="x86 DLL"
+ ;;
+ *executable*) # but shell scripts are "executable" too...
+@@ -154,9 +241,191 @@
+ $echo $win32_libid_type
+ }
+
++
++# func_infer_tag arg
++# Infer tagged configuration to use if any are available and
++# if one wasn't chosen via the "--tag" command line option.
++# Only attempt this if the compiler in the base compile
++# command doesn't match the default compiler.
++# arg is usually of the form 'gcc ...'
++func_infer_tag ()
++{
++ if test -n "$available_tags" && test -z "$tagname"; then
++ CC_quoted=
++ for arg in $CC; do
++ case $arg in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ arg="\"$arg\""
++ ;;
++ esac
++ CC_quoted="$CC_quoted $arg"
++ done
++ case $@ in
++ # Blanks in the command may have been stripped by the calling shell,
++ # but not from the CC environment variable when configure was run.
++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
++ # Blanks at the start of $base_compile will cause this to fail
++ # if we don't check for them as well.
++ *)
++ for z in $available_tags; do
++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
++ # Evaluate the configuration.
++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
++ CC_quoted=
++ for arg in $CC; do
++ # Double-quote args containing other shell metacharacters.
++ case $arg in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ arg="\"$arg\""
++ ;;
++ esac
++ CC_quoted="$CC_quoted $arg"
++ done
++ case "$@ " in
++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
++ # The compiler in the base compile command matches
++ # the one in the tagged configuration.
++ # Assume this is the tagged configuration we want.
++ tagname=$z
++ break
++ ;;
++ esac
++ fi
++ done
++ # If $tagname still isn't set, then no tagged configuration
++ # was found and let the user know that the "--tag" command
++ # line option must be used.
++ if test -z "$tagname"; then
++ $echo "$modename: unable to infer tagged configuration"
++ $echo "$modename: specify a tag with \`--tag'" 1>&2
++ exit $EXIT_FAILURE
++# else
++# $echo "$modename: using $tagname tagged configuration"
++ fi
++ ;;
++ esac
++ fi
++}
++
++
++# func_extract_an_archive dir oldlib
++func_extract_an_archive ()
++{
++ f_ex_an_ar_dir="$1"; shift
++ f_ex_an_ar_oldlib="$1"
++
++ $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
++ $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
++ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
++ :
++ else
++ $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
++ exit $EXIT_FAILURE
++ fi
++}
++
++# func_extract_archives gentop oldlib ...
++func_extract_archives ()
++{
++ my_gentop="$1"; shift
++ my_oldlibs=${1+"$@"}
++ my_oldobjs=""
++ my_xlib=""
++ my_xabs=""
++ my_xdir=""
++ my_status=""
++
++ $show "${rm}r $my_gentop"
++ $run ${rm}r "$my_gentop"
++ $show "$mkdir $my_gentop"
++ $run $mkdir "$my_gentop"
++ my_status=$?
++ if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
++ exit $my_status
++ fi
++
++ for my_xlib in $my_oldlibs; do
++ # Extract the objects.
++ case $my_xlib in
++ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
++ *) my_xabs=`pwd`"/$my_xlib" ;;
++ esac
++ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
++ my_xlib_u=$my_xlib
++ while :; do
++ case " $extracted_archives " in
++ *" $my_xlib_u "*)
++ extracted_serial=`expr $extracted_serial + 1`
++ 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"
++
++ $show "${rm}r $my_xdir"
++ $run ${rm}r "$my_xdir"
++ $show "$mkdir $my_xdir"
++ $run $mkdir "$my_xdir"
++ exit_status=$?
++ if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
++ exit $exit_status
++ fi
++ case $host in
++ *-darwin*)
++ $show "Extracting $my_xabs"
++ # Do not bother doing anything if just a dry run
++ if test -z "$run"; then
++ darwin_orig_dir=`pwd`
++ cd $my_xdir || exit $?
++ darwin_archive=$my_xabs
++ darwin_curdir=`pwd`
++ darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
++ darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
++ if test -n "$darwin_arches"; then
++ darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
++ darwin_arch=
++ $show "$darwin_base_archive has multiple architectures $darwin_arches"
++ for darwin_arch in $darwin_arches ; do
++ mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++ lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
++ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++ func_extract_an_archive "`pwd`" "${darwin_base_archive}"
++ cd "$darwin_curdir"
++ $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
++ done # $darwin_arches
++ ## Okay now we have a bunch of thin objects, gotta fatten them up :)
++ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
++ darwin_file=
++ darwin_files=
++ for darwin_file in $darwin_filelist; do
++ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
++ lipo -create -output "$darwin_file" $darwin_files
++ done # $darwin_filelist
++ ${rm}r unfat-$$
++ cd "$darwin_orig_dir"
++ else
++ cd "$darwin_orig_dir"
++ func_extract_an_archive "$my_xdir" "$my_xabs"
++ fi # $darwin_arches
++ fi # $run
++ ;;
++ *)
++ func_extract_an_archive "$my_xdir" "$my_xabs"
++ ;;
++ esac
++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
++ done
++ func_extract_archives_result="$my_oldobjs"
++}
+ # End of Shell function definitions
+ #####################################
+
++# Darwin sucks
++eval std_shrext=\"$shrext_cmds\"
++
++disable_libs=no
++
+ # Parse our command line options once, thoroughly.
+ while test "$#" -gt 0
+ do
+@@ -176,12 +445,13 @@
+ ;;
+ tag)
+ tagname="$arg"
++ preserve_args="${preserve_args}=$arg"
+
+ # Check whether tagname contains only valid characters
+ case $tagname in
+ *[!-_A-Za-z0-9,/]*)
+ $echo "$progname: invalid tag name: $tagname" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+@@ -191,10 +461,10 @@
+ # not specially marked.
+ ;;
+ *)
+- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
+ taglist="$taglist $tagname"
+ # Evaluate the configuration.
+- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
+ else
+ $echo "$progname: ignoring unknown tag $tagname" 1>&2
+ fi
+@@ -218,26 +488,28 @@
+ ;;
+
+ --version)
+- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+- $echo
+- $echo "Copyright (C) 2003 Free Software Foundation, Inc."
+- $echo "This is free software; see the source for copying conditions. There is NO"
+- $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+- exit 0
++ echo "\
++$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
++
++Copyright (C) 2008 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."
++ exit $?
+ ;;
+
+ --config)
+- ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
++ ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
+ # Now print the configurations for the tags.
+ for tagname in $taglist; do
+- ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
++ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+ done
+- exit 0
++ exit $?
+ ;;
+
+ --debug)
+ $echo "$progname: enabling shell trace mode"
+ set -x
++ preserve_args="$preserve_args $arg"
+ ;;
+
+ --dry-run | -n)
+@@ -256,7 +528,7 @@
+ else
+ $echo "disable static libraries"
+ fi
+- exit 0
++ exit $?
+ ;;
+
+ --finish) mode="finish" ;;
+@@ -268,13 +540,19 @@
+
+ --quiet | --silent)
+ show=:
++ preserve_args="$preserve_args $arg"
+ ;;
+
+- --tag) prevopt="--tag" prev=tag ;;
++ --tag)
++ prevopt="--tag"
++ prev=tag
++ preserve_args="$preserve_args --tag"
++ ;;
+ --tag=*)
+ set tag "$optarg" ${1+"$@"}
+ shift
+ prev=tag
++ preserve_args="$preserve_args --tag"
+ ;;
+
+ -dlopen)
+@@ -285,7 +563,7 @@
+ -*)
+ $echo "$modename: unrecognized option \`$arg'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+
+ *)
+@@ -298,9 +576,21 @@
+ if test -n "$prevopt"; then
+ $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
++case $disable_libs in
++no)
++ ;;
++shared)
++ build_libtool_libs=no
++ build_old_libs=yes
++ ;;
++static)
++ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
++ ;;
++esac
++
+ # If this variable is set in any of the actions, the command in it
+ # will be execed at the end. This prevents here-documents from being
+ # left over by shells.
+@@ -311,7 +601,7 @@
+ # Infer the operation mode.
+ if test -z "$mode"; then
+ $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+- $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
++ $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
+ case $nonopt in
+ *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+ mode=link
+@@ -354,7 +644,7 @@
+ if test -n "$execute_dlfiles" && test "$mode" != execute; then
+ $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Change the help message to a mode-specific one.
+@@ -369,13 +659,15 @@
+ # Get the compilation command and the source file.
+ base_compile=
+ srcfile="$nonopt" # always keep a non-empty value in "srcfile"
++ suppress_opt=yes
+ suppress_output=
+ arg_mode=normal
+ libobj=
++ later=
+
+ for arg
+ do
+- case "$arg_mode" in
++ case $arg_mode in
+ arg )
+ # do not "continue". Instead, add this to base_compile
+ lastarg="$arg"
+@@ -394,24 +686,19 @@
+ -o)
+ if test -n "$libobj" ; then
+ $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ arg_mode=target
+ continue
+ ;;
+
+- -static)
+- build_old_libs=yes
+- continue
+- ;;
+-
+- -prefer-pic)
+- pic_mode=yes
++ -static | -prefer-pic | -prefer-non-pic)
++ later="$later $arg"
+ continue
+ ;;
+
+- -prefer-non-pic)
+- pic_mode=no
++ -no-suppress)
++ suppress_opt=no
+ continue
+ ;;
+
+@@ -424,7 +711,7 @@
+ args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+ lastarg=
+ save_ifs="$IFS"; IFS=','
+- for arg in $args; do
++ for arg in $args; do
+ IFS="$save_ifs"
+
+ # Double-quote args containing other shell metacharacters.
+@@ -462,7 +749,10 @@
+ case $lastarg in
+ # Double-quote args containing other shell metacharacters.
+ # Many Bourne shells cannot handle close brackets correctly
+- # in scan sets, so we specify it separately.
++ # in scan sets, and some SunOS ksh mistreat backslash-escaping
++ # in scan sets (worked around with variable expansion),
++ # and furthermore cannot handle '|' '&' '(' ')' in scan sets
++ # at all, so we specify them separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ lastarg="\"$lastarg\""
+ ;;
+@@ -474,11 +764,11 @@
+ case $arg_mode in
+ arg)
+ $echo "$modename: you must specify an argument for -Xcompile"
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ target)
+ $echo "$modename: you must specify a target with \`-o'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ *)
+ # Get the name of the library object.
+@@ -500,9 +790,11 @@
+ *.class) xform=class ;;
+ *.cpp) xform=cpp ;;
+ *.cxx) xform=cxx ;;
+- *.f90) xform=f90 ;;
++ *.[fF][09]?) xform=[fF][09]. ;;
+ *.for) xform=for ;;
+ *.java) xform=java ;;
++ *.obj) xform=obj ;;
++ *.sx) xform=sx ;;
+ esac
+
+ libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+@@ -511,51 +803,39 @@
+ *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+ *)
+ $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+- # Infer tagged configuration to use if any are available and
+- # if one wasn't chosen via the "--tag" command line option.
+- # Only attempt this if the compiler in the base compile
+- # command doesn't match the default compiler.
+- if test -n "$available_tags" && test -z "$tagname"; then
+- case $base_compile in
+- # Blanks in the command may have been stripped by the calling shell,
+- # but not from the CC environment variable when configure was run.
+- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
+- # Blanks at the start of $base_compile will cause this to fail
+- # if we don't check for them as well.
+- *)
+- for z in $available_tags; do
+- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+- # Evaluate the configuration.
+- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+- case "$base_compile " in
+- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+- # The compiler in the base compile command matches
+- # the one in the tagged configuration.
+- # Assume this is the tagged configuration we want.
+- tagname=$z
+- break
+- ;;
+- esac
+- fi
+- done
+- # If $tagname still isn't set, then no tagged configuration
+- # was found and let the user know that the "--tag" command
+- # line option must be used.
+- if test -z "$tagname"; then
+- $echo "$modename: unable to infer tagged configuration"
+- $echo "$modename: specify a tag with \`--tag'" 1>&2
+- exit 1
+-# else
+-# $echo "$modename: using $tagname tagged configuration"
+- fi
++ func_infer_tag $base_compile
++
++ for arg in $later; do
++ case $arg in
++ -static)
++ build_old_libs=yes
++ continue
++ ;;
++
++ -prefer-pic)
++ pic_mode=yes
++ continue
++ ;;
++
++ -prefer-non-pic)
++ pic_mode=no
++ continue
+ ;;
+ esac
+- fi
++ done
+
++ qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
++ case $qlibobj in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ qlibobj="\"$qlibobj\"" ;;
++ esac
++ test "X$libobj" != "X$qlibobj" \
++ && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \
++ && $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
+ objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+ xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$xdir" = "X$obj"; then
+@@ -568,7 +848,7 @@
+ if test -z "$base_compile"; then
+ $echo "$modename: you must specify a compilation command" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Delete any leftover library objects.
+@@ -579,7 +859,7 @@
+ fi
+
+ $run $rm $removelist
+- trap "$run $rm $removelist; exit 1" 1 2 15
++ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+
+ # On Cygwin there's no "real" PIC flag so we must build both object types
+ case $host_os in
+@@ -598,7 +878,7 @@
+ output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+ lockfile="$output_obj.lock"
+ removelist="$removelist $output_obj $lockfile"
+- trap "$run $rm $removelist; exit 1" 1 2 15
++ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+ else
+ output_obj=
+ need_locks=no
+@@ -608,7 +888,7 @@
+ # Lock this critical section if it is needed
+ # We use this script file to make the link, it avoids creating a new file
+ if test "$need_locks" = yes; then
+- until $run ln "$0" "$lockfile" 2>/dev/null; do
++ until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+ $show "Waiting for $lockfile to be removed"
+ sleep 2
+ done
+@@ -626,14 +906,19 @@
+ compiler."
+
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+- $echo $srcfile > "$lockfile"
++ $echo "$srcfile" > "$lockfile"
+ fi
+
+ if test -n "$fix_srcfile_path"; then
+ eval srcfile=\"$fix_srcfile_path\"
+ fi
++ qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
++ case $qsrcfile in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ qsrcfile="\"$qsrcfile\"" ;;
++ esac
+
+ $run $rm "$libobj" "${libobj}T"
+
+@@ -655,18 +940,18 @@
+ fbsd_hideous_sh_bug=$base_compile
+
+ if test "$pic_mode" != no; then
+- command="$base_compile $srcfile $pic_flag"
++ command="$base_compile $qsrcfile $pic_flag"
+ else
+ # Don't build PIC code
+- command="$base_compile $srcfile"
++ command="$base_compile $qsrcfile"
+ fi
+
+ if test ! -d "${xdir}$objdir"; then
+ $show "$mkdir ${xdir}$objdir"
+ $run $mkdir ${xdir}$objdir
+- status=$?
+- if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
+- exit $status
++ exit_status=$?
++ if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
++ exit $exit_status
+ fi
+ fi
+
+@@ -678,10 +963,10 @@
+ $run $rm "$lobj" "$output_obj"
+
+ $show "$command"
+- if $run eval "$command"; then :
++ if $run eval $lt_env "$command"; then :
+ else
+ test -n "$output_obj" && $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test "$need_locks" = warn &&
+@@ -701,7 +986,7 @@
+ compiler."
+
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Just move the object if needed, then go on to compile the next one
+@@ -722,7 +1007,9 @@
+ EOF
+
+ # Allow error messages only from the first compilation.
+- suppress_output=' >/dev/null 2>&1'
++ if test "$suppress_opt" = yes; then
++ suppress_output=' >/dev/null 2>&1'
++ fi
+ else
+ # No PIC object so indicate it doesn't exist in the libtool
+ # object file.
+@@ -736,9 +1023,9 @@
+ if test "$build_old_libs" = yes; then
+ if test "$pic_mode" != yes; then
+ # Don't build PIC code
+- command="$base_compile $srcfile"
++ command="$base_compile $qsrcfile"
+ else
+- command="$base_compile $srcfile $pic_flag"
++ command="$base_compile $qsrcfile $pic_flag"
+ fi
+ if test "$compiler_c_o" = yes; then
+ command="$command -o $obj"
+@@ -748,10 +1035,10 @@
+ command="$command$suppress_output"
+ $run $rm "$obj" "$output_obj"
+ $show "$command"
+- if $run eval "$command"; then :
++ if $run eval $lt_env "$command"; then :
+ else
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test "$need_locks" = warn &&
+@@ -771,7 +1058,7 @@
+ compiler."
+
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Just move the object if needed
+@@ -809,7 +1096,7 @@
+ $run $rm "$lockfile"
+ fi
+
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool link mode
+@@ -835,7 +1122,7 @@
+ ;;
+ esac
+ libtool_args="$nonopt"
+- base_compile="$nonopt"
++ base_compile="$nonopt $@"
+ compile_command="$nonopt"
+ finalize_command="$nonopt"
+
+@@ -847,7 +1134,6 @@
+ old_convenience=
+ deplibs=
+ old_deplibs=
+- add_flags=
+ compiler_flags=
+ linker_flags=
+ dllsearchpath=
+@@ -868,6 +1154,8 @@
+ no_install=no
+ objs=
+ non_pic_objects=
++ notinst_path= # paths that contain not-installed libtool libraries
++ precious_files_regex=
+ prefer_static_libs=no
+ preload=no
+ prev=
+@@ -880,27 +1168,40 @@
+ thread_safe=no
+ vinfo=
+ vinfo_number=no
++ 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
+- -all-static | -static)
+- if test "X$arg" = "X-all-static"; then
++ -all-static | -static | -static-libtool-libs)
++ case $arg in
++ -all-static)
+ if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+ fi
+ if test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+- else
++ prefer_static_libs=yes
++ ;;
++ -static)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+- 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
+- prefer_static_libs=yes
+ break
+ ;;
+ esac
+@@ -912,7 +1213,6 @@
+ # Go through the arguments, transforming them on the way.
+ while test "$#" -gt 0; do
+ arg="$1"
+- base_compile="$base_compile $arg"
+ shift
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+@@ -976,7 +1276,7 @@
+ export_symbols="$arg"
+ if test ! -f "$arg"; then
+ $echo "$modename: symbol file \`$arg' does not exist"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ prev=
+ continue
+@@ -991,6 +1291,11 @@
+ prev=
+ continue
+ ;;
++ precious_regex)
++ precious_files_regex="$arg"
++ prev=
++ continue
++ ;;
+ release)
+ release="-$arg"
+ prev=
+@@ -1023,7 +1328,7 @@
+ test "$pic_object" = none && \
+ test "$non_pic_object" = none; then
+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Extract subdirectory from the argument.
+@@ -1071,12 +1376,17 @@
+ if test -z "$pic_object" || test "$pic_object" = none ; then
+ arg="$non_pic_object"
+ fi
++ else
++ # If the PIC object exists, use it instead.
++ # $xdir was prepended to $pic_object above.
++ non_pic_object="$pic_object"
++ non_pic_objects="$non_pic_objects $non_pic_object"
+ fi
+ else
+ # Only an error if not doing a dry-run.
+ if test -z "$run"; then
+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ else
+ # Dry-run case.
+
+@@ -1097,7 +1407,7 @@
+ done
+ else
+ $echo "$modename: link input file \`$save_arg' does not exist"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ arg=$save_arg
+ prev=
+@@ -1109,7 +1419,7 @@
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ $echo "$modename: only absolute run-paths are allowed" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ if test "$prev" = rpath; then
+@@ -1149,16 +1459,15 @@
+ finalize_command="$finalize_command $qarg"
+ continue
+ ;;
+- framework)
+- case $host in
+- *-*-darwin*)
+- case "$deplibs " in
+- *" $qarg.ltframework "*) ;;
+- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+- ;;
+- esac
+- ;;
+- esac
++ shrext)
++ shrext_cmds="$arg"
++ prev=
++ continue
++ ;;
++ darwin_framework|darwin_framework_skip)
++ test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
+ prev=
+ continue
+ ;;
+@@ -1210,7 +1519,7 @@
+ -export-symbols | -export-symbols-regex)
+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ $echo "$modename: more than one -exported-symbols argument is not allowed"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ if test "X$arg" = "X-export-symbols"; then
+ prev=expsyms
+@@ -1220,6 +1529,18 @@
+ continue
+ ;;
+
++ -framework|-arch|-isysroot)
++ case " $CC " in
++ *" ${arg} ${1} "* | *" ${arg} ${1} "*)
++ prev=darwin_framework_skip ;;
++ *) compiler_flags="$compiler_flags $arg"
++ prev=darwin_framework ;;
++ esac
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
++ continue
++ ;;
++
+ -inst-prefix-dir)
+ prev=inst_prefix
+ continue
+@@ -1246,7 +1567,8 @@
+ absdir=`cd "$dir" && pwd`
+ if test -z "$absdir"; then
+ $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+- exit 1
++ absdir="$dir"
++ notinst_path="$notinst_path $dir"
+ fi
+ dir="$absdir"
+ ;;
+@@ -1260,10 +1582,15 @@
+ esac
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++ testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+ case :$dllsearchpath: in
+ *":$dir:"*) ;;
+ *) dllsearchpath="$dllsearchpath:$dir";;
+ esac
++ case :$dllsearchpath: in
++ *":$testbindir:"*) ;;
++ *) dllsearchpath="$dllsearchpath:$testbindir";;
++ esac
+ ;;
+ esac
+ continue
+@@ -1272,26 +1599,35 @@
+ -l*)
+ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ case $host in
+- *-*-cygwin* | *-*-pw32* | *-*-beos*)
++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+ # These systems don't actually have a C or math library (as such)
+ continue
+ ;;
+- *-*-mingw* | *-*-os2*)
++ *-*-os2*)
+ # These systems don't actually have a C library (as such)
+ test "X$arg" = "X-lc" && continue
+ ;;
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-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
+- deplibs="$deplibs System.ltframework"
++ deplibs="$deplibs -framework System"
+ continue
++ ;;
++ *-*-sco3.2v5* | *-*-sco5v6*)
++ # Causes problems with __ctype
++ test "X$arg" = "X-lc" && continue
++ ;;
++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
++ # Compiler inserts libc in the correct place for threads to work
++ test "X$arg" = "X-lc" && continue
++ ;;
+ esac
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+- *-*-openbsd*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+@@ -1301,18 +1637,47 @@
+ continue
+ ;;
+
++ # Tru64 UNIX uses -model [arg] to determine the layout of C++
++ # classes, name mangling, and exception handling.
++ -model)
++ compile_command="$compile_command $arg"
++ compiler_flags="$compiler_flags $arg"
++ finalize_command="$finalize_command $arg"
++ prev=xcompiler
++ continue
++ ;;
++
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
++ compiler_flags="$compiler_flags $arg"
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
++ continue
++ ;;
++
++ -multi_module)
++ single_module="${wl}-multi_module"
++ continue
++ ;;
++
+ -module)
+ module=yes
+ continue
+ ;;
+
+- # gcc -m* arguments should be passed to the linker via $compiler_flags
+- # in order to pass architecture information to the linker
+- # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo
+- # but this is not reliable with gcc because gcc may use -mfoo to
+- # select a different linker, different libraries, etc, while
+- # -Wl,-mfoo simply passes -mfoo to the linker.
+- -m*)
++ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
++ # -r[0-9][0-9]* specifies the processor on the SGI compiler
++ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
++ # +DA*, +DD* enable 64-bit mode on the HP compiler
++ # -q* pass through compiler args for the IBM compiler
++ # -m* pass through architecture-specific compiler args for GCC
++ # -m*, -t[45]*, -txscale* pass through architecture-specific
++ # compiler args for GCC
++ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
++ # -F/path gives path to uninstalled frameworks, gcc on darwin
++ # @file GCC response files
++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+@@ -1323,9 +1688,7 @@
+ esac
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+- if test "$with_gcc" = "yes" ; then
+- compiler_flags="$compiler_flags $arg"
+- fi
++ compiler_flags="$compiler_flags $arg"
+ continue
+ ;;
+
+@@ -1341,9 +1704,9 @@
+
+ -no-install)
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
+ # The PATH hackery in wrapper scripts is required on Windows
+- # in order for the loader to find any dlls it needs.
++ # and Darwin in order for the loader to find any dlls it needs.
+ $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+ $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+ fast_install=no
+@@ -1365,6 +1728,11 @@
+
+ -o) prev=output ;;
+
++ -precious-files-regex)
++ prev=precious_regex
++ continue
++ ;;
++
+ -release)
+ prev=release
+ continue
+@@ -1387,7 +1755,7 @@
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ $echo "$modename: only absolute run-paths are allowed" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ case "$xrpath " in
+@@ -1397,7 +1765,7 @@
+ continue
+ ;;
+
+- -static)
++ -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
+@@ -1473,11 +1841,6 @@
+ continue
+ ;;
+
+- -framework)
+- prev=framework
+- continue
+- ;;
+-
+ # Some other compiler flag.
+ -* | +*)
+ # Unknown arguments in both finalize_command and compile_command need
+@@ -1488,7 +1851,6 @@
+ arg="\"$arg\""
+ ;;
+ esac
+- add_flags="$add_flags $arg"
+ ;;
+
+ *.$objext)
+@@ -1516,7 +1878,7 @@
+ test "$pic_object" = none && \
+ test "$non_pic_object" = none; then
+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Extract subdirectory from the argument.
+@@ -1564,12 +1926,17 @@
+ if test -z "$pic_object" || test "$pic_object" = none ; then
+ arg="$non_pic_object"
+ fi
++ else
++ # If the PIC object exists, use it instead.
++ # $xdir was prepended to $pic_object above.
++ non_pic_object="$pic_object"
++ non_pic_objects="$non_pic_objects $non_pic_object"
+ fi
+ else
+ # Only an error if not doing a dry-run.
+ if test -z "$run"; then
+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ else
+ # Dry-run case.
+
+@@ -1623,7 +1990,6 @@
+ arg="\"$arg\""
+ ;;
+ esac
+- add_flags="$add_flags $arg"
+ ;;
+ esac # arg
+
+@@ -1637,48 +2003,7 @@
+ if test -n "$prev"; then
+ $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+ $echo "$help" 1>&2
+- exit 1
+- fi
+-
+- # Infer tagged configuration to use if any are available and
+- # if one wasn't chosen via the "--tag" command line option.
+- # Only attempt this if the compiler in the base link
+- # command doesn't match the default compiler.
+- if test -n "$available_tags" && test -z "$tagname"; then
+- case $base_compile in
+- # Blanks in the command may have been stripped by the calling shell,
+- # but not from the CC environment variable when configure was run.
+- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
+- # Blanks at the start of $base_compile will cause this to fail
+- # if we don't check for them as well.
+- *)
+- for z in $available_tags; do
+- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+- # Evaluate the configuration.
+- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+- case $base_compile in
+- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+- # The compiler in $compile_command matches
+- # the one in the tagged configuration.
+- # Assume this is the tagged configuration we want.
+- tagname=$z
+- break
+- ;;
+- esac
+- fi
+- done
+- # If $tagname still isn't set, then no tagged configuration
+- # was found and let the user know that the "--tag" command
+- # line option must be used.
+- if test -z "$tagname"; then
+- $echo "$modename: unable to infer tagged configuration"
+- $echo "$modename: specify a tag with \`--tag'" 1>&2
+- exit 1
+-# else
+-# $echo "$modename: using $tagname tagged configuration"
+- fi
+- ;;
+- esac
++ exit $EXIT_FAILURE
+ fi
+
+ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+@@ -1711,9 +2036,9 @@
+ if test ! -d "$output_objdir"; then
+ $show "$mkdir $output_objdir"
+ $run $mkdir $output_objdir
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+- exit $status
++ exit_status=$?
++ if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
++ exit $exit_status
+ fi
+ fi
+
+@@ -1722,7 +2047,7 @@
+ "")
+ $echo "$modename: you must specify an output file" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ *.$libext) linkmode=oldlib ;;
+ *.lo | *.$objext) linkmode=obj ;;
+@@ -1732,7 +2057,7 @@
+
+ case $host in
+ *cygwin* | *mingw* | *pw32*)
+- # don't eliminate duplcations in $postdeps and $predeps
++ # don't eliminate duplications in $postdeps and $predeps
+ duplicate_compiler_generated_deps=yes
+ ;;
+ *)
+@@ -1776,7 +2101,6 @@
+ newlib_search_path=
+ need_relink=no # whether we're linking any uninstalled libtool libraries
+ notinst_deplibs= # not-installed libtool libraries
+- notinst_path= # paths that contain not-installed libtool libraries
+ case $linkmode in
+ lib)
+ passes="conv link"
+@@ -1785,7 +2109,7 @@
+ *.la) ;;
+ *)
+ $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ done
+@@ -1811,7 +2135,10 @@
+ case $pass in
+ dlopen) libs="$dlfiles" ;;
+ dlpreopen) libs="$dlprefiles" ;;
+- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++ link)
++ libs="$deplibs %DEPLIBS%"
++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++ ;;
+ esac
+ fi
+ if test "$pass" = dlopen; then
+@@ -1823,18 +2150,28 @@
+ lib=
+ found=no
+ case $deplib in
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
++ if test "$linkmode,$pass" = "prog,link"; then
++ compile_deplibs="$deplib $compile_deplibs"
++ finalize_deplibs="$deplib $finalize_deplibs"
++ else
++ compiler_flags="$compiler_flags $deplib"
++ fi
++ continue
++ ;;
+ -l*)
+ if test "$linkmode" != lib && test "$linkmode" != prog; then
+ $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+ continue
+ fi
+- if test "$pass" = conv && test "$allow_undefined" = yes; then
+- deplibs="$deplib $deplibs"
+- continue
+- fi
+ name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+- for search_ext in .la $shrext .so .a; do
++ 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
+@@ -1895,18 +2232,6 @@
+ 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
+- newdependency_libs="$deplib $newdependency_libs"
+- fi
+- fi
+- continue
+- ;;
+ -L*)
+ case $linkmode in
+ lib)
+@@ -1922,11 +2247,11 @@
+ fi
+ if test "$pass" = scan; then
+ deplibs="$deplib $deplibs"
+- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ else
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ fi
++ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ ;;
+ *)
+ $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+@@ -1954,7 +2279,22 @@
+ fi
+ case $linkmode in
+ lib)
+- if test "$deplibs_check_method" != pass_all; then
++ valid_a_lib=no
++ case $deplibs_check_method in
++ match_pattern*)
++ set dummy $deplibs_check_method
++ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++ if eval $echo \"$deplib\" 2>/dev/null \
++ | $SED 10q \
++ | $EGREP "$match_pattern_regex" > /dev/null; then
++ valid_a_lib=yes
++ fi
++ ;;
++ pass_all)
++ valid_a_lib=yes
++ ;;
++ esac
++ if test "$valid_a_lib" != yes; then
+ $echo
+ $echo "*** Warning: Trying to link with static lib archive $deplib."
+ $echo "*** I have the capability to make that library automatically link in when"
+@@ -2004,15 +2344,15 @@
+ esac # case $deplib
+ if test "$found" = yes || test -f "$lib"; then :
+ else
+- $echo "$modename: cannot find the library \`$lib'" 1>&2
+- exit 1
++ $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
++ exit $EXIT_FAILURE
+ fi
+
+ # Check to see that this really is a libtool archive.
+ if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ else
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+@@ -2028,6 +2368,8 @@
+ # it will not redefine variables installed, or shouldnotlink
+ installed=yes
+ shouldnotlink=no
++ avoidtemprpath=
++
+
+ # Read the .la file
+ case $lib in
+@@ -2035,13 +2377,6 @@
+ *) . ./$lib ;;
+ esac
+
+- case $host in
+- *-*-darwin*)
+- # Convert "-framework foo" to "foo.ltframework" in dependency_libs
+- test -n "$dependency_libs" && dependency_libs=`$echo "X$dependency_libs" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+- ;;
+- esac
+-
+ if test "$linkmode,$pass" = "lib,link" ||
+ test "$linkmode,$pass" = "prog,scan" ||
+ { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+@@ -2052,33 +2387,32 @@
+ if test "$pass" = conv; then
+ # Only check for convenience libraries
+ deplibs="$lib $deplibs"
+- tmp_libs=
+- for deplib in $dependency_libs; do
+- #echo "Adding $deplib to \$deplibs"
+- deplibs="$deplib $deplibs"
+- if test "X$duplicate_deps" = "Xyes" ; then
+- case "$tmp_libs " in
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+- esac
+- fi
+- tmp_libs="$tmp_libs $deplib"
+- done
+ if test -z "$libdir"; then
+ if test -z "$old_library"; then
+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ # It is a libtool convenience library, so add in its objects.
+ convenience="$convenience $ladir/$objdir/$old_library"
+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
++ tmp_libs=
++ for deplib in $dependency_libs; do
++ deplibs="$deplib $deplibs"
++ if test "X$duplicate_deps" = "Xyes" ; then
++ case "$tmp_libs " in
++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++ esac
++ fi
++ tmp_libs="$tmp_libs $deplib"
++ done
+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ $echo "$modename: \`$lib' is not a convenience library" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ continue
+ fi # $pass = conv
+
+-
++
+ # Get the name of the library we link against.
+ linklib=
+ for l in $old_library $library_names; do
+@@ -2086,16 +2420,18 @@
+ done
+ if test -z "$linklib"; then
+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # This library was specified with -dlopen.
+ if test "$pass" = dlopen; then
+ if test -z "$libdir"; then
+ $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+- if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++ if test -z "$dlname" ||
++ test "$dlopen_support" != yes ||
++ test "$build_libtool_libs" = no; then
+ # If there is no dlname, no dlopen support or we're linking
+ # statically, we need to preload. We also need to preload any
+ # dependent libraries so libltdl's deplib preloader doesn't
+@@ -2132,11 +2468,19 @@
+ dir="$libdir"
+ absdir="$libdir"
+ fi
++ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ else
+- dir="$ladir/$objdir"
+- absdir="$abs_ladir/$objdir"
+- # Remove this search path later
+- notinst_path="$notinst_path $abs_ladir"
++ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++ dir="$ladir"
++ absdir="$abs_ladir"
++ # Remove this search path later
++ notinst_path="$notinst_path $abs_ladir"
++ else
++ dir="$ladir/$objdir"
++ absdir="$abs_ladir/$objdir"
++ # Remove this search path later
++ notinst_path="$notinst_path $abs_ladir"
++ fi
+ fi # $installed = yes
+ name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+
+@@ -2144,7 +2488,7 @@
+ if test "$pass" = dlpreopen; then
+ if test -z "$libdir"; then
+ $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ # Prefer using a static library (so that no silly _DYNAMIC symbols
+ # are required to link).
+@@ -2171,7 +2515,7 @@
+ continue
+ fi
+
+-
++
+ if test "$linkmode" = prog && test "$pass" != link; then
+ newlib_search_path="$newlib_search_path $ladir"
+ deplibs="$lib $deplibs"
+@@ -2207,14 +2551,16 @@
+
+ if test "$linkmode,$pass" = "prog,link"; then
+ if test -n "$library_names" &&
+- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++ { { 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"; then
++ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ # Make sure the rpath contains only unique directories.
+ case "$temp_rpath " in
+ *" $dir "*) ;;
+ *" $absdir "*) ;;
+- *) temp_rpath="$temp_rpath $dir" ;;
++ *) temp_rpath="$temp_rpath $absdir" ;;
+ esac
+ fi
+
+@@ -2251,24 +2597,29 @@
+ fi
+
+ link_static=no # Whether the deplib will be linked statically
++ use_static_libs=$prefer_static_libs
++ if test "$use_static_libs" = built && test "$installed" = yes ; then
++ use_static_libs=no
++ fi
+ if test -n "$library_names" &&
+- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++ { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ if test "$installed" = no; then
+ notinst_deplibs="$notinst_deplibs $lib"
+ need_relink=yes
+ fi
+ # This is a shared library
+-
+- # Warn about portability, can't link against -module's on some systems (darwin)
+- if test "$shouldnotlink" = yes && test "$pass" = link ; then
++
++ # Warn about portability, can't link against -module's on
++ # some systems (darwin)
++ if test "$shouldnotlink" = yes && test "$pass" = link ; then
+ $echo
+ if test "$linkmode" = prog; then
+ $echo "*** Warning: Linking the executable $output against the loadable module"
+ else
+ $echo "*** Warning: Linking the shared library $output against the loadable module"
+ fi
+- $echo "*** $linklib is not portable!"
+- fi
++ $echo "*** $linklib is not portable!"
++ fi
+ if test "$linkmode" = lib &&
+ test "$hardcode_into_libs" = yes; then
+ # Hardcode the library path.
+@@ -2326,9 +2677,10 @@
+ else
+ $show "extracting exported symbol list from \`$soname'"
+ save_ifs="$IFS"; IFS='~'
+- eval cmds=\"$extract_expsyms_cmds\"
++ cmds=$extract_expsyms_cmds
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -2339,9 +2691,10 @@
+ if test -f "$output_objdir/$newlib"; then :; else
+ $show "generating import library for \`$soname'"
+ save_ifs="$IFS"; IFS='~'
+- eval cmds=\"$old_archive_from_expsyms_cmds\"
++ cmds=$old_archive_from_expsyms_cmds
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -2362,11 +2715,15 @@
+ if test "$hardcode_direct" = no; then
+ add="$dir/$linklib"
+ case $host in
+- *-*-sco3.2v5* ) add_dir="-L$dir" ;;
++ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
++ *-*-sysv4*uw2*) add_dir="-L$dir" ;;
++ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
++ *-*-unixware7*) add_dir="-L$dir" ;;
+ *-*-darwin* )
+- # if the lib is a module then we can not link against it, someone
+- # is ignoring the new warnings I added
+- if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
++ # if the lib is a module then we can not link against
++ # it, someone is ignoring the new warnings I added
++ if /usr/bin/file -L $add 2> /dev/null |
++ $EGREP ": [^:]* bundle" >/dev/null ; then
+ $echo "** Warning, lib $linklib is a module, not a shared library"
+ if test -z "$old_library" ; then
+ $echo
+@@ -2374,7 +2731,7 @@
+ $echo "** The link will probably fail, sorry"
+ else
+ add="$dir/$old_library"
+- fi
++ fi
+ fi
+ esac
+ elif test "$hardcode_minus_L" = no; then
+@@ -2397,9 +2754,9 @@
+ add_dir="-L$dir"
+ # Try looking first in the location we're being installed to.
+ if test -n "$inst_prefix_dir"; then
+- case "$libdir" in
++ case $libdir in
+ [\\/]*)
+- add_dir="-L$inst_prefix_dir$libdir $add_dir"
++ add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+@@ -2416,7 +2773,7 @@
+
+ if test "$lib_linked" != yes; then
+ $echo "$modename: configuration error: unsupported hardcode properties"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$add_shlibpath"; then
+@@ -2459,7 +2816,8 @@
+ esac
+ add="-l$name"
+ elif test "$hardcode_automatic" = yes; then
+- if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
++ if test -n "$inst_prefix_dir" &&
++ test -f "$inst_prefix_dir$libdir/$linklib" ; then
+ add="$inst_prefix_dir$libdir/$linklib"
+ else
+ add="$libdir/$linklib"
+@@ -2469,9 +2827,9 @@
+ add_dir="-L$libdir"
+ # Try looking first in the location we're being installed to.
+ if test -n "$inst_prefix_dir"; then
+- case "$libdir" in
++ case $libdir in
+ [\\/]*)
+- add_dir="-L$inst_prefix_dir$libdir $add_dir"
++ add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+@@ -2530,17 +2888,16 @@
+ fi
+ fi
+ else
+- convenience="$convenience $dir/$old_library"
+- old_convenience="$old_convenience $dir/$old_library"
+ deplibs="$dir/$old_library $deplibs"
+ link_static=yes
+ fi
+ fi # link shared/static library?
+
+ if test "$linkmode" = lib; then
+- #if test -n "$dependency_libs" &&
+- # { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
+- # test "$link_static" = yes; }; then
++ if test -n "$dependency_libs" &&
++ { test "$hardcode_into_libs" != yes ||
++ test "$build_old_libs" = yes ||
++ test "$link_static" = yes; }; then
+ # Extract -R from dependency_libs
+ temp_deplibs=
+ for libdir in $dependency_libs; do
+@@ -2554,7 +2911,7 @@
+ esac
+ done
+ dependency_libs="$temp_deplibs"
+- #fi
++ fi
+
+ newlib_search_path="$newlib_search_path $absdir"
+ # Link against this library
+@@ -2596,76 +2953,70 @@
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ if test "$absdir" != "$libdir"; then
+- # Sure, some shells/systems don't implement the -ef.
+- # Those will have to live with the warning.
+- test "$absdir" -ef "$libdir" > /dev/null 2>&1 ||
+- $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
++ $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+ fi
+ path="$absdir"
+ fi
+ depdepl=
+ case $host in
+ *-*-darwin*)
+- # we do not want to link against static libs, but need to link against shared
++ # we do not want to link against static libs,
++ # but need to link against shared
+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
++ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -n "$deplibrary_names" ; then
+ for tmp in $deplibrary_names ; do
+ depdepl=$tmp
+ done
+- if test -f "$path/$depdepl" ; then
++ if test -f "$deplibdir/$depdepl" ; then
++ depdepl="$deplibdir/$depdepl"
++ elif test -f "$path/$depdepl" ; then
+ depdepl="$path/$depdepl"
+- fi
++ else
++ # Can't find it, oh well...
++ depdepl=
++ fi
+ # do not add paths which are already there
+ case " $newlib_search_path " in
+ *" $path "*) ;;
+ *) newlib_search_path="$newlib_search_path $path";;
+ esac
+- path=""
+ fi
++ path=""
+ ;;
+ *)
+- path="-L$path"
+- ;;
+- esac
+-
++ path="-L$path"
++ ;;
++ esac
+ ;;
+- -l*)
++ -l*)
+ case $host in
+ *-*-darwin*)
+- # Again, we only want to link against shared libraries
+- eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+- for tmp in $newlib_search_path ; do
+- if test -f "$tmp/lib$tmp_libs.dylib" ; then
+- eval depdepl="$tmp/lib$tmp_libs.dylib"
+- break
+- fi
+- done
+- path=""
++ # Again, we only want to link against shared libraries
++ eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
++ for tmp in $newlib_search_path ; do
++ if test -f "$tmp/lib$tmp_libs.dylib" ; then
++ eval depdepl="$tmp/lib$tmp_libs.dylib"
++ break
++ fi
++ done
++ path=""
+ ;;
+ *) continue ;;
+- esac
+- ;;
+-
+- *.ltframework)
+- case $host in
+- *-*-darwin*)
+- depdepl="$deplib"
+- ;;
+ esac
+ ;;
+-
+ *) continue ;;
+ esac
+ case " $deplibs " in
+- *" $depdepl "*) ;;
+- *) deplibs="$deplibs $depdepl" ;;
+- esac
+- case " $deplibs " in
+ *" $path "*) ;;
+- *) deplibs="$deplibs $path" ;;
++ *) deplibs="$path $deplibs" ;;
++ esac
++ case " $deplibs " in
++ *" $depdepl "*) ;;
++ *) deplibs="$depdepl $deplibs" ;;
+ esac
+ done
+ fi # link_all_deplibs != no
+@@ -2752,7 +3103,8 @@
+ eval $var=\"$tmp_libs\"
+ done # for var
+ fi
+- # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
++ # Last step: remove runtime libs from dependency_libs
++ # (they stay in deplibs)
+ tmp_libs=
+ for i in $dependency_libs ; do
+ case " $predeps $postdeps $compiler_lib_search_path " in
+@@ -2773,9 +3125,10 @@
+
+ case $linkmode in
+ oldlib)
+- if test -n "$deplibs"; then
+- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
+- fi
++ case " $deplibs" in
++ *\ -l* | *\ -L*)
++ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
++ esac
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+@@ -2812,19 +3165,19 @@
+ case $outputname in
+ lib*)
+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+- eval shared_ext=\"$shrext\"
++ eval shared_ext=\"$shrext_cmds\"
+ eval libname=\"$libname_spec\"
+ ;;
+ *)
+ if test "$module" = no; then
+ $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ if test "$need_lib_prefix" != no; then
+ # Add the "lib" prefix for modules if required
+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+- eval shared_ext=\"$shrext\"
++ eval shared_ext=\"$shrext_cmds\"
+ eval libname=\"$libname_spec\"
+ else
+ libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+@@ -2835,7 +3188,7 @@
+ if test -n "$objs"; then
+ if test "$deplibs_check_method" != pass_all; then
+ $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+- exit 1
++ exit $EXIT_FAILURE
+ else
+ $echo
+ $echo "*** Warning: Linking the shared library $output against the non-libtool"
+@@ -2883,13 +3236,13 @@
+ if test -n "$8"; then
+ $echo "$modename: too many parameters to \`-version-info'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # convert absolute version numbers to libtool ages
+ # this retains compatibility with .la files and attempts
+ # to make the code below a bit more comprehensible
+-
++
+ case $vinfo_number in
+ yes)
+ number_major="$2"
+@@ -2903,7 +3256,7 @@
+ # which has an extra 1 added just for fun
+ #
+ case $version_type in
+- darwin|linux|osf|windows)
++ darwin|linux|osf|windows|none)
+ current=`expr $number_major + $number_minor`
+ age="$number_minor"
+ revision="$number_revision"
+@@ -2914,9 +3267,15 @@
+ age="0"
+ ;;
+ irix|nonstopux)
+- current=`expr $number_major + $number_minor - 1`
++ current=`expr $number_major + $number_minor`
+ age="$number_minor"
+ revision="$number_minor"
++ lt_irix_increment=no
++ ;;
++ *)
++ $echo "$modename: unknown library version type \`$version_type'" 1>&2
++ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ ;;
+@@ -2929,36 +3288,36 @@
+
+ # Check that each of the things are valid numbers.
+ case $current in
+- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
++ $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ case $revision in
+- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
++ $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ case $age in
+- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
++ $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ if test "$age" -gt "$current"; then
+ $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Calculate the version variables.
+@@ -2975,6 +3334,7 @@
+ versuffix="$major.$age.$revision"
+ # Darwin ld doesn't like 0 for these options...
+ minor_current=`expr $current + 1`
++ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ ;;
+
+@@ -2989,8 +3349,11 @@
+ ;;
+
+ irix | nonstopux)
+- major=`expr $current - $age + 1`
+-
++ if test "X$lt_irix_increment" = "Xno"; then
++ major=`expr $current - $age`
++ else
++ major=`expr $current - $age + 1`
++ fi
+ case $version_type in
+ nonstopux) verstring_prefix=nonstopux ;;
+ *) verstring_prefix=sgi ;;
+@@ -3047,7 +3410,7 @@
+ *)
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+@@ -3098,9 +3461,15 @@
+ tempremovelist=`$echo "$output_objdir/*"`
+ for p in $tempremovelist; do
+ case $p in
+- *.$objext | *$exeext)
++ *.$objext)
+ ;;
+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
++ if test "X$precious_files_regex" != "X"; then
++ if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
++ then
++ continue
++ fi
++ fi
+ removelist="$removelist $p"
+ ;;
+ *) ;;
+@@ -3121,11 +3490,11 @@
+ fi
+
+ # Eliminate all temporary directories.
+- for path in $notinst_path; do
+- lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
+- deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
+- dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
+- done
++ #for path in $notinst_path; do
++ # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
++ # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
++ # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
++ #done
+
+ if test -n "$xrpath"; then
+ # If the user specified any rpath flags, then add them.
+@@ -3137,7 +3506,7 @@
+ *) finalize_rpath="$finalize_rpath $libdir" ;;
+ esac
+ done
+- if true || test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
++ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ dependency_libs="$temp_xrpath $dependency_libs"
+ fi
+ fi
+@@ -3170,14 +3539,19 @@
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # Rhapsody C library is in the System framework
+- deplibs="$deplibs System.ltframework"
++ deplibs="$deplibs -framework System"
+ ;;
+ *-*-netbsd*)
+ # Don't link with libc until the a.out ld.so is fixed.
+ ;;
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc due to us having libc/libc_r.
+- test "X$arg" = "X-lc" && continue
++ ;;
++ *-*-sco3.2v5* | *-*-sco5v6*)
++ # Causes problems with __ctype
++ ;;
++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
++ # Compiler inserts libc in the correct place for threads to work
+ ;;
+ *)
+ # Add libc to deplibs on all other systems if necessary.
+@@ -3221,13 +3595,12 @@
+ int main() { return 0; }
+ EOF
+ $rm conftest
+- $LTCC -o conftest conftest.c $deplibs
+- if test "$?" -eq 0 ; then
++ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+ ldd_output=`ldd conftest`
+ for i in $deplibs; do
+- name="`expr $i : '-l\(.*\)'`"
++ name=`expr $i : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+- if test "$name" != "" && test "$name" -ne "0"; then
++ if test "$name" != "" && test "$name" != "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+@@ -3262,13 +3635,11 @@
+ # Error occurred in the first compile. Let's try to salvage
+ # the situation: Compile a separate program for each library.
+ for i in $deplibs; do
+- name="`expr $i : '-l\(.*\)'`"
++ name=`expr $i : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" && test "$name" != "0"; then
+ $rm conftest
+- $LTCC -o conftest conftest.c $i
+- # Did it work?
+- if test "$?" -eq 0 ; then
++ 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
+@@ -3300,7 +3671,7 @@
+ 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 "*** 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
+@@ -3314,7 +3685,7 @@
+ set dummy $deplibs_check_method
+ file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ for a_deplib in $deplibs; do
+- name="`expr $a_deplib : '-l\(.*\)'`"
++ name=`expr $a_deplib : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" && test "$name" != "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3383,7 +3754,7 @@
+ set dummy $deplibs_check_method
+ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ for a_deplib in $deplibs; do
+- name="`expr $a_deplib : '-l\(.*\)'`"
++ name=`expr $a_deplib : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+ if test -n "$name" && test "$name" != "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3463,7 +3834,7 @@
+ case $host in
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # On Rhapsody replace the C library is the System framework
+- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++ newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ ;;
+ esac
+
+@@ -3509,17 +3880,39 @@
+ fi
+ fi
+ fi
+- # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+- case $host in
+- *-*-darwin*)
+- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+- dependency_libs=`$echo "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+- ;;
+- esac
+ # Done checking deplibs!
+ deplibs=$newdeplibs
+ fi
+
++
++ # move library search paths that coincide with paths to not yet
++ # installed libraries to the beginning of the library search list
++ new_libs=
++ for path in $notinst_path; do
++ case " $new_libs " in
++ *" -L$path/$objdir "*) ;;
++ *)
++ case " $deplibs " in
++ *" -L$path/$objdir "*)
++ new_libs="$new_libs -L$path/$objdir" ;;
++ esac
++ ;;
++ esac
++ done
++ for deplib in $deplibs; do
++ case $deplib in
++ -L*)
++ case " $new_libs " in
++ *" $deplib "*) ;;
++ *) new_libs="$new_libs $deplib" ;;
++ esac
++ ;;
++ *) new_libs="$new_libs $deplib" ;;
++ esac
++ done
++ deplibs="$new_libs"
++
++
+ # All the library-specific variables (install_libdir is set above).
+ library_names=
+ old_library=
+@@ -3532,7 +3925,7 @@
+ hardcode_libdirs=
+ dep_rpath=
+ rpath="$finalize_rpath"
+- test "$mode" != relink && test "$fast_install" = no && rpath="$compile_rpath$rpath"
++ test "$mode" != relink && rpath="$compile_rpath$rpath"
+ for libdir in $rpath; do
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+@@ -3564,7 +3957,10 @@
+ test -n "$hardcode_libdirs"; then
+ libdir="$hardcode_libdirs"
+ if test -n "$hardcode_libdir_flag_spec_ld"; then
+- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
++ case $archive_cmds in
++ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
++ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
++ esac
+ else
+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+ fi
+@@ -3587,7 +3983,7 @@
+ fi
+
+ # Get the real and link names of the library.
+- eval shared_ext=\"$shrext\"
++ eval shared_ext=\"$shrext_cmds\"
+ eval library_names=\"$library_names_spec\"
+ set dummy $library_names
+ realname="$2"
+@@ -3603,6 +3999,7 @@
+ fi
+
+ lib="$output_objdir/$realname"
++ linknames=
+ for link
+ do
+ linknames="$linknames $link"
+@@ -3617,10 +4014,11 @@
+ $show "generating symbol list for \`$libname.la'"
+ export_symbols="$output_objdir/$libname.exp"
+ $run $rm $export_symbols
+- eval cmds=\"$export_symbols_cmds\"
++ cmds=$export_symbols_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ if len=`expr "X$cmd" : ".*"` &&
+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ $show "$cmd"
+@@ -3630,6 +4028,9 @@
+ # The command line is too long to execute in one step.
+ $show "using reloadable object file for export list..."
+ skipped_export=:
++ # Break out early, otherwise skipped_export may be
++ # set to false by a later but shorter cmd.
++ break
+ fi
+ done
+ IFS="$save_ifs"
+@@ -3650,12 +4051,12 @@
+ for test_deplib in $deplibs; do
+ case " $convenience " in
+ *" $test_deplib "*) ;;
+- *)
++ *)
+ tmp_deplibs="$tmp_deplibs $test_deplib"
+ ;;
+ esac
+ done
+- deplibs="$tmp_deplibs"
++ deplibs="$tmp_deplibs"
+
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+@@ -3663,67 +4064,13 @@
+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ else
+ gentop="$output_objdir/${outputname}x"
+- $show "${rm}r $gentop"
+- $run ${rm}r "$gentop"
+- $show "$mkdir $gentop"
+- $run $mkdir "$gentop"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$gentop"; then
+- exit $status
+- fi
+ generated="$generated $gentop"
+
+- for xlib in $convenience; do
+- # Extract the objects.
+- case $xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+- *) xabs=`pwd`"/$xlib" ;;
+- esac
+- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+- xdir="$gentop/$xlib"
+-
+- $show "${rm}r $xdir"
+- $run ${rm}r "$xdir"
+- $show "$mkdir $xdir"
+- $run $mkdir "$xdir"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$xdir"; then
+- exit $status
+- fi
+- # We will extract separately just the conflicting names and we will no
+- # longer touch any unique names. It is faster to leave these extract
+- # automatically by $AR in one run.
+- $show "(cd $xdir && $AR x $xabs)"
+- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+- $AR t "$xabs" | sort | uniq -cd | while read -r count name
+- do
+- i=1
+- while test "$i" -le "$count"
+- do
+- # Put our $i before any first dot (extension)
+- # Never overwrite any file
+- name_to="$name"
+- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+- do
+- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+- done
+- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+- i=`expr $i + 1`
+- done
+- done
+- fi
+-
+- libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+- done
++ func_extract_archives $gentop $convenience
++ libobjs="$libobjs $func_extract_archives_result"
+ fi
+ fi
+-
++
+ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ eval flag=\"$thread_safe_flag_spec\"
+ linker_flags="$linker_flags $flag"
+@@ -3734,31 +4081,27 @@
+ $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+ fi
+
+- # Add all flags from the command line. We here create a library,
+- # but those flags were only added to compile_command and
+- # finalize_command, which are only used when creating executables.
+- # So do it by hand here.
+- compiler_flags="$compiler_flags $add_flags"
+- # Only add it to commands which use CC, instead of LD, i.e.
+- # only to $compiler_flags
+- #linker_flags="$linker_flags $add_flags"
+-
+ # Do each of the archive commands.
+ if test "$module" = yes && test -n "$module_cmds" ; then
+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+- eval cmds=\"$module_expsym_cmds\"
++ eval test_cmds=\"$module_expsym_cmds\"
++ cmds=$module_expsym_cmds
+ else
+- eval cmds=\"$module_cmds\"
++ eval test_cmds=\"$module_cmds\"
++ cmds=$module_cmds
+ fi
+ else
+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+- eval cmds=\"$archive_expsym_cmds\"
++ eval test_cmds=\"$archive_expsym_cmds\"
++ cmds=$archive_expsym_cmds
+ else
+- eval cmds=\"$archive_cmds\"
++ eval test_cmds=\"$archive_cmds\"
++ cmds=$archive_cmds
+ fi
+ fi
+
+- if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
++ if test "X$skipped_export" != "X:" &&
++ len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ :
+ else
+@@ -3777,6 +4120,7 @@
+ save_libobjs=$libobjs
+ fi
+ save_output=$output
++ output_la=`$echo "X$output" | $Xsed -e "$basename"`
+
+ # Clear the reloadable object creation command queue and
+ # initialize k to one.
+@@ -3786,13 +4130,13 @@
+ delfiles=
+ last_robj=
+ k=1
+- output=$output_objdir/$save_output-${k}.$objext
++ output=$output_objdir/$output_la-${k}.$objext
+ # Loop over the list of objects to be linked.
+ for obj in $save_libobjs
+ do
+ eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+ if test "X$objlist" = X ||
+- { len=`expr "X$test_cmds" : ".*"` &&
++ { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ test "$len" -le "$max_cmd_len"; }; then
+ objlist="$objlist $obj"
+ else
+@@ -3806,9 +4150,9 @@
+ # the last one created.
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+ fi
+- last_robj=$output_objdir/$save_output-${k}.$objext
++ last_robj=$output_objdir/$output_la-${k}.$objext
+ k=`expr $k + 1`
+- output=$output_objdir/$save_output-${k}.$objext
++ output=$output_objdir/$output_la-${k}.$objext
+ objlist=$obj
+ len=1
+ fi
+@@ -3828,13 +4172,13 @@
+ eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+ fi
+
+- # Set up a command to remove the reloadale object files
++ # Set up a command to remove the reloadable object files
+ # after they are used.
+ i=0
+ while test "$i" -lt "$k"
+ do
+ i=`expr $i + 1`
+- delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
++ delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
+ done
+
+ $echo "creating a temporary reloadable object file: $output"
+@@ -3859,28 +4203,54 @@
+ # value of $libobjs for piecewise linking.
+
+ # Do each of the archive commands.
++ if test "$module" = yes && test -n "$module_cmds" ; then
++ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
++ cmds=$module_expsym_cmds
++ else
++ cmds=$module_cmds
++ fi
++ else
+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+- eval cmds=\"$archive_expsym_cmds\"
++ cmds=$archive_expsym_cmds
+ else
+- eval cmds=\"$archive_cmds\"
++ cmds=$archive_cmds
++ fi
+ fi
+
+ # Append the command to remove the reloadable object files
+ # to the just-reset $cmds.
+- eval cmds=\"\$cmds~$rm $delfiles\"
++ eval cmds=\"\$cmds~\$rm $delfiles\"
+ fi
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+- $run eval "$cmd" || exit $?
++ $run eval "$cmd" || {
++ lt_exit=$?
++
++ # Restore the uninstalled library and exit
++ if test "$mode" = relink; then
++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++ fi
++
++ exit $lt_exit
++ }
+ done
+ IFS="$save_ifs"
+
+ # Restore the uninstalled library and exit
+ if test "$mode" = relink; then
+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+- exit 0
++
++ if test -n "$convenience"; then
++ if test -z "$whole_archive_flag_spec"; then
++ $show "${rm}r $gentop"
++ $run ${rm}r "$gentop"
++ fi
++ fi
++
++ exit $EXIT_SUCCESS
+ fi
+
+ # Create links to the real library.
+@@ -3900,9 +4270,10 @@
+ ;;
+
+ obj)
+- if test -n "$deplibs"; then
+- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
+- fi
++ case " $deplibs" in
++ *\ -l* | *\ -L*)
++ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
++ esac
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+@@ -3928,7 +4299,7 @@
+ *.lo)
+ if test -n "$objs$old_deplibs"; then
+ $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ libobj="$output"
+ obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+@@ -3949,72 +4320,20 @@
+ reload_conv_objs=
+ gentop=
+ # reload_cmds runs $LD directly, so let us get rid of
+- # -Wl from whole_archive_flag_spec
++ # -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 reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
++ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
++ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+ else
+ gentop="$output_objdir/${obj}x"
+- $show "${rm}r $gentop"
+- $run ${rm}r "$gentop"
+- $show "$mkdir $gentop"
+- $run $mkdir "$gentop"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$gentop"; then
+- exit $status
+- fi
+ generated="$generated $gentop"
+
+- for xlib in $convenience; do
+- # Extract the objects.
+- case $xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+- *) xabs=`pwd`"/$xlib" ;;
+- esac
+- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+- xdir="$gentop/$xlib"
+-
+- $show "${rm}r $xdir"
+- $run ${rm}r "$xdir"
+- $show "$mkdir $xdir"
+- $run $mkdir "$xdir"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$xdir"; then
+- exit $status
+- fi
+- # We will extract separately just the conflicting names and we will no
+- # longer touch any unique names. It is faster to leave these extract
+- # automatically by $AR in one run.
+- $show "(cd $xdir && $AR x $xabs)"
+- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+- $AR t "$xabs" | sort | uniq -cd | while read -r count name
+- do
+- i=1
+- while test "$i" -le "$count"
+- do
+- # Put our $i before any first dot (extension)
+- # Never overwrite any file
+- name_to="$name"
+- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+- do
+- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+- done
+- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+- i=`expr $i + 1`
+- done
+- done
+- fi
+-
+- reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+- done
++ func_extract_archives $gentop $convenience
++ reload_conv_objs="$reload_objs $func_extract_archives_result"
+ fi
+ fi
+
+@@ -4022,10 +4341,11 @@
+ reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+ output="$obj"
+- eval cmds=\"$reload_cmds\"
++ cmds=$reload_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -4038,7 +4358,7 @@
+ $run ${rm}r $gentop
+ fi
+
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+ if test "$build_libtool_libs" != yes; then
+@@ -4051,17 +4371,18 @@
+ # accidentally link it into a program.
+ # $show "echo timestamp > $libobj"
+ # $run eval "echo timestamp > $libobj" || exit $?
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+ if test -n "$pic_flag" || test "$pic_mode" != default; then
+ # Only do commands if we really have different PIC objects.
+ reload_objs="$libobjs $reload_conv_objs"
+ output="$libobj"
+- eval cmds=\"$reload_cmds\"
++ cmds=$reload_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -4073,7 +4394,7 @@
+ $run ${rm}r $gentop
+ fi
+
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ prog)
+@@ -4098,24 +4419,50 @@
+ case $host in
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # On Rhapsody replace the C library is the System framework
+- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++ compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
++ finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ ;;
+ esac
+
+ case $host in
+- *-*-darwin*)
++ *darwin*)
+ # Don't allow lazy linking, it breaks C++ global constructors
+ if test "$tagname" = CXX ; then
+ compile_command="$compile_command ${wl}-bind_at_load"
+ finalize_command="$finalize_command ${wl}-bind_at_load"
+ fi
+- # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e '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 "*)
++ new_libs="$new_libs -L$path/$objdir" ;;
++ esac
++ ;;
++ esac
++ done
++ for deplib in $compile_deplibs; do
++ case $deplib in
++ -L*)
++ case " $new_libs " in
++ *" $deplib "*) ;;
++ *) new_libs="$new_libs $deplib" ;;
++ esac
++ ;;
++ *) new_libs="$new_libs $deplib" ;;
++ esac
++ done
++ compile_deplibs="$new_libs"
++
++
+ compile_command="$compile_command $compile_deplibs"
+ finalize_command="$finalize_command $finalize_deplibs"
+
+@@ -4160,10 +4507,15 @@
+ fi
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++ testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
+ case :$dllsearchpath: in
+ *":$libdir:"*) ;;
+ *) dllsearchpath="$dllsearchpath:$libdir";;
+ esac
++ case :$dllsearchpath: in
++ *":$testbindir:"*) ;;
++ *) dllsearchpath="$dllsearchpath:$testbindir";;
++ esac
+ ;;
+ esac
+ done
+@@ -4277,13 +4629,25 @@
+
+ # Prepare the list of exported symbols
+ if test -z "$export_symbols"; then
+- export_symbols="$output_objdir/$output.exp"
++ export_symbols="$output_objdir/$outputname.exp"
+ $run $rm $export_symbols
+- $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++ $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++ case $host in
++ *cygwin* | *mingw* )
++ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++ $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
++ ;;
++ esac
+ else
+- $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+- $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
++ $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
++ $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+ $run eval 'mv "$nlist"T "$nlist"'
++ case $host in
++ *cygwin* | *mingw* )
++ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++ $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
++ ;;
++ esac
+ fi
+ fi
+
+@@ -4334,7 +4698,26 @@
+ #endif
+
+ /* The mapping between symbol names and symbols. */
++"
++
++ case $host in
++ *cygwin* | *mingw* )
++ $echo >> "$output_objdir/$dlsyms" "\
++/* DATA imports from DLLs on WIN32 can't be const, because
++ runtime relocations are performed -- see ld's documentation
++ on pseudo-relocs */
++struct {
++"
++ ;;
++ * )
++ $echo >> "$output_objdir/$dlsyms" "\
+ const struct {
++"
++ ;;
++ esac
++
++
++ $echo >> "$output_objdir/$dlsyms" "\
+ const char *name;
+ lt_ptr address;
+ }
+@@ -4381,20 +4764,33 @@
+ esac
+
+ # Now compile the dynamic symbol file.
+- $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+- $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
++ $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
++ $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+
+ # Clean up the generated files.
+ $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+ $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
+
+ # Transform the symbol file into the correct name.
+- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++ case $host in
++ *cygwin* | *mingw* )
++ if test -f "$output_objdir/${outputname}.def" ; then
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ else
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ fi
++ ;;
++ * )
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ ;;
++ esac
+ ;;
+ *)
+ $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ else
+@@ -4403,30 +4799,19 @@
+ # really was required.
+
+ # Nullify the symbol file.
+- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+ fi
+
+- # AIX runtime linking requires linking programs with -Wl,-brtl and libs with -Wl,-G
+- # Also add -bnolibpath to the beginning of the link line, to clear the hardcoded runpath.
+- # Otherwise, things like the -L path to libgcc.a are accidentally hardcoded by ld.
+- # This does not apply on AIX for ia64, which uses a SysV linker.
+- case "$host" in
+- ia64-*-aix5*) ;;
+- *-*-aix4* | *-*-aix5*)
+- compile_command=`$echo "X$compile_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"`
+- finalize_command=`$echo "X$finalize_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"` ;;
+- esac
+-
+ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ # Replace the output file specification.
+- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
+ link_command="$compile_command$compile_rpath"
+
+ # We have no uninstalled library dependencies, so finalize right now.
+ $show "$link_command"
+ $run eval "$link_command"
+- status=$?
++ exit_status=$?
+
+ # Delete the generated files.
+ if test -n "$dlsyms"; then
+@@ -4434,7 +4819,7 @@
+ $run $rm "$output_objdir/${outputname}S.${objext}"
+ fi
+
+- exit $status
++ exit $exit_status
+ fi
+
+ if test -n "$shlibpath_var"; then
+@@ -4493,7 +4878,7 @@
+ # Link the executable and exit
+ $show "$link_command"
+ $run eval "$link_command" || exit $?
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+ if test "$hardcode_action" = relink; then
+@@ -4507,7 +4892,7 @@
+ if test "$fast_install" != no; then
+ link_command="$finalize_var$compile_command$finalize_rpath"
+ if test "$fast_install" = yes; then
+- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
++ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+ else
+ # fast_install is set to needless
+ relink_command=
+@@ -4544,14 +4929,14 @@
+ fi
+ done
+ relink_command="(cd `pwd`; $relink_command)"
+- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+ fi
+
+ # Quote $echo for shipping.
+- if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
+- case $0 in
+- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
+- *) qecho="$SHELL `pwd`/$0 --fallback-echo";;
++ if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
++ case $progpath in
++ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
++ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+ esac
+ qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+ else
+@@ -4573,11 +4958,13 @@
+ *) exeext= ;;
+ esac
+ case $host in
+- *mingw* )
+- cwrappersource=`$echo ${output_objdir}/lt-${outputname}.c`
+- cwrapper=`$echo ${output}.exe`
+- $rm $cwrappersource $cwrapper
+- trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
++ *cygwin* | *mingw* )
++ output_name=`basename $output`
++ output_path=`dirname $output`
++ cwrappersource="$output_path/$objdir/lt-$output_name.c"
++ cwrapper="$output_path/$output_name.exe"
++ $rm $cwrappersource $cwrapper
++ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+ cat > $cwrappersource <<EOF
+
+@@ -4586,7 +4973,7 @@
+
+ The $output program cannot be directly executed until all the libtool
+ libraries that it depends on are installed.
+-
++
+ This wrapper executable should never be moved out of the build directory.
+ If it is, it will not operate correctly.
+
+@@ -4602,6 +4989,9 @@
+ #include <malloc.h>
+ #include <stdarg.h>
+ #include <assert.h>
++#include <string.h>
++#include <ctype.h>
++#include <sys/stat.h>
+
+ #if defined(PATH_MAX)
+ # define LT_PATHMAX PATH_MAX
+@@ -4612,15 +5002,19 @@
+ #endif
+
+ #ifndef DIR_SEPARATOR
+-#define DIR_SEPARATOR '/'
++# define DIR_SEPARATOR '/'
++# define PATH_SEPARATOR ':'
+ #endif
+
+ #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+ defined (__OS2__)
+-#define HAVE_DOS_BASED_FILE_SYSTEM
+-#ifndef DIR_SEPARATOR_2
+-#define DIR_SEPARATOR_2 '\\'
+-#endif
++# define HAVE_DOS_BASED_FILE_SYSTEM
++# ifndef DIR_SEPARATOR_2
++# define DIR_SEPARATOR_2 '\\'
++# endif
++# ifndef PATH_SEPARATOR_2
++# define PATH_SEPARATOR_2 ';'
++# endif
+ #endif
+
+ #ifndef DIR_SEPARATOR_2
+@@ -4630,17 +5024,32 @@
+ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+ #endif /* DIR_SEPARATOR_2 */
+
++#ifndef PATH_SEPARATOR_2
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
++#else /* PATH_SEPARATOR_2 */
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
++#endif /* PATH_SEPARATOR_2 */
++
+ #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
+ #define XFREE(stale) do { \
+ if (stale) { free ((void *) stale); stale = 0; } \
+ } while (0)
+
++/* -DDEBUG is fairly common in CFLAGS. */
++#undef DEBUG
++#if defined DEBUGWRAPPER
++# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
++#else
++# define DEBUG(format, ...)
++#endif
++
+ const char *program_name = NULL;
+
+ void * xmalloc (size_t num);
+ char * xstrdup (const char *string);
+-char * basename (const char *name);
+-char * fnqualify(const char *path);
++const char * base_name (const char *name);
++char * find_executable(const char *wrapper);
++int check_executable(const char *path);
+ char * strendzap(char *str, const char *pat);
+ void lt_fatal (const char *message, ...);
+
+@@ -4649,30 +5058,52 @@
+ {
+ char **newargz;
+ int i;
+-
+- program_name = (char *) xstrdup ((char *) basename (argv[0]));
++
++ program_name = (char *) xstrdup (base_name (argv[0]));
++ DEBUG("(main) argv[0] : %s\n",argv[0]);
++ DEBUG("(main) program_name : %s\n",program_name);
+ newargz = XMALLOC(char *, argc+2);
+ EOF
+
+- cat >> $cwrappersource <<EOF
+- newargz[0] = "$SHELL";
++ cat >> $cwrappersource <<EOF
++ newargz[0] = (char *) xstrdup("$SHELL");
+ EOF
+
+- cat >> $cwrappersource <<"EOF"
+- newargz[1] = fnqualify(argv[0]);
++ cat >> $cwrappersource <<"EOF"
++ newargz[1] = find_executable(argv[0]);
++ if (newargz[1] == NULL)
++ lt_fatal("Couldn't find %s", argv[0]);
++ DEBUG("(main) found exe at : %s\n",newargz[1]);
+ /* we know the script has the same name, without the .exe */
+ /* so make sure newargz[1] doesn't end in .exe */
+- strendzap(newargz[1],".exe");
++ strendzap(newargz[1],".exe");
+ for (i = 1; i < argc; i++)
+ newargz[i+1] = xstrdup(argv[i]);
+ newargz[argc+1] = NULL;
++
++ for (i=0; i<argc+1; i++)
++ {
++ DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]);
++ ;
++ }
++
+ EOF
+
+- cat >> $cwrappersource <<EOF
++ case $host_os in
++ mingw*)
++ cat >> $cwrappersource <<EOF
++ execv("$SHELL",(char const **)newargz);
++EOF
++ ;;
++ *)
++ cat >> $cwrappersource <<EOF
+ execv("$SHELL",newargz);
+ EOF
++ ;;
++ esac
+
+- cat >> $cwrappersource <<"EOF"
++ cat >> $cwrappersource <<"EOF"
++ return 127;
+ }
+
+ void *
+@@ -4685,59 +5116,159 @@
+ return p;
+ }
+
+-char *
++char *
+ xstrdup (const char *string)
+ {
+ return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+ ;
+ }
+
+-char *
+-basename (const char *name)
++const char *
++base_name (const char *name)
+ {
+ const char *base;
+
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ /* Skip over the disk name in MSDOS pathnames. */
+- if (isalpha (name[0]) && name[1] == ':')
++ if (isalpha ((unsigned char)name[0]) && name[1] == ':')
+ name += 2;
+ #endif
+
+ for (base = name; *name; name++)
+ if (IS_DIR_SEPARATOR (*name))
+ base = name + 1;
+- return (char *) base;
++ return base;
++}
++
++int
++check_executable(const char * path)
++{
++ struct stat st;
++
++ DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
++ if ((!path) || (!*path))
++ return 0;
++
++ if ((stat (path, &st) >= 0) &&
++ (
++ /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
++#if defined (S_IXOTH)
++ ((st.st_mode & S_IXOTH) == S_IXOTH) ||
++#endif
++#if defined (S_IXGRP)
++ ((st.st_mode & S_IXGRP) == S_IXGRP) ||
++#endif
++ ((st.st_mode & S_IXUSR) == S_IXUSR))
++ )
++ return 1;
++ else
++ return 0;
+ }
+
+-char *
+-fnqualify(const char *path)
++/* Searches for the full path of the wrapper. Returns
++ newly allocated full path name if found, NULL otherwise */
++char *
++find_executable (const char* wrapper)
+ {
+- size_t size;
+- char *p;
++ int has_slash = 0;
++ const char* p;
++ const char* p_next;
++ /* static buffer for getcwd */
+ char tmp[LT_PATHMAX + 1];
++ int tmp_len;
++ char* concat_name;
++
++ DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
+
+- assert(path != NULL);
++ if ((wrapper == NULL) || (*wrapper == '\0'))
++ return NULL;
+
+- /* Is it qualified already? */
++ /* Absolute path? */
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
++ if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
++ {
++ concat_name = xstrdup (wrapper);
++ if (check_executable(concat_name))
++ return concat_name;
++ XFREE(concat_name);
++ }
++ else
++ {
++#endif
++ if (IS_DIR_SEPARATOR (wrapper[0]))
++ {
++ concat_name = xstrdup (wrapper);
++ if (check_executable(concat_name))
++ return concat_name;
++ XFREE(concat_name);
++ }
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+- if (isalpha (path[0]) && path[1] == ':')
+- return xstrdup (path);
++ }
+ #endif
+- if (IS_DIR_SEPARATOR (path[0]))
+- return xstrdup (path);
+
+- /* prepend the current directory */
+- /* doesn't handle '~' */
++ for (p = wrapper; *p; p++)
++ if (*p == '/')
++ {
++ has_slash = 1;
++ break;
++ }
++ if (!has_slash)
++ {
++ /* no slashes; search PATH */
++ const char* path = getenv ("PATH");
++ if (path != NULL)
++ {
++ for (p = path; *p; p = p_next)
++ {
++ const char* q;
++ size_t p_len;
++ for (q = p; *q; q++)
++ if (IS_PATH_SEPARATOR(*q))
++ break;
++ p_len = q - p;
++ p_next = (*q == '\0' ? q : q + 1);
++ if (p_len == 0)
++ {
++ /* empty path: current directory */
++ if (getcwd (tmp, LT_PATHMAX) == NULL)
++ lt_fatal ("getcwd failed");
++ tmp_len = strlen(tmp);
++ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
++ memcpy (concat_name, tmp, tmp_len);
++ concat_name[tmp_len] = '/';
++ strcpy (concat_name + tmp_len + 1, wrapper);
++ }
++ else
++ {
++ concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
++ memcpy (concat_name, p, p_len);
++ concat_name[p_len] = '/';
++ strcpy (concat_name + p_len + 1, wrapper);
++ }
++ if (check_executable(concat_name))
++ return concat_name;
++ XFREE(concat_name);
++ }
++ }
++ /* not found in PATH; assume curdir */
++ }
++ /* Relative path | not found in path: prepend cwd */
+ if (getcwd (tmp, LT_PATHMAX) == NULL)
+ lt_fatal ("getcwd failed");
+- size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
+- p = XMALLOC(char, size);
+- sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
+- return p;
++ tmp_len = strlen(tmp);
++ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
++ memcpy (concat_name, tmp, tmp_len);
++ concat_name[tmp_len] = '/';
++ strcpy (concat_name + tmp_len + 1, wrapper);
++
++ if (check_executable(concat_name))
++ return concat_name;
++ XFREE(concat_name);
++ return NULL;
+ }
+
+ char *
+-strendzap(char *str, const char *pat)
++strendzap(char *str, const char *pat)
+ {
+ size_t len, patlen;
+
+@@ -4757,7 +5288,7 @@
+ }
+
+ static void
+-lt_error_core (int exit_status, const char * mode,
++lt_error_core (int exit_status, const char * mode,
+ const char * message, va_list ap)
+ {
+ fprintf (stderr, "%s: %s: ", program_name, mode);
+@@ -4777,16 +5308,16 @@
+ va_end (ap);
+ }
+ EOF
+- # we should really use a build-platform specific compiler
+- # here, but OTOH, the wrappers (shell script and this C one)
+- # are only useful if you want to execute the "real" binary.
+- # Since the "real" binary is built for $host, then this
+- # wrapper might as well be built for $host, too.
+- $run $LTCC -s -o $cwrapper $cwrappersource
+- ;;
+- esac
+- $rm $output
+- trap "$rm $output; exit 1" 1 2 15
++ # we should really use a build-platform specific compiler
++ # here, but OTOH, the wrappers (shell script and this C one)
++ # are only useful if you want to execute the "real" binary.
++ # Since the "real" binary is built for $host, then this
++ # wrapper might as well be built for $host, too.
++ $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
++ ;;
++ esac
++ $rm $output
++ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+
+ $echo > $output "\
+ #! $SHELL
+@@ -4805,9 +5336,23 @@
+ Xsed='${SED} -e 1s/^X//'
+ sed_quote_subst='$sed_quote_subst'
+
++# Be Bourne compatible (taken from Autoconf:_AS_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.
+-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ relink_command=\"$relink_command\"
+
+@@ -4886,7 +5431,7 @@
+ else
+ $echo \"\$relink_command_output\" >&2
+ $rm \"\$progdir/\$file\"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi
+
+@@ -4936,34 +5481,32 @@
+ # Backslashes separate directories on plain windows
+ *-*-mingw | *-*-os2*)
+ $echo >> $output "\
+- exec \$progdir\\\\\$program \${1+\"\$@\"}
++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+ "
+ ;;
+
+ *)
+- # Need to set LD_LIBRARY_PATH, to the value already
+- # computed within libtool.
+ $echo >> $output "\
+- LD_LIBRARY_PATH=\"$rpath\" exec \$progdir/\$program \${1+\"\$@\"}
++ exec \"\$progdir/\$program\" \${1+\"\$@\"}
+ "
+ ;;
+ esac
+ $echo >> $output "\
+- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+- exit 1
++ \$echo \"\$0: cannot exec \$program \$*\"
++ exit $EXIT_FAILURE
+ fi
+ else
+ # The program doesn't exist.
+- \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
++ \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+ \$echo \"This script is just a wrapper for \$program.\" 1>&2
+ $echo \"See the $PACKAGE documentation for more information.\" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi\
+ "
+ chmod +x $output
+ fi
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+ esac
+
+@@ -4986,78 +5529,78 @@
+
+ if test -n "$addlibs"; then
+ gentop="$output_objdir/${outputname}x"
+- $show "${rm}r $gentop"
+- $run ${rm}r "$gentop"
+- $show "$mkdir $gentop"
+- $run $mkdir "$gentop"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$gentop"; then
+- exit $status
+- fi
+ generated="$generated $gentop"
+
+- # Add in members from convenience archives.
+- for xlib in $addlibs; do
+- # Extract the objects.
+- case $xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+- *) xabs=`pwd`"/$xlib" ;;
+- esac
+- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+- xdir="$gentop/$xlib"
+-
+- $show "${rm}r $xdir"
+- $run ${rm}r "$xdir"
+- $show "$mkdir $xdir"
+- $run $mkdir "$xdir"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$xdir"; then
+- exit $status
+- fi
+- # We will extract separately just the conflicting names and we will no
+- # longer touch any unique names. It is faster to leave these extract
+- # automatically by $AR in one run.
+- $show "(cd $xdir && $AR x $xabs)"
+- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+- $AR t "$xabs" | sort | uniq -cd | while read -r count name
+- do
+- i=1
+- while test "$i" -le "$count"
+- do
+- # Put our $i before any first dot (extension)
+- # Never overwrite any file
+- name_to="$name"
+- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+- do
+- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+- done
+- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+- i=`expr $i + 1`
+- done
+- done
+- fi
+-
+- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+- done
++ func_extract_archives $gentop $addlibs
++ oldobjs="$oldobjs $func_extract_archives_result"
+ fi
+
+- compiler_flags="$compiler_flags $add_flags"
+-
+ # Do each command in the archive commands.
+ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+- eval cmds=\"$old_archive_from_new_cmds\"
++ cmds=$old_archive_from_new_cmds
+ else
++ # POSIX demands no paths to be encoded in archives. We have
++ # to avoid creating archives with duplicate basenames if we
++ # might have to extract them afterwards, e.g., when creating a
++ # static archive out of a convenience library, or when linking
++ # the entirety of a libtool archive into another (currently
++ # not supported by libtool).
++ if (for obj in $oldobjs
++ do
++ $echo "X$obj" | $Xsed -e 's%^.*/%%'
++ done | sort | sort -uc >/dev/null 2>&1); then
++ :
++ else
++ $echo "copying selected object files to avoid basename conflicts..."
++
++ if test -z "$gentop"; then
++ gentop="$output_objdir/${outputname}x"
++ generated="$generated $gentop"
++
++ $show "${rm}r $gentop"
++ $run ${rm}r "$gentop"
++ $show "$mkdir $gentop"
++ $run $mkdir "$gentop"
++ exit_status=$?
++ if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
++ exit $exit_status
++ fi
++ fi
++
++ save_oldobjs=$oldobjs
++ oldobjs=
++ counter=1
++ for obj in $save_oldobjs
++ do
++ objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
++ case " $oldobjs " in
++ " ") oldobjs=$obj ;;
++ *[\ /]"$objbase "*)
++ while :; do
++ # Make sure we don't pick an alternate name that also
++ # overlaps.
++ newobj=lt$counter-$objbase
++ counter=`expr $counter + 1`
++ case " $oldobjs " in
++ *[\ /]"$newobj "*) ;;
++ *) if test ! -f "$gentop/$newobj"; then break; fi ;;
++ esac
++ done
++ $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
++ $run ln "$obj" "$gentop/$newobj" ||
++ $run cp "$obj" "$gentop/$newobj"
++ oldobjs="$oldobjs $gentop/$newobj"
++ ;;
++ *) oldobjs="$oldobjs $obj" ;;
++ esac
++ done
++ fi
++
+ eval cmds=\"$old_archive_cmds\"
+
+ if len=`expr "X$cmds" : ".*"` &&
+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+- :
++ cmds=$old_archive_cmds
+ else
+ # the command line is too long to link in one step, link in parts
+ $echo "using piecewise archive linking..."
+@@ -5066,31 +5609,18 @@
+ objlist=
+ concat_cmds=
+ save_oldobjs=$oldobjs
+- # GNU ar 2.10+ was changed to match POSIX; thus no paths are
+- # encoded into archives. This makes 'ar r' malfunction in
+- # this piecewise linking case whenever conflicting object
+- # names appear in distinct ar calls; check, warn and compensate.
+- if (for obj in $save_oldobjs
+- do
+- $echo "X$obj" | $Xsed -e 's%^.*/%%'
+- done | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
+- $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
+- AR_FLAGS=cq
+- fi
++
+ # Is there a better way of finding the last object in the list?
+ for obj in $save_oldobjs
+ do
+ last_oldobj=$obj
+- done
++ done
+ for obj in $save_oldobjs
+ do
+ oldobjs="$objlist $obj"
+ objlist="$objlist $obj"
+ eval test_cmds=\"$old_archive_cmds\"
+- if len=`expr "X$test_cmds" : ".*"` &&
++ if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ test "$len" -le "$max_cmd_len"; then
+ :
+ else
+@@ -5098,7 +5628,7 @@
+ oldobjs=$objlist
+ if test "$obj" = "$last_oldobj" ; then
+ RANLIB=$save_RANLIB
+- fi
++ fi
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ objlist=
+@@ -5109,12 +5639,13 @@
+ if test "X$oldobjs" = "X" ; then
+ eval cmds=\"\$concat_cmds\"
+ else
+- eval cmds=\"\$concat_cmds~$old_archive_cmds\"
++ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+ fi
+ fi
+ fi
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
++ eval cmd=\"$cmd\"
+ IFS="$save_ifs"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+@@ -5146,11 +5677,13 @@
+ fi
+ done
+ # Quote the link command for shipping.
+- relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
+- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+ if test "$hardcode_automatic" = yes ; then
+- relink_command=
+- fi
++ relink_command=
++ fi
++
++
+ # Only create the output if not a dry run.
+ if test -z "$run"; then
+ for installed in no yes; do
+@@ -5168,7 +5701,7 @@
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ newdependency_libs="$newdependency_libs $libdir/$name"
+ ;;
+@@ -5182,7 +5715,7 @@
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ newdlfiles="$newdlfiles $libdir/$name"
+ done
+@@ -5193,11 +5726,30 @@
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ newdlprefiles="$newdlprefiles $libdir/$name"
+ done
+ dlprefiles="$newdlprefiles"
++ else
++ newdlfiles=
++ for lib in $dlfiles; do
++ case $lib in
++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++ *) abs=`pwd`"/$lib" ;;
++ esac
++ newdlfiles="$newdlfiles $abs"
++ done
++ dlfiles="$newdlfiles"
++ newdlprefiles=
++ for lib in $dlprefiles; do
++ case $lib in
++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++ *) abs=`pwd`"/$lib" ;;
++ esac
++ newdlprefiles="$newdlprefiles $abs"
++ done
++ dlprefiles="$newdlprefiles"
+ fi
+ $rm $output
+ # place dlname in correct position for cygwin
+@@ -5241,7 +5793,7 @@
+
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
+- if test "$installed" = no && test "$need_relink" = yes && test "$fast_install" = no; then
++ if test "$installed" = no && test "$need_relink" = yes; then
+ $echo >> $output "\
+ relink_command=\"$relink_command\""
+ fi
+@@ -5254,7 +5806,7 @@
+ $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+ ;;
+ esac
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool install mode
+@@ -5265,11 +5817,11 @@
+ # install_prog (especially on Windows NT).
+ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ # Allow the use of GNU shtool's install command.
+- $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
++ $echo "X$nonopt" | grep shtool > /dev/null; then
+ # Aesthetically quote it.
+ arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+@@ -5278,14 +5830,14 @@
+ shift
+ else
+ install_prog=
+- arg="$nonopt"
++ arg=$nonopt
+ fi
+
+ # The real first argument should be the name of the installation program.
+ # Aesthetically quote it.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+@@ -5303,28 +5855,31 @@
+ do
+ if test -n "$dest"; then
+ files="$files $dest"
+- dest="$arg"
++ dest=$arg
+ continue
+ fi
+
+ case $arg in
+ -d) isdir=yes ;;
+- -f) prev="-f" ;;
+- -g) prev="-g" ;;
+- -m) prev="-m" ;;
+- -o) prev="-o" ;;
++ -f)
++ case " $install_prog " in
++ *[\\\ /]cp\ *) ;;
++ *) prev=$arg ;;
++ esac
++ ;;
++ -g | -m | -o) prev=$arg ;;
+ -s)
+ stripme=" -s"
+ continue
+ ;;
+- -*) ;;
+-
++ -*)
++ ;;
+ *)
+ # If the previous option needed an argument, then skip it.
+ if test -n "$prev"; then
+ prev=
+ else
+- dest="$arg"
++ dest=$arg
+ continue
+ fi
+ ;;
+@@ -5333,7 +5888,7 @@
+ # Aesthetically quote the argument.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+@@ -5343,13 +5898,13 @@
+ if test -z "$install_prog"; then
+ $echo "$modename: you must specify an install program" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$prev"; then
+ $echo "$modename: the \`$prev' option requires an argument" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -z "$files"; then
+@@ -5359,7 +5914,7 @@
+ $echo "$modename: you must specify a destination" 1>&2
+ fi
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Strip any trailing slash from the destination.
+@@ -5380,7 +5935,7 @@
+ if test "$#" -gt 2; then
+ $echo "$modename: \`$dest' is not a directory" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi
+ case $destdir in
+@@ -5392,7 +5947,7 @@
+ *)
+ $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ done
+@@ -5421,7 +5976,7 @@
+ else
+ $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ library_names=
+@@ -5463,14 +6018,14 @@
+ # but it's something to keep an eye on.
+ if test "$inst_prefix_dir" = "$destdir"; then
+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$inst_prefix_dir"; then
+ # 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%"`
++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
+ else
+- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
+ fi
+
+ $echo "$modename: warning: relinking \`$file'" 1>&2
+@@ -5478,7 +6033,7 @@
+ if $run eval "$relink_command"; then :
+ else
+ $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi
+
+@@ -5502,23 +6057,36 @@
+
+ if test "$#" -gt 0; then
+ # Delete the old symlinks, and create new ones.
++ # Try `ln -sf' first, because the `ln' binary might depend on
++ # the symlink we replace! Solaris /bin/ln does not understand -f,
++ # so we also need to try rm && ln -s.
+ for linkname
+ do
+ if test "$linkname" != "$realname"; then
+- $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+- $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
++ $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
++ $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+ fi
+ done
+ fi
+
+ # Do each command in the postinstall commands.
+ lib="$destdir/$realname"
+- eval cmds=\"$postinstall_cmds\"
++ cmds=$postinstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+- $run eval "$cmd" || exit $?
++ $run eval "$cmd" || {
++ lt_exit=$?
++
++ # Restore the uninstalled library and exit
++ if test "$mode" = relink; then
++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++ fi
++
++ exit $lt_exit
++ }
+ done
+ IFS="$save_ifs"
+ fi
+@@ -5556,7 +6124,7 @@
+ *)
+ $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+@@ -5574,7 +6142,7 @@
+ $show "$install_prog $staticobj $staticdest"
+ $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ fi
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ *)
+@@ -5612,23 +6180,21 @@
+ notinst_deplibs=
+ relink_command=
+
+- # To insure that "foo" is sourced, and not "foo.exe",
+- # finese the cygwin/MSYS system by explicitly sourcing "foo."
+- # which disallows the automatic-append-.exe behavior.
+- case $build in
+- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+- *) wrapperdot=${wrapper} ;;
+- esac
++ # Note that it is not necessary on cygwin/mingw to append a dot to
++ # foo even if both foo and FILE.exe exist: automatic-append-.exe
++ # behavior happens only for exec(3), not for open(2)! Also, sourcing
++ # `FILE.' does not work on cygwin managed mounts.
++ #
+ # If there is no directory component, then add one.
+- case $file in
+- */* | *\\*) . ${wrapperdot} ;;
+- *) . ./${wrapperdot} ;;
++ case $wrapper in
++ */* | *\\*) . ${wrapper} ;;
++ *) . ./${wrapper} ;;
+ esac
+
+ # Check the variables that should have been set.
+ if test -z "$notinst_deplibs"; then
+ $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ finalize=yes
+@@ -5650,34 +6216,25 @@
+ done
+
+ relink_command=
+- # To insure that "foo" is sourced, and not "foo.exe",
+- # finese the cygwin/MSYS system by explicitly sourcing "foo."
+- # which disallows the automatic-append-.exe behavior.
+- case $build in
+- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+- *) wrapperdot=${wrapper} ;;
+- esac
++ # Note that it is not necessary on cygwin/mingw to append a dot to
++ # foo even if both foo and FILE.exe exist: automatic-append-.exe
++ # behavior happens only for exec(3), not for open(2)! Also, sourcing
++ # `FILE.' does not work on cygwin managed mounts.
++ #
+ # If there is no directory component, then add one.
+- case $file in
+- */* | *\\*) . ${wrapperdot} ;;
+- *) . ./${wrapperdot} ;;
++ case $wrapper in
++ */* | *\\*) . ${wrapper} ;;
++ *) . ./${wrapper} ;;
+ esac
+
+ outputname=
+ if test "$fast_install" = no && test -n "$relink_command"; then
+ if test "$finalize" = yes && test -z "$run"; then
+- tmpdir="/tmp"
+- test -n "$TMPDIR" && tmpdir="$TMPDIR"
+- tmpdir="$tmpdir/libtool-$$"
+- if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
+- else
+- $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+- continue
+- fi
++ tmpdir=`func_mktempdir`
+ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+ outputname="$tmpdir/$file"
+ # Replace the output file specification.
+- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
+
+ $show "$relink_command"
+ if $run eval "$relink_command"; then :
+@@ -5697,7 +6254,7 @@
+ fi
+
+ # remove .exe since cygwin /usr/bin/install will append another
+- # one anyways
++ # one anyway
+ case $install_prog,$host in
+ */usr/bin/install*,*cygwin*)
+ case $file:$destfile in
+@@ -5729,16 +6286,17 @@
+ $show "$install_prog $file $oldlib"
+ $run eval "$install_prog \$file \$oldlib" || exit $?
+
+- if test -n "$stripme" && test -n "$striplib"; then
++ if test -n "$stripme" && test -n "$old_striplib"; then
+ $show "$old_striplib $oldlib"
+ $run eval "$old_striplib $oldlib" || exit $?
+ fi
+
+ # Do each command in the postinstall commands.
+- eval cmds=\"$old_postinstall_cmds\"
++ cmds=$old_postinstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -5752,9 +6310,9 @@
+ if test -n "$current_libdirs"; then
+ # Maybe just do a dry run.
+ test -n "$run" && current_libdirs=" -n$current_libdirs"
+- exec_cmd='$SHELL $0 --finish$current_libdirs'
++ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+ else
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+ ;;
+
+@@ -5773,10 +6331,11 @@
+ for libdir in $libdirs; do
+ if test -n "$finish_cmds"; then
+ # Do each command in the finish commands.
+- eval cmds=\"$finish_cmds\"
++ cmds=$finish_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || admincmds="$admincmds
+ $cmd"
+@@ -5793,9 +6352,9 @@
+ fi
+
+ # Exit here if they wanted silent mode.
+- exit 0
++ test "$show" = : && exit $EXIT_SUCCESS
+
+- $echo "----------------------------------------------------------------------"
++ $echo "X----------------------------------------------------------------------" | $Xsed
+ $echo "Libraries have been installed in:"
+ for libdir in $libdirs; do
+ $echo " $libdir"
+@@ -5828,8 +6387,8 @@
+ $echo
+ $echo "See any operating system documentation about shared libraries for"
+ $echo "more information, such as the ld(1) and ld.so(8) manual pages."
+- $echo "----------------------------------------------------------------------"
+- exit 0
++ $echo "X----------------------------------------------------------------------" | $Xsed
++ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool execute mode
+@@ -5841,7 +6400,7 @@
+ if test -z "$cmd"; then
+ $echo "$modename: you must specify a COMMAND" 1>&2
+ $echo "$help"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Handle -dlopen flags immediately.
+@@ -5849,7 +6408,7 @@
+ if test ! -f "$file"; then
+ $echo "$modename: \`$file' is not a file" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ dir=
+@@ -5860,7 +6419,7 @@
+ else
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Read the libtool library.
+@@ -5886,8 +6445,10 @@
+ if test -f "$dir/$objdir/$dlname"; then
+ dir="$dir/$objdir"
+ else
+- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+- exit 1
++ if test ! -f "$dir/$dlname"; then
++ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
++ exit $EXIT_FAILURE
++ fi
+ fi
+ ;;
+
+@@ -5951,12 +6512,12 @@
+ fi
+
+ # Restore saved environment variables
+- if test "${save_LC_ALL+set}" = set; then
+- LC_ALL="$save_LC_ALL"; export LC_ALL
+- fi
+- if test "${save_LANG+set}" = set; then
+- LANG="$save_LANG"; export LANG
+- fi
++ 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
++ fi"
++ done
+
+ # Now prepare to actually exec the command.
+ exec_cmd="\$cmd$args"
+@@ -5967,7 +6528,7 @@
+ $echo "export $shlibpath_var"
+ fi
+ $echo "$cmd$args"
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+ ;;
+
+@@ -5995,7 +6556,7 @@
+ if test -z "$rm"; then
+ $echo "$modename: you must specify an RM program" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ rmdirs=
+@@ -6045,15 +6606,24 @@
+ rmfiles="$rmfiles $objdir/$n"
+ done
+ test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+- test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+
+- if test "$mode" = uninstall; then
++ case "$mode" in
++ clean)
++ case " $library_names " in
++ # " " in the beginning catches empty $dlname
++ *" $dlname "*) ;;
++ *) rmfiles="$rmfiles $objdir/$dlname" ;;
++ esac
++ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
++ ;;
++ uninstall)
+ if test -n "$library_names"; then
+ # Do each command in the postuninstall commands.
+- eval cmds=\"$postuninstall_cmds\"
++ cmds=$postuninstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd"
+ if test "$?" -ne 0 && test "$rmforce" != yes; then
+@@ -6065,10 +6635,11 @@
+
+ if test -n "$old_library"; then
+ # Do each command in the old_postuninstall commands.
+- eval cmds=\"$old_postuninstall_cmds\"
++ cmds=$old_postuninstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd"
+ if test "$?" -ne 0 && test "$rmforce" != yes; then
+@@ -6078,7 +6649,8 @@
+ IFS="$save_ifs"
+ fi
+ # FIXME: should reinstall the best remaining shared library.
+- fi
++ ;;
++ esac
+ fi
+ ;;
+
+@@ -6107,7 +6679,7 @@
+ if test "$mode" = clean ; then
+ noexename=$name
+ case $file in
+- *.exe)
++ *.exe)
+ file=`$echo $file|${SED} 's,.exe$,,'`
+ noexename=`$echo $name|${SED} 's,.exe$,,'`
+ # $file with .exe has already been added to rmfiles,
+@@ -6152,20 +6724,20 @@
+ "")
+ $echo "$modename: you must specify a MODE" 1>&2
+ $echo "$generic_help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ if test -z "$exec_cmd"; then
+ $echo "$modename: invalid operation mode \`$mode'" 1>&2
+ $echo "$generic_help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi # test -z "$show_help"
+
+ if test -n "$exec_cmd"; then
+ eval exec $exec_cmd
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # We need to display help for each of the modes.
+@@ -6201,7 +6773,7 @@
+ a more detailed description of MODE.
+
+ Report bugs to <bug-libtool at gnu.org>."
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ clean)
+@@ -6302,9 +6874,9 @@
+ -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
++ try to export only the symbols listed in SYMFILE
+ -export-symbols-regex REGEX
+- try to export only the symbols matching 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
+@@ -6313,12 +6885,16 @@
+ -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
+- -static do not do any dynamic linking of libtool libraries
++ -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]
++ specify library version info [each variable defaults to 0]
+
+ All other options (arguments beginning with \`-') are ignored.
+
+@@ -6354,14 +6930,14 @@
+ *)
+ $echo "$modename: invalid operation mode \`$mode'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ $echo
+ $echo "Try \`$modename --help' for more information about other modes."
+
+-exit 0
++exit $?
+
+ # The TAGs below are defined such that we never get into a situation
+ # in which we disable both kinds of libraries. Given conflicting
+@@ -6375,12 +6951,11 @@
+ # configuration. But we'll never go from static-only to shared-only.
+
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+-build_libtool_libs=no
+-build_old_libs=yes
++disable_libs=shared
+ # ### END LIBTOOL TAG CONFIG: disable-shared
+
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-static
+-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
++disable_libs=static
+ # ### END LIBTOOL TAG CONFIG: disable-static
+
+ # Local Variables:
Added: kde-extras/eva/trunk/debian/patches/06_fix_ftbfs_with_gcc43.diff
===================================================================
--- kde-extras/eva/trunk/debian/patches/06_fix_ftbfs_with_gcc43.diff (rev 0)
+++ kde-extras/eva/trunk/debian/patches/06_fix_ftbfs_with_gcc43.diff 2008-05-05 20:19:17 UTC (rev 10481)
@@ -0,0 +1,596 @@
+diff -ruNad eva.orig/src/api/evaconnecter.cpp eva/src/api/evaconnecter.cpp
+--- eva.orig/src/api/evaconnecter.cpp 2008-04-25 08:09:34.000000000 +0000
++++ eva/src/api/evaconnecter.cpp 2008-04-25 08:24:55.000000000 +0000
+@@ -29,6 +29,7 @@
+ #include <qmutex.h>
+ #include <arpa/inet.h>
+ #include <stdlib.h>
++#include <cstring>
+ #include <kdebug.h>
+
+ #define POOL_CHECK_INTERVAL 2000 /// every 2 second check two pools
+diff -ruNad eva.orig/src/api/evahtmlparser.cpp eva/src/api/evahtmlparser.cpp
+--- eva.orig/src/api/evahtmlparser.cpp 2008-04-25 08:09:34.000000000 +0000
++++ eva/src/api/evahtmlparser.cpp 2008-04-25 08:20:10.000000000 +0000
+@@ -24,6 +24,7 @@
+ #include <qregexp.h>
+ #include <qfile.h>
+ #include <qpixmap.h>
++#include <cstring>
+ //#include <stdio.h>
+
+ unsigned int EvaHtmlParser::tmpNum = 0;
+diff -ruNad eva.orig/src/api/evaipaddress.cpp eva/src/api/evaipaddress.cpp
+--- eva.orig/src/api/evaipaddress.cpp 2008-04-25 08:09:34.000000000 +0000
++++ eva/src/api/evaipaddress.cpp 2008-04-25 16:23:40.000000000 +0000
+@@ -20,6 +20,7 @@
+
+ #include "evaipaddress.h"
+ #include <stdlib.h>
++#include <cstring>
+
+ EvaIPAddress::EvaIPAddress(const uint ip)
+ :isValidIP(false)
+diff -ruNad eva.orig/src/api/evaipaddress.h eva/src/api/evaipaddress.h
+--- eva.orig/src/api/evaipaddress.h 2008-04-25 08:09:34.000000000 +0000
++++ eva/src/api/evaipaddress.h 2008-04-25 16:23:19.000000000 +0000
+@@ -35,20 +35,20 @@
+ class EvaIPAddress{
+ public:
+ EvaIPAddress() {};
+- EvaIPAddress(const uint ip);
++ EvaIPAddress(const uint32_t ip);
+ EvaIPAddress(const std::string &strIP);
+ EvaIPAddress(const EvaIPAddress &address);
+
+- void setAddress(const uint ip);
++ void setAddress(const uint32_t ip);
+ void setAddress(const std::string &strIP);
+ const bool isValid() const;
+- const uint IP() const;
++ const uint32_t IP() const;
+ const std::string toString();
+ EvaIPAddress &operator= (const EvaIPAddress &rhs);
+ private:
+ bool isValidIP;
+- uint mIP;
+- uint getIntIP(const std::string &strIP);
++ uint32_t mIP;
++ uint32_t getIntIP(const std::string &strIP);
+ };
+
+ #endif
+diff -ruNad eva.orig/src/api/evapacketmanager.h eva/src/api/evapacketmanager.h
+--- eva.orig/src/api/evapacketmanager.h 2008-04-25 08:09:34.000000000 +0000
++++ eva/src/api/evapacketmanager.h 2008-04-25 14:55:51.000000000 +0000
+@@ -140,7 +140,7 @@
+ const unsigned int wanIp1, const unsigned short wanPort1,
+ const unsigned int wanIp2, const unsigned short wanPort2,
+ const unsigned int wanIp3, const unsigned short wanPort3,
+- const unsigned int lanIp1, const unsigned short lanPort2,
++ const unsigned int lanIp1, const unsigned short lanPort1,
+ const unsigned int lanIp2, const unsigned short lanPort2,
+ const unsigned int lanIp3, const unsigned short lanPort3,
+ const unsigned int syncIp, const unsigned short syncPort,
+diff -ruNad eva.orig/src/api/evapicmanager.cpp eva/src/api/evapicmanager.cpp
+--- eva.orig/src/api/evapicmanager.cpp 2008-04-25 08:09:34.000000000 +0000
++++ eva/src/api/evapicmanager.cpp 2008-04-25 08:13:40.000000000 +0000
+@@ -19,7 +19,7 @@
+ ***************************************************************************/
+
+ #include "evapicmanager.h"
+-
++#include <cstring>
+ #include "evauser.h"
+ #include "evausersetting.h"
+ #include "evanetwork.h"
+diff -ruNad eva.orig/src/api/evaqtutil.cpp eva/src/api/evaqtutil.cpp
+--- eva.orig/src/api/evaqtutil.cpp 2008-04-25 08:09:34.000000000 +0000
++++ eva/src/api/evaqtutil.cpp 2008-04-25 08:30:32.000000000 +0000
+@@ -28,6 +28,7 @@
+ #include <qfile.h>
+ #include <qfileinfo.h>
+ #include <qapplication.h>
++#include <cstring>
+
+ const QString EvaTextFilter::filter( const QString & source )
+ {
+diff -ruNad eva.orig/src/api/evasetting.cpp eva/src/api/evasetting.cpp
+--- eva.orig/src/api/evasetting.cpp 2008-04-25 08:09:34.000000000 +0000
++++ eva/src/api/evasetting.cpp 2008-04-25 08:24:03.000000000 +0000
+@@ -19,6 +19,7 @@
+ ***************************************************************************/
+ #include "evasetting.h"
+ #include <stdlib.h>
++#include <cstring>
+ #include <qapplication.h>
+ #include <qfile.h>
+ #include <qdir.h>
+diff -ruNad eva.orig/src/api/evauhmanager.cpp eva/src/api/evauhmanager.cpp
+--- eva.orig/src/api/evauhmanager.cpp 2008-04-25 08:09:34.000000000 +0000
++++ eva/src/api/evauhmanager.cpp 2008-04-25 08:17:58.000000000 +0000
+@@ -31,6 +31,7 @@
+ #include <qstringlist.h>
+ #include <qapplication.h>
+ #include <string.h>
++#include <cstring>
+
+ #define MaxBlockSize 800
+
+diff -ruNad eva.orig/src/api/evauser.cpp eva/src/api/evauser.cpp
+--- eva.orig/src/api/evauser.cpp 2008-04-25 08:09:34.000000000 +0000
++++ eva/src/api/evauser.cpp 2008-04-25 15:17:06.000000000 +0000
+@@ -25,6 +25,8 @@
+ #include "evautil.h"
+ #include "evafriend.h"
+ #include <string.h>
++#include <cstring>
++#include <cstdlib>
+ #include <qtextcodec.h>
+ #include <qevent.h>
+ #include <klocale.h>
+diff -ruNad eva.orig/src/api/evauser.h eva/src/api/evauser.h
+--- eva.orig/src/api/evauser.h 2008-04-25 08:09:34.000000000 +0000
++++ eva/src/api/evauser.h 2008-04-25 08:22:08.000000000 +0000
+@@ -27,7 +27,7 @@
+ #include "evausersetting.h"
+ #include <qobject.h>
+ #include <qstringlist.h>
+-#include <string>
++#include <cstring>
+ #include <list>
+
+ // used in the reply of login token ex requests
+diff -ruNad eva.orig/src/api/evausersetting.h eva/src/api/evausersetting.h
+--- eva.orig/src/api/evausersetting.h 2008-04-25 08:09:34.000000000 +0000
++++ eva/src/api/evausersetting.h 2008-04-25 08:32:58.000000000 +0000
+@@ -33,7 +33,7 @@
+ #include <qsize.h>
+ #include <qcolor.h>
+ #include <kshortcut.h>
+-
++#include <cstring>
+ class KConfig;
+
+ typedef struct BuddyInfoCacheItem{
+diff -ruNad eva.orig/src/api/filetrans/evacachedfile.cpp eva/src/api/filetrans/evacachedfile.cpp
+--- eva.orig/src/api/filetrans/evacachedfile.cpp 2008-04-25 08:09:34.000000000 +0000
++++ eva/src/api/filetrans/evacachedfile.cpp 2008-04-25 08:15:33.000000000 +0000
+@@ -25,6 +25,7 @@
+ #include <qfile.h>
+ #include <qfileinfo.h>
+ #include <qtextcodec.h>
++#include <cstring>
+
+ #define InfoFileName_Ext ".info"
+ #define CacheFileName_Ext ".cache"
+diff -ruNad eva.orig/src/api/filetrans/evafiledownloader.cpp eva/src/api/filetrans/evafiledownloader.cpp
+--- eva.orig/src/api/filetrans/evafiledownloader.cpp 2008-04-25 08:09:34.000000000 +0000
++++ eva/src/api/filetrans/evafiledownloader.cpp 2008-04-25 08:16:10.000000000 +0000
+@@ -26,6 +26,7 @@
+ #include <qdns.h>
+ #include <qtextcodec.h>
+ #include <qapplication.h>
++#include <cstring>
+
+ #define RELAY_SERVER_URL "RelayServer2.tencent.com"
+ #define RELAY_SERVER_DEFAULT_IP "219.133.40.38"
+diff -ruNad eva.orig/src/api/filetrans/evafiledownloader.h eva/src/api/filetrans/evafiledownloader.h
+--- eva.orig/src/api/filetrans/evafiledownloader.h 2008-04-25 08:09:34.000000000 +0000
++++ eva/src/api/filetrans/evafiledownloader.h 2008-04-25 14:47:13.000000000 +0000
+@@ -30,6 +30,8 @@
+ #include <qevent.h>
+ #include <qdatetime.h>
+ #include <qptrlist.h>
++#include <cstring>
++#include <cstdlib>
+
+ #define Eva_FileNotifyAgentEvent 65527
+ #define Eva_FileNotifyStatusEvent 65526
+diff -ruNad eva.orig/src/api/filetrans/evafilemanager.cpp eva/src/api/filetrans/evafilemanager.cpp
+--- eva.orig/src/api/filetrans/evafilemanager.cpp 2008-04-25 08:09:34.000000000 +0000
++++ eva/src/api/filetrans/evafilemanager.cpp 2008-04-25 08:16:43.000000000 +0000
+@@ -21,6 +21,7 @@
+ #include "evafilemanager.h"
+ #include "evafiledownloader.h"
+ #include <qevent.h>
++#include <cstring>
+
+ EvaFileManager::EvaFileManager(const int myId, QObject *parent)
+ : QObject(parent), m_MyId(myId), m_FileAgentToken(NULL), m_IsProxySet(false)
+diff -ruNad eva.orig/src/api/qmdcodec.cpp eva/src/api/qmdcodec.cpp
+--- eva.orig/src/api/qmdcodec.cpp 2008-04-25 08:09:34.000000000 +0000
++++ eva/src/api/qmdcodec.cpp 2008-04-25 08:27:39.000000000 +0000
+@@ -34,6 +34,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <cstring>
+
+ #include "qmdcodec.h"
+
+diff -ruNad eva.orig/src/libeva/evaaddfriend.cpp eva/src/libeva/evaaddfriend.cpp
+--- eva.orig/src/libeva/evaaddfriend.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/evaaddfriend.cpp 2008-04-25 08:55:17.000000000 +0000
+@@ -28,6 +28,7 @@
+ #else
+ #include <arpa/inet.h>
+ #endif
++#include <cstring>
+
+ AddFriendPacket::AddFriendPacket( )
+ : OutPacket(),
+diff -ruNad eva.orig/src/libeva/evaaddfriendex.cpp eva/src/libeva/evaaddfriendex.cpp
+--- eva.orig/src/libeva/evaaddfriendex.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/evaaddfriendex.cpp 2008-04-25 08:48:11.000000000 +0000
+@@ -28,7 +28,8 @@
+ #else
+ #include <arpa/inet.h>
+ #endif
+-
++#include <cstring>
++
+ EvaAddFriendExPacket::EvaAddFriendExPacket()
+ :OutPacket(),
+ m_AddQQNum(0)
+diff -ruNad eva.orig/src/libeva/evaadvancedsearch.cpp eva/src/libeva/evaadvancedsearch.cpp
+--- eva.orig/src/libeva/evaadvancedsearch.cpp 2008-04-25 08:09:35.000000000 +0000
++++ eva/src/libeva/evaadvancedsearch.cpp 2008-04-25 08:35:00.000000000 +0000
+@@ -19,6 +19,7 @@
+ ***************************************************************************/
+ #include "evaadvancedsearch.h"
+ #include "evautil.h"
++#include <cstring>
+
+ AdvancedUser::AdvancedUser()
+ :m_QQNum(0),
+diff -ruNad eva.orig/src/libeva/evacrypt.cpp eva/src/libeva/evacrypt.cpp
+--- eva.orig/src/libeva/evacrypt.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/evacrypt.cpp 2008-04-25 08:54:55.000000000 +0000
+@@ -32,6 +32,7 @@
+ #else
+ #include <arpa/inet.h>
+ #endif
++#include <cstring>
+
+ EvaCrypt::EvaCrypt()
+ {
+diff -ruNad eva.orig/src/libeva/evaextrainfo.cpp eva/src/libeva/evaextrainfo.cpp
+--- eva.orig/src/libeva/evaextrainfo.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/evaextrainfo.cpp 2008-04-25 08:51:28.000000000 +0000
+@@ -25,6 +25,7 @@
+ #else
+ #include <arpa/inet.h>
+ #endif
++#include <cstring>
+
+ RequestExtraInfoPacket::RequestExtraInfoPacket()
+ : OutPacket(QQ_CMD_REQUEST_EXTRA_INFORMATION, true),
+diff -ruNad eva.orig/src/libeva/evafriend.cpp eva/src/libeva/evafriend.cpp
+--- eva.orig/src/libeva/evafriend.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/evafriend.cpp 2008-04-25 15:05:59.000000000 +0000
+@@ -25,6 +25,8 @@
+ #else
+ #include <arpa/inet.h>
+ #endif
++#include <cstring>
++#include <cstdlib>
+
+ FriendItem::FriendItem(const unsigned int id)
+ :qqNum(id), face(0),
+diff -ruNad eva.orig/src/libeva/evafriendlist.cpp eva/src/libeva/evafriendlist.cpp
+--- eva.orig/src/libeva/evafriendlist.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/evafriendlist.cpp 2008-04-25 15:07:00.000000000 +0000
+@@ -19,6 +19,8 @@
+ ***************************************************************************/
+ #include "evafriendlist.h"
+ #include <stdio.h>
++#include <cstring>
++#include <cstdlib>
+
+ QQFriend::sortItem QQFriend::field2Sort = Sort_Nick;
+
+diff -ruNad eva.orig/src/libeva/evafriendlist.h eva/src/libeva/evafriendlist.h
+--- eva.orig/src/libeva/evafriendlist.h 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/evafriendlist.h 2008-04-25 08:54:23.000000000 +0000
+@@ -27,6 +27,7 @@
+ #include "evauserinfo.h"
+ #include "evalevel.h"
+ #include "evamemo.h"
++#include <cstring>
+
+
+ #define BUDDY_INVALID_FIELD 01
+diff -ruNad eva.orig/src/libeva/evagroup.cpp eva/src/libeva/evagroup.cpp
+--- eva.orig/src/libeva/evagroup.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/evagroup.cpp 2008-04-25 08:51:00.000000000 +0000
+@@ -26,6 +26,7 @@
+ #else
+ #include <arpa/inet.h>
+ #endif
++#include <cstring>
+
+ GroupNameOpPacket::GroupNameOpPacket( )
+ : OutPacket(QQ_CMD_GROUP_NAME_OP, true),
+diff -ruNad eva.orig/src/libeva/evaimreceive.cpp eva/src/libeva/evaimreceive.cpp
+--- eva.orig/src/libeva/evaimreceive.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/evaimreceive.cpp 2008-04-25 15:08:08.000000000 +0000
+@@ -26,6 +26,8 @@
+ #else
+ #include <arpa/inet.h>
+ #endif
++#include <cstring>
++#include <cstdlib>
+
+
+ ReceiveIMPacket::ReceiveIMPacket(unsigned char *buf, const int len)
+diff -ruNad eva.orig/src/libeva/evaimsend.cpp eva/src/libeva/evaimsend.cpp
+--- eva.orig/src/libeva/evaimsend.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/evaimsend.cpp 2008-04-25 15:09:03.000000000 +0000
+@@ -26,6 +26,8 @@
+ #else
+ #include <arpa/inet.h>
+ #endif
++#include <cstring>
++#include <cstdlib>
+
+ SendIM::SendIM(const unsigned short type)
+ : OutPacket(QQ_CMD_SEND_IM, true),
+diff -ruNad eva.orig/src/libeva/evakeyrequest.cpp eva/src/libeva/evakeyrequest.cpp
+--- eva.orig/src/libeva/evakeyrequest.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/evakeyrequest.cpp 2008-04-25 08:55:43.000000000 +0000
+@@ -20,6 +20,7 @@
+
+ #include "evakeyrequest.h"
+ #include <string.h>
++#include <cstring>
+
+ EvaRequestKeyPacket::EvaRequestKeyPacket()
+ : OutPacket(QQ_CMD_REQUEST_KEY, true)
+diff -ruNad eva.orig/src/libeva/evalevel.cpp eva/src/libeva/evalevel.cpp
+--- eva.orig/src/libeva/evalevel.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/evalevel.cpp 2008-04-25 08:46:40.000000000 +0000
+@@ -24,6 +24,7 @@
+ #else
+ #include <arpa/inet.h>
+ #endif
++#include <cstring>
+
+ EvaGetLevelPacket::EvaGetLevelPacket(const std::list<unsigned int> &l)
+ : OutPacket(QQ_CMD_GET_LEVEL, true),
+diff -ruNad eva.orig/src/libeva/evalogin.cpp eva/src/libeva/evalogin.cpp
+--- eva.orig/src/libeva/evalogin.cpp 2008-04-25 08:09:35.000000000 +0000
++++ eva/src/libeva/evalogin.cpp 2008-04-25 08:39:04.000000000 +0000
+@@ -27,6 +27,7 @@
+ #include <stdlib.h>
+ #include "evacrypt.h"
+ #include "evautil.h"
++#include <cstring>
+
+ LoginPacket::LoginPacket()
+ : OutPacket(),
+diff -ruNad eva.orig/src/libeva/evalogintoken.cpp eva/src/libeva/evalogintoken.cpp
+--- eva.orig/src/libeva/evalogintoken.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/evalogintoken.cpp 2008-04-25 08:56:06.000000000 +0000
+@@ -23,6 +23,7 @@
+ #include "evacrypt.h"
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <cstring>
+
+ #ifdef _WIN32
+ #include <winsock.h>
+diff -ruNad eva.orig/src/libeva/evamemo.cpp eva/src/libeva/evamemo.cpp
+--- eva.orig/src/libeva/evamemo.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/evamemo.cpp 2008-04-25 08:45:34.000000000 +0000
+@@ -19,6 +19,7 @@
+ ***************************************************************************/
+ #include "evamemo.h"
+ #include "evautil.h"
++#include <cstring>
+
+ EvaMemoPacket::EvaMemoPacket( const int id, const unsigned char type )
+ :OutPacket( QQ_CMD_MEMO_OP, true ), m_Id( id ), m_Type( type )
+diff -ruNad eva.orig/src/libeva/evaonlinestatus.cpp eva/src/libeva/evaonlinestatus.cpp
+--- eva.orig/src/libeva/evaonlinestatus.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/evaonlinestatus.cpp 2008-04-25 08:49:08.000000000 +0000
+@@ -26,6 +26,7 @@
+ #else
+ #include <arpa/inet.h>
+ #endif
++#include <cstring>
+
+ // class FriendStatus for private use
+ class FriendStatus {
+diff -ruNad eva.orig/src/libeva/evapacket.cpp eva/src/libeva/evapacket.cpp
+--- eva.orig/src/libeva/evapacket.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/evapacket.cpp 2008-04-25 08:53:49.000000000 +0000
+@@ -28,6 +28,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include "evacrypt.h"
++#include <cstring>
+
+ unsigned char Packet::iniKey[16] = {
+ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+diff -ruNad eva.orig/src/libeva/evaqun.cpp eva/src/libeva/evaqun.cpp
+--- eva.orig/src/libeva/evaqun.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/evaqun.cpp 2008-04-25 15:12:30.000000000 +0000
+@@ -27,6 +27,8 @@
+ #else
+ #include <arpa/inet.h>
+ #endif
++#include <cstring>
++#include <cstdlib>
+
+ QunInfo::QunInfo()
+ : qunID(0), externalID(0), type(QQ_QUN_TYPE_PERMANENT),
+diff -ruNad eva.orig/src/libeva/evasearchuser.cpp eva/src/libeva/evasearchuser.cpp
+--- eva.orig/src/libeva/evasearchuser.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/evasearchuser.cpp 2008-04-25 08:49:36.000000000 +0000
+@@ -18,6 +18,7 @@
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+ #include "evasearchuser.h"
++#include <cstring>
+
+
+
+diff -ruNad eva.orig/src/libeva/evasearchuser.h eva/src/libeva/evasearchuser.h
+--- eva.orig/src/libeva/evasearchuser.h 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/evasearchuser.h 2008-04-25 14:42:28.000000000 +0000
+@@ -27,6 +27,7 @@
+ #endif
+ #include <string>
+ #include <list>
++#include <cstdlib>
+ /**
+ @author yunfan
+ */
+diff -ruNad eva.orig/src/libeva/evauserinfo.cpp eva/src/libeva/evauserinfo.cpp
+--- eva.orig/src/libeva/evauserinfo.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/evauserinfo.cpp 2008-04-25 15:10:07.000000000 +0000
+@@ -19,6 +19,8 @@
+ ***************************************************************************/
+ #include "evauserinfo.h"
+ #include "evadefines.h"
++#include <cstring>
++#include <cstdlib>
+
+ // important: all string stored are encoded by "GB18030"
+
+diff -ruNad eva.orig/src/libeva/evautil.cpp eva/src/libeva/evautil.cpp
+--- eva.orig/src/libeva/evautil.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/evautil.cpp 2008-04-25 15:11:09.000000000 +0000
+@@ -25,6 +25,8 @@
+ #include <arpa/inet.h>
+ #endif
+ #include "md5.h"
++#include <cstring>
++#include <cstdlib>
+
+ // const char EvaUtil::smileyMap[QQ_SMILEY_AMOUNT] = {
+ // 0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,
+diff -ruNad eva.orig/src/libeva/libcustompic/evapicpacket.cpp eva/src/libeva/libcustompic/evapicpacket.cpp
+--- eva.orig/src/libeva/libcustompic/evapicpacket.cpp 2008-04-25 08:09:35.000000000 +0000
++++ eva/src/libeva/libcustompic/evapicpacket.cpp 2008-04-25 08:43:25.000000000 +0000
+@@ -26,6 +26,7 @@
+ #else
+ #include <arpa/inet.h>
+ #endif
++#include <cstring>
+
+ unsigned int EvaPicPacket::myQQ = 0;
+ unsigned char *EvaPicPacket::fileAgentKey = NULL;
+diff -ruNad eva.orig/src/libeva/libcustompic/evarequestagent.cpp eva/src/libeva/libcustompic/evarequestagent.cpp
+--- eva.orig/src/libeva/libcustompic/evarequestagent.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/libcustompic/evarequestagent.cpp 2008-04-25 08:45:01.000000000 +0000
+@@ -26,6 +26,7 @@
+ #else
+ #include <arpa/inet.h>
+ #endif
++#include <cstring>
+
+ EvaRequestAgentPacket::EvaRequestAgentPacket( const unsigned char *token, const unsigned short length)
+ : EvaPicOutPacket(QQ_05_CMD_REQUEST_AGENT, false)
+diff -ruNad eva.orig/src/libeva/libcustompic/evarequestface.cpp eva/src/libeva/libcustompic/evarequestface.cpp
+--- eva.orig/src/libeva/libcustompic/evarequestface.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/libcustompic/evarequestface.cpp 2008-04-25 08:44:04.000000000 +0000
+@@ -25,6 +25,7 @@
+ #else
+ #include <arpa/inet.h>
+ #endif
++#include <cstring>
+
+ EvaRequestFacePacket::EvaRequestFacePacket()
+ : EvaPicOutPacket(QQ_05_CMD_REQUEST_FACE, true), fileAgentToken(NULL)
+diff -ruNad eva.orig/src/libeva/libcustompic/evarequeststart.cpp eva/src/libeva/libcustompic/evarequeststart.cpp
+--- eva.orig/src/libeva/libcustompic/evarequeststart.cpp 2008-04-25 08:09:36.000000000 +0000
++++ eva/src/libeva/libcustompic/evarequeststart.cpp 2008-04-25 08:44:33.000000000 +0000
+@@ -25,6 +25,7 @@
+ #else
+ #include <arpa/inet.h>
+ #endif
++#include <cstring>
+
+ EvaRequestStartPacket::EvaRequestStartPacket()
+ : EvaPicOutPacket(QQ_05_CMD_REQUEST_START, true), requestSend(true)
+diff -ruNad eva.orig/src/libeva/libcustompic/evatransfer.cpp eva/src/libeva/libcustompic/evatransfer.cpp
+--- eva.orig/src/libeva/libcustompic/evatransfer.cpp 2008-04-25 08:09:35.000000000 +0000
++++ eva/src/libeva/libcustompic/evatransfer.cpp 2008-04-25 08:42:44.000000000 +0000
+@@ -26,7 +26,7 @@
+ #else
+ #include <arpa/inet.h>
+ #endif
+-
++#include <cstring>
+ EvaPicTransferPacket::EvaPicTransferPacket()
+ : EvaPicOutPacket(QQ_05_CMD_TRANSFER, false), fragment(NULL)
+ {
+diff -ruNad eva.orig/src/libeva/libft/evaftpacket.cpp eva/src/libeva/libft/evaftpacket.cpp
+--- eva.orig/src/libeva/libft/evaftpacket.cpp 2008-04-25 08:09:35.000000000 +0000
++++ eva/src/libeva/libft/evaftpacket.cpp 2008-04-25 08:36:28.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include "../evautil.h"
+ #include <string.h>
+ #include <stdio.h>
++#include <cstring>
+
+
+ EvaFTPacket::EvaFTPacket(const unsigned char *buf, const int len)
+diff -ruNad eva.orig/src/libeva/libft/evaftprotocols.cpp eva/src/libeva/libft/evaftprotocols.cpp
+--- eva.orig/src/libeva/libft/evaftprotocols.cpp 2008-04-25 08:09:35.000000000 +0000
++++ eva/src/libeva/libft/evaftprotocols.cpp 2008-04-25 08:37:02.000000000 +0000
+@@ -23,6 +23,7 @@
+ #include "../evacrypt.h"
+ #include <stdio.h>
+ #include <string.h>
++#include <cstring>
+
+ EvaFTAgentCreate::EvaFTAgentCreate()
+ : EvaFTAgentPacket(QQ_FILE_AGENT_CMD_CREATE),
+diff -ruNad eva.orig/src/libeva/libuh/evauhpacket.cpp eva/src/libeva/libuh/evauhpacket.cpp
+--- eva.orig/src/libeva/libuh/evauhpacket.cpp 2008-04-25 08:09:35.000000000 +0000
++++ eva/src/libeva/libuh/evauhpacket.cpp 2008-04-25 08:37:54.000000000 +0000
+@@ -27,6 +27,7 @@
+ #endif
+ #include <string.h>
+ #include <stdio.h>
++#include <cstring>
+
+ unsigned short EvaUHPacket::seq_random = 0;
+ unsigned short EvaUHPacket::seq_info = 0;
+diff -ruNad eva.orig/src/libeva/libuh/evauhprotocols.cpp eva/src/libeva/libuh/evauhprotocols.cpp
+--- eva.orig/src/libeva/libuh/evauhprotocols.cpp 2008-04-25 08:09:35.000000000 +0000
++++ eva/src/libeva/libuh/evauhprotocols.cpp 2008-04-25 08:38:17.000000000 +0000
+@@ -26,6 +26,7 @@
+ #endif
+ #include <string.h>
+ #include <stdio.h>
++#include <cstring>
+
+ EvaUHInfoRequest::EvaUHInfoRequest()
+ :EvaUHPacket(true)
+diff -ruNad eva.orig/src/ui/evaloginwindow.cpp eva/src/ui/evaloginwindow.cpp
+--- eva.orig/src/ui/evaloginwindow.cpp 2008-04-25 08:09:34.000000000 +0000
++++ eva/src/ui/evaloginwindow.cpp 2008-04-25 08:12:06.000000000 +0000
+@@ -23,6 +23,7 @@
+ #include "evautil.h"
+ #include "qmdcodec.h"
+
++#include <cstring>
+ #include <qpixmap.h>
+ #include <qlineedit.h>
+ #include <qcombobox.h>
+diff -ruNad eva.orig/src/ui/evaqunsysmsgwindow.cpp eva/src/ui/evaqunsysmsgwindow.cpp
+--- eva.orig/src/ui/evaqunsysmsgwindow.cpp 2008-04-25 08:09:34.000000000 +0000
++++ eva/src/ui/evaqunsysmsgwindow.cpp 2008-04-25 08:12:48.000000000 +0000
+@@ -20,7 +20,7 @@
+
+ #include "evaqunsysmsgwindow.h"
+
+-
++#include <cstring>
+ #include <qpushbutton.h>
+ #include <qframe.h>
+ #include <qtoolbutton.h>
Added: kde-extras/eva/trunk/debian/patches/08_translation_update.diff
===================================================================
--- kde-extras/eva/trunk/debian/patches/08_translation_update.diff (rev 0)
+++ kde-extras/eva/trunk/debian/patches/08_translation_update.diff 2008-05-05 20:19:17 UTC (rev 10481)
@@ -0,0 +1,5833 @@
+diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/po/eva.pot eva-0.4.921+svn42.new/po/eva.pot
+--- eva-0.4.921+svn42/po/eva.pot 2008-04-25 16:09:34.000000000 +0800
++++ eva-0.4.921+svn42.new/po/eva.pot 2008-05-06 03:12:20.000000000 +0800
+@@ -7,7 +7,7 @@
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2008-02-18 20:02+0800\n"
++"POT-Creation-Date: 2008-05-06 03:12+0800\n"
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL at li.org>\n"
+@@ -44,15 +44,15 @@
+ msgstr ""
+
+ #: evaaddingmanager.cpp:186
+-msgid "You are adding %1, cannot processing %2 request."
++msgid "You are adding %1, cannot process %2 request."
+ msgstr ""
+
+ #: evaaddingmanager.cpp:251
+-msgid "Incorrect verify code, try again please!"
++msgid "Incorrect verification code, try again please!"
+ msgstr ""
+
+ #: evaaddingmanager.cpp:284
+-msgid "Unkown auth reply type(%1), adding failed."
++msgid "Unknown auth reply type (%1), adding failed."
+ msgstr ""
+
+ #: evaaddingmanager.cpp:318
+@@ -161,7 +161,7 @@
+ msgid "Download Group"
+ msgstr ""
+
+-#: evamain.cpp:393 ui/evacontactlistview.cpp:456
++#: evamain.cpp:393 ui/evacontactlistview.cpp:423
+ msgid "Group"
+ msgstr ""
+
+@@ -185,140 +185,140 @@
+ msgid "No Auto-Reply"
+ msgstr ""
+
+-#: evamain.cpp:570 ui/evamainwindow.cpp:492
++#: evamain.cpp:569 ui/evamainwindow.cpp:493
+ msgid "Qun List"
+ msgstr ""
+
+-#: evamain.cpp:571
++#: evamain.cpp:570
+ msgid "Anonymous"
+ msgstr ""
+
+-#: evamain.cpp:572
++#: evamain.cpp:571
+ msgid "Black List"
+ msgstr ""
+
+-#: evamain.cpp:590 ui/evamainwindow.cpp:451
++#: evamain.cpp:589 ui/evamainwindow.cpp:452
+ msgid "Buddy List"
+ msgstr ""
+
+-#: evamain.cpp:1012
++#: evamain.cpp:1015
+ msgid "Network error occurred, check your network then try Eva later please."
+ msgstr ""
+
+-#: evamain.cpp:1013 ui/loginuibase.cpp:196
++#: evamain.cpp:1016 ui/loginuibase.cpp:196
+ msgid "Network"
+ msgstr ""
+
+-#: evamain.cpp:1038
++#: evamain.cpp:1041
+ msgid "Cannot login, try later please."
+ msgstr ""
+
+-#: evamain.cpp:1038 evamain.cpp:1075 evamain.cpp:2536
+-#: ui/evaloginwindow.cpp:140 ui/evaloginwindow.cpp:148
++#: evamain.cpp:1041 evamain.cpp:1078 evamain.cpp:2537
++#: ui/evaloginwindow.cpp:141 ui/evaloginwindow.cpp:149
+ msgid "Eva Login"
+ msgstr ""
+
+-#: evamain.cpp:1052
++#: evamain.cpp:1055
+ msgid "Lost connection with server, try later please."
+ msgstr ""
+
+-#: evamain.cpp:1052
++#: evamain.cpp:1055
+ msgid "Eva Connection"
+ msgstr ""
+
+-#: evamain.cpp:1101
++#: evamain.cpp:1104
+ msgid "I am online."
+ msgstr ""
+
+-#: evamain.cpp:1115
++#: evamain.cpp:1118
+ msgid "I am busy ..."
+ msgstr ""
+
+-#: evamain.cpp:1244
++#: evamain.cpp:1247
+ msgid "Uploading grouped friends successfully."
+ msgstr ""
+
+-#: evamain.cpp:1244 evamain.cpp:1246
++#: evamain.cpp:1247 evamain.cpp:1249
+ msgid "Eva Upload Groups"
+ msgstr ""
+
+-#: evamain.cpp:1246
++#: evamain.cpp:1249
+ msgid "Uploading grouped friends failed."
+ msgstr ""
+
+-#: evamain.cpp:1605
++#: evamain.cpp:1608
+ msgid "Delete buddy \"%1\" failed."
+ msgstr ""
+
+-#: evamain.cpp:1605
++#: evamain.cpp:1608
+ msgid "Eva Delete Buddy"
+ msgstr ""
+
+-#: evamain.cpp:1668
++#: evamain.cpp:1671
+ msgid "put \"%1\" into Blacklist, are you sure?"
+ msgstr ""
+
+-#: evamain.cpp:1669 evamain.cpp:1684
++#: evamain.cpp:1672 evamain.cpp:1687
+ msgid "Eva Blacklist"
+ msgstr ""
+
+-#: evamain.cpp:1683
++#: evamain.cpp:1686
+ msgid "Blacklist operation on \"%1\" failed."
+ msgstr ""
+
+-#: evamain.cpp:1691
++#: evamain.cpp:1694
+ msgid "add \"%1\" into your Buddy list?"
+ msgstr ""
+
+-#: evamain.cpp:1691
++#: evamain.cpp:1694
+ msgid "Eva Add Buddy"
+ msgstr ""
+
+-#: evamain.cpp:1839 ui/evanotifywindow.cpp:272 ui/evanotifywindow.cpp:290
++#: evamain.cpp:1842 ui/evanotifywindow.cpp:272 ui/evanotifywindow.cpp:290
+ #: ui/evanotifywindow.cpp:308 ui/evanotifywindow.cpp:325
+ #: ui/evanotifywindow.cpp:346 ui/evanotifywindow.cpp:364
+ #: ui/evaqunchatuibase.cpp:288 ui/evaqunchatwindow.cpp:322
+-#: ui/evaqunchatwindow.cpp:466 ui/evasyshistoryviewer.cpp:96
++#: ui/evaqunchatwindow.cpp:461 ui/evasyshistoryviewer.cpp:96
+ #: ui/qundetailsui.cpp:341 ui/qundetailswindow.cpp:106
+ #: ui/qundetailswindow.cpp:282
+ msgid "Qun"
+ msgstr ""
+
+-#: evamain.cpp:1960
++#: evamain.cpp:1963
+ msgid "You have exited the Qun \"%1\" successfully."
+ msgstr ""
+
+-#: evamain.cpp:1962
++#: evamain.cpp:1965
+ msgid ""
+ "Exit Qun \"%1\" failed\n"
+ "%2"
+ msgstr ""
+
+-#: evamain.cpp:1964 evamain.cpp:1982 evamain.cpp:1988
++#: evamain.cpp:1967 evamain.cpp:1985 evamain.cpp:1991
+ #: ui/evaquncreatewindow.cpp:74 ui/evaquncreatewindow.cpp:81
+ #: ui/evaquncreatewindow.cpp:296 ui/evaquncreatewindow.cpp:302
+ msgid "Qun Operation"
+ msgstr ""
+
+-#: evamain.cpp:1978
++#: evamain.cpp:1981
+ msgid ""
+ "You are the creator of Qun \"%1\", if you exit this Qun this Qun will be "
+ "deleted, are you sure?"
+ msgstr ""
+
+-#: evamain.cpp:1980
++#: evamain.cpp:1983
+ msgid "Are you sure you want to exit Qun \"%1\"?"
+ msgstr ""
+
+-#: evamain.cpp:2010
++#: evamain.cpp:2013
+ msgid "signature"
+ msgstr ""
+
+-#: evamain.cpp:2038
++#: evamain.cpp:2041
+ msgid "Eva Global Key"
+ msgstr ""
+
+-#: evamain.cpp:2039
++#: evamain.cpp:2042
+ msgid "This action allows you to read your new Eva message globally."
+ msgstr ""
+
+@@ -414,164 +414,164 @@
+ msgid "IM Client"
+ msgstr ""
+
+-#: main.cpp:29
++#: main.cpp:33
+ msgid "An IM Client Under KDE Using QQ IM Protocol."
+ msgstr ""
+
+-#: main.cpp:35
++#: main.cpp:39
+ msgid "Using the last saved settings to login."
+ msgstr ""
+
+-#: main.cpp:37
++#: main.cpp:41
+ msgid "QQ number to login."
+ msgstr ""
+
+-#: main.cpp:39
++#: main.cpp:43
+ msgid "Password for your QQ number."
+ msgstr ""
+
+-#: main.cpp:41
+-msgid "Connection mode ( one of UDP, TCP or HTTP_PROXY), defaulting to UDP"
++#: main.cpp:45
++msgid "Connection mode (one of UDP, TCP or HTTP_PROXY), defaulting to UDP"
+ msgstr ""
+
+-#: main.cpp:42
++#: main.cpp:46
+ msgid "Proxy server IP address."
+ msgstr ""
+
+-#: main.cpp:43
++#: main.cpp:47
+ msgid "Proxy server port number"
+ msgstr ""
+
+-#: main.cpp:44
++#: main.cpp:48
+ msgid "Proxy user name if required."
+ msgstr ""
+
+-#: main.cpp:45
++#: main.cpp:49
+ msgid "Proxy password if required."
+ msgstr ""
+
+-#: main.cpp:46
++#: main.cpp:50
+ msgid "Select login mode to invisible."
+ msgstr ""
+
+-#: main.cpp:47
++#: main.cpp:51
+ msgid "Save password and proxy settings."
+ msgstr ""
+
+-#: main.cpp:53 ui/evamainuibase.cpp:90
++#: main.cpp:58 ui/evamainuibase.cpp:90
+ msgid "Eva"
+ msgstr ""
+
+-#: main.cpp:54
+-msgid "(c) 2004-2007, yunfan"
++#: main.cpp:62
++msgid "(c) 2004-2008, yunfan"
+ msgstr ""
+
+-#: main.cpp:55
++#: main.cpp:66
+ msgid "yunfan"
+ msgstr ""
+
+-#: main.cpp:55
++#: main.cpp:66
+ msgid "original developer, maintainer"
+ msgstr ""
+
+-#: main.cpp:57
++#: main.cpp:68
+ msgid "casper"
+ msgstr ""
+
+-#: main.cpp:57
++#: main.cpp:68
+ msgid "developer, memo, system setting ui and IP address converting"
+ msgstr ""
+
+-#: main.cpp:60
++#: main.cpp:71
+ msgid "byakko"
+ msgstr ""
+
+-#: main.cpp:60
++#: main.cpp:71
+ msgid "UI patch provider"
+ msgstr ""
+
+-#: main.cpp:61
++#: main.cpp:72
+ msgid "caihua"
+ msgstr ""
+
+-#: main.cpp:61
++#: main.cpp:72
+ msgid "icon designer"
+ msgstr ""
+
+-#: main.cpp:62
+-msgid "fundawang"
++#: main.cpp:73
++msgid "Funda Wang"
+ msgstr ""
+
+-#: main.cpp:62
++#: main.cpp:73
+ msgid "patch for xdg-user-dir supported"
+ msgstr ""
+
+-#: main.cpp:63
++#: main.cpp:74
+ msgid "Levin Du"
+ msgstr ""
+
+-#: main.cpp:64
++#: main.cpp:75
+ msgid ""
+ "patch for system setting \n"
+ "fixed combo box index massing up after \n"
+ "clicking \"Default\" several times."
+ msgstr ""
+
+-#: main.cpp:66
++#: main.cpp:77
+ msgid "Minmin"
+ msgstr ""
+
+-#: main.cpp:66
++#: main.cpp:77
+ msgid "encapsulating encryption class in C++"
+ msgstr ""
+
+-#: main.cpp:67
++#: main.cpp:78
+ msgid "nwillis"
+ msgstr ""
+
+-#: main.cpp:67
++#: main.cpp:78
+ msgid "idle detecting(auto-away) feature"
+ msgstr ""
+
+-#: main.cpp:68
++#: main.cpp:79
+ msgid "Phytonix"
+ msgstr ""
+
+-#: main.cpp:68
++#: main.cpp:79
+ msgid "some original faces & Eva Logo designer."
+ msgstr ""
+
+-#: main.cpp:69
++#: main.cpp:80
+ msgid "Shixin Zeng"
+ msgstr ""
+
+-#: main.cpp:69
+-msgid "libeva patch for Windows supporting."
++#: main.cpp:80
++msgid "libeva patch for Windows support."
+ msgstr ""
+
+-#: main.cpp:70
+-msgid "starkwong"
++#: main.cpp:81
++msgid "Stark Wong"
+ msgstr ""
+
+-#: main.cpp:70
++#: main.cpp:81
+ msgid ""
+-"libeva patch for Visual Studio .Net 2002/2003 compiling supporting. 2007II "
+-"new smiley code"
++"libeva patch for Visual Studio .NET 2002/2003 compiling support.\n"
++"2007II new smiley code"
+ msgstr ""
+
+-#: main.cpp:71
++#: main.cpp:82
+ msgid "zsyddl"
+ msgstr ""
+
+-#: main.cpp:71
++#: main.cpp:82
+ msgid "earlier user details window designer"
+ msgstr ""
+
+-#: main.cpp:72
++#: main.cpp:83
+ msgid "swear"
+ msgstr ""
+
+-#: main.cpp:72
++#: main.cpp:83
+ msgid "forum maintainer"
+ msgstr ""
+
+@@ -594,7 +594,7 @@
+ #: ui/createsmileyui.cpp:135
+ msgid ""
+ "1. Select files from your computer.<br>\n"
+-" <font color=\"#0066cc\">( 150 pixels x 150 pixels or "
++" <font color=\"#0066cc\">(150 pixels x 150 pixels or "
+ "smaller size for better quality. )</font>"
+ msgstr ""
+
+@@ -623,8 +623,8 @@
+ "names would be used as smiley names and shortcuts.</font>"
+ msgstr ""
+
+-#: ui/createsmileywindow.cpp:97 ui/evachatwindow.cpp:896
+-#: ui/evaqunchatwindow.cpp:661
++#: ui/createsmileywindow.cpp:97 ui/evachatwindow.cpp:910
++#: ui/evaqunchatwindow.cpp:672
+ msgid " all images (*.png *.bmp *.jpg *.jpeg *.gif)"
+ msgstr ""
+
+@@ -964,8 +964,8 @@
+ msgid "You have joined Qun %1(%2)"
+ msgstr ""
+
+-#: ui/evaadduibase.cpp:175
+-msgid "Verify Code:"
++#: ui/evaadduibase.cpp:175 ui/evaloginveriuibase.cpp:127
++msgid "Verification Code:"
+ msgstr ""
+
+ #: ui/evaadduibase.cpp:176
+@@ -980,9 +980,9 @@
+ msgid "allow reverse adding"
+ msgstr ""
+
+-#: ui/evachatuibase.cpp:303 ui/evacontactlistview.cpp:847
+-#: ui/evacontactlistview.cpp:1146 ui/evacontactlistview.cpp:1633
+-#: ui/evacontactlistview.cpp:1649
++#: ui/evachatuibase.cpp:303 ui/evacontactlistview.cpp:826
++#: ui/evacontactlistview.cpp:1134 ui/evacontactlistview.cpp:1621
++#: ui/evacontactlistview.cpp:1637
+ msgid "Chat"
+ msgstr ""
+
+@@ -994,11 +994,11 @@
+ msgid "IP:"
+ msgstr ""
+
+-#: ui/evachatuibase.cpp:309 ui/evaqunchatuibase.cpp:291
++#: ui/evachatuibase.cpp:309
+ msgid "add a smiley icon"
+ msgstr ""
+
+-#: ui/evachatuibase.cpp:312 ui/evaqunchatuibase.cpp:293
++#: ui/evachatuibase.cpp:312
+ msgid "choose font size and color"
+ msgstr ""
+
+@@ -1011,11 +1011,11 @@
+ msgid "B"
+ msgstr ""
+
+-#: ui/evachatuibase.cpp:319 ui/evaqunchatuibase.cpp:296
+-#: ui/mainlistfontsettinguibase.cpp:317 ui/mainlistfontsettinguibase.cpp:322
+-#: ui/mainlistfontsettinguibase.cpp:327 ui/mainlistfontsettinguibase.cpp:332
+-#: ui/mainlistfontsettinguibase.cpp:337 ui/mainlistfontsettinguibase.cpp:342
+-#: ui/mainlistfontsettinguibase.cpp:347 ui/mainlistfontsettinguibase.cpp:352
++#: ui/evachatuibase.cpp:319 ui/mainlistfontsettinguibase.cpp:317
++#: ui/mainlistfontsettinguibase.cpp:322 ui/mainlistfontsettinguibase.cpp:327
++#: ui/mainlistfontsettinguibase.cpp:332 ui/mainlistfontsettinguibase.cpp:337
++#: ui/mainlistfontsettinguibase.cpp:342 ui/mainlistfontsettinguibase.cpp:347
++#: ui/mainlistfontsettinguibase.cpp:352
+ msgid "bold"
+ msgstr ""
+
+@@ -1023,11 +1023,11 @@
+ msgid "U"
+ msgstr ""
+
+-#: ui/evachatuibase.cpp:323 ui/evaqunchatuibase.cpp:299
+-#: ui/mainlistfontsettinguibase.cpp:318 ui/mainlistfontsettinguibase.cpp:323
+-#: ui/mainlistfontsettinguibase.cpp:328 ui/mainlistfontsettinguibase.cpp:333
+-#: ui/mainlistfontsettinguibase.cpp:338 ui/mainlistfontsettinguibase.cpp:343
+-#: ui/mainlistfontsettinguibase.cpp:348 ui/mainlistfontsettinguibase.cpp:353
++#: ui/evachatuibase.cpp:323 ui/mainlistfontsettinguibase.cpp:318
++#: ui/mainlistfontsettinguibase.cpp:323 ui/mainlistfontsettinguibase.cpp:328
++#: ui/mainlistfontsettinguibase.cpp:333 ui/mainlistfontsettinguibase.cpp:338
++#: ui/mainlistfontsettinguibase.cpp:343 ui/mainlistfontsettinguibase.cpp:348
++#: ui/mainlistfontsettinguibase.cpp:353
+ msgid "underline"
+ msgstr ""
+
+@@ -1035,32 +1035,32 @@
+ msgid "I"
+ msgstr ""
+
+-#: ui/evachatuibase.cpp:326 ui/evaqunchatuibase.cpp:302
+-#: ui/mainlistfontsettinguibase.cpp:319 ui/mainlistfontsettinguibase.cpp:324
+-#: ui/mainlistfontsettinguibase.cpp:329 ui/mainlistfontsettinguibase.cpp:334
+-#: ui/mainlistfontsettinguibase.cpp:339 ui/mainlistfontsettinguibase.cpp:344
+-#: ui/mainlistfontsettinguibase.cpp:349 ui/mainlistfontsettinguibase.cpp:354
++#: ui/evachatuibase.cpp:326 ui/mainlistfontsettinguibase.cpp:319
++#: ui/mainlistfontsettinguibase.cpp:324 ui/mainlistfontsettinguibase.cpp:329
++#: ui/mainlistfontsettinguibase.cpp:334 ui/mainlistfontsettinguibase.cpp:339
++#: ui/mainlistfontsettinguibase.cpp:344 ui/mainlistfontsettinguibase.cpp:349
++#: ui/mainlistfontsettinguibase.cpp:354
+ msgid "italic"
+ msgstr ""
+
+ #: ui/evachatuibase.cpp:330
+-msgid "send image files"
++msgid "Send image files"
+ msgstr ""
+
+ #: ui/evachatuibase.cpp:333
+-msgid "add a screen shot"
++msgid "Add a screenshot"
+ msgstr ""
+
+-#: ui/evachatuibase.cpp:335 ui/evaqunchatuibase.cpp:311
+-msgid "select an quick-reply message"
++#: ui/evachatuibase.cpp:335
++msgid "Select an quick-reply message"
+ msgstr ""
+
+ #: ui/evachatuibase.cpp:337 ui/evaqunchatuibase.cpp:312
+-msgid "toggle sound notification"
++msgid "Toggle sound notification"
+ msgstr ""
+
+ #: ui/evachatuibase.cpp:342
+-msgid "hide/display QQ show panel"
++msgid "Hide/Display QQ Show panel"
+ msgstr ""
+
+ #: ui/evachatuibase.cpp:344
+@@ -1068,19 +1068,19 @@
+ msgstr ""
+
+ #: ui/evachatuibase.cpp:346
+-msgid "view/hide IM history(Alt+H)"
++msgid "View/Hide IM history (Alt+H)"
+ msgstr ""
+
+ #: ui/evachatuibase.cpp:349 ui/evaqunchatuibase.cpp:318
+-msgid "close this window(Alt+X)"
++msgid "Close this window (Alt+X)"
+ msgstr ""
+
+ #: ui/evachatuibase.cpp:352 ui/evaqunchatuibase.cpp:321
+-msgid "send message"
++msgid "Send message"
+ msgstr ""
+
+ #: ui/evachatuibase.cpp:355 ui/evaqunchatuibase.cpp:323
+-msgid "change send key"
++msgid "Change send key"
+ msgstr ""
+
+ #: ui/evachatuibase.cpp:356
+@@ -1099,7 +1099,7 @@
+ msgid "&Copy Text"
+ msgstr ""
+
+-#: ui/evachatview.cpp:140 ui/evachatwindow.cpp:317 ui/evaqunchatwindow.cpp:187
++#: ui/evachatview.cpp:140 ui/evachatwindow.cpp:318 ui/evaqunchatwindow.cpp:187
+ msgid "(Auto-Reply)"
+ msgstr ""
+
+@@ -1160,226 +1160,226 @@
+ msgid "%1 wants to send you a file \"%2\", you can %3, %4 or %5."
+ msgstr ""
+
+-#: ui/evachatview.cpp:545
++#: ui/evachatview.cpp:546
+ msgid "resume"
+ msgstr ""
+
+-#: ui/evachatview.cpp:547
++#: ui/evachatview.cpp:548
+ msgid "start"
+ msgstr ""
+
+-#: ui/evachatview.cpp:548
++#: ui/evachatview.cpp:549
+ msgid ""
+ "Cached information of \"%1\" has been found, you can %2 the last download or "
+ "ignore the last cached download information and %3 a new download."
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:155 ui/evaqunchatwindow.cpp:304
++#: ui/evachatwindow.cpp:156 ui/evaqunchatwindow.cpp:304
+ msgid "Press \"Enter\" to Send"
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:156 ui/evaqunchatwindow.cpp:305
++#: ui/evachatwindow.cpp:157 ui/evaqunchatwindow.cpp:305
+ msgid "Press \"Ctrl+Enter\" to Send"
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:169
++#: ui/evachatwindow.cpp:170
+ msgid "Chatting with %1"
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:171
++#: ui/evachatwindow.cpp:172
+ msgid "(offline)"
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:189
++#: ui/evachatwindow.cpp:190
+ msgid "(online)"
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:199
++#: ui/evachatwindow.cpp:200
+ msgid "(leave)"
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:209
++#: ui/evachatwindow.cpp:210
+ msgid "(invisible)"
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:324 ui/evaqunchatwindow.cpp:200
++#: ui/evachatwindow.cpp:325 ui/evaqunchatwindow.cpp:200
+ msgid "message sent failed"
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:324 ui/evachatwindow.cpp:509 ui/evachatwindow.cpp:513
+-#: ui/evaqunchatwindow.cpp:200 ui/evaqunchatwindow.cpp:528
+-#: ui/evaqunchatwindow.cpp:532 ui/evaqunchatwindow.cpp:709
+-#: ui/evaqunchatwindow.cpp:713
++#: ui/evachatwindow.cpp:325 ui/evachatwindow.cpp:520 ui/evachatwindow.cpp:524
++#: ui/evaqunchatwindow.cpp:200 ui/evaqunchatwindow.cpp:539
++#: ui/evaqunchatwindow.cpp:543 ui/evaqunchatwindow.cpp:720
++#: ui/evaqunchatwindow.cpp:724
+ msgid "Message"
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:509 ui/evaqunchatwindow.cpp:528
+-#: ui/evaqunchatwindow.cpp:709
++#: ui/evachatwindow.cpp:520 ui/evaqunchatwindow.cpp:539
++#: ui/evaqunchatwindow.cpp:720
+ msgid "Cannot send empty message."
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:513 ui/evaqunchatwindow.cpp:532
+-#: ui/evaqunchatwindow.cpp:713
++#: ui/evachatwindow.cpp:524 ui/evaqunchatwindow.cpp:543
++#: ui/evaqunchatwindow.cpp:724
+ msgid "Message is too long, cannot send."
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:622 ui/evachatwindow.cpp:693
++#: ui/evachatwindow.cpp:636 ui/evachatwindow.cpp:707
+ msgid " all files (*)"
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:623
++#: ui/evachatwindow.cpp:637
+ msgid "select a file"
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:682 ui/evachatwindow.cpp:698
++#: ui/evachatwindow.cpp:696 ui/evachatwindow.cpp:712
+ msgid ""
+-"You have accepted transfering \"%1\", network connecting start, please "
++"You have accepted transferring \"%1\", network connecting start, please "
+ "wait..."
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:707
+-msgid "You have cancelled transfering \"%1\"."
++#: ui/evachatwindow.cpp:721
++msgid "You have cancelled transferring \"%1\"."
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:726
++#: ui/evachatwindow.cpp:740
+ msgid "accepted"
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:726
+-msgid "stoped"
++#: ui/evachatwindow.cpp:740
++msgid "stopped"
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:727
+-msgid "%1 has %2 transfering \"%3\"."
++#: ui/evachatwindow.cpp:741
++msgid "%1 has %2 transferring \"%3\"."
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:778
+-msgid "network lost connection or your friend has stoped transfering \"%1\"."
++#: ui/evachatwindow.cpp:792
++msgid "network lost connection or your friend has stopped transferring \"%1\"."
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:809
++#: ui/evachatwindow.cpp:823
+ msgid "sending \"%1\" finished."
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:831
++#: ui/evachatwindow.cpp:845
+ msgid "receiving file \"%1\" has been finished and saved in %2"
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:875
++#: ui/evachatwindow.cpp:889
+ msgid ""
+-"File transfer is still in process( %1 file(s) left ). Closing this window "
+-"will also stop those transfer processes.Do you want to close this window?"
++"File transfer is still in process (%1 file(s) left). Closing this window "
++"will also stop those transfer processes. Do you want to close this window?"
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:878
++#: ui/evachatwindow.cpp:892
+ msgid "Close Window?"
+ msgstr ""
+
+-#: ui/evachatwindow.cpp:897 ui/evaqunchatwindow.cpp:662
++#: ui/evachatwindow.cpp:911 ui/evaqunchatwindow.cpp:673
+ msgid "select an image file"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:457 ui/evaqunchatuibase.cpp:327
++#: ui/evacontactlistview.cpp:424 ui/evaqunchatuibase.cpp:327
+ msgid "Members"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:836
++#: ui/evacontactlistview.cpp:815
+ msgid "Rename"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:837
++#: ui/evacontactlistview.cpp:816
+ msgid "New Group"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:838
++#: ui/evacontactlistview.cpp:817
+ msgid "Delele Group"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:842
++#: ui/evacontactlistview.cpp:821
+ msgid "Show Online"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:844
++#: ui/evacontactlistview.cpp:823
+ msgid "Show All"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:848 ui/evacontactlistview.cpp:1634
++#: ui/evacontactlistview.cpp:827 ui/evacontactlistview.cpp:1622
+ msgid "Send File"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:850 ui/evacontactlistview.cpp:1636
++#: ui/evacontactlistview.cpp:829 ui/evacontactlistview.cpp:1624
+ msgid "Update Level"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:851 ui/evacontactlistview.cpp:1148
+-#: ui/evacontactlistview.cpp:1637 ui/evacontactlistview.cpp:1651
++#: ui/evacontactlistview.cpp:830 ui/evacontactlistview.cpp:1136
++#: ui/evacontactlistview.cpp:1625 ui/evacontactlistview.cpp:1639
+ #: ui/evaqunlistview.cpp:40 ui/evasearchuibase.cpp:697
+ #: ui/evasearchuibase.cpp:730 ui/evasearchuibase.cpp:749
+ #: ui/qundetailsui.cpp:355
+ msgid "Details"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:852 ui/evacontactlistview.cpp:1638
++#: ui/evacontactlistview.cpp:831 ui/evacontactlistview.cpp:1626
+ msgid "Modify Memo"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:853 ui/evacontactlistview.cpp:1149
+-#: ui/evacontactlistview.cpp:1639 ui/evacontactlistview.cpp:1652
++#: ui/evacontactlistview.cpp:832 ui/evacontactlistview.cpp:1137
++#: ui/evacontactlistview.cpp:1627 ui/evacontactlistview.cpp:1640
+ #: ui/evaqunchatuibase.cpp:313
+ msgid "History"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:856 ui/evacontactlistview.cpp:1642
++#: ui/evacontactlistview.cpp:835 ui/evacontactlistview.cpp:1630
+ msgid "Delete Buddy"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:871
++#: ui/evacontactlistview.cpp:850
+ msgid "new group"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:893
++#: ui/evacontactlistview.cpp:872
+ msgid "Delete group"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:894
++#: ui/evacontactlistview.cpp:873
+ msgid ""
+ "Only empty group can be deleted.\n"
+ "\n"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:950 ui/evacontactlistview.cpp:1731
++#: ui/evacontactlistview.cpp:929 ui/evacontactlistview.cpp:1719
+ msgid ""
+ "Delete friend \"%1\" from your list, are you sure?\n"
+ "\n"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:953 ui/evacontactlistview.cpp:1734
++#: ui/evacontactlistview.cpp:932 ui/evacontactlistview.cpp:1722
+ msgid "Delete a friend"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:953 ui/evacontactlistview.cpp:1734
++#: ui/evacontactlistview.cpp:932 ui/evacontactlistview.cpp:1722
+ msgid "Deleting"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:1108 ui/evacontactlistview.cpp:1592
++#: ui/evacontactlistview.cpp:1096 ui/evacontactlistview.cpp:1580
+ msgid "Qun name"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:1109 ui/evacontactlistview.cpp:1593
++#: ui/evacontactlistview.cpp:1097 ui/evacontactlistview.cpp:1581
+ msgid "Qun Number"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:1110 ui/evacontactlistview.cpp:1594
++#: ui/evacontactlistview.cpp:1098 ui/evacontactlistview.cpp:1582
+ #: ui/quncreateui.cpp:222 ui/qundetailsui.cpp:350
+ msgid "Qun Description"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:1151 ui/evacontactlistview.cpp:1654
++#: ui/evacontactlistview.cpp:1139 ui/evacontactlistview.cpp:1642
+ #: ui/quncreateui.cpp:216
+ msgid "Create Qun"
+ msgstr ""
+
+-#: ui/evacontactlistview.cpp:1152 ui/evacontactlistview.cpp:1655
++#: ui/evacontactlistview.cpp:1140 ui/evacontactlistview.cpp:1643
+ msgid "Exit Qun"
+ msgstr ""
+
+@@ -1456,7 +1456,6 @@
+ msgstr ""
+
+ #: ui/evadetailswindow.cpp:262 ui/evasyssettinguibase.cpp:1079
+-#: ui/evasyssettinguibase.cpp:1177
+ msgid "Other"
+ msgstr ""
+
+@@ -1560,7 +1559,7 @@
+ msgid "x"
+ msgstr ""
+
+-#: ui/evafilestatusuibase.cpp:159 ui/evafontselecter.cpp:100
++#: ui/evafilestatusuibase.cpp:159 ui/evafontselecter.cpp:103
+ msgid "Size:"
+ msgstr ""
+
+@@ -1568,19 +1567,19 @@
+ msgid "Speed:"
+ msgstr ""
+
+-#: ui/evafontselecter.cpp:97
++#: ui/evafontselecter.cpp:100
+ msgid "Font Selecter"
+ msgstr ""
+
+-#: ui/evafontselecter.cpp:98
++#: ui/evafontselecter.cpp:101
+ msgid "Color:"
+ msgstr ""
+
+-#: ui/evafontselecter.cpp:99
++#: ui/evafontselecter.cpp:102
+ msgid "select font color"
+ msgstr ""
+
+-#: ui/evafontselecter.cpp:101
++#: ui/evafontselecter.cpp:104
+ msgid "select font size"
+ msgstr ""
+
+@@ -1637,19 +1636,15 @@
+ msgid "Verification Graphic:"
+ msgstr ""
+
+-#: ui/evaloginveriuibase.cpp:127
+-msgid "Verification Code:"
+-msgstr ""
+-
+ #: ui/evaloginveriuibase.cpp:129
+ msgid "Change image"
+ msgstr ""
+
+-#: ui/evaloginwindow.cpp:141
++#: ui/evaloginwindow.cpp:142
+ msgid "Sorry, account is not an integer number."
+ msgstr ""
+
+-#: ui/evaloginwindow.cpp:149
++#: ui/evaloginwindow.cpp:150
+ msgid "Sorry, proxy server port is not an integer number."
+ msgstr ""
+
+@@ -1659,27 +1654,35 @@
+ msgid "Nick"
+ msgstr ""
+
+-#: ui/evamainuibase.cpp:93 ui/evamainwindow.cpp:406
++#: ui/evamainuibase.cpp:93 ui/evamainwindow.cpp:407
+ #: ui/evaquncreatewindow.cpp:112 ui/evaqunlistview.cpp:218
+ #: ui/quncreateui.cpp:147 ui/quncreateui.cpp:227 ui/qundetailsui.cpp:175
+ #: ui/qundetailsui.cpp:356 ui/qundetailswindow.cpp:432
+ msgid "QQ"
+ msgstr ""
+
+-#: ui/evamainwindow.cpp:407 ui/evaqunlistview.cpp:217
++#: ui/evamainwindow.cpp:408 ui/evaqunlistview.cpp:217
+ #: ui/mainlistfontsettinguibase.cpp:315
+ msgid "Nickname:"
+ msgstr ""
+
+-#: ui/evamainwindow.cpp:408
++#: ui/evamainwindow.cpp:409
+ msgid "Level"
+ msgstr ""
+
+-#: ui/evamainwindow.cpp:409
++#: ui/evamainwindow.cpp:410
+ msgid "Online Time"
+ msgstr ""
+
+-#: ui/evamainwindow.cpp:517
++#: ui/evamainwindow.cpp:411
++msgid " Hours "
++msgstr ""
++
++#: ui/evamainwindow.cpp:411
++msgid " min "
++msgstr ""
++
++#: ui/evamainwindow.cpp:518
+ msgid "Recent Contacts List"
+ msgstr ""
+
+@@ -1874,16 +1877,36 @@
+ msgid "Your Request has been rejected by \"%1\" of Qun \"%2\"."
+ msgstr ""
+
++#: ui/evaqunchatuibase.cpp:291
++msgid "Add a smiley icon"
++msgstr ""
++
++#: ui/evaqunchatuibase.cpp:293
++msgid "Choose font size and color"
++msgstr ""
++
++#: ui/evaqunchatuibase.cpp:296
++msgid "Bold"
++msgstr ""
++
++#: ui/evaqunchatuibase.cpp:299
++msgid "Underline"
++msgstr ""
++
+ #: ui/evaqunchatuibase.cpp:305
+-msgid "add a custom smiley (file size less than 50K)"
++msgid "Add a custom smiley (file size less than 50KB)"
+ msgstr ""
+
+ #: ui/evaqunchatuibase.cpp:308
+-msgid "add a screen shot ( less than 700 X 600 )"
++msgid "Add a screenshot (smaller than 700 x 600)"
++msgstr ""
++
++#: ui/evaqunchatuibase.cpp:311
++msgid "Select a quick-reply message"
+ msgstr ""
+
+ #: ui/evaqunchatuibase.cpp:315
+-msgid "view IM history(Alt+H)"
++msgid "View/Hide Qun history (Alt+H)"
+ msgstr ""
+
+ #: ui/evaqunchatuibase.cpp:320 ui/qundetailsui.cpp:366
+@@ -1895,14 +1918,14 @@
+ msgstr ""
+
+ #: ui/evaqunchatuibase.cpp:325
+-msgid "Click to open/close qun notice"
++msgid "Click to open/close Qun notice"
+ msgstr ""
+
+ #: ui/evaqunchatuibase.cpp:332
+ msgid "New Item"
+ msgstr ""
+
+-#: ui/evaqunchatwindow.cpp:693
++#: ui/evaqunchatwindow.cpp:704
+ msgid "Send Image Error"
+ msgstr ""
+
+@@ -2258,131 +2281,131 @@
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:215
+-msgid "oversea"
++msgid "Abroad"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:216 ui/evasyssettinguibase.cpp:1112
+-msgid "BeiJing"
++msgid "Beijing"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:217 ui/evasyssettinguibase.cpp:1113
+-msgid "ShangHai"
++msgid "Shanghai"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:218 ui/evasyssettinguibase.cpp:1114
+-msgid "TianJing"
++msgid "Tianjin"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:219 ui/evasyssettinguibase.cpp:1115
+-msgid "ChongQing"
++msgid "Chongqing"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:220 ui/evasyssettinguibase.cpp:1116
+-msgid "HeBei"
++msgid "Hebei"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:221 ui/evasyssettinguibase.cpp:1117
+-msgid "ShanXi"
++msgid "Shanxi"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:222 ui/evasyssettinguibase.cpp:1118
+-msgid "NeiMengGu"
++msgid "Neimenggu"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:223 ui/evasyssettinguibase.cpp:1119
+-msgid "LiaoNing"
++msgid "Liaoning"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:224 ui/evasyssettinguibase.cpp:1120
+-msgid "JiLin"
++msgid "Jilin"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:225 ui/evasyssettinguibase.cpp:1121
+-msgid "HeiLongJiang"
++msgid "Heilongjiang"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:226 ui/evasyssettinguibase.cpp:1122
+-msgid "JiangSu"
++msgid "Jiangsu"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:227 ui/evasyssettinguibase.cpp:1123
+-msgid "ZheJiang"
++msgid "Zhejiang"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:228 ui/evasyssettinguibase.cpp:1124
+-msgid "AnHui"
++msgid "Anhui"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:229 ui/evasyssettinguibase.cpp:1125
+-msgid "FuJian"
++msgid "Fujian"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:230 ui/evasyssettinguibase.cpp:1126
+-msgid "JiangXi"
++msgid "Jiangxi"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:231 ui/evasyssettinguibase.cpp:1127
+-msgid "ShanDong"
++msgid "Shandong"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:232 ui/evasyssettinguibase.cpp:1128
+-msgid "HeNan"
++msgid "Henan"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:233 ui/evasyssettinguibase.cpp:1129
+-msgid "HuBei"
++msgid "Hubei"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:234 ui/evasyssettinguibase.cpp:1130
+-msgid "HuNan"
++msgid "Hunan"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:235 ui/evasyssettinguibase.cpp:1131
+-msgid "GuangDong"
++msgid "Guangdong"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:236 ui/evasyssettinguibase.cpp:1132
+-msgid "GuangXi"
++msgid "Guangxi"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:237 ui/evasyssettinguibase.cpp:1133
+-msgid "HaiNan"
++msgid "Hainan"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:238 ui/evasyssettinguibase.cpp:1134
+-msgid "SiChuan"
++msgid "Sichuan"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:239 ui/evasyssettinguibase.cpp:1135
+-msgid "GuiZhou"
++msgid "Guizhou"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:240 ui/evasyssettinguibase.cpp:1136
+-msgid "YunNan"
++msgid "Yunnan"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:241 ui/evasyssettinguibase.cpp:1137
+-msgid "XiZang"
++msgid "Xizang"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:242 ui/evasyssettinguibase.cpp:1138
+-msgid "ShaanXi"
++msgid "Shaanxi"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:243 ui/evasyssettinguibase.cpp:1139
+-msgid "GanSu"
++msgid "Gansu"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:244 ui/evasyssettinguibase.cpp:1140
+-msgid "NingXia"
++msgid "Ningxia"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:245 ui/evasyssettinguibase.cpp:1141
+-msgid "QingHai"
++msgid "Qinghai"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:246 ui/evasyssettinguibase.cpp:1142
+-msgid "XinJiang"
++msgid "Xinjiang"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:247 ui/evasyssettinguibase.cpp:1143
+@@ -2394,7 +2417,7 @@
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:249 ui/evasyssettinguibase.cpp:1145
+-msgid "TaiWan"
++msgid "Taiwan"
+ msgstr ""
+
+ #: ui/evasearchwindow.cpp:375 ui/evasearchwindow.cpp:400
+@@ -2621,15 +2644,15 @@
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1041
+-msgid "Zodiac:"
++msgid "Chinese Zodiac:"
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1042
+-msgid "Horoscape:"
++msgid "Horoscope:"
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1043
+-msgid "Blood:"
++msgid "Blood Type:"
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1087 ui/evauseruibase.cpp:282
+@@ -2657,7 +2680,7 @@
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1094
+-msgid "following availible to"
++msgid "Following available to"
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1095
+@@ -2705,11 +2728,11 @@
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1146 ui/evauseruibase.cpp:296
+-msgid "Zip Code:"
++msgid "Postal Code:"
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1147
+-msgid "Area:"
++msgid "Region:"
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1148
+@@ -2781,51 +2804,51 @@
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1168
+-msgid "display buddy online tip"
++msgid "Display buddy online tip"
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1169
+-msgid "display online users only"
++msgid "Display online users only"
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1170
+-msgid "sound enabled"
++msgid "Sound enabled"
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1171
+-msgid "show smiley icon in buddy list"
++msgid "Show smiley icon in buddy list"
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1172
+-msgid "show QQ News"
++msgid "Show QQ News"
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1173
+-msgid "display message tip"
++msgid "Display message tip"
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1174
+-msgid "display system ad. tip"
++msgid "Display system ad. tip"
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1175
+-msgid "change send key to \"Enter\""
++msgid "Change send key to \"Enter\""
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1176
+-msgid "display buddy signature in seperate line"
++msgid "Display buddy signature in separate line"
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1178
+-msgid "message page size:"
++msgid "Message page size:"
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1179
+-msgid "pieces"
++msgid "entries"
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1180
+-msgid "change status to away after:"
++msgid "Change status to away after:"
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1181
+@@ -2833,7 +2856,7 @@
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1182
+-msgid "face size:"
++msgid "Face size:"
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1183
+@@ -2853,7 +2876,7 @@
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1188
+-msgid "theme path:"
++msgid "Theme path:"
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1189 ui/evasyssettinguibase.cpp:1191
+@@ -2861,7 +2884,7 @@
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1190
+-msgid "sound path:"
++msgid "Sound path:"
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1192
+@@ -2877,7 +2900,7 @@
+ msgstr ""
+
+ #: ui/evasyssettinguibase.cpp:1196
+-msgid "reply automatically when leave"
++msgid "Reply automatically when away"
+ msgstr ""
+
+ #: ui/evasyssettingwindow.cpp:407
+@@ -2934,7 +2957,8 @@
+ msgid "Enjoy Eva, Enjoy Open Source!"
+ msgstr ""
+
+-#: ui/evauseruibase.cpp:291
++#: ui/evauseruibase.cpp:291 ui/mainlistfontsettinguibase.cpp:330
++#: ui/mainlistfontsettinguibase.cpp:340
+ msgid "Name:"
+ msgstr ""
+
+@@ -3040,16 +3064,12 @@
+ msgid "signature color:"
+ msgstr ""
+
+-#: ui/mainlistfontsettinguibase.cpp:330 ui/mainlistfontsettinguibase.cpp:340
+-msgid "name:"
+-msgstr ""
+-
+ #: ui/mainlistfontsettinguibase.cpp:331 ui/mainlistfontsettinguibase.cpp:341
+ msgid "name color:"
+ msgstr ""
+
+ #: ui/mainlistfontsettinguibase.cpp:350
+-msgid "online counting:"
++msgid "Online statistics:"
+ msgstr ""
+
+ #: ui/quncategoryui.cpp:94
+@@ -3073,11 +3093,11 @@
+ msgstr ""
+
+ #: ui/quncreateui.cpp:220
+-msgid "select a category"
++msgid "Select a category"
+ msgstr ""
+
+ #: ui/quncreateui.cpp:221 ui/qundetailsui.cpp:349
+-msgid "Qun Notice ( member only)"
++msgid "Qun Notice (member only)"
+ msgstr ""
+
+ #: ui/quncreateui.cpp:224 ui/qundetailsui.cpp:352
+@@ -3253,27 +3273,27 @@
+ msgstr ""
+
+ #: api/evausersetting.cpp:871 api/evausersetting.cpp:1115
+-msgid "sorry, I am working."
++msgid "Sorry, I am working."
+ msgstr ""
+
+ #: api/evausersetting.cpp:872 api/evausersetting.cpp:1116
+-msgid "having dinner now./fa"
++msgid "Having dinner now./fa"
+ msgstr ""
+
+ #: api/evausersetting.cpp:873 api/evausersetting.cpp:1117
+-msgid "I am not available now, sorry"
++msgid "I am not available now, sorry."
+ msgstr ""
+
+ #: api/evausersetting.cpp:882 api/evausersetting.cpp:1121
+-msgid "oh."
++msgid "Oh."
+ msgstr ""
+
+ #: api/evausersetting.cpp:883 api/evausersetting.cpp:1122
+-msgid "ok, ok, I got u."
++msgid "OK, OK, I got you."
+ msgstr ""
+
+ #: api/evausersetting.cpp:884 api/evausersetting.cpp:1123
+-msgid "/jy ,really?"
++msgid "/jy , really?"
+ msgstr ""
+
+ #: api/regiongrabber.cpp:47
+@@ -3281,5 +3301,5 @@
+ msgstr ""
+
+ #: api/regiongrabber.cpp:47
+-msgid "Size(W x H):"
++msgid "Size (W x H):"
+ msgstr ""
+diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/po/zh_CN/eva.po eva-0.4.921+svn42.new/po/zh_CN/eva.po
+--- eva-0.4.921+svn42/po/zh_CN/eva.po 2008-05-05 23:26:08.000000000 +0800
++++ eva-0.4.921+svn42.new/po/zh_CN/eva.po 2008-05-06 03:13:08.000000000 +0800
+@@ -1,18 +1,21 @@
+-# translation of new.po to
+-# translation of eva.po to
+-# This file is distributed under the same license as the PACKAGE package.
+-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
++# Translation of eva.po to Chinese (simplified)
+ #
+-# 云帆 <yunfan_zg at 163.com>, 2006.
+-# bamfox <bamfox at 126.com>, 2006.
++# This file is distributed under the same license as the eva package.
++# Copyright (C) 2004-2008 yunfan
++#
++# Translators:
++# 云帆 <yunfan_zg at 163.com>, 2006.
++# bamfox <bamfox at 126.com>, 2006.
++# Liu Sizhuang(刘思壮) <chinatslsz at hotmail.com>, 2008.
++# Anthony Fok 霍东灵 <anthony.fok at thizgroup.com> <foka at debian.org>, 2008.
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: new\n"
++"Project-Id-Version: eva-0.4.921+svn42\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2008-02-18 20:02+0800\n"
+-"PO-Revision-Date: 2008-02-26 19:07+0800\n"
+-"Last-Translator: Liu Sizhuang(刘思壮) <chinatslsz at hotmail.com>\n"
+-"Language-Team: <zh at li.org>\n"
++"POT-Creation-Date: 2008-05-06 03:12+0800\n"
++"PO-Revision-Date: 2008-05-06 02:30+0800\n"
++"Last-Translator: Anthony Fok <anthony.fok at thizgroup.com>\n"
++"Language-Team: Chinese (simplified) <i18n-translation at lists.linux.net.cn>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+@@ -22,13 +25,15 @@
+ msgid ""
+ "_: NAME OF TRANSLATORS\n"
+ "Your names"
+-msgstr "云帆"
++msgstr "云帆,bamfox,Liu Sizhuang(刘思壮),Anthony Fok 霍东灵"
+
+ #: _translatorinfo.cpp:3
+ msgid ""
+ "_: EMAIL OF TRANSLATORS\n"
+ "Your emails"
+-msgstr "yunfan_zg at 163.com"
++msgstr ""
++"yunfan_zg at 163.com,bamfox at 126.com,chinatslsz at hotmail.com,anthony."
++"fok at thizgroup.com"
+
+ #: evaaddingmanager.cpp:141 evaaddingmanager.cpp:602
+ msgid ""
+@@ -49,17 +54,16 @@
+ msgstr "Eva 查找/添加好友"
+
+ #: evaaddingmanager.cpp:186
+-msgid "You are adding %1, cannot processing %2 request."
+-msgstr "你正在添加%1,不能处理%2的请求。"
++msgid "You are adding %1, cannot process %2 request."
++msgstr "您正在添加 %1,不能处理 %2 的请求。"
+
+ #: evaaddingmanager.cpp:251
+-msgid "Incorrect verify code, try again please!"
++msgid "Incorrect verification code, try again please!"
+ msgstr "验证码错误,再试一次!"
+
+ #: evaaddingmanager.cpp:284
+-#, fuzzy
+-msgid "Unkown auth reply type(%1), adding failed."
+-msgstr "未知auth回复类型(%1),添加失败。"
++msgid "Unknown auth reply type (%1), adding failed."
++msgstr "未知 auth 回复类型 (%1),添加失败。"
+
+ #: evaaddingmanager.cpp:318
+ msgid "Incorrect answer, try again please!"
+@@ -79,7 +83,7 @@
+
+ #: evachatwindowmanager.cpp:198
+ msgid "Send message to \"%1\" failed."
+-msgstr "发送消息给“%1” 失败。"
++msgstr "发送消息给 “%1” 失败。"
+
+ #: evachatwindowmanager.cpp:312
+ msgid "Send Message Failed"
+@@ -111,15 +115,15 @@
+
+ #: evamain.cpp:192
+ msgid "password missing, type \"eva --help\" to see details.\n"
+-msgstr "缺少密码, 输入 “eva --help” 来查看详情。\n"
++msgstr "缺少密码,输入 “eva --help” 来查看详情。\n"
+
+ #: evamain.cpp:220
+ msgid "mode can only be one of UDP, TCP or HTTP_PROXY.\n"
+-msgstr "模式只能为 UDP, TCP 或者 HTTP_PROXY 之一。\n"
++msgstr "模式只能为 UDP,TCP 或者 HTTP_PROXY 之一。\n"
+
+ #: evamain.cpp:229
+ msgid "http proxy server IP address missing.\n"
+-msgstr "缺少 http 代理服务器IP地址。\n"
++msgstr "缺少 http 代理服务器 IP 地址。\n"
+
+ #: evamain.cpp:235
+ msgid "http proxy server port number missing.\n"
+@@ -167,7 +171,7 @@
+ msgid "Download Group"
+ msgstr "下载好友分组"
+
+-#: evamain.cpp:393 ui/evacontactlistview.cpp:456
++#: evamain.cpp:393 ui/evacontactlistview.cpp:423
+ msgid "Group"
+ msgstr "好友分组"
+
+@@ -191,110 +195,110 @@
+ msgid "No Auto-Reply"
+ msgstr "无自动回复"
+
+-#: evamain.cpp:570 ui/evamainwindow.cpp:492
++#: evamain.cpp:569 ui/evamainwindow.cpp:493
+ msgid "Qun List"
+ msgstr "群列表"
+
+-#: evamain.cpp:571
++#: evamain.cpp:570
+ msgid "Anonymous"
+ msgstr "陌生人"
+
+-#: evamain.cpp:572
++#: evamain.cpp:571
+ msgid "Black List"
+ msgstr "黑名单"
+
+-#: evamain.cpp:590 ui/evamainwindow.cpp:451
++#: evamain.cpp:589 ui/evamainwindow.cpp:452
+ msgid "Buddy List"
+ msgstr "好友列表"
+
+-#: evamain.cpp:1012
++#: evamain.cpp:1015
+ msgid "Network error occurred, check your network then try Eva later please."
+-msgstr "网络连接发生错误, 请检查你的网络连接或者稍后尝试重新登录Eva。"
++msgstr "网络连接发生错误,请检查您的网络连接或者稍后尝试重新登录 Eva。"
+
+-#: evamain.cpp:1013 ui/loginuibase.cpp:196
++#: evamain.cpp:1016 ui/loginuibase.cpp:196
+ msgid "Network"
+ msgstr "网络设置"
+
+-#: evamain.cpp:1038
++#: evamain.cpp:1041
+ msgid "Cannot login, try later please."
+-msgstr "无法登录, 请稍后再试。"
++msgstr "无法登录,请稍后再试。"
+
+-#: evamain.cpp:1038 evamain.cpp:1075 evamain.cpp:2536
+-#: ui/evaloginwindow.cpp:140 ui/evaloginwindow.cpp:148
++#: evamain.cpp:1041 evamain.cpp:1078 evamain.cpp:2537
++#: ui/evaloginwindow.cpp:141 ui/evaloginwindow.cpp:149
+ msgid "Eva Login"
+ msgstr "登录"
+
+-#: evamain.cpp:1052
++#: evamain.cpp:1055
+ msgid "Lost connection with server, try later please."
+ msgstr "已经与服务器失去连接,请稍后再试。"
+
+-#: evamain.cpp:1052
++#: evamain.cpp:1055
+ msgid "Eva Connection"
+ msgstr "Eva 网络连接"
+
+-#: evamain.cpp:1101
++#: evamain.cpp:1104
+ msgid "I am online."
+ msgstr "上线了。"
+
+-#: evamain.cpp:1115
++#: evamain.cpp:1118
+ msgid "I am busy ..."
+ msgstr "忙碌中……"
+
+-#: evamain.cpp:1244
++#: evamain.cpp:1247
+ msgid "Uploading grouped friends successfully."
+ msgstr "上传好友分组成功。"
+
+-#: evamain.cpp:1244 evamain.cpp:1246
++#: evamain.cpp:1247 evamain.cpp:1249
+ msgid "Eva Upload Groups"
+ msgstr "Eva 上传分组"
+
+-#: evamain.cpp:1246
++#: evamain.cpp:1249
+ msgid "Uploading grouped friends failed."
+ msgstr "上传好友分组失败。"
+
+-#: evamain.cpp:1605
++#: evamain.cpp:1608
+ msgid "Delete buddy \"%1\" failed."
+ msgstr "删除好友“%1”失败。"
+
+-#: evamain.cpp:1605
++#: evamain.cpp:1608
+ msgid "Eva Delete Buddy"
+ msgstr "Eva 删除好友"
+
+-#: evamain.cpp:1668
++#: evamain.cpp:1671
+ msgid "put \"%1\" into Blacklist, are you sure?"
+ msgstr "将“%1”放入黑名单吗?"
+
+-#: evamain.cpp:1669 evamain.cpp:1684
++#: evamain.cpp:1672 evamain.cpp:1687
+ msgid "Eva Blacklist"
+ msgstr "Eva 黑名单"
+
+-#: evamain.cpp:1683
++#: evamain.cpp:1686
+ msgid "Blacklist operation on \"%1\" failed."
+-msgstr "无法将“%1”放入黑名单, 请稍后再试。"
++msgstr "无法将“%1”放入黑名单,请稍后再试。"
+
+-#: evamain.cpp:1691
++#: evamain.cpp:1694
+ msgid "add \"%1\" into your Buddy list?"
+ msgstr "将“%1”加入好友列表吗?"
+
+-#: evamain.cpp:1691
++#: evamain.cpp:1694
+ msgid "Eva Add Buddy"
+ msgstr "Eva 添加好友"
+
+-#: evamain.cpp:1839 ui/evanotifywindow.cpp:272 ui/evanotifywindow.cpp:290
++#: evamain.cpp:1842 ui/evanotifywindow.cpp:272 ui/evanotifywindow.cpp:290
+ #: ui/evanotifywindow.cpp:308 ui/evanotifywindow.cpp:325
+ #: ui/evanotifywindow.cpp:346 ui/evanotifywindow.cpp:364
+ #: ui/evaqunchatuibase.cpp:288 ui/evaqunchatwindow.cpp:322
+-#: ui/evaqunchatwindow.cpp:466 ui/evasyshistoryviewer.cpp:96
++#: ui/evaqunchatwindow.cpp:461 ui/evasyshistoryviewer.cpp:96
+ #: ui/qundetailsui.cpp:341 ui/qundetailswindow.cpp:106
+ #: ui/qundetailswindow.cpp:282
+ msgid "Qun"
+ msgstr "群"
+
+-#: evamain.cpp:1960
++#: evamain.cpp:1963
+ msgid "You have exited the Qun \"%1\" successfully."
+-msgstr "你已成功退出群“%1”。"
++msgstr "您已成功退出群“%1”。"
+
+-#: evamain.cpp:1962
++#: evamain.cpp:1965
+ msgid ""
+ "Exit Qun \"%1\" failed\n"
+ "%2"
+@@ -302,33 +306,33 @@
+ "退出群“%1”失败\n"
+ "%2"
+
+-#: evamain.cpp:1964 evamain.cpp:1982 evamain.cpp:1988
++#: evamain.cpp:1967 evamain.cpp:1985 evamain.cpp:1991
+ #: ui/evaquncreatewindow.cpp:74 ui/evaquncreatewindow.cpp:81
+ #: ui/evaquncreatewindow.cpp:296 ui/evaquncreatewindow.cpp:302
+ msgid "Qun Operation"
+ msgstr "群操作"
+
+-#: evamain.cpp:1978
++#: evamain.cpp:1981
+ msgid ""
+ "You are the creator of Qun \"%1\", if you exit this Qun this Qun will be "
+ "deleted, are you sure?"
+-msgstr "你是群“%1”的创建者, 如果你退出,这个群将会被删除,你确定吗?"
++msgstr "您是群“%1”的创建者,如果您退出,这个群将会被删除,您确定吗?"
+
+-#: evamain.cpp:1980
++#: evamain.cpp:1983
+ msgid "Are you sure you want to exit Qun \"%1\"?"
+ msgstr "确定要退出群“%1”吗?"
+
+-#: evamain.cpp:2010
++#: evamain.cpp:2013
+ msgid "signature"
+ msgstr "个性签名"
+
+-#: evamain.cpp:2038
++#: evamain.cpp:2041
+ msgid "Eva Global Key"
+ msgstr "Eva 全局热键"
+
+-#: evamain.cpp:2039
++#: evamain.cpp:2042
+ msgid "This action allows you to read your new Eva message globally."
+-msgstr "这个动作允许你全局读取Eva消息。"
++msgstr "这个动作允许您全局读取Eva消息。"
+
+ #: evascriptmanager.cpp:336
+ msgid ""
+@@ -361,7 +365,7 @@
+
+ #: evascriptmanager.cpp:409
+ msgid "Are you sure you want to uninstall the script '%1'?"
+-msgstr "你确定要卸载脚本 “%1” 吗?"
++msgstr "您确定要卸载脚本 “%1” 吗?"
+
+ #: evascriptmanager.cpp:409
+ msgid "Uninstall Script"
+@@ -394,14 +398,13 @@
+
+ #: evascriptmanager.cpp:566
+ msgid "%1 Eva Script"
+-msgstr "%1 Eva脚本"
++msgstr "%1 Eva 脚本"
+
+ #: evascriptmanager.cpp:570
+ msgid "License"
+ msgstr "协议"
+
+ #: evascriptmanager.cpp:598
+-#, fuzzy
+ msgid "Debugging"
+ msgstr "调试"
+
+@@ -418,7 +421,6 @@
+ msgstr "脚本 “%1” 以错误代码 %2 退出"
+
+ #: evasysmsgmanager.cpp:145
+-#, fuzzy
+ msgid "Verifying system message for buddy %1 failed."
+ msgstr "好友 %1 的验证消息失败。"
+
+@@ -426,164 +428,166 @@
+ msgid "IM Client"
+ msgstr "聊天客户端"
+
+-#: main.cpp:29
++#: main.cpp:33
+ msgid "An IM Client Under KDE Using QQ IM Protocol."
+ msgstr "KDE 下兼容 QQ 即时通讯协议的客户端。"
+
+-#: main.cpp:35
++#: main.cpp:39
+ msgid "Using the last saved settings to login."
+ msgstr "使用上次保存的设置登录。"
+
+-#: main.cpp:37
++#: main.cpp:41
+ msgid "QQ number to login."
+ msgstr "登录的 QQ 号码。"
+
+-#: main.cpp:39
++#: main.cpp:43
+ msgid "Password for your QQ number."
+ msgstr "您 QQ 号的密码。"
+
+-#: main.cpp:41
+-msgid "Connection mode ( one of UDP, TCP or HTTP_PROXY), defaulting to UDP"
+-msgstr "连接模式 (UDP, TCP 或者 HTTP_PROXY 之一),默认为 UDP"
++#: main.cpp:45
++msgid "Connection mode (one of UDP, TCP or HTTP_PROXY), defaulting to UDP"
++msgstr "连接模式 (UDP、TCP 或者 HTTP_PROXY 之一),默认为 UDP"
+
+-#: main.cpp:42
++#: main.cpp:46
+ msgid "Proxy server IP address."
+-msgstr "代理服务器IP地址。"
++msgstr "代理服务器 IP 地址。"
+
+-#: main.cpp:43
++#: main.cpp:47
+ msgid "Proxy server port number"
+ msgstr "代理服务器端口号"
+
+-#: main.cpp:44
++#: main.cpp:48
+ msgid "Proxy user name if required."
+ msgstr "代理器上的用户名(如果需要的话)。"
+
+-#: main.cpp:45
++#: main.cpp:49
+ msgid "Proxy password if required."
+ msgstr "代理器上的密码(如果需要的话)。"
+
+-#: main.cpp:46
++#: main.cpp:50
+ msgid "Select login mode to invisible."
+ msgstr "选择登录模式为隐身。"
+
+-#: main.cpp:47
++#: main.cpp:51
+ msgid "Save password and proxy settings."
+ msgstr "保存密码和代理设置。"
+
+-#: main.cpp:53 ui/evamainuibase.cpp:90
++#: main.cpp:58 ui/evamainuibase.cpp:90
+ msgid "Eva"
+ msgstr "Eva"
+
+-#: main.cpp:54
+-msgid "(c) 2004-2007, yunfan"
+-msgstr "(c) 2004-2007, 云帆"
++#: main.cpp:62
++msgid "(c) 2004-2008, yunfan"
++msgstr "(c) 2004-2008,云帆"
+
+-#: main.cpp:55
++#: main.cpp:66
+ msgid "yunfan"
+ msgstr "云帆"
+
+-#: main.cpp:55
++#: main.cpp:66
+ msgid "original developer, maintainer"
+ msgstr "最初作者,维护者"
+
+-#: main.cpp:57
++#: main.cpp:68
+ msgid "casper"
+ msgstr "casper"
+
+-#: main.cpp:57
++#: main.cpp:68
+ msgid "developer, memo, system setting ui and IP address converting"
+-msgstr "作者, 备注、系统设置以及IP地址转换"
++msgstr "作者,备注、系统设置以及 IP 地址转换"
+
+-#: main.cpp:60
++#: main.cpp:71
+ msgid "byakko"
+-msgstr ""
++msgstr "byakko"
+
+-#: main.cpp:60
++#: main.cpp:71
+ msgid "UI patch provider"
+ msgstr "提供 UI 补丁"
+
+-#: main.cpp:61
++#: main.cpp:72
+ msgid "caihua"
+ msgstr "caihua"
+
+-#: main.cpp:61
++#: main.cpp:72
+ msgid "icon designer"
+ msgstr "图标设计"
+
+-#: main.cpp:62
+-msgid "fundawang"
+-msgstr ""
++#: main.cpp:73
++msgid "Funda Wang"
++msgstr "Funda Wang"
+
+-#: main.cpp:62
++#: main.cpp:73
+ msgid "patch for xdg-user-dir supported"
+ msgstr "xdg-user-dir 支持的补丁"
+
+-#: main.cpp:63
++#: main.cpp:74
+ msgid "Levin Du"
+ msgstr "Levin Du"
+
+-#: main.cpp:64
++#: main.cpp:75
+ msgid ""
+ "patch for system setting \n"
+ "fixed combo box index massing up after \n"
+ "clicking \"Default\" several times."
+-msgstr "系统选项补丁-解决多次点击“默认”按钮导致combo box索引混乱问题。"
++msgstr "系统选项补丁-解决多次点击“默认”按钮导致 combo box 索引混乱问题。"
+
+-#: main.cpp:66
++#: main.cpp:77
+ msgid "Minmin"
+ msgstr "民民"
+
+-#: main.cpp:66
++#: main.cpp:77
+ msgid "encapsulating encryption class in C++"
+-msgstr "加密的C++类封装。"
++msgstr "加密的 C++ 类封装。"
+
+-#: main.cpp:67
++#: main.cpp:78
+ msgid "nwillis"
+ msgstr "nwillis"
+
+-#: main.cpp:67
++#: main.cpp:78
+ msgid "idle detecting(auto-away) feature"
+ msgstr "空闲检测(自动离开)功能"
+
+-#: main.cpp:68
++#: main.cpp:79
+ msgid "Phytonix"
+ msgstr "Phytonix"
+
+-#: main.cpp:68
++#: main.cpp:79
+ msgid "some original faces & Eva Logo designer."
+ msgstr "部分头像和 Eva Logo 设计者。"
+
+-#: main.cpp:69
++#: main.cpp:80
+ msgid "Shixin Zeng"
+ msgstr "Shixin Zeng"
+
+-#: main.cpp:69
+-msgid "libeva patch for Windows supporting."
++#: main.cpp:80
++msgid "libeva patch for Windows support."
+ msgstr "libeva 的 Windows 支持补丁。"
+
+-#: main.cpp:70
+-msgid "starkwong"
+-msgstr "starkwong"
+-
+-#: main.cpp:70
+-msgid ""
+-"libeva patch for Visual Studio .Net 2002/2003 compiling supporting. 2007II "
+-"new smiley code"
+-msgstr "libeva 在 Visual Studio .Net 2002/2003 下正常编译的补丁。2007II 新表情"
++#: main.cpp:81
++msgid "Stark Wong"
++msgstr "Stark Wong"
+
+-#: main.cpp:71
++#: main.cpp:81
++msgid ""
++"libeva patch for Visual Studio .NET 2002/2003 compiling support.\n"
++"2007II new smiley code"
++msgstr ""
++"libeva 在 Visual Studio .NET 2002/2003 下正常编译的补丁。\n"
++"2007II 新表情"
++
++#: main.cpp:82
+ msgid "zsyddl"
+ msgstr "zsyddl"
+
+-#: main.cpp:71
++#: main.cpp:82
+ msgid "earlier user details window designer"
+ msgstr "原用户资料窗口设计者"
+
+-#: main.cpp:72
++#: main.cpp:83
+ msgid "swear"
+-msgstr ""
++msgstr "swear"
+
+-#: main.cpp:72
++#: main.cpp:83
+ msgid "forum maintainer"
+ msgstr "论坛维护者"
+
+@@ -591,7 +595,7 @@
+ #: rc.cpp:3
+ #, no-c-format
+ msgid "C&ustom"
+-msgstr "自定义(&u)"
++msgstr "自定义(&U)"
+
+ #: ui/createsmileyui.cpp:132
+ msgid "Add custom smiley"
+@@ -608,11 +612,11 @@
+ #: ui/createsmileyui.cpp:135
+ msgid ""
+ "1. Select files from your computer.<br>\n"
+-" <font color=\"#0066cc\">( 150 pixels x 150 pixels or "
++" <font color=\"#0066cc\">(150 pixels x 150 pixels or "
+ "smaller size for better quality. )</font>"
+ msgstr ""
+ "1. 从计算机中选择文件。<br>\n"
+-" <font color=\"#0066cc\">( 150 象素 X 150 象素或者更小"
++" <font color=\"#0066cc\">(150 像素 x 150 像素或者更小"
+ "的尺寸效果更好。)</font>"
+
+ #: ui/createsmileyui.cpp:138
+@@ -634,7 +638,7 @@
+
+ #: ui/createsmileyui.cpp:142
+ msgid "3. Give your smiley a name."
+-msgstr "3. 为你的表情命名。"
++msgstr "3. 为您的表情命名。"
+
+ #: ui/createsmileyui.cpp:143
+ msgid ""
+@@ -644,8 +648,8 @@
+ "<font color=\"#0099cc\">注:当创建多个表情时,文件名将作为表情名和快捷键。</"
+ "font>"
+
+-#: ui/createsmileywindow.cpp:97 ui/evachatwindow.cpp:896
+-#: ui/evaqunchatwindow.cpp:661
++#: ui/createsmileywindow.cpp:97 ui/evachatwindow.cpp:910
++#: ui/evaqunchatwindow.cpp:672
+ msgid " all images (*.png *.bmp *.jpg *.jpeg *.gif)"
+ msgstr "所有图片 (*.png *.bmp *.jpg *.jpeg *.gif)"
+
+@@ -706,7 +710,7 @@
+
+ #: ui/createsmileywindow.cpp:474
+ msgid "A directory named \"%1\" already exists. "
+-msgstr "名为 \"%1\" 的目录已经存在。 "
++msgstr "名为 “%1” 的目录已经存在。 "
+
+ #: ui/createsmileywindow.cpp:474
+ msgid "Directory Exists!"
+@@ -714,7 +718,7 @@
+
+ #: ui/createsmileywindow.cpp:576
+ msgid "Remove directory \"%1\" failed. "
+-msgstr "删除目录\"%1\"失败。 "
++msgstr "删除目录 “%1” 失败。 "
+
+ #: ui/createsmileywindow.cpp:577
+ msgid "Remove Directory!"
+@@ -722,7 +726,7 @@
+
+ #: ui/createsmileywindow.cpp:592
+ msgid "Cannot rename the group name \"%1\" to \"%2\". "
+-msgstr "不能重命名分组 \"%1\" 为 \"%2\"。"
++msgstr "不能重命名分组 “%1” 为 “%2”。"
+
+ #: ui/createsmileywindow.cpp:594 ui/createsmileywindow.cpp:601
+ #: ui/createsmileywindow.cpp:610
+@@ -755,15 +759,15 @@
+
+ #: ui/customfacemanagerui.cpp:515
+ msgid "Ed&it Group"
+-msgstr "编辑分组(&i)"
++msgstr "编辑分组(&I)"
+
+ #: ui/customfacemanagerui.cpp:518
+ msgid "Re&move Group"
+-msgstr "删除分组(&m)"
++msgstr "删除分组(&M)"
+
+ #: ui/customfacemanagerui.cpp:522
+ msgid "&Add"
+-msgstr "添加(&d)"
++msgstr "添加(&A)"
+
+ #: ui/customfacemanagerui.cpp:528
+ msgid "&Up"
+@@ -783,7 +787,7 @@
+
+ #: ui/customfaceuibase.cpp:89
+ msgid "CustomFaceUIBase"
+-msgstr ""
++msgstr "CustomFaceUIBase"
+
+ #: ui/customfaceuibase.cpp:90
+ msgid "Add smiley"
+@@ -862,23 +866,23 @@
+
+ #: ui/evaaddingnoticewindow.cpp:144
+ msgid "%1 has approved your request"
+-msgstr "%1 已经通过了你的请求"
++msgstr "%1 已经通过了您的请求"
+
+ #: ui/evaaddingnoticewindow.cpp:148
+ msgid "%1 has rejected your request"
+-msgstr "%1 已经拒绝了你的请求"
++msgstr "%1 已经拒绝了您的请求"
+
+ #: ui/evaaddingnoticewindow.cpp:152
+ msgid "%1 wants to add you onto her/his contact list"
+-msgstr "%1 想添加你作为她/他的好友"
++msgstr "%1 想添加您作为她/他的好友"
+
+ #: ui/evaaddingnoticewindow.cpp:163
+ msgid "%1 has approved your request and added you onto her/his contact list"
+-msgstr "%1 通过了你的请求并且加了你作为她/他的好友"
++msgstr "%1 通过了您的请求并且加了您作为她/他的好友"
+
+ #: ui/evaaddingnoticewindow.cpp:168
+ msgid "%1 has added you onto her/his contact list"
+-msgstr "%1 已经加了你作为她/他的好友"
++msgstr "%1 已经加了您作为她/他的好友"
+
+ #: ui/evaaddingnoticewindow.cpp:170
+ msgid "&Add to my list"
+@@ -889,9 +893,8 @@
+ msgstr "附加信息(%1):"
+
+ #: ui/evaaddingnoticewindow.cpp:249
+-#, fuzzy
+ msgid "Select one of the three actions to perform please."
+-msgstr "选择一个行为:"
++msgstr "请选择三个行为中的其中一个进行。"
+
+ #: ui/evaaddingnoticewindow.cpp:270
+ msgid "accept and add"
+@@ -911,7 +914,7 @@
+
+ #: ui/evaaddingnoticewindow.cpp:282
+ msgid "Operation %1 failed."
+-msgstr "操作 %1 失败"
++msgstr "操作 %1 失败。"
+
+ #: ui/evaaddingwindow.cpp:61
+ msgid "Select a group for %1"
+@@ -919,11 +922,11 @@
+
+ #: ui/evaaddingwindow.cpp:63 ui/evaaddqunwindow.cpp:84
+ msgid "Retrieving information from server..."
+-msgstr "从服务器接受信息……"
++msgstr "从服务器接收信息……"
+
+ #: ui/evaaddingwindow.cpp:65
+ msgid "You are about to add "
+-msgstr "你正在增加好友 "
++msgstr "您正在增加好友 "
+
+ #: ui/evaaddingwindow.cpp:102
+ msgid " refuses to be added."
+@@ -935,7 +938,7 @@
+
+ #: ui/evaaddingwindow.cpp:160
+ msgid "Enter the answer please."
+-msgstr "请输入答案"
++msgstr "请输入答案。"
+
+ #: ui/evaaddqunuibase.cpp:193
+ msgid "Qun ID:"
+@@ -954,7 +957,6 @@
+ msgstr "创建者信息"
+
+ #: ui/evaaddqunuibase.cpp:201
+-#, fuzzy
+ msgid "Auth Code:"
+ msgstr "验证信息:"
+
+@@ -967,7 +969,6 @@
+ msgstr "刷新"
+
+ #: ui/evaaddqunuibase.cpp:205
+-#, fuzzy
+ msgid "Authentication needed, please leave a message"
+ msgstr "需要验证,请留言"
+
+@@ -986,28 +987,27 @@
+
+ #: ui/evaaddqunwindow.cpp:157
+ msgid "You have joined Qun %1(%2)"
+-msgstr "你已经加入了群 %1(%2)"
++msgstr "您已经加入了群 %1(%2)"
+
+-#: ui/evaadduibase.cpp:175
+-msgid "Verify Code:"
++#: ui/evaadduibase.cpp:175 ui/evaloginveriuibase.cpp:127
++msgid "Verification Code:"
+ msgstr "验证码:"
+
+ #: ui/evaadduibase.cpp:176
+-#, fuzzy
+ msgid "Personal Question:"
+ msgstr "个人问题:"
+
+ #: ui/evaadduibase.cpp:177
+ msgid "Your Answer:"
+-msgstr "你的答案:"
++msgstr "您的答案:"
+
+ #: ui/evaadduibase.cpp:181
+ msgid "allow reverse adding"
+-msgstr "允许对方把你添加为好友"
++msgstr "允许对方把您添加为好友"
+
+-#: ui/evachatuibase.cpp:303 ui/evacontactlistview.cpp:847
+-#: ui/evacontactlistview.cpp:1146 ui/evacontactlistview.cpp:1633
+-#: ui/evacontactlistview.cpp:1649
++#: ui/evachatuibase.cpp:303 ui/evacontactlistview.cpp:826
++#: ui/evacontactlistview.cpp:1134 ui/evacontactlistview.cpp:1621
++#: ui/evacontactlistview.cpp:1637
+ msgid "Chat"
+ msgstr "收发讯息"
+
+@@ -1019,11 +1019,11 @@
+ msgid "IP:"
+ msgstr "IP:"
+
+-#: ui/evachatuibase.cpp:309 ui/evaqunchatuibase.cpp:291
++#: ui/evachatuibase.cpp:309
+ msgid "add a smiley icon"
+ msgstr "添加表情"
+
+-#: ui/evachatuibase.cpp:312 ui/evaqunchatuibase.cpp:293
++#: ui/evachatuibase.cpp:312
+ msgid "choose font size and color"
+ msgstr "选择字体大小和颜色"
+
+@@ -1036,11 +1036,11 @@
+ msgid "B"
+ msgstr "B"
+
+-#: ui/evachatuibase.cpp:319 ui/evaqunchatuibase.cpp:296
+-#: ui/mainlistfontsettinguibase.cpp:317 ui/mainlistfontsettinguibase.cpp:322
+-#: ui/mainlistfontsettinguibase.cpp:327 ui/mainlistfontsettinguibase.cpp:332
+-#: ui/mainlistfontsettinguibase.cpp:337 ui/mainlistfontsettinguibase.cpp:342
+-#: ui/mainlistfontsettinguibase.cpp:347 ui/mainlistfontsettinguibase.cpp:352
++#: ui/evachatuibase.cpp:319 ui/mainlistfontsettinguibase.cpp:317
++#: ui/mainlistfontsettinguibase.cpp:322 ui/mainlistfontsettinguibase.cpp:327
++#: ui/mainlistfontsettinguibase.cpp:332 ui/mainlistfontsettinguibase.cpp:337
++#: ui/mainlistfontsettinguibase.cpp:342 ui/mainlistfontsettinguibase.cpp:347
++#: ui/mainlistfontsettinguibase.cpp:352
+ msgid "bold"
+ msgstr "粗体"
+
+@@ -1048,11 +1048,11 @@
+ msgid "U"
+ msgstr "U"
+
+-#: ui/evachatuibase.cpp:323 ui/evaqunchatuibase.cpp:299
+-#: ui/mainlistfontsettinguibase.cpp:318 ui/mainlistfontsettinguibase.cpp:323
+-#: ui/mainlistfontsettinguibase.cpp:328 ui/mainlistfontsettinguibase.cpp:333
+-#: ui/mainlistfontsettinguibase.cpp:338 ui/mainlistfontsettinguibase.cpp:343
+-#: ui/mainlistfontsettinguibase.cpp:348 ui/mainlistfontsettinguibase.cpp:353
++#: ui/evachatuibase.cpp:323 ui/mainlistfontsettinguibase.cpp:318
++#: ui/mainlistfontsettinguibase.cpp:323 ui/mainlistfontsettinguibase.cpp:328
++#: ui/mainlistfontsettinguibase.cpp:333 ui/mainlistfontsettinguibase.cpp:338
++#: ui/mainlistfontsettinguibase.cpp:343 ui/mainlistfontsettinguibase.cpp:348
++#: ui/mainlistfontsettinguibase.cpp:353
+ msgid "underline"
+ msgstr "下划线"
+
+@@ -1060,32 +1060,32 @@
+ msgid "I"
+ msgstr "I"
+
+-#: ui/evachatuibase.cpp:326 ui/evaqunchatuibase.cpp:302
+-#: ui/mainlistfontsettinguibase.cpp:319 ui/mainlistfontsettinguibase.cpp:324
+-#: ui/mainlistfontsettinguibase.cpp:329 ui/mainlistfontsettinguibase.cpp:334
+-#: ui/mainlistfontsettinguibase.cpp:339 ui/mainlistfontsettinguibase.cpp:344
+-#: ui/mainlistfontsettinguibase.cpp:349 ui/mainlistfontsettinguibase.cpp:354
++#: ui/evachatuibase.cpp:326 ui/mainlistfontsettinguibase.cpp:319
++#: ui/mainlistfontsettinguibase.cpp:324 ui/mainlistfontsettinguibase.cpp:329
++#: ui/mainlistfontsettinguibase.cpp:334 ui/mainlistfontsettinguibase.cpp:339
++#: ui/mainlistfontsettinguibase.cpp:344 ui/mainlistfontsettinguibase.cpp:349
++#: ui/mainlistfontsettinguibase.cpp:354
+ msgid "italic"
+ msgstr "斜体"
+
+ #: ui/evachatuibase.cpp:330
+-msgid "send image files"
++msgid "Send image files"
+ msgstr "发送图片"
+
+ #: ui/evachatuibase.cpp:333
+-msgid "add a screen shot"
++msgid "Add a screenshot"
+ msgstr "添加屏幕截图"
+
+-#: ui/evachatuibase.cpp:335 ui/evaqunchatuibase.cpp:311
+-msgid "select an quick-reply message"
++#: ui/evachatuibase.cpp:335
++msgid "Select an quick-reply message"
+ msgstr "选择快捷回复消息"
+
+ #: ui/evachatuibase.cpp:337 ui/evaqunchatuibase.cpp:312
+-msgid "toggle sound notification"
++msgid "Toggle sound notification"
+ msgstr "声音提示开关"
+
+ #: ui/evachatuibase.cpp:342
+-msgid "hide/display QQ show panel"
++msgid "Hide/Display QQ Show panel"
+ msgstr "隐藏/显示QQ秀面板"
+
+ #: ui/evachatuibase.cpp:344
+@@ -1093,19 +1093,19 @@
+ msgstr "聊天记录(&H)"
+
+ #: ui/evachatuibase.cpp:346
+-msgid "view/hide IM history(Alt+H)"
+-msgstr "查看/隐藏聊天记录(Alt+H)"
++msgid "View/Hide IM history (Alt+H)"
++msgstr "查看/隐藏聊天记录 (Alt+H)"
+
+ #: ui/evachatuibase.cpp:349 ui/evaqunchatuibase.cpp:318
+-msgid "close this window(Alt+X)"
+-msgstr "关闭窗口(Alt+X)"
++msgid "Close this window (Alt+X)"
++msgstr "关闭窗口 (Alt+X)"
+
+ #: ui/evachatuibase.cpp:352 ui/evaqunchatuibase.cpp:321
+-msgid "send message"
++msgid "Send message"
+ msgstr "发送消息"
+
+ #: ui/evachatuibase.cpp:355 ui/evaqunchatuibase.cpp:323
+-msgid "change send key"
++msgid "Change send key"
+ msgstr "切换发送键"
+
+ #: ui/evachatuibase.cpp:356
+@@ -1114,7 +1114,7 @@
+
+ #: ui/evachatuibase.cpp:358 ui/evachatuibase.cpp:362
+ msgid "Click to update"
+-msgstr "单击更新QQ秀"
++msgstr "单击更新 QQ 秀"
+
+ #: ui/evachatuibase.cpp:359
+ msgid "Me"
+@@ -1124,7 +1124,7 @@
+ msgid "&Copy Text"
+ msgstr "复制文本(&C)"
+
+-#: ui/evachatview.cpp:140 ui/evachatwindow.cpp:317 ui/evaqunchatwindow.cpp:187
++#: ui/evachatview.cpp:140 ui/evachatwindow.cpp:318 ui/evaqunchatwindow.cpp:187
+ msgid "(Auto-Reply)"
+ msgstr "(自动回复)"
+
+@@ -1167,7 +1167,7 @@
+ #: ui/evachatview.cpp:462 ui/evascriptwidget.cpp:432
+ msgid ""
+ "A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+-msgstr "名为\"%1\"的文件已经存在。您确定要覆盖它吗?"
++msgstr "名为 “%1” 的文件已经存在。您确定要覆盖它吗?"
+
+ #: ui/evachatview.cpp:462 ui/evascriptwidget.cpp:432
+ msgid "Overwrite File?"
+@@ -1179,198 +1179,198 @@
+
+ #: ui/evachatview.cpp:512
+ msgid "Waiting for %1 accepting file \"%2\". Please wait or %3."
+-msgstr "等待 %1 接受发送文件“%2”的请求。 请等待或者 %3。"
++msgstr "等待 %1 接受发送文件 “%2” 的请求。 请等待或者 %3。"
+
+ #: ui/evachatview.cpp:515
+ msgid "%1 wants to send you a file \"%2\", you can %3, %4 or %5."
+-msgstr "%1 请求发送文件“%2”给您, 您可以 %3, %4 或者 %5。"
++msgstr "%1 请求发送文件 “%2” 给您,您可以 %3,%4 或者 %5。"
+
+-#: ui/evachatview.cpp:545
++#: ui/evachatview.cpp:546
+ msgid "resume"
+ msgstr "续传"
+
+-#: ui/evachatview.cpp:547
++#: ui/evachatview.cpp:548
+ msgid "start"
+ msgstr "开始"
+
+-#: ui/evachatview.cpp:548
++#: ui/evachatview.cpp:549
+ msgid ""
+ "Cached information of \"%1\" has been found, you can %2 the last download or "
+ "ignore the last cached download information and %3 a new download."
+ msgstr ""
+-"已发现文件“%1”的接收缓存文件, 您希望 %2 未接收完的文件, 还是 %3 从起始位置"
+-"接收?"
++"已发现文件“%1”的接收缓存文件,您希望 %2 未接收完的文件,还是 %3 从起始位置接"
++"收?"
+
+-#: ui/evachatwindow.cpp:155 ui/evaqunchatwindow.cpp:304
++#: ui/evachatwindow.cpp:156 ui/evaqunchatwindow.cpp:304
+ msgid "Press \"Enter\" to Send"
+ msgstr "按“Enter”键发送"
+
+-#: ui/evachatwindow.cpp:156 ui/evaqunchatwindow.cpp:305
++#: ui/evachatwindow.cpp:157 ui/evaqunchatwindow.cpp:305
+ msgid "Press \"Ctrl+Enter\" to Send"
+ msgstr "按“Ctrl+Enter”键发送"
+
+-#: ui/evachatwindow.cpp:169
++#: ui/evachatwindow.cpp:170
+ msgid "Chatting with %1"
+ msgstr "与 %1 聊天中"
+
+-#: ui/evachatwindow.cpp:171
++#: ui/evachatwindow.cpp:172
+ msgid "(offline)"
+ msgstr "(离线)"
+
+-#: ui/evachatwindow.cpp:189
++#: ui/evachatwindow.cpp:190
+ msgid "(online)"
+ msgstr "(在线)"
+
+-#: ui/evachatwindow.cpp:199
++#: ui/evachatwindow.cpp:200
+ msgid "(leave)"
+ msgstr "(离开)"
+
+-#: ui/evachatwindow.cpp:209
++#: ui/evachatwindow.cpp:210
+ msgid "(invisible)"
+ msgstr "(隐身)"
+
+-#: ui/evachatwindow.cpp:324 ui/evaqunchatwindow.cpp:200
++#: ui/evachatwindow.cpp:325 ui/evaqunchatwindow.cpp:200
+ msgid "message sent failed"
+ msgstr "消息发送失败"
+
+-#: ui/evachatwindow.cpp:324 ui/evachatwindow.cpp:509 ui/evachatwindow.cpp:513
+-#: ui/evaqunchatwindow.cpp:200 ui/evaqunchatwindow.cpp:528
+-#: ui/evaqunchatwindow.cpp:532 ui/evaqunchatwindow.cpp:709
+-#: ui/evaqunchatwindow.cpp:713
++#: ui/evachatwindow.cpp:325 ui/evachatwindow.cpp:520 ui/evachatwindow.cpp:524
++#: ui/evaqunchatwindow.cpp:200 ui/evaqunchatwindow.cpp:539
++#: ui/evaqunchatwindow.cpp:543 ui/evaqunchatwindow.cpp:720
++#: ui/evaqunchatwindow.cpp:724
+ msgid "Message"
+ msgstr "消息提示"
+
+-#: ui/evachatwindow.cpp:509 ui/evaqunchatwindow.cpp:528
+-#: ui/evaqunchatwindow.cpp:709
++#: ui/evachatwindow.cpp:520 ui/evaqunchatwindow.cpp:539
++#: ui/evaqunchatwindow.cpp:720
+ msgid "Cannot send empty message."
+ msgstr "不能发送空消息。"
+
+-#: ui/evachatwindow.cpp:513 ui/evaqunchatwindow.cpp:532
+-#: ui/evaqunchatwindow.cpp:713
++#: ui/evachatwindow.cpp:524 ui/evaqunchatwindow.cpp:543
++#: ui/evaqunchatwindow.cpp:724
+ msgid "Message is too long, cannot send."
+ msgstr "消息太长,不能发送。"
+
+-#: ui/evachatwindow.cpp:622 ui/evachatwindow.cpp:693
++#: ui/evachatwindow.cpp:636 ui/evachatwindow.cpp:707
+ msgid " all files (*)"
+ msgstr " 所有文件 (*)"
+
+-#: ui/evachatwindow.cpp:623
++#: ui/evachatwindow.cpp:637
+ msgid "select a file"
+ msgstr "选择要发送的文件"
+
+-#: ui/evachatwindow.cpp:682 ui/evachatwindow.cpp:698
++#: ui/evachatwindow.cpp:696 ui/evachatwindow.cpp:712
+ msgid ""
+-"You have accepted transfering \"%1\", network connecting start, please "
++"You have accepted transferring \"%1\", network connecting start, please "
+ "wait..."
+-msgstr "您已经接受了发送“%1”的请求, 开始进行网络连接,请等待……"
++msgstr "您已经接受了发送“%1”的请求,开始进行网络连接,请等待……"
+
+-#: ui/evachatwindow.cpp:707
+-msgid "You have cancelled transfering \"%1\"."
++#: ui/evachatwindow.cpp:721
++msgid "You have cancelled transferring \"%1\"."
+ msgstr "您已经取消了传送 “%1”。"
+
+-#: ui/evachatwindow.cpp:726
++#: ui/evachatwindow.cpp:740
+ msgid "accepted"
+ msgstr "接受了"
+
+-#: ui/evachatwindow.cpp:726
+-msgid "stoped"
++#: ui/evachatwindow.cpp:740
++msgid "stopped"
+ msgstr "停止了"
+
+-#: ui/evachatwindow.cpp:727
+-msgid "%1 has %2 transfering \"%3\"."
+-msgstr "%1已经%2传输文件“%3”。"
+-
+-#: ui/evachatwindow.cpp:778
+-msgid "network lost connection or your friend has stoped transfering \"%1\"."
+-msgstr "失去网络连接或者你的好友停止了传送“%1”。"
++#: ui/evachatwindow.cpp:741
++msgid "%1 has %2 transferring \"%3\"."
++msgstr "%1 已经%2传输文件“%3”。"
++
++#: ui/evachatwindow.cpp:792
++msgid "network lost connection or your friend has stopped transferring \"%1\"."
++msgstr "失去网络连接或者您的好友停止了传送“%1”。"
+
+-#: ui/evachatwindow.cpp:809
++#: ui/evachatwindow.cpp:823
+ msgid "sending \"%1\" finished."
+ msgstr "发送“%1”完成。"
+
+-#: ui/evachatwindow.cpp:831
++#: ui/evachatwindow.cpp:845
+ msgid "receiving file \"%1\" has been finished and saved in %2"
+ msgstr "文件“%1”已经接收完成,保存在 %2。"
+
+-#: ui/evachatwindow.cpp:875
++#: ui/evachatwindow.cpp:889
+ msgid ""
+-"File transfer is still in process( %1 file(s) left ). Closing this window "
+-"will also stop those transfer processes.Do you want to close this window?"
++"File transfer is still in process (%1 file(s) left). Closing this window "
++"will also stop those transfer processes. Do you want to close this window?"
+ msgstr ""
+-"依然有文件在传输(%1 文件), 关闭窗口将停止传输这些文件, 你确定要关闭窗口"
++"依然有文件在传输 (%1 个文件),关闭窗口将停止传输这些文件,您确定要关闭窗口"
+ "吗?"
+
+-#: ui/evachatwindow.cpp:878
++#: ui/evachatwindow.cpp:892
+ msgid "Close Window?"
+ msgstr "关闭窗口?"
+
+-#: ui/evachatwindow.cpp:897 ui/evaqunchatwindow.cpp:662
++#: ui/evachatwindow.cpp:911 ui/evaqunchatwindow.cpp:673
+ msgid "select an image file"
+ msgstr "选择一幅图片"
+
+-#: ui/evacontactlistview.cpp:457 ui/evaqunchatuibase.cpp:327
++#: ui/evacontactlistview.cpp:424 ui/evaqunchatuibase.cpp:327
+ msgid "Members"
+ msgstr "成员"
+
+-#: ui/evacontactlistview.cpp:836
++#: ui/evacontactlistview.cpp:815
+ msgid "Rename"
+ msgstr "重命名"
+
+-#: ui/evacontactlistview.cpp:837
++#: ui/evacontactlistview.cpp:816
+ msgid "New Group"
+ msgstr "添加组"
+
+-#: ui/evacontactlistview.cpp:838
++#: ui/evacontactlistview.cpp:817
+ msgid "Delele Group"
+ msgstr "删除组"
+
+-#: ui/evacontactlistview.cpp:842
++#: ui/evacontactlistview.cpp:821
+ msgid "Show Online"
+ msgstr "只显示在线用户"
+
+-#: ui/evacontactlistview.cpp:844
++#: ui/evacontactlistview.cpp:823
+ msgid "Show All"
+ msgstr "显示全部用户"
+
+-#: ui/evacontactlistview.cpp:848 ui/evacontactlistview.cpp:1634
++#: ui/evacontactlistview.cpp:827 ui/evacontactlistview.cpp:1622
+ msgid "Send File"
+ msgstr "发送文件"
+
+-#: ui/evacontactlistview.cpp:850 ui/evacontactlistview.cpp:1636
++#: ui/evacontactlistview.cpp:829 ui/evacontactlistview.cpp:1624
+ msgid "Update Level"
+ msgstr "更新等级"
+
+-#: ui/evacontactlistview.cpp:851 ui/evacontactlistview.cpp:1148
+-#: ui/evacontactlistview.cpp:1637 ui/evacontactlistview.cpp:1651
++#: ui/evacontactlistview.cpp:830 ui/evacontactlistview.cpp:1136
++#: ui/evacontactlistview.cpp:1625 ui/evacontactlistview.cpp:1639
+ #: ui/evaqunlistview.cpp:40 ui/evasearchuibase.cpp:697
+ #: ui/evasearchuibase.cpp:730 ui/evasearchuibase.cpp:749
+ #: ui/qundetailsui.cpp:355
+ msgid "Details"
+ msgstr "详细资料"
+
+-#: ui/evacontactlistview.cpp:852 ui/evacontactlistview.cpp:1638
++#: ui/evacontactlistview.cpp:831 ui/evacontactlistview.cpp:1626
+ msgid "Modify Memo"
+ msgstr "更改备注"
+
+-#: ui/evacontactlistview.cpp:853 ui/evacontactlistview.cpp:1149
+-#: ui/evacontactlistview.cpp:1639 ui/evacontactlistview.cpp:1652
++#: ui/evacontactlistview.cpp:832 ui/evacontactlistview.cpp:1137
++#: ui/evacontactlistview.cpp:1627 ui/evacontactlistview.cpp:1640
+ #: ui/evaqunchatuibase.cpp:313
+ msgid "History"
+ msgstr "聊天记录"
+
+-#: ui/evacontactlistview.cpp:856 ui/evacontactlistview.cpp:1642
++#: ui/evacontactlistview.cpp:835 ui/evacontactlistview.cpp:1630
+ msgid "Delete Buddy"
+ msgstr "删除好友"
+
+-#: ui/evacontactlistview.cpp:871
++#: ui/evacontactlistview.cpp:850
+ msgid "new group"
+ msgstr "添加组"
+
+-#: ui/evacontactlistview.cpp:893
++#: ui/evacontactlistview.cpp:872
+ msgid "Delete group"
+ msgstr "删除组"
+
+-#: ui/evacontactlistview.cpp:894
++#: ui/evacontactlistview.cpp:873
+ msgid ""
+ "Only empty group can be deleted.\n"
+ "\n"
+@@ -1378,7 +1378,7 @@
+ "只能删除空组。\n"
+ "\n"
+
+-#: ui/evacontactlistview.cpp:950 ui/evacontactlistview.cpp:1731
++#: ui/evacontactlistview.cpp:929 ui/evacontactlistview.cpp:1719
+ msgid ""
+ "Delete friend \"%1\" from your list, are you sure?\n"
+ "\n"
+@@ -1386,34 +1386,33 @@
+ "从您的好友列表中删除“%1”,确认吗?\n"
+ "\n"
+
+-#: ui/evacontactlistview.cpp:953 ui/evacontactlistview.cpp:1734
++#: ui/evacontactlistview.cpp:932 ui/evacontactlistview.cpp:1722
+ msgid "Delete a friend"
+ msgstr "删除好友"
+
+-#: ui/evacontactlistview.cpp:953 ui/evacontactlistview.cpp:1734
+-#, fuzzy
++#: ui/evacontactlistview.cpp:932 ui/evacontactlistview.cpp:1722
+ msgid "Deleting"
+ msgstr "正在删除"
+
+-#: ui/evacontactlistview.cpp:1108 ui/evacontactlistview.cpp:1592
++#: ui/evacontactlistview.cpp:1096 ui/evacontactlistview.cpp:1580
+ msgid "Qun name"
+ msgstr "群名称"
+
+-#: ui/evacontactlistview.cpp:1109 ui/evacontactlistview.cpp:1593
++#: ui/evacontactlistview.cpp:1097 ui/evacontactlistview.cpp:1581
+ msgid "Qun Number"
+ msgstr "群号码"
+
+-#: ui/evacontactlistview.cpp:1110 ui/evacontactlistview.cpp:1594
++#: ui/evacontactlistview.cpp:1098 ui/evacontactlistview.cpp:1582
+ #: ui/quncreateui.cpp:222 ui/qundetailsui.cpp:350
+ msgid "Qun Description"
+ msgstr "群描述"
+
+-#: ui/evacontactlistview.cpp:1151 ui/evacontactlistview.cpp:1654
++#: ui/evacontactlistview.cpp:1139 ui/evacontactlistview.cpp:1642
+ #: ui/quncreateui.cpp:216
+ msgid "Create Qun"
+ msgstr "创建群"
+
+-#: ui/evacontactlistview.cpp:1152 ui/evacontactlistview.cpp:1655
++#: ui/evacontactlistview.cpp:1140 ui/evacontactlistview.cpp:1643
+ msgid "Exit Qun"
+ msgstr "退出群"
+
+@@ -1490,7 +1489,6 @@
+ msgstr "AB"
+
+ #: ui/evadetailswindow.cpp:262 ui/evasyssettinguibase.cpp:1079
+-#: ui/evasyssettinguibase.cpp:1177
+ msgid "Other"
+ msgstr "其它"
+
+@@ -1594,7 +1592,7 @@
+ msgid "x"
+ msgstr "x"
+
+-#: ui/evafilestatusuibase.cpp:159 ui/evafontselecter.cpp:100
++#: ui/evafilestatusuibase.cpp:159 ui/evafontselecter.cpp:103
+ msgid "Size:"
+ msgstr "大小:"
+
+@@ -1602,19 +1600,19 @@
+ msgid "Speed:"
+ msgstr "速度:"
+
+-#: ui/evafontselecter.cpp:97
++#: ui/evafontselecter.cpp:100
+ msgid "Font Selecter"
+ msgstr "字体选择"
+
+-#: ui/evafontselecter.cpp:98
++#: ui/evafontselecter.cpp:101
+ msgid "Color:"
+ msgstr "颜色:"
+
+-#: ui/evafontselecter.cpp:99
++#: ui/evafontselecter.cpp:102
+ msgid "select font color"
+ msgstr "选择字体颜色"
+
+-#: ui/evafontselecter.cpp:101
++#: ui/evafontselecter.cpp:104
+ msgid "select font size"
+ msgstr "选择字体大小"
+
+@@ -1671,19 +1669,15 @@
+ msgid "Verification Graphic:"
+ msgstr "验证图片:"
+
+-#: ui/evaloginveriuibase.cpp:127
+-msgid "Verification Code:"
+-msgstr "验证码:"
+-
+ #: ui/evaloginveriuibase.cpp:129
+ msgid "Change image"
+ msgstr "更换图片"
+
+-#: ui/evaloginwindow.cpp:141
++#: ui/evaloginwindow.cpp:142
+ msgid "Sorry, account is not an integer number."
+ msgstr "对不起,输入的帐号不是整数。"
+
+-#: ui/evaloginwindow.cpp:149
++#: ui/evaloginwindow.cpp:150
+ msgid "Sorry, proxy server port is not an integer number."
+ msgstr "对不起,代理服务器端口不是整数。"
+
+@@ -1693,27 +1687,35 @@
+ msgid "Nick"
+ msgstr "昵称"
+
+-#: ui/evamainuibase.cpp:93 ui/evamainwindow.cpp:406
++#: ui/evamainuibase.cpp:93 ui/evamainwindow.cpp:407
+ #: ui/evaquncreatewindow.cpp:112 ui/evaqunlistview.cpp:218
+ #: ui/quncreateui.cpp:147 ui/quncreateui.cpp:227 ui/qundetailsui.cpp:175
+ #: ui/qundetailsui.cpp:356 ui/qundetailswindow.cpp:432
+ msgid "QQ"
+ msgstr "QQ"
+
+-#: ui/evamainwindow.cpp:407 ui/evaqunlistview.cpp:217
++#: ui/evamainwindow.cpp:408 ui/evaqunlistview.cpp:217
+ #: ui/mainlistfontsettinguibase.cpp:315
+ msgid "Nickname:"
+ msgstr "昵称:"
+
+-#: ui/evamainwindow.cpp:408
++#: ui/evamainwindow.cpp:409
+ msgid "Level"
+ msgstr "等级"
+
+-#: ui/evamainwindow.cpp:409
++#: ui/evamainwindow.cpp:410
+ msgid "Online Time"
+ msgstr "在线时长"
+
+-#: ui/evamainwindow.cpp:517
++#: ui/evamainwindow.cpp:411
++msgid " Hours "
++msgstr " 小时 "
++
++#: ui/evamainwindow.cpp:411
++msgid " min "
++msgstr " 分钟 "
++
++#: ui/evamainwindow.cpp:518
+ msgid "Recent Contacts List"
+ msgstr "最近联系人列表"
+
+@@ -1792,7 +1794,7 @@
+ msgid ""
+ "Authentication is needed for adding her/him, you can send a message to her/"
+ "him."
+-msgstr "加她/他为好友需要验证,你可以给她/他发送一条信息。"
++msgstr "加她/他为好友需要验证,您可以给她/他发送一条信息。"
+
+ #: ui/evanotifywindow.cpp:86
+ msgid "Sending error, please try again."
+@@ -1804,7 +1806,7 @@
+
+ #: ui/evanotifywindow.cpp:108
+ msgid "You are added by %1"
+-msgstr "你已经被 %1 加为好友"
++msgstr "您已经被 %1 加为好友"
+
+ #: ui/evanotifywindow.cpp:123
+ msgid "%1 is waiting for your approve."
+@@ -1821,7 +1823,7 @@
+
+ #: ui/evanotifywindow.cpp:141
+ msgid "You'v been approved by \"%1\""
+-msgstr "%1 已经通过你的验证请求"
++msgstr "%1 已经通过您的验证请求"
+
+ #: ui/evanotifywindow.cpp:156
+ msgid "Your Request has been rejected by %1"
+@@ -1857,7 +1859,7 @@
+
+ #: ui/evanotifywindow.cpp:258
+ msgid "Do you want to add \"%1\" into your list?"
+-msgstr "要把“%1”加到你的好友列表中吗?"
++msgstr "要把“%1”加到您的好友列表中吗?"
+
+ #: ui/evanotifywindow.cpp:272 ui/evasyshistoryviewer.cpp:99
+ msgid "created"
+@@ -1873,7 +1875,7 @@
+
+ #: ui/evanotifywindow.cpp:293
+ msgid "You'v joined Qun \"%1\"."
+-msgstr "你已经加入群“%1”。"
++msgstr "您已经加入群“%1”。"
+
+ #: ui/evanotifywindow.cpp:308 ui/evasyshistoryviewer.cpp:105
+ msgid "removed"
+@@ -1881,7 +1883,7 @@
+
+ #: ui/evanotifywindow.cpp:311
+ msgid "You have been removed out from Qun \"%1\"."
+-msgstr "你已经被群“%1”删除。"
++msgstr "您已经被群“%1”删除。"
+
+ #: ui/evanotifywindow.cpp:325 ui/evasyshistoryviewer.cpp:80
+ #: ui/evasyshistoryviewer.cpp:108
+@@ -1899,7 +1901,7 @@
+
+ #: ui/evanotifywindow.cpp:349
+ msgid "You'v been approved by creator \"%1\" of Qun \"%2\"."
+-msgstr "“%1”已经通过你加入群“%2”的请求。"
++msgstr "“%1”已经通过您加入群“%2”的请求。"
+
+ #: ui/evanotifywindow.cpp:364 ui/evasyshistoryviewer.cpp:86
+ #: ui/evasyshistoryviewer.cpp:115
+@@ -1908,19 +1910,39 @@
+
+ #: ui/evanotifywindow.cpp:367
+ msgid "Your Request has been rejected by \"%1\" of Qun \"%2\"."
+-msgstr "“%1”已经拒绝你加入群“%2”的请求。"
++msgstr "“%1”已经拒绝您加入群“%2”的请求。"
++
++#: ui/evaqunchatuibase.cpp:291
++msgid "Add a smiley icon"
++msgstr "添加表情"
++
++#: ui/evaqunchatuibase.cpp:293
++msgid "Choose font size and color"
++msgstr "选择字体大小和颜色"
++
++#: ui/evaqunchatuibase.cpp:296
++msgid "Bold"
++msgstr "粗体"
++
++#: ui/evaqunchatuibase.cpp:299
++msgid "Underline"
++msgstr "下划线"
+
+ #: ui/evaqunchatuibase.cpp:305
+-msgid "add a custom smiley (file size less than 50K)"
+-msgstr "添加自定义表情(请小于50K)"
++msgid "Add a custom smiley (file size less than 50KB)"
++msgstr "添加自定义表情 (请小于 50KB)"
+
+ #: ui/evaqunchatuibase.cpp:308
+-msgid "add a screen shot ( less than 700 X 600 )"
+-msgstr "添加屏幕截图(小于 700 X 600)"
++msgid "Add a screenshot (smaller than 700 x 600)"
++msgstr "添加屏幕截图 (小于 700 x 600)"
++
++#: ui/evaqunchatuibase.cpp:311
++msgid "Select a quick-reply message"
++msgstr "选择快捷回复消息"
+
+ #: ui/evaqunchatuibase.cpp:315
+-msgid "view IM history(Alt+H)"
+-msgstr "查看聊天记录(Alt+H)"
++msgid "View/Hide Qun history (Alt+H)"
++msgstr "查看/隐藏聊天记录 (Alt+H)"
+
+ #: ui/evaqunchatuibase.cpp:320 ui/qundetailsui.cpp:366
+ msgid "Alt+S"
+@@ -1931,14 +1953,14 @@
+ msgstr "群公告"
+
+ #: ui/evaqunchatuibase.cpp:325
+-msgid "Click to open/close qun notice"
++msgid "Click to open/close Qun notice"
+ msgstr "点击打开/关闭群公告"
+
+ #: ui/evaqunchatuibase.cpp:332
+ msgid "New Item"
+ msgstr "新项目"
+
+-#: ui/evaqunchatwindow.cpp:693
++#: ui/evaqunchatwindow.cpp:704
+ msgid "Send Image Error"
+ msgstr "发送图片错误"
+
+@@ -2018,7 +2040,7 @@
+
+ #: ui/evaqunsysmsgwindow.cpp:122
+ msgid "You have created Qun"
+-msgstr "你已经建立了群"
++msgstr "您已经建立了群"
+
+ #: ui/evaqunsysmsgwindow.cpp:123
+ msgid "(%1)"
+@@ -2026,11 +2048,11 @@
+
+ #: ui/evaqunsysmsgwindow.cpp:128
+ msgid "has added you to Qun"
+-msgstr "已经把你加进了群"
++msgstr "已经把您加进了群"
+
+ #: ui/evaqunsysmsgwindow.cpp:134
+ msgid "You have been removed from Qun"
+-msgstr "你已经退出了群"
++msgstr "您已经退出了群"
+
+ #: ui/evaqunsysmsgwindow.cpp:137
+ msgid "has quit Qun"
+@@ -2041,37 +2063,30 @@
+ msgstr "请求进入群"
+
+ #: ui/evaqunsysmsgwindow.cpp:150
+-#, fuzzy
+ msgid "has approved your request to be a member of Qun"
+-msgstr "已经同意了你的请求:加入群"
++msgstr "已经同意了您的请求:加入群"
+
+ #: ui/evaqunsysmsgwindow.cpp:155
+-#, fuzzy
+ msgid "has rejected your request to be a member of Qun"
+-msgstr "已经拒绝了你的请求:加入群"
++msgstr "已经拒绝了您的请求:加入群"
+
+ #: ui/evaqunsysmsgwindow.cpp:162
+-#, fuzzy
+ msgid "You have been set as an administrator of Qun"
+-msgstr "你已经被设置为管理员:群"
++msgstr "您已经被设置为管理员:群"
+
+ #: ui/evaqunsysmsgwindow.cpp:164
+-#, fuzzy
+ msgid "You have been set as an non-administrator(normal member) of Qun"
+-msgstr "你已经被设置为普通成员:群"
++msgstr "您已经被设置为普通成员:群"
+
+ #: ui/evaqunsysmsgwindow.cpp:169
+-#, fuzzy
+ msgid "has been set as an administrator of Qun"
+ msgstr "被设置成了管理员:群"
+
+ #: ui/evaqunsysmsgwindow.cpp:171
+-#, fuzzy
+ msgid "has been set as an non-administrator(normal member) of Qun"
+ msgstr "被设置为普通成员:群"
+
+ #: ui/evaqunsysmsgwindow.cpp:175
+-#, fuzzy
+ msgid "Additional message: %1"
+ msgstr "附加信息: %1"
+
+@@ -2088,8 +2103,8 @@
+ "%1 is an Eva script, \n"
+ "do your want to install it?"
+ msgstr ""
+-"%1 是一个Eva脚本, \n"
+-"你想安装吗?"
++"%1 是一个 Eva 脚本,\n"
++"您想安装吗?"
+
+ #: ui/evascriptwidget.cpp:362
+ msgid "Install Eva script?"
+@@ -2183,7 +2198,7 @@
+
+ #: ui/evasearchuibase.cpp:691 ui/evasearchuibase.cpp:720
+ msgid "the following users is found for you by Eva."
+-msgstr "以下是 Eva 为你找到的用户"
++msgstr "以下是 Eva 为您找到的用户"
+
+ #: ui/evasearchuibase.cpp:692 ui/evasearchuibase.cpp:721
+ msgid "QQ Num"
+@@ -2210,7 +2225,7 @@
+
+ #: ui/evasearchuibase.cpp:701
+ msgid "you may set one condition or more to search friend here"
+-msgstr "你也许想在这里设置查找好友的条件"
++msgstr "您也许想在这里设置查找好友的条件"
+
+ #: ui/evasearchuibase.cpp:702
+ msgid "online users"
+@@ -2303,131 +2318,131 @@
+ msgstr "未知"
+
+ #: ui/evasearchwindow.cpp:215
+-msgid "oversea"
++msgid "Abroad"
+ msgstr "海外"
+
+ #: ui/evasearchwindow.cpp:216 ui/evasyssettinguibase.cpp:1112
+-msgid "BeiJing"
++msgid "Beijing"
+ msgstr "北京"
+
+ #: ui/evasearchwindow.cpp:217 ui/evasyssettinguibase.cpp:1113
+-msgid "ShangHai"
++msgid "Shanghai"
+ msgstr "上海"
+
+ #: ui/evasearchwindow.cpp:218 ui/evasyssettinguibase.cpp:1114
+-msgid "TianJing"
++msgid "Tianjin"
+ msgstr "天津"
+
+ #: ui/evasearchwindow.cpp:219 ui/evasyssettinguibase.cpp:1115
+-msgid "ChongQing"
++msgid "Chongqing"
+ msgstr "重庆"
+
+ #: ui/evasearchwindow.cpp:220 ui/evasyssettinguibase.cpp:1116
+-msgid "HeBei"
++msgid "Hebei"
+ msgstr "河北"
+
+ #: ui/evasearchwindow.cpp:221 ui/evasyssettinguibase.cpp:1117
+-msgid "ShanXi"
++msgid "Shanxi"
+ msgstr "山西"
+
+ #: ui/evasearchwindow.cpp:222 ui/evasyssettinguibase.cpp:1118
+-msgid "NeiMengGu"
++msgid "Neimenggu"
+ msgstr "内蒙古"
+
+ #: ui/evasearchwindow.cpp:223 ui/evasyssettinguibase.cpp:1119
+-msgid "LiaoNing"
++msgid "Liaoning"
+ msgstr "辽宁"
+
+ #: ui/evasearchwindow.cpp:224 ui/evasyssettinguibase.cpp:1120
+-msgid "JiLin"
++msgid "Jilin"
+ msgstr "吉林"
+
+ #: ui/evasearchwindow.cpp:225 ui/evasyssettinguibase.cpp:1121
+-msgid "HeiLongJiang"
++msgid "Heilongjiang"
+ msgstr "黑龙江"
+
+ #: ui/evasearchwindow.cpp:226 ui/evasyssettinguibase.cpp:1122
+-msgid "JiangSu"
++msgid "Jiangsu"
+ msgstr "江苏"
+
+ #: ui/evasearchwindow.cpp:227 ui/evasyssettinguibase.cpp:1123
+-msgid "ZheJiang"
++msgid "Zhejiang"
+ msgstr "浙江"
+
+ #: ui/evasearchwindow.cpp:228 ui/evasyssettinguibase.cpp:1124
+-msgid "AnHui"
++msgid "Anhui"
+ msgstr "安徽"
+
+ #: ui/evasearchwindow.cpp:229 ui/evasyssettinguibase.cpp:1125
+-msgid "FuJian"
++msgid "Fujian"
+ msgstr "福建"
+
+ #: ui/evasearchwindow.cpp:230 ui/evasyssettinguibase.cpp:1126
+-msgid "JiangXi"
++msgid "Jiangxi"
+ msgstr "江西"
+
+ #: ui/evasearchwindow.cpp:231 ui/evasyssettinguibase.cpp:1127
+-msgid "ShanDong"
++msgid "Shandong"
+ msgstr "山东"
+
+ #: ui/evasearchwindow.cpp:232 ui/evasyssettinguibase.cpp:1128
+-msgid "HeNan"
++msgid "Henan"
+ msgstr "河南"
+
+ #: ui/evasearchwindow.cpp:233 ui/evasyssettinguibase.cpp:1129
+-msgid "HuBei"
++msgid "Hubei"
+ msgstr "湖北"
+
+ #: ui/evasearchwindow.cpp:234 ui/evasyssettinguibase.cpp:1130
+-msgid "HuNan"
++msgid "Hunan"
+ msgstr "湖南"
+
+ #: ui/evasearchwindow.cpp:235 ui/evasyssettinguibase.cpp:1131
+-msgid "GuangDong"
++msgid "Guangdong"
+ msgstr "广东"
+
+ #: ui/evasearchwindow.cpp:236 ui/evasyssettinguibase.cpp:1132
+-msgid "GuangXi"
++msgid "Guangxi"
+ msgstr "广西"
+
+ #: ui/evasearchwindow.cpp:237 ui/evasyssettinguibase.cpp:1133
+-msgid "HaiNan"
++msgid "Hainan"
+ msgstr "海南"
+
+ #: ui/evasearchwindow.cpp:238 ui/evasyssettinguibase.cpp:1134
+-msgid "SiChuan"
++msgid "Sichuan"
+ msgstr "四川"
+
+ #: ui/evasearchwindow.cpp:239 ui/evasyssettinguibase.cpp:1135
+-msgid "GuiZhou"
++msgid "Guizhou"
+ msgstr "贵州"
+
+ #: ui/evasearchwindow.cpp:240 ui/evasyssettinguibase.cpp:1136
+-msgid "YunNan"
++msgid "Yunnan"
+ msgstr "云南"
+
+ #: ui/evasearchwindow.cpp:241 ui/evasyssettinguibase.cpp:1137
+-msgid "XiZang"
++msgid "Xizang"
+ msgstr "西藏"
+
+ #: ui/evasearchwindow.cpp:242 ui/evasyssettinguibase.cpp:1138
+-msgid "ShaanXi"
++msgid "Shaanxi"
+ msgstr "陕西"
+
+ #: ui/evasearchwindow.cpp:243 ui/evasyssettinguibase.cpp:1139
+-msgid "GanSu"
++msgid "Gansu"
+ msgstr "甘肃"
+
+ #: ui/evasearchwindow.cpp:244 ui/evasyssettinguibase.cpp:1140
+-msgid "NingXia"
++msgid "Ningxia"
+ msgstr "宁夏"
+
+ #: ui/evasearchwindow.cpp:245 ui/evasyssettinguibase.cpp:1141
+-msgid "QingHai"
++msgid "Qinghai"
+ msgstr "青海"
+
+ #: ui/evasearchwindow.cpp:246 ui/evasyssettinguibase.cpp:1142
+-msgid "XinJiang"
++msgid "Xinjiang"
+ msgstr "新疆"
+
+ #: ui/evasearchwindow.cpp:247 ui/evasyssettinguibase.cpp:1143
+@@ -2439,7 +2454,7 @@
+ msgstr "澳门"
+
+ #: ui/evasearchwindow.cpp:249 ui/evasyssettinguibase.cpp:1145
+-msgid "TaiWan"
++msgid "Taiwan"
+ msgstr "台湾"
+
+ #: ui/evasearchwindow.cpp:375 ui/evasearchwindow.cpp:400
+@@ -2462,7 +2477,7 @@
+ #: ui/evasearchwindow.cpp:460 ui/evasearchwindow.cpp:657
+ #: ui/evasearchwindow.cpp:736 ui/evasearchwindow.cpp:888
+ msgid "Eva is searching users for you..."
+-msgstr "Eva 正在为你搜寻用户……"
++msgstr "Eva 正在为您搜寻用户……"
+
+ #: ui/evasearchwindow.cpp:484
+ msgid "Search conditions can not be empty."
+@@ -2485,7 +2500,7 @@
+
+ #: ui/evasearchwindow.cpp:595 ui/evasearchwindow.cpp:757
+ msgid "the following users are found for you by Eva."
+-msgstr "以下是 Eva 为你找到的用户"
++msgstr "以下是 Eva 为您找到的用户"
+
+ #: ui/evasearchwindow.cpp:642 ui/evasearchwindow.cpp:825
+ msgid "Current page %1 "
+@@ -2509,7 +2524,7 @@
+
+ #: ui/evasearchwindow.cpp:942
+ msgid "Eva is searching Qun for you..."
+-msgstr "Eva 正在为你搜寻群……"
++msgstr "Eva 正在为您搜寻群……"
+
+ #: ui/evasearchwindow.cpp:973
+ msgid "Current page 1 "
+@@ -2517,7 +2532,7 @@
+
+ #: ui/evasearchwindow.cpp:974
+ msgid "the following Qun are found for you by Eva."
+-msgstr "以下是 Eva 为你搜寻到的群"
++msgstr "以下是 Eva 为您搜寻到的群"
+
+ #: ui/evasysbroadcastuibase.cpp:113
+ msgid "System message"
+@@ -2532,7 +2547,6 @@
+ msgstr "更多信息(&M)"
+
+ #: ui/evasysbroadcastwindow.cpp:75
+-#, fuzzy
+ msgid "System News"
+ msgstr "系统消息"
+
+@@ -2549,9 +2563,8 @@
+ msgstr "已被添加"
+
+ #: ui/evasyshistoryviewer.cpp:76
+-#, fuzzy
+ msgid "approved and added"
+-msgstr "通过并加入(?)"
++msgstr "通过并添加"
+
+ #: ui/evasyshistoryviewer.cpp:89
+ msgid "News"
+@@ -2668,15 +2681,15 @@
+ msgstr "年龄:"
+
+ #: ui/evasyssettinguibase.cpp:1041
+-msgid "Zodiac:"
++msgid "Chinese Zodiac:"
+ msgstr "属相:"
+
+ #: ui/evasyssettinguibase.cpp:1042
+-msgid "Horoscape:"
++msgid "Horoscope:"
+ msgstr "星座:"
+
+ #: ui/evasyssettinguibase.cpp:1043
+-msgid "Blood:"
++msgid "Blood Type:"
+ msgstr "血型:"
+
+ #: ui/evasyssettinguibase.cpp:1087 ui/evauseruibase.cpp:282
+@@ -2704,7 +2717,7 @@
+ msgstr "私人联系方式"
+
+ #: ui/evasyssettinguibase.cpp:1094
+-msgid "following availible to"
++msgid "Following available to"
+ msgstr "以下资料"
+
+ #: ui/evasyssettinguibase.cpp:1095
+@@ -2752,11 +2765,11 @@
+ msgstr "省份:"
+
+ #: ui/evasyssettinguibase.cpp:1146 ui/evauseruibase.cpp:296
+-msgid "Zip Code:"
++msgid "Postal Code:"
+ msgstr "邮政编码:"
+
+ #: ui/evasyssettinguibase.cpp:1147
+-msgid "Area:"
++msgid "Region:"
+ msgstr "国家:"
+
+ #: ui/evasyssettinguibase.cpp:1148
+@@ -2828,51 +2841,51 @@
+ msgstr "常规"
+
+ #: ui/evasyssettinguibase.cpp:1168
+-msgid "display buddy online tip"
++msgid "Display buddy online tip"
+ msgstr "好友上线提示"
+
+ #: ui/evasyssettinguibase.cpp:1169
+-msgid "display online users only"
++msgid "Display online users only"
+ msgstr "只显示在线好友"
+
+ #: ui/evasyssettinguibase.cpp:1170
+-msgid "sound enabled"
++msgid "Sound enabled"
+ msgstr "播放声音提示"
+
+ #: ui/evasyssettinguibase.cpp:1171
+-msgid "show smiley icon in buddy list"
++msgid "Show smiley icon in buddy list"
+ msgstr "显示昵称中的表情图标"
+
+ #: ui/evasyssettinguibase.cpp:1172
+-msgid "show QQ News"
++msgid "Show QQ News"
+ msgstr "显示 QQ 新闻"
+
+ #: ui/evasyssettinguibase.cpp:1173
+-msgid "display message tip"
++msgid "Display message tip"
+ msgstr "消息提示"
+
+ #: ui/evasyssettinguibase.cpp:1174
+-msgid "display system ad. tip"
++msgid "Display system ad. tip"
+ msgstr "系统广告提示"
+
+ #: ui/evasyssettinguibase.cpp:1175
+-msgid "change send key to \"Enter\""
++msgid "Change send key to \"Enter\""
+ msgstr "更改发送键为“Enter”"
+
+ #: ui/evasyssettinguibase.cpp:1176
+-msgid "display buddy signature in seperate line"
++msgid "Display buddy signature in separate line"
+ msgstr "分行显示个性签名"
+
+ #: ui/evasyssettinguibase.cpp:1178
+-msgid "message page size:"
++msgid "Message page size:"
+ msgstr "消息浏览页大小:"
+
+ #: ui/evasyssettinguibase.cpp:1179
+-msgid "pieces"
++msgid "entries"
+ msgstr "条"
+
+ #: ui/evasyssettinguibase.cpp:1180
+-msgid "change status to away after:"
++msgid "Change status to away after:"
+ msgstr "更改状态为离开,如果空闲超过:"
+
+ #: ui/evasyssettinguibase.cpp:1181
+@@ -2880,7 +2893,7 @@
+ msgstr "分钟"
+
+ #: ui/evasyssettinguibase.cpp:1182
+-msgid "face size:"
++msgid "Face size:"
+ msgstr "头像大小:"
+
+ #: ui/evasyssettinguibase.cpp:1183
+@@ -2900,7 +2913,7 @@
+ msgstr "路径"
+
+ #: ui/evasyssettinguibase.cpp:1188
+-msgid "theme path:"
++msgid "Theme path:"
+ msgstr "主题路径:"
+
+ #: ui/evasyssettinguibase.cpp:1189 ui/evasyssettinguibase.cpp:1191
+@@ -2908,12 +2921,12 @@
+ msgstr "浏览"
+
+ #: ui/evasyssettinguibase.cpp:1190
+-msgid "sound path:"
++msgid "Sound path:"
+ msgstr "声音路径:"
+
+ #: ui/evasyssettinguibase.cpp:1192
+ msgid "Quick Reply (within 50 words):"
+-msgstr "快速回复(50字以内):"
++msgstr "快速回复(50 字以内):"
+
+ #: ui/evasyssettinguibase.cpp:1193 ui/evasyssettinguibase.cpp:1197
+ msgid "New"
+@@ -2924,7 +2937,7 @@
+ msgstr "自动回复(50 字以内):"
+
+ #: ui/evasyssettinguibase.cpp:1196
+-msgid "reply automatically when leave"
++msgid "Reply automatically when away"
+ msgstr "离开状态时自动回复"
+
+ #: ui/evasyssettingwindow.cpp:407
+@@ -2979,9 +2992,10 @@
+
+ #: ui/evauseruibase.cpp:279
+ msgid "Enjoy Eva, Enjoy Open Source!"
+-msgstr "享受Eva,享受开源!"
++msgstr "享受 Eva,享受开源!"
+
+-#: ui/evauseruibase.cpp:291
++#: ui/evauseruibase.cpp:291 ui/mainlistfontsettinguibase.cpp:330
++#: ui/mainlistfontsettinguibase.cpp:340
+ msgid "Name:"
+ msgstr "名称:"
+
+@@ -3087,16 +3101,12 @@
+ msgid "signature color:"
+ msgstr "个性签名颜色:"
+
+-#: ui/mainlistfontsettinguibase.cpp:330 ui/mainlistfontsettinguibase.cpp:340
+-msgid "name:"
+-msgstr "名称:"
+-
+ #: ui/mainlistfontsettinguibase.cpp:331 ui/mainlistfontsettinguibase.cpp:341
+ msgid "name color:"
+ msgstr "名称颜色:"
+
+ #: ui/mainlistfontsettinguibase.cpp:350
+-msgid "online counting:"
++msgid "Online statistics:"
+ msgstr "在线统计:"
+
+ #: ui/quncategoryui.cpp:94
+@@ -3120,12 +3130,12 @@
+ msgstr "分类"
+
+ #: ui/quncreateui.cpp:220
+-msgid "select a category"
++msgid "Select a category"
+ msgstr "选择一个分类"
+
+ #: ui/quncreateui.cpp:221 ui/qundetailsui.cpp:349
+-msgid "Qun Notice ( member only)"
+-msgstr "群公告(仅成员可见)"
++msgid "Qun Notice (member only)"
++msgstr "群公告 (仅成员可见)"
+
+ #: ui/quncreateui.cpp:224 ui/qundetailsui.cpp:352
+ msgid "No authentication needed."
+@@ -3300,36 +3310,66 @@
+ msgstr "群消息设置已经更新。"
+
+ #: api/evausersetting.cpp:871 api/evausersetting.cpp:1115
+-msgid "sorry, I am working."
++msgid "Sorry, I am working."
+ msgstr "对不起,我正在工作。"
+
+ #: api/evausersetting.cpp:872 api/evausersetting.cpp:1116
+-msgid "having dinner now./fa"
++msgid "Having dinner now./fa"
+ msgstr "吃饭去了。/fa"
+
+ #: api/evausersetting.cpp:873 api/evausersetting.cpp:1117
+-msgid "I am not available now, sorry"
+-msgstr "有事不在,不好意思"
++msgid "I am not available now, sorry."
++msgstr "有事不在,不好意思。"
+
+ #: api/evausersetting.cpp:882 api/evausersetting.cpp:1121
+-msgid "oh."
++msgid "Oh."
+ msgstr "哦。"
+
+ #: api/evausersetting.cpp:883 api/evausersetting.cpp:1122
+-msgid "ok, ok, I got u."
+-msgstr "好了,好了,知道了"
++msgid "OK, OK, I got you."
++msgstr "好了,好了,知道了。"
+
+ #: api/evausersetting.cpp:884 api/evausersetting.cpp:1123
+-msgid "/jy ,really?"
+-msgstr "/jy , 真的吗?"
++msgid "/jy , really?"
++msgstr "/jy ,真的吗?"
+
+ #: api/regiongrabber.cpp:47
+ msgid "Press mouse left button<br>to grab screenshot."
+ msgstr "按下鼠标左键<br>截取屏幕图象"
+
+ #: api/regiongrabber.cpp:47
+-msgid "Size(W x H):"
+-msgstr "尺寸(宽x高):"
++msgid "Size (W x H):"
++msgstr "尺寸 (宽 x 高):"
++
++#~ msgid "select an quick-reply message"
++#~ msgstr "选择快捷回复消息"
++
++#~ msgid "toggle sound notification"
++#~ msgstr "声音提示开关"
++
++#~ msgid "close this window(Alt+X)"
++#~ msgstr "关闭窗口 (Alt+X)"
++
++#~ msgid "send message"
++#~ msgstr "发送消息"
++
++#~ msgid "change send key"
++#~ msgstr "切换发送键"
++
++#~ msgid "Zip Code:"
++#~ msgstr "邮政编码:"
++
++#~ msgid "name:"
++#~ msgstr "名称:"
++
++#~ msgid "view IM history(Alt+H)"
++#~ msgstr "查看聊天记录(Alt+H)"
++
++#~ msgid "Area:"
++#~ msgstr "国家:"
++
++#~ msgid "pieces"
++#~ msgstr "条"
+
+ #~ msgid "Double click to chat"
+ #~ msgstr "双击打开聊天窗口"
+@@ -3427,7 +3467,7 @@
+ #~ msgstr "正在添加好友,请等待…"
+
+ #~ msgid "sending Joining request, please wait..."
+-#~ msgstr "正在发送添加请求, 请稍等……"
++#~ msgstr "正在发送添加请求,请稍等……"
+
+ #~ msgid "All %1 pages are displayed"
+ #~ msgstr "显示所有%1页"
+@@ -3480,7 +3520,7 @@
+ #~ msgstr "加入群回复"
+
+ #~ msgid "Your join request have have been denied by Qun \"%1\"."
+-#~ msgstr "你加入群“%1”的请求被拒绝。"
++#~ msgstr "您加入群“%1”的请求被拒绝。"
+
+ #~ msgid "New Password:"
+ #~ msgstr "新密码:"
+diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/po/zh_TW/eva.po eva-0.4.921+svn42.new/po/zh_TW/eva.po
+--- eva-0.4.921+svn42/po/zh_TW/eva.po 2008-04-25 16:09:34.000000000 +0800
++++ eva-0.4.921+svn42.new/po/zh_TW/eva.po 2008-05-06 03:12:28.000000000 +0800
+@@ -1,19 +1,21 @@
+-# translation of new.po to
+-# translation of eva.po to
+-# This file is distributed under the same license as the PACKAGE package.
+-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
++# Translation of eva.po to Chinese (traditional)
+ #
+-# 云帆 <yunfan_zg at 163.com>, 2006.
+-# bamfox <bamfox at 126.com>, 2006.
+-# Stark Wong <starkwong at hotmail.com>, 2008.
++# This file is distributed under the same license as the eva package.
++# Copyright (C) 2004-2008 yunfan
++#
++# Translators:
++# 雲帆 <yunfan_zg at 163.com>, 2006.
++# bamfox <bamfox at 126.com>, 2006.
++# Stark Wong <starkwong at hotmail.com>, 2008.
++# Anthony Fok 霍東靈 <anthony.fok at thizgroup.com> <foka at debian.org>, 2008.
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: new\n"
++"Project-Id-Version: eva-0.4.921+svn42\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2008-02-18 20:02+0800\n"
+-"PO-Revision-Date: 2008-02-17 15:46+0800\n"
+-"Last-Translator: Stark Wong <starkwong at hotmail.com>\n"
+-"Language-Team: <zh at li.org>\n"
++"POT-Creation-Date: 2008-05-06 03:12+0800\n"
++"PO-Revision-Date: 2008-05-06 03:00+0800\n"
++"Last-Translator: Anthony Fok <anthony.fok at thizgroup.com>\n"
++"Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+@@ -56,15 +58,15 @@
+ msgstr "Eva 搜尋/加入好友"
+
+ #: evaaddingmanager.cpp:186
+-msgid "You are adding %1, cannot processing %2 request."
+-msgstr "您正在加入 %1,無法處理%2請求。"
++msgid "You are adding %1, cannot process %2 request."
++msgstr "您正在加入 %1,無法處理 %2 請求。"
+
+ #: evaaddingmanager.cpp:251
+-msgid "Incorrect verify code, try again please!"
++msgid "Incorrect verification code, try again please!"
+ msgstr "驗證碼不正確,請再試一次!"
+
+ #: evaaddingmanager.cpp:284
+-msgid "Unkown auth reply type(%1), adding failed."
++msgid "Unknown auth reply type (%1), adding failed."
+ msgstr "認證回覆類型不明(%1),加入失敗。"
+
+ #: evaaddingmanager.cpp:318
+@@ -117,11 +119,11 @@
+
+ #: evamain.cpp:192
+ msgid "password missing, type \"eva --help\" to see details.\n"
+-msgstr "遺漏密碼, 輸入 「eva --help」 來觀看詳細資料。\n"
++msgstr "遺漏密碼,輸入「eva --help」來觀看詳細資料。\n"
+
+ #: evamain.cpp:220
+ msgid "mode can only be one of UDP, TCP or HTTP_PROXY.\n"
+-msgstr "模式只能是 UDP, TCP 或 HTTP_PROXY 之一。\n"
++msgstr "模式只能是 UDP、TCP 或 HTTP_PROXY 之一。\n"
+
+ #: evamain.cpp:229
+ msgid "http proxy server IP address missing.\n"
+@@ -151,7 +153,7 @@
+
+ #: evamain.cpp:382
+ msgid "Online"
+-msgstr "在線"
++msgstr "上線"
+
+ #: evamain.cpp:383
+ msgid "Offline"
+@@ -173,7 +175,7 @@
+ msgid "Download Group"
+ msgstr "下載好友群組"
+
+-#: evamain.cpp:393 ui/evacontactlistview.cpp:456
++#: evamain.cpp:393 ui/evacontactlistview.cpp:423
+ msgid "Group"
+ msgstr "好友群組"
+
+@@ -197,110 +199,110 @@
+ msgid "No Auto-Reply"
+ msgstr "沒有自動回覆"
+
+-#: evamain.cpp:570 ui/evamainwindow.cpp:492
++#: evamain.cpp:569 ui/evamainwindow.cpp:493
+ msgid "Qun List"
+ msgstr "群清單"
+
+-#: evamain.cpp:571
++#: evamain.cpp:570
+ msgid "Anonymous"
+ msgstr "陌生人"
+
+-#: evamain.cpp:572
++#: evamain.cpp:571
+ msgid "Black List"
+ msgstr "黑名單"
+
+-#: evamain.cpp:590 ui/evamainwindow.cpp:451
++#: evamain.cpp:589 ui/evamainwindow.cpp:452
+ msgid "Buddy List"
+ msgstr "好友清單"
+
+-#: evamain.cpp:1012
++#: evamain.cpp:1015
+ msgid "Network error occurred, check your network then try Eva later please."
+-msgstr "網路連線發生錯誤, 請檢查你的網路連線,稍後再嘗試登入Eva。"
++msgstr "網路連線發生錯誤,請檢查你的網路連線,稍後再嘗試登入Eva。"
+
+-#: evamain.cpp:1013 ui/loginuibase.cpp:196
++#: evamain.cpp:1016 ui/loginuibase.cpp:196
+ msgid "Network"
+ msgstr "網路設定"
+
+-#: evamain.cpp:1038
++#: evamain.cpp:1041
+ msgid "Cannot login, try later please."
+-msgstr "無法登入, 請稍後再試。"
++msgstr "無法登入,請稍後再試。"
+
+-#: evamain.cpp:1038 evamain.cpp:1075 evamain.cpp:2536
+-#: ui/evaloginwindow.cpp:140 ui/evaloginwindow.cpp:148
++#: evamain.cpp:1041 evamain.cpp:1078 evamain.cpp:2537
++#: ui/evaloginwindow.cpp:141 ui/evaloginwindow.cpp:149
+ msgid "Eva Login"
+ msgstr "登入"
+
+-#: evamain.cpp:1052
++#: evamain.cpp:1055
+ msgid "Lost connection with server, try later please."
+ msgstr "已經與伺服器失去連線,請稍後再試。"
+
+-#: evamain.cpp:1052
++#: evamain.cpp:1055
+ msgid "Eva Connection"
+ msgstr "Eva 網路連線"
+
+-#: evamain.cpp:1101
++#: evamain.cpp:1104
+ msgid "I am online."
+ msgstr "上線了。"
+
+-#: evamain.cpp:1115
++#: evamain.cpp:1118
+ msgid "I am busy ..."
+ msgstr "忙碌中……"
+
+-#: evamain.cpp:1244
++#: evamain.cpp:1247
+ msgid "Uploading grouped friends successfully."
+ msgstr "上傳好友群組成功。"
+
+-#: evamain.cpp:1244 evamain.cpp:1246
++#: evamain.cpp:1247 evamain.cpp:1249
+ msgid "Eva Upload Groups"
+ msgstr "Eva 上傳群組"
+
+-#: evamain.cpp:1246
++#: evamain.cpp:1249
+ msgid "Uploading grouped friends failed."
+ msgstr "上傳好友群組失敗。"
+
+-#: evamain.cpp:1605
++#: evamain.cpp:1608
+ msgid "Delete buddy \"%1\" failed."
+ msgstr "刪除好友「%1」失敗。"
+
+-#: evamain.cpp:1605
++#: evamain.cpp:1608
+ msgid "Eva Delete Buddy"
+ msgstr "Eva 刪除好友"
+
+-#: evamain.cpp:1668
++#: evamain.cpp:1671
+ msgid "put \"%1\" into Blacklist, are you sure?"
+ msgstr "將「%1」放入黑名單嗎?"
+
+-#: evamain.cpp:1669 evamain.cpp:1684
++#: evamain.cpp:1672 evamain.cpp:1687
+ msgid "Eva Blacklist"
+ msgstr "Eva 黑名單"
+
+-#: evamain.cpp:1683
++#: evamain.cpp:1686
+ msgid "Blacklist operation on \"%1\" failed."
+-msgstr "無法將「%1」放入黑名單, 請稍後再試。"
++msgstr "無法將「%1」放入黑名單,請稍後再試。"
+
+-#: evamain.cpp:1691
++#: evamain.cpp:1694
+ msgid "add \"%1\" into your Buddy list?"
+ msgstr "將「%1」加入好友清單嗎?"
+
+-#: evamain.cpp:1691
++#: evamain.cpp:1694
+ msgid "Eva Add Buddy"
+ msgstr "Eva 加入好友"
+
+-#: evamain.cpp:1839 ui/evanotifywindow.cpp:272 ui/evanotifywindow.cpp:290
++#: evamain.cpp:1842 ui/evanotifywindow.cpp:272 ui/evanotifywindow.cpp:290
+ #: ui/evanotifywindow.cpp:308 ui/evanotifywindow.cpp:325
+ #: ui/evanotifywindow.cpp:346 ui/evanotifywindow.cpp:364
+ #: ui/evaqunchatuibase.cpp:288 ui/evaqunchatwindow.cpp:322
+-#: ui/evaqunchatwindow.cpp:466 ui/evasyshistoryviewer.cpp:96
++#: ui/evaqunchatwindow.cpp:461 ui/evasyshistoryviewer.cpp:96
+ #: ui/qundetailsui.cpp:341 ui/qundetailswindow.cpp:106
+ #: ui/qundetailswindow.cpp:282
+ msgid "Qun"
+ msgstr "群"
+
+-#: evamain.cpp:1960
++#: evamain.cpp:1963
+ msgid "You have exited the Qun \"%1\" successfully."
+ msgstr "你已成功退出群「%1」。"
+
+-#: evamain.cpp:1962
++#: evamain.cpp:1965
+ msgid ""
+ "Exit Qun \"%1\" failed\n"
+ "%2"
+@@ -308,31 +310,31 @@
+ "退出群「%1」失敗\n"
+ "%2"
+
+-#: evamain.cpp:1964 evamain.cpp:1982 evamain.cpp:1988
++#: evamain.cpp:1967 evamain.cpp:1985 evamain.cpp:1991
+ #: ui/evaquncreatewindow.cpp:74 ui/evaquncreatewindow.cpp:81
+ #: ui/evaquncreatewindow.cpp:296 ui/evaquncreatewindow.cpp:302
+ msgid "Qun Operation"
+ msgstr "群操作"
+
+-#: evamain.cpp:1978
++#: evamain.cpp:1981
+ msgid ""
+ "You are the creator of Qun \"%1\", if you exit this Qun this Qun will be "
+ "deleted, are you sure?"
+-msgstr "你是群「%1」的建立者, 如果你退出,這個群將會被刪除,你確定嗎?"
++msgstr "你是群「%1」的建立者,如果你退出,這個群將會被刪除,你確定嗎?"
+
+-#: evamain.cpp:1980
++#: evamain.cpp:1983
+ msgid "Are you sure you want to exit Qun \"%1\"?"
+ msgstr "確定要退出群「%1」嗎?"
+
+-#: evamain.cpp:2010
++#: evamain.cpp:2013
+ msgid "signature"
+ msgstr "個性簽名"
+
+-#: evamain.cpp:2038
++#: evamain.cpp:2041
+ msgid "Eva Global Key"
+ msgstr "Eva 全域熱鍵"
+
+-#: evamain.cpp:2039
++#: evamain.cpp:2042
+ msgid "This action allows you to read your new Eva message globally."
+ msgstr "這個動作允許你全域閱讀 Eva 訊息。"
+
+@@ -431,164 +433,166 @@
+ msgid "IM Client"
+ msgstr "聊天客戶端"
+
+-#: main.cpp:29
++#: main.cpp:33
+ msgid "An IM Client Under KDE Using QQ IM Protocol."
+ msgstr "KDE 上使用 QQ 協定的即時通訊客戶端。"
+
+-#: main.cpp:35
++#: main.cpp:39
+ msgid "Using the last saved settings to login."
+ msgstr "使用上次儲存的設定登入。"
+
+-#: main.cpp:37
++#: main.cpp:41
+ msgid "QQ number to login."
+ msgstr "登入的 QQ 號碼。"
+
+-#: main.cpp:39
++#: main.cpp:43
+ msgid "Password for your QQ number."
+ msgstr "您 QQ 號的密碼。"
+
+-#: main.cpp:41
+-msgid "Connection mode ( one of UDP, TCP or HTTP_PROXY), defaulting to UDP"
+-msgstr "連線模式 (UDP, TCP 或 HTTP_PROXY 之一),預設為 UDP"
++#: main.cpp:45
++msgid "Connection mode (one of UDP, TCP or HTTP_PROXY), defaulting to UDP"
++msgstr "連線模式 (UDP、TCP 或 HTTP_PROXY 之一),預設為 UDP"
+
+-#: main.cpp:42
++#: main.cpp:46
+ msgid "Proxy server IP address."
+ msgstr "代理伺服器 IP 位址。"
+
+-#: main.cpp:43
++#: main.cpp:47
+ msgid "Proxy server port number"
+ msgstr "代理伺服器連線埠號"
+
+-#: main.cpp:44
++#: main.cpp:48
+ msgid "Proxy user name if required."
+ msgstr "代理伺服器使用者名稱(如果需要的話)。"
+
+-#: main.cpp:45
++#: main.cpp:49
+ msgid "Proxy password if required."
+ msgstr "代理伺服器密碼 (如果需要的話)。"
+
+-#: main.cpp:46
++#: main.cpp:50
+ msgid "Select login mode to invisible."
+ msgstr "選擇登入模式為隱身。"
+
+-#: main.cpp:47
++#: main.cpp:51
+ msgid "Save password and proxy settings."
+ msgstr "儲存密碼和代理伺服器設定。"
+
+-#: main.cpp:53 ui/evamainuibase.cpp:90
++#: main.cpp:58 ui/evamainuibase.cpp:90
+ msgid "Eva"
+ msgstr "Eva"
+
+-#: main.cpp:54
+-msgid "(c) 2004-2007, yunfan"
+-msgstr "(c) 2004-2007,云帆"
++#: main.cpp:62
++msgid "(c) 2004-2008, yunfan"
++msgstr "(c) 2004-2008,雲帆"
+
+-#: main.cpp:55
++#: main.cpp:66
+ msgid "yunfan"
+-msgstr "云帆"
++msgstr "雲帆"
+
+-#: main.cpp:55
++#: main.cpp:66
+ msgid "original developer, maintainer"
+ msgstr "最初作者,維護者"
+
+-#: main.cpp:57
++#: main.cpp:68
+ msgid "casper"
+ msgstr "casper"
+
+-#: main.cpp:57
++#: main.cpp:68
+ msgid "developer, memo, system setting ui and IP address converting"
+ msgstr "開發者、備註、系統設定介面以及 IP 位址轉換"
+
+-#: main.cpp:60
++#: main.cpp:71
+ msgid "byakko"
+ msgstr "byakko"
+
+-#: main.cpp:60
++#: main.cpp:71
+ msgid "UI patch provider"
+ msgstr "UI 修正提供者"
+
+-#: main.cpp:61
++#: main.cpp:72
+ msgid "caihua"
+ msgstr "caihua"
+
+-#: main.cpp:61
++#: main.cpp:72
+ msgid "icon designer"
+ msgstr "圖示設計者"
+
+-#: main.cpp:62
+-msgid "fundawang"
+-msgstr "fundawang"
++#: main.cpp:73
++msgid "Funda Wang"
++msgstr "Funda Wang"
+
+-#: main.cpp:62
++#: main.cpp:73
+ msgid "patch for xdg-user-dir supported"
+ msgstr "對支援 xdg-user-dir 的修正"
+
+-#: main.cpp:63
++#: main.cpp:74
+ msgid "Levin Du"
+ msgstr "Levin Du"
+
+-#: main.cpp:64
++#: main.cpp:75
+ msgid ""
+ "patch for system setting \n"
+ "fixed combo box index massing up after \n"
+ "clicking \"Default\" several times."
+ msgstr "系統選項修正-解決多次點選「預設值」按鈕導致下拉選單索引混亂問題。"
+
+-#: main.cpp:66
++#: main.cpp:77
+ msgid "Minmin"
+ msgstr "民民"
+
+-#: main.cpp:66
++#: main.cpp:77
+ msgid "encapsulating encryption class in C++"
+ msgstr "封裝 C++ 的加密類別。"
+
+-#: main.cpp:67
++#: main.cpp:78
+ msgid "nwillis"
+ msgstr "nwillis"
+
+-#: main.cpp:67
++#: main.cpp:78
+ msgid "idle detecting(auto-away) feature"
+ msgstr "閒置檢測(自動離開)功能"
+
+-#: main.cpp:68
++#: main.cpp:79
+ msgid "Phytonix"
+ msgstr "Phytonix"
+
+-#: main.cpp:68
++#: main.cpp:79
+ msgid "some original faces & Eva Logo designer."
+ msgstr "部分原始頭像和 Eva 標誌設計者。"
+
+-#: main.cpp:69
++#: main.cpp:80
+ msgid "Shixin Zeng"
+ msgstr "Shixin Zeng"
+
+-#: main.cpp:69
+-msgid "libeva patch for Windows supporting."
++#: main.cpp:80
++msgid "libeva patch for Windows support."
+ msgstr "libeva 的 Windows 支持修正。"
+
+-#: main.cpp:70
+-msgid "starkwong"
+-msgstr "starkwong"
+-
+-#: main.cpp:70
+-msgid ""
+-"libeva patch for Visual Studio .Net 2002/2003 compiling supporting. 2007II "
+-"new smiley code"
+-msgstr "libeva 在 Visual Studio .Net 2002/2003 的編譯修正。2007II 新表情圖示碼"
++#: main.cpp:81
++msgid "Stark Wong"
++msgstr "Stark Wong"
+
+-#: main.cpp:71
++#: main.cpp:81
++msgid ""
++"libeva patch for Visual Studio .NET 2002/2003 compiling support.\n"
++"2007II new smiley code"
++msgstr ""
++"libeva 在 Visual Studio .NET 2002/2003 的編譯修正。\n"
++"2007II 新表情圖示碼"
++
++#: main.cpp:82
+ msgid "zsyddl"
+ msgstr "zsyddl"
+
+-#: main.cpp:71
++#: main.cpp:82
+ msgid "earlier user details window designer"
+ msgstr "較早時期的使用者詳細資料視窗設計者"
+
+-#: main.cpp:72
++#: main.cpp:83
+ msgid "swear"
+ msgstr "swear"
+
+-#: main.cpp:72
++#: main.cpp:83
+ msgid "forum maintainer"
+ msgstr "討論區維護者"
+
+@@ -596,7 +600,7 @@
+ #: rc.cpp:3
+ #, no-c-format
+ msgid "C&ustom"
+-msgstr "自訂(&u)"
++msgstr "自訂(&U)"
+
+ #: ui/createsmileyui.cpp:132
+ msgid "Add custom smiley"
+@@ -613,11 +617,11 @@
+ #: ui/createsmileyui.cpp:135
+ msgid ""
+ "1. Select files from your computer.<br>\n"
+-" <font color=\"#0066cc\">( 150 pixels x 150 pixels or "
++" <font color=\"#0066cc\">(150 pixels x 150 pixels or "
+ "smaller size for better quality. )</font>"
+ msgstr ""
+ "1. 從您的電腦中選擇檔案。<br>\n"
+-" <font color=\"#0066cc\">( 150 像素 X 150 像素或更小的"
++" <font color=\"#0066cc\">(150 像素 x 150 像素或更小的"
+ "畫質會比較好。)</font>"
+
+ #: ui/createsmileyui.cpp:138
+@@ -650,8 +654,8 @@
+ "<font color=\"#0099cc\">注意:當建立超過一個表情時,將使用檔案名稱作為表情圖"
+ "示名稱和快捷鍵。</font>"
+
+-#: ui/createsmileywindow.cpp:97 ui/evachatwindow.cpp:896
+-#: ui/evaqunchatwindow.cpp:661
++#: ui/createsmileywindow.cpp:97 ui/evachatwindow.cpp:910
++#: ui/evaqunchatwindow.cpp:672
+ msgid " all images (*.png *.bmp *.jpg *.jpeg *.gif)"
+ msgstr "所有影像 (*.png *.bmp *.jpg *.jpeg *.gif)"
+
+@@ -903,7 +907,6 @@
+ msgstr "接受並加入"
+
+ #: ui/evaaddingnoticewindow.cpp:273
+-#, fuzzy
+ msgid "accept"
+ msgstr "接受"
+
+@@ -992,8 +995,8 @@
+ msgid "You have joined Qun %1(%2)"
+ msgstr "你已經加入群 %1(%2)"
+
+-#: ui/evaadduibase.cpp:175
+-msgid "Verify Code:"
++#: ui/evaadduibase.cpp:175 ui/evaloginveriuibase.cpp:127
++msgid "Verification Code:"
+ msgstr "驗證碼:"
+
+ #: ui/evaadduibase.cpp:176
+@@ -1008,9 +1011,9 @@
+ msgid "allow reverse adding"
+ msgstr "允許反向加入"
+
+-#: ui/evachatuibase.cpp:303 ui/evacontactlistview.cpp:847
+-#: ui/evacontactlistview.cpp:1146 ui/evacontactlistview.cpp:1633
+-#: ui/evacontactlistview.cpp:1649
++#: ui/evachatuibase.cpp:303 ui/evacontactlistview.cpp:826
++#: ui/evacontactlistview.cpp:1134 ui/evacontactlistview.cpp:1621
++#: ui/evacontactlistview.cpp:1637
+ msgid "Chat"
+ msgstr "聊天"
+
+@@ -1022,11 +1025,11 @@
+ msgid "IP:"
+ msgstr "IP:"
+
+-#: ui/evachatuibase.cpp:309 ui/evaqunchatuibase.cpp:291
++#: ui/evachatuibase.cpp:309
+ msgid "add a smiley icon"
+ msgstr "加入表情圖示"
+
+-#: ui/evachatuibase.cpp:312 ui/evaqunchatuibase.cpp:293
++#: ui/evachatuibase.cpp:312
+ msgid "choose font size and color"
+ msgstr "選擇字型大小和色彩"
+
+@@ -1039,11 +1042,11 @@
+ msgid "B"
+ msgstr "B"
+
+-#: ui/evachatuibase.cpp:319 ui/evaqunchatuibase.cpp:296
+-#: ui/mainlistfontsettinguibase.cpp:317 ui/mainlistfontsettinguibase.cpp:322
+-#: ui/mainlistfontsettinguibase.cpp:327 ui/mainlistfontsettinguibase.cpp:332
+-#: ui/mainlistfontsettinguibase.cpp:337 ui/mainlistfontsettinguibase.cpp:342
+-#: ui/mainlistfontsettinguibase.cpp:347 ui/mainlistfontsettinguibase.cpp:352
++#: ui/evachatuibase.cpp:319 ui/mainlistfontsettinguibase.cpp:317
++#: ui/mainlistfontsettinguibase.cpp:322 ui/mainlistfontsettinguibase.cpp:327
++#: ui/mainlistfontsettinguibase.cpp:332 ui/mainlistfontsettinguibase.cpp:337
++#: ui/mainlistfontsettinguibase.cpp:342 ui/mainlistfontsettinguibase.cpp:347
++#: ui/mainlistfontsettinguibase.cpp:352
+ msgid "bold"
+ msgstr "粗體"
+
+@@ -1051,65 +1054,64 @@
+ msgid "U"
+ msgstr "U"
+
+-#: ui/evachatuibase.cpp:323 ui/evaqunchatuibase.cpp:299
+-#: ui/mainlistfontsettinguibase.cpp:318 ui/mainlistfontsettinguibase.cpp:323
+-#: ui/mainlistfontsettinguibase.cpp:328 ui/mainlistfontsettinguibase.cpp:333
+-#: ui/mainlistfontsettinguibase.cpp:338 ui/mainlistfontsettinguibase.cpp:343
+-#: ui/mainlistfontsettinguibase.cpp:348 ui/mainlistfontsettinguibase.cpp:353
++#: ui/evachatuibase.cpp:323 ui/mainlistfontsettinguibase.cpp:318
++#: ui/mainlistfontsettinguibase.cpp:323 ui/mainlistfontsettinguibase.cpp:328
++#: ui/mainlistfontsettinguibase.cpp:333 ui/mainlistfontsettinguibase.cpp:338
++#: ui/mainlistfontsettinguibase.cpp:343 ui/mainlistfontsettinguibase.cpp:348
++#: ui/mainlistfontsettinguibase.cpp:353
+ msgid "underline"
+-msgstr "下劃線"
++msgstr "底線"
+
+ #: ui/evachatuibase.cpp:324
+ msgid "I"
+ msgstr "I"
+
+-#: ui/evachatuibase.cpp:326 ui/evaqunchatuibase.cpp:302
+-#: ui/mainlistfontsettinguibase.cpp:319 ui/mainlistfontsettinguibase.cpp:324
+-#: ui/mainlistfontsettinguibase.cpp:329 ui/mainlistfontsettinguibase.cpp:334
+-#: ui/mainlistfontsettinguibase.cpp:339 ui/mainlistfontsettinguibase.cpp:344
+-#: ui/mainlistfontsettinguibase.cpp:349 ui/mainlistfontsettinguibase.cpp:354
++#: ui/evachatuibase.cpp:326 ui/mainlistfontsettinguibase.cpp:319
++#: ui/mainlistfontsettinguibase.cpp:324 ui/mainlistfontsettinguibase.cpp:329
++#: ui/mainlistfontsettinguibase.cpp:334 ui/mainlistfontsettinguibase.cpp:339
++#: ui/mainlistfontsettinguibase.cpp:344 ui/mainlistfontsettinguibase.cpp:349
++#: ui/mainlistfontsettinguibase.cpp:354
+ msgid "italic"
+ msgstr "斜體"
+
+ #: ui/evachatuibase.cpp:330
+-msgid "send image files"
++msgid "Send image files"
+ msgstr "傳送影像檔案"
+
+ #: ui/evachatuibase.cpp:333
+-msgid "add a screen shot"
+-msgstr "加入螢幕截圖"
++msgid "Add a screenshot"
++msgstr "加入畫面快照"
+
+-#: ui/evachatuibase.cpp:335 ui/evaqunchatuibase.cpp:311
+-msgid "select an quick-reply message"
++#: ui/evachatuibase.cpp:335
++msgid "Select an quick-reply message"
+ msgstr "選擇快速回覆訊息"
+
+ #: ui/evachatuibase.cpp:337 ui/evaqunchatuibase.cpp:312
+-msgid "toggle sound notification"
+-msgstr ""
++msgid "Toggle sound notification"
++msgstr "聲音提示開關"
+
+ #: ui/evachatuibase.cpp:342
+-msgid "hide/display QQ show panel"
+-msgstr "隱藏/顯示 QQ 秀面板。"
++msgid "Hide/Display QQ Show panel"
++msgstr "隱藏/顯示 QQ 秀面板"
+
+ #: ui/evachatuibase.cpp:344
+ msgid "&History"
+ msgstr "歷史(&H)"
+
+ #: ui/evachatuibase.cpp:346
+-#, fuzzy
+-msgid "view/hide IM history(Alt+H)"
+-msgstr "檢視聊天記錄(Alt+H)"
++msgid "View/Hide IM history (Alt+H)"
++msgstr "檢視聊天記錄 (Alt+H)"
+
+ #: ui/evachatuibase.cpp:349 ui/evaqunchatuibase.cpp:318
+-msgid "close this window(Alt+X)"
+-msgstr "關閉這個視窗(Alt+X)"
++msgid "Close this window (Alt+X)"
++msgstr "關閉這個視窗 (Alt+X)"
+
+ #: ui/evachatuibase.cpp:352 ui/evaqunchatuibase.cpp:321
+-msgid "send message"
++msgid "Send message"
+ msgstr "傳送訊息"
+
+ #: ui/evachatuibase.cpp:355 ui/evaqunchatuibase.cpp:323
+-msgid "change send key"
++msgid "Change send key"
+ msgstr "變更傳送鍵"
+
+ #: ui/evachatuibase.cpp:356
+@@ -1128,7 +1130,7 @@
+ msgid "&Copy Text"
+ msgstr "複製文字(&C)"
+
+-#: ui/evachatview.cpp:140 ui/evachatwindow.cpp:317 ui/evaqunchatwindow.cpp:187
++#: ui/evachatview.cpp:140 ui/evachatwindow.cpp:318 ui/evaqunchatwindow.cpp:187
+ msgid "(Auto-Reply)"
+ msgstr "(自動回覆)"
+
+@@ -1187,194 +1189,194 @@
+
+ #: ui/evachatview.cpp:515
+ msgid "%1 wants to send you a file \"%2\", you can %3, %4 or %5."
+-msgstr "%1 請求傳送檔案「%2」給您, 您可以 %3, %4 或 %5。"
++msgstr "%1 請求傳送檔案「%2」給您,您可以 %3,%4 或 %5。"
+
+-#: ui/evachatview.cpp:545
++#: ui/evachatview.cpp:546
+ msgid "resume"
+ msgstr "續傳"
+
+-#: ui/evachatview.cpp:547
++#: ui/evachatview.cpp:548
+ msgid "start"
+ msgstr "開始"
+
+-#: ui/evachatview.cpp:548
++#: ui/evachatview.cpp:549
+ msgid ""
+ "Cached information of \"%1\" has been found, you can %2 the last download or "
+ "ignore the last cached download information and %3 a new download."
+ msgstr ""
+-"已發現檔案「%1」的接收緩存檔案, 您希望%2上一次的下載,或忽略最後緩存的下載資"
++"已發現檔案「%1」的接收緩存檔案,您希望%2上一次的下載,或忽略最後緩存的下載資"
+ "訊並%3新的下載。"
+
+-#: ui/evachatwindow.cpp:155 ui/evaqunchatwindow.cpp:304
++#: ui/evachatwindow.cpp:156 ui/evaqunchatwindow.cpp:304
+ msgid "Press \"Enter\" to Send"
+ msgstr "按「Enter」鍵傳送"
+
+-#: ui/evachatwindow.cpp:156 ui/evaqunchatwindow.cpp:305
++#: ui/evachatwindow.cpp:157 ui/evaqunchatwindow.cpp:305
+ msgid "Press \"Ctrl+Enter\" to Send"
+ msgstr "按「Ctrl+Enter」鍵傳送"
+
+-#: ui/evachatwindow.cpp:169
++#: ui/evachatwindow.cpp:170
+ msgid "Chatting with %1"
+ msgstr "與 %1 聊天中"
+
+-#: ui/evachatwindow.cpp:171
++#: ui/evachatwindow.cpp:172
+ msgid "(offline)"
+ msgstr "(離線)"
+
+-#: ui/evachatwindow.cpp:189
++#: ui/evachatwindow.cpp:190
+ msgid "(online)"
+-msgstr "(在線)"
++msgstr "(上線)"
+
+-#: ui/evachatwindow.cpp:199
++#: ui/evachatwindow.cpp:200
+ msgid "(leave)"
+ msgstr "(離開)"
+
+-#: ui/evachatwindow.cpp:209
++#: ui/evachatwindow.cpp:210
+ msgid "(invisible)"
+ msgstr "(隱身)"
+
+-#: ui/evachatwindow.cpp:324 ui/evaqunchatwindow.cpp:200
++#: ui/evachatwindow.cpp:325 ui/evaqunchatwindow.cpp:200
+ msgid "message sent failed"
+ msgstr "訊息傳送失敗"
+
+-#: ui/evachatwindow.cpp:324 ui/evachatwindow.cpp:509 ui/evachatwindow.cpp:513
+-#: ui/evaqunchatwindow.cpp:200 ui/evaqunchatwindow.cpp:528
+-#: ui/evaqunchatwindow.cpp:532 ui/evaqunchatwindow.cpp:709
+-#: ui/evaqunchatwindow.cpp:713
++#: ui/evachatwindow.cpp:325 ui/evachatwindow.cpp:520 ui/evachatwindow.cpp:524
++#: ui/evaqunchatwindow.cpp:200 ui/evaqunchatwindow.cpp:539
++#: ui/evaqunchatwindow.cpp:543 ui/evaqunchatwindow.cpp:720
++#: ui/evaqunchatwindow.cpp:724
+ msgid "Message"
+ msgstr "訊息"
+
+-#: ui/evachatwindow.cpp:509 ui/evaqunchatwindow.cpp:528
+-#: ui/evaqunchatwindow.cpp:709
++#: ui/evachatwindow.cpp:520 ui/evaqunchatwindow.cpp:539
++#: ui/evaqunchatwindow.cpp:720
+ msgid "Cannot send empty message."
+ msgstr "無法傳送空訊息。"
+
+-#: ui/evachatwindow.cpp:513 ui/evaqunchatwindow.cpp:532
+-#: ui/evaqunchatwindow.cpp:713
++#: ui/evachatwindow.cpp:524 ui/evaqunchatwindow.cpp:543
++#: ui/evaqunchatwindow.cpp:724
+ msgid "Message is too long, cannot send."
+ msgstr "訊息太長,無法傳送。"
+
+-#: ui/evachatwindow.cpp:622 ui/evachatwindow.cpp:693
++#: ui/evachatwindow.cpp:636 ui/evachatwindow.cpp:707
+ msgid " all files (*)"
+ msgstr " 所有檔案 (*)"
+
+-#: ui/evachatwindow.cpp:623
++#: ui/evachatwindow.cpp:637
+ msgid "select a file"
+ msgstr "選擇檔案"
+
+-#: ui/evachatwindow.cpp:682 ui/evachatwindow.cpp:698
++#: ui/evachatwindow.cpp:696 ui/evachatwindow.cpp:712
+ msgid ""
+-"You have accepted transfering \"%1\", network connecting start, please "
++"You have accepted transferring \"%1\", network connecting start, please "
+ "wait..."
+-msgstr "您已經接受了傳送「%1」的請求, 開始進行網路連線,請稍候……"
++msgstr "您已經接受了傳送「%1」的請求,開始進行網路連線,請稍候……"
+
+-#: ui/evachatwindow.cpp:707
+-msgid "You have cancelled transfering \"%1\"."
+-msgstr "您已經取消了傳送 「%1」。"
++#: ui/evachatwindow.cpp:721
++msgid "You have cancelled transferring \"%1\"."
++msgstr "您已經取消了傳送「%1」。"
+
+-#: ui/evachatwindow.cpp:726
++#: ui/evachatwindow.cpp:740
+ msgid "accepted"
+ msgstr "接受"
+
+-#: ui/evachatwindow.cpp:726
+-msgid "stoped"
++#: ui/evachatwindow.cpp:740
++msgid "stopped"
+ msgstr "停止"
+
+-#: ui/evachatwindow.cpp:727
+-msgid "%1 has %2 transfering \"%3\"."
+-msgstr "%1 已經%2傳輸檔案「%3」。"
++#: ui/evachatwindow.cpp:741
++msgid "%1 has %2 transferring \"%3\"."
++msgstr "%1 已經 %2 傳輸檔案「%3」。"
+
+-#: ui/evachatwindow.cpp:778
+-msgid "network lost connection or your friend has stoped transfering \"%1\"."
++#: ui/evachatwindow.cpp:792
++msgid "network lost connection or your friend has stopped transferring \"%1\"."
+ msgstr "失去網路連線或你的好友已停止傳送「%1」。"
+
+-#: ui/evachatwindow.cpp:809
++#: ui/evachatwindow.cpp:823
+ msgid "sending \"%1\" finished."
+ msgstr "傳送「%1」完成。"
+
+-#: ui/evachatwindow.cpp:831
++#: ui/evachatwindow.cpp:845
+ msgid "receiving file \"%1\" has been finished and saved in %2"
+ msgstr "檔案「%1」已經接收完成並儲存於 %2。"
+
+-#: ui/evachatwindow.cpp:875
++#: ui/evachatwindow.cpp:889
+ msgid ""
+-"File transfer is still in process( %1 file(s) left ). Closing this window "
+-"will also stop those transfer processes.Do you want to close this window?"
++"File transfer is still in process (%1 file(s) left). Closing this window "
++"will also stop those transfer processes. Do you want to close this window?"
+ msgstr ""
+ "依然有檔案在傳輸(尚餘 %1 個檔案),關閉此視窗將停止傳輸這些檔案,你確定要關"
+ "閉視窗嗎?"
+
+-#: ui/evachatwindow.cpp:878
++#: ui/evachatwindow.cpp:892
+ msgid "Close Window?"
+ msgstr "關閉視窗?"
+
+-#: ui/evachatwindow.cpp:897 ui/evaqunchatwindow.cpp:662
++#: ui/evachatwindow.cpp:911 ui/evaqunchatwindow.cpp:673
+ msgid "select an image file"
+ msgstr "選擇影像檔案"
+
+-#: ui/evacontactlistview.cpp:457 ui/evaqunchatuibase.cpp:327
++#: ui/evacontactlistview.cpp:424 ui/evaqunchatuibase.cpp:327
+ msgid "Members"
+ msgstr "成員"
+
+-#: ui/evacontactlistview.cpp:836
++#: ui/evacontactlistview.cpp:815
+ msgid "Rename"
+ msgstr "重新命名"
+
+-#: ui/evacontactlistview.cpp:837
++#: ui/evacontactlistview.cpp:816
+ msgid "New Group"
+ msgstr "加入分組"
+
+-#: ui/evacontactlistview.cpp:838
++#: ui/evacontactlistview.cpp:817
+ msgid "Delele Group"
+ msgstr "刪除分組"
+
+-#: ui/evacontactlistview.cpp:842
++#: ui/evacontactlistview.cpp:821
+ msgid "Show Online"
+-msgstr "只顯示在線使用者"
++msgstr "只顯示上線使用者"
+
+-#: ui/evacontactlistview.cpp:844
++#: ui/evacontactlistview.cpp:823
+ msgid "Show All"
+ msgstr "顯示全部使用者"
+
+-#: ui/evacontactlistview.cpp:848 ui/evacontactlistview.cpp:1634
++#: ui/evacontactlistview.cpp:827 ui/evacontactlistview.cpp:1622
+ msgid "Send File"
+ msgstr "傳送檔案"
+
+-#: ui/evacontactlistview.cpp:850 ui/evacontactlistview.cpp:1636
++#: ui/evacontactlistview.cpp:829 ui/evacontactlistview.cpp:1624
+ msgid "Update Level"
+ msgstr "更新等級"
+
+-#: ui/evacontactlistview.cpp:851 ui/evacontactlistview.cpp:1148
+-#: ui/evacontactlistview.cpp:1637 ui/evacontactlistview.cpp:1651
++#: ui/evacontactlistview.cpp:830 ui/evacontactlistview.cpp:1136
++#: ui/evacontactlistview.cpp:1625 ui/evacontactlistview.cpp:1639
+ #: ui/evaqunlistview.cpp:40 ui/evasearchuibase.cpp:697
+ #: ui/evasearchuibase.cpp:730 ui/evasearchuibase.cpp:749
+ #: ui/qundetailsui.cpp:355
+ msgid "Details"
+ msgstr "詳細資料"
+
+-#: ui/evacontactlistview.cpp:852 ui/evacontactlistview.cpp:1638
++#: ui/evacontactlistview.cpp:831 ui/evacontactlistview.cpp:1626
+ msgid "Modify Memo"
+ msgstr "更改備註"
+
+-#: ui/evacontactlistview.cpp:853 ui/evacontactlistview.cpp:1149
+-#: ui/evacontactlistview.cpp:1639 ui/evacontactlistview.cpp:1652
++#: ui/evacontactlistview.cpp:832 ui/evacontactlistview.cpp:1137
++#: ui/evacontactlistview.cpp:1627 ui/evacontactlistview.cpp:1640
+ #: ui/evaqunchatuibase.cpp:313
+ msgid "History"
+ msgstr "歷史"
+
+-#: ui/evacontactlistview.cpp:856 ui/evacontactlistview.cpp:1642
++#: ui/evacontactlistview.cpp:835 ui/evacontactlistview.cpp:1630
+ msgid "Delete Buddy"
+ msgstr "刪除好友"
+
+-#: ui/evacontactlistview.cpp:871
++#: ui/evacontactlistview.cpp:850
+ msgid "new group"
+ msgstr "加入分組"
+
+-#: ui/evacontactlistview.cpp:893
++#: ui/evacontactlistview.cpp:872
+ msgid "Delete group"
+ msgstr "刪除分組"
+
+-#: ui/evacontactlistview.cpp:894
++#: ui/evacontactlistview.cpp:873
+ msgid ""
+ "Only empty group can be deleted.\n"
+ "\n"
+@@ -1382,7 +1384,7 @@
+ "只能刪除空白的分組。\n"
+ "\n"
+
+-#: ui/evacontactlistview.cpp:950 ui/evacontactlistview.cpp:1731
++#: ui/evacontactlistview.cpp:929 ui/evacontactlistview.cpp:1719
+ msgid ""
+ "Delete friend \"%1\" from your list, are you sure?\n"
+ "\n"
+@@ -1390,34 +1392,33 @@
+ "從您的好友清單中刪除「%1」,確認嗎?\n"
+ "\n"
+
+-#: ui/evacontactlistview.cpp:953 ui/evacontactlistview.cpp:1734
++#: ui/evacontactlistview.cpp:932 ui/evacontactlistview.cpp:1722
+ msgid "Delete a friend"
+ msgstr "刪除好友"
+
+-#: ui/evacontactlistview.cpp:953 ui/evacontactlistview.cpp:1734
++#: ui/evacontactlistview.cpp:932 ui/evacontactlistview.cpp:1722
+ msgid "Deleting"
+ msgstr "正在刪除"
+
+-#: ui/evacontactlistview.cpp:1108 ui/evacontactlistview.cpp:1592
+-#, fuzzy
++#: ui/evacontactlistview.cpp:1096 ui/evacontactlistview.cpp:1580
+ msgid "Qun name"
+ msgstr "群名稱"
+
+-#: ui/evacontactlistview.cpp:1109 ui/evacontactlistview.cpp:1593
++#: ui/evacontactlistview.cpp:1097 ui/evacontactlistview.cpp:1581
+ msgid "Qun Number"
+ msgstr "群號碼"
+
+-#: ui/evacontactlistview.cpp:1110 ui/evacontactlistview.cpp:1594
++#: ui/evacontactlistview.cpp:1098 ui/evacontactlistview.cpp:1582
+ #: ui/quncreateui.cpp:222 ui/qundetailsui.cpp:350
+ msgid "Qun Description"
+ msgstr "群描述"
+
+-#: ui/evacontactlistview.cpp:1151 ui/evacontactlistview.cpp:1654
++#: ui/evacontactlistview.cpp:1139 ui/evacontactlistview.cpp:1642
+ #: ui/quncreateui.cpp:216
+ msgid "Create Qun"
+ msgstr "建立群"
+
+-#: ui/evacontactlistview.cpp:1152 ui/evacontactlistview.cpp:1655
++#: ui/evacontactlistview.cpp:1140 ui/evacontactlistview.cpp:1643
+ msgid "Exit Qun"
+ msgstr "退出群"
+
+@@ -1494,7 +1495,6 @@
+ msgstr "AB"
+
+ #: ui/evadetailswindow.cpp:262 ui/evasyssettinguibase.cpp:1079
+-#: ui/evasyssettinguibase.cpp:1177
+ msgid "Other"
+ msgstr "其它"
+
+@@ -1598,7 +1598,7 @@
+ msgid "x"
+ msgstr "x"
+
+-#: ui/evafilestatusuibase.cpp:159 ui/evafontselecter.cpp:100
++#: ui/evafilestatusuibase.cpp:159 ui/evafontselecter.cpp:103
+ msgid "Size:"
+ msgstr "大小:"
+
+@@ -1606,19 +1606,19 @@
+ msgid "Speed:"
+ msgstr "速度:"
+
+-#: ui/evafontselecter.cpp:97
++#: ui/evafontselecter.cpp:100
+ msgid "Font Selecter"
+ msgstr "字型選擇"
+
+-#: ui/evafontselecter.cpp:98
++#: ui/evafontselecter.cpp:101
+ msgid "Color:"
+ msgstr "顏色:"
+
+-#: ui/evafontselecter.cpp:99
++#: ui/evafontselecter.cpp:102
+ msgid "select font color"
+ msgstr "選擇字型色彩"
+
+-#: ui/evafontselecter.cpp:101
++#: ui/evafontselecter.cpp:104
+ msgid "select font size"
+ msgstr "選擇字型大小"
+
+@@ -1675,19 +1675,15 @@
+ msgid "Verification Graphic:"
+ msgstr "驗證圖片:"
+
+-#: ui/evaloginveriuibase.cpp:127
+-msgid "Verification Code:"
+-msgstr "驗證碼:"
+-
+ #: ui/evaloginveriuibase.cpp:129
+ msgid "Change image"
+ msgstr "變更影像"
+
+-#: ui/evaloginwindow.cpp:141
++#: ui/evaloginwindow.cpp:142
+ msgid "Sorry, account is not an integer number."
+ msgstr "很抱歉,輸入的帳號並不是整數。"
+
+-#: ui/evaloginwindow.cpp:149
++#: ui/evaloginwindow.cpp:150
+ msgid "Sorry, proxy server port is not an integer number."
+ msgstr "很抱歉,代理伺服器連線埠不是整數。"
+
+@@ -1697,27 +1693,35 @@
+ msgid "Nick"
+ msgstr "暱稱"
+
+-#: ui/evamainuibase.cpp:93 ui/evamainwindow.cpp:406
++#: ui/evamainuibase.cpp:93 ui/evamainwindow.cpp:407
+ #: ui/evaquncreatewindow.cpp:112 ui/evaqunlistview.cpp:218
+ #: ui/quncreateui.cpp:147 ui/quncreateui.cpp:227 ui/qundetailsui.cpp:175
+ #: ui/qundetailsui.cpp:356 ui/qundetailswindow.cpp:432
+ msgid "QQ"
+ msgstr "QQ"
+
+-#: ui/evamainwindow.cpp:407 ui/evaqunlistview.cpp:217
++#: ui/evamainwindow.cpp:408 ui/evaqunlistview.cpp:217
+ #: ui/mainlistfontsettinguibase.cpp:315
+ msgid "Nickname:"
+ msgstr "暱稱:"
+
+-#: ui/evamainwindow.cpp:408
++#: ui/evamainwindow.cpp:409
+ msgid "Level"
+ msgstr "等級"
+
+-#: ui/evamainwindow.cpp:409
++#: ui/evamainwindow.cpp:410
+ msgid "Online Time"
+-msgstr "在線時長"
++msgstr "上線時長"
++
++#: ui/evamainwindow.cpp:411
++msgid " Hours "
++msgstr " 小時 "
++
++#: ui/evamainwindow.cpp:411
++msgid " min "
++msgstr " 分鐘 "
+
+-#: ui/evamainwindow.cpp:517
++#: ui/evamainwindow.cpp:518
+ msgid "Recent Contacts List"
+ msgstr "最近連絡人清單"
+
+@@ -1914,17 +1918,37 @@
+ msgid "Your Request has been rejected by \"%1\" of Qun \"%2\"."
+ msgstr "「%1」已經拒絕你加入群「%2」的請求。"
+
++#: ui/evaqunchatuibase.cpp:291
++msgid "Add a smiley icon"
++msgstr "加入表情圖示"
++
++#: ui/evaqunchatuibase.cpp:293
++msgid "Choose font size and color"
++msgstr "選擇字型大小和色彩"
++
++#: ui/evaqunchatuibase.cpp:296
++msgid "Bold"
++msgstr "粗體"
++
++#: ui/evaqunchatuibase.cpp:299
++msgid "Underline"
++msgstr "底線"
++
+ #: ui/evaqunchatuibase.cpp:305
+-msgid "add a custom smiley (file size less than 50K)"
+-msgstr "加入自定義表情(請小於50K)"
++msgid "Add a custom smiley (file size less than 50KB)"
++msgstr "加入自定義表情 (請小於 50KB)"
+
+ #: ui/evaqunchatuibase.cpp:308
+-msgid "add a screen shot ( less than 700 X 600 )"
+-msgstr "加入屏幕截圖(小於 700 X 600)"
++msgid "Add a screenshot (smaller than 700 x 600)"
++msgstr "加入畫面快照 (小於 700 x 600)"
++
++#: ui/evaqunchatuibase.cpp:311
++msgid "Select a quick-reply message"
++msgstr "選擇快速回覆訊息"
+
+ #: ui/evaqunchatuibase.cpp:315
+-msgid "view IM history(Alt+H)"
+-msgstr "檢視聊天記錄(Alt+H)"
++msgid "View/Hide Qun history (Alt+H)"
++msgstr "檢視聊天記錄 (Alt+H)"
+
+ #: ui/evaqunchatuibase.cpp:320 ui/qundetailsui.cpp:366
+ msgid "Alt+S"
+@@ -1935,14 +1959,14 @@
+ msgstr "群公告"
+
+ #: ui/evaqunchatuibase.cpp:325
+-msgid "Click to open/close qun notice"
++msgid "Click to open/close Qun notice"
+ msgstr "點選開啟/關閉群公告"
+
+ #: ui/evaqunchatuibase.cpp:332
+ msgid "New Item"
+ msgstr "新項目"
+
+-#: ui/evaqunchatwindow.cpp:693
++#: ui/evaqunchatwindow.cpp:704
+ msgid "Send Image Error"
+ msgstr "傳送影像錯誤"
+
+@@ -2156,7 +2180,7 @@
+
+ #: ui/evasearchuibase.cpp:682
+ msgid "search online users"
+-msgstr "搜尋在線使用者"
++msgstr "搜尋上線使用者"
+
+ #: ui/evasearchuibase.cpp:683 ui/evasearchuibase.cpp:687
+ msgid "accurate conditions"
+@@ -2175,9 +2199,8 @@
+ msgstr "請按搜尋按鈕前進到 QQ 好友首頁進行搜尋"
+
+ #: ui/evasearchuibase.cpp:689
+-#, fuzzy
+ msgid "number of online users :"
+-msgstr "在線使用者數量:"
++msgstr "上線使用者數量:"
+
+ #: ui/evasearchuibase.cpp:691 ui/evasearchuibase.cpp:720
+ msgid "the following users is found for you by Eva."
+@@ -2212,7 +2235,7 @@
+
+ #: ui/evasearchuibase.cpp:702
+ msgid "online users"
+-msgstr "在線使用者"
++msgstr "上線使用者"
+
+ #: ui/evasearchuibase.cpp:703
+ msgid "has camera"
+@@ -2277,7 +2300,6 @@
+ msgstr "以條件搜尋"
+
+ #: ui/evasearchuibase.cpp:740
+-#, fuzzy
+ msgid "category"
+ msgstr "分類"
+
+@@ -2302,132 +2324,131 @@
+ msgstr "不明"
+
+ #: ui/evasearchwindow.cpp:215
+-msgid "oversea"
++msgid "Abroad"
+ msgstr "海外"
+
+ #: ui/evasearchwindow.cpp:216 ui/evasyssettinguibase.cpp:1112
+-msgid "BeiJing"
++msgid "Beijing"
+ msgstr "北京"
+
+ #: ui/evasearchwindow.cpp:217 ui/evasyssettinguibase.cpp:1113
+-msgid "ShangHai"
++msgid "Shanghai"
+ msgstr "上海"
+
+ #: ui/evasearchwindow.cpp:218 ui/evasyssettinguibase.cpp:1114
+-msgid "TianJing"
++msgid "Tianjin"
+ msgstr "天津"
+
+ #: ui/evasearchwindow.cpp:219 ui/evasyssettinguibase.cpp:1115
+-msgid "ChongQing"
++msgid "Chongqing"
+ msgstr "重慶"
+
+ #: ui/evasearchwindow.cpp:220 ui/evasyssettinguibase.cpp:1116
+-msgid "HeBei"
++msgid "Hebei"
+ msgstr "河北"
+
+ #: ui/evasearchwindow.cpp:221 ui/evasyssettinguibase.cpp:1117
+-msgid "ShanXi"
++msgid "Shanxi"
+ msgstr "山西"
+
+ #: ui/evasearchwindow.cpp:222 ui/evasyssettinguibase.cpp:1118
+-msgid "NeiMengGu"
++msgid "Neimenggu"
+ msgstr "內蒙古"
+
+ #: ui/evasearchwindow.cpp:223 ui/evasyssettinguibase.cpp:1119
+-msgid "LiaoNing"
++msgid "Liaoning"
+ msgstr "遼寧"
+
+ #: ui/evasearchwindow.cpp:224 ui/evasyssettinguibase.cpp:1120
+-msgid "JiLin"
++msgid "Jilin"
+ msgstr "吉林"
+
+ #: ui/evasearchwindow.cpp:225 ui/evasyssettinguibase.cpp:1121
+-msgid "HeiLongJiang"
++msgid "Heilongjiang"
+ msgstr "黑龍江"
+
+ #: ui/evasearchwindow.cpp:226 ui/evasyssettinguibase.cpp:1122
+-msgid "JiangSu"
++msgid "Jiangsu"
+ msgstr "江蘇"
+
+ #: ui/evasearchwindow.cpp:227 ui/evasyssettinguibase.cpp:1123
+-msgid "ZheJiang"
++msgid "Zhejiang"
+ msgstr "浙江"
+
+ #: ui/evasearchwindow.cpp:228 ui/evasyssettinguibase.cpp:1124
+-msgid "AnHui"
++msgid "Anhui"
+ msgstr "安徽"
+
+ #: ui/evasearchwindow.cpp:229 ui/evasyssettinguibase.cpp:1125
+-msgid "FuJian"
++msgid "Fujian"
+ msgstr "福建"
+
+ #: ui/evasearchwindow.cpp:230 ui/evasyssettinguibase.cpp:1126
+-msgid "JiangXi"
++msgid "Jiangxi"
+ msgstr "江西"
+
+ #: ui/evasearchwindow.cpp:231 ui/evasyssettinguibase.cpp:1127
+-msgid "ShanDong"
++msgid "Shandong"
+ msgstr "山東"
+
+ #: ui/evasearchwindow.cpp:232 ui/evasyssettinguibase.cpp:1128
+-msgid "HeNan"
++msgid "Henan"
+ msgstr "河南"
+
+ #: ui/evasearchwindow.cpp:233 ui/evasyssettinguibase.cpp:1129
+-msgid "HuBei"
++msgid "Hubei"
+ msgstr "湖北"
+
+ #: ui/evasearchwindow.cpp:234 ui/evasyssettinguibase.cpp:1130
+-msgid "HuNan"
++msgid "Hunan"
+ msgstr "湖南"
+
+ #: ui/evasearchwindow.cpp:235 ui/evasyssettinguibase.cpp:1131
+-msgid "GuangDong"
++msgid "Guangdong"
+ msgstr "廣東"
+
+ #: ui/evasearchwindow.cpp:236 ui/evasyssettinguibase.cpp:1132
+-msgid "GuangXi"
++msgid "Guangxi"
+ msgstr "廣西"
+
+ #: ui/evasearchwindow.cpp:237 ui/evasyssettinguibase.cpp:1133
+-msgid "HaiNan"
++msgid "Hainan"
+ msgstr "海南"
+
+ #: ui/evasearchwindow.cpp:238 ui/evasyssettinguibase.cpp:1134
+-msgid "SiChuan"
++msgid "Sichuan"
+ msgstr "四川"
+
+ #: ui/evasearchwindow.cpp:239 ui/evasyssettinguibase.cpp:1135
+-msgid "GuiZhou"
++msgid "Guizhou"
+ msgstr "貴州"
+
+ #: ui/evasearchwindow.cpp:240 ui/evasyssettinguibase.cpp:1136
+-msgid "YunNan"
++msgid "Yunnan"
+ msgstr "雲南"
+
+ #: ui/evasearchwindow.cpp:241 ui/evasyssettinguibase.cpp:1137
+-#, fuzzy
+-msgid "XiZang"
++msgid "Xizang"
+ msgstr "西藏"
+
+ #: ui/evasearchwindow.cpp:242 ui/evasyssettinguibase.cpp:1138
+-msgid "ShaanXi"
++msgid "Shaanxi"
+ msgstr "陝西"
+
+ #: ui/evasearchwindow.cpp:243 ui/evasyssettinguibase.cpp:1139
+-msgid "GanSu"
++msgid "Gansu"
+ msgstr "甘肅"
+
+ #: ui/evasearchwindow.cpp:244 ui/evasyssettinguibase.cpp:1140
+-msgid "NingXia"
++msgid "Ningxia"
+ msgstr "寧夏"
+
+ #: ui/evasearchwindow.cpp:245 ui/evasyssettinguibase.cpp:1141
+-msgid "QingHai"
++msgid "Qinghai"
+ msgstr "青海"
+
+ #: ui/evasearchwindow.cpp:246 ui/evasyssettinguibase.cpp:1142
+-msgid "XinJiang"
++msgid "Xinjiang"
+ msgstr "新疆"
+
+ #: ui/evasearchwindow.cpp:247 ui/evasyssettinguibase.cpp:1143
+@@ -2439,12 +2460,11 @@
+ msgstr "澳門"
+
+ #: ui/evasearchwindow.cpp:249 ui/evasyssettinguibase.cpp:1145
+-msgid "TaiWan"
++msgid "Taiwan"
+ msgstr "台灣"
+
+ #: ui/evasearchwindow.cpp:375 ui/evasearchwindow.cpp:400
+ #: ui/evasearchwindow.cpp:711 ui/evasearchwindow.cpp:856
+-#, fuzzy
+ msgid "Please select a user."
+ msgstr "請選擇一個使用者。"
+
+@@ -2457,7 +2477,6 @@
+ msgstr "Eva - 搜尋/加入"
+
+ #: ui/evasearchwindow.cpp:441 ui/evasearchwindow.cpp:1053
+-#, fuzzy
+ msgid "Please select a Qun."
+ msgstr "請選擇一個群。"
+
+@@ -2506,7 +2525,6 @@
+ msgstr "群號碼不能為空。"
+
+ #: ui/evasearchwindow.cpp:926
+-#, fuzzy
+ msgid "Qun Num is incorrect."
+ msgstr "群號碼不正確。"
+
+@@ -2523,7 +2541,6 @@
+ msgstr "Eva 已為您找到這些群。"
+
+ #: ui/evasysbroadcastuibase.cpp:113
+-#, fuzzy
+ msgid "System message"
+ msgstr "系統訊息"
+
+@@ -2670,15 +2687,15 @@
+ msgstr "年齡:"
+
+ #: ui/evasyssettinguibase.cpp:1041
+-msgid "Zodiac:"
++msgid "Chinese Zodiac:"
+ msgstr "生肖:"
+
+ #: ui/evasyssettinguibase.cpp:1042
+-msgid "Horoscape:"
++msgid "Horoscope:"
+ msgstr "星座:"
+
+ #: ui/evasyssettinguibase.cpp:1043
+-msgid "Blood:"
++msgid "Blood Type:"
+ msgstr "血型:"
+
+ #: ui/evasyssettinguibase.cpp:1087 ui/evauseruibase.cpp:282
+@@ -2706,7 +2723,7 @@
+ msgstr "私人連絡方式"
+
+ #: ui/evasyssettinguibase.cpp:1094
+-msgid "following availible to"
++msgid "Following available to"
+ msgstr "以下資料"
+
+ #: ui/evasyssettinguibase.cpp:1095
+@@ -2754,11 +2771,11 @@
+ msgstr "省份:"
+
+ #: ui/evasyssettinguibase.cpp:1146 ui/evauseruibase.cpp:296
+-msgid "Zip Code:"
++msgid "Postal Code:"
+ msgstr "郵政編碼:"
+
+ #: ui/evasyssettinguibase.cpp:1147
+-msgid "Area:"
++msgid "Region:"
+ msgstr "國家:"
+
+ #: ui/evasyssettinguibase.cpp:1148
+@@ -2830,51 +2847,51 @@
+ msgstr "一般"
+
+ #: ui/evasyssettinguibase.cpp:1168
+-msgid "display buddy online tip"
++msgid "Display buddy online tip"
+ msgstr "顯示好友上線提示"
+
+ #: ui/evasyssettinguibase.cpp:1169
+-msgid "display online users only"
+-msgstr "只顯示在線好友"
++msgid "Display online users only"
++msgstr "只顯示上線好友"
+
+ #: ui/evasyssettinguibase.cpp:1170
+-msgid "sound enabled"
++msgid "Sound enabled"
+ msgstr "啟用聲音提示"
+
+ #: ui/evasyssettinguibase.cpp:1171
+-msgid "show smiley icon in buddy list"
++msgid "Show smiley icon in buddy list"
+ msgstr "顯示暱稱中的表情圖示"
+
+ #: ui/evasyssettinguibase.cpp:1172
+-msgid "show QQ News"
++msgid "Show QQ News"
+ msgstr "顯示 QQ 新聞"
+
+ #: ui/evasyssettinguibase.cpp:1173
+-msgid "display message tip"
++msgid "Display message tip"
+ msgstr "顯示訊息提示"
+
+ #: ui/evasyssettinguibase.cpp:1174
+-msgid "display system ad. tip"
++msgid "Display system ad. tip"
+ msgstr "顯示系統廣告提示"
+
+ #: ui/evasyssettinguibase.cpp:1175
+-msgid "change send key to \"Enter\""
++msgid "Change send key to \"Enter\""
+ msgstr "更改傳送鍵為「Enter」"
+
+ #: ui/evasyssettinguibase.cpp:1176
+-msgid "display buddy signature in seperate line"
++msgid "Display buddy signature in separate line"
+ msgstr "分行顯示個性簽名"
+
+ #: ui/evasyssettinguibase.cpp:1178
+-msgid "message page size:"
++msgid "Message page size:"
+ msgstr "訊息瀏覽頁大小:"
+
+ #: ui/evasyssettinguibase.cpp:1179
+-msgid "pieces"
+-msgstr "件"
++msgid "entries"
++msgstr "筆"
+
+ #: ui/evasyssettinguibase.cpp:1180
+-msgid "change status to away after:"
++msgid "Change status to away after:"
+ msgstr "更改狀態為離開,如果空閒超過:"
+
+ #: ui/evasyssettinguibase.cpp:1181
+@@ -2882,7 +2899,7 @@
+ msgstr "分鍾"
+
+ #: ui/evasyssettinguibase.cpp:1182
+-msgid "face size:"
++msgid "Face size:"
+ msgstr "頭像大小:"
+
+ #: ui/evasyssettinguibase.cpp:1183
+@@ -2902,7 +2919,7 @@
+ msgstr "路徑"
+
+ #: ui/evasyssettinguibase.cpp:1188
+-msgid "theme path:"
++msgid "Theme path:"
+ msgstr "主題路徑:"
+
+ #: ui/evasyssettinguibase.cpp:1189 ui/evasyssettinguibase.cpp:1191
+@@ -2910,7 +2927,7 @@
+ msgstr "瀏覽"
+
+ #: ui/evasyssettinguibase.cpp:1190
+-msgid "sound path:"
++msgid "Sound path:"
+ msgstr "聲音路徑:"
+
+ #: ui/evasyssettinguibase.cpp:1192
+@@ -2926,7 +2943,7 @@
+ msgstr "自動回覆(50 字以內):"
+
+ #: ui/evasyssettinguibase.cpp:1196
+-msgid "reply automatically when leave"
++msgid "Reply automatically when away"
+ msgstr "離開狀態時自動回覆"
+
+ #: ui/evasyssettingwindow.cpp:407
+@@ -2983,7 +3000,8 @@
+ msgid "Enjoy Eva, Enjoy Open Source!"
+ msgstr "享受 Eva,享受開源!"
+
+-#: ui/evauseruibase.cpp:291
++#: ui/evauseruibase.cpp:291 ui/mainlistfontsettinguibase.cpp:330
++#: ui/mainlistfontsettinguibase.cpp:340
+ msgid "Name:"
+ msgstr "名稱:"
+
+@@ -3089,17 +3107,13 @@
+ msgid "signature color:"
+ msgstr "個性簽名色彩:"
+
+-#: ui/mainlistfontsettinguibase.cpp:330 ui/mainlistfontsettinguibase.cpp:340
+-msgid "name:"
+-msgstr "名稱:"
+-
+ #: ui/mainlistfontsettinguibase.cpp:331 ui/mainlistfontsettinguibase.cpp:341
+ msgid "name color:"
+ msgstr "名稱色彩:"
+
+ #: ui/mainlistfontsettinguibase.cpp:350
+-msgid "online counting:"
+-msgstr "在線統計:"
++msgid "Online statistics:"
++msgstr "上線統計:"
+
+ #: ui/quncategoryui.cpp:94
+ msgid "Select Qun Category"
+@@ -3122,12 +3136,12 @@
+ msgstr "分類"
+
+ #: ui/quncreateui.cpp:220
+-msgid "select a category"
++msgid "Select a category"
+ msgstr "選擇一個分類"
+
+ #: ui/quncreateui.cpp:221 ui/qundetailsui.cpp:349
+-msgid "Qun Notice ( member only)"
+-msgstr "群公告(僅成員可見)"
++msgid "Qun Notice (member only)"
++msgstr "群公告 (僅成員可見)"
+
+ #: ui/quncreateui.cpp:224 ui/qundetailsui.cpp:352
+ msgid "No authentication needed."
+@@ -3302,36 +3316,75 @@
+ msgstr "群訊息設定已經更新。"
+
+ #: api/evausersetting.cpp:871 api/evausersetting.cpp:1115
+-msgid "sorry, I am working."
++msgid "Sorry, I am working."
+ msgstr "很抱歉,我正在工作。"
+
+ #: api/evausersetting.cpp:872 api/evausersetting.cpp:1116
+-msgid "having dinner now./fa"
++msgid "Having dinner now./fa"
+ msgstr "吃飯去了。/fa"
+
+ #: api/evausersetting.cpp:873 api/evausersetting.cpp:1117
+-msgid "I am not available now, sorry"
+-msgstr "有事不在,不好意思"
++msgid "I am not available now, sorry."
++msgstr "有事不在,不好意思。"
+
+ #: api/evausersetting.cpp:882 api/evausersetting.cpp:1121
+-msgid "oh."
++msgid "Oh."
+ msgstr "哦。"
+
+ #: api/evausersetting.cpp:883 api/evausersetting.cpp:1122
+-msgid "ok, ok, I got u."
++msgid "OK, OK, I got you."
+ msgstr "好了,好了,知道了"
+
+ #: api/evausersetting.cpp:884 api/evausersetting.cpp:1123
+-msgid "/jy ,really?"
++msgid "/jy , really?"
+ msgstr "/jy , 真的嗎?"
+
+ #: api/regiongrabber.cpp:47
+ msgid "Press mouse left button<br>to grab screenshot."
+-msgstr "按下滑鼠左鍵取得<br>螢幕截圖。"
++msgstr "按下滑鼠左鍵取得<br>畫面快照。"
+
+ #: api/regiongrabber.cpp:47
+-msgid "Size(W x H):"
+-msgstr "尺寸(寬x高):"
++msgid "Size (W x H):"
++msgstr "尺寸 (寬 x 高):"
++
++#~ msgid "select an quick-reply message"
++#~ msgstr "選擇快速回覆訊息"
++
++#~ msgid "view/hide IM history(Alt+H)"
++#~ msgstr "檢視聊天記錄(Alt+H)"
++
++#~ msgid "close this window(Alt+X)"
++#~ msgstr "關閉這個視窗(Alt+X)"
++
++#~ msgid "send message"
++#~ msgstr "傳送訊息"
++
++#~ msgid "change send key"
++#~ msgstr "變更傳送鍵"
++
++#~ msgid "Verify Code:"
++#~ msgstr "驗證碼:"
++
++#~ msgid "view IM history(Alt+H)"
++#~ msgstr "檢視聊天記錄(Alt+H)"
++
++#~ msgid "oversea"
++#~ msgstr "海外"
++
++#~ msgid "Zip Code:"
++#~ msgstr "郵政編碼:"
++
++#~ msgid "Area:"
++#~ msgstr "國家:"
++
++#~ msgid "pieces"
++#~ msgstr "件"
++
++#~ msgid "name:"
++#~ msgstr "名稱:"
++
++#~ msgid "online counting:"
++#~ msgstr "在線統計:"
+
+ #~ msgid "Quit"
+ #~ msgstr "退出"
+@@ -3543,7 +3596,7 @@
+ #~ msgstr "正在加入好友,請稍候…"
+
+ #~ msgid "sending Joining request, please wait..."
+-#~ msgstr "正在傳送加入請求, 請稍等……"
++#~ msgstr "正在傳送加入請求,請稍等……"
+
+ #~ msgid "All %1 pages are displayed"
+ #~ msgstr "顯示所有%1頁"
+diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/api/evausersetting.cpp eva-0.4.921+svn42.new/src/api/evausersetting.cpp
+--- eva-0.4.921+svn42/src/api/evausersetting.cpp 2008-04-25 16:09:34.000000000 +0800
++++ eva-0.4.921+svn42.new/src/api/evausersetting.cpp 2008-05-06 02:26:29.000000000 +0800
+@@ -868,9 +868,9 @@
+ for(QStringList::Iterator iter = strList.begin(); iter != strList.end(); ++iter)
+ autoList.push_back(*iter);
+ } else {
+- autoList.push_back(QString(i18n("sorry, I am working.")));
+- autoList.push_back(QString(i18n("having dinner now./fa")));
+- autoList.push_back(QString(i18n("I am not available now, sorry")));
++ autoList.push_back(QString(i18n("Sorry, I am working.")));
++ autoList.push_back(QString(i18n("Having dinner now./fa")));
++ autoList.push_back(QString(i18n("I am not available now, sorry.")));
+ }
+
+ strList.clear();
+@@ -879,9 +879,9 @@
+ for(QStringList::Iterator iter = strList.begin(); iter != strList.end(); ++iter)
+ quickList.push_back(*iter);
+ } else {
+- quickList.push_back(QString(i18n("oh.")));
+- quickList.push_back(QString(i18n("ok, ok, I got u.")));
+- quickList.push_back(QString(i18n("/jy ,really?")));
++ quickList.push_back(QString(i18n("Oh.")));
++ quickList.push_back(QString(i18n("OK, OK, I got you.")));
++ quickList.push_back(QString(i18n("/jy , really?")));
+ }
+ delete groupSaver;
+
+@@ -1112,15 +1112,15 @@
+ m_ShowSignatureInSeperateLine = false;
+
+ if(!autoList.size()){
+- autoList.push_back(QString(i18n("sorry, I am working.")));
+- autoList.push_back(QString(i18n("having dinner now./fa")));
+- autoList.push_back(QString(i18n("I am not available now, sorry")));
++ autoList.push_back(QString(i18n("Sorry, I am working.")));
++ autoList.push_back(QString(i18n("Having dinner now./fa")));
++ autoList.push_back(QString(i18n("I am not available now, sorry.")));
+ }
+
+ if(!quickList.size()){
+- quickList.push_back(QString(i18n("oh.")));
+- quickList.push_back(QString(i18n("ok, ok, I got u.")));
+- quickList.push_back(QString(i18n("/jy ,really?")));
++ quickList.push_back(QString(i18n("Oh.")));
++ quickList.push_back(QString(i18n("OK, OK, I got you.")));
++ quickList.push_back(QString(i18n("/jy , really?")));
+ }
+ }
+
+diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/api/regiongrabber.cpp eva-0.4.921+svn42.new/src/api/regiongrabber.cpp
+--- eva-0.4.921+svn42/src/api/regiongrabber.cpp 2008-04-25 16:09:34.000000000 +0800
++++ eva-0.4.921+svn42.new/src/api/regiongrabber.cpp 2008-05-06 02:30:59.000000000 +0800
+@@ -44,7 +44,7 @@
+
+ void SizeTip::setTip( const QRect &rect )
+ {
+- QString des = "<font color=red>" + i18n("Press mouse left button<br>to grab screenshot.") + "</font><p>" + i18n("Size(W x H):");
++ QString des = "<font color=red>" + i18n("Press mouse left button<br>to grab screenshot.") + "</font><p>" + i18n("Size (W x H):");
+ QString tip = "<qt>" + des + QString("<b><font color=yellow>%1</font></b> x <b><font color=yellow>%2</font></b>").arg( rect.width() )
+ .arg( rect.height() ) + "</qt>";
+
+diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/evaaddingmanager.cpp eva-0.4.921+svn42.new/src/evaaddingmanager.cpp
+--- eva-0.4.921+svn42/src/evaaddingmanager.cpp 2008-04-25 16:09:35.000000000 +0800
++++ eva-0.4.921+svn42.new/src/evaaddingmanager.cpp 2008-05-05 23:46:01.000000000 +0800
+@@ -183,7 +183,7 @@
+ void EvaAddingManager::slotAddBuddyExReply( const unsigned int id, const unsigned char reply, const unsigned char auth )
+ {
+ if(id != m_ID) {
+- KMessageBox::information(0, QString(i18n("You are adding %1, cannot processing %2 request.")).arg(m_ID).arg(id),
++ KMessageBox::information(0, QString(i18n("You are adding %1, cannot process %2 request.")).arg(m_ID).arg(id),
+ i18n("Eva Search/Add Friend"));
+ return;
+ }
+@@ -248,7 +248,7 @@
+ if(cmd == AUTH_INFO_CMD_CODE){
+ printf(" auth info cmd code reply\n");
+ if(reply == 0x01){
+- KMessageBox::information(0, QString(i18n("Incorrect verify code, try again please!")),
++ KMessageBox::information(0, QString(i18n("Incorrect verification code, try again please!")),
+ i18n("Eva Search/Add Friend"));
+ m_AddingDialog->leCode->setFocus();
+ return;
+@@ -281,7 +281,7 @@
+ }
+ break;
+ default:
+- KMessageBox::information(0, QString(i18n("Unkown auth reply type(%1), adding failed.")).arg(reply),
++ KMessageBox::information(0, QString(i18n("Unknown auth reply type (%1), adding failed.")).arg(reply),
+ i18n("Eva Search/Add Friend"));
+ addingFinished();
+ return;
+diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/main.cpp eva-0.4.921+svn42.new/src/main.cpp
+--- eva-0.4.921+svn42/src/main.cpp 2008-04-25 16:09:35.000000000 +0800
++++ eva-0.4.921+svn42.new/src/main.cpp 2008-05-06 01:28:11.000000000 +0800
+@@ -42,7 +42,7 @@
+ { "p", 0, 0},
+ { "passwd <password>", I18N_NOOP("Password for your QQ number."), 0},
+ { "m", 0, 0},
+- { "mode <mode>", I18N_NOOP("Connection mode ( one of UDP, TCP or HTTP_PROXY), defaulting to UDP"), "UDP"},
++ { "mode <mode>", I18N_NOOP("Connection mode (one of UDP, TCP or HTTP_PROXY), defaulting to UDP"), "UDP"},
+ { "pip <IP address>", I18N_NOOP("Proxy server IP address."), 0},
+ { "pport <proxy port>", I18N_NOOP("Proxy server port number"), 0},
+ { "pu <proxy username>", I18N_NOOP("Proxy user name if required."), 0},
+@@ -70,15 +70,15 @@
+
+ about.addCredit( I18N_NOOP("byakko"), I18N_NOOP("UI patch provider"), "byakko.ang at gmail.com");
+ about.addCredit( I18N_NOOP("caihua"), I18N_NOOP("icon designer"), "13307864987 at gx165.com");
+- about.addCredit( I18N_NOOP("fundawang"), I18N_NOOP("patch for xdg-user-dir supported"), "fundawang at yeah.net");
++ about.addCredit( I18N_NOOP("Funda Wang"), I18N_NOOP("patch for xdg-user-dir supported"), "fundawang at yeah.net");
+ about.addCredit( I18N_NOOP("Levin Du"),
+ I18N_NOOP("patch for system setting \nfixed combo box index massing up after \nclicking \"Default\" several times."),
+ "zsdjw at 21cn.com");
+ about.addCredit( I18N_NOOP("Minmin"), I18N_NOOP("encapsulating encryption class in C++"), "csdengxm at hotmail.com");
+ about.addCredit( I18N_NOOP("nwillis"), I18N_NOOP("idle detecting(auto-away) feature"), "neowillis at gmail.com");
+ about.addCredit( I18N_NOOP("Phytonix"), I18N_NOOP("some original faces & Eva Logo designer."), "yahzee at d3eye.com");
+- about.addCredit( I18N_NOOP("Shixin Zeng"), I18N_NOOP("libeva patch for Windows supporting."), "shixinzeng at gmail.com");
+- about.addCredit( I18N_NOOP("starkwong"), I18N_NOOP("libeva patch for Visual Studio .Net 2002/2003 compiling supporting. 2007II new smiley code"), "starkwong at hotmail.com");
++ about.addCredit( I18N_NOOP("Shixin Zeng"), I18N_NOOP("libeva patch for Windows support."), "shixinzeng at gmail.com");
++ about.addCredit( I18N_NOOP("Stark Wong"), I18N_NOOP("libeva patch for Visual Studio .NET 2002/2003 compiling support.\n2007II new smiley code"), "starkwong at hotmail.com");
+ about.addCredit( I18N_NOOP("zsyddl"), I18N_NOOP("earlier user details window designer"), "morrowren at sina.com" );
+ about.addCredit( I18N_NOOP("swear"), I18N_NOOP("forum maintainer"), "inzaghi1230 at hotmail.com");
+
+diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/createsmileyui.cpp eva-0.4.921+svn42.new/src/ui/createsmileyui.cpp
+--- eva-0.4.921+svn42/src/ui/createsmileyui.cpp 2008-04-25 16:09:34.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/createsmileyui.cpp 2008-05-06 01:47:22.000000000 +0800
+@@ -133,7 +133,7 @@
+ lblTop->setText( i18n("<b>Please follow the steps below to create your smiley.</b><br>\n"
+ "<b>You could select one or more files at a time.</b>" ) );
+ lblStep1->setText( i18n("1. Select files from your computer.<br>\n"
+-" <font color=\"#0066cc\">( 150 pixels x 150 pixels or smaller size for better quality. )</font>" ) );
++" <font color=\"#0066cc\">(150 pixels x 150 pixels or smaller size for better quality. )</font>" ) );
+ lblSelect->setText( QString::null );
+ btnSelect->setText( i18n("Select Images ..." ) );
+ lblStep2->setText( i18n("2. Input the shortcut key for the smiley. Max length is 6 chars.<br>\n"
+diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/evaadduibase.cpp eva-0.4.921+svn42.new/src/ui/evaadduibase.cpp
+--- eva-0.4.921+svn42/src/ui/evaadduibase.cpp 2008-04-25 16:09:34.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/evaadduibase.cpp 2008-05-06 01:09:20.000000000 +0800
+@@ -172,7 +172,7 @@
+ //lblTopic->setText( i18n( "-" ) );
+ //tbtnFace->setText( i18n( "..." ) );
+ lblGroup->setText( i18n( "Select Group:" ) );
+- lblVeriCode->setText( i18n( "Verify Code:" ) );
++ lblVeriCode->setText( i18n( "Verification Code:" ) );
+ lblQuestion->setText( i18n( "Personal Question:" ) );
+ lblAnswer->setText( i18n( "Your Answer:" ) );
+ //lblCodeGraphic->setText( i18n( "-" ) );
+diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/evachatuibase.cpp eva-0.4.921+svn42.new/src/ui/evachatuibase.cpp
+--- eva-0.4.921+svn42/src/ui/evachatuibase.cpp 2008-04-25 16:09:34.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/evachatuibase.cpp 2008-05-06 02:42:17.000000000 +0800
+@@ -327,32 +327,32 @@
+ tbAddImage->setText("...");
+ tbAddImage->setAccel( QKeySequence( tr( "Alt+A" ) ) );
+ tbAddImage->setText( i18n( "..." ) );
+- QToolTip::add( tbAddImage, i18n( "send image files" ) );
++ QToolTip::add( tbAddImage, i18n( "Send image files" ) );
+ tbScreenShot->setText(i18n("..."));
+ tbScreenShot->setAccel( QKeySequence( tr( "Alt+T" ) ) );
+- QToolTip::add( tbScreenShot, i18n( "add a screen shot" ) );
++ QToolTip::add( tbScreenShot, i18n( "Add a screenshot" ) );
+ tbQuickReply->setAccel( QKeySequence( tr( "Alt+R" ) ) );
+- QToolTip::add( tbQuickReply, i18n( "select an quick-reply message" ) );
++ QToolTip::add( tbQuickReply, i18n( "Select an quick-reply message" ) );
+
+- QToolTip::add(tbEnableSound, i18n("toggle sound notification") );
++ QToolTip::add(tbEnableSound, i18n("Toggle sound notification") );
+
+
+ tbHideShows->setText( i18n( "..." ) );
+ tbHideShows->setAccel( QKeySequence( tr( "Alt+P" ) ) );
+- QToolTip::add( tbHideShows, i18n( "hide/display QQ show panel" ) );
++ QToolTip::add( tbHideShows, i18n( "Hide/Display QQ Show panel" ) );
+
+ pbHistory->setText( i18n( "&History" ) );
+ pbHistory->setAccel( QKeySequence( tr( "Alt+H" ) ) );
+- QToolTip::add( pbHistory, i18n( "view/hide IM history(Alt+H)" ) );
++ QToolTip::add( pbHistory, i18n( "View/Hide IM history (Alt+H)" ) );
+ pbClose->setText( i18n( "Close" ) );
+ pbClose->setAccel( QKeySequence( tr( "Alt+X" ) ) );
+- QToolTip::add( pbClose, i18n( "close this window(Alt+X)" ) );
++ QToolTip::add( pbClose, i18n( "Close this window (Alt+X)" ) );
+ pbSend->setText( i18n( "&Send" ) );
+ pbSend->setAccel( QKeySequence( tr( "Alt+S" ) ) );
+- QToolTip::add( pbSend, i18n( "send message" ) );
++ QToolTip::add( pbSend, i18n( "Send message" ) );
+ pbSendKey->setText( QString::null );
+ pbSendKey->setAccel( QKeySequence( QString::null ) );
+- QToolTip::add( pbSendKey, i18n( "change send key" ) );
++ QToolTip::add( pbSendKey, i18n( "Change send key" ) );
+ lblBuddyShow->setText( i18n( "Buddy" ) );
+ tbShowBuddy->setText( i18n( "..." ) );
+ QToolTip::add( tbShowBuddy, i18n( "Click to update" ) );
+diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/evachatwindow.cpp eva-0.4.921+svn42.new/src/ui/evachatwindow.cpp
+--- eva-0.4.921+svn42/src/ui/evachatwindow.cpp 2008-04-25 16:09:34.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/evachatwindow.cpp 2008-05-06 03:11:12.000000000 +0800
+@@ -693,7 +693,7 @@
+
+ void EvaChatWindow::slotFileTransferAcceptClicked( const unsigned int showSession)
+ {
+- QString msg = i18n("You have accepted transfering \"%1\", network connecting start, please wait...").arg(getFileName(getSession(showSession)));
++ QString msg = i18n("You have accepted transferring \"%1\", network connecting start, please wait...").arg(getFileName(getSession(showSession)));
+ chatDisplay->showInfomation(msg);
+ emit fileTransferAccept(buddy->getQQ(), getSession(showSession), "", QQ_TRANSFER_FILE);
+ }
+@@ -709,7 +709,7 @@
+ QString dir = fullname.left(fullname.findRev("/"));
+ //QFileInfo info(fullname);
+ if(!dir.isEmpty()){
+- QString msg = i18n("You have accepted transfering \"%1\", network connecting start, please wait...").arg(getFileName(getSession(showSession)));
++ QString msg = i18n("You have accepted transferring \"%1\", network connecting start, please wait...").arg(getFileName(getSession(showSession)));
+ chatDisplay->showInfomation(msg);
+ emit fileTransferAccept(buddy->getQQ(), session, dir, QQ_TRANSFER_FILE);
+ }
+@@ -718,7 +718,7 @@
+ void EvaChatWindow::slotFileTransferCancelClicked( const unsigned int showSession)
+ {
+ printf("EvaChatWindow::slotFileTransferCancelClicked -- \n");
+- QString msg = i18n("You have cancelled transfering \"%1\".").arg(getFileName(getSession(showSession)));
++ QString msg = i18n("You have cancelled transferring \"%1\".").arg(getFileName(getSession(showSession)));
+ chatDisplay->showInfomation(msg);
+ emit fileTransferCancel(buddy->getQQ(), getSession(showSession));
+ removeFromFileList(getSession(showSession));
+@@ -737,8 +737,8 @@
+ return;
+
+ QString name = codec->toUnicode(buddy->getNick().c_str());
+- QString action = isAccepted?i18n("accepted"):i18n("stoped");
+- QString msg = i18n("%1 has %2 transfering \"%3\".").arg(name).arg(action).arg(filename);
++ QString action = isAccepted ? i18n("accepted") : i18n("stopped");
++ QString msg = i18n("%1 has %2 transferring \"%3\".").arg(name).arg(action).arg(filename);
+ chatDisplay->showInfomation(msg);
+ }
+
+@@ -789,7 +789,7 @@
+ case ESNone:
+ break;
+ case ESError:{
+- QString msg = i18n("network lost connection or your friend has stoped transfering \"%1\".").arg(filename);
++ QString msg = i18n("network lost connection or your friend has stopped transferring \"%1\".").arg(filename);
+ switch(transferType){
+ case QQ_TRANSFER_FILE:{
+ if(getFileName(session).isEmpty()) break;
+@@ -886,8 +886,8 @@
+ void EvaChatWindow::closeEvent( QCloseEvent * e )
+ {
+ if(m_FileList.size() && m_NumImages && KMessageBox::questionYesNo(this,
+- i18n("File transfer is still in process( %1 file(s) left ). Closing this window"
+- " will also stop those transfer processes."
++ i18n("File transfer is still in process (%1 file(s) left). Closing this window "
++ "will also stop those transfer processes. "
+ "Do you want to close this window?").arg(m_FileList.size()),
+ i18n("Close Window?")) == KMessageBox::No){
+ e->ignore();
+diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/evaqunchatuibase.cpp eva-0.4.921+svn42.new/src/ui/evaqunchatuibase.cpp
+--- eva-0.4.921+svn42/src/ui/evaqunchatuibase.cpp 2008-04-25 16:09:34.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/evaqunchatuibase.cpp 2008-05-06 02:16:43.000000000 +0800
+@@ -288,41 +288,41 @@
+ setCaption( i18n( "Qun" ) );
+ tbQunDetails->setText( i18n( "..." ) );
+ tbSmiley->setText( i18n( "..." ) );
+- QToolTip::add( tbSmiley, i18n( "add a smiley icon" ) );
++ QToolTip::add( tbSmiley, i18n( "Add a smiley icon" ) );
+ tbFont->setText( i18n( "..." ) );
+- QToolTip::add( tbFont, i18n( "choose font size and color" ) );
++ QToolTip::add( tbFont, i18n( "Choose font size and color" ) );
+ tbB->setText( i18n( "..." ) );
+ tbB->setAccel( QKeySequence( tr( "Alt+B" ) ) );
+- QToolTip::add( tbB, i18n( "bold" ) );
++ QToolTip::add( tbB, i18n( "Bold" ) );
+ tbU->setText( i18n( "..." ) );
+ tbU->setAccel( QKeySequence( tr( "Alt+U" ) ) );
+- QToolTip::add( tbU, i18n( "underline" ) );
++ QToolTip::add( tbU, i18n( "Underline" ) );
+ tbI->setText( i18n( "..." ) );
+ tbI->setAccel( QKeySequence( tr( "Alt+I" ) ) );
+- QToolTip::add( tbI, i18n( "italic" ) );
++ QToolTip::add( tbI, i18n( "Italic" ) );
+ tbImageFile->setText(i18n("..."));
+ tbImageFile->setAccel( QKeySequence( tr( "Alt+A" ) ) );
+- QToolTip::add( tbImageFile, i18n( "add a custom smiley (file size less than 50K)" ) );
++ QToolTip::add( tbImageFile, i18n( "Add a custom smiley (file size less than 50KB)" ) );
+ tbScreenShot->setText(i18n("..."));
+ tbScreenShot->setAccel( QKeySequence( tr( "Alt+T" ) ) );
+- QToolTip::add( tbScreenShot, i18n( "add a screen shot ( less than 700 X 600 )" ) );
++ QToolTip::add( tbScreenShot, i18n( "Add a screenshot (smaller than 700 x 600)" ) );
+ tbQuickReply->setText( i18n( "..." ) );
+ tbQuickReply->setAccel( QKeySequence( tr( "Alt+R" ) ) );
+- QToolTip::add( tbQuickReply, i18n( "select an quick-reply message" ) );
+- QToolTip::add( tbEnableSound, i18n( "toggle sound notification" ) );
++ QToolTip::add( tbQuickReply, i18n( "Select a quick-reply message" ) );
++ QToolTip::add( tbEnableSound, i18n( "Toggle sound notification" ) );
+ pbHistory->setText( i18n( "History" ) );
+ pbHistory->setAccel( QKeySequence( tr( "Alt+H" ) ) );
+- QToolTip::add( pbHistory, i18n( "view/hide Qun history(Alt+H)" ) );
++ QToolTip::add( pbHistory, i18n( "View/Hide Qun history (Alt+H)" ) );
+ pbClose->setText( i18n( "Close" ) );
+ pbClose->setAccel( QKeySequence( tr( "Alt+X" ) ) );
+- QToolTip::add( pbClose, i18n( "close this window(Alt+X)" ) );
++ QToolTip::add( pbClose, i18n( "Close this window (Alt+X)" ) );
+ pbSend->setText( i18n( "&Send" ) );
+ pbSend->setAccel( QKeySequence( i18n( "Alt+S" ) ) );
+- QToolTip::add( pbSend, i18n( "send message" ) );
++ QToolTip::add( pbSend, i18n( "Send message" ) );
+ pbSendKey->setText( QString::null );
+- QToolTip::add( pbSendKey, i18n( "change send key" ) );
++ QToolTip::add( pbSendKey, i18n( "Change send key" ) );
+ tbtnNotice->setTextLabel( i18n( "Notice" ) );
+- QToolTip::add( tbtnNotice, i18n( "Click to open/close qun notice" ) );
++ QToolTip::add( tbtnNotice, i18n( "Click to open/close Qun notice" ) );
+ //kslblNotice->setText( i18n( "Notice Here" ) );
+ lblMembers->setText( i18n( "Members" ) );
+ //listView1->header()->setLabel( 0, i18n( "Column 1" ) );
+diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/evasearchwindow.cpp eva-0.4.921+svn42.new/src/ui/evasearchwindow.cpp
+--- eva-0.4.921+svn42/src/ui/evasearchwindow.cpp 2008-04-25 16:09:34.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/evasearchwindow.cpp 2008-05-06 02:19:01.000000000 +0800
+@@ -212,41 +212,41 @@
+
+
+ cbASProvince->insertItem(i18n("any"));
+- cbASProvince->insertItem(i18n("oversea"));
+- cbASProvince->insertItem( i18n( "BeiJing" ) );
+- cbASProvince->insertItem( i18n( "ShangHai" ) );
+- cbASProvince->insertItem( i18n("TianJing" ) );
+- cbASProvince->insertItem( i18n("ChongQing" ) );
+- cbASProvince->insertItem( i18n("HeBei" ) );
+- cbASProvince->insertItem( i18n("ShanXi" ) );
+- cbASProvince->insertItem( i18n("NeiMengGu" ) );
+- cbASProvince->insertItem( i18n("LiaoNing" ) );
+- cbASProvince->insertItem( i18n("JiLin" ) );
+- cbASProvince->insertItem( i18n("HeiLongJiang" ) );
+- cbASProvince->insertItem( i18n("JiangSu" ) );
+- cbASProvince->insertItem( i18n("ZheJiang" ) );
+- cbASProvince->insertItem( i18n("AnHui" ) );
+- cbASProvince->insertItem( i18n("FuJian" ) );
+- cbASProvince->insertItem( i18n("JiangXi" ) );
+- cbASProvince->insertItem( i18n("ShanDong" ) );
+- cbASProvince->insertItem( i18n("HeNan" ) );
+- cbASProvince->insertItem( i18n("HuBei" ) );
+- cbASProvince->insertItem( i18n("HuNan" ) );
+- cbASProvince->insertItem( i18n("GuangDong" ) );
+- cbASProvince->insertItem( i18n("GuangXi" ) );
+- cbASProvince->insertItem( i18n("HaiNan" ) );
+- cbASProvince->insertItem( i18n("SiChuan" ) );
+- cbASProvince->insertItem( i18n("GuiZhou" ) );
+- cbASProvince->insertItem( i18n("YunNan" ) );
+- cbASProvince->insertItem( i18n("XiZang" ) );
+- cbASProvince->insertItem( i18n("ShaanXi" ) );
+- cbASProvince->insertItem( i18n("GanSu" ) );
+- cbASProvince->insertItem( i18n("NingXia" ) );
+- cbASProvince->insertItem( i18n("QingHai" ) );
+- cbASProvince->insertItem( i18n("XinJiang" ) );
++ cbASProvince->insertItem(i18n("Abroad"));
++ cbASProvince->insertItem( i18n("Beijing") );
++ cbASProvince->insertItem( i18n("Shanghai") );
++ cbASProvince->insertItem( i18n("Tianjin") );
++ cbASProvince->insertItem( i18n("Chongqing") );
++ cbASProvince->insertItem( i18n("Hebei") );
++ cbASProvince->insertItem( i18n("Shanxi") );
++ cbASProvince->insertItem( i18n("Neimenggu") );
++ cbASProvince->insertItem( i18n("Liaoning") );
++ cbASProvince->insertItem( i18n("Jilin") );
++ cbASProvince->insertItem( i18n("Heilongjiang") );
++ cbASProvince->insertItem( i18n("Jiangsu") );
++ cbASProvince->insertItem( i18n("Zhejiang") );
++ cbASProvince->insertItem( i18n("Anhui") );
++ cbASProvince->insertItem( i18n("Fujian") );
++ cbASProvince->insertItem( i18n("Jiangxi") );
++ cbASProvince->insertItem( i18n("Shandong" ) );
++ cbASProvince->insertItem( i18n("Henan") );
++ cbASProvince->insertItem( i18n("Hubei") );
++ cbASProvince->insertItem( i18n("Hunan") );
++ cbASProvince->insertItem( i18n("Guangdong") );
++ cbASProvince->insertItem( i18n("Guangxi") );
++ cbASProvince->insertItem( i18n("Hainan") );
++ cbASProvince->insertItem( i18n("Sichuan") );
++ cbASProvince->insertItem( i18n("Guizhou") );
++ cbASProvince->insertItem( i18n("Yunnan") );
++ cbASProvince->insertItem( i18n("Xizang") );
++ cbASProvince->insertItem( i18n("Shaanxi") );
++ cbASProvince->insertItem( i18n("Gansu") );
++ cbASProvince->insertItem( i18n("Ningxia") );
++ cbASProvince->insertItem( i18n("Qinghai") );
++ cbASProvince->insertItem( i18n("Xinjiang") );
+ cbASProvince->insertItem( i18n("Hong Kong" ) );
+- cbASProvince->insertItem( i18n("Macao" ) );
+- cbASProvince->insertItem( i18n("TaiWan" ) );
++ cbASProvince->insertItem( i18n("Macao") );
++ cbASProvince->insertItem( i18n("Taiwan") );
+
+ cbASCity->insertItem(i18n("any"));
+
+diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/evasyssettinguibase.cpp eva-0.4.921+svn42.new/src/ui/evasyssettinguibase.cpp
+--- eva-0.4.921+svn42/src/ui/evasyssettinguibase.cpp 2008-04-25 16:09:34.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/evasyssettinguibase.cpp 2008-05-06 02:20:20.000000000 +0800
+@@ -1038,9 +1038,9 @@
+ cbOccupation->insertItem( i18n( "Soldier" ) );
+ leHomePage->setText( QString::null );
+ lblAge->setText( i18n( "Age:" ) );
+- lblZodiac->setText( i18n( "Zodiac:" ) );
+- lblHoroscape->setText( i18n( "Horoscape:" ) );
+- lblBlood->setText( i18n( "Blood:" ) );
++ lblZodiac->setText( i18n( "Chinese Zodiac:" ) );
++ lblHoroscape->setText( i18n( "Horoscope:" ) );
++ lblBlood->setText( i18n( "Blood Type:" ) );
+ leAge->setText( QString::null );
+ cbZodiac->clear();
+ cbZodiac->insertItem( QString::null );
+@@ -1091,7 +1091,7 @@
+ tbtnShop->setTextLabel( i18n( "go to QQ Show shop" ) );
+ gbContact->setTitle( i18n( "Private Info" ) );
+ buttonGroup1->setTitle( QString::null );
+- lblPrompt->setText( i18n( "following availible to" ) );
++ lblPrompt->setText( i18n( "Following available to" ) );
+ rbPublic->setText( i18n( "All" ) );
+ rbProtect->setText( i18n( "Friend" ) );
+ rbPrivate->setText( i18n( "None" ) );
+@@ -1109,42 +1109,42 @@
+ lblProvince->setText( i18n( "Province:" ) );
+ cbProvince->clear();
+ cbProvince->insertItem( QString::null );
+- cbProvince->insertItem( i18n( "BeiJing" ) );
+- cbProvince->insertItem( i18n( "ShangHai" ) );
+- cbProvince->insertItem( i18n("TianJing" ) );
+- cbProvince->insertItem( i18n("ChongQing" ) );
+- cbProvince->insertItem( i18n("HeBei" ) );
+- cbProvince->insertItem( i18n("ShanXi" ) );
+- cbProvince->insertItem( i18n("NeiMengGu" ) );
+- cbProvince->insertItem( i18n("LiaoNing" ) );
+- cbProvince->insertItem( i18n("JiLin" ) );
+- cbProvince->insertItem( i18n("HeiLongJiang" ) );
+- cbProvince->insertItem( i18n("JiangSu" ) );
+- cbProvince->insertItem( i18n("ZheJiang" ) );
+- cbProvince->insertItem( i18n("AnHui" ) );
+- cbProvince->insertItem( i18n("FuJian" ) );
+- cbProvince->insertItem( i18n("JiangXi" ) );
+- cbProvince->insertItem( i18n("ShanDong" ) );
+- cbProvince->insertItem( i18n("HeNan" ) );
+- cbProvince->insertItem( i18n("HuBei" ) );
+- cbProvince->insertItem( i18n("HuNan" ) );
+- cbProvince->insertItem( i18n("GuangDong" ) );
+- cbProvince->insertItem( i18n("GuangXi" ) );
+- cbProvince->insertItem( i18n("HaiNan" ) );
+- cbProvince->insertItem( i18n("SiChuan" ) );
+- cbProvince->insertItem( i18n("GuiZhou" ) );
+- cbProvince->insertItem( i18n("YunNan" ) );
+- cbProvince->insertItem( i18n("XiZang" ) );
+- cbProvince->insertItem( i18n("ShaanXi" ) );
+- cbProvince->insertItem( i18n("GanSu" ) );
+- cbProvince->insertItem( i18n("NingXia" ) );
+- cbProvince->insertItem( i18n("QingHai" ) );
+- cbProvince->insertItem( i18n("XinJiang" ) );
+- cbProvince->insertItem( i18n("Hong Kong" ) );
+- cbProvince->insertItem( i18n("Macao" ) );
+- cbProvince->insertItem( i18n("TaiWan" ) );
+- lblZipCode->setText( i18n("Zip Code:" ) );
+- lblArea->setText( i18n("Area:" ) );
++ cbProvince->insertItem( i18n("Beijing") );
++ cbProvince->insertItem( i18n("Shanghai") );
++ cbProvince->insertItem( i18n("Tianjin") );
++ cbProvince->insertItem( i18n("Chongqing") );
++ cbProvince->insertItem( i18n("Hebei") );
++ cbProvince->insertItem( i18n("Shanxi") );
++ cbProvince->insertItem( i18n("Neimenggu") );
++ cbProvince->insertItem( i18n("Liaoning") );
++ cbProvince->insertItem( i18n("Jilin") );
++ cbProvince->insertItem( i18n("Heilongjiang") );
++ cbProvince->insertItem( i18n("Jiangsu") );
++ cbProvince->insertItem( i18n("Zhejiang") );
++ cbProvince->insertItem( i18n("Anhui") );
++ cbProvince->insertItem( i18n("Fujian") );
++ cbProvince->insertItem( i18n("Jiangxi") );
++ cbProvince->insertItem( i18n("Shandong") );
++ cbProvince->insertItem( i18n("Henan") );
++ cbProvince->insertItem( i18n("Hubei") );
++ cbProvince->insertItem( i18n("Hunan") );
++ cbProvince->insertItem( i18n("Guangdong") );
++ cbProvince->insertItem( i18n("Guangxi") );
++ cbProvince->insertItem( i18n("Hainan") );
++ cbProvince->insertItem( i18n("Sichuan") );
++ cbProvince->insertItem( i18n("Guizhou") );
++ cbProvince->insertItem( i18n("Yunnan") );
++ cbProvince->insertItem( i18n("Xizang") );
++ cbProvince->insertItem( i18n("Shaanxi") );
++ cbProvince->insertItem( i18n("Gansu") );
++ cbProvince->insertItem( i18n("Ningxia") );
++ cbProvince->insertItem( i18n("Qinghai") );
++ cbProvince->insertItem( i18n("Xinjiang") );
++ cbProvince->insertItem( i18n("Hong Kong") );
++ cbProvince->insertItem( i18n("Macao") );
++ cbProvince->insertItem( i18n("Taiwan") );
++ lblZipCode->setText( i18n("Postal Code:" ) );
++ lblArea->setText( i18n("Region:" ) );
+ gbPassword->setTitle( i18n("Password Setting"));
+ pbChangePassword->setText(i18n("Change password"));
+ pbProtectPassword->setText(i18n("Apply password protection"));
+@@ -1165,35 +1165,35 @@
+ cbbQuestion->insertItem( i18n( "my favourate Linux distro?" ) );
+
+ gbGeneralSetting->setTitle( i18n("General" ) );
+- chbOnlineTip->setText( i18n("display buddy online tip" ) );
+- chbShowOnlineUsers->setText( i18n("display online users only" ) );
+- chbSound->setText( i18n("sound enabled" ) );
+- chbShowNickSmiley->setText( i18n("show smiley icon in buddy list") );
+- chbSystemNews->setText( i18n("show QQ News") );
+- chbMessage->setText( i18n("display message tip" ) );
+- chbSystemBroadcast->setText( i18n("display system ad. tip" ) );
+- chbSendKey->setText( i18n("change send key to \"Enter\"" ) );
+- chbShowSigSeperate->setText( i18n( "display buddy signature in seperate line" ) );
+- gbOtherSetting->setTitle( i18n("Other" ) );
+- lblPageSize->setText( i18n("message page size:" ) );
+- lblPageSizeEnd->setText( i18n("pieces" ) );
+- lblIdleTime->setText( i18n("change status to away after:" ) );
++ chbOnlineTip->setText( i18n("Display buddy online tip" ) );
++ chbShowOnlineUsers->setText( i18n("Display online users only" ) );
++ chbSound->setText( i18n("Sound enabled" ) );
++ chbShowNickSmiley->setText( i18n("Show smiley icon in buddy list") );
++ chbSystemNews->setText( i18n("Show QQ News") );
++ chbMessage->setText( i18n("Display message tip" ) );
++ chbSystemBroadcast->setText( i18n("Display system ad. tip" ) );
++ chbSendKey->setText( i18n("Change send key to \"Enter\"" ) );
++ chbShowSigSeperate->setText( i18n( "Display buddy signature in separate line" ) );
++ gbOtherSetting->setTitle( i18n("Miscellaneous" ) );
++ lblPageSize->setText( i18n("Message page size:" ) );
++ lblPageSizeEnd->setText( i18n("entries" ) );
++ lblIdleTime->setText( i18n("Change status to away after:" ) );
+ lblIdleTimeEnd->setText( i18n("minutes" ) );
+- lblFaceSize->setText( i18n("face size:" ) );
++ lblFaceSize->setText( i18n("Face size:" ) );
+ lblFaceSmall->setText( i18n("small" ) );
+ lblFaceBig->setText( i18n("large" ) );
+ lblShortKey->setText( i18n("Shortcut Key for reading messages:" ) );
+ kkbtnShortKey->setText( i18n("None" ) );
+ gbPath->setTitle( i18n("Path" ) );
+- lblThemePath->setText( i18n("theme path:" ) );
++ lblThemePath->setText( i18n("Theme path:" ) );
+ pbTheme->setText( i18n("Browse" ) );
+- lblSoundPath->setText( i18n("sound path:" ) );
++ lblSoundPath->setText( i18n("Sound path:" ) );
+ pbSound->setText( i18n("Browse" ) );
+ gbQuickReply->setTitle( i18n("Quick Reply (within 50 words):" ) );
+ pbQuickNew->setText( i18n("New" ) );
+ pbQuickDelete->setText( i18n("Delete" ) );
+ gbAutoReply->setTitle( i18n("Auto-Reply (within 50 words):" ) );
+- chbAutoReply->setText( i18n("reply automatically when leave" ) );
++ chbAutoReply->setText( i18n("Reply automatically when away" ) );
+ pbAutoNew->setText( i18n("New" ) );
+ pbAutoDelete->setText( i18n("Delete" ) );
+ pbFaceDefault->setText( i18n("Default" ) );
+diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/evauseruibase.cpp eva-0.4.921+svn42.new/src/ui/evauseruibase.cpp
+--- eva-0.4.921+svn42/src/ui/evauseruibase.cpp 2008-04-25 16:09:34.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/evauseruibase.cpp 2008-05-06 02:15:18.000000000 +0800
+@@ -293,7 +293,7 @@
+ lblMemoAddress->setText( i18n( "Address:" ) );
+ lblMemoEmail->setText( i18n( "Email:" ) );
+ lblMemoTelephone->setText( i18n( "Telephone:" ) );
+- lblMemoZipCode->setText( i18n( "Zip Code:" ) );
++ lblMemoZipCode->setText( i18n( "Postal Code:" ) );
+ lblMemoNote->setText( i18n( "Note:" ) );
+ chbAutoUploadMemo->setText( i18n( "Auto Upload Memo" ) );
+ pbDownloadMemo->setText( i18n( "Download Memo" ) );
+diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/mainlistfontsettinguibase.cpp eva-0.4.921+svn42.new/src/ui/mainlistfontsettinguibase.cpp
+--- eva-0.4.921+svn42/src/ui/mainlistfontsettinguibase.cpp 2008-04-25 16:09:34.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/mainlistfontsettinguibase.cpp 2008-05-06 02:23:11.000000000 +0800
+@@ -327,7 +327,7 @@
+ chbBuddySigFontB->setText( i18n("bold" ) );
+ chbBuddySigFontU->setText( i18n("underline" ) );
+ chbBuddySigFontI->setText( i18n("italic" ) );
+- gbQunName->setTitle( i18n("name:" ) );
++ gbQunName->setTitle( i18n("Name:" ) );
+ lblQunNameColor->setText( i18n("name color:" ) );
+ chbQunNameFontB->setText( i18n("bold" ) );
+ chbQunNameFontU->setText( i18n("underline" ) );
+@@ -337,7 +337,7 @@
+ chbQunFlashFontB->setText( i18n("bold" ) );
+ chbQunFlashFontU->setText( i18n("underline" ) );
+ chbQunFlashFontI->setText( i18n("italic" ) );
+- gbGroupName->setTitle( i18n("name:" ) );
++ gbGroupName->setTitle( i18n("Name:" ) );
+ lblGroupNameColor->setText( i18n("name color:" ) );
+ chbGroupNameFontB->setText( i18n("bold" ) );
+ chbGroupNameFontU->setText( i18n("underline" ) );
+@@ -347,7 +347,7 @@
+ chbGroupFlashFontB->setText( i18n("bold" ) );
+ chbGroupFlashFontU->setText( i18n("underline" ) );
+ chbGroupFlashFontI->setText( i18n("italic" ) );
+- gbGroupOnlineCount->setTitle( i18n("online counting:" ) );
++ gbGroupOnlineCount->setTitle( i18n("Online statistics:" ) );
+ lblGroupOnlineColor->setText( i18n("signature color:" ) );
+ chbGroupOnlineFontB->setText( i18n("bold" ) );
+ chbGroupOnlineFontU->setText( i18n("underline" ) );
+diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/quncreateui.cpp eva-0.4.921+svn42.new/src/ui/quncreateui.cpp
+--- eva-0.4.921+svn42/src/ui/quncreateui.cpp 2008-04-25 16:09:34.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/quncreateui.cpp 2008-05-06 02:21:51.000000000 +0800
+@@ -217,8 +217,8 @@
+ lblTip->setText( i18n( "Please input Qun details below, then click \"Next\"" ) );
+ lblName->setText( i18n( "Name" ) );
+ lblCategory->setText( i18n( "Category" ) );
+- tbCategory->setText( i18n( "select a category" ) );
+- gbNotice->setTitle( i18n( "Qun Notice ( member only)" ) );
++ tbCategory->setText( i18n( "Select a category" ) );
++ gbNotice->setTitle( i18n( "Qun Notice (member only)" ) );
+ gbDescription->setTitle( i18n( "Qun Description" ) );
+ bgAuthen->setTitle( i18n( "Authentication" ) );
+ rbNoAuthenNeed->setText( i18n( "No authentication needed." ) );
+diff -Nur -x '*.orig' -x '*~' eva-0.4.921+svn42/src/ui/qundetailsui.cpp eva-0.4.921+svn42.new/src/ui/qundetailsui.cpp
+--- eva-0.4.921+svn42/src/ui/qundetailsui.cpp 2008-04-25 16:09:34.000000000 +0800
++++ eva-0.4.921+svn42.new/src/ui/qundetailsui.cpp 2008-05-06 02:30:22.000000000 +0800
+@@ -346,7 +346,7 @@
+ lblQunFace->setText( i18n( "Qun Face" ) );
+ lblCategory->setText( i18n( "Category" ) );
+ tbCategory->setText( QString::null );
+- gbNotice->setTitle( i18n( "Qun Notice ( member only)" ) );
++ gbNotice->setTitle( i18n( "Qun Notice (member only)" ) );
+ gbDescription->setTitle( i18n( "Qun Description" ) );
+ bgAuthen->setTitle( i18n( "Authentication" ) );
+ rbNoAuthenNeed->setText( i18n( "No authentication needed." ) );
Modified: kde-extras/eva/trunk/debian/rules
===================================================================
--- kde-extras/eva/trunk/debian/rules 2008-05-05 19:59:16 UTC (rev 10480)
+++ kde-extras/eva/trunk/debian/rules 2008-05-05 20:19:17 UTC (rev 10481)
@@ -1,74 +1,12 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export kde_htmldir = /usr/share/doc/kde/HTML
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-configure:
-config.status: configure
- dh_testdir
- # Add here commands to configure the package.
- CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info --disable-rpath
-
-
-build: build-stamp
-build-stamp: config.status
- dh_testdir
- # Add here commands to compile the package.
- $(MAKE)
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
- find po -iname "*.gmo" -exec rm {} \;
- rm -f config.log
- dh_clean
-
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- $(MAKE) install DESTDIR=$(CURDIR)/debian/eva
- chrpath -d $(CURDIR)/debian/eva/usr/bin/eva
-
-binary-indep: build install
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
- dh_installman debian/eva.1
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+DEB_INSTALL_MANPAGES_eva = debian/eva.1
+clean::
+ find . -iname "*.gmo" -exec rm {} \;
More information about the pkg-kde-commits
mailing list