rev 4964 - in kde-extras/digikamimageplugins/trunk/debian: . patches

Achim Bohnet ach-guest at alioth.debian.org
Tue Nov 21 19:38:52 UTC 2006


Author: ach-guest
Date: 2006-11-21 20:38:51 +0100 (Tue, 21 Nov 2006)
New Revision: 4964

Removed:
   kde-extras/digikamimageplugins/trunk/debian/patches/20_kdesvn_r516000_fix_infrared_bluring.diff
Modified:
   kde-extras/digikamimageplugins/trunk/debian/changelog
   kde-extras/digikamimageplugins/trunk/debian/patches/02_autotools_update.diff
   kde-extras/digikamimageplugins/trunk/debian/patches/03_libtool_update.diff
   kde-extras/digikamimageplugins/trunk/debian/rules
Log:
digikamimageplugins: Prepare for new upstream release
  Partial work to reenable relibtoolization:
  * removed patches/20_kdesvn_r516000_fix_infrared_bluring.diff: is part of
    rc1 release
  * rules: remove buildprep rule. Now included in cdbs' kde.mk
  * patches/ copied update versin from pkg-kde common-patches:
    02_autotools_update.diff, 03_libtool_update.diff, 04_am_maintainer_mode.diff
    and 05_pedantic-errors.diff.
  Did commit buildprep.  patches/* not used at all right now

Modified: kde-extras/digikamimageplugins/trunk/debian/changelog
===================================================================
--- kde-extras/digikamimageplugins/trunk/debian/changelog	2006-11-21 18:58:20 UTC (rev 4963)
+++ kde-extras/digikamimageplugins/trunk/debian/changelog	2006-11-21 19:38:51 UTC (rev 4964)
@@ -1,3 +1,21 @@
+digikamimageplugins (0.9.0~rc1-1) UNRELEASED; urgency=low
+
+  * NOT YET RELEASED
+  * TODO: for relibtoolization: (06_aclocal_update.diff)
+          10_Makefile.am_only_used_libs.diff needs an update.
+
+  * new upstream release
+
+  [ Achim Bohnet ]
+  * removed patches/20_kdesvn_r516000_fix_infrared_bluring.diff: is part of
+    rc1 release
+  * rules: remove buildprep rule. Now included in cdbs' kde.mk
+  * patches/ copied update versin from pkg-kde common-patches:
+    02_autotools_update.diff, 03_libtool_update.diff, 04_am_maintainer_mode.diff
+    and 05_pedantic-errors.diff.
+
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Tue, 21 Nov 2006 19:15:07 +0100
+
 digikamimageplugins (0.9.0~beta3-3) unstable; urgency=low
 
   [ Mark Purcell ]

Modified: kde-extras/digikamimageplugins/trunk/debian/patches/02_autotools_update.diff
===================================================================
--- kde-extras/digikamimageplugins/trunk/debian/patches/02_autotools_update.diff	2006-11-21 18:58:20 UTC (rev 4963)
+++ kde-extras/digikamimageplugins/trunk/debian/patches/02_autotools_update.diff	2006-11-21 19:38:51 UTC (rev 4964)
@@ -1,175 +1,355 @@
-diff -Nrua a/admin/compile b/admin/compile
---- a/admin/compile	2005-09-17 18:09:28.000000000 +0200
-+++ b/admin/compile	2005-11-24 00:02:11.000000000 +0100
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # Wrapper for compilers which do not understand `-c -o'.
- 
--scriptversion=2005-05-14.22
-+scriptversion=2005-02-03.08
- 
- # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
- # Written by Tom Tromey <tromey at cygnus.com>.
-@@ -18,7 +18,7 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-diff -Nrua a/admin/depcomp b/admin/depcomp
---- a/admin/depcomp	2005-09-17 18:09:28.000000000 +0200
-+++ b/admin/depcomp	2005-11-24 00:02:11.000000000 +0100
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # depcomp - compile a program generating dependencies as side-effects
- 
--scriptversion=2005-05-14.22
-+scriptversion=2005-02-09.22
- 
- # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
- 
-@@ -17,8 +17,8 @@
- 
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
- 
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
 diff -Nrua a/admin/install-sh b/admin/install-sh
---- a/admin/install-sh	2005-09-17 18:09:28.000000000 +0200
-+++ b/admin/install-sh	2005-11-24 00:02:11.000000000 +0100
+--- a/admin/install-sh	2006-03-17 16:38:42.000000000 -0500
++++ b/admin/install-sh	2006-03-24 19:22:40.000000000 -0500
 @@ -1,7 +1,7 @@
  #!/bin/sh
  # install - install a program, script, or datafile
  
--scriptversion=2005-05-14.22
-+scriptversion=2005-02-02.21
+-scriptversion=2005-11-07.23
++scriptversion=2005-05-14.22
  
  # This originates from X11R5 (mit/util/scripts/install.sh), which was
  # later released in X11R6 (xc/config/util/install.sh) with the
-diff -Nrua a/admin/missing b/admin/missing
---- a/admin/missing	2005-09-17 18:09:28.000000000 +0200
-+++ b/admin/missing	2005-11-24 00:02:11.000000000 +0100
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # Common stub for a few missing GNU programs while installing.
+@@ -58,21 +58,7 @@
+ rmprog="${RMPROG-rm}"
+ mkdirprog="${MKDIRPROG-mkdir}"
  
--scriptversion=2005-06-08.21
-+scriptversion=2005-02-08.22
+-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=
+-
+-chmodcmd=$chmodprog
++chmodcmd="$chmodprog 0755"
+ chowncmd=
+ chgrpcmd=
+ stripcmd=
+@@ -125,7 +111,7 @@
  
- # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
- #   Free Software Foundation, Inc.
-@@ -19,8 +19,8 @@
+     --help) echo "$usage"; exit $?;;
  
- # 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.
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
+-    -m) mode=$2
++    -m) chmodcmd="$chmodprog $2"
+         shift
+         shift
+         continue;;
+@@ -178,8 +164,6 @@
+   exit 0
+ fi
  
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -297,9 +297,6 @@
-       # ... 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
-     ;;
+-test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15
+-
+ for src
+ do
+   # Protect names starting with `-'.
+@@ -189,11 +173,15 @@
  
-diff -Nrua a/admin/mkinstalldirs b/admin/mkinstalldirs
---- a/admin/mkinstalldirs	2005-09-17 18:09:28.000000000 +0200
-+++ b/admin/mkinstalldirs	2005-11-24 00:02:11.000000000 +0100
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # mkinstalldirs --- make directory hierarchy
+   if test -n "$dir_arg"; then
+     dst=$src
+-    dstdir=$dst
+-    test -d "$dstdir"
+-    dstdir_status=$?
+-  else
++    src=
  
--scriptversion=2005-06-29.22
-+scriptversion=2005-02-02.21
++    if test -d "$dst"; then
++      mkdircmd=:
++      chmodcmd=
++    else
++      mkdircmd=$mkdirprog
++    fi
++  else
+     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+     # might cause directories to be created, which would be especially bad
+     # if $src (and thus $dsttmp) contains '*'.
+@@ -220,122 +208,53 @@
+ 	echo "$0: $dstarg: Is a directory" >&2
+ 	exit 1
+       fi
+-      dstdir=$dst
+-      dst=$dstdir/`basename "$src"`
+-      dstdir_status=0
+-    else
+-      # Prefer dirname, but fall back on a substitute if dirname fails.
+-      dstdir=`
+-	(dirname "$dst") 2>/dev/null ||
+-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	     X"$dst" : 'X\(//\)[^/]' \| \
+-	     X"$dst" : 'X\(//\)$' \| \
+-	     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'
+-      `
+-
+-      test -d "$dstdir"
+-      dstdir_status=$?
++      dst=$dst/`basename "$src"`
+     fi
+   fi
  
- # Original author: Noah Friedman <friedman at prep.ai.mit.edu>
- # Created: 1993-05-16
-@@ -12,7 +12,7 @@
- # <automake-patches at gnu.org>.
+-  obsolete_mkdir_used=false
++  # This sed command emulates the dirname command.
++  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
  
- errstatus=0
--dirmode=
-+dirmode=""
+-  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
++  # Make sure that the destination directory exists.
  
- usage="\
- Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-@@ -103,21 +103,13 @@
+-    if
+-      $posix_mkdir && {
++  # Skip lots of stat calls in the usual case.
++  if test ! -d "$dstdir"; then
++    defaultIFS='
++	 '
++    IFS="${IFS-$defaultIFS}"
++
++    oIFS=$IFS
++    # Some sh's can't handle IFS=/ for some reason.
++    IFS='%'
++    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++    shift
++    IFS=$oIFS
  
- for file
- do
--  case $file in
--    /*) pathcomp=/ ;;
--    *)  pathcomp= ;;
--  esac
--  oIFS=$IFS
--  IFS=/
--  set fnord $file
-+  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
--  IFS=$oIFS
+-	# 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.
+-
+-	if test -n "$dir_arg"; then
+-	  mkdir_mode=$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
+-	fi
+-
+-	$mkdirprog -m "$mkdir_mode" -p -- "$dstdir"
+-      }
+-    then :
+-    else
++    pathcomp=
  
-+  pathcomp=
-   for d
-   do
--    test "x$d" = x && continue
+-      # 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.
 -
--    pathcomp=$pathcomp$d
-+    pathcomp="$pathcomp$d"
-     case $pathcomp in
-       -*) pathcomp=./$pathcomp ;;
-     esac
-@@ -132,7 +124,7 @@
-       else
- 	if test ! -z "$dirmode"; then
- 	  echo "chmod $dirmode $pathcomp"
--	  lasterr=
-+	  lasterr=""
- 	  chmod "$dirmode" "$pathcomp" || lasterr=$?
+-      case $dstdir in
+-	/*) pathcomp=/ ;;
+-	-*) pathcomp=./ ;;
+-	*)  pathcomp= ;;
+-      esac
+-
+-      case $posix_glob in
+-        '')
+-	  if (set -f) 2>/dev/null; then
+-	    posix_glob=true
+-	  else
+-	    posix_glob=false
+-	  fi ;;
+-      esac
+-
+-      oIFS=$IFS
+-      IFS=/
+-      $posix_glob && set -f
+-      set fnord $dstdir
++    while test $# -ne 0 ; do
++      pathcomp=$pathcomp$1
+       shift
+-      $posix_glob && set +f
+-      IFS=$oIFS
+-
+-      for d
+-      do
+-	test "x$d" = x && 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
+-	fi
+-	pathcomp=$pathcomp/
+-      done
+-      obsolete_mkdir_used=true
+-    fi
++      if test ! -d "$pathcomp"; then
++        $mkdirprog "$pathcomp"
++	# mkdir can fail with a `File exist' error in case several
++	# install-sh are creating the directory concurrently.  This
++	# is OK.
++	test -d "$pathcomp" || exit
++      fi
++      pathcomp=$pathcomp/
++    done
+   fi
  
- 	  if test ! -z "$lasterr"; then
-@@ -142,7 +134,7 @@
-       fi
-     fi
+   if test -n "$dir_arg"; then
+-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+-      test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dst"; } || exit 1
++    $doit $mkdircmd "$dst" \
++      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
++      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
++      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
++      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
++
+   else
++    dstfile=`basename "$dst"`
  
--    pathcomp=$pathcomp/
-+    pathcomp="$pathcomp/"
-   done
+     # Make a couple of temp file names in the proper directory.
+     dsttmp=$dstdir/_inst.$$_
+@@ -343,6 +262,7 @@
+ 
+     # Trap to clean up those temp files at exit.
+     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
++    trap '(exit $?); exit' 1 2 13 15
+ 
+     # Copy the file name to the temp name.
+     $doit $cpprog "$src" "$dsttmp" &&
+@@ -356,10 +276,10 @@
+     { 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"; } &&
++      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+ 
+     # Now rename the file to the real destination.
+-    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
++    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+       || {
+ 	   # The rename failed, perhaps because mv can't rename something else
+ 	   # to itself, or perhaps because mv is so ancient that it does not
+@@ -371,12 +291,11 @@
+ 	   # 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; :; }; }\
++	     if test -f "$dstdir/$dstfile"; then
++	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
++	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+ 	       || {
+-		 echo "$0: cannot unlink or rename $dst" >&2
++		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+ 		 (exit 1); exit 1
+ 	       }
+ 	     else
+@@ -385,14 +304,17 @@
+ 	   } &&
+ 
+ 	   # Now rename the file to the real destination.
+-	   $doit $mvcmd "$dsttmp" "$dst"
++	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+ 	 }
+-    } || exit 1
+-
+-    trap '' 0
+-  fi
++    }
++  fi || { (exit 1); exit 1; }
  done
  
-diff -Nrua a/admin/ylwrap b/admin/ylwrap
---- a/admin/ylwrap	2005-09-17 18:09:28.000000000 +0200
-+++ b/admin/ylwrap	2005-11-24 00:02:11.000000000 +0100
-@@ -1,7 +1,7 @@
++# The final little trick to "correctly" pass the exit status to the exit trap.
++{
++  (exit 0); exit 0
++}
++
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "scriptversion="
+diff -Nrua a/admin/missing b/admin/missing
+--- a/admin/missing	2006-03-17 16:38:41.000000000 -0500
++++ b/admin/missing	2006-03-24 19:22:40.000000000 -0500
+@@ -1,9 +1,9 @@
  #! /bin/sh
- # ylwrap - wrapper for lex/yacc invocations.
+ # Common stub for a few missing GNU programs while installing.
  
--scriptversion=2005-05-14.22
-+scriptversion=2005-02-02.22
+-scriptversion=2004-09-07.08
++scriptversion=2005-06-08.21
  
- # Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
+-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
  #   Free Software Foundation, Inc.
-@@ -20,8 +20,7 @@
- #
+ # 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., 51 Franklin Street, Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-# 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
+@@ -87,12 +87,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 $?
+     ;;
+ 
+   -*)
+@@ -288,11 +288,18 @@
+          call might also be the consequence of using a buggy \`make' (AIX,
+          DU, IRIX).  You might want to install the \`Texinfo' package or
+          the \`GNU make' package.  Grab either from any GNU archive site."
++    # The file to touch is that specified with -o ...
+     file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+     if test -z "$file"; then
+-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+-    fi
++      # ... or it is the one specified with @setfilename ...
++      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
++      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
++      # ... or it is derived from the source name (dir/f.texi becomes f.info)
++      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
++    fi
++    # If the file does not exist, the user really needs makeinfo;
++    # let's fail without touching anything.
++    test -f $file || exit 1
+     touch $file
+     ;;
+ 

Modified: kde-extras/digikamimageplugins/trunk/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/digikamimageplugins/trunk/debian/patches/03_libtool_update.diff	2006-11-21 18:58:20 UTC (rev 4963)
+++ kde-extras/digikamimageplugins/trunk/debian/patches/03_libtool_update.diff	2006-11-21 19:38:51 UTC (rev 4964)
@@ -1,6 +1,6 @@
-diff -ru digikam-0.8.0.old/admin/libtool.m4.in digikam-0.8.0/admin/libtool.m4.in
---- digikam-0.8.0.old/admin/libtool.m4.in	2005-11-21 20:14:05.000000000 +0100
-+++ digikam-0.8.0/admin/libtool.m4.in	2005-12-31 09:24:09.000000000 +0100
+diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
+--- a/admin/libtool.m4.in	2006-03-17 16:38:41.000000000 -0500
++++ b/admin/libtool.m4.in	2006-03-24 19:22:40.000000000 -0500
 @@ -1,28 +1,13 @@
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 -## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -31,7 +31,7 @@
 +## modifications, as long as this notice is preserved.
  
 -# serial 47 AC_PROG_LIBTOOL
-+# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
++# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
  
  
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -62,7 +62,26 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -200,6 +185,8 @@
+@@ -172,6 +157,7 @@
+ test -z "$AS" && AS=as
+ test -z "$CC" && CC=cc
+ test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+ test -z "$LN_S" && LN_S="ln -s"
+@@ -191,15 +177,17 @@
+ if test -n "$RANLIB"; then
+   case $host_os in
+   openbsd*)
+-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+     ;;
+   *)
+-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+     ;;
+   esac
    old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
  fi
  
@@ -71,7 +90,15 @@
  # Only perform the check for file, if the check method requires it
  case $deplibs_check_method in
  file_magic*)
-@@ -245,6 +232,48 @@
+@@ -240,11 +228,56 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
  ])# _LT_AC_SYS_COMPILER
  
  
@@ -98,7 +125,7 @@
 +AC_DEFUN([_LT_COMPILER_BOILERPLATE],
 +[ac_outfile=conftest.$ac_objext
 +printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_compiler_boilerplate=`cat conftest.err`
 +$rm conftest*
 +])# _LT_COMPILER_BOILERPLATE
@@ -111,7 +138,7 @@
 +AC_DEFUN([_LT_LINKER_BOILERPLATE],
 +[ac_outfile=conftest.$ac_objext
 +printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_linker_boilerplate=`cat conftest.err`
 +$rm conftest*
 +])# _LT_LINKER_BOILERPLATE
@@ -120,7 +147,7 @@
  # _LT_AC_SYS_LIBPATH_AIX
  # ----------------------
  # Links a minimal program and checks the executable
-@@ -317,15 +346,15 @@
+@@ -317,15 +350,15 @@
  
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
@@ -139,7 +166,7 @@
         (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
      then
        break
-@@ -494,14 +523,13 @@
+@@ -494,14 +527,13 @@
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
    if AC_TRY_EVAL(ac_compile); then
@@ -156,7 +183,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -513,7 +541,6 @@
+@@ -513,7 +545,6 @@
        esac
        ;;
      *64-bit*)
@@ -164,7 +191,30 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -578,7 +605,7 @@
+@@ -547,6 +578,22 @@
+     CFLAGS="$SAVE_CFLAGS"
+   fi
+   ;;
++sparc*-*solaris*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.o` in
++    *64-bit*)
++      case $lt_cv_prog_gnu_ld in
++      yes*) LD="${LD-ld} -m elf64_sparc" ;;
++      *)    LD="${LD-ld} -64" ;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+@@ -578,7 +625,7 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -173,20 +223,20 @@
     -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 +615,10 @@
+@@ -588,8 +635,10 @@
     echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
 -     # So say no if there are warnings
 -     if test ! -s conftest.err; then
 +     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+     $SED '/^$/d' conftest.err >conftest.er2
-+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
         $2=yes
       fi
     fi
-@@ -615,11 +644,16 @@
+@@ -615,11 +664,16 @@
     LDFLAGS="$LDFLAGS $3"
     printf "$lt_simple_link_test_code" > conftest.$ac_ext
     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -196,15 +246,15 @@
       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 > conftest.exp
-+       $SED '/^$/d' conftest.err >conftest.er2
++       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
 +       if diff conftest.exp conftest.er2 >/dev/null; then
 +         $2=yes
 +       fi
       else
         $2=yes
       fi
-@@ -643,7 +677,7 @@
+@@ -643,7 +697,7 @@
  AC_MSG_CHECKING([the maximum length of command line arguments])
  AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
    i=0
@@ -213,7 +263,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -672,20 +706,53 @@
+@@ -672,20 +726,70 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -237,6 +287,12 @@
 +    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
@@ -250,6 +306,17 @@
 +      esac
 +    fi
 +    ;;
++  sco3.2v5*)
++    lt_cv_sys_max_cmd_len=102400
++    ;;
++  sysv5* | sco5v6* | sysv4.2uw2*)
++    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
++    if test -n "$kargmax"; then
++      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
++    else
++      lt_cv_sys_max_cmd_len=32768
++    fi
++    ;;
 +  *)
      # If test is not a shell built-in, we'll probably end up computing a
      # maximum length that is only half of the actual maximum length, but
@@ -273,7 +340,32 @@
      # 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.
-@@ -781,7 +848,7 @@
+@@ -702,7 +806,7 @@
+ 
+ 
+ # _LT_AC_CHECK_DLFCN
+-# --------------------
++# ------------------
+ AC_DEFUN([_LT_AC_CHECK_DLFCN],
+ [AC_CHECK_HEADERS(dlfcn.h)dnl
+ ])# _LT_AC_CHECK_DLFCN
+@@ -710,7 +814,7 @@
+ 
+ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+ #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+-# ------------------------------------------------------------------
++# ---------------------------------------------------------------------
+ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "$cross_compiling" = yes; then :
+@@ -776,17 +880,19 @@
+       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+       /* dlclose (self); */
+     }
++  else
++    puts (dlerror ());
+ 
+     exit (status);
  }]
  EOF
    if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -282,7 +374,22 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) $1 ;;
-@@ -835,7 +902,7 @@
+       x$lt_dlneed_uscore) $2 ;;
+-      x$lt_unknown|x*) $3 ;;
++      x$lt_dlunknown|x*) $3 ;;
+     esac
+   else :
+     # compilation failed
+@@ -798,7 +904,7 @@
+ 
+ 
+ # AC_LIBTOOL_DLOPEN_SELF
+-# -------------------
++# ----------------------
+ AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "x$enable_dlopen" != xyes; then
+@@ -835,7 +941,7 @@
      lt_cv_dlopen_self=yes
      ])
     ;;
@@ -291,7 +398,25 @@
    *)
      AC_CHECK_FUNC([shl_load],
  	  [lt_cv_dlopen="shl_load"],
-@@ -924,20 +991,13 @@
+@@ -869,7 +975,7 @@
+     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
+     save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
+     save_LIBS="$LIBS"
+     LIBS="$lt_cv_dlopen_libs $LIBS"
+@@ -882,7 +988,7 @@
+     ])
+ 
+     if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
++      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+     	  lt_cv_dlopen_self_static, [dnl
+ 	  _LT_AC_TRY_DLOPEN_SELF(
+@@ -924,20 +1030,13 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -313,14 +438,14 @@
     -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 +1009,18 @@
+@@ -949,13 +1048,18 @@
     then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
 -     if test ! -s out/conftest.err; then
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+     $SED '/^$/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; 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
@@ -336,7 +461,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -1014,8 +1079,8 @@
+@@ -1014,8 +1118,8 @@
  [AC_MSG_CHECKING([how to hardcode library paths into programs])
  _LT_AC_TAGVAR(hardcode_action, $1)=
  if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
@@ -347,7 +472,7 @@
  
    # We can hardcode non-existant directories.
    if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -1072,7 +1137,7 @@
+@@ -1072,7 +1176,7 @@
     *)
    AC_MSG_RESULT([no])
      ;;
@@ -356,7 +481,7 @@
  fi
  ])# AC_LIBTOOL_SYS_LIB_STRIP
  
-@@ -1085,7 +1150,7 @@
+@@ -1085,7 +1189,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -365,7 +490,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -1095,7 +1160,20 @@
+@@ -1095,7 +1199,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -387,7 +512,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -1160,7 +1238,7 @@
+@@ -1160,7 +1277,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -396,7 +521,7 @@
    ;;
  
  beos*)
-@@ -1169,7 +1247,7 @@
+@@ -1169,7 +1286,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -405,7 +530,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -1185,7 +1263,7 @@
+@@ -1185,7 +1302,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -414,7 +539,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -1197,7 +1275,8 @@
+@@ -1197,7 +1314,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -424,7 +549,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -1227,7 +1306,7 @@
+@@ -1227,7 +1345,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -433,7 +558,7 @@
        ;;
      esac
      ;;
-@@ -1250,7 +1329,7 @@
+@@ -1250,7 +1368,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -442,19 +567,22 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -1273,7 +1352,7 @@
+@@ -1273,20 +1391,17 @@
    dynamic_linker=no
    ;;
  
 -kfreebsd*-gnu*)
-+kfreebsd*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -1285,8 +1364,17 @@
-   dynamic_linker='GNU ld.so'
-   ;;
- 
+-  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*)
@@ -471,7 +599,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -1304,7 +1392,7 @@
+@@ -1304,14 +1419,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -480,7 +608,20 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -1331,9 +1419,9 @@
+-  *) # from 3.2 on
++  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
++  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
++  freebsd*) # from 4.6 on
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -1331,9 +1451,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -492,7 +633,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -1348,7 +1436,7 @@
+@@ -1348,7 +1468,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -501,7 +642,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -1359,7 +1447,7 @@
+@@ -1359,7 +1479,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -510,7 +651,34 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -1421,22 +1509,19 @@
+@@ -1371,6 +1491,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix3*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -1414,29 +1546,26 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -539,7 +707,7 @@
    # 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 +1531,30 @@
+@@ -1446,6 +1575,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -555,22 +723,10 @@
 +  dynamic_linker='NetBSD ld.elf_so'
 +  ;;
 +
-+knetbsd*-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'
-+  ;;
-+
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -1455,7 +1564,7 @@
+@@ -1455,7 +1596,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -579,9 +735,11 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -1484,7 +1593,11 @@
+@@ -1483,8 +1624,13 @@
+ 
  openbsd*)
    version_type=sunos
++  sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
 -  need_version=no
 +  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
@@ -592,7 +750,7 @@
    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 +1617,7 @@
+@@ -1504,7 +1650,7 @@
  
  os2*)
    libname_spec='$name'
@@ -601,8 +759,83 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -1650,7 +1763,9 @@
+@@ -1522,13 +1668,6 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
  
+-sco3.2v5*)
+-  version_type=osf
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+-
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -1554,7 +1693,7 @@
+   need_version=yes
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+@@ -1587,6 +1726,29 @@
+   fi
+   ;;
+ 
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  version_type=freebsd-elf
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  if test "$with_gnu_ld" = yes; then
++    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++    shlibpath_overrides_runpath=no
++  else
++    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++    shlibpath_overrides_runpath=yes
++    case $host_os in
++      sco3.2v5*)
++        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++	;;
++    esac
++  fi
++  sys_lib_dlsearch_path_spec='/usr/lib'
++  ;;
++
+ uts4*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -1600,6 +1762,11 @@
+ esac
+ AC_MSG_RESULT([$dynamic_linker])
+ test "$dynamic_linker" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
+ ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+ 
+ 
+@@ -1624,6 +1791,9 @@
+       AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+     fi
+   fi
++  if test -z "$LTCFLAGS"; then
++    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++  fi
+ 
+   # Extract list of available tagged configurations in $ofile.
+   # Note that this assumes the entire list is on one line.
+@@ -1650,7 +1820,9 @@
+ 
        case $tagname in
        CXX)
 -	if test -n "$CXX" && test "X$CXX" != "Xno"; then
@@ -612,7 +845,7 @@
  	  AC_LIBTOOL_LANG_CXX_CONFIG
  	else
  	  tagname=""
-@@ -1712,7 +1827,7 @@
+@@ -1712,7 +1884,7 @@
  
  # AC_LIBTOOL_WIN32_DLL
  # --------------------
@@ -621,7 +854,16 @@
  AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
  [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
  ])# AC_LIBTOOL_WIN32_DLL
-@@ -1886,7 +2001,7 @@
+@@ -1750,7 +1922,7 @@
+ 
+ # AC_DISABLE_SHARED
+ # -----------------
+-#- set the default shared flag to --disable-shared
++# set the default shared flag to --disable-shared
+ AC_DEFUN([AC_DISABLE_SHARED],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_SHARED(no)
+@@ -1886,7 +2058,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -630,7 +872,7 @@
  	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
  	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -1996,7 +2111,7 @@
+@@ -1996,7 +2168,7 @@
      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
        lt_cv_path_LD="$ac_dir/$ac_prog"
        # Check to see if the program is GNU ld.  I'd rather use --version,
@@ -639,7 +881,7 @@
        # 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 +2143,7 @@
+@@ -2028,7 +2200,7 @@
  AC_DEFUN([AC_PROG_LD_GNU],
  [AC_REQUIRE([AC_PROG_EGREP])dnl
  AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
@@ -648,14 +890,14 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -2055,6 +2170,15 @@
+@@ -2055,6 +2227,15 @@
  *) reload_flag=" $reload_flag" ;;
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
 +case $host_os in
 +  darwin*)
 +    if test "$GCC" = yes; then
-+      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
 +    else
 +      reload_cmds='$LD$reload_flag -o $output$reload_objs'
 +    fi
@@ -664,7 +906,7 @@
  ])# AC_PROG_LD_RELOAD_FLAG
  
  
-@@ -2088,44 +2212,36 @@
+@@ -2088,44 +2269,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -709,7 +951,7 @@
    ;;
  
 -freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | dragonfly*)
++freebsd* | dragonfly*)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
@@ -720,7 +962,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -2141,7 +2257,7 @@
+@@ -2141,7 +2314,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -729,9 +971,15 @@
    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
-@@ -2158,42 +2274,21 @@
+@@ -2157,43 +2330,27 @@
+   esac
    ;;
  
++interix3*)
++  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
++  ;;
++
  irix5* | irix6* | nonstopux*)
 -  case $host_os in
 -  irix5* | nonstopux*)
@@ -759,7 +1007,7 @@
    ;;
  
  # This must be Linux ELF.
- linux*)
+-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 ;;
@@ -771,15 +1019,16 @@
 -    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 | knetbsd*-gnu)
++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,19 +2307,14 @@
+@@ -2212,32 +2369,22 @@
    ;;
  
  openbsd*)
@@ -798,18 +1047,107 @@
 -  # this will be overridden with pass_all, but let us keep it just in case
 -  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
 -  lt_cv_file_magic_test_file=/shlib/libc.so
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-sco3.2v5*)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -2234,7 +2324,6 @@
- 
  solaris*)
    lt_cv_deplibs_check_method=pass_all
 -  lt_cv_file_magic_test_file=/lib/libc.so
    ;;
  
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -2342,13 +2431,13 @@
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+   case $host_vendor in
+   motorola)
+     lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+@@ -2258,10 +2405,13 @@
+   siemens)
+     lt_cv_deplibs_check_method=pass_all
+     ;;
++  pc)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
+   esac
+   ;;
+ 
+-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ esac
+@@ -2281,36 +2431,43 @@
+   # Let the user override the test.
+   lt_cv_path_NM="$NM"
+ else
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+-      # Check to see if the nm accepts a BSD-compat flag.
+-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-      #   nm: unknown option "B" ignored
+-      # Tru64's nm complains that /dev/null is an invalid object file
+-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+-      */dev/null* | *'Invalid file or object type'*)
+-	lt_cv_path_NM="$tmp_nm -B"
+-	break
+-        ;;
+-      *)
+-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+-	*/dev/null*)
+-	  lt_cv_path_NM="$tmp_nm -p"
++  lt_nm_to_check="${ac_tool_prefix}nm"
++  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
++    lt_nm_to_check="$lt_nm_to_check nm"
++  fi
++  for lt_tmp_nm in $lt_nm_to_check; do
++    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++      IFS="$lt_save_ifs"
++      test -z "$ac_dir" && ac_dir=.
++      tmp_nm="$ac_dir/$lt_tmp_nm"
++      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++	# Check to see if the nm accepts a BSD-compat flag.
++	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
++	#   nm: unknown option "B" ignored
++	# Tru64's nm complains that /dev/null is an invalid object file
++	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++	*/dev/null* | *'Invalid file or object type'*)
++	  lt_cv_path_NM="$tmp_nm -B"
+ 	  break
+ 	  ;;
+ 	*)
+-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+-	  continue # so that we can try to find one that supports BSD flags
++	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++	  */dev/null*)
++	    lt_cv_path_NM="$tmp_nm -p"
++	    break
++	    ;;
++	  *)
++	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	    continue # so that we can try to find one that supports BSD flags
++	    ;;
++	  esac
+ 	  ;;
+ 	esac
+-      esac
+-    fi
++      fi
++    done
++    IFS="$lt_save_ifs"
+   done
+-  IFS="$lt_save_ifs"
+   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi])
+ NM="$lt_cv_path_NM"
+@@ -2342,13 +2499,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl convenience library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -830,7 +1168,7 @@
  AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
    case $enable_ltdl_convenience in
-@@ -2367,13 +2456,13 @@
+@@ -2367,13 +2524,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl installable library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -851,7 +1189,7 @@
  # 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 +2500,21 @@
+@@ -2411,10 +2568,21 @@
  # ---------------
  AC_DEFUN([_LT_AC_LANG_CXX],
  [AC_REQUIRE([AC_PROG_CXX])
@@ -861,7 +1199,7 @@
  ])# _LT_AC_LANG_CXX
  
 +# _LT_AC_PROG_CXXCPP
-+# ---------------
++# ------------------
 +AC_DEFUN([_LT_AC_PROG_CXXCPP],
 +[
 +AC_REQUIRE([AC_PROG_CXX])
@@ -874,28 +1212,69 @@
  
  # AC_LIBTOOL_F77
  # --------------
-@@ -2487,6 +2587,10 @@
+@@ -2454,7 +2622,7 @@
  
+ 
+ # AC_LIBTOOL_RC
+-# --------------
++# -------------
+ # enable support for Windows resource files
+ AC_DEFUN([AC_LIBTOOL_RC],
+ [AC_REQUIRE([LT_AC_PROG_RC])
+@@ -2487,36 +2655,9 @@
+ 
  _LT_AC_SYS_COMPILER
  
+-#
+-# Check for any special shared library compilation flags.
+-#
+-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
+-if test "$GCC" = no; then
+-  case $host_os in
+-  sco3.2v5*)
+-    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
+-    ;;
+-  esac
+-fi
+-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
+-  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
+-  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ 	]]" >/dev/null; then :
+-  else
+-    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
+-    _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
+-  fi
+-fi
+-
+-
+-#
+-# Check to make sure the static flag actually works.
+-#
+-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
+-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+-  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
+-  [],
+-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+-
 +# save warnings/boilerplate of simple test code
 +_LT_COMPILER_BOILERPLATE
 +_LT_LINKER_BOILERPLATE
-+
- #
- # Check for any special shared library compilation flags.
- #
-@@ -2500,7 +2604,7 @@
- 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 :
-+  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
-@@ -2541,7 +2645,7 @@
  
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+@@ -2530,9 +2671,9 @@
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
++AC_LIBTOOL_DLOPEN_SELF
+ 
+-# Report which librarie types wil actually be built
++# Report which library types will actually be built
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+ 
+@@ -2541,7 +2682,7 @@
+ 
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
 -case "$host_os" in
@@ -903,7 +1282,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -2550,48 +2654,11 @@
+@@ -2550,48 +2691,11 @@
    fi
    ;;
  
@@ -954,7 +1333,7 @@
  esac
  AC_MSG_RESULT([$enable_shared])
  
-@@ -2616,7 +2683,7 @@
+@@ -2616,7 +2720,7 @@
  AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
  [AC_LANG_PUSH(C++)
  AC_REQUIRE([AC_PROG_CXX])
@@ -963,7 +1342,15 @@
  
  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -2645,7 +2712,7 @@
+@@ -2628,6 +2732,7 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+ _LT_AC_TAGVAR(module_cmds, $1)=
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+@@ -2645,7 +2750,7 @@
  _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
  
  # Source file extension for C++ test sources.
@@ -972,7 +1359,13 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -2660,6 +2727,10 @@
+@@ -2655,11 +2760,15 @@
+ lt_simple_compile_test_code="int some_variable = 0;\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
+ 
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -983,7 +1376,20 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -2681,7 +2752,7 @@
+@@ -2670,18 +2779,18 @@
+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+   lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+-  unset lt_cv_prog_gnu_ld
++  $as_unset lt_cv_prog_gnu_ld
+ fi
+ if test -n "${lt_cv_path_LDCXX+set}"; then
+   lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+-  unset lt_cv_path_LD
++  $as_unset lt_cv_path_LD
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
  CC=${CXX-"c++"}
  compiler=$CC
  _LT_AC_TAGVAR(compiler, $1)=$CC
@@ -992,7 +1398,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -2699,8 +2770,8 @@
+@@ -2699,8 +2808,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
@@ -1003,7 +1409,7 @@
  
      _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 +2797,7 @@
+@@ -2726,7 +2835,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.
@@ -1012,7 +1418,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -2756,8 +2827,22 @@
+@@ -2756,8 +2865,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -1032,12 +1438,13 @@
 +	    ;;
 +	  esac
 +	done
++	;;
 +      esac
 +
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -2774,7 +2859,7 @@
+@@ -2774,7 +2898,7 @@
      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
      if test "$GXX" = yes; then
@@ -1046,8 +1453,11 @@
        # 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`
-@@ -2795,6 +2880,9 @@
+@@ -2793,8 +2917,12 @@
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  	fi
++	;;
        esac
        shared_flag='-shared'
 +      if test "$aix_use_runtimelinking" = yes; then
@@ -1056,7 +1466,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -2803,15 +2891,16 @@
+@@ -2803,15 +2931,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -1077,39 +1487,55 @@
      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 +2909,12 @@
+@@ -2820,13 +2949,12 @@
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  
 -      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $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 $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${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 $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	_LT_AC_SYS_LIBPATH_AIX
-@@ -2840,8 +2928,8 @@
+@@ -2835,16 +2963,26 @@
+ 	# -berok will link without error, but may produce a broken library.
+ 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	# -bexpall does not export symbols beginning with underscore (_)
+-	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
  	# Exported symbols can be pulled into shared objects from archives
- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++	_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 $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	_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
      ;;
-@@ -2854,16 +2942,17 @@
-     esac
-     ;;
- 
 +
-   cygwin* | mingw* | pw32*)
++  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 +2996,12 @@
      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
      # as there is no search path for DLLs.
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1120,16 +1546,16 @@
  
      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}--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 +2961,81 @@
+@@ -2872,70 +3010,81 @@
  	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}--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
@@ -1171,15 +1597,7 @@
 -    *) # 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'
-+    if test "$GXX" = yes ; then
-+      lt_int_apple_cc_single_mod=no
-+      output_verbose_link_cmd='echo'
-+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-+       lt_int_apple_cc_single_mod=yes
-+      fi
-+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       else
+-      else
 -	case ${MACOSX_DEPLOYMENT_TARGET} in
 -	  10.[012])
 -	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
@@ -1188,31 +1606,7 @@
 -	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
 -	    ;;
 -	esac
-+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+        fi
-+        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          else
-+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          fi
-+            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      else
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+          ;;
-+      esac
-       fi
+-      fi
 -      ;;
 -    esac
 -    lt_int_apple_cc_single_mod=no
@@ -1243,6 +1637,40 @@
 -    _LT_AC_TAGVAR(ld_shlibs, $1)=no
 -  fi
 -    ;;
++    if test "$GXX" = yes ; then
++      lt_int_apple_cc_single_mod=no
++      output_verbose_link_cmd='echo'
++      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++       lt_int_apple_cc_single_mod=yes
++      fi
++      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      else
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++        fi
++        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          else
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          fi
++            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
++      fi
 +        ;;
  
    dgux*)
@@ -1257,7 +1685,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -2946,14 +3046,14 @@
+@@ -2946,14 +3095,14 @@
  	;;
      esac
      ;;
@@ -1270,11 +1698,11 @@
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      ;;
 -  freebsd* | kfreebsd*-gnu)
-+  freebsd* | kfreebsd*-gnu | dragonfly*)
++  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 +3070,12 @@
+@@ -2970,12 +3119,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -1290,7 +1718,7 @@
        # 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 +3084,11 @@
+@@ -2984,11 +3133,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.
@@ -1304,25 +1732,48 @@
        else
          # FIXME: insert proper C++ library support
          _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -2998,7 +3098,7 @@
+@@ -2998,33 +3147,22 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
 -      case "$host_cpu" in
+-      hppa*64*)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
 +      case $host_cpu in
-       hppa*64*)
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      hppa*64*|ia64*)
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -3014,7 +3114,7 @@
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-        ;;
+-      ia64*)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
          ;;
+       *)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+         ;;
        esac
      fi
 -    case "$host_cpu" in
+-    hppa*64*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
+-    ia64*)
 +    case $host_cpu in
-     hppa*64*)
++    hppa*64*|ia64*)
        _LT_AC_TAGVAR(hardcode_direct, $1)=no
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -3035,17 +3135,17 @@
+-      _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 +3173,20 @@
      esac
  
      case $cc_basename in
@@ -1333,10 +1784,15 @@
  	;;
 -      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*|ia64*)
- 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	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'
@@ -1344,14 +1800,19 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -3061,12 +3161,12 @@
+@@ -3061,12 +3202,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
- 	    ia64*|hppa*64*)
- 	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	    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'
@@ -1359,8 +1820,24 @@
  	      ;;
  	    esac
  	  fi
-@@ -3079,9 +3179,9 @@
+@@ -3077,11 +3221,25 @@
+ 	;;
+     esac
      ;;
++  interix3*)
++    _LT_AC_TAGVAR(hardcode_direct, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++    # Instead, shared libraries are loaded at an image base (0x10000000 by
++    # default) and relocated if they conflict, which is a slow very memory
++    # consuming and fragmenting process.  To avoid this, we pick a random,
++    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    ;;
    irix5* | irix6*)
      case $cc_basename in
 -      CC)
@@ -1371,7 +1848,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -3092,9 +3192,9 @@
+@@ -3092,9 +3250,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -1383,9 +1860,12 @@
  	  fi
  	fi
  	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -3105,14 +3205,14 @@
+@@ -3103,16 +3261,16 @@
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
      ;;
-   linux*)
+-  linux*)
++  linux* | k*bsd*-gnu)
      case $cc_basename in
 -      KCC)
 +      KCC*)
@@ -1401,7 +1881,7 @@
  	# 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 +3230,44 @@
+@@ -3130,20 +3288,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -1452,7 +1932,7 @@
  
  	runpath_var=LD_RUN_PATH
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -3171,7 +3295,7 @@
+@@ -3171,7 +3353,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -1461,16 +1941,16 @@
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	;;
-@@ -3181,7 +3305,7 @@
+@@ -3181,7 +3363,7 @@
  	;;
      esac
      ;;
 -  netbsd*)
-+  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++  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 +3316,31 @@
+@@ -3192,15 +3374,31 @@
      # 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::"'
      ;;
@@ -1504,7 +1984,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3210,14 +3350,14 @@
+@@ -3210,14 +3408,14 @@
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -1522,7 +2002,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3235,7 +3375,7 @@
+@@ -3235,7 +3433,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1531,7 +2011,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3254,13 +3394,13 @@
+@@ -3254,13 +3452,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -1547,7 +2027,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3269,17 +3409,17 @@
+@@ -3269,17 +3467,17 @@
  	# the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
  	;;
@@ -1569,7 +2049,7 @@
  	  $rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -3298,7 +3438,7 @@
+@@ -3298,7 +3496,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1578,17 +2058,23 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3322,7 +3462,7 @@
-   sco*)
-     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-     case $cc_basename in
+@@ -3319,27 +3517,14 @@
+     # FIXME: insert proper C++ library support
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+-  sco*)
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case $cc_basename in
 -      CC)
-+      CC*)
- 	# FIXME: insert proper C++ library support
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
- 	;;
-@@ -3334,12 +3474,12 @@
-     ;;
+-	# 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)
@@ -1602,7 +2088,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3352,36 +3492,33 @@
+@@ -3352,36 +3537,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -1651,7 +2137,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -3389,9 +3526,9 @@
+@@ -3389,9 +3571,9 @@
  	# in the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -1663,7 +2149,7 @@
  
  	# 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 +3538,9 @@
+@@ -3401,9 +3583,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
@@ -1675,7 +2161,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -3412,9 +3549,9 @@
+@@ -3412,9 +3594,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -1687,8 +2173,65 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -3432,7 +3569,7 @@
+@@ -3427,12 +3609,63 @@
+ 	;;
+     esac
      ;;
+-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
++  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    runpath_var='LD_RUN_PATH'
++
++    case $cc_basename in
++      CC*)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      *)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
++    ;;
++  sysv5* | sco3.2v5* | sco5v6*)
++    # Note: We can NOT use -z defs as we might desire, because we do not
++    # link with -lc, and that would cause any symbols used from libc to
++    # always be unresolved, which means just about no library would
++    # ever link correctly.  If we're not using GNU ld we use -z text
++    # though, which does catch some bad symbols but isn't as heavy-handed
++    # as -z defs.
++    # For security reasons, it is highly recommended that you always
++    # use absolute paths for naming shared libraries, and exclude the
++    # DT_RUNPATH tag from executables and libraries.  But doing so
++    # requires that you compile everything twice, which is a pain.
++    # So that behaviour is only enabled if SCOABSPATH is set to a
++    # non-empty value in the environment.  Most likely only useful for
++    # creating official distributions of packages.
++    # This is a hack until libtool officially supports absolute path
++    # names for shared libraries.
++    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++    runpath_var='LD_RUN_PATH'
++
++    case $cc_basename in
++      CC*)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      *)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
+     ;;
    tandem*)
      case $cc_basename in
 -      NCC)
@@ -1696,7 +2239,25 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3542,7 +3679,7 @@
+@@ -3469,8 +3702,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+@@ -3488,7 +3719,7 @@
+ ])# AC_LIBTOOL_LANG_CXX_CONFIG
+ 
+ # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+-# ------------------------
++# ------------------------------------
+ # Figure out "hidden" library dependencies from verbose
+ # compiler output when linking a shared library.
+ # Parse the compiler output and extract the necessary
+@@ -3542,7 +3773,7 @@
    # The `*' in the case matches for architectures that use `case' in
    # $output_verbose_cmd can trigger glob expansion during the loop
    # eval without this substitution.
@@ -1705,7 +2266,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -3582,7 +3719,7 @@
+@@ -3582,7 +3813,7 @@
         fi
         ;;
  
@@ -1714,13 +2275,21 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -3618,6 +3755,21 @@
+@@ -3618,13 +3849,37 @@
  
  $rm -f confest.$objext
  
 +# PORTME: override above test on systems where it is broken
 +ifelse([$1],[CXX],
 +[case $host_os in
++interix3*)
++  # Interix 3.5 installs completely hosed .la files for C++, so rather than
++  # hack all around it, let's just trust "g++" to DTRT.
++  _LT_AC_TAGVAR(predep_objects,$1)=
++  _LT_AC_TAGVAR(postdep_objects,$1)=
++  _LT_AC_TAGVAR(postdeps,$1)=
++  ;;
++
 +solaris*)
 +  case $cc_basename in
 +  CC*)
@@ -1730,13 +2299,22 @@
 +    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
 +    ;;
 +  esac
++  ;;
 +esac
 +])
 +
  case " $_LT_AC_TAGVAR(postdeps, $1) " in
  *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
  esac
-@@ -3668,12 +3820,16 @@
+ ])# 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'.
+@@ -3668,12 +3923,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -1754,7 +2332,7 @@
  
  AC_MSG_CHECKING([if libtool supports shared libraries])
  AC_MSG_RESULT([$can_build_shared])
-@@ -3683,7 +3839,7 @@
+@@ -3683,7 +3942,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -1763,7 +2341,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -3691,8 +3847,10 @@
+@@ -3691,8 +3950,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -1776,7 +2354,25 @@
    ;;
  esac
  AC_MSG_RESULT([$enable_shared])
-@@ -3743,20 +3901,27 @@
+@@ -3702,8 +3963,6 @@
+ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+ 
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+-
+ _LT_AC_TAGVAR(GCC, $1)="$G77"
+ _LT_AC_TAGVAR(LD, $1)="$LD"
+ 
+@@ -3713,8 +3972,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+@@ -3743,20 +4000,27 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -1805,7 +2401,25 @@
  ## 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
-@@ -3803,11 +3968,16 @@
+@@ -3768,8 +4032,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+@@ -3779,7 +4041,7 @@
+ 
+ 
+ # AC_LIBTOOL_LANG_RC_CONFIG
+-# --------------------------
++# -------------------------
+ # Ensure that the configuration vars for the Windows resource compiler are
+ # suitably defined.  Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+@@ -3803,11 +4065,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -1822,7 +2436,7 @@
  _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
  
  AC_LIBTOOL_CONFIG($1)
-@@ -3833,11 +4003,12 @@
+@@ -3833,11 +4100,12 @@
    # without removal of \ escapes.
    if test -n "${ZSH_VERSION+set}" ; then
      setopt NO_GLOB_SUBST
@@ -1832,12 +2446,12 @@
    # 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 NM \
++  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 \
-@@ -3887,7 +4058,7 @@
+@@ -3887,7 +4155,7 @@
      _LT_AC_TAGVAR(archive_cmds, $1) | \
      _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
      _LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1846,7 +2460,7 @@
      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
      _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
      extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -3953,11 +4124,11 @@
+@@ -3953,11 +4221,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -1860,7 +2474,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -3988,6 +4159,12 @@
+@@ -3988,6 +4256,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -1873,7 +2487,17 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -4018,7 +4195,7 @@
+@@ -3999,6 +4273,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+ 
+@@ -4018,7 +4295,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -1882,7 +2506,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -4049,7 +4226,7 @@
+@@ -4049,7 +4326,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -1891,7 +2515,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -4064,7 +4241,7 @@
+@@ -4064,7 +4341,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
  
@@ -1900,7 +2524,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -4293,7 +4470,10 @@
+@@ -4293,7 +4570,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -1912,7 +2536,7 @@
  fi
  ])# AC_LIBTOOL_CONFIG
  
-@@ -4335,9 +4515,6 @@
+@@ -4335,9 +4615,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
  
@@ -1922,11 +2546,11 @@
  # 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,6 +4536,13 @@
+@@ -4359,14 +4636,30 @@
    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
    ;;
-+linux*)
++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'"
@@ -1936,16 +2560,26 @@
  irix* | nonstopux*)
    symcode='[[BCDEGRST]]'
    ;;
-@@ -4366,7 +4550,7 @@
+ osf*)
    symcode='[[BCDEGQRST]]'
    ;;
- solaris* | sysv5*)
+-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 +4568,17 @@
+@@ -4384,14 +4677,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -1965,7 +2599,18 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -4555,7 +4742,7 @@
+@@ -4547,6 +4843,10 @@
+       # DJGPP does not support shared libraries at all
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+       ;;
++    interix3*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
+     sysv4*MP*)
+       if test -d /usr/nec; then
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+@@ -4555,7 +4855,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -1974,7 +2619,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -4580,18 +4767,28 @@
+@@ -4580,18 +4880,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -2006,12 +2651,12 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -4599,22 +4796,22 @@
+@@ -4599,22 +4909,22 @@
  	    ;;
  	esac
  	;;
 -      freebsd* | kfreebsd*-gnu)
-+      freebsd* | kfreebsd*-gnu | dragonfly*)
++      freebsd* | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
@@ -2019,7 +2664,8 @@
 -	  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)="${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
@@ -2027,14 +2673,21 @@
 -	  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"
+-	    _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
  	      ;;
-@@ -4629,7 +4826,7 @@
+@@ -4627,9 +4937,13 @@
+ 	    ;;
+ 	esac
  	;;
++      interix*)
++	# This is c89, which is MS Visual C++ (no shared libs)
++	# Anyone wants to do a port?
++	;;
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
 -	  CC)
@@ -2042,9 +2695,12 @@
  	    _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.
-@@ -4640,18 +4837,24 @@
+@@ -4638,20 +4952,26 @@
+ 	    ;;
+ 	esac
  	;;
-       linux*)
+-      linux*)
++      linux* | k*bsd*-gnu)
  	case $cc_basename in
 -	  KCC)
 +	  KCC*)
@@ -2071,7 +2727,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -4668,25 +4871,25 @@
+@@ -4668,25 +4988,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -2084,7 +2740,7 @@
  	esac
  	;;
 -      netbsd*)
-+      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++      netbsd* | netbsdelf*-gnu)
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
@@ -2102,17 +2758,19 @@
  	    # Digital/Compaq C++
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -4702,7 +4905,7 @@
+@@ -4700,24 +5020,15 @@
  	;;
-       sco*)
- 	case $cc_basename in
+       psos*)
+ 	;;
+-      sco*)
+-	case $cc_basename in
 -	  CC)
-+	  CC*)
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- 	    ;;
- 	  *)
-@@ -4711,13 +4914,13 @@
- 	;;
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
        solaris*)
  	case $cc_basename in
 -	  CC)
@@ -2127,7 +2785,7 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
  	    ;;
-@@ -4727,12 +4930,12 @@
+@@ -4727,12 +5038,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -2142,7 +2800,7 @@
  	    # Lucid
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -4742,7 +4945,7 @@
+@@ -4742,7 +5053,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -2151,7 +2809,35 @@
  	    # NonStop-UX NCC 3.20
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    ;;
-@@ -4813,7 +5016,7 @@
+@@ -4750,7 +5061,14 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      unixware*)
++      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++	case $cc_basename in
++	  CC*)
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	esac
+ 	;;
+       vxworks*)
+ 	;;
+@@ -4797,6 +5115,11 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+       ;;
+ 
++    interix3*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
++
+     msdosdjgpp*)
+       # Just because we use GCC doesn't mean we suddenly get shared libraries
+       # on systems that don't support them.
+@@ -4813,7 +5136,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2160,7 +2846,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -4839,6 +5042,16 @@
+@@ -4839,6 +5162,16 @@
  	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -2177,7 +2863,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -4850,7 +5063,7 @@
+@@ -4850,7 +5183,7 @@
        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2186,11 +2872,13 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -4874,12 +5087,19 @@
+@@ -4873,13 +5206,20 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
        ;;
  
-     linux*)
+-    linux*)
 -      case $CC in
++    linux* | k*bsd*-gnu)
 +      case $cc_basename in
        icc* | ecc*)
  	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -2207,9 +2895,15 @@
        ccc*)
          _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
          # All Alpha code is PIC.
-@@ -4900,9 +5120,14 @@
+@@ -4894,15 +5234,15 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
        ;;
  
+-    sco3.2v5*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
+-      ;;
+-
      solaris*)
 -      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -2223,10 +2917,25 @@
        ;;
  
      sunos4*)
-@@ -4924,6 +5149,11 @@
+@@ -4911,7 +5251,7 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+ 
+-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++    sysv4 | sysv4.2uw2* | sysv4.3*)
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -4924,6 +5264,17 @@
        fi
        ;;
  
++    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
 +    unicos*)
 +      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
@@ -2235,7 +2944,7 @@
      uts4*)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4951,7 +5181,7 @@
+@@ -4951,7 +5302,7 @@
      [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
  fi
@@ -2244,19 +2953,36 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -4984,7 +5214,10 @@
+@@ -4960,6 +5311,16 @@
+     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+     ;;
+ esac
++
++#
++# Check to make sure the static flag actually works.
++#
++wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
++  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
++  $lt_tmp_static_flag,
++  [],
++  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+ ])
+ 
+ 
+@@ -4984,7 +5345,10 @@
      _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
 -    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
 +    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
 +  ;;
-+  linux*)
++  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'
-@@ -5010,7 +5243,7 @@
+@@ -5010,7 +5374,7 @@
    _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
    _LT_AC_TAGVAR(hardcode_automatic, $1)=no
    _LT_AC_TAGVAR(module_cmds, $1)=
@@ -2265,7 +2991,7 @@
    _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*
-@@ -5027,7 +5260,8 @@
+@@ -5027,7 +5391,8 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -2275,7 +3001,18 @@
    case $host_os in
    cygwin* | mingw* | pw32*)
      # FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -5047,6 +5281,27 @@
+@@ -5037,6 +5402,10 @@
+       with_gnu_ld=no
+     fi
+     ;;
++  interix*)
++    # we just hope/assume this is gcc and not c89 (= MSVC++)
++    with_gnu_ld=yes
++    ;;
+   openbsd*)
+     with_gnu_ld=no
+     ;;
+@@ -5047,6 +5416,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -2303,7 +3040,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -5084,7 +5339,7 @@
+@@ -5084,7 +5474,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
@@ -2312,7 +3049,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -5094,13 +5349,13 @@
+@@ -5094,13 +5484,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
        # as there is no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -2325,22 +3062,37 @@
  
        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}--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,19 +5364,51 @@
+@@ -5109,23 +5499,70 @@
  	  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}--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
 +      ;;
 +
-+    linux*)
++    interix3*)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++      # Instead, shared libraries are loaded at an image base (0x10000000 by
++      # default) and relocated if they conflict, which is a slow very memory
++      # consuming and fragmenting process.  To avoid this, we pick a random,
++      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      ;;
++
++    linux* | k*bsd*-gnu)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	tmp_addflag=
 +	case $cc_basename,$host_cpu in
@@ -2374,7 +3126,7 @@
        ;;
  
 -    netbsd*)
-+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++    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=
@@ -2386,7 +3138,12 @@
        fi
        ;;
  
-@@ -5139,8 +5426,8 @@
+-    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 +5576,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -2397,8 +3154,40 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -5155,24 +5442,19 @@
+       ;;
  
++    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 +5619,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'
@@ -2429,7 +3218,16 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -5206,9 +5488,20 @@
+@@ -5184,7 +5643,7 @@
+       # Note: this linker hardcodes the directories in LIBPATH if there
+       # are no directories specified by -L.
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      if test "$GCC" = yes && test -z "$link_static_flag"; then
++      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ 	# Neither direct hardcoding nor static linking is supported with a
+ 	# broken collect2.
+ 	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -5206,9 +5665,21 @@
  	else
  	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -2445,6 +3243,7 @@
 +  	    break
 +  	  fi
 +	  done
++	  ;;
 +	esac
  
 -	# KDE requires run time linking.  Make it the default.
@@ -2452,7 +3251,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -5225,7 +5518,7 @@
+@@ -5225,7 +5696,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
        if test "$GCC" = yes; then
@@ -2461,8 +3260,11 @@
  	# 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`
-@@ -5246,6 +5539,9 @@
+@@ -5244,8 +5715,12 @@
+   	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+   	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  	  fi
++	  ;;
  	esac
  	shared_flag='-shared'
 +	if test "$aix_use_runtimelinking" = yes; then
@@ -2471,16 +3273,19 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -5254,29 +5550,29 @@
+@@ -5253,30 +5728,30 @@
+   	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
-   	if test "$aix_use_runtimelinking" = yes; then
+-  	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
        fi
  
@@ -2500,28 +3305,34 @@
 -	_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 $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${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 $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 _LT_AC_SYS_LIBPATH_AIX
-@@ -5290,8 +5586,8 @@
+@@ -5285,13 +5760,11 @@
+ 	  # -berok will link without error, but may produce a broken library.
+ 	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	  # -bexpall does not export symbols beginning with underscore (_)
+-	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
  	  # Exported symbols can be pulled into shared objects from archives
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++	  _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 $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	  _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 +5600,7 @@
+@@ -5304,7 +5777,7 @@
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;
  
@@ -2530,7 +3341,7 @@
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
        ;;
  
-@@ -5314,69 +5610,69 @@
+@@ -5314,69 +5787,69 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -2646,18 +3457,18 @@
        ;;
  
      dgux*)
-@@ -5409,8 +5705,8 @@
+@@ -5409,8 +5882,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* | kfreebsd*-gnu | dragonfly*)
++    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 +5714,7 @@
+@@ -5418,7 +5891,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -2666,15 +3477,41 @@
        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
-@@ -5434,16 +5730,16 @@
+@@ -5432,47 +5905,62 @@
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       ;;
  
-     hpux10* | hpux11*)
+-    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*|ia64*)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	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'
@@ -2683,21 +3520,52 @@
  	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*|ia64*)
- 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	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'
  	  ;;
-@@ -5453,7 +5749,7 @@
+ 	*)
+-	  _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*)
- 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	hppa*64*|ia64*)
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -5486,7 +5782,7 @@
+-	  _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 +5974,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'
@@ -2705,16 +3573,16 @@
        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 +5792,7 @@
+@@ -5496,7 +5984,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
 -    netbsd*)
-+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++    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
-@@ -5519,7 +5815,8 @@
+@@ -5519,7 +6007,8 @@
        _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
@@ -2724,7 +3592,7 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        else
-@@ -5529,7 +5826,7 @@
+@@ -5529,7 +6018,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	   ;;
  	 *)
@@ -2733,7 +3601,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -5540,14 +5837,14 @@
+@@ -5540,14 +6029,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
@@ -2750,7 +3618,7 @@
        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 +5856,13 @@
+@@ -5559,13 +6048,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}\*'
@@ -2766,7 +3634,18 @@
  
  	# Both c and cxx compiler support -rpath directly
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -5584,10 +5881,12 @@
+@@ -5573,21 +6062,15 @@
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       ;;
+ 
+-    sco3.2v5*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+-      runpath_var=LD_RUN_PATH
+-      hardcode_runpath_var=yes
+-      ;;
+-
      solaris*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
        if test "$GCC" = yes; then
@@ -2781,7 +3660,7 @@
  	_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 +5895,18 @@
+@@ -5596,8 +6079,18 @@
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        case $host_os in
        solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -2802,7 +3681,7 @@
        esac
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
-@@ -5606,7 +5915,7 @@
+@@ -5606,7 +6099,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.
@@ -2811,19 +3690,86 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -5666,9 +5975,9 @@
-    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
-       _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+@@ -5654,36 +6147,45 @@
+       fi
+       ;;
+ 
+-    sysv4.2uw2*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
++      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
+-      ;;
++      runpath_var='LD_RUN_PATH'
+ 
+-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
        else
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
        fi
+-      runpath_var='LD_RUN_PATH'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    sysv5*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+-      # $CC -shared without GNU ld will not create a library from C++
+-      # object files and a static libstdc++, better avoid it by now
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++    sysv5* | sco3.2v5* | sco5v6*)
++      # Note: We can NOT use -z defs as we might desire, because we do not
++      # link with -lc, and that would cause any symbols used from libc to
++      # always be unresolved, which means just about no library would
++      # ever link correctly.  If we're not using GNU ld we use -z text
++      # though, which does catch some bad symbols but isn't as heavy-handed
++      # as -z defs.
++      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
        runpath_var='LD_RUN_PATH'
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -5726,7 +6035,7 @@
++
++      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 +6203,6 @@
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+ test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -5726,13 +6223,14 @@
        AC_MSG_CHECKING([whether -lc should be explicitly linked in])
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -2832,7 +3778,14 @@
        if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
          soname=conftest
          lib=conftest
-@@ -5860,7 +6169,7 @@
+         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=
+@@ -5860,7 +6358,7 @@
  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
  # along with /bin/sed that truncates output.
  for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -2841,9 +3794,9 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-diff -ru digikam-0.8.0.old/admin/ltmain.sh digikam-0.8.0/admin/ltmain.sh
---- digikam-0.8.0.old/admin/ltmain.sh	2005-11-21 20:14:05.000000000 +0100
-+++ digikam-0.8.0/admin/ltmain.sh	2005-12-31 09:24:30.000000000 +0100
+diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
+--- a/admin/ltmain.sh	2006-03-17 16:38:41.000000000 -0500
++++ b/admin/ltmain.sh	2006-03-24 19:22:40.000000000 -0500
 @@ -1,7 +1,7 @@
  # ltmain.sh - Provide generalized library-building support services.
  # NOTE: Changing this file will not affect anything until you rerun configure.
@@ -2876,8 +3829,8 @@
 +
 +PROGRAM=ltmain.sh
 +PACKAGE=libtool
-+VERSION="1.5.20 Debian 1.5.20-2"
-+TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)"
++VERSION="1.5.22 Debian 1.5.22-4"
++TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 +
 +# See if we are running on zsh, and set the options which allow our
 +# commands through without removal of \ escapes.
@@ -2958,10 +3911,56 @@
  fi
  
  # Global variables.
-@@ -118,10 +139,14 @@
+@@ -111,6 +132,8 @@
+ show="$echo"
+ show_help=
+ execute_dlfiles=
++duplicate_deps=no
++preserve_args=
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
+ 
+@@ -118,10 +141,51 @@
  # Shell function definitions:
  # This seems to be the best place for them
  
++# func_mktempdir [string]
++# Make a temporary directory that won't clash with other running
++# libtool processes, and avoids race conditions if possible.  If
++# given, STRING is the basename for that directory.
++func_mktempdir ()
++{
++    my_template="${TMPDIR-/tmp}/${1-$progname}"
++
++    if test "$run" = ":"; then
++      # Return a directory name, but don't create it in dry-run mode
++      my_tmpdir="${my_template}-$$"
++    else
++
++      # If mktemp works, use that first and foremost
++      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
++
++      if test ! -d "$my_tmpdir"; then
++	# Failing that, at least try and use $RANDOM to avoid a race
++	my_tmpdir="${my_template}-${RANDOM-0}$$"
++
++	save_mktempdir_umask=`umask`
++	umask 0077
++	$mkdir "$my_tmpdir"
++	umask $save_mktempdir_umask
++      fi
++
++      # If we're not in dry-run mode, bomb out on failure
++      test -d "$my_tmpdir" || {
++        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
++	exit $EXIT_FAILURE
++      }
++    fi
++
++    $echo "X$my_tmpdir" | $Xsed
++}
++
++
 +# func_win32_libid arg
 +# return the library type of file 'arg'
 +#
@@ -2974,17 +3973,24 @@
    win32_libid_type="unknown"
    win32_fileres=`file -L $1 2>/dev/null`
    case $win32_fileres in
-@@ -130,7 +155,7 @@
+@@ -130,17 +194,16 @@
      ;;
    *ar\ archive*) # could be an import, or static
      if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
 -      grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
 +      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
        win32_nmres=`eval $NM -f posix -A $1 | \
- 	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
-       if test "X$win32_nmres" = "Ximport" ; then
-@@ -140,7 +165,7 @@
-       fi
+-	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*) 
@@ -2992,7 +3998,7 @@
      win32_libid_type="x86 DLL"
      ;;
    *executable*) # but shell scripts are "executable" too...
-@@ -154,9 +179,179 @@
+@@ -154,9 +217,181 @@
    $echo $win32_libid_type
  }
  
@@ -3112,9 +4118,9 @@
 +      $run ${rm}r "$my_xdir"
 +      $show "$mkdir $my_xdir"
 +      $run $mkdir "$my_xdir"
-+      status=$?
-+      if test "$status" -ne 0 && test ! -d "$my_xdir"; then
-+	exit $status
++      exit_status=$?
++      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
++	exit $exit_status
 +      fi
 +      case $host in
 +      *-darwin*)
@@ -3169,10 +4175,12 @@
 +# Darwin sucks
 +eval std_shrext=\"$shrext_cmds\"
 +
++disable_libs=no
++
  # Parse our command line options once, thoroughly.
  while test "$#" -gt 0
  do
-@@ -176,12 +371,13 @@
+@@ -176,12 +411,13 @@
        ;;
      tag)
        tagname="$arg"
@@ -3187,7 +4195,7 @@
  	;;
        esac
  
-@@ -191,10 +387,10 @@
+@@ -191,10 +427,10 @@
  	# not specially marked.
  	;;
        *)
@@ -3200,7 +4208,7 @@
  	else
  	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
  	fi
-@@ -220,24 +416,25 @@
+@@ -220,24 +456,25 @@
    --version)
      $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
      $echo
@@ -3231,7 +4239,7 @@
      ;;
  
    --dry-run | -n)
-@@ -256,7 +453,7 @@
+@@ -256,7 +493,7 @@
      else
        $echo "disable static libraries"
      fi
@@ -3240,15 +4248,20 @@
      ;;
  
    --finish) mode="finish" ;;
-@@ -268,6 +465,7 @@
+@@ -268,13 +505,19 @@
  
    --quiet | --silent)
      show=:
 +    preserve_args="$preserve_args $arg"
      ;;
  
-   --tag) prevopt="--tag" prev=tag ;;
-@@ -275,6 +473,7 @@
+-  --tag) prevopt="--tag" prev=tag ;;
++  --tag)
++    prevopt="--tag"
++    prev=tag
++    preserve_args="$preserve_args --tag"
++    ;;
+   --tag=*)
      set tag "$optarg" ${1+"$@"}
      shift
      prev=tag
@@ -3256,7 +4269,7 @@
      ;;
  
    -dlopen)
-@@ -285,7 +484,7 @@
+@@ -285,7 +528,7 @@
    -*)
      $echo "$modename: unrecognized option \`$arg'" 1>&2
      $echo "$help" 1>&2
@@ -3265,7 +4278,7 @@
      ;;
  
    *)
-@@ -298,7 +497,7 @@
+@@ -298,9 +541,21 @@
  if test -n "$prevopt"; then
    $echo "$modename: option \`$prevopt' requires an argument" 1>&2
    $echo "$help" 1>&2
@@ -3273,8 +4286,22 @@
 +  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
-@@ -311,7 +510,7 @@
+ # will be execed at the end.  This prevents here-documents from being
+ # left over by shells.
+@@ -311,7 +566,7 @@
    # Infer the operation mode.
    if test -z "$mode"; then
      $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
@@ -3283,7 +4310,7 @@
      case $nonopt in
      *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
        mode=link
-@@ -354,7 +553,7 @@
+@@ -354,7 +609,7 @@
    if test -n "$execute_dlfiles" && test "$mode" != execute; then
      $echo "$modename: unrecognized option \`-dlopen'" 1>&2
      $echo "$help" 1>&2
@@ -3292,7 +4319,7 @@
    fi
  
    # Change the help message to a mode-specific one.
-@@ -369,13 +568,15 @@
+@@ -369,13 +624,15 @@
      # Get the compilation command and the source file.
      base_compile=
      srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
@@ -3309,7 +4336,7 @@
        arg  )
  	# do not "continue".  Instead, add this to base_compile
  	lastarg="$arg"
-@@ -394,24 +595,19 @@
+@@ -394,24 +651,19 @@
  	-o)
  	  if test -n "$libobj" ; then
  	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
@@ -3339,7 +4366,7 @@
  	  continue
  	  ;;
  
-@@ -424,7 +620,7 @@
+@@ -424,7 +676,7 @@
  	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
  	  lastarg=
  	  save_ifs="$IFS"; IFS=','
@@ -3348,7 +4375,7 @@
  	    IFS="$save_ifs"
  
  	    # Double-quote args containing other shell metacharacters.
-@@ -462,7 +658,10 @@
+@@ -462,7 +714,10 @@
        case $lastarg in
        # Double-quote args containing other shell metacharacters.
        # Many Bourne shells cannot handle close brackets correctly
@@ -3360,7 +4387,7 @@
        *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
  	lastarg="\"$lastarg\""
  	;;
-@@ -474,11 +673,11 @@
+@@ -474,11 +729,11 @@
      case $arg_mode in
      arg)
        $echo "$modename: you must specify an argument for -Xcompile"
@@ -3374,7 +4401,7 @@
        ;;
      *)
        # Get the name of the library object.
-@@ -511,51 +710,39 @@
+@@ -511,51 +766,39 @@
      *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
      *)
        $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
@@ -3453,7 +4480,7 @@
      objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
      xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
      if test "X$xdir" = "X$obj"; then
-@@ -568,7 +755,7 @@
+@@ -568,7 +811,7 @@
      if test -z "$base_compile"; then
        $echo "$modename: you must specify a compilation command" 1>&2
        $echo "$help" 1>&2
@@ -3462,7 +4489,7 @@
      fi
  
      # Delete any leftover library objects.
-@@ -579,7 +766,7 @@
+@@ -579,7 +822,7 @@
      fi
  
      $run $rm $removelist
@@ -3471,7 +4498,7 @@
  
      # On Cygwin there's no "real" PIC flag so we must build both object types
      case $host_os in
-@@ -598,7 +785,7 @@
+@@ -598,7 +841,7 @@
        output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
        lockfile="$output_obj.lock"
        removelist="$removelist $output_obj $lockfile"
@@ -3480,7 +4507,7 @@
      else
        output_obj=
        need_locks=no
-@@ -608,7 +795,7 @@
+@@ -608,7 +851,7 @@
      # Lock this critical section if it is needed
      # We use this script file to make the link, it avoids creating a new file
      if test "$need_locks" = yes; then
@@ -3489,7 +4516,7 @@
  	$show "Waiting for $lockfile to be removed"
  	sleep 2
        done
-@@ -626,14 +813,19 @@
+@@ -626,14 +869,19 @@
  compiler."
  
  	$run $rm $removelist
@@ -3511,7 +4538,7 @@
  
      $run $rm "$libobj" "${libobj}T"
  
-@@ -655,10 +847,10 @@
+@@ -655,18 +903,18 @@
        fbsd_hideous_sh_bug=$base_compile
  
        if test "$pic_mode" != no; then
@@ -3524,7 +4551,18 @@
        fi
  
        if test ! -d "${xdir}$objdir"; then
-@@ -681,7 +873,7 @@
+ 	$show "$mkdir ${xdir}$objdir"
+ 	$run $mkdir ${xdir}$objdir
+-	status=$?
+-	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
+-	  exit $status
++	exit_status=$?
++	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
++	  exit $exit_status
+ 	fi
+       fi
+ 
+@@ -681,7 +929,7 @@
        if $run eval "$command"; then :
        else
  	test -n "$output_obj" && $run $rm $removelist
@@ -3533,7 +4571,7 @@
        fi
  
        if test "$need_locks" = warn &&
-@@ -701,7 +893,7 @@
+@@ -701,7 +949,7 @@
  compiler."
  
  	$run $rm $removelist
@@ -3542,7 +4580,7 @@
        fi
  
        # Just move the object if needed, then go on to compile the next one
-@@ -722,7 +914,9 @@
+@@ -722,7 +970,9 @@
  EOF
  
        # Allow error messages only from the first compilation.
@@ -3553,7 +4591,7 @@
      else
        # No PIC object so indicate it doesn't exist in the libtool
        # object file.
-@@ -736,9 +930,9 @@
+@@ -736,9 +986,9 @@
      if test "$build_old_libs" = yes; then
        if test "$pic_mode" != yes; then
  	# Don't build PIC code
@@ -3565,7 +4603,7 @@
        fi
        if test "$compiler_c_o" = yes; then
  	command="$command -o $obj"
-@@ -751,7 +945,7 @@
+@@ -751,7 +1001,7 @@
        if $run eval "$command"; then :
        else
  	$run $rm $removelist
@@ -3574,7 +4612,7 @@
        fi
  
        if test "$need_locks" = warn &&
-@@ -771,7 +965,7 @@
+@@ -771,7 +1021,7 @@
  compiler."
  
  	$run $rm $removelist
@@ -3583,7 +4621,7 @@
        fi
  
        # Just move the object if needed
-@@ -809,7 +1003,7 @@
+@@ -809,7 +1059,7 @@
        $run $rm "$lockfile"
      fi
  
@@ -3592,7 +4630,7 @@
      ;;
  
    # libtool link mode
-@@ -835,7 +1029,7 @@
+@@ -835,7 +1085,7 @@
        ;;
      esac
      libtool_args="$nonopt"
@@ -3601,7 +4639,7 @@
      compile_command="$nonopt"
      finalize_command="$nonopt"
  
-@@ -847,7 +1041,6 @@
+@@ -847,7 +1097,6 @@
      old_convenience=
      deplibs=
      old_deplibs=
@@ -3609,15 +4647,16 @@
      compiler_flags=
      linker_flags=
      dllsearchpath=
-@@ -868,6 +1061,7 @@
+@@ -868,6 +1117,8 @@
      no_install=no
      objs=
      non_pic_objects=
++    notinst_path= # paths that contain not-installed libtool libraries
 +    precious_files_regex=
      prefer_static_libs=no
      preload=no
      prev=
-@@ -881,6 +1075,8 @@
+@@ -881,6 +1132,8 @@
      vinfo=
      vinfo_number=no
  
@@ -3626,7 +4665,24 @@
      # We need to know -static, to get the right output filenames.
      for arg
      do
-@@ -912,7 +1108,6 @@
+@@ -893,14 +1146,15 @@
+ 	  if test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+ 	  fi
++	  prefer_static_libs=yes
+ 	else
+ 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+ 	  fi
++	  prefer_static_libs=built
+ 	fi
+ 	build_libtool_libs=no
+ 	build_old_libs=yes
+-	prefer_static_libs=yes
+ 	break
+ 	;;
+       esac
+@@ -912,7 +1166,6 @@
      # Go through the arguments, transforming them on the way.
      while test "$#" -gt 0; do
        arg="$1"
@@ -3634,7 +4690,7 @@
        shift
        case $arg in
        *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-@@ -976,7 +1171,7 @@
+@@ -976,7 +1229,7 @@
  	  export_symbols="$arg"
  	  if test ! -f "$arg"; then
  	    $echo "$modename: symbol file \`$arg' does not exist"
@@ -3643,7 +4699,7 @@
  	  fi
  	  prev=
  	  continue
-@@ -991,6 +1186,11 @@
+@@ -991,6 +1244,11 @@
  	  prev=
  	  continue
  	  ;;
@@ -3655,7 +4711,7 @@
  	release)
  	  release="-$arg"
  	  prev=
-@@ -1023,7 +1223,7 @@
+@@ -1023,7 +1281,7 @@
  		   test "$pic_object" = none && \
  		   test "$non_pic_object" = none; then
  		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -3664,7 +4720,17 @@
  		fi
  
  		# Extract subdirectory from the argument.
-@@ -1076,7 +1276,7 @@
+@@ -1071,12 +1329,17 @@
+ 		  if test -z "$pic_object" || test "$pic_object" = none ; then
+ 		    arg="$non_pic_object"
+ 		  fi
++		else
++		  # If the PIC object exists, use it instead.
++		  # $xdir was prepended to $pic_object above.
++		  non_pic_object="$pic_object"
++		  non_pic_objects="$non_pic_objects $non_pic_object"
+ 		fi
+ 	      else
  		# Only an error if not doing a dry-run.
  		if test -z "$run"; then
  		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
@@ -3673,7 +4739,7 @@
  		else
  		  # Dry-run case.
  
-@@ -1097,7 +1297,7 @@
+@@ -1097,7 +1360,7 @@
  	    done
  	  else
  	    $echo "$modename: link input file \`$save_arg' does not exist"
@@ -3682,7 +4748,7 @@
  	  fi
  	  arg=$save_arg
  	  prev=
-@@ -1109,7 +1309,7 @@
+@@ -1109,7 +1372,7 @@
  	  [\\/]* | [A-Za-z]:[\\/]*) ;;
  	  *)
  	    $echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -3691,7 +4757,7 @@
  	    ;;
  	  esac
  	  if test "$prev" = rpath; then
-@@ -1149,16 +1349,15 @@
+@@ -1149,16 +1412,15 @@
  	  finalize_command="$finalize_command $qarg"
  	  continue
  	  ;;
@@ -3710,14 +4776,14 @@
 +	  prev=
 +	  continue
 +	  ;;
-+        darwin_framework)
-+	  compiler_flags="$compiler_flags $arg"
++	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 +1409,7 @@
+@@ -1210,7 +1472,7 @@
        -export-symbols | -export-symbols-regex)
  	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
  	  $echo "$modename: more than one -exported-symbols argument is not allowed"
@@ -3726,31 +4792,62 @@
  	fi
  	if test "X$arg" = "X-export-symbols"; then
  	  prev=expsyms
-@@ -1220,6 +1419,14 @@
+@@ -1220,6 +1482,18 @@
  	continue
  	;;
  
-+      -framework|-arch)
-+        prev=darwin_framework
-+        compiler_flags="$compiler_flags $arg"
++      -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
-+        ;;
++	continue
++	;;
 +
        -inst-prefix-dir)
  	prev=inst_prefix
  	continue
-@@ -1246,7 +1453,7 @@
+@@ -1246,7 +1520,8 @@
  	  absdir=`cd "$dir" && pwd`
  	  if test -z "$absdir"; then
  	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
 -	    exit 1
-+	    exit $EXIT_FAILURE
++	    absdir="$dir"
++	    notinst_path="$notinst_path $dir"
  	  fi
  	  dir="$absdir"
  	  ;;
-@@ -1280,18 +1487,18 @@
+@@ -1260,10 +1535,15 @@
+ 	esac
+ 	case $host in
+ 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+ 	  case :$dllsearchpath: in
+ 	  *":$dir:"*) ;;
+ 	  *) dllsearchpath="$dllsearchpath:$dir";;
+ 	  esac
++	  case :$dllsearchpath: in
++	  *":$testbindir:"*) ;;
++	  *) dllsearchpath="$dllsearchpath:$testbindir";;
++	  esac
+ 	  ;;
+ 	esac
+ 	continue
+@@ -1272,26 +1552,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
  	    ;;
@@ -3764,6 +4861,15 @@
 -	    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
@@ -3772,7 +4878,7 @@
  	   # Do not include libc_r directly, use -pthread flag.
  	   continue
  	   ;;
-@@ -1301,18 +1508,36 @@
+@@ -1301,18 +1590,41 @@
  	continue
  	;;
  
@@ -3811,13 +4917,29 @@
 +      # +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
-+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
++      # -m*, -t[45]*, -txscale* pass through architecture-specific
++      # compiler args for GCC
++      # -pg pass through profiling flag for GCC
++      # @file GCC response files
++      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
++      -t[45]*|-txscale*|@*)
 +
  	# Unknown arguments in both finalize_command and compile_command need
  	# to be aesthetically quoted because they are evaled later.
  	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-@@ -1365,6 +1590,11 @@
+@@ -1323,9 +1635,7 @@
+ 	esac
+         compile_command="$compile_command $arg"
+         finalize_command="$finalize_command $arg"
+-        if test "$with_gcc" = "yes" ; then
+-          compiler_flags="$compiler_flags $arg"
+-        fi
++        compiler_flags="$compiler_flags $arg"
+         continue
+         ;;
  
+@@ -1365,6 +1675,11 @@
+ 
        -o) prev=output ;;
  
 +      -precious-files-regex)
@@ -3828,7 +4950,7 @@
        -release)
  	prev=release
  	continue
-@@ -1387,7 +1617,7 @@
+@@ -1387,7 +1702,7 @@
  	[\\/]* | [A-Za-z]:[\\/]*) ;;
  	*)
  	  $echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -3837,7 +4959,7 @@
  	  ;;
  	esac
  	case "$xrpath " in
-@@ -1473,11 +1703,6 @@
+@@ -1473,11 +1788,6 @@
  	continue
  	;;
  
@@ -3849,7 +4971,7 @@
        # Some other compiler flag.
        -* | +*)
  	# Unknown arguments in both finalize_command and compile_command need
-@@ -1488,7 +1713,6 @@
+@@ -1488,7 +1798,6 @@
  	  arg="\"$arg\""
  	  ;;
  	esac
@@ -3857,7 +4979,7 @@
  	;;
  
        *.$objext)
-@@ -1516,7 +1740,7 @@
+@@ -1516,7 +1825,7 @@
  	     test "$pic_object" = none && \
  	     test "$non_pic_object" = none; then
  	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -3866,7 +4988,17 @@
  	  fi
  
  	  # Extract subdirectory from the argument.
-@@ -1569,7 +1793,7 @@
+@@ -1564,12 +1873,17 @@
+ 	    if test -z "$pic_object" || test "$pic_object" = none ; then
+ 	      arg="$non_pic_object"
+ 	    fi
++	  else
++	    # If the PIC object exists, use it instead.
++	    # $xdir was prepended to $pic_object above.
++	    non_pic_object="$pic_object"
++	    non_pic_objects="$non_pic_objects $non_pic_object"
+ 	  fi
+ 	else
  	  # Only an error if not doing a dry-run.
  	  if test -z "$run"; then
  	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
@@ -3875,7 +5007,7 @@
  	  else
  	    # Dry-run case.
  
-@@ -1623,7 +1847,6 @@
+@@ -1623,7 +1937,6 @@
  	  arg="\"$arg\""
  	  ;;
  	esac
@@ -3883,7 +5015,7 @@
  	;;
        esac # arg
  
-@@ -1637,48 +1860,7 @@
+@@ -1637,48 +1950,7 @@
      if test -n "$prev"; then
        $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
        $echo "$help" 1>&2
@@ -3933,7 +5065,20 @@
      fi
  
      if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-@@ -1722,7 +1904,7 @@
+@@ -1711,9 +1983,9 @@
+     if test ! -d "$output_objdir"; then
+       $show "$mkdir $output_objdir"
+       $run $mkdir $output_objdir
+-      status=$?
+-      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+-	exit $status
++      exit_status=$?
++      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
++	exit $exit_status
+       fi
+     fi
+ 
+@@ -1722,7 +1994,7 @@
      "")
        $echo "$modename: you must specify an output file" 1>&2
        $echo "$help" 1>&2
@@ -3942,7 +5087,7 @@
        ;;
      *.$libext) linkmode=oldlib ;;
      *.lo | *.$objext) linkmode=obj ;;
-@@ -1732,7 +1914,7 @@
+@@ -1732,7 +2004,7 @@
  
      case $host in
      *cygwin* | *mingw* | *pw32*)
@@ -3951,7 +5096,15 @@
        duplicate_compiler_generated_deps=yes
        ;;
      *)
-@@ -1785,7 +1967,7 @@
+@@ -1776,7 +2048,6 @@
+     newlib_search_path=
+     need_relink=no # whether we're linking any uninstalled libtool libraries
+     notinst_deplibs= # not-installed libtool libraries
+-    notinst_path= # paths that contain not-installed libtool libraries
+     case $linkmode in
+     lib)
+ 	passes="conv link"
+@@ -1785,7 +2056,7 @@
  	  *.la) ;;
  	  *)
  	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
@@ -3960,7 +5113,7 @@
  	    ;;
  	  esac
  	done
-@@ -1811,7 +1993,10 @@
+@@ -1811,7 +2082,10 @@
  	case $pass in
  	dlopen) libs="$dlfiles" ;;
  	dlpreopen) libs="$dlprefiles" ;;
@@ -3972,7 +5125,7 @@
  	esac
        fi
        if test "$pass" = dlopen; then
-@@ -1823,18 +2008,23 @@
+@@ -1823,18 +2097,23 @@
  	lib=
  	found=no
  	case $deplib in
@@ -4001,7 +5154,7 @@
  	      # Search the libtool library
  	      lib="$searchdir/lib${name}${search_ext}"
  	      if test -f "$lib"; then
-@@ -1895,18 +2085,6 @@
+@@ -1895,18 +2174,6 @@
  	    fi
  	  fi
  	  ;; # -l
@@ -4020,7 +5173,7 @@
  	-L*)
  	  case $linkmode in
  	  lib)
-@@ -1922,11 +2100,11 @@
+@@ -1922,11 +2189,11 @@
  	    fi
  	    if test "$pass" = scan; then
  	      deplibs="$deplib $deplibs"
@@ -4033,7 +5186,7 @@
  	    ;;
  	  *)
  	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-@@ -1954,7 +2132,22 @@
+@@ -1954,7 +2221,22 @@
  	  fi
  	  case $linkmode in
  	  lib)
@@ -4057,11 +5210,13 @@
  	      $echo
  	      $echo "*** Warning: Trying to link with static lib archive $deplib."
  	      $echo "*** I have the capability to make that library automatically link in when"
-@@ -2005,14 +2198,14 @@
+@@ -2004,15 +2286,15 @@
+ 	esac # case $deplib
  	if test "$found" = yes || test -f "$lib"; then :
  	else
- 	  $echo "$modename: cannot find the library \`$lib'" 1>&2
+-	  $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
  
@@ -4074,7 +5229,7 @@
  	fi
  
  	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-@@ -2028,6 +2221,8 @@
+@@ -2028,6 +2310,8 @@
  	# it will not redefine variables installed, or shouldnotlink
  	installed=yes
  	shouldnotlink=no
@@ -4083,7 +5238,7 @@
  
  	# Read the .la file
  	case $lib in
-@@ -2035,13 +2230,6 @@
+@@ -2035,13 +2319,6 @@
  	*) . ./$lib ;;
  	esac
  
@@ -4097,7 +5252,7 @@
  	if test "$linkmode,$pass" = "lib,link" ||
  	   test "$linkmode,$pass" = "prog,scan" ||
  	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-@@ -2052,33 +2240,32 @@
+@@ -2052,33 +2329,32 @@
  	if test "$pass" = conv; then
  	  # Only check for convenience libraries
  	  deplibs="$lib $deplibs"
@@ -4144,7 +5299,7 @@
  	# Get the name of the library we link against.
  	linklib=
  	for l in $old_library $library_names; do
-@@ -2086,16 +2273,18 @@
+@@ -2086,16 +2362,18 @@
  	done
  	if test -z "$linklib"; then
  	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
@@ -4166,7 +5321,7 @@
  	    # 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 +2321,19 @@
+@@ -2132,11 +2410,19 @@
  	    dir="$libdir"
  	    absdir="$libdir"
  	  fi
@@ -4190,7 +5345,7 @@
  	fi # $installed = yes
  	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
  
-@@ -2144,7 +2341,7 @@
+@@ -2144,7 +2430,7 @@
  	if test "$pass" = dlpreopen; then
  	  if test -z "$libdir"; then
  	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
@@ -4199,7 +5354,7 @@
  	  fi
  	  # Prefer using a static library (so that no silly _DYNAMIC symbols
  	  # are required to link).
-@@ -2171,7 +2368,7 @@
+@@ -2171,7 +2457,7 @@
  	  continue
  	fi
  
@@ -4208,7 +5363,7 @@
  	if test "$linkmode" = prog && test "$pass" != link; then
  	  newlib_search_path="$newlib_search_path $ladir"
  	  deplibs="$lib $deplibs"
-@@ -2209,12 +2406,12 @@
+@@ -2209,12 +2495,12 @@
  	  if test -n "$library_names" &&
  	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
  	    # We need to hardcode the library path
@@ -4223,7 +5378,19 @@
  	      esac
  	    fi
  
-@@ -2258,17 +2455,18 @@
+@@ -2251,24 +2537,29 @@
+ 	fi
+ 
+ 	link_static=no # Whether the deplib will be linked statically
++	use_static_libs=$prefer_static_libs
++	if test "$use_static_libs" = built && test "$installed" = yes ; then
++	  use_static_libs=no
++	fi
+ 	if test -n "$library_names" &&
+-	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ 	  if test "$installed" = no; then
+ 	    notinst_deplibs="$notinst_deplibs $lib"
  	    need_relink=yes
  	  fi
  	  # This is a shared library
@@ -4247,7 +5414,7 @@
  	  if test "$linkmode" = lib &&
  	     test "$hardcode_into_libs" = yes; then
  	    # Hardcode the library path.
-@@ -2326,9 +2524,10 @@
+@@ -2326,9 +2617,10 @@
  	    else
  	      $show "extracting exported symbol list from \`$soname'"
  	      save_ifs="$IFS"; IFS='~'
@@ -4259,7 +5426,7 @@
  		$show "$cmd"
  		$run eval "$cmd" || exit $?
  	      done
-@@ -2339,9 +2538,10 @@
+@@ -2339,9 +2631,10 @@
  	    if test -f "$output_objdir/$newlib"; then :; else
  	      $show "generating import library for \`$soname'"
  	      save_ifs="$IFS"; IFS='~'
@@ -4271,20 +5438,27 @@
  		$show "$cmd"
  		$run eval "$cmd" || exit $?
  	      done
-@@ -2364,9 +2564,9 @@
+@@ -2362,11 +2655,15 @@
+ 	      if test "$hardcode_direct" = no; then
+ 		add="$dir/$linklib"
  		case $host in
- 		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
+-		  *-*-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
++		    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 +2574,7 @@
+@@ -2374,7 +2671,7 @@
  		        $echo "** The link will probably fail, sorry"
  		      else
  		        add="$dir/$old_library"
@@ -4293,7 +5467,7 @@
  		    fi
  		esac
  	      elif test "$hardcode_minus_L" = no; then
-@@ -2397,9 +2597,9 @@
+@@ -2397,9 +2694,9 @@
  		add_dir="-L$dir"
  		# Try looking first in the location we're being installed to.
  		if test -n "$inst_prefix_dir"; then
@@ -4305,7 +5479,7 @@
  		      ;;
  		  esac
  		fi
-@@ -2416,7 +2616,7 @@
+@@ -2416,7 +2713,7 @@
  
  	    if test "$lib_linked" != yes; then
  	      $echo "$modename: configuration error: unsupported hardcode properties"
@@ -4314,7 +5488,7 @@
  	    fi
  
  	    if test -n "$add_shlibpath"; then
-@@ -2459,7 +2659,8 @@
+@@ -2459,7 +2756,8 @@
  	      esac
  	      add="-l$name"
  	    elif test "$hardcode_automatic" = yes; then
@@ -4324,7 +5498,7 @@
  	        add="$inst_prefix_dir$libdir/$linklib"
  	      else
  	        add="$libdir/$linklib"
-@@ -2469,9 +2670,9 @@
+@@ -2469,9 +2767,9 @@
  	      add_dir="-L$libdir"
  	      # Try looking first in the location we're being installed to.
  	      if test -n "$inst_prefix_dir"; then
@@ -4336,7 +5510,7 @@
  		    ;;
  		esac
  	      fi
-@@ -2530,17 +2731,16 @@
+@@ -2530,17 +2828,16 @@
  	      fi
  	    fi
  	  else
@@ -4358,7 +5532,7 @@
  	    # Extract -R from dependency_libs
  	    temp_deplibs=
  	    for libdir in $dependency_libs; do
-@@ -2554,7 +2754,7 @@
+@@ -2554,7 +2851,7 @@
  	      esac
  	    done
  	    dependency_libs="$temp_deplibs"
@@ -4367,7 +5541,7 @@
  
  	  newlib_search_path="$newlib_search_path $absdir"
  	  # Link against this library
-@@ -2596,20 +2796,18 @@
+@@ -2596,20 +2893,18 @@
  		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  		  if test -z "$libdir"; then
  		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
@@ -4392,7 +5566,7 @@
  		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
  		  if test -n "$deplibrary_names" ; then
  		    for tmp in $deplibrary_names ; do
-@@ -2617,55 +2815,45 @@
+@@ -2617,55 +2912,45 @@
  		    done
  		    if test -f "$path/$depdepl" ; then
  		      depdepl="$path/$depdepl"
@@ -4468,7 +5642,7 @@
  	      esac
  	    done
  	  fi # link_all_deplibs != no
-@@ -2752,7 +2940,8 @@
+@@ -2752,7 +3037,8 @@
  	  eval $var=\"$tmp_libs\"
  	done # for var
        fi
@@ -4478,7 +5652,7 @@
        tmp_libs=
        for i in $dependency_libs ; do
  	case " $predeps $postdeps $compiler_lib_search_path " in
-@@ -2812,19 +3001,19 @@
+@@ -2812,19 +3098,19 @@
        case $outputname in
        lib*)
  	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
@@ -4501,7 +5675,7 @@
  	  eval libname=\"$libname_spec\"
  	else
  	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-@@ -2835,7 +3024,7 @@
+@@ -2835,7 +3121,7 @@
        if test -n "$objs"; then
  	if test "$deplibs_check_method" != pass_all; then
  	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
@@ -4510,7 +5684,7 @@
  	else
  	  $echo
  	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-@@ -2883,13 +3072,13 @@
+@@ -2883,13 +3169,13 @@
  	if test -n "$8"; then
  	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
  	  $echo "$help" 1>&2
@@ -4526,7 +5700,7 @@
  	case $vinfo_number in
  	yes)
  	  number_major="$2"
-@@ -2918,6 +3107,11 @@
+@@ -2918,6 +3204,11 @@
  	    age="$number_minor"
  	    revision="$number_minor"
  	    ;;
@@ -4538,7 +5712,7 @@
  	  esac
  	  ;;
  	no)
-@@ -2929,36 +3123,36 @@
+@@ -2929,36 +3220,36 @@
  
  	# Check that each of the things are valid numbers.
  	case $current in
@@ -4585,7 +5759,7 @@
  	fi
  
  	# Calculate the version variables.
-@@ -2975,7 +3169,7 @@
+@@ -2975,7 +3266,7 @@
  	  versuffix="$major.$age.$revision"
  	  # Darwin ld doesn't like 0 for these options...
  	  minor_current=`expr $current + 1`
@@ -4594,7 +5768,7 @@
  	  ;;
  
  	freebsd-aout)
-@@ -3047,7 +3241,7 @@
+@@ -3047,7 +3338,7 @@
  	*)
  	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
  	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
@@ -4603,7 +5777,7 @@
  	  ;;
  	esac
  
-@@ -3098,9 +3292,15 @@
+@@ -3098,9 +3389,15 @@
  	tempremovelist=`$echo "$output_objdir/*"`
  	for p in $tempremovelist; do
  	  case $p in
@@ -4620,7 +5794,20 @@
  	       removelist="$removelist $p"
  	       ;;
  	    *) ;;
-@@ -3137,7 +3337,7 @@
+@@ -3122,9 +3419,9 @@
+ 
+       # Eliminate all temporary directories.
+       for path in $notinst_path; do
+-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
+-	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
+-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
++	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
++	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
++	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+       done
+ 
+       if test -n "$xrpath"; then
+@@ -3137,7 +3434,7 @@
  	  *) finalize_rpath="$finalize_rpath $libdir" ;;
  	  esac
  	done
@@ -4629,7 +5816,7 @@
  	  dependency_libs="$temp_xrpath $dependency_libs"
  	fi
        fi
-@@ -3170,12 +3370,12 @@
+@@ -3170,14 +3467,19 @@
  	    ;;
  	  *-*-rhapsody* | *-*-darwin1.[012])
  	    # Rhapsody C library is in the System framework
@@ -4642,9 +5829,22 @@
 -	  *-*-openbsd* | *-*-freebsd*)
 +	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
  	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
+-	    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
  	    ;;
-@@ -3225,7 +3425,7 @@
+  	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+@@ -3221,11 +3523,11 @@
+ 	  int main() { return 0; }
+ EOF
+ 	  $rm conftest
+-	  $LTCC -o conftest conftest.c $deplibs
++	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
  	  if test "$?" -eq 0 ; then
  	    ldd_output=`ldd conftest`
  	    for i in $deplibs; do
@@ -4653,7 +5853,7 @@
  	      # If $name is empty we are operating on a -L argument.
                if test "$name" != "" && test "$name" -ne "0"; then
  		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3262,7 +3462,7 @@
+@@ -3262,11 +3564,11 @@
  	    # Error occurred in the first compile.  Let's try to salvage
  	    # the situation: Compile a separate program for each library.
  	    for i in $deplibs; do
@@ -4662,7 +5862,12 @@
  	      # If $name is empty we are operating on a -L argument.
                if test "$name" != "" && test "$name" != "0"; then
  		$rm conftest
-@@ -3314,7 +3514,7 @@
+-		$LTCC -o conftest conftest.c $i
++		$LTCC $LTCFLAGS -o conftest conftest.c $i
+ 		# Did it work?
+ 		if test "$?" -eq 0 ; then
+ 		  ldd_output=`ldd conftest`
+@@ -3314,7 +3616,7 @@
  	  set dummy $deplibs_check_method
  	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
  	  for a_deplib in $deplibs; do
@@ -4671,7 +5876,7 @@
  	    # 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 +3583,7 @@
+@@ -3383,7 +3685,7 @@
  	  set dummy $deplibs_check_method
  	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
  	  for a_deplib in $deplibs; do
@@ -4680,7 +5885,7 @@
  	    # 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 +3663,7 @@
+@@ -3463,7 +3765,7 @@
  	case $host in
  	*-*-rhapsody* | *-*-darwin1.[012])
  	  # On Rhapsody replace the C library is the System framework
@@ -4689,7 +5894,7 @@
  	  ;;
  	esac
  
-@@ -3509,13 +3709,6 @@
+@@ -3509,17 +3811,39 @@
  	    fi
  	  fi
  	fi
@@ -4703,7 +5908,40 @@
  	# Done checking deplibs!
  	deplibs=$newdeplibs
        fi
-@@ -3532,7 +3725,7 @@
+ 
++
++      # 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 +3856,7 @@
  	  hardcode_libdirs=
  	  dep_rpath=
  	  rpath="$finalize_rpath"
@@ -4712,7 +5950,7 @@
  	  for libdir in $rpath; do
  	    if test -n "$hardcode_libdir_flag_spec"; then
  	      if test -n "$hardcode_libdir_separator"; then
-@@ -3587,7 +3780,7 @@
+@@ -3587,7 +3911,7 @@
  	fi
  
  	# Get the real and link names of the library.
@@ -4721,7 +5959,15 @@
  	eval library_names=\"$library_names_spec\"
  	set dummy $library_names
  	realname="$2"
-@@ -3617,10 +3810,11 @@
+@@ -3603,6 +3927,7 @@
+ 	fi
+ 
+ 	lib="$output_objdir/$realname"
++	linknames=
+ 	for link
+ 	do
+ 	  linknames="$linknames $link"
+@@ -3617,10 +3942,11 @@
  	    $show "generating symbol list for \`$libname.la'"
  	    export_symbols="$output_objdir/$libname.exp"
  	    $run $rm $export_symbols
@@ -4734,7 +5980,7 @@
  	      if len=`expr "X$cmd" : ".*"` &&
  	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
  	        $show "$cmd"
-@@ -3630,6 +3824,9 @@
+@@ -3630,6 +3956,9 @@
  	        # The command line is too long to execute in one step.
  	        $show "using reloadable object file for export list..."
  	        skipped_export=:
@@ -4744,7 +5990,7 @@
  	      fi
  	    done
  	    IFS="$save_ifs"
-@@ -3650,12 +3847,12 @@
+@@ -3650,12 +3979,12 @@
  	for test_deplib in $deplibs; do
  		case " $convenience " in
  		*" $test_deplib "*) ;;
@@ -4759,7 +6005,7 @@
  
  	if test -n "$convenience"; then
  	  if test -n "$whole_archive_flag_spec"; then
-@@ -3663,67 +3860,13 @@
+@@ -3663,67 +3992,13 @@
  	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
  	  else
  	    gentop="$output_objdir/${outputname}x"
@@ -4830,7 +6076,7 @@
  	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 +3877,27 @@
+@@ -3734,31 +4009,27 @@
  	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
  	fi
  
@@ -4872,7 +6118,7 @@
  	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
  	  :
  	else
-@@ -3777,6 +3916,7 @@
+@@ -3777,6 +4048,7 @@
  	    save_libobjs=$libobjs
  	  fi
  	  save_output=$output
@@ -4880,7 +6126,7 @@
  
  	  # Clear the reloadable object creation command queue and
  	  # initialize k to one.
-@@ -3786,13 +3926,13 @@
+@@ -3786,13 +4058,13 @@
  	  delfiles=
  	  last_robj=
  	  k=1
@@ -4896,7 +6142,7 @@
  		 test "$len" -le "$max_cmd_len"; }; then
  	      objlist="$objlist $obj"
  	    else
-@@ -3806,9 +3946,9 @@
+@@ -3806,9 +4078,9 @@
  		# the last one created.
  		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
  	      fi
@@ -4908,7 +6154,7 @@
  	      objlist=$obj
  	      len=1
  	    fi
-@@ -3828,13 +3968,13 @@
+@@ -3828,13 +4100,13 @@
  	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
            fi
  
@@ -4924,7 +6170,7 @@
  	  done
  
  	  $echo "creating a temporary reloadable object file: $output"
-@@ -3859,28 +3999,54 @@
+@@ -3859,28 +4131,54 @@
  	  # value of $libobjs for piecewise linking.
  
  	  # Do each of the archive commands.
@@ -4984,7 +6230,7 @@
  	fi
  
  	# Create links to the real library.
-@@ -3928,7 +4094,7 @@
+@@ -3928,7 +4226,7 @@
        *.lo)
  	if test -n "$objs$old_deplibs"; then
  	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
@@ -4993,7 +6239,7 @@
  	fi
  	libobj="$output"
  	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-@@ -3957,64 +4123,10 @@
+@@ -3957,64 +4255,10 @@
  	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
  	else
  	  gentop="$output_objdir/${obj}x"
@@ -5060,7 +6306,7 @@
  	fi
        fi
  
-@@ -4022,10 +4134,11 @@
+@@ -4022,10 +4266,11 @@
        reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
  
        output="$obj"
@@ -5073,7 +6319,7 @@
  	$show "$cmd"
  	$run eval "$cmd" || exit $?
        done
-@@ -4038,7 +4151,7 @@
+@@ -4038,7 +4283,7 @@
  	  $run ${rm}r $gentop
  	fi
  
@@ -5082,7 +6328,7 @@
        fi
  
        if test "$build_libtool_libs" != yes; then
-@@ -4051,17 +4164,18 @@
+@@ -4051,17 +4296,18 @@
  	# accidentally link it into a program.
  	# $show "echo timestamp > $libobj"
  	# $run eval "echo timestamp > $libobj" || exit $?
@@ -5103,7 +6349,7 @@
  	  $show "$cmd"
  	  $run eval "$cmd" || exit $?
  	done
-@@ -4073,7 +4187,7 @@
+@@ -4073,7 +4319,7 @@
  	$run ${rm}r $gentop
        fi
  
@@ -5112,7 +6358,7 @@
        ;;
  
      prog)
-@@ -4098,21 +4212,18 @@
+@@ -4098,24 +4344,50 @@
        case $host in
        *-*-rhapsody* | *-*-darwin1.[012])
  	# On Rhapsody replace the C library is the System framework
@@ -5137,8 +6383,56 @@
          ;;
        esac
  
-@@ -4277,12 +4388,12 @@
++
++      # 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 +4432,15 @@
+ 	fi
+ 	case $host in
+ 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
+ 	  case :$dllsearchpath: in
+ 	  *":$libdir:"*) ;;
+ 	  *) dllsearchpath="$dllsearchpath:$libdir";;
+ 	  esac
++	  case :$dllsearchpath: in
++	  *":$testbindir:"*) ;;
++	  *) dllsearchpath="$dllsearchpath:$testbindir";;
++	  esac
+ 	  ;;
+ 	esac
+       done
+@@ -4277,13 +4554,25 @@
+ 
  	    # Prepare the list of exported symbols
  	    if test -z "$export_symbols"; then
 -	      export_symbols="$output_objdir/$output.exp"
@@ -5146,15 +6440,28 @@
  	      $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 "${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 +4445,26 @@
+ 
+@@ -4334,7 +4623,26 @@
  #endif
  
  /* The mapping between symbol names and symbols. */
@@ -5181,7 +6488,37 @@
    const char *name;
    lt_ptr address;
  }
-@@ -4394,7 +4524,7 @@
+@@ -4381,20 +4689,33 @@
+ 	  esac
+ 
+ 	  # Now compile the dynamic symbol file.
+-	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+-	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
++	  $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
++	  $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+ 
+ 	  # Clean up the generated files.
+ 	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+ 	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
+ 
+ 	  # Transform the symbol file into the correct name.
+-	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+-	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++          case $host in
++          *cygwin* | *mingw* )
++            if test -f "$output_objdir/${outputname}.def" ; then
++              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
++              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
++            else
++              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++             fi
++            ;;
++          * )
++            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++            ;;
++          esac
  	  ;;
  	*)
  	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
@@ -5190,7 +6527,7 @@
  	  ;;
  	esac
        else
-@@ -4407,17 +4537,6 @@
+@@ -4407,17 +4728,6 @@
  	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
        fi
  
@@ -5208,7 +6545,25 @@
        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'`
-@@ -4493,7 +4612,7 @@
+@@ -4426,7 +4736,7 @@
+ 	# We have no uninstalled library dependencies, so finalize right now.
+ 	$show "$link_command"
+ 	$run eval "$link_command"
+-	status=$?
++	exit_status=$?
+ 
+ 	# Delete the generated files.
+ 	if test -n "$dlsyms"; then
+@@ -4434,7 +4744,7 @@
+ 	  $run $rm "$output_objdir/${outputname}S.${objext}"
+ 	fi
+ 
+-	exit $status
++	exit $exit_status
+       fi
+ 
+       if test -n "$shlibpath_var"; then
+@@ -4493,7 +4803,7 @@
  	# Link the executable and exit
  	$show "$link_command"
  	$run eval "$link_command" || exit $?
@@ -5217,7 +6572,7 @@
        fi
  
        if test "$hardcode_action" = relink; then
-@@ -4548,10 +4667,10 @@
+@@ -4548,10 +4858,10 @@
        fi
  
        # Quote $echo for shipping.
@@ -5232,22 +6587,26 @@
  	esac
  	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
        else
-@@ -4573,11 +4692,11 @@
+@@ -4573,11 +4883,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* )
-+	    cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
- 	    cwrapper=`$echo ${output}.exe`
- 	    $rm $cwrappersource $cwrapper
--	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
-+	    trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
++            output_name=`basename $output`
++            output_path=`dirname $output`
++            cwrappersource="$output_path/$objdir/lt-$output_name.c"
++            cwrapper="$output_path/$output_name.exe"
++            $rm $cwrappersource $cwrapper
++            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
  
  	    cat > $cwrappersource <<EOF
  
-@@ -4586,7 +4705,7 @@
+@@ -4586,7 +4898,7 @@
  
     The $output program cannot be directly executed until all the libtool
     libraries that it depends on are installed.
@@ -5256,26 +6615,102 @@
     This wrapper executable should never be moved out of the build directory.
     If it is, it will not operate correctly.
  
-@@ -4618,7 +4737,7 @@
+@@ -4602,6 +4914,9 @@
+ #include <malloc.h>
+ #include <stdarg.h>
+ #include <assert.h>
++#include <string.h>
++#include <ctype.h>
++#include <sys/stat.h>
+ 
+ #if defined(PATH_MAX)
+ # define LT_PATHMAX PATH_MAX
+@@ -4612,15 +4927,19 @@
+ #endif
+ 
+ #ifndef DIR_SEPARATOR
+-#define DIR_SEPARATOR '/'
++# define DIR_SEPARATOR '/'
++# define PATH_SEPARATOR ':'
+ #endif
+ 
  #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
    defined (__OS2__)
- #define HAVE_DOS_BASED_FILE_SYSTEM
+-#define HAVE_DOS_BASED_FILE_SYSTEM
 -#ifndef DIR_SEPARATOR_2 
-+#ifndef DIR_SEPARATOR_2
- #define 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
- #endif
-@@ -4649,7 +4768,7 @@
+ 
+ #ifndef DIR_SEPARATOR_2
+@@ -4630,17 +4949,32 @@
+         (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+ #endif /* DIR_SEPARATOR_2 */
+ 
++#ifndef PATH_SEPARATOR_2
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
++#else /* PATH_SEPARATOR_2 */
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
++#endif /* PATH_SEPARATOR_2 */
++
+ #define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+ #define XFREE(stale) do { \
+   if (stale) { free ((void *) stale); stale = 0; } \
+ } while (0)
+ 
++/* -DDEBUG is fairly common in CFLAGS.  */
++#undef DEBUG
++#if defined DEBUGWRAPPER
++# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
++#else
++# define DEBUG(format, ...)
++#endif
++
+ const char *program_name = NULL;
+ 
+ void * xmalloc (size_t num);
+ char * xstrdup (const char *string);
+-char * basename (const char *name);
+-char * fnqualify(const char *path);
++const char * base_name (const char *name);
++char * find_executable(const char *wrapper);
++int    check_executable(const char *path);
+ char * strendzap(char *str, const char *pat);
+ void lt_fatal (const char *message, ...);
+ 
+@@ -4649,30 +4983,52 @@
  {
    char **newargz;
    int i;
 -  
+-  program_name = (char *) xstrdup ((char *) basename (argv[0]));
 +
-   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
-@@ -4662,7 +4781,7 @@
-   newargz[1] = fnqualify(argv[0]);
+ 
+-	    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"); 
@@ -5283,15 +6718,36 @@
    for (i = 1; i < argc; i++)
      newargz[i+1] = xstrdup(argv[i]);
    newargz[argc+1] = NULL;
-@@ -4673,6 +4792,7 @@
++
++  for (i=0; i<argc+1; i++)
++  {
++    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
++    ;
++  }
++
  EOF
  
- 	    cat >> $cwrappersource <<"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,7 +4805,7 @@
+@@ -4685,59 +5041,159 @@
    return p;
  }
  
@@ -5300,25 +6756,171 @@
  xstrdup (const char *string)
  {
    return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-@@ -4699,7 +4819,7 @@
+ ;
+ }
  
+-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 (name[0]) && name[1] == ':')
++  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
      name += 2;
  #endif
  
-@@ -4709,7 +4829,7 @@
-   return (char *) base;
+   for (base = name; *name; name++)
+     if (IS_DIR_SEPARATOR (*name))
+       base = name + 1;
+-  return (char *) base;
++  return base;
  }
  
 -char * 
+-fnqualify(const char *path)
++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;
++}
++
++/* Searches for the full path of the wrapper.  Returns
++   newly allocated full path name if found, NULL otherwise */
 +char *
- fnqualify(const char *path)
++find_executable (const char* wrapper)
  {
-   size_t size;
-@@ -4737,7 +4857,7 @@
+-  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 *
@@ -5327,7 +6929,7 @@
  {
    size_t len, patlen;
  
-@@ -4757,7 +4877,7 @@
+@@ -4757,7 +5213,7 @@
  }
  
  static void
@@ -5336,16 +6938,34 @@
            const char * message, va_list ap)
  {
    fprintf (stderr, "%s: %s: ", program_name, mode);
-@@ -4786,7 +4906,7 @@
- 	  ;;
- 	esac
- 	$rm $output
+@@ -4777,16 +5233,16 @@
+   va_end (ap);
+ }
+ EOF
+-	  # we should really use a build-platform specific compiler
+-	  # here, but OTOH, the wrappers (shell script and this C one)
+-	  # are only useful if you want to execute the "real" binary.
+-	  # Since the "real" binary is built for $host, then this
+-	  # wrapper might as well be built for $host, too.
+-	  $run $LTCC -s -o $cwrapper $cwrappersource
+-	  ;;
+-	esac
+-	$rm $output
 -	trap "$rm $output; exit 1" 1 2 15
-+	trap "$rm $output; exit $EXIT_FAILURE" 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
-@@ -4807,7 +4927,7 @@
+@@ -4807,7 +5263,7 @@
  
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
@@ -5354,7 +6974,7 @@
  
  relink_command=\"$relink_command\"
  
-@@ -4886,7 +5006,7 @@
+@@ -4886,7 +5342,7 @@
        else
  	$echo \"\$relink_command_output\" >&2
  	$rm \"\$progdir/\$file\"
@@ -5363,7 +6983,7 @@
        fi
      fi
  
-@@ -4936,34 +5056,32 @@
+@@ -4936,34 +5392,32 @@
  	# Backslashes separate directories on plain windows
  	*-*-mingw | *-*-os2*)
  	  $echo >> $output "\
@@ -5404,7 +7024,7 @@
        ;;
      esac
  
-@@ -4986,78 +5104,78 @@
+@@ -4986,78 +5440,78 @@
  
        if test -n "$addlibs"; then
  	gentop="$output_objdir/${outputname}x"
@@ -5500,9 +7120,9 @@
 +	    $run ${rm}r "$gentop"
 +	    $show "$mkdir $gentop"
 +	    $run $mkdir "$gentop"
-+	    status=$?
-+	    if test "$status" -ne 0 && test ! -d "$gentop"; then
-+	      exit $status
++	    exit_status=$?
++	    if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
++	      exit $exit_status
 +	    fi
 +	  fi
 +
@@ -5544,7 +7164,7 @@
  	else
  	  # the command line is too long to link in one step, link in parts
  	  $echo "using piecewise archive linking..."
-@@ -5066,31 +5184,18 @@
+@@ -5066,31 +5520,18 @@
  	  objlist=
  	  concat_cmds=
  	  save_oldobjs=$oldobjs
@@ -5579,7 +7199,7 @@
  	       test "$len" -le "$max_cmd_len"; then
  	      :
  	    else
-@@ -5098,7 +5203,7 @@
+@@ -5098,7 +5539,7 @@
  	      oldobjs=$objlist
  	      if test "$obj" = "$last_oldobj" ; then
  	        RANLIB=$save_RANLIB
@@ -5588,7 +7208,7 @@
  	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
  	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
  	      objlist=
-@@ -5109,12 +5214,13 @@
+@@ -5109,12 +5550,13 @@
  	  if test "X$oldobjs" = "X" ; then
  	    eval cmds=\"\$concat_cmds\"
  	  else
@@ -5603,7 +7223,7 @@
  	IFS="$save_ifs"
  	$show "$cmd"
  	$run eval "$cmd" || exit $?
-@@ -5146,11 +5252,13 @@
+@@ -5146,11 +5588,13 @@
  	fi
        done
        # Quote the link command for shipping.
@@ -5620,7 +7240,7 @@
        # Only create the output if not a dry run.
        if test -z "$run"; then
  	for installed in no yes; do
-@@ -5168,7 +5276,7 @@
+@@ -5168,7 +5612,7 @@
  		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  		if test -z "$libdir"; then
  		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
@@ -5629,7 +7249,7 @@
  		fi
  		newdependency_libs="$newdependency_libs $libdir/$name"
  		;;
-@@ -5182,7 +5290,7 @@
+@@ -5182,7 +5626,7 @@
  	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
  	      if test -z "$libdir"; then
  		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
@@ -5638,7 +7258,7 @@
  	      fi
  	      newdlfiles="$newdlfiles $libdir/$name"
  	    done
-@@ -5193,11 +5301,30 @@
+@@ -5193,11 +5637,30 @@
  	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
  	      if test -z "$libdir"; then
  		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
@@ -5670,7 +7290,7 @@
  	  fi
  	  $rm $output
  	  # place dlname in correct position for cygwin
-@@ -5241,7 +5368,7 @@
+@@ -5241,7 +5704,7 @@
  
  # Directory that this library needs to be installed in:
  libdir='$install_libdir'"
@@ -5679,7 +7299,7 @@
  	    $echo >> $output "\
  relink_command=\"$relink_command\""
  	  fi
-@@ -5254,7 +5381,7 @@
+@@ -5254,7 +5717,7 @@
        $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
        ;;
      esac
@@ -5688,7 +7308,7 @@
      ;;
  
    # libtool install mode
-@@ -5265,11 +5392,11 @@
+@@ -5265,11 +5728,11 @@
      # install_prog (especially on Windows NT).
      if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
         # Allow the use of GNU shtool's install command.
@@ -5702,7 +7322,7 @@
  	arg="\"$arg\""
  	;;
        esac
-@@ -5278,14 +5405,14 @@
+@@ -5278,14 +5741,14 @@
        shift
      else
        install_prog=
@@ -5719,7 +7339,7 @@
        arg="\"$arg\""
        ;;
      esac
-@@ -5303,28 +5430,31 @@
+@@ -5303,28 +5766,31 @@
      do
        if test -n "$dest"; then
  	files="$files $dest"
@@ -5759,7 +7379,7 @@
  	  continue
  	fi
  	;;
-@@ -5333,7 +5463,7 @@
+@@ -5333,7 +5799,7 @@
        # Aesthetically quote the argument.
        arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
        case $arg in
@@ -5768,7 +7388,7 @@
  	arg="\"$arg\""
  	;;
        esac
-@@ -5343,13 +5473,13 @@
+@@ -5343,13 +5809,13 @@
      if test -z "$install_prog"; then
        $echo "$modename: you must specify an install program" 1>&2
        $echo "$help" 1>&2
@@ -5784,7 +7404,7 @@
      fi
  
      if test -z "$files"; then
-@@ -5359,7 +5489,7 @@
+@@ -5359,7 +5825,7 @@
  	$echo "$modename: you must specify a destination" 1>&2
        fi
        $echo "$help" 1>&2
@@ -5793,7 +7413,7 @@
      fi
  
      # Strip any trailing slash from the destination.
-@@ -5380,7 +5510,7 @@
+@@ -5380,7 +5846,7 @@
        if test "$#" -gt 2; then
  	$echo "$modename: \`$dest' is not a directory" 1>&2
  	$echo "$help" 1>&2
@@ -5802,7 +7422,7 @@
        fi
      fi
      case $destdir in
-@@ -5392,7 +5522,7 @@
+@@ -5392,7 +5858,7 @@
  	*)
  	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
  	  $echo "$help" 1>&2
@@ -5811,7 +7431,7 @@
  	  ;;
  	esac
        done
-@@ -5421,7 +5551,7 @@
+@@ -5421,7 +5887,7 @@
  	else
  	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
  	  $echo "$help" 1>&2
@@ -5820,7 +7440,7 @@
  	fi
  
  	library_names=
-@@ -5463,7 +5593,7 @@
+@@ -5463,7 +5929,7 @@
  	  # but it's something to keep an eye on.
  	  if test "$inst_prefix_dir" = "$destdir"; then
  	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
@@ -5829,7 +7449,7 @@
  	  fi
  
  	  if test -n "$inst_prefix_dir"; then
-@@ -5478,7 +5608,7 @@
+@@ -5478,7 +5944,7 @@
  	  if $run eval "$relink_command"; then :
  	  else
  	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
@@ -5838,7 +7458,7 @@
  	  fi
  	fi
  
-@@ -5502,23 +5632,36 @@
+@@ -5502,23 +5968,36 @@
  
  	  if test "$#" -gt 0; then
  	    # Delete the old symlinks, and create new ones.
@@ -5879,7 +7499,7 @@
  	  done
  	  IFS="$save_ifs"
  	fi
-@@ -5556,7 +5699,7 @@
+@@ -5556,7 +6035,7 @@
  	*)
  	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
  	  $echo "$help" 1>&2
@@ -5888,7 +7508,7 @@
  	  ;;
  	esac
  
-@@ -5574,7 +5717,7 @@
+@@ -5574,7 +6053,7 @@
  	  $show "$install_prog $staticobj $staticdest"
  	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
  	fi
@@ -5897,7 +7517,7 @@
  	;;
  
        *)
-@@ -5612,23 +5755,21 @@
+@@ -5612,23 +6091,21 @@
  	  notinst_deplibs=
  	  relink_command=
  
@@ -5930,7 +7550,7 @@
  	  fi
  
  	  finalize=yes
-@@ -5650,17 +5791,15 @@
+@@ -5650,30 +6127,21 @@
  	  done
  
  	  relink_command=
@@ -5956,21 +7576,21 @@
  	  esac
  
  	  outputname=
-@@ -5669,8 +5808,12 @@
- 	      tmpdir="/tmp"
- 	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
- 	      tmpdir="$tmpdir/libtool-$$"
+ 	  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 :
-+	      save_umask=`umask`
-+	      umask 0077
-+	      if $mkdir "$tmpdir"; then
-+	        umask $save_umask
- 	      else
-+	        umask $save_umask
- 		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
- 		continue
- 	      fi
-@@ -5697,7 +5840,7 @@
+-	      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.
+@@ -5697,7 +6165,7 @@
  	fi
  
  	# remove .exe since cygwin /usr/bin/install will append another
@@ -5979,7 +7599,7 @@
  	case $install_prog,$host in
  	*/usr/bin/install*,*cygwin*)
  	  case $file:$destfile in
-@@ -5729,16 +5872,17 @@
+@@ -5729,16 +6197,17 @@
        $show "$install_prog $file $oldlib"
        $run eval "$install_prog \$file \$oldlib" || exit $?
  
@@ -5999,7 +7619,7 @@
  	$show "$cmd"
  	$run eval "$cmd" || exit $?
        done
-@@ -5752,9 +5896,9 @@
+@@ -5752,9 +6221,9 @@
      if test -n "$current_libdirs"; then
        # Maybe just do a dry run.
        test -n "$run" && current_libdirs=" -n$current_libdirs"
@@ -6011,7 +7631,7 @@
      fi
      ;;
  
-@@ -5773,10 +5917,11 @@
+@@ -5773,10 +6242,11 @@
        for libdir in $libdirs; do
  	if test -n "$finish_cmds"; then
  	  # Do each command in the finish commands.
@@ -6024,25 +7644,30 @@
  	    $show "$cmd"
  	    $run eval "$cmd" || admincmds="$admincmds
         $cmd"
-@@ -5793,7 +5938,7 @@
+@@ -5793,9 +6263,9 @@
      fi
  
      # Exit here if they wanted silent mode.
 -    exit 0
 +    test "$show" = : && exit $EXIT_SUCCESS
  
-     $echo "----------------------------------------------------------------------"
+-    $echo "----------------------------------------------------------------------"
++    $echo "X----------------------------------------------------------------------" | $Xsed
      $echo "Libraries have been installed in:"
-@@ -5829,7 +5974,7 @@
+     for libdir in $libdirs; do
+       $echo "   $libdir"
+@@ -5828,8 +6298,8 @@
+     $echo
      $echo "See any operating system documentation about shared libraries for"
      $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-     $echo "----------------------------------------------------------------------"
+-    $echo "----------------------------------------------------------------------"
 -    exit 0
++    $echo "X----------------------------------------------------------------------" | $Xsed
 +    exit $EXIT_SUCCESS
      ;;
  
    # libtool execute mode
-@@ -5841,7 +5986,7 @@
+@@ -5841,7 +6311,7 @@
      if test -z "$cmd"; then
        $echo "$modename: you must specify a COMMAND" 1>&2
        $echo "$help"
@@ -6051,7 +7676,7 @@
      fi
  
      # Handle -dlopen flags immediately.
-@@ -5849,7 +5994,7 @@
+@@ -5849,7 +6319,7 @@
        if test ! -f "$file"; then
  	$echo "$modename: \`$file' is not a file" 1>&2
  	$echo "$help" 1>&2
@@ -6060,7 +7685,7 @@
        fi
  
        dir=
-@@ -5860,7 +6005,7 @@
+@@ -5860,7 +6330,7 @@
  	else
  	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
  	  $echo "$help" 1>&2
@@ -6069,7 +7694,7 @@
  	fi
  
  	# Read the libtool library.
-@@ -5887,7 +6032,7 @@
+@@ -5887,7 +6357,7 @@
  	  dir="$dir/$objdir"
  	else
  	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
@@ -6078,7 +7703,7 @@
  	fi
  	;;
  
-@@ -5967,7 +6112,7 @@
+@@ -5967,7 +6437,7 @@
  	$echo "export $shlibpath_var"
        fi
        $echo "$cmd$args"
@@ -6087,7 +7712,7 @@
      fi
      ;;
  
-@@ -5995,7 +6140,7 @@
+@@ -5995,7 +6465,7 @@
      if test -z "$rm"; then
        $echo "$modename: you must specify an RM program" 1>&2
        $echo "$help" 1>&2
@@ -6096,8 +7721,23 @@
      fi
  
      rmdirs=
-@@ -6050,10 +6195,11 @@
- 	  if test "$mode" = uninstall; then
+@@ -6045,15 +6515,24 @@
+ 	    rmfiles="$rmfiles $objdir/$n"
+ 	  done
+ 	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+-	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+ 
+-	  if test "$mode" = uninstall; then
++	  case "$mode" in
++	  clean)
++	    case "  $library_names " in
++	    # "  " in the beginning catches empty $dlname
++	    *" $dlname "*) ;;
++	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
++	    esac
++	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
++	    ;;
++	  uninstall)
  	    if test -n "$library_names"; then
  	      # Do each command in the postuninstall commands.
 -	      eval cmds=\"$postuninstall_cmds\"
@@ -6109,7 +7749,7 @@
  		$show "$cmd"
  		$run eval "$cmd"
  		if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6065,10 +6211,11 @@
+@@ -6065,10 +6544,11 @@
  
  	    if test -n "$old_library"; then
  	      # Do each command in the old_postuninstall commands.
@@ -6122,7 +7762,17 @@
  		$show "$cmd"
  		$run eval "$cmd"
  		if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6107,7 +6254,7 @@
+@@ -6078,7 +6558,8 @@
+ 	      IFS="$save_ifs"
+ 	    fi
+ 	    # FIXME: should reinstall the best remaining shared library.
+-	  fi
++	    ;;
++	  esac
+ 	fi
+ 	;;
+ 
+@@ -6107,7 +6588,7 @@
  	if test "$mode" = clean ; then
  	  noexename=$name
  	  case $file in
@@ -6131,7 +7781,7 @@
  	    file=`$echo $file|${SED} 's,.exe$,,'`
  	    noexename=`$echo $name|${SED} 's,.exe$,,'`
  	    # $file with .exe has already been added to rmfiles,
-@@ -6152,20 +6299,20 @@
+@@ -6152,20 +6633,20 @@
    "")
      $echo "$modename: you must specify a MODE" 1>&2
      $echo "$generic_help" 1>&2
@@ -6155,7 +7805,7 @@
  fi
  
  # We need to display help for each of the modes.
-@@ -6201,7 +6348,7 @@
+@@ -6201,7 +6682,7 @@
  a more detailed description of MODE.
  
  Report bugs to <bug-libtool at gnu.org>."
@@ -6164,7 +7814,7 @@
    ;;
  
  clean)
-@@ -6313,6 +6460,8 @@
+@@ -6313,6 +6794,8 @@
    -no-undefined     declare that a library does not refer to external symbols
    -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
    -objectlist FILE  Use a list of object files found in FILE to specify objects
@@ -6173,7 +7823,7 @@
    -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
-@@ -6354,14 +6503,14 @@
+@@ -6354,14 +6837,14 @@
  *)
    $echo "$modename: invalid operation mode \`$mode'" 1>&2
    $echo "$help" 1>&2
@@ -6190,3 +7840,18 @@
  
  # 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 +6858,11 @@
+ # configuration.  But we'll never go from static-only to shared-only.
+ 
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+-build_libtool_libs=no
+-build_old_libs=yes
++disable_libs=shared
+ # ### END LIBTOOL TAG CONFIG: disable-shared
+ 
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-static
+-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
++disable_libs=static
+ # ### END LIBTOOL TAG CONFIG: disable-static
+ 
+ # Local Variables:

Deleted: kde-extras/digikamimageplugins/trunk/debian/patches/20_kdesvn_r516000_fix_infrared_bluring.diff

Modified: kde-extras/digikamimageplugins/trunk/debian/rules
===================================================================
--- kde-extras/digikamimageplugins/trunk/debian/rules	2006-11-21 18:58:20 UTC (rev 4963)
+++ kde-extras/digikamimageplugins/trunk/debian/rules	2006-11-21 19:38:51 UTC (rev 4964)
@@ -9,10 +9,6 @@
 clean ::
 	rm -f po/*/*.gmo
 
-buildprep: clean apply-patches
-	make -f admin/Makefile.common dist
-	debian/rules clean
-
 get-orig-source:
 	 @@dh_testdir
 	 @@[ -d ../tarballs/. ]




More information about the pkg-kde-commits mailing list