[Pkg-kde-commits] rev 2171 - trunk/common-patches

Christopher Martin chrsmrtn at costa.debian.org
Thu Nov 10 18:42:09 UTC 2005


Author: chrsmrtn
Date: 2005-11-10 18:42:07 +0000 (Thu, 10 Nov 2005)
New Revision: 2171

Added:
   trunk/common-patches/06_disable_no_undefined.diff
   trunk/common-patches/07_disable-visibility.diff
Removed:
   trunk/common-patches/06_automake-1.9.diff
   trunk/common-patches/07_disable_no_undefined.diff
   trunk/common-patches/08_disable-visibility.diff
Modified:
   trunk/common-patches/02_autotools_update.diff
   trunk/common-patches/03_libtool_update.diff
   trunk/common-patches/05_pedantic-errors.diff
Log:
Sync the common-patches for 3.5.0 RC1.


Modified: trunk/common-patches/02_autotools_update.diff
===================================================================
--- trunk/common-patches/02_autotools_update.diff	2005-11-10 07:51:11 UTC (rev 2170)
+++ trunk/common-patches/02_autotools_update.diff	2005-11-10 18:42:07 UTC (rev 2171)
@@ -1,1910 +1,22 @@
-diff -Nrua a/admin/compile b/admin/compile
---- a/admin/compile	2002-09-30 14:18:17.000000000 +0200
-+++ b/admin/compile	2005-02-26 06:17:26.726682545 +0100
-@@ -1,8 +1,9 @@
- #! /bin/sh
--
- # Wrapper for compilers which do not understand `-c -o'.
- 
--# Copyright 1999, 2000 Free Software Foundation, Inc.
-+scriptversion=2005-02-03.08
-+
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
- # Written by Tom Tromey <tromey at cygnus.com>.
- #
- # This program is free software; you can redistribute it and/or modify
-@@ -24,76 +25,118 @@
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
--# Usage:
--# compile PROGRAM [ARGS]...
--# `-o FOO.o' is removed from the args passed to the actual compile.
--
--prog=$1
--shift
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake at gnu.org> or send patches to
-+# <automake-patches at gnu.org>.
-+
-+case $1 in
-+  '')
-+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-+     exit 1;
-+     ;;
-+  -h | --h*)
-+    cat <<\EOF
-+Usage: compile [--help] [--version] PROGRAM [ARGS]
-+
-+Wrapper for compilers which do not understand `-c -o'.
-+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-+arguments, and rename the output as expected.
-+
-+If you are trying to build a whole package this is not the
-+right script to run: please start by reading the file `INSTALL'.
-+
-+Report bugs to <bug-automake at gnu.org>.
-+EOF
-+    exit $?
-+    ;;
-+  -v | --v*)
-+    echo "compile $scriptversion"
-+    exit $?
-+    ;;
-+esac
- 
- ofile=
- cfile=
--args=
--while test $# -gt 0; do
--   case "$1" in
--    -o)
--       # configure might choose to run compile as `compile cc -o foo foo.c'.
--       # So we do something ugly here.
--       ofile=$2
--       shift
--       case "$ofile" in
--	*.o | *.obj)
--	   ;;
--	*)
--	   args="$args -o $ofile"
--	   ofile=
--	   ;;
--       esac
--       ;;
--    *.c)
--       cfile=$1
--       args="$args $1"
--       ;;
--    *)
--       args="$args $1"
--       ;;
--   esac
--   shift
-+eat=
-+
-+for arg
-+do
-+  if test -n "$eat"; then
-+    eat=
-+  else
-+    case $1 in
-+      -o)
-+	# configure might choose to run compile as `compile cc -o foo foo.c'.
-+	# So we strip `-o arg' only if arg is an object.
-+	eat=1
-+	case $2 in
-+	  *.o | *.obj)
-+	    ofile=$2
-+	    ;;
-+	  *)
-+	    set x "$@" -o "$2"
-+	    shift
-+	    ;;
-+	esac
-+	;;
-+      *.c)
-+	cfile=$1
-+	set x "$@" "$1"
-+	shift
-+	;;
-+      *)
-+	set x "$@" "$1"
-+	shift
-+	;;
-+    esac
-+  fi
-+  shift
- done
- 
- if test -z "$ofile" || test -z "$cfile"; then
--   # If no `-o' option was seen then we might have been invoked from a
--   # pattern rule where we don't need one.  That is ok -- this is a
--   # normal compilation that the losing compiler can handle.  If no
--   # `.c' file was seen then we are probably linking.  That is also
--   # ok.
--   exec "$prog" $args
-+  # If no `-o' option was seen then we might have been invoked from a
-+  # pattern rule where we don't need one.  That is ok -- this is a
-+  # normal compilation that the losing compiler can handle.  If no
-+  # `.c' file was seen then we are probably linking.  That is also
-+  # ok.
-+  exec "$@"
- fi
- 
- # Name of file we expect compiler to create.
--cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
- 
- # Create the lock directory.
- # Note: use `[/.-]' here to ensure that we don't use the same name
- # that we are using for the .o file.  Also, base the name on the expected
- # object file name, since that is what matters with a parallel build.
--lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
-+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
- while true; do
--   if mkdir $lockdir > /dev/null 2>&1; then
--      break
--   fi
--   sleep 1
-+  if mkdir "$lockdir" >/dev/null 2>&1; then
-+    break
-+  fi
-+  sleep 1
- done
- # FIXME: race condition here if user kills between mkdir and trap.
--trap "rmdir $lockdir; exit 1" 1 2 15
-+trap "rmdir '$lockdir'; exit 1" 1 2 15
- 
- # Run the compile.
--"$prog" $args
--status=$?
-+"$@"
-+ret=$?
- 
- if test -f "$cofile"; then
--   mv "$cofile" "$ofile"
-+  mv "$cofile" "$ofile"
-+elif test -f "${cofile}bj"; then
-+  mv "${cofile}bj" "$ofile"
- fi
- 
--rmdir $lockdir
--exit $status
-+rmdir "$lockdir"
-+exit $ret
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
 diff -Nrua a/admin/depcomp b/admin/depcomp
---- a/admin/depcomp	2003-04-16 23:53:18.000000000 +0200
-+++ b/admin/depcomp	2005-02-26 06:17:26.733681321 +0100
-@@ -1,7 +1,9 @@
+--- a/admin/depcomp	2005-07-06 17:21:25.000000000 -0400
++++ b/admin/depcomp	2005-10-28 15:11:00.000000000 -0400
+@@ -1,7 +1,7 @@
  #! /bin/sh
--
  # depcomp - compile a program generating dependencies as side-effects
--# Copyright 1999, 2000 Free Software Foundation, Inc.
-+
-+scriptversion=2005-02-09.22
-+
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
  
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -25,13 +27,45 @@
+-scriptversion=2005-05-14.22
++scriptversion=2005-07-09.11
  
- # Originally written by Alexandre Oliva <oliva at dcc.unicamp.br>.
+ # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
  
-+case $1 in
-+  '')
-+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-+     exit 1;
-+     ;;
-+  -h | --h*)
-+    cat <<\EOF
-+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-+
-+Run PROGRAMS ARGS to compile a file, generating dependencies
-+as side-effects.
-+
-+Environment variables:
-+  depmode     Dependency tracking mode.
-+  source      Source file read by `PROGRAMS ARGS'.
-+  object      Object file output by `PROGRAMS ARGS'.
-+  DEPDIR      directory where to store dependencies.
-+  depfile     Dependency file to output.
-+  tmpdepfile  Temporary file to use when outputing dependencies.
-+  libtool     Whether libtool is used (yes/no).
-+
-+Report bugs to <bug-automake at gnu.org>.
-+EOF
-+    exit $?
-+    ;;
-+  -v | --v*)
-+    echo "depcomp $scriptversion"
-+    exit $?
-+    ;;
-+esac
-+
- if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-   echo "depcomp: Variables source, object and depmode must be set" 1>&2
-   exit 1
- fi
--# `libtool' can also be set to `yes' or `no'.
+@@ -467,7 +467,8 @@
+   done
  
--depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
-+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-+depfile=${depfile-`echo "$object" |
-+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
- tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
- 
- rm -f "$tmpdepfile"
-@@ -163,19 +197,25 @@
- 
- aix)
-   # The C for AIX Compiler uses -M and outputs the dependencies
--  # in a .u file.  This file always lives in the current directory.
--  # Also, the AIX compiler puts `$object:' at the start of each line;
--  # $object doesn't have directory information.
--  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
-+  # in a .u file.  In older versions, this file always lives in the
-+  # current directory.  Also, the AIX compiler puts `$object:' at the
-+  # start of each line; $object doesn't have directory information.
-+  # Version 6 uses the directory in both cases.
-+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-   tmpdepfile="$stripped.u"
--  outname="$stripped.o"
-   if test "$libtool" = yes; then
-     "$@" -Wc,-M
-   else
-     "$@" -M
-   fi
--
-   stat=$?
-+
-+  if test -f "$tmpdepfile"; then :
-+  else
-+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-+    tmpdepfile="$stripped.u"
-+  fi
-+
-   if test $stat -eq 0; then :
-   else
-     rm -f "$tmpdepfile"
-@@ -183,6 +223,7 @@
-   fi
- 
-   if test -f "$tmpdepfile"; then
-+    outname="$stripped.o"
-     # Each line is of the form `foo.o: dependent.h'.
-     # Do two passes, one to just change these to
-     # `$object: dependent.h' and one to simply `dependent.h:'.
-@@ -198,11 +239,9 @@
-   ;;
- 
- icc)
--  # Must come before tru64.
--
--  # Intel's C compiler understands `-MD -MF file'.  However
-+  # Intel's C compiler understands `-MD -MF file'.  However on
-   #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
--  # will fill foo.d with something like
-+  # ICC 7.0 will fill foo.d with something like
-   #    foo.o: sub/foo.c
-   #    foo.o: sub/foo.h
-   # which is wrong.  We want:
-@@ -210,6 +249,12 @@
-   #    sub/foo.o: sub/foo.h
-   #    sub/foo.c:
-   #    sub/foo.h:
-+  # ICC 7.1 will output
-+  #    foo.o: sub/foo.c sub/foo.h
-+  # and will wrap long lines using \ :
-+  #    foo.o: sub/foo.c ... \
-+  #     sub/foo.h ... \
-+  #     ...
- 
-   "$@" -MD -MF "$tmpdepfile"
-   stat=$?
-@@ -219,45 +264,70 @@
-     exit $stat
-   fi
-   rm -f "$depfile"
--  # Each line is of the form `foo.o: dependent.h'.
-+  # Each line is of the form `foo.o: dependent.h',
-+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-   # Do two passes, one to just change these to
-   # `$object: dependent.h' and one to simply `dependent.h:'.
--  sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
--  sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-+  # Some versions of the HPUX 10.20 sed can't process this invocation
-+  # correctly.  Breaking it into two sed invocations is a workaround.
-+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-+    sed -e 's/$/ :/' >> "$depfile"
-   rm -f "$tmpdepfile"
-   ;;
- 
- tru64)
--   # The Tru64 AIX compiler uses -MD to generate dependencies as a side
-+   # The Tru64 compiler uses -MD to generate dependencies as a side
-    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
--   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
-+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-    # dependencies in `foo.d' instead, so we check for that too.
-    # Subdirectories are respected.
-+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+   test "x$dir" = "x$object" && dir=
-+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
- 
--   tmpdepfile1="$object.d"
--   tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` 
-    if test "$libtool" = yes; then
-+      # With Tru64 cc, shared objects can also be used to make a
-+      # static library.  This mecanism is used in libtool 1.4 series to
-+      # handle both shared and static libraries in a single compilation.
-+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-+      #
-+      # With libtool 1.5 this exception was removed, and libtool now
-+      # generates 2 separate objects for the 2 libraries.  These two
-+      # compilations output dependencies in in $dir.libs/$base.o.d and
-+      # in $dir$base.o.d.  We have to check for both files, because
-+      # one of the two compilations can be disabled.  We should prefer
-+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-+      # automatically cleaned when .libs/ is deleted, while ignoring
-+      # the former would cause a distcleancheck panic.
-+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-       "$@" -Wc,-MD
-    else
-+      tmpdepfile1=$dir$base.o.d
-+      tmpdepfile2=$dir$base.d
-+      tmpdepfile3=$dir$base.d
-+      tmpdepfile4=$dir$base.d
-       "$@" -MD
-    fi
- 
-    stat=$?
-    if test $stat -eq 0; then :
-    else
--      rm -f "$tmpdepfile1" "$tmpdepfile2"
-+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-       exit $stat
-    fi
- 
--   if test -f "$tmpdepfile1"; then
--      tmpdepfile="$tmpdepfile1"
--   else
--      tmpdepfile="$tmpdepfile2"
--   fi
-+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+   do
-+     test -f "$tmpdepfile" && break
-+   done
-    if test -f "$tmpdepfile"; then
-       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
--      # That's a space and a tab in the [].
--      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-+      # That's a tab and a space in the [].
-+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-    else
-       echo "#dummy" > "$depfile"
-    fi
-@@ -270,34 +340,42 @@
- 
- dashmstdout)
-   # Important note: in order to support this mode, a compiler *must*
--  # always write the proprocessed file to stdout, regardless of -o,
--  # because we must use -o when running libtool.
--  test -z "$dashmflag" && dashmflag=-M
--  ( IFS=" "
--    case " $* " in
--    *" --mode=compile "*) # this is libtool, let us make it quiet
--      for arg
--      do # cycle over the arguments
--        case "$arg" in
--	"--mode=compile")
--	  # insert --quiet before "--mode=compile"
--	  set fnord "$@" --quiet
--	  shift # fnord
--	  ;;
--	esac
--	set fnord "$@" "$arg"
--	shift # fnord
--	shift # "$arg"
--      done
-+  # always write the preprocessed file to stdout, regardless of -o.
-+  "$@" || exit $?
-+
-+  # Remove the call to Libtool.
-+  if test "$libtool" = yes; then
-+    while test $1 != '--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+
-+  # Remove `-o $object'.
-+  IFS=" "
-+  for arg
-+  do
-+    case $arg in
-+    -o)
-+      shift
-+      ;;
-+    $object)
-+      shift
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"
-+      shift # fnord
-+      shift # $arg
-       ;;
-     esac
--    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
--  ) &
--  proc=$!
--  "$@"
--  stat=$?
--  wait "$proc"
--  if test "$stat" != 0; then exit $stat; fi
-+  done
-+
-+  test -z "$dashmflag" && dashmflag=-M
-+  # Require at least two characters before searching for `:'
-+  # in the target name.  This is to cope with DOS-style filenames:
-+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-+  "$@" $dashmflag |
-+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-   rm -f "$depfile"
-   cat < "$tmpdepfile" > "$depfile"
-   tr ' ' '
-@@ -315,36 +393,40 @@
-   ;;
- 
- makedepend)
--  # X makedepend
--  (
--    shift
--    cleared=no
--    for arg in "$@"; do
--      case $cleared in no)
--        set ""; shift
--	cleared=yes
--      esac
--      case "$arg" in
--        -D*|-I*)
--	  set fnord "$@" "$arg"; shift;;
--	-*)
--	  ;;
--	*)
--	  set fnord "$@" "$arg"; shift;;
--      esac
-+  "$@" || exit $?
-+  # Remove any Libtool call
-+  if test "$libtool" = yes; then
-+    while test $1 != '--mode=compile'; do
-+      shift
-     done
--    obj_suffix="`echo $object | sed 's/^.*\././'`"
--    touch "$tmpdepfile"
--    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
--  ) &
--  proc=$!
--  "$@"
--  stat=$?
--  wait "$proc"
--  if test "$stat" != 0; then exit $stat; fi
-+    shift
-+  fi
-+  # X makedepend
-+  shift
-+  cleared=no
-+  for arg in "$@"; do
-+    case $cleared in
-+    no)
-+      set ""; shift
-+      cleared=yes ;;
-+    esac
-+    case "$arg" in
-+    -D*|-I*)
-+      set fnord "$@" "$arg"; shift ;;
-+    # Strip any option that makedepend may not understand.  Remove
-+    # the object too, otherwise makedepend will parse it as a source file.
-+    -*|$object)
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"; shift ;;
-+    esac
-+  done
-+  obj_suffix="`echo $object | sed 's/^.*\././'`"
-+  touch "$tmpdepfile"
-+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-   rm -f "$depfile"
-   cat < "$tmpdepfile" > "$depfile"
--  tail +3 "$tmpdepfile" | tr ' ' '
-+  sed '1,2d' "$tmpdepfile" | tr ' ' '
- ' | \
- ## Some versions of the HPUX 10.20 sed can't process this invocation
- ## correctly.  Breaking it into two sed invocations is a workaround.
-@@ -354,35 +436,39 @@
- 
- cpp)
-   # Important note: in order to support this mode, a compiler *must*
--  # always write the proprocessed file to stdout, regardless of -o,
--  # because we must use -o when running libtool.
--  ( IFS=" "
--    case " $* " in
--    *" --mode=compile "*)
--      for arg
--      do # cycle over the arguments
--        case $arg in
--	"--mode=compile")
--	  # insert --quiet before "--mode=compile"
--	  set fnord "$@" --quiet
--	  shift # fnord
--	  ;;
--	esac
--	set fnord "$@" "$arg"
--	shift # fnord
--	shift # "$arg"
--      done
-+  # always write the preprocessed file to stdout.
-+  "$@" || exit $?
-+
-+  # Remove the call to Libtool.
-+  if test "$libtool" = yes; then
-+    while test $1 != '--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+
-+  # Remove `-o $object'.
-+  IFS=" "
-+  for arg
-+  do
-+    case $arg in
-+    -o)
-+      shift
-+      ;;
-+    $object)
-+      shift
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"
-+      shift # fnord
-+      shift # $arg
-       ;;
-     esac
--    "$@" -E |
-+  done
-+
-+  "$@" -E |
-     sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+   "$@" -E |
+-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
++    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
++       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
      sed '$ s: \\$::' > "$tmpdepfile"
--  ) &
--  proc=$!
--  "$@"
--  stat=$?
--  wait "$proc"
--  if test "$stat" != 0; then exit $stat; fi
    rm -f "$depfile"
    echo "$object : \\" > "$depfile"
-   cat < "$tmpdepfile" >> "$depfile"
-@@ -392,34 +478,27 @@
- 
- msvisualcpp)
-   # Important note: in order to support this mode, a compiler *must*
--  # always write the proprocessed file to stdout, regardless of -o,
-+  # always write the preprocessed file to stdout, regardless of -o,
-   # because we must use -o when running libtool.
--  ( IFS=" "
--    case " $* " in
--    *" --mode=compile "*)
--      for arg
--      do # cycle over the arguments
--        case $arg in
--	"--mode=compile")
--	  # insert --quiet before "--mode=compile"
--	  set fnord "$@" --quiet
--	  shift # fnord
--	  ;;
--	esac
-+  "$@" || exit $?
-+  IFS=" "
-+  for arg
-+  do
-+    case "$arg" in
-+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-+	set fnord "$@"
-+	shift
-+	shift
-+	;;
-+    *)
- 	set fnord "$@" "$arg"
--	shift # fnord
--	shift # "$arg"
--      done
--      ;;
-+	shift
-+	shift
-+	;;
-     esac
--    "$@" -E |
--    sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
--  ) &
--  proc=$!
--  "$@"
--  stat=$?
--  wait "$proc"
--  if test "$stat" != 0; then exit $stat; fi
-+  done
-+  "$@" -E |
-+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-   rm -f "$depfile"
-   echo "$object : \\" > "$depfile"
-   . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-@@ -439,3 +518,12 @@
- esac
- 
- exit 0
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
-diff -Nrua a/admin/install-sh b/admin/install-sh
---- a/admin/install-sh	2003-08-07 11:41:31.000000000 +0200
-+++ b/admin/install-sh	2005-02-26 06:17:26.757677124 +0100
-@@ -1,19 +1,38 @@
- #!/bin/sh
--#
- # install - install a program, script, or datafile
--# This comes from X11R5 (mit/util/scripts/install.sh).
-+
-+scriptversion=2005-02-02.21
-+
-+# This originates from X11R5 (mit/util/scripts/install.sh), which was
-+# later released in X11R6 (xc/config/util/install.sh) with the
-+# following copyright and license.
-+#
-+# Copyright (C) 1994 X Consortium
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a copy
-+# of this software and associated documentation files (the "Software"), to
-+# deal in the Software without restriction, including without limitation the
-+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-+# sell copies of the Software, and to permit persons to whom the Software is
-+# furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice shall be included in
-+# all copies or substantial portions of the Software.
- #
--# Copyright 1991 by the Massachusetts Institute of Technology
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- #
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation, and that the name of M.I.T. not be used in advertising or
--# publicity pertaining to distribution of the software without specific,
--# written prior permission.  M.I.T. makes no representations about the
--# suitability of this software for any purpose.  It is provided "as is"
--# without express or implied warranty.
-+# Except as contained in this notice, the name of the X Consortium shall not
-+# be used in advertising or otherwise to promote the sale, use or other deal-
-+# ings in this Software without prior written authorization from the X Consor-
-+# tium.
-+#
-+#
-+# FSF changes to this file are in the public domain.
- #
- # Calling this script install-sh is preferred over install.sh, to prevent
- # `make' implicit rules from creating a file called install from it
-@@ -23,13 +42,11 @@
- # from scratch.  It can only install one file at a time, a restriction
- # shared with many OS's install programs.
- 
--
- # set DOITPROG to echo to test this script
- 
- # Don't use :- since 4.3BSD and earlier shells don't like it.
- doit="${DOITPROG-}"
- 
--
- # put in absolute paths if you don't have them in your path; or use env. vars.
- 
- mvprog="${MVPROG-mv}"
-@@ -41,236 +58,266 @@
- rmprog="${RMPROG-rm}"
- mkdirprog="${MKDIRPROG-mkdir}"
- 
--transformbasename=""
--transform_arg=""
--instcmd="$mvprog"
- chmodcmd="$chmodprog 0755"
--chowncmd=""
--chgrpcmd=""
--stripcmd=""
-+chowncmd=
-+chgrpcmd=
-+stripcmd=
- rmcmd="$rmprog -f"
- mvcmd="$mvprog"
--src=""
--dst=""
--dir_arg=""
--
--while [ x"$1" != x ]; do
--    case $1 in
--	-c) instcmd=$cpprog
--	    shift
--	    continue;;
--
--	-d) dir_arg=true
--	    shift
--	    continue;;
--
--	-m) chmodcmd="$chmodprog $2"
--	    shift
--	    shift
--	    continue;;
--
--	-o) chowncmd="$chownprog $2"
--	    shift
--	    shift
--	    continue;;
--
--	-g) chgrpcmd="$chgrpprog $2"
--	    shift
--	    shift
--	    continue;;
--
--	-s) stripcmd=$stripprog
--	    shift
--	    continue;;
--
--	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
--	    shift
--	    continue;;
--
--	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
--	    shift
--	    continue;;
--
--	*)  if [ x"$src" = x ]
--	    then
--		src=$1
--	    else
--		# this colon is to work around a 386BSD /bin/sh bug
--		:
--		dst=$1
--	    fi
--	    shift
--	    continue;;
--    esac
--done
-+src=
-+dst=
-+dir_arg=
-+dstarg=
-+no_target_directory=
-+
-+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-+   or: $0 [OPTION]... SRCFILES... DIRECTORY
-+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-+   or: $0 [OPTION]... -d DIRECTORIES...
-+
-+In the 1st form, copy SRCFILE to DSTFILE.
-+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-+In the 4th, create DIRECTORIES.
-+
-+Options:
-+-c         (ignored)
-+-d         create directories instead of installing files.
-+-g GROUP   $chgrpprog installed files to GROUP.
-+-m MODE    $chmodprog installed files to MODE.
-+-o USER    $chownprog installed files to USER.
-+-s         $stripprog installed files.
-+-t DIRECTORY  install into DIRECTORY.
-+-T         report an error if DSTFILE is a directory.
-+--help     display this help and exit.
-+--version  display version info and exit.
-+
-+Environment variables override the default commands:
-+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-+"
-+
-+while test -n "$1"; do
-+  case $1 in
-+    -c) shift
-+        continue;;
-+
-+    -d) dir_arg=true
-+        shift
-+        continue;;
-+
-+    -g) chgrpcmd="$chgrpprog $2"
-+        shift
-+        shift
-+        continue;;
-+
-+    --help) echo "$usage"; exit $?;;
-+
-+    -m) chmodcmd="$chmodprog $2"
-+        shift
-+        shift
-+        continue;;
-+
-+    -o) chowncmd="$chownprog $2"
-+        shift
-+        shift
-+        continue;;
-+
-+    -s) stripcmd=$stripprog
-+        shift
-+        continue;;
- 
--if [ x"$src" = x ]
--then
--	echo "$0: no input file specified" >&2
--	exit 1
--else
--	:
--fi
--
--if [ x"$dir_arg" != x ]; then
--	dst=$src
--	src=""
--
--	if [ -d "$dst" ]; then
--		instcmd=:
--		chmodcmd=""
--	else
--		instcmd=$mkdirprog
--	fi
--else
--
--# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
--# might cause directories to be created, which would be especially bad
--# if $src (and thus $dsttmp) contains '*'.
--
--	if [ -f "$src" ] || [ -d "$src" ]
--	then
--		:
--	else
--		echo "$0: $src does not exist" >&2
--		exit 1
--	fi
--
--	if [ x"$dst" = x ]
--	then
--		echo "$0: no destination specified" >&2
--		exit 1
--	else
--		:
--	fi
--
--# If destination is a directory, append the input filename; if your system
--# does not like double slashes in filenames, you may need to add some logic
--
--	if [ -d "$dst" ]
--	then
--		dst=$dst/`basename "$src"`
--	else
--		:
--	fi
--fi
--
--## this sed command emulates the dirname command
--dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
--
--# Make sure that the destination directory exists.
--#  this part is taken from Noah Friedman's mkinstalldirs script
--
--# Skip lots of stat calls in the usual case.
--if [ ! -d "$dstdir" ]; then
--defaultIFS='
--	'
--IFS="${IFS-$defaultIFS}"
--
--oIFS=$IFS
--# Some sh's can't handle IFS=/ for some reason.
--IFS='%'
--set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
--IFS=$oIFS
--
--pathcomp=''
-+    -t) dstarg=$2
-+	shift
-+	shift
-+	continue;;
- 
--while [ $# -ne 0 ] ; do
--	pathcomp=$pathcomp$1
-+    -T) no_target_directory=true
- 	shift
-+	continue;;
- 
--	if [ ! -d "$pathcomp" ] ;
--        then
--		$mkdirprog "$pathcomp"
--	else
--		:
--	fi
-+    --version) echo "$0 $scriptversion"; exit $?;;
- 
--	pathcomp=$pathcomp/
-+    *)  # When -d is used, all remaining arguments are directories to create.
-+	# When -t is used, the destination is already specified.
-+	test -n "$dir_arg$dstarg" && break
-+        # Otherwise, the last argument is the destination.  Remove it from $@.
-+	for arg
-+	do
-+          if test -n "$dstarg"; then
-+	    # $@ is not empty: it contains at least $arg.
-+	    set fnord "$@" "$dstarg"
-+	    shift # fnord
-+	  fi
-+	  shift # arg
-+	  dstarg=$arg
-+	done
-+	break;;
-+  esac
- done
--fi
--
--if [ x"$dir_arg" != x ]
--then
--	$doit $instcmd "$dst" &&
- 
--	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
--	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
--	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
--	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
--else
--
--# If we're going to rename the final executable, determine the name now.
--
--	if [ x"$transformarg" = x ]
--	then
--		dstfile=`basename "$dst"`
--	else
--		dstfile=`basename "$dst" $transformbasename |
--			sed $transformarg`$transformbasename
--	fi
--
--# don't allow the sed command to completely eliminate the filename
--
--	if [ x"$dstfile" = x ]
--	then
--		dstfile=`basename "$dst"`
--	else
--		:
--	fi
--
--# Make a couple of temp file names in the proper directory.
--
--	dsttmp=$dstdir/#inst.$$#
--	rmtmp=$dstdir/#rm.$$#
--
--# Trap to clean up temp files at exit.
--
--	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
--	trap '(exit $?); exit' 1 2 13 15
--
--# Move or copy the file name to the temp name
--
--	$doit $instcmd "$src" "$dsttmp" &&
--
--# and set any options; do chmod last to preserve setuid bits
--
--# If any of these fail, we abort the whole thing.  If we want to
--# ignore errors from any of these, just make sure not to ignore
--# errors from the above "$doit $instcmd $src $dsttmp" command.
--
--	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
--	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
--	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
--	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
--
--# Now remove or move aside any old file at destination location.  We try this
--# two ways since rm can't unlink itself on some systems and the destination
--# file might be busy for other reasons.  In this case, the final cleanup
--# might fail but the new file should still install successfully.
--
--{
--	if [ -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 $dstdir/$dstfile" >&2
--		  (exit 1); exit
--		}
--	else
--		:
--	fi
--} &&
--
--# Now rename the file to the real destination.
-+if test -z "$1"; then
-+  if test -z "$dir_arg"; then
-+    echo "$0: no input file specified." >&2
-+    exit 1
-+  fi
-+  # It's OK to call `install-sh -d' without argument.
-+  # This can happen when creating conditional directories.
-+  exit 0
-+fi
- 
--	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-+for src
-+do
-+  # Protect names starting with `-'.
-+  case $src in
-+    -*) src=./$src ;;
-+  esac
-+
-+  if test -n "$dir_arg"; then
-+    dst=$src
-+    src=
-+
-+    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 '*'.
-+    if test ! -f "$src" && test ! -d "$src"; then
-+      echo "$0: $src does not exist." >&2
-+      exit 1
-+    fi
-+
-+    if test -z "$dstarg"; then
-+      echo "$0: no destination specified." >&2
-+      exit 1
-+    fi
-+
-+    dst=$dstarg
-+    # Protect names starting with `-'.
-+    case $dst in
-+      -*) dst=./$dst ;;
-+    esac
- 
--fi &&
-+    # If destination is a directory, append the input filename; won't work
-+    # if double slashes aren't ignored.
-+    if test -d "$dst"; then
-+      if test -n "$no_target_directory"; then
-+	echo "$0: $dstarg: Is a directory" >&2
-+	exit 1
-+      fi
-+      dst=$dst/`basename "$src"`
-+    fi
-+  fi
-+
-+  # This sed command emulates the dirname command.
-+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-+
-+  # Make sure that the destination directory exists.
-+
-+  # 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
-+
-+    pathcomp=
-+
-+    while test $# -ne 0 ; do
-+      pathcomp=$pathcomp$1
-+      shift
-+      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 -n "$dir_arg"; then
-+    $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"`
-+
-+    # Make a couple of temp file names in the proper directory.
-+    dsttmp=$dstdir/_inst.$$_
-+    rmtmp=$dstdir/_rm.$$_
-+
-+    # 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" &&
-+
-+    # and set any options; do chmod last to preserve setuid bits.
-+    #
-+    # If any of these fail, we abort the whole thing.  If we want to
-+    # ignore errors from any of these, just make sure not to ignore
-+    # errors from the above "$doit $cpprog $src $dsttmp" command.
-+    #
-+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-+
-+    # Now rename the file to the real destination.
-+    { $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
-+	   # support -f.
-+
-+	   # Now remove or move aside any old file at destination location.
-+	   # We try this two ways since rm can't unlink itself on some
-+	   # systems and the destination file might be busy for other
-+	   # reasons.  In this case, the final cleanup might fail but the new
-+	   # file should still install successfully.
-+	   {
-+	     if test -f "$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 $dstdir/$dstfile" >&2
-+		 (exit 1); exit 1
-+	       }
-+	     else
-+	       :
-+	     fi
-+	   } &&
-+
-+	   # Now rename the file to the real destination.
-+	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-+	 }
-+    }
-+  fi || { (exit 1); exit 1; }
-+done
- 
- # The final little trick to "correctly" pass the exit status to the exit trap.
--
- {
--	(exit 0); exit
-+  (exit 0); exit 0
- }
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
-diff -Nrua a/admin/missing b/admin/missing
---- a/admin/missing	2002-10-26 18:44:28.000000000 +0200
-+++ b/admin/missing	2005-02-26 06:17:26.761676424 +0100
-@@ -1,6 +1,10 @@
- #! /bin/sh
- # Common stub for a few missing GNU programs while installing.
--# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
-+
-+scriptversion=2005-02-08.22
-+
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-+#   Free Software Foundation, Inc.
- # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
- 
- # This program is free software; you can redistribute it and/or modify
-@@ -38,18 +42,24 @@
-   configure_ac=configure.in
- fi
- 
-+msg="missing on your system"
-+
- case "$1" in
- --run)
-   # Try to run requested program, and just exit if it succeeds.
-   run=
-   shift
-   "$@" && exit 0
-+  # Exit code 63 means version mismatch.  This often happens
-+  # when the user try to use an ancient version of a tool on
-+  # a file that requires a minimum version.  In this case we
-+  # we should proceed has if the program had been absent, or
-+  # if --run hadn't been passed.
-+  if test $? = 63; then
-+    run=:
-+    msg="probably too old"
-+  fi
-   ;;
--esac
--
--# If it does not exist, or fails to run (possibly an outdated version),
--# try to emulate it.
--case "$1" in
- 
-   -h|--h|--he|--hel|--help)
-     echo "\
-@@ -74,11 +84,15 @@
-   lex          create \`lex.yy.c', if possible, from existing .c
-   makeinfo     touch the output file
-   tar          try tar, gnutar, gtar, then tar without non-portable flags
--  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-+
-+Send bug reports to <bug-automake at gnu.org>."
-+    exit $?
-     ;;
- 
-   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
--    echo "missing 0.4 - GNU automake"
-+    echo "missing $scriptversion (GNU Automake)"
-+    exit $?
-     ;;
- 
-   -*)
-@@ -87,14 +101,44 @@
-     exit 1
-     ;;
- 
--  aclocal*)
-+esac
-+
-+# Now exit if we have it, but it failed.  Also exit now if we
-+# don't have it and --version was passed (most likely to detect
-+# the program).
-+case "$1" in
-+  lex|yacc)
-+    # Not GNU programs, they don't have --version.
-+    ;;
-+
-+  tar)
-+    if test -n "$run"; then
-+       echo 1>&2 "ERROR: \`tar' requires --run"
-+       exit 1
-+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-+       exit 1
-+    fi
-+    ;;
-+
-+  *)
-     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-        # We have it, but it failed.
-        exit 1
-+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-+       # Could not run --version or --help.  This is probably someone
-+       # running `$TOOL --version' or `$TOOL --help' to check whether
-+       # $TOOL exists and not knowing $TOOL uses missing.
-+       exit 1
-     fi
-+    ;;
-+esac
- 
-+# If it does not exist, or fails to run (possibly an outdated version),
-+# try to emulate it.
-+case "$1" in
-+  aclocal*)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
-+WARNING: \`$1' is $msg.  You should only need it if
-          you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-          to install the \`Automake' and \`Perl' packages.  Grab them from
-          any GNU archive site."
-@@ -102,13 +146,8 @@
-     ;;
- 
-   autoconf)
--    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
--       # We have it, but it failed.
--       exit 1
--    fi
--
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
-+WARNING: \`$1' is $msg.  You should only need it if
-          you modified \`${configure_ac}'.  You might want to install the
-          \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-          archive site."
-@@ -116,13 +155,8 @@
-     ;;
- 
-   autoheader)
--    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
--       # We have it, but it failed.
--       exit 1
--    fi
--
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
-+WARNING: \`$1' is $msg.  You should only need it if
-          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-          from any GNU archive site."
-@@ -140,13 +174,8 @@
-     ;;
- 
-   automake*)
--    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
--       # We have it, but it failed.
--       exit 1
--    fi
--
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
-+WARNING: \`$1' is $msg.  You should only need it if
-          you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-          You might want to install the \`Automake' and \`Perl' packages.
-          Grab them from any GNU archive site."
-@@ -156,16 +185,11 @@
-     ;;
- 
-   autom4te)
--    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
--       # We have it, but it failed.
--       exit 1
--    fi
--
-     echo 1>&2 "\
--WARNING: \`$1' is needed, and you do not seem to have it handy on your
--         system.  You might have modified some files without having the
-+WARNING: \`$1' is needed, but is $msg.
-+         You might have modified some files without having the
-          proper tools for further handling them.
--         You can get \`$1Help2man' as part of \`Autoconf' from any GNU
-+         You can get \`$1' as part of \`Autoconf' from any GNU
-          archive site."
- 
-     file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-@@ -185,7 +209,7 @@
- 
-   bison|yacc)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
-+WARNING: \`$1' $msg.  You should only need it if
-          you modified a \`.y' file.  You may need the \`Bison' package
-          in order for those modifications to take effect.  You can get
-          \`Bison' from any GNU archive site."
-@@ -215,7 +239,7 @@
- 
-   lex|flex)
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
-+WARNING: \`$1' is $msg.  You should only need it if
-          you modified a \`.l' file.  You may need the \`Flex' package
-          in order for those modifications to take effect.  You can get
-          \`Flex' from any GNU archive site."
-@@ -237,13 +261,8 @@
-     ;;
- 
-   help2man)
--    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
--       # We have it, but it failed.
--       exit 1
--    fi
--
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
-+WARNING: \`$1' is $msg.  You should only need it if
- 	 you modified a dependency of a manual page.  You may need the
- 	 \`Help2man' package in order for those modifications to take
- 	 effect.  You can get \`Help2man' from any GNU archive site."
-@@ -262,32 +281,27 @@
-     ;;
- 
-   makeinfo)
--    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
--       # We have makeinfo, but it failed.
--       exit 1
--    fi
--
-     echo 1>&2 "\
--WARNING: \`$1' is missing on your system.  You should only need it if
-+WARNING: \`$1' is $msg.  You should only need it if
-          you modified a \`.texi' or \`.texinfo' file, or any other file
-          indirectly affecting the aspect of the manual.  The spurious
-          call might also be the consequence of using a buggy \`make' (AIX,
-          DU, IRIX).  You might want to install the \`Texinfo' package or
-          the \`GNU make' package.  Grab either from any GNU archive site."
-+    # 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`
-+      # ... 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
-     touch $file
-     ;;
- 
-   tar)
-     shift
--    if test -n "$run"; then
--      echo 1>&2 "ERROR: \`tar' requires --run"
--      exit 1
--    fi
- 
-     # We have already tried tar in the generic part.
-     # Look for gnutar/gtar before invocation to avoid ugly error
-@@ -323,10 +337,10 @@
- 
-   *)
-     echo 1>&2 "\
--WARNING: \`$1' is needed, and you do not seem to have it handy on your
--         system.  You might have modified some files without having the
-+WARNING: \`$1' is needed, and is $msg.
-+         You might have modified some files without having the
-          proper tools for further handling them.  Check the \`README' file,
--         it often tells you about the needed prerequirements for installing
-+         it often tells you about the needed prerequisites for installing
-          this package.  You may also peek at any GNU archive site, in case
-          some other package would contain this missing \`$1' program."
-     exit 1
-@@ -334,3 +348,10 @@
- esac
- 
- exit 0
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
-diff -Nrua a/admin/mkinstalldirs b/admin/mkinstalldirs
---- a/admin/mkinstalldirs	2002-10-26 18:53:16.000000000 +0200
-+++ b/admin/mkinstalldirs	2005-02-26 06:17:26.766675550 +0100
-@@ -1,21 +1,33 @@
- #! /bin/sh
- # mkinstalldirs --- make directory hierarchy
--# Author: Noah Friedman <friedman at prep.ai.mit.edu>
-+
-+scriptversion=2005-02-02.21
-+
-+# Original author: Noah Friedman <friedman at prep.ai.mit.edu>
- # Created: 1993-05-16
--# Public domain
-+# Public domain.
-+#
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake at gnu.org> or send patches to
-+# <automake-patches at gnu.org>.
- 
- errstatus=0
- dirmode=""
- 
- usage="\
--Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-+
-+Create each directory DIR (with mode MODE, if specified), including all
-+leading file name components.
-+
-+Report bugs to <bug-automake at gnu.org>."
- 
- # process command line arguments
- while test $# -gt 0 ; do
-   case $1 in
-     -h | --help | --h*)         # -h for help
--      echo "$usage" 1>&2
--      exit 0
-+      echo "$usage"
-+      exit $?
-       ;;
-     -m)                         # -m PERM arg
-       shift
-@@ -23,6 +35,10 @@
-       dirmode=$1
-       shift
-       ;;
-+    --version)
-+      echo "$0 $scriptversion"
-+      exit $?
-+      ;;
-     --)                         # stop option processing
-       shift
-       break
-@@ -50,17 +66,37 @@
-   0) exit 0 ;;
- esac
- 
-+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-+# mkdir -p a/c at the same time, both will detect that a is missing,
-+# one will create a, then the other will try to create a and die with
-+# a "File exists" error.  This is a problem when calling mkinstalldirs
-+# from a parallel make.  We use --version in the probe to restrict
-+# ourselves to GNU mkdir, which is thread-safe.
- case $dirmode in
-   '')
--    if mkdir -p -- . 2>/dev/null; then
-+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-       echo "mkdir -p -- $*"
-       exec mkdir -p -- "$@"
-+    else
-+      # On NextStep and OpenStep, the `mkdir' command does not
-+      # recognize any option.  It will interpret all options as
-+      # directories to create, and then abort because `.' already
-+      # exists.
-+      test -d ./-p && rmdir ./-p
-+      test -d ./--version && rmdir ./--version
-     fi
-     ;;
-   *)
--    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-+       test ! -d ./--version; then
-       echo "mkdir -m $dirmode -p -- $*"
-       exec mkdir -m "$dirmode" -p -- "$@"
-+    else
-+      # Clean up after NextStep and OpenStep mkdir.
-+      for d in ./-m ./-p ./--version "./$dirmode";
-+      do
-+        test -d $d && rmdir $d
-+      done
-     fi
-     ;;
- esac
-@@ -84,17 +120,17 @@
-       mkdir "$pathcomp" || lasterr=$?
- 
-       if test ! -d "$pathcomp"; then
--  	errstatus=$lasterr
-+	errstatus=$lasterr
-       else
--  	if test ! -z "$dirmode"; then
-+	if test ! -z "$dirmode"; then
- 	  echo "chmod $dirmode $pathcomp"
--    	  lasterr=""
--  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-+	  lasterr=""
-+	  chmod "$dirmode" "$pathcomp" || lasterr=$?
- 
--  	  if test ! -z "$lasterr"; then
--  	    errstatus=$lasterr
--  	  fi
--  	fi
-+	  if test ! -z "$lasterr"; then
-+	    errstatus=$lasterr
-+	  fi
-+	fi
-       fi
-     fi
- 
-@@ -107,5 +143,8 @@
- # Local Variables:
- # mode: shell-script
- # sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
- # End:
--# mkinstalldirs ends here
-diff -Nrua a/admin/ylwrap b/admin/ylwrap
---- a/admin/ylwrap	2001-10-05 02:46:36.000000000 +0200
-+++ b/admin/ylwrap	2005-02-26 06:17:26.777673626 +0100
-@@ -1,6 +1,11 @@
- #! /bin/sh
- # ylwrap - wrapper for lex/yacc invocations.
--# Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
-+
-+scriptversion=2005-02-02.22
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
-+#   Free Software Foundation, Inc.
-+#
- # Written by Tom Tromey <tromey at cygnus.com>.
- #
- # This program is free software; you can redistribute it and/or modify
-@@ -22,44 +27,65 @@
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
--# Usage:
--#     ylwrap INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
--# * INPUT is the input file
--# * OUTPUT is file PROG generates
--# * DESIRED is file we actually want
--# * PROGRAM is program to run
--# * ARGS are passed to PROG
--# Any number of OUTPUT,DESIRED pairs may be used.
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake at gnu.org> or send patches to
-+# <automake-patches at gnu.org>.
-+
-+case "$1" in
-+  '')
-+    echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
-+    exit 1
-+    ;;
-+  --basedir)
-+    basedir=$2
-+    shift 2
-+    ;;
-+  -h|--h*)
-+    cat <<\EOF
-+Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
-+
-+Wrapper for lex/yacc invocations, renaming files as desired.
-+
-+  INPUT is the input file
-+  OUTPUT is one file PROG generates
-+  DESIRED is the file we actually want instead of OUTPUT
-+  PROGRAM is program to run
-+  ARGS are passed to PROG
-+
-+Any number of OUTPUT,DESIRED pairs may be used.
-+
-+Report bugs to <bug-automake at gnu.org>.
-+EOF
-+    exit $?
-+    ;;
-+  -v|--v*)
-+    echo "ylwrap $scriptversion"
-+    exit $?
-+    ;;
-+esac
-+
- 
- # The input.
- input="$1"
- shift
- case "$input" in
-- [\\/]* | ?:[\\/]*)
-+  [\\/]* | ?:[\\/]*)
-     # Absolute path; do nothing.
-     ;;
-- *)
-+  *)
-     # Relative path.  Make it absolute.
-     input="`pwd`/$input"
-     ;;
- esac
- 
--# The directory holding the input.
--input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
--# Quote $INPUT_DIR so we can use it in a regexp.
--# FIXME: really we should care about more than `.' and `\'.
--input_rx=`echo "$input_dir" | sed -e 's,\\\\,\\\\\\\\,g' -e 's,\\.,\\\\.,g'`
--
--echo "got $input_rx"
--
- pairlist=
- while test "$#" -ne 0; do
--   if test "$1" = "--"; then
--      shift
--      break
--   fi
--   pairlist="$pairlist $1"
--   shift
-+  if test "$1" = "--"; then
-+    shift
-+    break
-+  fi
-+  pairlist="$pairlist $1"
-+  shift
- done
- 
- # The program to run.
-@@ -67,8 +93,8 @@
- shift
- # Make any relative path in $prog absolute.
- case "$prog" in
-- [\\/]* | ?:[\\/]*) ;;
-- *[\\/]*) prog="`pwd`/$prog" ;;
-+  [\\/]* | ?:[\\/]*) ;;
-+  *[\\/]*) prog="`pwd`/$prog" ;;
- esac
- 
- # FIXME: add hostname here for parallel makes that run commands on
-@@ -79,65 +105,118 @@
- 
- cd $dirname
- 
--$prog ${1+"$@"} "$input"
--status=$?
-+case $# in
-+  0) $prog "$input" ;;
-+  *) $prog "$@" "$input" ;;
-+esac
-+ret=$?
- 
--if test $status -eq 0; then
--   set X $pairlist
--   shift
--   first=yes
--   # Since DOS filename conventions don't allow two dots,
--   # the DOS version of Bison writes out y_tab.c instead of y.tab.c
--   # and y_tab.h instead of y.tab.h. Test to see if this is the case.
--   y_tab_nodot="no"
--   if test -f y_tab.c || test -f y_tab.h; then
--      y_tab_nodot="yes"
--   fi
--
--   while test "$#" -ne 0; do
--      from="$1"
--      # Handle y_tab.c and y_tab.h output by DOS
--      if test $y_tab_nodot = "yes"; then
--	 if test $from = "y.tab.c"; then
--	    from="y_tab.c"
--	 else
--	    if test $from = "y.tab.h"; then
--	       from="y_tab.h"
--	    fi
--	 fi
--      fi
--      if test -f "$from"; then
--         # If $2 is an absolute path name, then just use that,
--         # otherwise prepend `../'.
--         case "$2" in
--	   [\\/]* | ?:[\\/]*) target="$2";;
--	   *) target="../$2";;
--	 esac
--
--	 # Edit out `#line' or `#' directives.  We don't want the
--	 # resulting debug information to point at an absolute srcdir;
--	 # it is better for it to just mention the .y file with no
--	 # path.
--	 sed -e "/^#/ s,$input_rx,," "$from" > "$target" || status=$?
-+if test $ret -eq 0; then
-+  set X $pairlist
-+  shift
-+  first=yes
-+  # Since DOS filename conventions don't allow two dots,
-+  # the DOS version of Bison writes out y_tab.c instead of y.tab.c
-+  # and y_tab.h instead of y.tab.h. Test to see if this is the case.
-+  y_tab_nodot="no"
-+  if test -f y_tab.c || test -f y_tab.h; then
-+    y_tab_nodot="yes"
-+  fi
-+
-+  # The directory holding the input.
-+  input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
-+  # Quote $INPUT_DIR so we can use it in a regexp.
-+  # FIXME: really we should care about more than `.' and `\'.
-+  input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
-+
-+  while test "$#" -ne 0; do
-+    from="$1"
-+    # Handle y_tab.c and y_tab.h output by DOS
-+    if test $y_tab_nodot = "yes"; then
-+      if test $from = "y.tab.c"; then
-+    	from="y_tab.c"
-       else
--	 # A missing file is only an error for the first file.  This
--	 # is a blatant hack to let us support using "yacc -d".  If -d
--	 # is not specified, we don't want an error when the header
--	 # file is "missing".
--	 if test $first = yes; then
--	    status=1
--	 fi
-+    	if test $from = "y.tab.h"; then
-+    	  from="y_tab.h"
-+    	fi
-       fi
--      shift
--      shift
--      first=no
--   done
-+    fi
-+    if test -f "$from"; then
-+      # If $2 is an absolute path name, then just use that,
-+      # otherwise prepend `../'.
-+      case "$2" in
-+    	[\\/]* | ?:[\\/]*) target="$2";;
-+    	*) target="../$2";;
-+      esac
-+
-+      # We do not want to overwrite a header file if it hasn't
-+      # changed.  This avoid useless recompilations.  However the
-+      # parser itself (the first file) should always be updated,
-+      # because it is the destination of the .y.c rule in the
-+      # Makefile.  Divert the output of all other files to a temporary
-+      # file so we can compare them to existing versions.
-+      if test $first = no; then
-+	realtarget="$target"
-+	target="tmp-`echo $target | sed s/.*[\\/]//g`"
-+      fi
-+      # Edit out `#line' or `#' directives.
-+      #
-+      # We don't want the resulting debug information to point at
-+      # an absolute srcdir; it is better for it to just mention the
-+      # .y file with no path.
-+      #
-+      # We want to use the real output file name, not yy.lex.c for
-+      # instance.
-+      #
-+      # We want the include guards to be adjusted too.
-+      FROM=`echo "$from" | sed \
-+            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
-+            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
-+      TARGET=`echo "$2" | sed \
-+            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
-+            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
-+
-+      sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
-+          -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
-+
-+      # Check whether header files must be updated.
-+      if test $first = no; then
-+	if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
-+	  echo "$2" is unchanged
-+	  rm -f "$target"
-+	else
-+          echo updating "$2"
-+          mv -f "$target" "$realtarget"
-+        fi
-+      fi
-+    else
-+      # A missing file is only an error for the first file.  This
-+      # is a blatant hack to let us support using "yacc -d".  If -d
-+      # is not specified, we don't want an error when the header
-+      # file is "missing".
-+      if test $first = yes; then
-+        ret=1
-+      fi
-+    fi
-+    shift
-+    shift
-+    first=no
-+  done
- else
--   status=$?
-+  ret=$?
- fi
- 
- # Remove the directory.
- cd ..
- rm -rf $dirname
- 
--exit $status
-+exit $ret
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:

Modified: trunk/common-patches/03_libtool_update.diff
===================================================================
--- trunk/common-patches/03_libtool_update.diff	2005-11-10 07:51:11 UTC (rev 2170)
+++ trunk/common-patches/03_libtool_update.diff	2005-11-10 18:42:07 UTC (rev 2171)
@@ -1,15 +1,41 @@
 diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in	2005-01-18 04:52:36.000000000 -0500
-+++ b/admin/libtool.m4.in	2005-05-19 13:26:30.000000000 -0400
-@@ -23,6 +23,7 @@
- ## the same distribution terms that you use for the rest of that program.
+--- a/admin/libtool.m4.in	2005-11-09 04:19:43.000000000 -0500
++++ b/admin/libtool.m4.in	2005-11-10 12:07:37.000000000 -0500
+@@ -1,28 +1,13 @@
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
++## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+ ## Free Software Foundation, Inc.
+ ## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ ##
+-## This program is free software; you can redistribute it and/or modify
+-## it under the terms of the GNU General Public License as published by
+-## the Free Software Foundation; either version 2 of the License, or
+-## (at your option) any later version.
+-##
+-## This program is distributed in the hope that it will be useful, but
+-## WITHOUT ANY WARRANTY; without even the implied warranty of
+-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-## General Public License for more details.
+-##
+-## You should have received a copy of the GNU General Public License
+-## along with this program; if not, write to the Free Software
+-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-##
+-## As a special exception to the GNU General Public License, if you
+-## distribute this file as part of a program that contains a
+-## configuration script generated by Autoconf, you may include it under
+-## the same distribution terms that you use for the rest of that program.
++## This file is free software; the Free Software Foundation gives
++## unlimited permission to copy and/or distribute it, with or without
++## modifications, as long as this notice is preserved.
  
- # serial 47 AC_PROG_LIBTOOL
-+# Debian $Rev: 214 $
+-# serial 47 AC_PROG_LIBTOOL
++# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
  
  
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -82,7 +83,7 @@
+@@ -82,7 +67,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -18,9 +44,107 @@
  AC_SUBST(LIBTOOL)dnl
  
  # Prevent multiple expansion
-@@ -496,12 +497,11 @@
+@@ -132,7 +117,7 @@
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
+ [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+ 
+ # Same as above, but do not quote variable references.
+@@ -152,7 +137,7 @@
+ default_ofile=libtool
+ can_build_shared=yes
+ 
+-# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -200,6 +185,8 @@
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+ 
++_LT_CC_BASENAME([$compiler])
++
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+@@ -245,6 +232,48 @@
+ ])# _LT_AC_SYS_COMPILER
+ 
+ 
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
++AC_DEFUN([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++  case $cc_temp in
++    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++])
++
++
++# _LT_COMPILER_BOILERPLATE
++# ------------------------
++# Check for compiler boilerplate output or warnings with
++# the simple compiler test code.
++AC_DEFUN([_LT_COMPILER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_COMPILER_BOILERPLATE
++
++
++# _LT_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++AC_DEFUN([_LT_LINKER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_LINKER_BOILERPLATE
++
++
+ # _LT_AC_SYS_LIBPATH_AIX
+ # ----------------------
+ # Links a minimal program and checks the executable
+@@ -317,15 +346,15 @@
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+-       echo_test_string="`eval $cmd`" &&
++    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++       echo_test_string=`eval $cmd` &&
+        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+     then
+       break
+@@ -494,14 +523,13 @@
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
    if AC_TRY_EVAL(ac_compile); then
-     case "`/usr/bin/file conftest.o`" in
+-    case "`/usr/bin/file conftest.o`" in
++    case `/usr/bin/file conftest.o` in
      *32-bit*)
 -      LINUX_64_MODE="32"
        case $host in
@@ -32,7 +156,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -513,7 +513,6 @@
+@@ -513,7 +541,6 @@
        esac
        ;;
      *64-bit*)
@@ -40,7 +164,47 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -643,7 +642,7 @@
+@@ -578,7 +605,7 @@
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -588,8 +615,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
+        $2=yes
+      fi
+    fi
+@@ -615,11 +644,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
+-     # The compiler can only warn and ignore the option if not recognized
++     # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+      if test -s conftest.err; then
+        # Append any errors to the config.log.
+        cat conftest.err 1>&AS_MESSAGE_LOG_FD
++       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
++       $SED '/^$/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 @@
  AC_MSG_CHECKING([the maximum length of command line arguments])
  AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
    i=0
@@ -49,24 +213,52 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -672,20 +671,26 @@
+@@ -672,20 +706,53 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
+- *)
 +  amigaos*)
 +    # On AmigaOS with pdksh, this test takes hours, literally.
 +    # So we just punt and use a minimum line length of 8192.
 +    lt_cv_sys_max_cmd_len=8192;
 +    ;;
 +
-  *)
++  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    ;;
++  osf*)
++    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++    # nice to cause kernel panics so lets avoid the loop below.
++    # First set a reasonable default.
++    lt_cv_sys_max_cmd_len=16384
++    #
++    if test -x /sbin/sysconfig; then
++      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++        *1*) lt_cv_sys_max_cmd_len=-1 ;;
++      esac
++    fi
++    ;;
++  *)
      # If test is not a shell built-in, we'll probably end up computing a
      # maximum length that is only half of the actual maximum length, but
      # we can't tell.
 -    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
 -	       = "XX$testring") >/dev/null 2>&1 &&
 -	    new_result=`expr "X$testring" : ".*" 2>&1` &&
-+    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
 +	       = "XX$teststring") >/dev/null 2>&1 &&
 +	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
  	    lt_cv_sys_max_cmd_len=$new_result &&
@@ -81,7 +273,16 @@
      # 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.
-@@ -835,7 +840,7 @@
+@@ -781,7 +848,7 @@
+ }]
+ EOF
+   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) $1 ;;
+@@ -835,7 +902,7 @@
      lt_cv_dlopen_self=yes
      ])
     ;;
@@ -90,7 +291,7 @@
    *)
      AC_CHECK_FUNC([shl_load],
  	  [lt_cv_dlopen="shl_load"],
-@@ -924,13 +929,6 @@
+@@ -924,20 +991,13 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -104,12 +305,29 @@
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -954,8 +952,11 @@
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -949,13 +1009,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
+        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
       fi
     fi
-    chmod u+w .
+-   chmod u+w .
 -   $rm conftest* out/*
 -   rmdir out
++   chmod u+w . 2>&AS_MESSAGE_LOG_FD
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
@@ -118,7 +336,18 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -1072,7 +1073,7 @@
+@@ -1014,8 +1079,8 @@
+ [AC_MSG_CHECKING([how to hardcode library paths into programs])
+ _LT_AC_TAGVAR(hardcode_action, $1)=
+ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+-   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
++   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
++   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+ 
+   # We can hardcode non-existant directories.
+   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+@@ -1072,7 +1137,7 @@
     *)
    AC_MSG_RESULT([no])
      ;;
@@ -127,7 +356,7 @@
  fi
  ])# AC_LIBTOOL_SYS_LIB_STRIP
  
-@@ -1085,7 +1086,7 @@
+@@ -1085,7 +1150,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -136,7 +365,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -1095,7 +1096,20 @@
+@@ -1095,7 +1160,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -158,7 +387,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -1160,7 +1174,7 @@
+@@ -1160,7 +1238,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -167,8 +396,17 @@
    ;;
  
  beos*)
-@@ -1185,7 +1199,7 @@
+@@ -1169,7 +1247,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
  
+-bsdi4*)
++bsdi[[45]]*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -1185,7 +1263,7 @@
+ 
  cygwin* | mingw* | pw32*)
    version_type=windows
 -  shrext=".dll"
@@ -176,34 +414,85 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -1250,7 +1264,7 @@
+@@ -1197,7 +1275,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -1227,7 +1306,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+@@ -1250,7 +1329,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
 -  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -1273,7 +1287,7 @@
+@@ -1273,7 +1352,7 @@
    dynamic_linker=no
    ;;
  
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
 +kfreebsd*-gnu)
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -1333,7 +1347,7 @@
+@@ -1285,8 +1364,17 @@
+   dynamic_linker='GNU ld.so'
+   ;;
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[[123]]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -1304,7 +1392,7 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.[01]* | freebsdelf3.[01]*)
++  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -1331,9 +1419,9 @@
+   version_type=sunos
+   need_lib_prefix=no
    need_version=no
-   case "$host_cpu" in
+-  case "$host_cpu" in
++  case $host_cpu in
    ia64*)
 -    shrext='.so'
 +    shrext_cmds='.so'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -1348,7 +1362,7 @@
+@@ -1348,7 +1436,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -212,7 +501,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -1359,7 +1373,7 @@
+@@ -1359,7 +1447,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -221,7 +510,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -1421,22 +1435,19 @@
+@@ -1421,22 +1509,19 @@
    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'
@@ -243,14 +532,14 @@
  
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -1446,6 +1457,30 @@
+@@ -1446,6 +1531,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -281,7 +570,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -1455,7 +1490,7 @@
+@@ -1455,7 +1564,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -290,16 +579,20 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -1484,7 +1519,7 @@
+@@ -1484,7 +1593,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
 -  need_version=no
-+  need_version=yes
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -1504,7 +1539,7 @@
+@@ -1504,7 +1617,7 @@
  
  os2*)
    libname_spec='$name'
@@ -308,9 +601,80 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -2095,31 +2130,23 @@
+@@ -1650,7 +1763,9 @@
+ 
+       case $tagname in
+       CXX)
+-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
++	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++	    (test "X$CXX" != "Xg++"))) ; then
+ 	  AC_LIBTOOL_LANG_CXX_CONFIG
+ 	else
+ 	  tagname=""
+@@ -1712,7 +1827,7 @@
+ 
+ # AC_LIBTOOL_WIN32_DLL
+ # --------------------
+-# declare package support for building win32 dll's
++# declare package support for building win32 DLLs
+ AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+ [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+ ])# AC_LIBTOOL_WIN32_DLL
+@@ -1886,7 +2001,7 @@
+       if test -n "$file_magic_test_file"; then
+ 	case $deplibs_check_method in
+ 	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ 	    $EGREP "$file_magic_regex" > /dev/null; then
+@@ -1996,7 +2111,7 @@
+     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+       lt_cv_path_LD="$ac_dir/$ac_prog"
+       # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some GNU ld's only accept -v.
++      # but apparently some variants of GNU ld only accept -v.
+       # Break only if it was the GNU/non-GNU ld that we prefer.
+       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+       *GNU* | *'with BFD'*)
+@@ -2028,7 +2143,7 @@
+ AC_DEFUN([AC_PROG_LD_GNU],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+@@ -2055,6 +2170,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'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
+ ])# AC_PROG_LD_RELOAD_FLAG
+ 
+ 
+@@ -2088,44 +2212,36 @@
+   lt_cv_deplibs_check_method=pass_all
    ;;
  
+-bsdi4*)
++bsdi[[45]]*)
+   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
  cygwin*)
 -  lt_cv_deplibs_check_method=pass_all
 +  # func_win32_libid is a shell function defined in ltmain.sh
@@ -344,12 +708,28 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
--freebsd*)
-+freebsd* | kfreebsd*-gnu)
+-freebsd* | kfreebsd*-gnu)
++freebsd* | kfreebsd*-gnu | dragonfly*)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-@@ -2158,42 +2185,21 @@
+       # Not sure whether the presence of OpenBSD here was a mistake.
+       # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+       lt_cv_file_magic_cmd=/usr/bin/file
+       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+       ;;
+@@ -2141,7 +2257,7 @@
+ 
+ hpux10.20* | hpux11*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+-  case "$host_cpu" in
++  case $host_cpu in
+   ia64*)
+     lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+@@ -2158,42 +2274,21 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
@@ -399,9 +779,21 @@
    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
-@@ -2222,9 +2228,6 @@
+@@ -2212,19 +2307,14 @@
    ;;
  
+ openbsd*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+   else
+-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   fi
+   ;;
+ 
  osf3* | osf4* | osf5*)
 -  # this will be overridden with pass_all, but let us keep it just in case
 -  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
@@ -409,7 +801,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -2234,7 +2237,6 @@
+@@ -2234,7 +2324,6 @@
  
  solaris*)
    lt_cv_deplibs_check_method=pass_all
@@ -417,7 +809,83 @@
    ;;
  
  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -2500,7 +2502,7 @@
+@@ -2342,13 +2431,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl convenience library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+-# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
+-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
+-# '${top_srcdir}/' (note the single quotes!).  If your package is not
+-# flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-convenience to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
++# (note the single quotes!).  If your package is not flat and you're not
++# using automake, define top_builddir and top_srcdir appropriately in
++# the Makefiles.
+ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+   case $enable_ltdl_convenience in
+@@ -2367,13 +2456,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl installable library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+-# DIRECTORY is not provided and an installed libltdl is not found, it is
+-# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
+-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+-# quotes!).  If your package is not flat and you're not using automake,
+-# define top_builddir and top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-install to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# and an installed libltdl is not found, it is assumed to be `libltdl'.
++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
++# '${top_srcdir}/' (note the single quotes!).  If your package is not
++# flat and you're not using automake, define top_builddir and top_srcdir
++# appropriately in the Makefiles.
+ # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+@@ -2411,10 +2500,21 @@
+ # ---------------
+ AC_DEFUN([_LT_AC_LANG_CXX],
+ [AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+ ])# _LT_AC_LANG_CXX
+ 
++# _LT_AC_PROG_CXXCPP
++# ---------------
++AC_DEFUN([_LT_AC_PROG_CXXCPP],
++[
++AC_REQUIRE([AC_PROG_CXX])
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++    (test "X$CXX" != "Xg++"))) ; then
++  AC_PROG_CXXCPP
++fi
++])# _LT_AC_PROG_CXXCPP
+ 
+ # AC_LIBTOOL_F77
+ # --------------
+@@ -2487,6 +2587,10 @@
+ 
+ _LT_AC_SYS_COMPILER
+ 
++# 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])
@@ -426,7 +894,16 @@
    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
-@@ -2550,7 +2552,7 @@
+@@ -2541,7 +2645,7 @@
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -2550,48 +2654,11 @@
    fi
    ;;
  
@@ -435,62 +912,87 @@
    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
      test "$enable_shared" = yes && enable_static=no
    fi
-@@ -2560,29 +2562,29 @@
-     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-     case "$host_os" in
-     rhapsody* | darwin1.[[012]])
+-  ;;
+-  darwin* | rhapsody*)
+-  if test "$GCC" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[[012]])
 -      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-       ;;
-     *) # Darwin 1.3 on
-       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--	allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-       else
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-      else
 -	case ${MACOSX_DEPLOYMENT_TARGET} in
 -	  10.[012])
--	    allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	    ;;
 -	  10.*)
--	    allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
 -	    ;;
 -	esac
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[[012]])
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-+            ;;
-+        esac
-       fi
-       ;;
-     esac
-     output_verbose_link_cmd='echo'
+-      fi
+-      ;;
+-    esac
+-    output_verbose_link_cmd='echo'
 -    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
 -    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $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 ld's
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
 -    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 -    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     _LT_AC_TAGVAR(hardcode_direct, $1)=no
-     _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -2590,8 +2592,8 @@
-     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-   else
-     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-  else
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
 -  fi  
 -    ;;  
-+  fi
 +    ;;
  esac
  AC_MSG_RESULT([$enable_shared])
  
-@@ -2699,8 +2701,8 @@
+@@ -2616,7 +2683,7 @@
+ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+ [AC_LANG_PUSH(C++)
+ AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+ 
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -2645,7 +2712,7 @@
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+ 
+ # Source file extension for C++ test sources.
+-ac_ext=cc
++ac_ext=cpp
+ 
+ # Object file extension for compiled C++ test sources.
+ objext=o
+@@ -2660,6 +2727,10 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+@@ -2681,7 +2752,7 @@
+ CC=${CXX-"c++"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+ 
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+@@ -2699,8 +2770,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
@@ -501,7 +1003,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 +2728,7 @@
+@@ -2726,7 +2797,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.
@@ -510,7 +1012,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -2756,8 +2758,22 @@
+@@ -2756,8 +2827,22 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -535,7 +1037,26 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -2803,15 +2819,16 @@
+@@ -2774,7 +2859,7 @@
+     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+     if test "$GXX" = yes; then
+-      case $host_os in aix4.[012]|aix4.[012].*)
++      case $host_os in aix4.[[012]]|aix4.[[012]].*)
+       # We only want to do this on AIX 4.2 and lower, the check
+       # below for broken collect2 doesn't work under 4.3+
+ 	collect2name=`${CC} -print-prog-name=collect2`
+@@ -2795,6 +2880,9 @@
+ 	fi
+       esac
+       shared_flag='-shared'
++      if test "$aix_use_runtimelinking" = yes; then
++	shared_flag="$shared_flag "'${wl}-G'
++      fi
+     else
+       # not using gcc
+       if test "$host_cpu" = ia64; then
+@@ -2803,15 +2891,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -556,7 +1077,7 @@
      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 +2837,12 @@
+@@ -2820,13 +2909,12 @@
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -572,16 +1093,23 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	_LT_AC_SYS_LIBPATH_AIX
-@@ -2841,7 +2857,7 @@
+@@ -2840,8 +2928,8 @@
+ 	# Exported symbols can be pulled into shared objects from archives
  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
  	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- 	# This is similar to how AIX traditionally builds it's shared libraries.
+-	# 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'
        fi
      fi
      ;;
-@@ -2858,12 +2874,12 @@
+@@ -2854,16 +2942,17 @@
+     esac
+     ;;
+ 
++
+   cygwin* | mingw* | pw32*)
      # _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'
@@ -596,7 +1124,7 @@
        # 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,7 +2888,7 @@
+@@ -2872,70 +2961,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -605,87 +1133,169 @@
      else
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
      fi
-@@ -2883,20 +2899,20 @@
-     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-     case "$host_os" in
-     rhapsody* | darwin1.[[012]])
+   ;;
++      darwin* | rhapsody*)
++        case $host_os in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++        esac
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-  darwin* | rhapsody*)
+-  if test "$GXX" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[[012]])
 -      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-       ;;
-     *) # Darwin 1.3 on
-       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--	allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
++    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
 -	case ${MACOSX_DEPLOYMENT_TARGET} in
 -	  10.[012])
--	    allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	    ;;
 -	  10.*)
--	    allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
 -	    ;;
 -	esac
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[[012]])
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined 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
-       ;;
-     esac
-@@ -2906,19 +2922,19 @@
-       lt_int_apple_cc_single_mod=yes
-     fi
-     if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      ;;
+-    esac
+-    lt_int_apple_cc_single_mod=no
+-    output_verbose_link_cmd='echo'
+-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-      lt_int_apple_cc_single_mod=yes
+-    fi
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+      _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
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-     fi
+-    fi
 -    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $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 ld's
-     if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _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
+-    else
 -      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     fi
+-    fi
 -    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    _LT_AC_TAGVAR(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(hardcode_direct, $1)=no
-     _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -2953,7 +2969,7 @@
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-  else
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-  fi
+-    ;;
++        ;;
+ 
+   dgux*)
+     case $cc_basename in
+-      ec++)
++      ec++*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      ghcx)
++      ghcx*)
+ 	# Green Hills C++ Compiler
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -2946,14 +3046,14 @@
+ 	;;
+     esac
+     ;;
+-  freebsd[12]*)
++  freebsd[[12]]*)
+     # C++ shared libraries reported to be fairly broken before switch to ELF
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
    freebsd-elf*)
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      ;;
--  freebsd*)
-+  freebsd* | kfreebsd*-gnu)
+-  freebsd* | kfreebsd*-gnu)
++  freebsd* | kfreebsd*-gnu | dragonfly*)
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -2975,7 +2991,7 @@
+@@ -2970,12 +3070,12 @@
+ 				# location of the library.
+ 
+     case $cc_basename in
+-    CC)
++    CC*)
+       # FIXME: insert proper C++ library support
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;
-     aCC)
+-    aCC)
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++    aCC*)
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -2984,11 +3000,11 @@
+@@ -2984,11 +3084,11 @@
        # explicitly linking system object files so we need to strip them
        # from the output so that they don't get included in the library
        # dependencies.
 -      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
        ;;
      *)
        if test "$GXX" = yes; then
@@ -694,7 +1304,38 @@
        else
          # FIXME: insert proper C++ library support
          _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3045,7 +3061,7 @@
+@@ -2998,7 +3098,7 @@
+     ;;
+   hpux10*|hpux11*)
+     if test $with_gnu_ld = no; then
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*)
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+@@ -3014,7 +3114,7 @@
+         ;;
+       esac
+     fi
+-    case "$host_cpu" in
++    case $host_cpu in
+     hppa*64*)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -3035,17 +3135,17 @@
+     esac
+ 
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      aCC)
+-	case "$host_cpu" in
++      aCC*)
++	case $host_cpu in
+ 	hppa*64*|ia64*)
  	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	  ;;
  	*)
@@ -703,7 +1344,13 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -3066,7 +3082,7 @@
+@@ -3061,12 +3161,12 @@
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test $with_gnu_ld = no; then
+-	    case "$host_cpu" in
++	    case $host_cpu in
+ 	    ia64*|hppa*64*)
  	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	      ;;
  	    *)
@@ -712,28 +1359,38 @@
  	      ;;
  	    esac
  	  fi
-@@ -3081,7 +3097,7 @@
+@@ -3079,9 +3179,9 @@
+     ;;
+   irix5* | irix6*)
      case $cc_basename in
-       CC)
+-      CC)
++      CC*)
  	# SGI C++
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -3092,9 +3108,9 @@
+@@ -3092,9 +3192,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
 -	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  	  else
 -	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
 +	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
  	  fi
  	fi
  	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -3111,8 +3127,8 @@
+@@ -3105,14 +3205,14 @@
+     ;;
+   linux*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -744,19 +1401,49 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -3134,16 +3150,16 @@
+@@ -3130,20 +3230,44 @@
+ 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 	;;
+-      icpc)
++      icpc*)
  	# Intel C++
  	with_gnu_ld=yes
++	# version 8.0 and above of icpc choke on multiply defined symbols
++	# if we add $predep_objects and $postdep_objects, however 7.1 and
++	# earlier do not add the objects themselves.
++	case `$CC -V 2>&1` in
++	*"Version 7."*)
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	*)  # Version 8.0 or newer
++	  tmp_idyn=
++	  case $host_cpu in
++	    ia64*) tmp_idyn=' -i_dynamic';;
++	  esac
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	esac
  	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
 -	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
  	;;
-       cxx)
+-      cxx)
++      pgCC*)
++        # Portland Group C++ compiler
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++        ;;
++      cxx*)
  	# Compaq C++
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
 -	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
@@ -765,8 +1452,17 @@
  
  	runpath_var=LD_RUN_PATH
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -3181,7 +3197,7 @@
+@@ -3171,7 +3295,7 @@
+     ;;
+   mvs*)
+     case $cc_basename in
+-      cxx)
++      cxx*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	;;
+@@ -3181,7 +3305,7 @@
+ 	;;
      esac
      ;;
 -  netbsd*)
@@ -774,7 +1470,32 @@
      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=
-@@ -3200,7 +3216,7 @@
+@@ -3192,15 +3316,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::"'
+     ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  openbsd*)
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    fi
++    output_verbose_link_cmd='echo'
++    ;;
+   osf3*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -783,25 +1504,41 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3217,7 +3233,7 @@
+@@ -3210,14 +3350,14 @@
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 
  	;;
-       cxx)
+-      RCC)
++      RCC*)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      cxx)
++      cxx*)
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3235,7 +3251,7 @@
+@@ -3235,7 +3375,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 -	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3260,7 +3276,7 @@
+@@ -3254,13 +3394,13 @@
+     ;;
+   osf4* | osf5*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -810,50 +1547,123 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3276,10 +3292,10 @@
+@@ -3269,17 +3409,17 @@
+ 	# the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
  	;;
-       cxx)
+-      RCC)
++      RCC*)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      cxx)
++      cxx*)
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
  	  echo "-hidden">> $lib.exp~
 -	  $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
-+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
  	  $rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -3298,7 +3314,7 @@
+@@ -3298,7 +3438,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 -	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3355,9 +3371,9 @@
-       CC)
+@@ -3322,7 +3462,7 @@
+   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 @@
+     ;;
+   sunos4*)
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# Sun C++ 4.x
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      lcc)
++      lcc*)
+ 	# Lucid
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -3352,36 +3492,33 @@
+     ;;
+   solaris*)
+     case $cc_basename in
+-      CC)
++      CC*)
  	# Sun C++ 4.2, 5.x and Centerline C++
++        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
  	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-+	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -3391,7 +3407,7 @@
+ 	case $host_os in
+-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
++	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ 	  *)
+ 	    # The C++ compiler is used as linker so we must use $wl
+ 	    # flag to pass the commands to the underlying system
+-	    # linker.
++	    # linker. We must also pass each convience library through
++	    # to the system linker between allextract/defaultextract.
++	    # The C++ compiler will combine linker options so we
++	    # cannot just pass the convience library names through
++	    # without $wl.
+ 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ 	    ;;
+ 	esac
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	output_verbose_link_cmd='echo'
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+@@ -3389,9 +3526,9 @@
+ 	# in the archive.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
  	;;
-       gcx)
+-      gcx)
++      gcx*)
  	# Green Hills C++ Compiler
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
  
  	# The C++ compiler must be used to create the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -3401,9 +3417,9 @@
+@@ -3401,9 +3538,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
@@ -865,7 +1675,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -3412,9 +3428,9 @@
+@@ -3412,9 +3549,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -877,7 +1687,25 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -3582,7 +3598,7 @@
+@@ -3432,7 +3569,7 @@
+     ;;
+   tandem*)
+     case $cc_basename in
+-      NCC)
++      NCC*)
+ 	# NonStop-UX NCC 3.20
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -3542,7 +3679,7 @@
+   # The `*' in the case matches for architectures that use `case' in
+   # $output_verbose_cmd can trigger glob expansion during the loop
+   # eval without this substitution.
+-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+ 
+   for p in `eval $output_verbose_link_cmd`; do
+     case $p in
+@@ -3582,7 +3719,7 @@
         fi
         ;;
  
@@ -886,16 +1714,115 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -3691,7 +3707,7 @@
+@@ -3618,6 +3755,21 @@
+ 
+ $rm -f confest.$objext
+ 
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++solaris*)
++  case $cc_basename in
++  CC*)
++    # Adding this requires a known-good setup of shared libraries for
++    # Sun compiler versions before 5.6, else PIC objects from an old
++    # archive will be linked into the output, leading to subtle bugs.
++    _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 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+ 
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+@@ -3683,7 +3839,7 @@
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -3691,8 +3847,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
 -aix4*)
+-  test "$enable_shared" = yes && enable_static=no
 +aix4* | aix5*)
-   test "$enable_shared" = yes && enable_static=no
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
    ;;
  esac
-@@ -3833,11 +3849,12 @@
+ AC_MSG_RESULT([$enable_shared])
+@@ -3743,20 +3901,27 @@
+ lt_simple_compile_test_code="class foo {}\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ 
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ 
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+@@ -3803,11 +3968,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ 
+ AC_LIBTOOL_CONFIG($1)
+@@ -3833,11 +4003,12 @@
    # without removal of \ escapes.
    if test -n "${ZSH_VERSION+set}" ; then
      setopt NO_GLOB_SUBST
@@ -910,7 +1837,7 @@
      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 +3904,7 @@
+@@ -3887,7 +4058,7 @@
      _LT_AC_TAGVAR(archive_cmds, $1) | \
      _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
      _LT_AC_TAGVAR(module_cmds, $1) | \
@@ -919,7 +1846,34 @@
      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
      _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
      extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -4018,7 +4035,7 @@
+@@ -3953,11 +4124,11 @@
+ SED=$lt_SED
+ 
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++Xsed="$SED -e 1s/^X//"
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+@@ -3988,6 +4159,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -4018,7 +4195,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -928,7 +1882,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -4049,7 +4066,7 @@
+@@ -4049,7 +4226,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -937,7 +1891,16 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -4293,7 +4310,10 @@
+@@ -4064,7 +4241,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+ 
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -4293,7 +4470,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.
@@ -949,7 +1912,31 @@
  fi
  ])# AC_LIBTOOL_CONFIG
  
-@@ -4366,7 +4386,7 @@
+@@ -4335,9 +4515,6 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+ 
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+ 
+@@ -4359,6 +4536,13 @@
+   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*)
++  if test "$host_cpu" = ia64; then
++    symcode='[[ABCDGIRSTW]]'
++    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  fi
++  ;;
+ irix* | nonstopux*)
+   symcode='[[BCDEGRST]]'
+   ;;
+@@ -4366,7 +4550,7 @@
    symcode='[[BCDEGQRST]]'
    ;;
  solaris* | sysv5*)
@@ -958,7 +1945,7 @@
    ;;
  sysv4)
    symcode='[[DFNSTU]]'
-@@ -4384,7 +4404,7 @@
+@@ -4384,14 +4568,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -967,26 +1954,133 @@
  esac
  
  # Try without a prefix undercore, then with it.
-@@ -4599,7 +4619,7 @@
+ for ac_symprfx in "" "_"; do
+ 
++  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++  symxfrm="\\1 $ac_symprfx\\2 \\2"
++
+   # Write the raw and C identifiers.
+-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ 
+   # Check to see that the pipe works correctly.
+   pipe_works=no
+@@ -4555,7 +4742,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	;;
+       *)
+@@ -4580,18 +4767,28 @@
+ 	;;
+       chorus*)
+ 	case $cc_basename in
+-	cxch68)
++	cxch68*)
+ 	  # Green Hills C++ Compiler
+ 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ 	  ;;
+ 	esac
+ 	;;
++       darwin*)
++         # PIC is the default on this platform
++         # Common symbols not allowed in MH_DYLIB files
++         case $cc_basename in
++           xlc*)
++           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++           ;;
++         esac
++       ;;
+       dgux*)
+ 	case $cc_basename in
+-	  ec++)
++	  ec++*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    ;;
+-	  ghcx)
++	  ghcx*)
+ 	    # Green Hills C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+@@ -4599,22 +4796,22 @@
+ 	    ;;
  	esac
  	;;
--      freebsd*)
-+      freebsd* | kfreebsd*-gnu)
+-      freebsd* | kfreebsd*-gnu)
++      freebsd* | kfreebsd*-gnu | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
-@@ -4650,7 +4670,7 @@
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ 	    if test "$host_cpu" != ia64; then
+ 	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ 	    fi
+ 	    ;;
+-	  aCC)
++	  aCC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+-	    case "$host_cpu" in
++	    case $host_cpu in
+ 	    hppa*64*|ia64*)
+ 	      # +Z the default
+ 	      ;;
+@@ -4629,7 +4826,7 @@
+ 	;;
+       irix5* | irix6* | nonstopux*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ 	    # CC pic flag -KPIC is the default.
+@@ -4640,18 +4837,24 @@
+ 	;;
+       linux*)
+ 	case $cc_basename in
+-	  KCC)
++	  KCC*)
+ 	    # KAI C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 	    ;;
+-	  icpc)
++	  icpc* | ecpc*)
+ 	    # Intel C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
 -	    ;; 
+-	  cxx)
 +	    ;;
- 	  cxx)
++	  pgCC*)
++	    # Portland Group C++ compiler.
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	  cxx*)
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -4675,7 +4695,7 @@
+ 	    # Linux and Compaq Tru64 Unix objects are PIC.
+@@ -4668,25 +4871,25 @@
+ 	;;
+       mvs*)
+ 	case $cc_basename in
+-	  cxx)
++	  cxx*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
  	    ;;
+ 	  *)
+ 	    ;;
  	esac
  	;;
 -      netbsd*)
@@ -994,17 +2088,175 @@
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
-@@ -4986,6 +5006,9 @@
+-	  KCC)
++	  KCC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ 	    ;;
+-	  RCC)
++	  RCC*)
+ 	    # Rational C++ 2.4.1
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+-	  cxx)
++	  cxx*)
+ 	    # Digital/Compaq C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+@@ -4702,7 +4905,7 @@
+ 	;;
+       sco*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 	    ;;
+ 	  *)
+@@ -4711,13 +4914,13 @@
+ 	;;
+       solaris*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    # Sun C++ 4.2, 5.x and Centerline C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ 	    ;;
+-	  gcx)
++	  gcx*)
+ 	    # Green Hills C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ 	    ;;
+@@ -4727,12 +4930,12 @@
+ 	;;
+       sunos4*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    # Sun C++ 4.x
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	    ;;
+-	  lcc)
++	  lcc*)
+ 	    # Lucid
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+@@ -4742,7 +4945,7 @@
+ 	;;
+       tandem*)
+ 	case $cc_basename in
+-	  NCC)
++	  NCC*)
+ 	    # NonStop-UX NCC 3.20
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    ;;
+@@ -4813,7 +5016,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -4839,6 +5042,16 @@
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++         ;;
++       esac
++       ;;
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+@@ -4850,7 +5063,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.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -4874,12 +5087,19 @@
+       ;;
+ 
+     linux*)
+-      case $CC in
++      case $cc_basename in
+       icc* | ecc*)
+ 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+         ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++        ;;
+       ccc*)
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         # All Alpha code is PIC.
+@@ -4900,9 +5120,14 @@
+       ;;
+ 
+     solaris*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++      esac
+       ;;
+ 
+     sunos4*)
+@@ -4924,6 +5149,11 @@
+       fi
+       ;;
+ 
++    unicos*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      ;;
++
+     uts4*)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -4951,7 +5181,7 @@
+     [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+ fi
+-case "$host_os" in
++case $host_os in
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+@@ -4984,7 +5214,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 '\''/^[[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*)
 +    _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 +5033,7 @@
+@@ -5010,7 +5243,7 @@
    _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
    _LT_AC_TAGVAR(hardcode_automatic, $1)=no
    _LT_AC_TAGVAR(module_cmds, $1)=
@@ -1013,7 +2265,45 @@
    _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*
-@@ -5084,7 +5107,7 @@
+@@ -5027,7 +5260,8 @@
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
+   extract_expsyms_cmds=
+-
++  # Just being paranoid about ensuring that cc_basename is set.
++  _LT_CC_BASENAME([$compiler])
+   case $host_os in
+   cygwin* | mingw* | pw32*)
+     # FIXME: the MSVC++ port hasn't been tested in a loooong time
+@@ -5047,6 +5281,27 @@
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     wlarc='${wl}'
+ 
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>/dev/null` in
++      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
++
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+     aix3* | aix4* | aix5*)
+@@ -5084,7 +5339,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
@@ -1022,7 +2312,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -5094,13 +5117,13 @@
+@@ -5094,13 +5349,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'
@@ -1030,7 +2320,8 @@
 +      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
        _LT_AC_TAGVAR(always_export_symbols, $1)=no
        _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-       _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[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/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
  
        if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 -        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -1038,14 +2329,47 @@
  	# 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 +5132,19 @@
+@@ -5109,19 +5364,51 @@
  	  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'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    linux*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	tmp_addflag=
++	case $cc_basename,$host_cpu in
++	pgcc*)				# Portland Group C compiler
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	esac
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
        else
- 	ld_shlibs=no
+-	ld_shlibs=no
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
        ;;
  
@@ -1062,7 +2386,7 @@
        fi
        ;;
  
-@@ -5139,8 +5162,8 @@
+@@ -5139,8 +5426,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1073,36 +2397,8 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -5153,10 +5176,36 @@
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       ;;
+@@ -5155,24 +5442,19 @@
  
-+  linux*)
-+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
-+      supports_anon_versioning=no
-+      case `$LD -v 2>/dev/null` in
-+        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-+        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+        *\ 2.11.*) ;; # other 2.11 versions
-+        *) supports_anon_versioning=yes ;;
-+      esac
-+      if test $supports_anon_versioning = yes; then
-+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+      else
-+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
-+      fi
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+    else
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    fi
-+    ;;
-+
      *)
        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'
@@ -1112,7 +2408,28 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -5206,9 +5255,20 @@
+       ;;
+     esac
+ 
+-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-      fi
++    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
++      runpath_var=
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+     fi
+   else
+     # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -5206,9 +5488,20 @@
  	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
@@ -1135,7 +2452,26 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -5254,29 +5314,29 @@
+@@ -5225,7 +5518,7 @@
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+       if test "$GCC" = yes; then
+-	case $host_os in aix4.[012]|aix4.[012].*)
++	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ 	# We only want to do this on AIX 4.2 and lower, the check
+ 	# below for broken collect2 doesn't work under 4.3+
+ 	  collect2name=`${CC} -print-prog-name=collect2`
+@@ -5246,6 +5539,9 @@
+ 	  fi
+ 	esac
+ 	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -5254,29 +5550,29 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -1174,16 +2510,27 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 _LT_AC_SYS_LIBPATH_AIX
-@@ -5291,7 +5351,7 @@
+@@ -5290,8 +5586,8 @@
+ 	  # Exported symbols can be pulled into shared objects from archives
  	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
  	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- 	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  # 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'
  	fi
        fi
        ;;
-@@ -5314,13 +5374,13 @@
+@@ -5304,7 +5600,7 @@
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[[45]]*)
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+       ;;
+ 
+@@ -5314,69 +5610,69 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1200,88 +2547,117 @@
        # The linker will automatically build a .lib file if we build a DLL.
        _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
        # FIXME: Should let the user specify the lib program.
-@@ -5334,21 +5394,21 @@
-       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-       case "$host_os" in
-       rhapsody* | darwin1.[[012]])
+       _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[[012]])
 -	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
- 	;;
-       *) # Darwin 1.3 on
+-	;;
+-      *) # Darwin 1.3 on
 -	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--	  allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	else
 -	  case ${MACOSX_DEPLOYMENT_TARGET} in
 -	    10.[012])
--	      allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	      ;;
 -	    10.*)
--	      allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
 -	      ;;
 -	  esac
 -	fi
-+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+      else
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[[012]])
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-+            ;;
-+        esac
-+      fi
- 	;;
+-	;;
++      case $host_os in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
        esac
-     	lt_int_apple_cc_single_mod=no
-@@ -5357,26 +5417,26 @@
-     	  lt_int_apple_cc_single_mod=yes
-     	fi
-     	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+    	  _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
 -        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       fi
+-      fi
 -      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $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 ld's
-         if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _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
+-        else
 -          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         fi
+-        fi
 -          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(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(archive_cmds_need_lc, $1)=no
        _LT_AC_TAGVAR(hardcode_direct, $1)=no
        _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 -    else  
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi  
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      _LT_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 -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +    else
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    fi  
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $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 $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*)
-@@ -5409,8 +5469,8 @@
+@@ -5409,8 +5705,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
+-    freebsd* | kfreebsd*-gnu)
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+    freebsd* | kfreebsd*-gnu)
++    freebsd* | kfreebsd*-gnu | 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 +5478,7 @@
+@@ -5418,7 +5714,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -1290,9 +2666,12 @@
        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
-@@ -5436,10 +5496,10 @@
+@@ -5434,16 +5730,16 @@
+ 
+     hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- 	case "$host_cpu" in
+-	case "$host_cpu" in
++	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 ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -1303,7 +2682,21 @@
  	  ;;
  	esac
        else
-@@ -5486,7 +5546,7 @@
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*|ia64*)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	  ;;
+@@ -5453,7 +5749,7 @@
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*)
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+@@ -5486,7 +5782,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -1312,7 +2705,7 @@
        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 +5556,7 @@
+@@ -5496,7 +5792,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -1321,16 +2714,17 @@
        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 +5579,7 @@
+@@ -5519,7 +5815,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
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        else
-@@ -5529,7 +5589,7 @@
+@@ -5529,7 +5826,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	   ;;
  	 *)
@@ -1339,7 +2733,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -5540,14 +5600,14 @@
+@@ -5540,14 +5837,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
@@ -1356,7 +2750,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,7 +5619,7 @@
+@@ -5559,13 +5856,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}\*'
@@ -1365,19 +2759,50 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
        else
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -5584,9 +5644,9 @@
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+ 
+ 	# Both c and cxx compiler support -rpath directly
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -5584,10 +5881,12 @@
      solaris*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
        if test "$GCC" = yes; then
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	wlarc='${wl}'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
 +	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
        else
++	wlarc=''
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -5606,7 +5666,7 @@
+   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -5596,8 +5895,18 @@
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       case $host_os in
+       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++      *)
++ 	# The compiler driver will combine linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
+       esac
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+@@ -5606,7 +5915,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.
@@ -1386,7 +2811,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -5666,9 +5726,9 @@
+@@ -5666,9 +5975,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -1398,7 +2823,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -5726,7 +5786,7 @@
+@@ -5726,7 +6035,7 @@
        AC_MSG_CHECKING([whether -lc should be explicitly linked in])
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1407,28 +2832,28 @@
        if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
          soname=conftest
          lib=conftest
-@@ -5885,7 +5945,7 @@
-     fi
-   done
- done
--])
- SED=$lt_cv_path_SED
-+])
- AC_MSG_RESULT([$SED])
- ])
+@@ -5860,7 +6169,7 @@
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+-  test ! -f $lt_ac_sed && break
++  test ! -f $lt_ac_sed && continue
+   cat /dev/null > conftest.in
+   lt_ac_count=0
+   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
 diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
---- a/admin/ltmain.sh	2004-12-12 14:19:26.000000000 -0500
-+++ b/admin/ltmain.sh	2005-05-19 13:26:30.000000000 -0400
+--- a/admin/ltmain.sh	2005-11-09 04:19:43.000000000 -0500
++++ b/admin/ltmain.sh	2005-11-10 12:07:37.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.
  #
 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
  # Free Software Foundation, Inc.
  # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
  #
-@@ -24,6 +24,29 @@
+@@ -24,6 +24,34 @@
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
@@ -1451,14 +2876,19 @@
 +
 +PROGRAM=ltmain.sh
 +PACKAGE=libtool
-+VERSION=1.5.6
-+TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 224 $"
++VERSION="1.5.20 Debian 1.5.20-2"
++TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)"
 +
++# See if we are running on zsh, and set the options which allow our
++# commands through without removal of \ escapes.
++if test -n "${ZSH_VERSION+set}" ; then
++  setopt NO_GLOB_SUBST
++fi
 +
  # Check that we have a working $echo.
  if test "X$1" = X--no-reexec; then
    # Discard the --no-reexec flag, and continue.
-@@ -36,7 +59,7 @@
+@@ -36,7 +64,7 @@
    :
  else
    # Restart under the correct shell, and then maybe $echo will work.
@@ -1467,7 +2897,7 @@
  fi
  
  if test "X$1" = X--fallback-echo; then
-@@ -45,19 +68,9 @@
+@@ -45,19 +73,9 @@
    cat <<EOF
  $*
  EOF
@@ -1488,13 +2918,37 @@
  default_mode=
  help="Try \`$progname --help' for more information."
  magic="%%%MAGIC variable%%%"
-@@ -94,12 +107,13 @@
+@@ -70,14 +88,15 @@
+ Xsed="${SED}"' -e 1s/^X//'
+ sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+ # test EBCDIC or ASCII
+-case `echo A|tr A '\301'` in
+- A) # EBCDIC based system
+-  SP2NL="tr '\100' '\n'"
+-  NL2SP="tr '\r\n' '\100\100'"
++case `echo X|tr X '\101'` in
++ A) # ASCII based system
++    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
++  SP2NL='tr \040 \012'
++  NL2SP='tr \015\012 \040\040'
+   ;;
+- *) # Assume ASCII based system
+-  SP2NL="tr '\040' '\012'"
+-  NL2SP="tr '\015\012' '\040\040'"
++ *) # EBCDIC based system
++  SP2NL='tr \100 \n'
++  NL2SP='tr \r\n \100\100'
+   ;;
+ esac
+ 
+@@ -94,12 +113,14 @@
  fi
  
  # Make sure IFS has a sensible default
 -: ${IFS=" 	"}
-+: ${IFS=" 	
-+"}
++lt_nl='
++'
++IFS=" 	$lt_nl"
  
  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
    $echo "$modename: not configured to build any kind of library" 1>&2
@@ -1504,7 +2958,7 @@
  fi
  
  # Global variables.
-@@ -118,10 +132,13 @@
+@@ -118,10 +139,14 @@
  # Shell function definitions:
  # This seems to be the best place for them
  
@@ -1515,11 +2969,12 @@
  # Has to be a shell function in order to 'eat' the argument
  # that is supplied when $file_magic_command is called.
 -win32_libid () {
-+func_win32_libid () {
++func_win32_libid ()
++{
    win32_libid_type="unknown"
    win32_fileres=`file -L $1 2>/dev/null`
    case $win32_fileres in
-@@ -130,7 +147,7 @@
+@@ -130,7 +155,7 @@
      ;;
    *ar\ archive*) # could be an import, or static
      if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
@@ -1528,7 +2983,7 @@
        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 +157,7 @@
+@@ -140,7 +165,7 @@
        fi
      fi
      ;;
@@ -1537,7 +2992,7 @@
      win32_libid_type="x86 DLL"
      ;;
    *executable*) # but shell scripts are "executable" too...
-@@ -154,9 +171,76 @@
+@@ -154,9 +179,179 @@
    $echo $win32_libid_type
  }
  
@@ -1548,7 +3003,8 @@
 +# Only attempt this if the compiler in the base compile
 +# command doesn't match the default compiler.
 +# arg is usually of the form 'gcc ...'
-+func_infer_tag () {
++func_infer_tag ()
++{
 +    if test -n "$available_tags" && test -z "$tagname"; then
 +      CC_quoted=
 +      for arg in $CC; do
@@ -1605,6 +3061,108 @@
 +      esac
 +    fi
 +}
++
++
++# func_extract_an_archive dir oldlib
++func_extract_an_archive ()
++{
++    f_ex_an_ar_dir="$1"; shift
++    f_ex_an_ar_oldlib="$1"
++
++    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
++    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
++    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
++     :
++    else
++      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
++      exit $EXIT_FAILURE
++    fi
++}
++
++# func_extract_archives gentop oldlib ...
++func_extract_archives ()
++{
++    my_gentop="$1"; shift
++    my_oldlibs=${1+"$@"}
++    my_oldobjs=""
++    my_xlib=""
++    my_xabs=""
++    my_xdir=""
++    my_status=""
++
++    $show "${rm}r $my_gentop"
++    $run ${rm}r "$my_gentop"
++    $show "$mkdir $my_gentop"
++    $run $mkdir "$my_gentop"
++    my_status=$?
++    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
++      exit $my_status
++    fi
++
++    for my_xlib in $my_oldlibs; do
++      # Extract the objects.
++      case $my_xlib in
++	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
++	*) my_xabs=`pwd`"/$my_xlib" ;;
++      esac
++      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
++      my_xdir="$my_gentop/$my_xlib"
++
++      $show "${rm}r $my_xdir"
++      $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
++      fi
++      case $host in
++      *-darwin*)
++	$show "Extracting $my_xabs"
++	# Do not bother doing anything if just a dry run
++	if test -z "$run"; then
++	  darwin_orig_dir=`pwd`
++	  cd $my_xdir || exit $?
++	  darwin_archive=$my_xabs
++	  darwin_curdir=`pwd`
++	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
++	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
++	  if test -n "$darwin_arches"; then 
++	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
++	    darwin_arch=
++	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
++	    for darwin_arch in  $darwin_arches ; do
++	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
++	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
++	      cd "$darwin_curdir"
++	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
++	    done # $darwin_arches
++      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
++	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
++	    darwin_file=
++	    darwin_files=
++	    for darwin_file in $darwin_filelist; do
++	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
++	      lipo -create -output "$darwin_file" $darwin_files
++	    done # $darwin_filelist
++	    ${rm}r unfat-$$
++	    cd "$darwin_orig_dir"
++	  else
++	    cd "$darwin_orig_dir"
++ 	    func_extract_an_archive "$my_xdir" "$my_xabs"
++	  fi # $darwin_arches
++	fi # $run
++	;;
++      *)
++        func_extract_an_archive "$my_xdir" "$my_xabs"
++        ;;
++      esac
++      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
++    done
++    func_extract_archives_result="$my_oldobjs"
++}
  # End of Shell function definitions
  #####################################
  
@@ -1614,7 +3172,7 @@
  # Parse our command line options once, thoroughly.
  while test "$#" -gt 0
  do
-@@ -176,12 +260,13 @@
+@@ -176,12 +371,13 @@
        ;;
      tag)
        tagname="$arg"
@@ -1629,7 +3187,7 @@
  	;;
        esac
  
-@@ -191,10 +276,10 @@
+@@ -191,10 +387,10 @@
  	# not specially marked.
  	;;
        *)
@@ -1642,12 +3200,16 @@
  	else
  	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
  	fi
-@@ -223,21 +308,22 @@
-     $echo "Copyright (C) 2003  Free Software Foundation, Inc."
+@@ -220,24 +416,25 @@
+   --version)
+     $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+     $echo
+-    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
++    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
      $echo "This is free software; see the source for copying conditions.  There is NO"
      $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 -    exit 0
-+    exit $EXIT_SUCCESS
++    exit $?
      ;;
  
    --config)
@@ -1659,7 +3221,7 @@
 +      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
      done
 -    exit 0
-+    exit $EXIT_SUCCESS
++    exit $?
      ;;
  
    --debug)
@@ -1669,16 +3231,16 @@
      ;;
  
    --dry-run | -n)
-@@ -256,7 +342,7 @@
+@@ -256,7 +453,7 @@
      else
        $echo "disable static libraries"
      fi
 -    exit 0
-+    exit $EXIT_SUCCESS
++    exit $?
      ;;
  
    --finish) mode="finish" ;;
-@@ -268,6 +354,7 @@
+@@ -268,6 +465,7 @@
  
    --quiet | --silent)
      show=:
@@ -1686,7 +3248,7 @@
      ;;
  
    --tag) prevopt="--tag" prev=tag ;;
-@@ -275,6 +362,7 @@
+@@ -275,6 +473,7 @@
      set tag "$optarg" ${1+"$@"}
      shift
      prev=tag
@@ -1694,7 +3256,7 @@
      ;;
  
    -dlopen)
-@@ -285,7 +373,7 @@
+@@ -285,7 +484,7 @@
    -*)
      $echo "$modename: unrecognized option \`$arg'" 1>&2
      $echo "$help" 1>&2
@@ -1703,7 +3265,7 @@
      ;;
  
    *)
-@@ -298,7 +386,7 @@
+@@ -298,7 +497,7 @@
  if test -n "$prevopt"; then
    $echo "$modename: option \`$prevopt' requires an argument" 1>&2
    $echo "$help" 1>&2
@@ -1712,7 +3274,16 @@
  fi
  
  # If this variable is set in any of the actions, the command in it
-@@ -354,7 +442,7 @@
+@@ -311,7 +510,7 @@
+   # Infer the operation mode.
+   if test -z "$mode"; then
+     $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+-    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
++    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
+     case $nonopt in
+     *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+       mode=link
+@@ -354,7 +553,7 @@
    if test -n "$execute_dlfiles" && test "$mode" != execute; then
      $echo "$modename: unrecognized option \`-dlopen'" 1>&2
      $echo "$help" 1>&2
@@ -1721,7 +3292,7 @@
    fi
  
    # Change the help message to a mode-specific one.
-@@ -369,9 +457,11 @@
+@@ -369,13 +568,15 @@
      # Get the compilation command and the source file.
      base_compile=
      srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
@@ -1733,7 +3304,12 @@
  
      for arg
      do
-@@ -394,24 +484,19 @@
+-      case "$arg_mode" in
++      case $arg_mode in
+       arg  )
+ 	# do not "continue".  Instead, add this to base_compile
+ 	lastarg="$arg"
+@@ -394,24 +595,19 @@
  	-o)
  	  if test -n "$libobj" ; then
  	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
@@ -1746,16 +3322,16 @@
  
 -	-static)
 -	  build_old_libs=yes
--	  continue
--	  ;;
--
--	-prefer-pic)
--	  pic_mode=yes
 +	-static | -prefer-pic | -prefer-non-pic)
 +	  later="$later $arg"
  	  continue
  	  ;;
  
+-	-prefer-pic)
+-	  pic_mode=yes
+-	  continue
+-	  ;;
+-
 -	-prefer-non-pic)
 -	  pic_mode=no
 +	-no-suppress)
@@ -1763,7 +3339,7 @@
  	  continue
  	  ;;
  
-@@ -424,7 +509,7 @@
+@@ -424,7 +620,7 @@
  	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
  	  lastarg=
  	  save_ifs="$IFS"; IFS=','
@@ -1772,7 +3348,19 @@
  	    IFS="$save_ifs"
  
  	    # Double-quote args containing other shell metacharacters.
-@@ -474,11 +559,11 @@
+@@ -462,7 +658,10 @@
+       case $lastarg in
+       # Double-quote args containing other shell metacharacters.
+       # Many Bourne shells cannot handle close brackets correctly
+-      # in scan sets, so we specify it separately.
++      # in scan sets, and some SunOS ksh mistreat backslash-escaping
++      # in scan sets (worked around with variable expansion),
++      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
++      # at all, so we specify them separately.
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	lastarg="\"$lastarg\""
+ 	;;
+@@ -474,11 +673,11 @@
      case $arg_mode in
      arg)
        $echo "$modename: you must specify an argument for -Xcompile"
@@ -1786,7 +3374,7 @@
        ;;
      *)
        # Get the name of the library object.
-@@ -511,50 +596,30 @@
+@@ -511,51 +710,39 @@
      *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
      *)
        $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
@@ -1854,9 +3442,18 @@
 -    fi
 +    done
  
++    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
++    case $qlibobj in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	qlibobj="\"$qlibobj\"" ;;
++    esac
++    test "X$libobj" != "X$qlibobj" \
++	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
++	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
      objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
      xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-@@ -568,7 +633,7 @@
+     if test "X$xdir" = "X$obj"; then
+@@ -568,7 +755,7 @@
      if test -z "$base_compile"; then
        $echo "$modename: you must specify a compilation command" 1>&2
        $echo "$help" 1>&2
@@ -1865,7 +3462,7 @@
      fi
  
      # Delete any leftover library objects.
-@@ -579,7 +644,7 @@
+@@ -579,7 +766,7 @@
      fi
  
      $run $rm $removelist
@@ -1874,7 +3471,7 @@
  
      # On Cygwin there's no "real" PIC flag so we must build both object types
      case $host_os in
-@@ -598,7 +663,7 @@
+@@ -598,7 +785,7 @@
        output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
        lockfile="$output_obj.lock"
        removelist="$removelist $output_obj $lockfile"
@@ -1883,7 +3480,7 @@
      else
        output_obj=
        need_locks=no
-@@ -608,7 +673,7 @@
+@@ -608,7 +795,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
@@ -1892,16 +3489,42 @@
  	$show "Waiting for $lockfile to be removed"
  	sleep 2
        done
-@@ -626,7 +691,7 @@
+@@ -626,14 +813,19 @@
  compiler."
  
  	$run $rm $removelist
 -	exit 1
 +	exit $EXIT_FAILURE
        fi
-       $echo $srcfile > "$lockfile"
+-      $echo $srcfile > "$lockfile"
++      $echo "$srcfile" > "$lockfile"
      fi
-@@ -681,7 +746,7 @@
+ 
+     if test -n "$fix_srcfile_path"; then
+       eval srcfile=\"$fix_srcfile_path\"
+     fi
++    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
++    case $qsrcfile in
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++      qsrcfile="\"$qsrcfile\"" ;;
++    esac
+ 
+     $run $rm "$libobj" "${libobj}T"
+ 
+@@ -655,10 +847,10 @@
+       fbsd_hideous_sh_bug=$base_compile
+ 
+       if test "$pic_mode" != no; then
+-	command="$base_compile $srcfile $pic_flag"
++	command="$base_compile $qsrcfile $pic_flag"
+       else
+ 	# Don't build PIC code
+-	command="$base_compile $srcfile"
++	command="$base_compile $qsrcfile"
+       fi
+ 
+       if test ! -d "${xdir}$objdir"; then
+@@ -681,7 +873,7 @@
        if $run eval "$command"; then :
        else
  	test -n "$output_obj" && $run $rm $removelist
@@ -1910,7 +3533,7 @@
        fi
  
        if test "$need_locks" = warn &&
-@@ -701,7 +766,7 @@
+@@ -701,7 +893,7 @@
  compiler."
  
  	$run $rm $removelist
@@ -1919,7 +3542,7 @@
        fi
  
        # Just move the object if needed, then go on to compile the next one
-@@ -722,7 +787,9 @@
+@@ -722,7 +914,9 @@
  EOF
  
        # Allow error messages only from the first compilation.
@@ -1930,7 +3553,19 @@
      else
        # No PIC object so indicate it doesn't exist in the libtool
        # object file.
-@@ -751,7 +818,7 @@
+@@ -736,9 +930,9 @@
+     if test "$build_old_libs" = yes; then
+       if test "$pic_mode" != yes; then
+ 	# Don't build PIC code
+-	command="$base_compile $srcfile"
++	command="$base_compile $qsrcfile"
+       else
+-	command="$base_compile $srcfile $pic_flag"
++	command="$base_compile $qsrcfile $pic_flag"
+       fi
+       if test "$compiler_c_o" = yes; then
+ 	command="$command -o $obj"
+@@ -751,7 +945,7 @@
        if $run eval "$command"; then :
        else
  	$run $rm $removelist
@@ -1939,7 +3574,7 @@
        fi
  
        if test "$need_locks" = warn &&
-@@ -771,7 +838,7 @@
+@@ -771,7 +965,7 @@
  compiler."
  
  	$run $rm $removelist
@@ -1948,7 +3583,7 @@
        fi
  
        # Just move the object if needed
-@@ -809,7 +876,7 @@
+@@ -809,7 +1003,7 @@
        $run $rm "$lockfile"
      fi
  
@@ -1957,7 +3592,7 @@
      ;;
  
    # libtool link mode
-@@ -835,7 +902,7 @@
+@@ -835,7 +1029,7 @@
        ;;
      esac
      libtool_args="$nonopt"
@@ -1966,7 +3601,7 @@
      compile_command="$nonopt"
      finalize_command="$nonopt"
  
-@@ -847,7 +914,6 @@
+@@ -847,7 +1041,6 @@
      old_convenience=
      deplibs=
      old_deplibs=
@@ -1974,7 +3609,7 @@
      compiler_flags=
      linker_flags=
      dllsearchpath=
-@@ -868,6 +934,7 @@
+@@ -868,6 +1061,7 @@
      no_install=no
      objs=
      non_pic_objects=
@@ -1982,7 +3617,7 @@
      prefer_static_libs=no
      preload=no
      prev=
-@@ -881,6 +948,8 @@
+@@ -881,6 +1075,8 @@
      vinfo=
      vinfo_number=no
  
@@ -1991,7 +3626,7 @@
      # We need to know -static, to get the right output filenames.
      for arg
      do
-@@ -912,7 +981,6 @@
+@@ -912,7 +1108,6 @@
      # Go through the arguments, transforming them on the way.
      while test "$#" -gt 0; do
        arg="$1"
@@ -1999,7 +3634,7 @@
        shift
        case $arg in
        *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-@@ -976,7 +1044,7 @@
+@@ -976,7 +1171,7 @@
  	  export_symbols="$arg"
  	  if test ! -f "$arg"; then
  	    $echo "$modename: symbol file \`$arg' does not exist"
@@ -2008,7 +3643,7 @@
  	  fi
  	  prev=
  	  continue
-@@ -991,6 +1059,11 @@
+@@ -991,6 +1186,11 @@
  	  prev=
  	  continue
  	  ;;
@@ -2020,7 +3655,7 @@
  	release)
  	  release="-$arg"
  	  prev=
-@@ -1023,7 +1096,7 @@
+@@ -1023,7 +1223,7 @@
  		   test "$pic_object" = none && \
  		   test "$non_pic_object" = none; then
  		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -2029,7 +3664,7 @@
  		fi
  
  		# Extract subdirectory from the argument.
-@@ -1076,7 +1149,7 @@
+@@ -1076,7 +1276,7 @@
  		# 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
@@ -2038,7 +3673,7 @@
  		else
  		  # Dry-run case.
  
-@@ -1097,7 +1170,7 @@
+@@ -1097,7 +1297,7 @@
  	    done
  	  else
  	    $echo "$modename: link input file \`$save_arg' does not exist"
@@ -2047,7 +3682,7 @@
  	  fi
  	  arg=$save_arg
  	  prev=
-@@ -1109,7 +1182,7 @@
+@@ -1109,7 +1309,7 @@
  	  [\\/]* | [A-Za-z]:[\\/]*) ;;
  	  *)
  	    $echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -2056,7 +3691,7 @@
  	    ;;
  	  esac
  	  if test "$prev" = rpath; then
-@@ -1149,16 +1222,8 @@
+@@ -1149,16 +1349,15 @@
  	  finalize_command="$finalize_command $qarg"
  	  continue
  	  ;;
@@ -2072,10 +3707,17 @@
 -   	  esac
 +	shrext)
 +  	  shrext_cmds="$arg"
++	  prev=
++	  continue
++	  ;;
++        darwin_framework)
++	  compiler_flags="$compiler_flags $arg"
++	  compile_command="$compile_command $arg"
++	  finalize_command="$finalize_command $arg"
  	  prev=
  	  continue
  	  ;;
-@@ -1210,7 +1275,7 @@
+@@ -1210,7 +1409,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"
@@ -2084,7 +3726,22 @@
  	fi
  	if test "X$arg" = "X-export-symbols"; then
  	  prev=expsyms
-@@ -1246,7 +1311,7 @@
+@@ -1220,6 +1419,14 @@
+ 	continue
+ 	;;
+ 
++      -framework|-arch)
++        prev=darwin_framework
++        compiler_flags="$compiler_flags $arg"
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
++        continue
++        ;;
++
+       -inst-prefix-dir)
+ 	prev=inst_prefix
+ 	continue
+@@ -1246,7 +1453,7 @@
  	  absdir=`cd "$dir" && pwd`
  	  if test -z "$absdir"; then
  	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
@@ -2093,18 +3750,15 @@
  	  fi
  	  dir="$absdir"
  	  ;;
-@@ -1276,9 +1341,6 @@
- 	    # These systems don't actually have a C or math library (as such)
- 	    continue
- 	    ;;
--	  *-*-freebsd*-gnu*)
--	    # prevent being parsed by the freebsd regexp below
--	    ;;
- 	  *-*-mingw* | *-*-os2*)
+@@ -1280,18 +1487,18 @@
  	    # These systems don't actually have a C library (as such)
  	    test "X$arg" = "X-lc" && continue
-@@ -1289,15 +1351,12 @@
  	    ;;
+-	  *-*-openbsd* | *-*-freebsd*)
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
  	  *-*-rhapsody* | *-*-darwin1.[012])
  	    # Rhapsody C and math libraries are in the System framework
 -	    deplibs="$deplibs System.ltframework"
@@ -2113,28 +3767,57 @@
  	  esac
  	elif test "X$arg" = "X-lc_r"; then
  	 case $host in
--	 *-*-freebsd*-gnu*)
--	   # prevent being parsed by the freebsd regexp below
--	   ;;
 -	 *-*-openbsd*)
-+	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
  	   # Do not include libc_r directly, use -pthread flag.
  	   continue
  	   ;;
-@@ -1307,6 +1366,11 @@
+@@ -1301,18 +1508,36 @@
  	continue
  	;;
  
++      # Tru64 UNIX uses -model [arg] to determine the layout of C++
++      # classes, name mangling, and exception handling.
++      -model)
++	compile_command="$compile_command $arg"
++	compiler_flags="$compiler_flags $arg"
++	finalize_command="$finalize_command $arg"
++	prev=xcompiler
++	continue
++	;;
++
 +     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-+	deplibs="$deplibs $arg"
++	compiler_flags="$compiler_flags $arg"
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
 +	continue
 +	;;
 +
        -module)
  	module=yes
  	continue
-@@ -1371,6 +1435,11 @@
+ 	;;
  
+-      # gcc -m* arguments should be passed to the linker via $compiler_flags
+-      # in order to pass architecture information to the linker
+-      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
+-      # but this is not reliable with gcc because gcc may use -mfoo to
+-      # select a different linker, different libraries, etc, while
+-      # -Wl,-mfoo simply passes -mfoo to the linker.
+-      -m*)
++      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
++      # -r[0-9][0-9]* specifies the processor on the SGI compiler
++      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
++      # +DA*, +DD* enable 64-bit mode on the HP compiler
++      # -q* pass through compiler args for the IBM compiler
++      # -m* pass through architecture-specific compiler args for GCC
++      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
++
+ 	# 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 @@
+ 
        -o) prev=output ;;
  
 +      -precious-files-regex)
@@ -2145,7 +3828,7 @@
        -release)
  	prev=release
  	continue
-@@ -1393,7 +1462,7 @@
+@@ -1387,7 +1617,7 @@
  	[\\/]* | [A-Za-z]:[\\/]*) ;;
  	*)
  	  $echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -2154,7 +3837,7 @@
  	  ;;
  	esac
  	case "$xrpath " in
-@@ -1479,11 +1548,6 @@
+@@ -1473,11 +1703,6 @@
  	continue
  	;;
  
@@ -2166,7 +3849,7 @@
        # Some other compiler flag.
        -* | +*)
  	# Unknown arguments in both finalize_command and compile_command need
-@@ -1494,7 +1558,6 @@
+@@ -1488,7 +1713,6 @@
  	  arg="\"$arg\""
  	  ;;
  	esac
@@ -2174,7 +3857,7 @@
  	;;
  
        *.$objext)
-@@ -1522,7 +1585,7 @@
+@@ -1516,7 +1740,7 @@
  	     test "$pic_object" = none && \
  	     test "$non_pic_object" = none; then
  	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -2183,7 +3866,7 @@
  	  fi
  
  	  # Extract subdirectory from the argument.
-@@ -1575,7 +1638,7 @@
+@@ -1569,7 +1793,7 @@
  	  # 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
@@ -2192,7 +3875,7 @@
  	  else
  	    # Dry-run case.
  
-@@ -1629,7 +1692,6 @@
+@@ -1623,7 +1847,6 @@
  	  arg="\"$arg\""
  	  ;;
  	esac
@@ -2200,7 +3883,7 @@
  	;;
        esac # arg
  
-@@ -1643,48 +1705,7 @@
+@@ -1637,48 +1860,7 @@
      if test -n "$prev"; then
        $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
        $echo "$help" 1>&2
@@ -2250,7 +3933,7 @@
      fi
  
      if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-@@ -1728,7 +1749,7 @@
+@@ -1722,7 +1904,7 @@
      "")
        $echo "$modename: you must specify an output file" 1>&2
        $echo "$help" 1>&2
@@ -2259,7 +3942,7 @@
        ;;
      *.$libext) linkmode=oldlib ;;
      *.lo | *.$objext) linkmode=obj ;;
-@@ -1738,7 +1759,7 @@
+@@ -1732,7 +1914,7 @@
  
      case $host in
      *cygwin* | *mingw* | *pw32*)
@@ -2268,7 +3951,7 @@
        duplicate_compiler_generated_deps=yes
        ;;
      *)
-@@ -1791,7 +1812,7 @@
+@@ -1785,7 +1967,7 @@
  	  *.la) ;;
  	  *)
  	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
@@ -2277,7 +3960,7 @@
  	    ;;
  	  esac
  	done
-@@ -1817,7 +1838,10 @@
+@@ -1811,7 +1993,10 @@
  	case $pass in
  	dlopen) libs="$dlfiles" ;;
  	dlpreopen) libs="$dlprefiles" ;;
@@ -2289,7 +3972,7 @@
  	esac
        fi
        if test "$pass" = dlopen; then
-@@ -1829,18 +1853,23 @@
+@@ -1823,18 +2008,23 @@
  	lib=
  	found=no
  	case $deplib in
@@ -2298,7 +3981,7 @@
 +	    compile_deplibs="$deplib $compile_deplibs"
 +	    finalize_deplibs="$deplib $finalize_deplibs"
 +	  else
-+	    deplibs="$deplib $deplibs"
++	    compiler_flags="$compiler_flags $deplib"
 +	  fi
 +	  continue
 +	  ;;
@@ -2318,7 +4001,7 @@
  	      # Search the libtool library
  	      lib="$searchdir/lib${name}${search_ext}"
  	      if test -f "$lib"; then
-@@ -1901,18 +1930,6 @@
+@@ -1895,18 +2085,6 @@
  	    fi
  	  fi
  	  ;; # -l
@@ -2337,7 +4020,7 @@
  	-L*)
  	  case $linkmode in
  	  lib)
-@@ -1928,11 +1945,11 @@
+@@ -1922,11 +2100,11 @@
  	    fi
  	    if test "$pass" = scan; then
  	      deplibs="$deplib $deplibs"
@@ -2350,7 +4033,31 @@
  	    ;;
  	  *)
  	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-@@ -2011,14 +2028,14 @@
+@@ -1954,7 +2132,22 @@
+ 	  fi
+ 	  case $linkmode in
+ 	  lib)
+-	    if test "$deplibs_check_method" != pass_all; then
++	    valid_a_lib=no
++	    case $deplibs_check_method in
++	      match_pattern*)
++		set dummy $deplibs_check_method
++	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++		if eval $echo \"$deplib\" 2>/dev/null \
++		    | $SED 10q \
++		    | $EGREP "$match_pattern_regex" > /dev/null; then
++		  valid_a_lib=yes
++		fi
++		;;
++	      pass_all)
++		valid_a_lib=yes
++		;;
++            esac
++	    if test "$valid_a_lib" != yes; then
+ 	      $echo
+ 	      $echo "*** Warning: Trying to link with static lib archive $deplib."
+ 	      $echo "*** I have the capability to make that library automatically link in when"
+@@ -2005,14 +2198,14 @@
  	if test "$found" = yes || test -f "$lib"; then :
  	else
  	  $echo "$modename: cannot find the library \`$lib'" 1>&2
@@ -2367,7 +4074,16 @@
  	fi
  
  	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-@@ -2041,13 +2058,6 @@
+@@ -2028,6 +2221,8 @@
+ 	# it will not redefine variables installed, or shouldnotlink
+ 	installed=yes
+ 	shouldnotlink=no
++	avoidtemprpath=
++
+ 
+ 	# Read the .la file
+ 	case $lib in
+@@ -2035,13 +2230,6 @@
  	*) . ./$lib ;;
  	esac
  
@@ -2381,7 +4097,7 @@
  	if test "$linkmode,$pass" = "lib,link" ||
  	   test "$linkmode,$pass" = "prog,scan" ||
  	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-@@ -2058,33 +2068,32 @@
+@@ -2052,33 +2240,32 @@
  	if test "$pass" = conv; then
  	  # Only check for convenience libraries
  	  deplibs="$lib $deplibs"
@@ -2428,7 +4144,7 @@
  	# Get the name of the library we link against.
  	linklib=
  	for l in $old_library $library_names; do
-@@ -2092,16 +2101,18 @@
+@@ -2086,16 +2273,18 @@
  	done
  	if test -z "$linklib"; then
  	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
@@ -2450,7 +4166,31 @@
  	    # 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
-@@ -2150,7 +2161,7 @@
+@@ -2132,11 +2321,19 @@
+ 	    dir="$libdir"
+ 	    absdir="$libdir"
+ 	  fi
++	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ 	else
+-	  dir="$ladir/$objdir"
+-	  absdir="$abs_ladir/$objdir"
+-	  # Remove this search path later
+-	  notinst_path="$notinst_path $abs_ladir"
++	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++	    dir="$ladir"
++	    absdir="$abs_ladir"
++	    # Remove this search path later
++	    notinst_path="$notinst_path $abs_ladir"
++	  else
++	    dir="$ladir/$objdir"
++	    absdir="$abs_ladir/$objdir"
++	    # Remove this search path later
++	    notinst_path="$notinst_path $abs_ladir"
++	  fi
+ 	fi # $installed = yes
+ 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+ 
+@@ -2144,7 +2341,7 @@
  	if test "$pass" = dlpreopen; then
  	  if test -z "$libdir"; then
  	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
@@ -2459,7 +4199,7 @@
  	  fi
  	  # Prefer using a static library (so that no silly _DYNAMIC symbols
  	  # are required to link).
-@@ -2177,7 +2188,7 @@
+@@ -2171,7 +2368,7 @@
  	  continue
  	fi
  
@@ -2468,7 +4208,22 @@
  	if test "$linkmode" = prog && test "$pass" != link; then
  	  newlib_search_path="$newlib_search_path $ladir"
  	  deplibs="$lib $deplibs"
-@@ -2264,17 +2275,18 @@
+@@ -2209,12 +2406,12 @@
+ 	  if test -n "$library_names" &&
+ 	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ 	    # We need to hardcode the library path
+-	    if test -n "$shlibpath_var"; then
++	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ 	      # Make sure the rpath contains only unique directories.
+ 	      case "$temp_rpath " in
+ 	      *" $dir "*) ;;
+ 	      *" $absdir "*) ;;
+-	      *) temp_rpath="$temp_rpath $dir" ;;
++	      *) temp_rpath="$temp_rpath $absdir" ;;
+ 	      esac
+ 	    fi
+ 
+@@ -2258,17 +2455,18 @@
  	    need_relink=yes
  	  fi
  	  # This is a shared library
@@ -2492,7 +4247,7 @@
  	  if test "$linkmode" = lib &&
  	     test "$hardcode_into_libs" = yes; then
  	    # Hardcode the library path.
-@@ -2332,9 +2344,10 @@
+@@ -2326,9 +2524,10 @@
  	    else
  	      $show "extracting exported symbol list from \`$soname'"
  	      save_ifs="$IFS"; IFS='~'
@@ -2504,7 +4259,7 @@
  		$show "$cmd"
  		$run eval "$cmd" || exit $?
  	      done
-@@ -2345,9 +2358,10 @@
+@@ -2339,9 +2538,10 @@
  	    if test -f "$output_objdir/$newlib"; then :; else
  	      $show "generating import library for \`$soname'"
  	      save_ifs="$IFS"; IFS='~'
@@ -2516,7 +4271,7 @@
  		$show "$cmd"
  		$run eval "$cmd" || exit $?
  	      done
-@@ -2370,9 +2384,9 @@
+@@ -2364,9 +2564,9 @@
  		case $host in
  		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
  		  *-*-darwin* )
@@ -2529,7 +4284,7 @@
  		      $echo "** Warning, lib $linklib is a module, not a shared library"
  		      if test -z "$old_library" ; then
  		        $echo
-@@ -2380,7 +2394,7 @@
+@@ -2374,7 +2574,7 @@
  		        $echo "** The link will probably fail, sorry"
  		      else
  		        add="$dir/$old_library"
@@ -2538,16 +4293,19 @@
  		    fi
  		esac
  	      elif test "$hardcode_minus_L" = no; then
-@@ -2405,7 +2419,7 @@
+@@ -2397,9 +2597,9 @@
+ 		add_dir="-L$dir"
+ 		# Try looking first in the location we're being installed to.
  		if test -n "$inst_prefix_dir"; then
- 		  case "$libdir" in
+-		  case "$libdir" in
++		  case $libdir in
  		    [\\/]*)
 -		      add_dir="-L$inst_prefix_dir$libdir $add_dir"
 +		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
  		      ;;
  		  esac
  		fi
-@@ -2422,7 +2436,7 @@
+@@ -2416,7 +2616,7 @@
  
  	    if test "$lib_linked" != yes; then
  	      $echo "$modename: configuration error: unsupported hardcode properties"
@@ -2556,7 +4314,7 @@
  	    fi
  
  	    if test -n "$add_shlibpath"; then
-@@ -2465,7 +2479,8 @@
+@@ -2459,7 +2659,8 @@
  	      esac
  	      add="-l$name"
  	    elif test "$hardcode_automatic" = yes; then
@@ -2566,16 +4324,27 @@
  	        add="$inst_prefix_dir$libdir/$linklib"
  	      else
  	        add="$libdir/$linklib"
-@@ -2477,7 +2492,7 @@
+@@ -2469,9 +2670,9 @@
+ 	      add_dir="-L$libdir"
+ 	      # Try looking first in the location we're being installed to.
  	      if test -n "$inst_prefix_dir"; then
- 		case "$libdir" in
+-		case "$libdir" in
++		case $libdir in
  		  [\\/]*)
 -		    add_dir="-L$inst_prefix_dir$libdir $add_dir"
 +		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
  		    ;;
  		esac
  	      fi
-@@ -2544,9 +2559,10 @@
+@@ -2530,17 +2731,16 @@
+ 	      fi
+ 	    fi
+ 	  else
+-	    convenience="$convenience $dir/$old_library"
+-	    old_convenience="$old_convenience $dir/$old_library"
+ 	    deplibs="$dir/$old_library $deplibs"
+ 	    link_static=yes
+ 	  fi
  	fi # link shared/static library?
  
  	if test "$linkmode" = lib; then
@@ -2589,7 +4358,7 @@
  	    # Extract -R from dependency_libs
  	    temp_deplibs=
  	    for libdir in $dependency_libs; do
-@@ -2560,7 +2576,7 @@
+@@ -2554,7 +2754,7 @@
  	      esac
  	    done
  	    dependency_libs="$temp_deplibs"
@@ -2598,7 +4367,7 @@
  
  	  newlib_search_path="$newlib_search_path $absdir"
  	  # Link against this library
-@@ -2602,20 +2618,18 @@
+@@ -2596,20 +2796,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
@@ -2623,7 +4392,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
-@@ -2623,52 +2637,42 @@
+@@ -2617,55 +2815,45 @@
  		    done
  		    if test -f "$path/$depdepl" ; then
  		      depdepl="$path/$depdepl"
@@ -2685,15 +4454,21 @@
  	      *) continue ;;
  	      esac
  	      case " $deplibs " in
- 	      *" $depdepl "*) ;;
+-	      *" $depdepl "*) ;;
 -	      *) deplibs="$deplibs $depdepl" ;;
 -	      esac	      
+-	      case " $deplibs " in
+ 	      *" $path "*) ;;
+-	      *) deplibs="$deplibs $path" ;;
++	      *) deplibs="$path $deplibs" ;;
++	      esac
++	      case " $deplibs " in
++	      *" $depdepl "*) ;;
 +	      *) deplibs="$depdepl $deplibs" ;;
-+	      esac
- 	      case " $deplibs " in
- 	      *" $path "*) ;;
- 	      *) deplibs="$deplibs $path" ;;
-@@ -2758,7 +2762,8 @@
+ 	      esac
+ 	    done
+ 	  fi # link_all_deplibs != no
+@@ -2752,7 +2940,8 @@
  	  eval $var=\"$tmp_libs\"
  	done # for var
        fi
@@ -2703,7 +4478,7 @@
        tmp_libs=
        for i in $dependency_libs ; do
  	case " $predeps $postdeps $compiler_lib_search_path " in
-@@ -2818,19 +2823,19 @@
+@@ -2812,19 +3001,19 @@
        case $outputname in
        lib*)
  	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
@@ -2726,7 +4501,7 @@
  	  eval libname=\"$libname_spec\"
  	else
  	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-@@ -2841,7 +2846,7 @@
+@@ -2835,7 +3024,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
@@ -2735,7 +4510,7 @@
  	else
  	  $echo
  	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-@@ -2889,13 +2894,13 @@
+@@ -2883,13 +3072,13 @@
  	if test -n "$8"; then
  	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
  	  $echo "$help" 1>&2
@@ -2751,7 +4526,7 @@
  	case $vinfo_number in
  	yes)
  	  number_major="$2"
-@@ -2924,6 +2929,11 @@
+@@ -2918,6 +3107,11 @@
  	    age="$number_minor"
  	    revision="$number_minor"
  	    ;;
@@ -2763,14 +4538,15 @@
  	  esac
  	  ;;
  	no)
-@@ -2935,36 +2945,36 @@
+@@ -2929,36 +3123,36 @@
  
  	# Check that each of the things are valid numbers.
  	case $current in
 -	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
 +	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
  	*)
- 	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+-	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
++	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
  	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
 -	  exit 1
 +	  exit $EXIT_FAILURE
@@ -2781,7 +4557,8 @@
 -	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
 +	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
  	*)
- 	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+-	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
++	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
  	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
 -	  exit 1
 +	  exit $EXIT_FAILURE
@@ -2792,7 +4569,8 @@
 -	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
 +	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
  	*)
- 	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+-	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
++	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
  	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
 -	  exit 1
 +	  exit $EXIT_FAILURE
@@ -2807,7 +4585,16 @@
  	fi
  
  	# Calculate the version variables.
-@@ -3053,7 +3063,7 @@
+@@ -2975,7 +3169,7 @@
+ 	  versuffix="$major.$age.$revision"
+ 	  # Darwin ld doesn't like 0 for these options...
+ 	  minor_current=`expr $current + 1`
+-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
++	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ 	  ;;
+ 
+ 	freebsd-aout)
+@@ -3047,7 +3241,7 @@
  	*)
  	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
  	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
@@ -2816,8 +4603,12 @@
  	  ;;
  	esac
  
-@@ -3107,6 +3117,12 @@
- 	    *.$objext)
+@@ -3098,9 +3292,15 @@
+ 	tempremovelist=`$echo "$output_objdir/*"`
+ 	for p in $tempremovelist; do
+ 	  case $p in
+-	    *.$objext | *$exeext)
++	    *.$objext)
  	       ;;
  	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
 +	       if test "X$precious_files_regex" != "X"; then
@@ -2829,7 +4620,7 @@
  	       removelist="$removelist $p"
  	       ;;
  	    *) ;;
-@@ -3143,7 +3159,7 @@
+@@ -3137,7 +3337,7 @@
  	  *) finalize_rpath="$finalize_rpath $libdir" ;;
  	  esac
  	done
@@ -2838,7 +4629,7 @@
  	  dependency_libs="$temp_xrpath $dependency_libs"
  	fi
        fi
-@@ -3176,17 +3192,11 @@
+@@ -3170,12 +3370,12 @@
  	    ;;
  	  *-*-rhapsody* | *-*-darwin1.[012])
  	    # Rhapsody C library is in the System framework
@@ -2848,16 +4639,48 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
--	  *-*-freebsd*-gnu*)
--	    # Prevent $arg from being parsed by the freebsd regexp below.
--	    if test "$build_libtool_need_lc" = "yes"; then
--	      deplibs="$deplibs -lc"
--	    fi
--	    ;;
- 	  *-*-openbsd* | *-*-freebsd*)
+-	  *-*-openbsd* | *-*-freebsd*)
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
  	    # Do not include libc due to us having libc/libc_r.
  	    test "X$arg" = "X-lc" && continue
-@@ -3475,7 +3485,7 @@
+ 	    ;;
+@@ -3225,7 +3425,7 @@
+ 	  if test "$?" -eq 0 ; then
+ 	    ldd_output=`ldd conftest`
+ 	    for i in $deplibs; do
+-	      name="`expr $i : '-l\(.*\)'`"
++	      name=`expr $i : '-l\(.*\)'`
+ 	      # If $name is empty we are operating on a -L argument.
+               if test "$name" != "" && test "$name" -ne "0"; then
+ 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3262,7 +3462,7 @@
+ 	    # Error occurred in the first compile.  Let's try to salvage
+ 	    # the situation: Compile a separate program for each library.
+ 	    for i in $deplibs; do
+-	      name="`expr $i : '-l\(.*\)'`"
++	      name=`expr $i : '-l\(.*\)'`
+ 	      # If $name is empty we are operating on a -L argument.
+               if test "$name" != "" && test "$name" != "0"; then
+ 		$rm conftest
+@@ -3314,7 +3514,7 @@
+ 	  set dummy $deplibs_check_method
+ 	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ 	  for a_deplib in $deplibs; do
+-	    name="`expr $a_deplib : '-l\(.*\)'`"
++	    name=`expr $a_deplib : '-l\(.*\)'`
+ 	    # If $name is empty we are operating on a -L argument.
+             if test "$name" != "" && test  "$name" != "0"; then
+ 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3383,7 +3583,7 @@
+ 	  set dummy $deplibs_check_method
+ 	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ 	  for a_deplib in $deplibs; do
+-	    name="`expr $a_deplib : '-l\(.*\)'`"
++	    name=`expr $a_deplib : '-l\(.*\)'`
+ 	    # If $name is empty we are operating on a -L argument.
+ 	    if test -n "$name" && test "$name" != "0"; then
+ 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3463,7 +3663,7 @@
  	case $host in
  	*-*-rhapsody* | *-*-darwin1.[012])
  	  # On Rhapsody replace the C library is the System framework
@@ -2866,7 +4689,7 @@
  	  ;;
  	esac
  
-@@ -3521,13 +3531,6 @@
+@@ -3509,13 +3709,6 @@
  	    fi
  	  fi
  	fi
@@ -2880,7 +4703,7 @@
  	# Done checking deplibs!
  	deplibs=$newdeplibs
        fi
-@@ -3544,7 +3547,7 @@
+@@ -3532,7 +3725,7 @@
  	  hardcode_libdirs=
  	  dep_rpath=
  	  rpath="$finalize_rpath"
@@ -2889,7 +4712,7 @@
  	  for libdir in $rpath; do
  	    if test -n "$hardcode_libdir_flag_spec"; then
  	      if test -n "$hardcode_libdir_separator"; then
-@@ -3599,7 +3602,7 @@
+@@ -3587,7 +3780,7 @@
  	fi
  
  	# Get the real and link names of the library.
@@ -2898,7 +4721,7 @@
  	eval library_names=\"$library_names_spec\"
  	set dummy $library_names
  	realname="$2"
-@@ -3629,10 +3632,11 @@
+@@ -3617,10 +3810,11 @@
  	    $show "generating symbol list for \`$libname.la'"
  	    export_symbols="$output_objdir/$libname.exp"
  	    $run $rm $export_symbols
@@ -2911,7 +4734,17 @@
  	      if len=`expr "X$cmd" : ".*"` &&
  	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
  	        $show "$cmd"
-@@ -3662,12 +3666,12 @@
+@@ -3630,6 +3824,9 @@
+ 	        # The command line is too long to execute in one step.
+ 	        $show "using reloadable object file for export list..."
+ 	        skipped_export=:
++		# Break out early, otherwise skipped_export may be
++		# set to false by a later but shorter cmd.
++		break
+ 	      fi
+ 	    done
+ 	    IFS="$save_ifs"
+@@ -3650,12 +3847,12 @@
  	for test_deplib in $deplibs; do
  		case " $convenience " in
  		*" $test_deplib "*) ;;
@@ -2926,7 +4759,78 @@
  
  	if test -n "$convenience"; then
  	  if test -n "$whole_archive_flag_spec"; then
-@@ -3746,31 +3750,26 @@
+@@ -3663,67 +3860,13 @@
+ 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ 	  else
+ 	    gentop="$output_objdir/${outputname}x"
+-	    $show "${rm}r $gentop"
+-	    $run ${rm}r "$gentop"
+-	    $show "$mkdir $gentop"
+-	    $run $mkdir "$gentop"
+-	    status=$?
+-	    if test "$status" -ne 0 && test ! -d "$gentop"; then
+-	      exit $status
+-	    fi
+ 	    generated="$generated $gentop"
+ 
+-	    for xlib in $convenience; do
+-	      # Extract the objects.
+-	      case $xlib in
+-	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+-	      *) xabs=`pwd`"/$xlib" ;;
+-	      esac
+-	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+-	      xdir="$gentop/$xlib"
+-
+-	      $show "${rm}r $xdir"
+-	      $run ${rm}r "$xdir"
+-	      $show "$mkdir $xdir"
+-	      $run $mkdir "$xdir"
+-	      status=$?
+-	      if test "$status" -ne 0 && test ! -d "$xdir"; then
+-		exit $status
+-	      fi
+-	      # We will extract separately just the conflicting names and we will no
+-	      # longer touch any unique names. It is faster to leave these extract
+-	      # automatically by $AR in one run.
+-	      $show "(cd $xdir && $AR x $xabs)"
+-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+-		:
+-	      else
+-		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+-		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+-		$AR t "$xabs" | sort | uniq -cd | while read -r count name
+-		do
+-		  i=1
+-		  while test "$i" -le "$count"
+-		  do
+-		   # Put our $i before any first dot (extension)
+-		   # Never overwrite any file
+-		   name_to="$name"
+-		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+-		   do
+-		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+-		   done
+-		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+-		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+-		   i=`expr $i + 1`
+-		  done
+-		done
+-	      fi
+-
+-	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+-	    done
++	    func_extract_archives $gentop $convenience
++	    libobjs="$libobjs $func_extract_archives_result"
+ 	  fi
+ 	fi
+-
++	
+ 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ 	  eval flag=\"$thread_safe_flag_spec\"
+ 	  linker_flags="$linker_flags $flag"
+@@ -3734,31 +3877,27 @@
  	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
  	fi
  
@@ -2963,11 +4867,64 @@
  	fi
  
 -	if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
-+	if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
++	if test "X$skipped_export" != "X:" &&
++	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
  	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
  	  :
  	else
-@@ -3871,19 +3870,28 @@
+@@ -3777,6 +3916,7 @@
+ 	    save_libobjs=$libobjs
+ 	  fi
+ 	  save_output=$output
++	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
+ 
+ 	  # Clear the reloadable object creation command queue and
+ 	  # initialize k to one.
+@@ -3786,13 +3926,13 @@
+ 	  delfiles=
+ 	  last_robj=
+ 	  k=1
+-	  output=$output_objdir/$save_output-${k}.$objext
++	  output=$output_objdir/$output_la-${k}.$objext
+ 	  # Loop over the list of objects to be linked.
+ 	  for obj in $save_libobjs
+ 	  do
+ 	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+ 	    if test "X$objlist" = X ||
+-	       { len=`expr "X$test_cmds" : ".*"` &&
++	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ 		 test "$len" -le "$max_cmd_len"; }; then
+ 	      objlist="$objlist $obj"
+ 	    else
+@@ -3806,9 +3946,9 @@
+ 		# the last one created.
+ 		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+ 	      fi
+-	      last_robj=$output_objdir/$save_output-${k}.$objext
++	      last_robj=$output_objdir/$output_la-${k}.$objext
+ 	      k=`expr $k + 1`
+-	      output=$output_objdir/$save_output-${k}.$objext
++	      output=$output_objdir/$output_la-${k}.$objext
+ 	      objlist=$obj
+ 	      len=1
+ 	    fi
+@@ -3828,13 +3968,13 @@
+ 	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+           fi
+ 
+-	  # Set up a command to remove the reloadale object files
++	  # Set up a command to remove the reloadable object files
+ 	  # after they are used.
+ 	  i=0
+ 	  while test "$i" -lt "$k"
+ 	  do
+ 	    i=`expr $i + 1`
+-	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
++	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
+ 	  done
+ 
+ 	  $echo "creating a temporary reloadable object file: $output"
+@@ -3859,28 +3999,54 @@
  	  # value of $libobjs for piecewise linking.
  
  	  # Do each of the archive commands.
@@ -2997,18 +4954,37 @@
  	  IFS="$save_ifs"
 +	  eval cmd=\"$cmd\"
  	  $show "$cmd"
- 	  $run eval "$cmd" || exit $?
+-	  $run eval "$cmd" || exit $?
++	  $run eval "$cmd" || {
++	    lt_exit=$?
++
++	    # Restore the uninstalled library and exit
++	    if test "$mode" = relink; then
++	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++	    fi
++
++	    exit $lt_exit
++	  }
  	done
-@@ -3892,7 +3900,7 @@
+ 	IFS="$save_ifs"
+ 
  	# Restore the uninstalled library and exit
  	if test "$mode" = relink; then
  	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
 -	  exit 0
++
++	  if test -n "$convenience"; then
++	    if test -z "$whole_archive_flag_spec"; then
++	      $show "${rm}r $gentop"
++	      $run ${rm}r "$gentop"
++	    fi
++	  fi
++
 +	  exit $EXIT_SUCCESS
  	fi
  
  	# Create links to the real library.
-@@ -3940,7 +3948,7 @@
+@@ -3928,7 +4094,7 @@
        *.lo)
  	if test -n "$objs$old_deplibs"; then
  	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
@@ -3017,7 +4993,74 @@
  	fi
  	libobj="$output"
  	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-@@ -4034,10 +4042,11 @@
+@@ -3957,64 +4123,10 @@
+ 	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ 	else
+ 	  gentop="$output_objdir/${obj}x"
+-	  $show "${rm}r $gentop"
+-	  $run ${rm}r "$gentop"
+-	  $show "$mkdir $gentop"
+-	  $run $mkdir "$gentop"
+-	  status=$?
+-	  if test "$status" -ne 0 && test ! -d "$gentop"; then
+-	    exit $status
+-	  fi
+ 	  generated="$generated $gentop"
+ 
+-	  for xlib in $convenience; do
+-	    # Extract the objects.
+-	    case $xlib in
+-	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+-	    *) xabs=`pwd`"/$xlib" ;;
+-	    esac
+-	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+-	    xdir="$gentop/$xlib"
+-
+-	    $show "${rm}r $xdir"
+-	    $run ${rm}r "$xdir"
+-	    $show "$mkdir $xdir"
+-	    $run $mkdir "$xdir"
+-	    status=$?
+-	    if test "$status" -ne 0 && test ! -d "$xdir"; then
+-	      exit $status
+-	    fi
+-	    # We will extract separately just the conflicting names and we will no
+-	    # longer touch any unique names. It is faster to leave these extract
+-	    # automatically by $AR in one run.
+-	    $show "(cd $xdir && $AR x $xabs)"
+-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+-	      :
+-	    else
+-	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+-	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+-	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
+-	      do
+-		i=1
+-		while test "$i" -le "$count"
+-		do
+-		 # Put our $i before any first dot (extension)
+-		 # Never overwrite any file
+-		 name_to="$name"
+-		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+-		 do
+-		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+-		 done
+-		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+-		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+-		 i=`expr $i + 1`
+-		done
+-	      done
+-	    fi
+-
+-	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+-	  done
++	  func_extract_archives $gentop $convenience
++	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+ 	fi
+       fi
+ 
+@@ -4022,10 +4134,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"
@@ -3030,7 +5073,7 @@
  	$show "$cmd"
  	$run eval "$cmd" || exit $?
        done
-@@ -4050,7 +4059,7 @@
+@@ -4038,7 +4151,7 @@
  	  $run ${rm}r $gentop
  	fi
  
@@ -3039,7 +5082,7 @@
        fi
  
        if test "$build_libtool_libs" != yes; then
-@@ -4063,17 +4072,18 @@
+@@ -4051,17 +4164,18 @@
  	# accidentally link it into a program.
  	# $show "echo timestamp > $libobj"
  	# $run eval "echo timestamp > $libobj" || exit $?
@@ -3060,7 +5103,7 @@
  	  $show "$cmd"
  	  $run eval "$cmd" || exit $?
  	done
-@@ -4085,7 +4095,7 @@
+@@ -4073,7 +4187,7 @@
  	$run ${rm}r $gentop
        fi
  
@@ -3069,7 +5112,7 @@
        ;;
  
      prog)
-@@ -4110,21 +4120,18 @@
+@@ -4098,21 +4212,18 @@
        case $host in
        *-*-rhapsody* | *-*-darwin1.[012])
  	# On Rhapsody replace the C library is the System framework
@@ -3094,7 +5137,51 @@
          ;;
        esac
  
-@@ -4406,7 +4413,7 @@
+@@ -4277,12 +4388,12 @@
+ 
+ 	    # Prepare the list of exported symbols
+ 	    if test -z "$export_symbols"; then
+-	      export_symbols="$output_objdir/$output.exp"
++	      export_symbols="$output_objdir/$outputname.exp"
+ 	      $run $rm $export_symbols
+-	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ 	    else
+-	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+-	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
++	      $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
++	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+ 	      $run eval 'mv "$nlist"T "$nlist"'
+ 	    fi
+ 	  fi
+@@ -4334,7 +4445,26 @@
+ #endif
+ 
+ /* The mapping between symbol names and symbols. */
++"
++
++	    case $host in
++	    *cygwin* | *mingw* )
++	  $echo >> "$output_objdir/$dlsyms" "\
++/* DATA imports from DLLs on WIN32 can't be const, because
++   runtime relocations are performed -- see ld's documentation
++   on pseudo-relocs */
++struct {
++"
++	      ;;
++	    * )
++	  $echo >> "$output_objdir/$dlsyms" "\
+ const struct {
++"
++	      ;;
++	    esac
++
++
++	  $echo >> "$output_objdir/$dlsyms" "\
+   const char *name;
+   lt_ptr address;
+ }
+@@ -4394,7 +4524,7 @@
  	  ;;
  	*)
  	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
@@ -3103,7 +5190,7 @@
  	  ;;
  	esac
        else
-@@ -4419,17 +4426,6 @@
+@@ -4407,17 +4537,6 @@
  	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
        fi
  
@@ -3121,7 +5208,7 @@
        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'`
-@@ -4505,7 +4501,7 @@
+@@ -4493,7 +4612,7 @@
  	# Link the executable and exit
  	$show "$link_command"
  	$run eval "$link_command" || exit $?
@@ -3130,7 +5217,7 @@
        fi
  
        if test "$hardcode_action" = relink; then
-@@ -4560,10 +4556,10 @@
+@@ -4548,10 +4667,10 @@
        fi
  
        # Quote $echo for shipping.
@@ -3145,8 +5232,14 @@
  	esac
  	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
        else
-@@ -4589,7 +4585,7 @@
- 	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
+@@ -4573,11 +4692,11 @@
+ 	  *) exeext= ;;
+ 	esac
+ 	case $host in
+-	  *mingw* )
+-	    cwrappersource=`$echo ${output_objdir}/lt-${outputname}.c`
++	  *cygwin* | *mingw* )
++	    cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
  	    cwrapper=`$echo ${output}.exe`
  	    $rm $cwrappersource $cwrapper
 -	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
@@ -3154,7 +5247,7 @@
  
  	    cat > $cwrappersource <<EOF
  
-@@ -4598,7 +4594,7 @@
+@@ -4586,7 +4705,7 @@
  
     The $output program cannot be directly executed until all the libtool
     libraries that it depends on are installed.
@@ -3163,7 +5256,7 @@
     This wrapper executable should never be moved out of the build directory.
     If it is, it will not operate correctly.
  
-@@ -4630,7 +4626,7 @@
+@@ -4618,7 +4737,7 @@
  #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
    defined (__OS2__)
  #define HAVE_DOS_BASED_FILE_SYSTEM
@@ -3172,7 +5265,7 @@
  #define DIR_SEPARATOR_2 '\\'
  #endif
  #endif
-@@ -4661,7 +4657,7 @@
+@@ -4649,7 +4768,7 @@
  {
    char **newargz;
    int i;
@@ -3181,7 +5274,7 @@
    program_name = (char *) xstrdup ((char *) basename (argv[0]));
    newargz = XMALLOC(char *, argc+2);
  EOF
-@@ -4674,7 +4670,7 @@
+@@ -4662,7 +4781,7 @@
    newargz[1] = fnqualify(argv[0]);
    /* we know the script has the same name, without the .exe */
    /* so make sure newargz[1] doesn't end in .exe */
@@ -3190,7 +5283,15 @@
    for (i = 1; i < argc; i++)
      newargz[i+1] = xstrdup(argv[i]);
    newargz[argc+1] = NULL;
-@@ -4697,7 +4693,7 @@
+@@ -4673,6 +4792,7 @@
+ EOF
+ 
+ 	    cat >> $cwrappersource <<"EOF"
++  return 127;
+ }
+ 
+ void *
+@@ -4685,7 +4805,7 @@
    return p;
  }
  
@@ -3199,7 +5300,7 @@
  xstrdup (const char *string)
  {
    return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-@@ -4711,7 +4707,7 @@
+@@ -4699,7 +4819,7 @@
  
  #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
    /* Skip over the disk name in MSDOS pathnames. */
@@ -3208,7 +5309,7 @@
      name += 2;
  #endif
  
-@@ -4721,7 +4717,7 @@
+@@ -4709,7 +4829,7 @@
    return (char *) base;
  }
  
@@ -3217,7 +5318,7 @@
  fnqualify(const char *path)
  {
    size_t size;
-@@ -4749,7 +4745,7 @@
+@@ -4737,7 +4857,7 @@
  }
  
  char *
@@ -3226,7 +5327,7 @@
  {
    size_t len, patlen;
  
-@@ -4769,7 +4765,7 @@
+@@ -4757,7 +4877,7 @@
  }
  
  static void
@@ -3235,7 +5336,7 @@
            const char * message, va_list ap)
  {
    fprintf (stderr, "%s: %s: ", program_name, mode);
-@@ -4798,7 +4794,7 @@
+@@ -4786,7 +4906,7 @@
  	  ;;
  	esac
  	$rm $output
@@ -3244,7 +5345,16 @@
  
  	$echo > $output "\
  #! $SHELL
-@@ -4898,7 +4894,7 @@
+@@ -4807,7 +4927,7 @@
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ relink_command=\"$relink_command\"
+ 
+@@ -4886,7 +5006,7 @@
        else
  	$echo \"\$relink_command_output\" >&2
  	$rm \"\$progdir/\$file\"
@@ -3253,7 +5363,13 @@
        fi
      fi
  
-@@ -4953,29 +4949,27 @@
+@@ -4936,34 +5056,32 @@
+ 	# Backslashes separate directories on plain windows
+ 	*-*-mingw | *-*-os2*)
+ 	  $echo >> $output "\
+-      exec \$progdir\\\\\$program \${1+\"\$@\"}
++      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+ "
  	  ;;
  
  	*)
@@ -3261,7 +5377,7 @@
 -	  # computed within libtool.
  	  $echo >> $output "\
 -      LD_LIBRARY_PATH=\"$rpath\" exec \$progdir/\$program \${1+\"\$@\"}
-+      exec \$progdir/\$program \${1+\"\$@\"}
++      exec \"\$progdir/\$program\" \${1+\"\$@\"}
  "
  	  ;;
  	esac
@@ -3272,7 +5388,8 @@
      fi
    else
      # The program doesn't exist.
-     \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
+-    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
++    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
      \$echo \"This script is just a wrapper for \$program.\" 1>&2
      $echo \"See the $PACKAGE documentation for more information.\" 1>&2
 -    exit 1
@@ -3287,8 +5404,71 @@
        ;;
      esac
  
-@@ -5059,17 +5053,15 @@
- 	done
+@@ -4986,78 +5104,78 @@
+ 
+       if test -n "$addlibs"; then
+ 	gentop="$output_objdir/${outputname}x"
+-	$show "${rm}r $gentop"
+-	$run ${rm}r "$gentop"
+-	$show "$mkdir $gentop"
+-	$run $mkdir "$gentop"
+-	status=$?
+-	if test "$status" -ne 0 && test ! -d "$gentop"; then
+-	  exit $status
+-	fi
+ 	generated="$generated $gentop"
+ 
+-	# Add in members from convenience archives.
+-	for xlib in $addlibs; do
+-	  # Extract the objects.
+-	  case $xlib in
+-	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+-	  *) xabs=`pwd`"/$xlib" ;;
+-	  esac
+-	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+-	  xdir="$gentop/$xlib"
+-
+-	  $show "${rm}r $xdir"
+-	  $run ${rm}r "$xdir"
+-	  $show "$mkdir $xdir"
+-	  $run $mkdir "$xdir"
+-	  status=$?
+-	  if test "$status" -ne 0 && test ! -d "$xdir"; then
+-	    exit $status
+-	  fi
+-	  # We will extract separately just the conflicting names and we will no
+-	  # longer touch any unique names. It is faster to leave these extract
+-	  # automatically by $AR in one run.
+-	  $show "(cd $xdir && $AR x $xabs)"
+-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+-	    :
+-	  else
+-	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+-	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+-	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
+-	    do
+-	      i=1
+-	      while test "$i" -le "$count"
+-	      do
+-	       # Put our $i before any first dot (extension)
+-	       # Never overwrite any file
+-	       name_to="$name"
+-	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+-	       do
+-		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+-	       done
+-	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+-	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+-	       i=`expr $i + 1`
+-	      done
+-	    done
+-	  fi
+-
+-	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+-	done
++	func_extract_archives $gentop $addlibs
++	oldobjs="$oldobjs $func_extract_archives_result"
        fi
  
 -      compiler_flags="$compiler_flags $add_flags"
@@ -3298,6 +5478,63 @@
 -	eval cmds=\"$old_archive_from_new_cmds\"
 +       cmds=$old_archive_from_new_cmds
        else
++	# POSIX demands no paths to be encoded in archives.  We have
++	# to avoid creating archives with duplicate basenames if we
++	# might have to extract them afterwards, e.g., when creating a
++	# static archive out of a convenience library, or when linking
++	# the entirety of a libtool archive into another (currently
++	# not supported by libtool).
++	if (for obj in $oldobjs
++	    do
++	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
++	    done | sort | sort -uc >/dev/null 2>&1); then
++	  :
++	else
++	  $echo "copying selected object files to avoid basename conflicts..."
++
++	  if test -z "$gentop"; then
++	    gentop="$output_objdir/${outputname}x"
++	    generated="$generated $gentop"
++
++	    $show "${rm}r $gentop"
++	    $run ${rm}r "$gentop"
++	    $show "$mkdir $gentop"
++	    $run $mkdir "$gentop"
++	    status=$?
++	    if test "$status" -ne 0 && test ! -d "$gentop"; then
++	      exit $status
++	    fi
++	  fi
++
++	  save_oldobjs=$oldobjs
++	  oldobjs=
++	  counter=1
++	  for obj in $save_oldobjs
++	  do
++	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
++	    case " $oldobjs " in
++	    " ") oldobjs=$obj ;;
++	    *[\ /]"$objbase "*)
++	      while :; do
++		# Make sure we don't pick an alternate name that also
++		# overlaps.
++		newobj=lt$counter-$objbase
++		counter=`expr $counter + 1`
++		case " $oldobjs " in
++		*[\ /]"$newobj "*) ;;
++		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
++		esac
++	      done
++	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
++	      $run ln "$obj" "$gentop/$newobj" ||
++	      $run cp "$obj" "$gentop/$newobj"
++	      oldobjs="$oldobjs $gentop/$newobj"
++	      ;;
++	    *) oldobjs="$oldobjs $obj" ;;
++	    esac
++	  done
++	fi
++
  	eval cmds=\"$old_archive_cmds\"
  
  	if len=`expr "X$cmds" : ".*"` &&
@@ -3307,7 +5544,26 @@
  	else
  	  # the command line is too long to link in one step, link in parts
  	  $echo "using piecewise archive linking..."
-@@ -5096,7 +5088,7 @@
+@@ -5066,31 +5184,18 @@
+ 	  objlist=
+ 	  concat_cmds=
+ 	  save_oldobjs=$oldobjs
+-	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
+-	  # encoded into archives.  This makes 'ar r' malfunction in
+-	  # this piecewise linking case whenever conflicting object
+-	  # names appear in distinct ar calls; check, warn and compensate.
+-	    if (for obj in $save_oldobjs
+-	    do
+-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+-	    done | sort | sort -uc >/dev/null 2>&1); then
+-	    :
+-	  else
+-	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
+-	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
+-	    AR_FLAGS=cq
+-	  fi
++
+ 	  # Is there a better way of finding the last object in the list?
  	  for obj in $save_oldobjs
  	  do
  	    last_oldobj=$obj
@@ -3316,7 +5572,14 @@
  	  for obj in $save_oldobjs
  	  do
  	    oldobjs="$objlist $obj"
-@@ -5110,7 +5102,7 @@
+ 	    objlist="$objlist $obj"
+ 	    eval test_cmds=\"$old_archive_cmds\"
+-	    if len=`expr "X$test_cmds" : ".*"` &&
++	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ 	       test "$len" -le "$max_cmd_len"; then
+ 	      :
+ 	    else
+@@ -5098,7 +5203,7 @@
  	      oldobjs=$objlist
  	      if test "$obj" = "$last_oldobj" ; then
  	        RANLIB=$save_RANLIB
@@ -3325,7 +5588,7 @@
  	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
  	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
  	      objlist=
-@@ -5121,12 +5113,13 @@
+@@ -5109,12 +5214,13 @@
  	  if test "X$oldobjs" = "X" ; then
  	    eval cmds=\"\$concat_cmds\"
  	  else
@@ -3340,7 +5603,7 @@
  	IFS="$save_ifs"
  	$show "$cmd"
  	$run eval "$cmd" || exit $?
-@@ -5158,11 +5151,13 @@
+@@ -5146,11 +5252,13 @@
  	fi
        done
        # Quote the link command for shipping.
@@ -3357,7 +5620,7 @@
        # Only create the output if not a dry run.
        if test -z "$run"; then
  	for installed in no yes; do
-@@ -5180,7 +5175,7 @@
+@@ -5168,7 +5276,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
@@ -3366,7 +5629,7 @@
  		fi
  		newdependency_libs="$newdependency_libs $libdir/$name"
  		;;
-@@ -5194,7 +5189,7 @@
+@@ -5182,7 +5290,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
@@ -3375,7 +5638,7 @@
  	      fi
  	      newdlfiles="$newdlfiles $libdir/$name"
  	    done
-@@ -5205,11 +5200,30 @@
+@@ -5193,11 +5301,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
@@ -3407,7 +5670,7 @@
  	  fi
  	  $rm $output
  	  # place dlname in correct position for cygwin
-@@ -5253,7 +5267,7 @@
+@@ -5241,7 +5368,7 @@
  
  # Directory that this library needs to be installed in:
  libdir='$install_libdir'"
@@ -3416,7 +5679,7 @@
  	    $echo >> $output "\
  relink_command=\"$relink_command\""
  	  fi
-@@ -5266,7 +5280,7 @@
+@@ -5254,7 +5381,7 @@
        $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
        ;;
      esac
@@ -3425,7 +5688,87 @@
      ;;
  
    # libtool install mode
-@@ -5355,13 +5369,13 @@
+@@ -5265,11 +5392,11 @@
+     # install_prog (especially on Windows NT).
+     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+        # Allow the use of GNU shtool's install command.
+-       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
++       $echo "X$nonopt" | grep shtool > /dev/null; then
+       # Aesthetically quote it.
+       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+       case $arg in
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	arg="\"$arg\""
+ 	;;
+       esac
+@@ -5278,14 +5405,14 @@
+       shift
+     else
+       install_prog=
+-      arg="$nonopt"
++      arg=$nonopt
+     fi
+ 
+     # The real first argument should be the name of the installation program.
+     # Aesthetically quote it.
+     arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+     case $arg in
+-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+       arg="\"$arg\""
+       ;;
+     esac
+@@ -5303,28 +5430,31 @@
+     do
+       if test -n "$dest"; then
+ 	files="$files $dest"
+-	dest="$arg"
++	dest=$arg
+ 	continue
+       fi
+ 
+       case $arg in
+       -d) isdir=yes ;;
+-      -f) prev="-f" ;;
+-      -g) prev="-g" ;;
+-      -m) prev="-m" ;;
+-      -o) prev="-o" ;;
++      -f) 
++      	case " $install_prog " in
++	*[\\\ /]cp\ *) ;;
++	*) prev=$arg ;;
++	esac
++	;;
++      -g | -m | -o) prev=$arg ;;
+       -s)
+ 	stripme=" -s"
+ 	continue
+ 	;;
+-      -*) ;;
+-
++      -*)
++	;;
+       *)
+ 	# If the previous option needed an argument, then skip it.
+ 	if test -n "$prev"; then
+ 	  prev=
+ 	else
+-	  dest="$arg"
++	  dest=$arg
+ 	  continue
+ 	fi
+ 	;;
+@@ -5333,7 +5463,7 @@
+       # Aesthetically quote the argument.
+       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+       case $arg in
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	arg="\"$arg\""
+ 	;;
+       esac
+@@ -5343,13 +5473,13 @@
      if test -z "$install_prog"; then
        $echo "$modename: you must specify an install program" 1>&2
        $echo "$help" 1>&2
@@ -3441,7 +5784,7 @@
      fi
  
      if test -z "$files"; then
-@@ -5371,7 +5385,7 @@
+@@ -5359,7 +5489,7 @@
  	$echo "$modename: you must specify a destination" 1>&2
        fi
        $echo "$help" 1>&2
@@ -3450,7 +5793,7 @@
      fi
  
      # Strip any trailing slash from the destination.
-@@ -5392,7 +5406,7 @@
+@@ -5380,7 +5510,7 @@
        if test "$#" -gt 2; then
  	$echo "$modename: \`$dest' is not a directory" 1>&2
  	$echo "$help" 1>&2
@@ -3459,7 +5802,7 @@
        fi
      fi
      case $destdir in
-@@ -5404,7 +5418,7 @@
+@@ -5392,7 +5522,7 @@
  	*)
  	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
  	  $echo "$help" 1>&2
@@ -3468,7 +5811,7 @@
  	  ;;
  	esac
        done
-@@ -5433,7 +5447,7 @@
+@@ -5421,7 +5551,7 @@
  	else
  	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
  	  $echo "$help" 1>&2
@@ -3477,7 +5820,7 @@
  	fi
  
  	library_names=
-@@ -5475,7 +5489,7 @@
+@@ -5463,7 +5593,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
@@ -3486,7 +5829,7 @@
  	  fi
  
  	  if test -n "$inst_prefix_dir"; then
-@@ -5490,7 +5504,7 @@
+@@ -5478,7 +5608,7 @@
  	  if $run eval "$relink_command"; then :
  	  else
  	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
@@ -3495,8 +5838,24 @@
  	  fi
  	fi
  
-@@ -5525,10 +5539,11 @@
+@@ -5502,23 +5632,36 @@
  
+ 	  if test "$#" -gt 0; then
+ 	    # Delete the old symlinks, and create new ones.
++	    # Try `ln -sf' first, because the `ln' binary might depend on
++	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
++	    # so we also need to try rm && ln -s.
+ 	    for linkname
+ 	    do
+ 	      if test "$linkname" != "$realname"; then
+-		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+-		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
++                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
++                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+ 	      fi
+ 	    done
+ 	  fi
+ 
  	  # Do each command in the postinstall commands.
  	  lib="$destdir/$realname"
 -	  eval cmds=\"$postinstall_cmds\"
@@ -3506,9 +5865,21 @@
  	    IFS="$save_ifs"
 +	    eval cmd=\"$cmd\"
  	    $show "$cmd"
- 	    $run eval "$cmd" || exit $?
+-	    $run eval "$cmd" || exit $?
++	    $run eval "$cmd" || {
++	      lt_exit=$?
++
++	      # Restore the uninstalled library and exit
++	      if test "$mode" = relink; then
++		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++	      fi
++
++	      exit $lt_exit
++	    }
  	  done
-@@ -5568,7 +5583,7 @@
+ 	  IFS="$save_ifs"
+ 	fi
+@@ -5556,7 +5699,7 @@
  	*)
  	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
  	  $echo "$help" 1>&2
@@ -3517,7 +5888,7 @@
  	  ;;
  	esac
  
-@@ -5586,7 +5601,7 @@
+@@ -5574,7 +5717,7 @@
  	  $show "$install_prog $staticobj $staticdest"
  	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
  	fi
@@ -3526,7 +5897,31 @@
  	;;
  
        *)
-@@ -5640,7 +5655,7 @@
+@@ -5612,23 +5755,21 @@
+ 	  notinst_deplibs=
+ 	  relink_command=
+ 
+-	  # To insure that "foo" is sourced, and not "foo.exe",
+-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
+-	  # which disallows the automatic-append-.exe behavior.
+-	  case $build in
+-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+-	  *) wrapperdot=${wrapper} ;;
+-	  esac
++	  # Note that it is not necessary on cygwin/mingw to append a dot to
++	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
++	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
++	  # `FILE.' does not work on cygwin managed mounts.
++	  #
+ 	  # If there is no directory component, then add one.
+-	  case $file in
+-	  */* | *\\*) . ${wrapperdot} ;;
+-	  *) . ./${wrapperdot} ;;
++	  case $wrapper in
++	  */* | *\\*) . ${wrapper} ;;
++	  *) . ./${wrapper} ;;
+ 	  esac
+ 
  	  # Check the variables that should have been set.
  	  if test -z "$notinst_deplibs"; then
  	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
@@ -3535,7 +5930,33 @@
  	  fi
  
  	  finalize=yes
-@@ -5681,8 +5696,12 @@
+@@ -5650,17 +5791,15 @@
+ 	  done
+ 
+ 	  relink_command=
+-	  # To insure that "foo" is sourced, and not "foo.exe",
+-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
+-	  # which disallows the automatic-append-.exe behavior.
+-	  case $build in
+-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+-	  *) wrapperdot=${wrapper} ;;
+-	  esac
++	  # Note that it is not necessary on cygwin/mingw to append a dot to
++	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
++	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
++	  # `FILE.' does not work on cygwin managed mounts.
++	  #
+ 	  # If there is no directory component, then add one.
+-	  case $file in
+-	  */* | *\\*) . ${wrapperdot} ;;
+-	  *) . ./${wrapperdot} ;;
++	  case $wrapper in
++	  */* | *\\*) . ${wrapper} ;;
++	  *) . ./${wrapper} ;;
+ 	  esac
+ 
+ 	  outputname=
+@@ -5669,8 +5808,12 @@
  	      tmpdir="/tmp"
  	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
  	      tmpdir="$tmpdir/libtool-$$"
@@ -3549,7 +5970,16 @@
  		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
  		continue
  	      fi
-@@ -5741,16 +5760,17 @@
+@@ -5697,7 +5840,7 @@
+ 	fi
+ 
+ 	# remove .exe since cygwin /usr/bin/install will append another
+-	# one anyways
++	# one anyway 
+ 	case $install_prog,$host in
+ 	*/usr/bin/install*,*cygwin*)
+ 	  case $file:$destfile in
+@@ -5729,16 +5872,17 @@
        $show "$install_prog $file $oldlib"
        $run eval "$install_prog \$file \$oldlib" || exit $?
  
@@ -3569,7 +5999,7 @@
  	$show "$cmd"
  	$run eval "$cmd" || exit $?
        done
-@@ -5764,9 +5784,9 @@
+@@ -5752,9 +5896,9 @@
      if test -n "$current_libdirs"; then
        # Maybe just do a dry run.
        test -n "$run" && current_libdirs=" -n$current_libdirs"
@@ -3581,7 +6011,7 @@
      fi
      ;;
  
-@@ -5785,10 +5805,11 @@
+@@ -5773,10 +5917,11 @@
        for libdir in $libdirs; do
  	if test -n "$finish_cmds"; then
  	  # Do each command in the finish commands.
@@ -3594,7 +6024,7 @@
  	    $show "$cmd"
  	    $run eval "$cmd" || admincmds="$admincmds
         $cmd"
-@@ -5805,7 +5826,7 @@
+@@ -5793,7 +5938,7 @@
      fi
  
      # Exit here if they wanted silent mode.
@@ -3603,7 +6033,7 @@
  
      $echo "----------------------------------------------------------------------"
      $echo "Libraries have been installed in:"
-@@ -5841,7 +5862,7 @@
+@@ -5829,7 +5974,7 @@
      $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 "----------------------------------------------------------------------"
@@ -3612,7 +6042,7 @@
      ;;
  
    # libtool execute mode
-@@ -5853,7 +5874,7 @@
+@@ -5841,7 +5986,7 @@
      if test -z "$cmd"; then
        $echo "$modename: you must specify a COMMAND" 1>&2
        $echo "$help"
@@ -3621,7 +6051,7 @@
      fi
  
      # Handle -dlopen flags immediately.
-@@ -5861,7 +5882,7 @@
+@@ -5849,7 +5994,7 @@
        if test ! -f "$file"; then
  	$echo "$modename: \`$file' is not a file" 1>&2
  	$echo "$help" 1>&2
@@ -3630,7 +6060,7 @@
        fi
  
        dir=
-@@ -5872,7 +5893,7 @@
+@@ -5860,7 +6005,7 @@
  	else
  	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
  	  $echo "$help" 1>&2
@@ -3639,7 +6069,7 @@
  	fi
  
  	# Read the libtool library.
-@@ -5899,7 +5920,7 @@
+@@ -5887,7 +6032,7 @@
  	  dir="$dir/$objdir"
  	else
  	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
@@ -3648,7 +6078,7 @@
  	fi
  	;;
  
-@@ -5979,7 +6000,7 @@
+@@ -5967,7 +6112,7 @@
  	$echo "export $shlibpath_var"
        fi
        $echo "$cmd$args"
@@ -3657,7 +6087,7 @@
      fi
      ;;
  
-@@ -6007,7 +6028,7 @@
+@@ -5995,7 +6140,7 @@
      if test -z "$rm"; then
        $echo "$modename: you must specify an RM program" 1>&2
        $echo "$help" 1>&2
@@ -3666,7 +6096,7 @@
      fi
  
      rmdirs=
-@@ -6062,10 +6083,11 @@
+@@ -6050,10 +6195,11 @@
  	  if test "$mode" = uninstall; then
  	    if test -n "$library_names"; then
  	      # Do each command in the postuninstall commands.
@@ -3679,7 +6109,7 @@
  		$show "$cmd"
  		$run eval "$cmd"
  		if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6077,10 +6099,11 @@
+@@ -6065,10 +6211,11 @@
  
  	    if test -n "$old_library"; then
  	      # Do each command in the old_postuninstall commands.
@@ -3692,7 +6122,7 @@
  		$show "$cmd"
  		$run eval "$cmd"
  		if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6119,7 +6142,7 @@
+@@ -6107,7 +6254,7 @@
  	if test "$mode" = clean ; then
  	  noexename=$name
  	  case $file in
@@ -3701,7 +6131,7 @@
  	    file=`$echo $file|${SED} 's,.exe$,,'`
  	    noexename=`$echo $name|${SED} 's,.exe$,,'`
  	    # $file with .exe has already been added to rmfiles,
-@@ -6164,20 +6187,20 @@
+@@ -6152,20 +6299,20 @@
    "")
      $echo "$modename: you must specify a MODE" 1>&2
      $echo "$generic_help" 1>&2
@@ -3725,7 +6155,7 @@
  fi
  
  # We need to display help for each of the modes.
-@@ -6213,7 +6236,7 @@
+@@ -6201,7 +6348,7 @@
  a more detailed description of MODE.
  
  Report bugs to <bug-libtool at gnu.org>."
@@ -3734,7 +6164,7 @@
    ;;
  
  clean)
-@@ -6325,6 +6348,8 @@
+@@ -6313,6 +6460,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
@@ -3743,7 +6173,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
-@@ -6366,14 +6391,14 @@
+@@ -6354,14 +6503,14 @@
  *)
    $echo "$modename: invalid operation mode \`$mode'" 1>&2
    $echo "$help" 1>&2
@@ -3756,7 +6186,7 @@
  $echo "Try \`$modename --help' for more information about other modes."
  
 -exit 0
-+exit $EXIT_SUCCESS
++exit $?
  
  # The TAGs below are defined such that we never get into a situation
  # in which we disable both kinds of libraries.  Given conflicting

Modified: trunk/common-patches/05_pedantic-errors.diff
===================================================================
--- trunk/common-patches/05_pedantic-errors.diff	2005-11-10 07:51:11 UTC (rev 2170)
+++ trunk/common-patches/05_pedantic-errors.diff	2005-11-10 18:42:07 UTC (rev 2171)
@@ -1,6 +1,6 @@
 --- a/admin/acinclude.m4.in
 +++ b/admin/acinclude.m4.in
-@@ -2139,9 +2139,6 @@
+@@ -2144,9 +2144,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"

Deleted: trunk/common-patches/06_automake-1.9.diff

Added: trunk/common-patches/06_disable_no_undefined.diff
===================================================================
--- trunk/common-patches/06_disable_no_undefined.diff	2005-11-10 07:51:11 UTC (rev 2170)
+++ trunk/common-patches/06_disable_no_undefined.diff	2005-11-10 18:42:07 UTC (rev 2171)
@@ -0,0 +1,18 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -1689,15 +1689,6 @@
+        KDE_USE_CLOSURE_TRUE="#"
+        KDE_USE_CLOSURE_FALSE=""
+        KDE_NO_UNDEFINED=""
+-       case $host in 
+-         *-*-linux-gnu)
+-           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+-                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+-		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+-		[KDE_NO_UNDEFINED=""])],
+-	    [KDE_NO_UNDEFINED=""])
+-           ;;
+-       esac
+   fi
+   AC_SUBST(KDE_USE_CLOSURE_TRUE)
+   AC_SUBST(KDE_USE_CLOSURE_FALSE)

Added: trunk/common-patches/07_disable-visibility.diff
===================================================================
--- trunk/common-patches/07_disable-visibility.diff	2005-11-10 07:51:11 UTC (rev 2170)
+++ trunk/common-patches/07_disable-visibility.diff	2005-11-10 18:42:07 UTC (rev 2171)
@@ -0,0 +1,123 @@
+--- kde.orig/admin/acinclude.m4.in
++++ kde.patched/admin/acinclude.m4.in
+@@ -3339,63 +3339,63 @@
+ 
+ AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
+ [
+-  AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
+-
+-  AC_MSG_CHECKING([grepping for visibility push/pop in headers])
+-
+-  if test "x$GXX" = "xyes"; then
+-    AC_LANG_SAVE
+-    AC_LANG_CPLUSPLUS
+-    AC_EGREP_CPP(
+-       [GCC visibility push],
+-       [ #include <exception> 
+-       ], 
+-    [
+-      AC_MSG_RESULT(yes)
+-      kde_stdc_visibility_patched=yes ],
+-    [ 
+-      AC_MSG_RESULT(no)
+-      AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for 
+-                   visibility support. Disabling -fvisibility=hidden])
+-
+-      kde_stdc_visibility_patched=no ])
+-    AC_LANG_RESTORE
+-
+-    kde_have_gcc_visibility=no
+-    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
+-    [
+-      kde_have_gcc_visibility=yes
+-      AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
+-        [
+-          AC_LANG_SAVE
+-          AC_LANG_CPLUSPLUS
+-
+-          safe_CXXFLAGS=$CXXFLAGS
+-          CXXFLAGS="$CXXFLAGS $all_includes"
+-
+-          AC_TRY_COMPILE(
+-          [
+-#include <qglobal.h>
+-#if Q_EXPORT - 0 != 0
+-/* if this compiles, then Q_EXPORT is undefined */
+-/* if Q_EXPORT is nonempty, this will break compilation */
+-#endif
+-          ], [/* elvis is alive */],
+-          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
+-
+-          CXXFLAGS=$safe_CXXFLAGS
+-          AC_LANG_RESTORE
+-        ]
+-      )
+-
+-      if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+-        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+-        KDE_CHECK_VISIBILITY_GCC_BUG
+-        HAVE_GCC_VISIBILITY=1
+-        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
+-      fi
+-    ])
+-  fi
++dnl  AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
++dnl
++dnl  AC_MSG_CHECKING([grepping for visibility push/pop in headers])
++dnl
++dnl  if test "x$GXX" = "xyes"; then
++dnl    AC_LANG_SAVE
++dnl    AC_LANG_CPLUSPLUS
++dnl    AC_EGREP_CPP(
++dnl       [GCC visibility push],
++dnl       [ #include <exception> 
++dnl       ], 
++dnl    [
++dnl      AC_MSG_RESULT(yes)
++dnl      kde_stdc_visibility_patched=yes ],
++dnl    [ 
++dnl      AC_MSG_RESULT(no)
++dnl      AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for 
++dnl                   visibility support. Disabling -fvisibility=hidden])
++dnl
++dnl      kde_stdc_visibility_patched=no ])
++dnl    AC_LANG_RESTORE
++dnl
++dnl    kde_have_gcc_visibility=no
++dnl    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
++dnl    [
++dnl      kde_have_gcc_visibility=yes
++dnl      AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
++dnl        [
++dnl          AC_LANG_SAVE
++dnl          AC_LANG_CPLUSPLUS
++dnl
++dnl          safe_CXXFLAGS=$CXXFLAGS
++dnl          CXXFLAGS="$CXXFLAGS $all_includes"
++dnl
++dnl          AC_TRY_COMPILE(
++dnl          [
++dnl#include <qglobal.h>
++dnl#if Q_EXPORT - 0 != 0
++dnl/* if this compiles, then Q_EXPORT is undefined */
++dnl/* if Q_EXPORT is nonempty, this will break compilation */
++dnl#endif
++dnl          ], [/* elvis is alive */],
++dnl          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
++dnl
++dnl          CXXFLAGS=$safe_CXXFLAGS
++dnl          AC_LANG_RESTORE
++dnl        ]
++dnl      )
++dnl
++dnl      if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
++dnl        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
++dnl        KDE_CHECK_VISIBILITY_GCC_BUG
++dnl        HAVE_GCC_VISIBILITY=1
++dnl        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
++dnl      fi
++dnl    ])
++dnl  fi
+ ])
+ 
+ AC_DEFUN([KDE_ADD_DEPENDENCIES],

Deleted: trunk/common-patches/07_disable_no_undefined.diff

Deleted: trunk/common-patches/08_disable-visibility.diff




More information about the pkg-kde-commits mailing list