tUpdate to latest upstream. - vaccinewars - be a doctor and try to vaccinate the world
 (HTM) git clone git://src.adamsgaard.dk/vaccinewars
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit 4dd6319273236d0e92065490b4240c212361b247
 (DIR) parent 3ed403e58eacda155a1cbc7e206bf17c8dd2c243
 (HTM) Author: Ben Webb <ben@salilab.org>
       Date:   Mon, 11 Feb 2008 04:13:39 +0000
       
       Update to latest upstream.
       
       
       Diffstat:
         M m4/libtool.m4                       |    1639 +++++++++++++++++++------------
       
       1 file changed, 1038 insertions(+), 601 deletions(-)
       ---
 (DIR) diff --git a/m4/libtool.m4 b/m4/libtool.m4
       t@@ -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@gnu.ai.mit.edu>, 1996
        ##
       -## This program is free software; you can redistribute it and/or modify
       -## it under the terms of the GNU General Public License as published by
       -## the Free Software Foundation; either version 2 of the License, or
       -## (at your option) any later version.
       -##
       -## This program is distributed in the hope that it will be useful, but
       -## WITHOUT ANY WARRANTY; without even the implied warranty of
       -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       -## General Public License for more details.
       -##
       -## You should have received a copy of the GNU General Public License
       -## along with this program; if not, write to the Free Software
       -## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
       -##
       -## As a special exception to the GNU General Public License, if you
       -## distribute this file as part of a program that contains a
       -## configuration script generated by Autoconf, you may include it under
       -## the same distribution terms that you use for the rest of that program.
       +## This file is free software; the Free Software Foundation gives
       +## unlimited permission to copy and/or distribute it, with or without
       +## modifications, as long as this notice is preserved.
        
       -# serial 47 AC_PROG_LIBTOOL
       +# serial 48 AC_PROG_LIBTOOL
        
        
        # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
       t@@ -132,7 +117,7 @@ esac
        
        # 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.
       t@@ -152,7 +137,7 @@ rm="rm -f"
        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"
       t@@ -172,6 +157,7 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
        test -z "$AS" && AS=as
        test -z "$CC" && CC=cc
        test -z "$LTCC" && LTCC=$CC
       +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
        test -z "$DLLTOOL" && DLLTOOL=dlltool
        test -z "$LD" && LD=ld
        test -z "$LN_S" && LN_S="ln -s"
       t@@ -191,15 +177,17 @@ old_postuninstall_cmds=
        if test -n "$RANLIB"; then
          case $host_os in
          openbsd*)
       -    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
       +    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
            ;;
          *)
       -    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
       +    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
            ;;
          esac
          old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
        fi
        
       +_LT_CC_BASENAME([$compiler])
       +
        # Only perform the check for file, if the check method requires it
        case $deplibs_check_method in
        file_magic*)
       t@@ -240,11 +228,56 @@ AC_DEFUN([_LT_AC_SYS_COMPILER],
        # If no C compiler was specified, use CC.
        LTCC=${LTCC-"$CC"}
        
       +# If no C compiler flags were specified, use CFLAGS.
       +LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
       +
        # Allow CC to be a program name with arguments.
        compiler=$CC
        ])# _LT_AC_SYS_COMPILER
        
        
       +# _LT_CC_BASENAME(CC)
       +# -------------------
       +# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
       +AC_DEFUN([_LT_CC_BASENAME],
       +[for cc_temp in $1""; do
       +  case $cc_temp in
       +    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
       +    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
       +    \-*) ;;
       +    *) break;;
       +  esac
       +done
       +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
       +])
       +
       +
       +# _LT_COMPILER_BOILERPLATE
       +# ------------------------
       +# Check for compiler boilerplate output or warnings with
       +# the simple compiler test code.
       +AC_DEFUN([_LT_COMPILER_BOILERPLATE],
       +[ac_outfile=conftest.$ac_objext
       +printf "$lt_simple_compile_test_code" >conftest.$ac_ext
       +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
       +_lt_compiler_boilerplate=`cat conftest.err`
       +$rm conftest*
       +])# _LT_COMPILER_BOILERPLATE
       +
       +
       +# _LT_LINKER_BOILERPLATE
       +# ----------------------
       +# Check for linker boilerplate output or warnings with
       +# the simple link test code.
       +AC_DEFUN([_LT_LINKER_BOILERPLATE],
       +[ac_outfile=conftest.$ac_objext
       +printf "$lt_simple_link_test_code" >conftest.$ac_ext
       +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
       +_lt_linker_boilerplate=`cat conftest.err`
       +$rm conftest*
       +])# _LT_LINKER_BOILERPLATE
       +
       +
        # _LT_AC_SYS_LIBPATH_AIX
        # ----------------------
        # Links a minimal program and checks the executable
       t@@ -317,15 +350,15 @@ fi
        
        # The HP-UX ksh and POSIX shell print the target directory to stdout
        # if CDPATH is set.
       -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
       +(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
       t@@ -494,7 +527,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
          # Find out which ABI we are using.
          echo 'int i;' > conftest.$ac_ext
          if AC_TRY_EVAL(ac_compile); then
       -    case "`/usr/bin/file conftest.o`" in
       +    case `/usr/bin/file conftest.o` in
            *32-bit*)
              case $host in
                x86_64-*linux*)
       t@@ -545,6 +578,22 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
            CFLAGS="$SAVE_CFLAGS"
          fi
          ;;
       +sparc*-*solaris*)
       +  # Find out which ABI we are using.
       +  echo 'int i;' > conftest.$ac_ext
       +  if AC_TRY_EVAL(ac_compile); then
       +    case `/usr/bin/file conftest.o` in
       +    *64-bit*)
       +      case $lt_cv_prog_gnu_ld in
       +      yes*) LD="${LD-ld} -m elf64_sparc" ;;
       +      *)    LD="${LD-ld} -64" ;;
       +      esac
       +      ;;
       +    esac
       +  fi
       +  rm -rf conftest*
       +  ;;
       +
        AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
        [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
          AC_CHECK_TOOL(DLLTOOL, dlltool, false)
       t@@ -576,7 +625,7 @@ AC_CACHE_CHECK([$1], [$2],
           # 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)
       t@@ -586,8 +635,10 @@ AC_CACHE_CHECK([$1], [$2],
           echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
           if (exit $ac_status) && test -s "$ac_outfile"; then
             # The compiler can only warn and ignore the option if not recognized
       -     # So say no if there are warnings
       -     if test ! -s conftest.err; then
       +     # So say no if there are warnings other than the usual output.
       +     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
       +     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
       +     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
               $2=yes
             fi
           fi
       t@@ -613,11 +664,16 @@ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
           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 -e '/^$/d' > conftest.exp
       +       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
       +       if diff conftest.exp conftest.er2 >/dev/null; then
       +         $2=yes
       +       fi
             else
               $2=yes
             fi
       t@@ -676,11 +732,55 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
            lt_cv_sys_max_cmd_len=8192;
            ;;
        
       - *)
       +  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
       +    # This has been around since 386BSD, at least.  Likely further.
       +    if test -x /sbin/sysctl; then
       +      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
       +    elif test -x /usr/sbin/sysctl; then
       +      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
       +    else
       +      lt_cv_sys_max_cmd_len=65536        # usable default for all BSDs
       +    fi
       +    # And add a safety zone
       +    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       +    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
       +    ;;
       +
       +  interix*)
       +    # We know the value 262144 and hardcode it with a safety zone (like BSD)
       +    lt_cv_sys_max_cmd_len=196608
       +    ;;
       +
       +  osf*)
       +    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
       +    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
       +    # nice to cause kernel panics so lets avoid the loop below.
       +    # First set a reasonable default.
       +    lt_cv_sys_max_cmd_len=16384
       +    #
       +    if test -x /sbin/sysconfig; then
       +      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
       +        *1*) lt_cv_sys_max_cmd_len=-1 ;;
       +      esac
       +    fi
       +    ;;
       +  sco3.2v5*)
       +    lt_cv_sys_max_cmd_len=102400
       +    ;;
       +  sysv5* | sco5v6* | sysv4.2uw2*)
       +    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
       +    if test -n "$kargmax"; then
       +      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[         ]]//'`
       +    else
       +      lt_cv_sys_max_cmd_len=32768
       +    fi
       +    ;;
       +  *)
            # 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$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 &&
       t@@ -706,7 +806,7 @@ fi
        
        
        # _LT_AC_CHECK_DLFCN
       -# --------------------
       +# ------------------
        AC_DEFUN([_LT_AC_CHECK_DLFCN],
        [AC_CHECK_HEADERS(dlfcn.h)dnl
        ])# _LT_AC_CHECK_DLFCN
       t@@ -714,7 +814,7 @@ AC_DEFUN([_LT_AC_CHECK_DLFCN],
        
        # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
        #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
       -# ------------------------------------------------------------------
       +# ---------------------------------------------------------------------
        AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
        [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
        if test "$cross_compiling" = yes; then :
       t@@ -780,17 +880,19 @@ int main ()
              else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
              /* dlclose (self); */
            }
       +  else
       +    puts (dlerror ());
        
            exit (status);
        }]
        EOF
          if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
       -    (./conftest; exit; ) 2>/dev/null
       +    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
            lt_status=$?
            case x$lt_status in
              x$lt_dlno_uscore) $1 ;;
              x$lt_dlneed_uscore) $2 ;;
       -      x$lt_unknown|x*) $3 ;;
       +      x$lt_dlunknown|x*) $3 ;;
            esac
          else :
            # compilation failed
       t@@ -802,7 +904,7 @@ rm -fr conftest*
        
        
        # AC_LIBTOOL_DLOPEN_SELF
       -# -------------------
       +# ----------------------
        AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
        [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
        if test "x$enable_dlopen" != xyes; then
       t@@ -873,7 +975,7 @@ else
            test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
        
            save_LDFLAGS="$LDFLAGS"
       -    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
       +    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
        
            save_LIBS="$LIBS"
            LIBS="$lt_cv_dlopen_libs $LIBS"
       t@@ -886,7 +988,7 @@ else
            ])
        
            if test "x$lt_cv_dlopen_self" = xyes; then
       -      LDFLAGS="$LDFLAGS $link_static_flag"
       +      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
              AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
                      lt_cv_dlopen_self_static, [dnl
                  _LT_AC_TRY_DLOPEN_SELF(
       t@@ -934,7 +1036,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
           # 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)
       t@@ -946,11 +1048,13 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
           then
             # The compiler can only warn and ignore the option if not recognized
             # So say no if there are warnings
       -     if test ! -s out/conftest.err; then
       +     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
       +     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
       +     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
               _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
             fi
           fi
       -   chmod u+w .
       +   chmod u+w . 2>&AS_MESSAGE_LOG_FD
           $rm conftest*
           # SGI C++ compiler will create directory out/ii_files/ for
           # template instantiation
       t@@ -1014,8 +1118,8 @@ AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
        [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 &&
       t@@ -1182,7 +1286,7 @@ beos*)
          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}'
       t@@ -1210,7 +1314,8 @@ cygwin* | mingw* | pw32*)
              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'
       t@@ -1240,7 +1345,7 @@ cygwin* | mingw* | pw32*)
              ;;
            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
            ;;
       t@@ -1259,11 +1364,11 @@ darwin* | rhapsody*)
          version_type=darwin
          need_lib_prefix=no
          need_version=no
       -  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
       +  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext'
          soname_spec='${libname}${release}${major}$shared_ext'
          shlibpath_overrides_runpath=yes
          shlibpath_var=DYLD_LIBRARY_PATH
       -  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
       +  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"`
       t@@ -1298,8 +1403,17 @@ kfreebsd*-gnu)
          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*)
       t@@ -1317,14 +1431,19 @@ freebsd*)
          freebsd2*)
            shlibpath_overrides_runpath=yes
            ;;
       -  freebsd3.[01]* | freebsdelf3.[01]*)
       +  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
            shlibpath_overrides_runpath=yes
            hardcode_into_libs=yes
            ;;
       -  *) # from 3.2 on
       +  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
       +  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
            shlibpath_overrides_runpath=no
            hardcode_into_libs=yes
            ;;
       +  freebsd*) # from 4.6 on
       +    shlibpath_overrides_runpath=yes
       +    hardcode_into_libs=yes
       +    ;;
          esac
          ;;
        
       t@@ -1344,7 +1463,7 @@ hpux9* | hpux10* | hpux11*)
          version_type=sunos
          need_lib_prefix=no
          need_version=no
       -  case "$host_cpu" in
       +  case $host_cpu in
          ia64*)
            shrext_cmds='.so'
            hardcode_into_libs=yes
       t@@ -1384,6 +1503,18 @@ hpux9* | hpux10* | hpux11*)
          postinstall_cmds='chmod 555 $lib'
          ;;
        
       +interix3*)
       +  version_type=linux
       +  need_lib_prefix=no
       +  need_version=no
       +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
       +  soname_spec='${libname}${release}${shared_ext}$major'
       +  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
       +  shlibpath_var=LD_LIBRARY_PATH
       +  shlibpath_overrides_runpath=no
       +  hardcode_into_libs=yes
       +  ;;
       +
        irix5* | irix6* | nonstopux*)
          case $host_os in
            nonstopux*) version_type=nonstopux ;;
       t@@ -1441,27 +1572,10 @@ linux*)
          # before this can be enabled.
          hardcode_into_libs=yes
        
       -  # find out which ABI we are using
       -  libsuff=
       -  case "$host_cpu" in
       -  x86_64*|s390x*|powerpc64*)
       -    echo '[#]line __oline__ "configure"' > conftest.$ac_ext
       -    if AC_TRY_EVAL(ac_compile); then
       -      case `/usr/bin/file conftest.$ac_objext` in
       -      *64-bit*)
       -        libsuff=64
       -        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
       -        ;;
       -      esac
       -    fi
       -    rm -rf conftest*
       -    ;;
       -  esac
       -
          # 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' ' '`
       -    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
       +    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
       t@@ -1522,8 +1636,13 @@ nto-qnx*)
        
        openbsd*)
          version_type=sunos
       +  sys_lib_dlsearch_path_spec="/usr/lib"
          need_lib_prefix=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
       t@@ -1561,13 +1680,6 @@ osf3* | osf4* | osf5*)
          sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
          ;;
        
       -sco3.2v5*)
       -  version_type=osf
       -  soname_spec='${libname}${release}${shared_ext}$major'
       -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
       -  shlibpath_var=LD_LIBRARY_PATH
       -  ;;
       -
        solaris*)
          version_type=linux
          need_lib_prefix=no
       t@@ -1593,7 +1705,7 @@ sunos4*)
          need_version=yes
          ;;
        
       -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
       +sysv4 | sysv4.3*)
          version_type=linux
          library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
          soname_spec='${libname}${release}${shared_ext}$major'
       t@@ -1626,6 +1738,29 @@ sysv4*MP*)
          fi
          ;;
        
       +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
       +  version_type=freebsd-elf
       +  need_lib_prefix=no
       +  need_version=no
       +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
       +  soname_spec='${libname}${release}${shared_ext}$major'
       +  shlibpath_var=LD_LIBRARY_PATH
       +  hardcode_into_libs=yes
       +  if test "$with_gnu_ld" = yes; then
       +    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
       +    shlibpath_overrides_runpath=no
       +  else
       +    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
       +    shlibpath_overrides_runpath=yes
       +    case $host_os in
       +      sco3.2v5*)
       +        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
       +        ;;
       +    esac
       +  fi
       +  sys_lib_dlsearch_path_spec='/usr/lib'
       +  ;;
       +
        uts4*)
          version_type=linux
          library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
       t@@ -1639,6 +1774,11 @@ uts4*)
        esac
        AC_MSG_RESULT([$dynamic_linker])
        test "$dynamic_linker" = no && can_build_shared=no
       +
       +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
       +if test "$GCC" = yes; then
       +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
       +fi
        ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
        
        
       t@@ -1663,6 +1803,9 @@ if test -f "$ltmain" && test -n "$tagnames"; then
              AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
            fi
          fi
       +  if test -z "$LTCFLAGS"; then
       +    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
       +  fi
        
          # Extract list of available tagged configurations in $ofile.
          # Note that this assumes the entire list is on one line.
       t@@ -1689,7 +1832,9 @@ if test -f "$ltmain" && test -n "$tagnames"; then
        
              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=""
       t@@ -1751,7 +1896,7 @@ AC_DEFUN([AC_LIBTOOL_DLOPEN],
        
        # 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
       t@@ -1789,7 +1934,7 @@ AC_ARG_ENABLE([shared],
        
        # AC_DISABLE_SHARED
        # -----------------
       -#- set the default shared flag to --disable-shared
       +# set the default shared flag to --disable-shared
        AC_DEFUN([AC_DISABLE_SHARED],
        [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
        AC_ENABLE_SHARED(no)
       t@@ -1925,7 +2070,7 @@ dnl not every word.  This closes a longstanding sh security hole.
              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
       t@@ -2035,7 +2180,7 @@ AC_CACHE_VAL(lt_cv_path_LD,
            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'*)
       t@@ -2067,7 +2212,7 @@ AC_PROG_LD_GNU
        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
       t@@ -2094,6 +2239,15 @@ case $reload_flag in
        *) reload_flag=" $reload_flag" ;;
        esac
        reload_cmds='$LD$reload_flag -o $output$reload_objs'
       +case $host_os in
       +  darwin*)
       +    if test "$GCC" = yes; then
       +      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
       +    else
       +      reload_cmds='$LD$reload_flag -o $output$reload_objs'
       +    fi
       +    ;;
       +esac
        ])# AC_PROG_LD_RELOAD_FLAG
        
        
       t@@ -2127,7 +2281,7 @@ beos*)
          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
       t@@ -2150,13 +2304,13 @@ darwin* | rhapsody*)
          lt_cv_deplibs_check_method=pass_all
          ;;
        
       -freebsd* | kfreebsd*-gnu)
       +freebsd* | kfreebsd*-gnu | dragonfly*)
          if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
            case $host_cpu in
            i*86 )
              # Not sure whether the presence of OpenBSD here was a mistake.
              # Let's accept both of them until this is cleared up.
       -      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
       +      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
              lt_cv_file_magic_cmd=/usr/bin/file
              lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
              ;;
       t@@ -2172,7 +2326,7 @@ gnu*)
        
        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
       t@@ -2188,6 +2342,11 @@ hpux10.20* | hpux11*)
          esac
          ;;
        
       +interix3*)
       +  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
       +  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
       +  ;;
       +
        irix5* | irix6* | nonstopux*)
          case $LD in
          *-32|*"-32 ") libmagic=32-bit;;
       t@@ -2200,15 +2359,6 @@ irix5* | irix6* | nonstopux*)
        
        # This must be Linux ELF.
        linux*)
       -  case $host_cpu in
       -  alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*)
       -    lt_cv_deplibs_check_method=pass_all ;;
       -  *)
       -    # glibc up to 2.1.1 does not perform some relocations on ARM
       -    # this will be overridden with pass_all, but let us keep it just in case
       -    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
       -  esac
       -  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
          lt_cv_deplibs_check_method=pass_all
          ;;
        
       t@@ -2231,12 +2381,10 @@ nto-qnx*)
          ;;
        
        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
          ;;
        
       t@@ -2244,15 +2392,11 @@ osf3* | osf4* | osf5*)
          lt_cv_deplibs_check_method=pass_all
          ;;
        
       -sco3.2v5*)
       -  lt_cv_deplibs_check_method=pass_all
       -  ;;
       -
        solaris*)
          lt_cv_deplibs_check_method=pass_all
          ;;
        
       -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
       +sysv4 | sysv4.3*)
          case $host_vendor in
          motorola)
            lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
       t@@ -2273,10 +2417,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
          siemens)
            lt_cv_deplibs_check_method=pass_all
            ;;
       +  pc)
       +    lt_cv_deplibs_check_method=pass_all
       +    ;;
          esac
          ;;
        
       -sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
       +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
          lt_cv_deplibs_check_method=pass_all
          ;;
        esac
       t@@ -2296,36 +2443,43 @@ AC_DEFUN([AC_PROG_NM],
          # Let the user override the test.
          lt_cv_path_NM="$NM"
        else
       -  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
       -  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
       -    IFS="$lt_save_ifs"
       -    test -z "$ac_dir" && ac_dir=.
       -    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
       -    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
       -      # Check to see if the nm accepts a BSD-compat flag.
       -      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       -      #   nm: unknown option "B" ignored
       -      # Tru64's nm complains that /dev/null is an invalid object file
       -      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
       -      */dev/null* | *'Invalid file or object type'*)
       -        lt_cv_path_NM="$tmp_nm -B"
       -        break
       -        ;;
       -      *)
       -        case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
       -        */dev/null*)
       -          lt_cv_path_NM="$tmp_nm -p"
       +  lt_nm_to_check="${ac_tool_prefix}nm"
       +  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
       +    lt_nm_to_check="$lt_nm_to_check nm"
       +  fi
       +  for lt_tmp_nm in $lt_nm_to_check; do
       +    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
       +    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
       +      IFS="$lt_save_ifs"
       +      test -z "$ac_dir" && ac_dir=.
       +      tmp_nm="$ac_dir/$lt_tmp_nm"
       +      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
       +        # Check to see if the nm accepts a BSD-compat flag.
       +        # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       +        #   nm: unknown option "B" ignored
       +        # Tru64's nm complains that /dev/null is an invalid object file
       +        case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
       +        */dev/null* | *'Invalid file or object type'*)
       +          lt_cv_path_NM="$tmp_nm -B"
                  break
                  ;;
                *)
       -          lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
       -          continue # so that we can try to find one that supports BSD flags
       +          case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
       +          */dev/null*)
       +            lt_cv_path_NM="$tmp_nm -p"
       +            break
       +            ;;
       +          *)
       +            lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
       +            continue # so that we can try to find one that supports BSD flags
       +            ;;
       +          esac
                  ;;
                esac
       -      esac
       -    fi
       +      fi
       +    done
       +    IFS="$lt_save_ifs"
          done
       -  IFS="$lt_save_ifs"
          test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
        fi])
        NM="$lt_cv_path_NM"
       t@@ -2357,13 +2511,13 @@ esac
        # -----------------------------------
        # 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
       t@@ -2382,13 +2536,13 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
        # -----------------------------------
        # 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
       t@@ -2426,10 +2580,21 @@ AC_DEFUN([AC_LIBTOOL_CXX],
        # ---------------
        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
        # --------------
       t@@ -2469,7 +2634,7 @@ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
        
        
        # AC_LIBTOOL_RC
       -# --------------
       +# -------------
        # enable support for Windows resource files
        AC_DEFUN([AC_LIBTOOL_RC],
        [AC_REQUIRE([LT_AC_PROG_RC])
       t@@ -2502,36 +2667,9 @@ lt_simple_link_test_code='int main(){return(0);}\n'
        
        _LT_AC_SYS_COMPILER
        
       -#
       -# Check for any special shared library compilation flags.
       -#
       -_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
       -if test "$GCC" = no; then
       -  case $host_os in
       -  sco3.2v5*)
       -    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
       -    ;;
       -  esac
       -fi
       -if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
       -  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
       -  if echo "$old_CC $old_CFLAGS " | grep "[[         ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[         ]]" >/dev/null; then :
       -  else
       -    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
       -    _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
       -  fi
       -fi
       -
       -
       -#
       -# Check to make sure the static flag actually works.
       -#
       -AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
       -  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
       -  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
       -  [],
       -  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
       -
       +# save warnings/boilerplate of simple test code
       +_LT_COMPILER_BOILERPLATE
       +_LT_LINKER_BOILERPLATE
        
        ## CAVEAT EMPTOR:
        ## There is no encapsulation within the following macros, do not change
       t@@ -2545,9 +2683,9 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1)
        AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
        AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
        AC_LIBTOOL_SYS_LIB_STRIP
       -AC_LIBTOOL_DLOPEN_SELF($1)
       +AC_LIBTOOL_DLOPEN_SELF
        
       -# Report which librarie types wil actually be built
       +# Report which library types will actually be built
        AC_MSG_CHECKING([if libtool supports shared libraries])
        AC_MSG_RESULT([$can_build_shared])
        
       t@@ -2556,7 +2694,7 @@ test "$can_build_shared" = "no" && enable_shared=no
        
        # On AIX, shared libraries and static libraries use the same namespace, and
        # are all built from PIC.
       -case "$host_os" in
       +case $host_os in
        aix3*)
          test "$enable_shared" = yes && enable_static=no
          if test -n "$RANLIB"; then
       t@@ -2569,43 +2707,6 @@ aix4* | aix5*)
          if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
            test "$enable_shared" = yes && enable_static=no
          fi
       -  ;;
       -  darwin* | rhapsody*)
       -  if test "$GCC" = yes; then
       -    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       -    case "$host_os" in
       -    rhapsody* | darwin1.[[012]])
       -      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
       -      ;;
       -    *) # Darwin 1.3 on
       -      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
       -      ;;
       -    esac
       -    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 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 $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
       -    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
       -    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       -  else
       -    _LT_AC_TAGVAR(ld_shlibs, $1)=no
       -  fi
            ;;
        esac
        AC_MSG_RESULT([$enable_shared])
       t@@ -2631,7 +2732,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
        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)=
       t@@ -2643,6 +2744,7 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
        _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
       +_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
        _LT_AC_TAGVAR(hardcode_automatic, $1)=no
        _LT_AC_TAGVAR(module_cmds, $1)=
        _LT_AC_TAGVAR(module_expsym_cmds, $1)=
       t@@ -2660,7 +2762,7 @@ _LT_AC_TAGVAR(postdeps, $1)=
        _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
       t@@ -2670,11 +2772,15 @@ _LT_AC_TAGVAR(objext, $1)=$objext
        lt_simple_compile_test_code="int some_variable = 0;\n"
        
        # Code to be used in simple link tests
       -lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
       +lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
        
        # ltmain only uses $CC for tagged configurations so make sure $CC is set.
        _LT_AC_SYS_COMPILER
        
       +# 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
       t@@ -2685,18 +2791,18 @@ lt_save_path_LD=$lt_cv_path_LD
        if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
          lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
        else
       -  unset lt_cv_prog_gnu_ld
       +  $as_unset lt_cv_prog_gnu_ld
        fi
        if test -n "${lt_cv_path_LDCXX+set}"; then
          lt_cv_path_LD=$lt_cv_path_LDCXX
        else
       -  unset lt_cv_path_LD
       +  $as_unset lt_cv_path_LD
        fi
        test -z "${LDCXX+set}" || LD=$LDCXX
        CC=${CXX-"c++"}
        compiler=$CC
        _LT_AC_TAGVAR(compiler, $1)=$CC
       -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
       +_LT_CC_BASENAME([$compiler])
        
        # We don't want -fno-exception wen compiling C++ code, so set the
        # no_builtin_flag separately
       t@@ -2785,6 +2891,7 @@ case $host_os in
                    ;;
                  esac
                done
       +        ;;
              esac
        
              exp_sym_flag='-bexport'
       t@@ -2803,7 +2910,7 @@ case $host_os in
            _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`
       t@@ -2822,8 +2929,12 @@ case $host_os in
                  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
                  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
                fi
       +        ;;
              esac
              shared_flag='-shared'
       +      if test "$aix_use_runtimelinking" = yes; then
       +        shared_flag="$shared_flag "'${wl}-G'
       +      fi
            else
              # not using gcc
              if test "$host_cpu" = ia64; then
       t@@ -2850,12 +2961,12 @@ case $host_os in
              _LT_AC_SYS_LIBPATH_AIX
              _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
        
       -      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
       +      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
             else
              if test "$host_cpu" = ia64; then
                _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
                _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
       -        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
       +        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
              else
                # Determine the default libpath from the value encoded in an empty executable.
                _LT_AC_SYS_LIBPATH_AIX
       t@@ -2864,16 +2975,26 @@ case $host_os in
                # -berok will link without error, but may produce a broken library.
                _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
                _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
       -        # -bexpall does not export symbols beginning with underscore (_)
       -        _LT_AC_TAGVAR(always_export_symbols, $1)=yes
                # Exported symbols can be pulled into shared objects from archives
       -        _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
       +        _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
                _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
       -        # This is similar to how AIX traditionally builds it's shared libraries.
       -        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
       +        # This is similar to how AIX traditionally builds its shared libraries.
       +        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
              fi
            fi
            ;;
       +
       +  beos*)
       +    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
       +      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
       +      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
       +      # support --undefined.  This deserves some investigation.  FIXME
       +      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
       +    else
       +      _LT_AC_TAGVAR(ld_shlibs, $1)=no
       +    fi
       +    ;;
       +
          chorus*)
            case $cc_basename in
              *)
       t@@ -2892,7 +3013,7 @@ case $host_os in
            _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
        
            if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
       -      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
       +      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
              # If the export-symbols file already is a .def file (1st line
              # is EXPORTS), use it as is; otherwise, prepend...
              _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
       t@@ -2901,70 +3022,81 @@ case $host_os in
                echo EXPORTS > $output_objdir/$soname.def;
                cat $export_symbols >> $output_objdir/$soname.def;
              fi~
       -      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
       +      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
            else
              _LT_AC_TAGVAR(ld_shlibs, $1)=no
            fi
          ;;
       +      darwin* | rhapsody*)
       +        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)='-undefined suppress'
       -      ;;
       -    *) # Darwin 1.3 on
       -      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
       -              _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined 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]])
       -            _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
       -    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 $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
       -    else
       -      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
       -    fi
       -    _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
       -      _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 ${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
       -    _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
       -    _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
       t@@ -2975,14 +3107,14 @@ case $host_os in
                ;;
            esac
            ;;
       -  freebsd[12]*)
       +  freebsd[[12]]*)
            # C++ shared libraries reported to be fairly broken before switch to ELF
            _LT_AC_TAGVAR(ld_shlibs, $1)=no
            ;;
          freebsd-elf*)
            _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
            ;;
       -  freebsd* | kfreebsd*-gnu)
       +  freebsd* | kfreebsd*-gnu | dragonfly*)
            # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
            # conventions
            _LT_AC_TAGVAR(ld_shlibs, $1)=yes
       t@@ -2999,11 +3131,11 @@ case $host_os in
                                        # 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 $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
       t@@ -3013,7 +3145,7 @@ case $host_os in
              # explicitly linking system object files so we need to strip them
              # from the output so that they don't get included in the library
              # dependencies.
       -      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; 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
       t@@ -3027,33 +3159,22 @@ case $host_os in
            ;;
          hpux10*|hpux11*)
            if test $with_gnu_ld = no; then
       -      case "$host_cpu" in
       -      hppa*64*)
       -        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
       +      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
       +      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
       +
       +      case $host_cpu in
       +      hppa*64*|ia64*)
                _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
       -        _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
       -        ;;
       -      ia64*)
       -        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
                ;;
              *)
       -        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
       -        _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
                _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
                ;;
              esac
            fi
       -    case "$host_cpu" in
       -    hppa*64*)
       -      _LT_AC_TAGVAR(hardcode_direct, $1)=no
       -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       -      ;;
       -    ia64*)
       +    case $host_cpu in
       +    hppa*64*|ia64*)
              _LT_AC_TAGVAR(hardcode_direct, $1)=no
              _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       -      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
       -                                              # but as the default
       -                                              # location of the library.
              ;;
            *)
              _LT_AC_TAGVAR(hardcode_direct, $1)=yes
       t@@ -3064,14 +3185,17 @@ case $host_os in
            esac
        
            case $cc_basename in
       -      CC)
       +      CC*)
                # FIXME: insert proper C++ library support
                _LT_AC_TAGVAR(ld_shlibs, $1)=no
                ;;
       -      aCC)
       -        case "$host_cpu" in
       -        hppa*64*|ia64*)
       -          _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
       +      aCC*)
       +        case $host_cpu in
       +        hppa*64*)
       +          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
       +          ;;
       +        ia64*)
       +          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
                  ;;
                *)
                  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
       t@@ -3090,9 +3214,12 @@ case $host_os in
              *)
                if test "$GXX" = yes; then
                  if test $with_gnu_ld = no; then
       -            case "$host_cpu" in
       -            ia64*|hppa*64*)
       -              _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
       +            case $host_cpu in
       +            hppa*64*)
       +              _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
       +              ;;
       +            ia64*)
       +              _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
                      ;;
                    *)
                      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
       t@@ -3106,11 +3233,25 @@ case $host_os in
                ;;
            esac
            ;;
       +  interix3*)
       +    _LT_AC_TAGVAR(hardcode_direct, $1)=no
       +    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       +    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
       +    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
       +    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
       +    # Instead, shared libraries are loaded at an image base (0x10000000 by
       +    # default) and relocated if they conflict, which is a slow very memory
       +    # consuming and fragmenting process.  To avoid this, we pick a random,
       +    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
       +    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
       +    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       +    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       +    ;;
          irix5* | irix6*)
            case $cc_basename in
       -      CC)
       +      CC*)
                # SGI C++
       -        _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
       t@@ -3121,7 +3262,7 @@ case $host_os in
              *)
                if test "$GXX" = yes; then
                  if test "$with_gnu_ld" = no; then
       -            _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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
                  fi
       t@@ -3134,7 +3275,7 @@ case $host_os in
            ;;
          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
       t@@ -3159,17 +3300,41 @@ case $host_os in
                # "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
       -        _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       -        _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 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(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
                _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
                _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
                ;;
       -      cxx)
       +      pgCC*)
       +        # 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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
                _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
       t@@ -3200,7 +3365,7 @@ case $host_os in
            ;;
          mvs*)
            case $cc_basename in
       -      cxx)
       +      cxx*)
                # FIXME: insert proper C++ library support
                _LT_AC_TAGVAR(ld_shlibs, $1)=no
                ;;
       t@@ -3221,9 +3386,25 @@ case $host_os in
            # 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
       t@@ -3239,14 +3420,14 @@ case $host_os in
                _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
        
                ;;
       -      RCC)
       +      RCC*)
                # Rational C++ 2.4.1
                # FIXME: insert proper C++ library support
                _LT_AC_TAGVAR(ld_shlibs, $1)=no
                ;;
       -      cxx)
       +      cxx*)
                _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
       -        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $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)=:
       t@@ -3264,7 +3445,7 @@ case $host_os in
              *)
                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} $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)=:
       t@@ -3283,7 +3464,7 @@ case $host_os in
            ;;
          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
       t@@ -3298,17 +3479,17 @@ case $host_os in
                # the KAI C++ compiler.
                _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
                ;;
       -      RCC)
       +      RCC*)
                # Rational C++ 2.4.1
                # FIXME: insert proper C++ library support
                _LT_AC_TAGVAR(ld_shlibs, $1)=no
                ;;
       -      cxx)
       +      cxx*)
                _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
       -        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $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 $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'
       t@@ -3327,7 +3508,7 @@ case $host_os in
              *)
                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} $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)=:
       t@@ -3348,27 +3529,14 @@ case $host_os in
            # FIXME: insert proper C++ library support
            _LT_AC_TAGVAR(ld_shlibs, $1)=no
            ;;
       -  sco*)
       -    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       -    case $cc_basename in
       -      CC)
       -        # FIXME: insert proper C++ library support
       -        _LT_AC_TAGVAR(ld_shlibs, $1)=no
       -        ;;
       -      *)
       -        # FIXME: insert proper C++ library support
       -        _LT_AC_TAGVAR(ld_shlibs, $1)=no
       -        ;;
       -    esac
       -    ;;
          sunos4*)
            case $cc_basename in
       -      CC)
       +      CC*)
                # Sun C++ 4.x
                # FIXME: insert proper C++ library support
                _LT_AC_TAGVAR(ld_shlibs, $1)=no
                ;;
       -      lcc)
       +      lcc*)
                # Lucid
                # FIXME: insert proper C++ library support
                _LT_AC_TAGVAR(ld_shlibs, $1)=no
       t@@ -3381,36 +3549,33 @@ case $host_os in
            ;;
          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 $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 $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
                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
       t@@ -3418,7 +3583,7 @@ case $host_os in
                # in the archive.
                _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
                ;;
       -      gcx)
       +      gcx*)
                # Green Hills C++ Compiler
                _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
        
       t@@ -3456,12 +3621,63 @@ case $host_os in
                ;;
            esac
            ;;
       -  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
       +  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
       +    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
            _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       +    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       +    runpath_var='LD_RUN_PATH'
       +
       +    case $cc_basename in
       +      CC*)
       +        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       +        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       +        ;;
       +      *)
       +        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       +        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       +        ;;
       +    esac
       +    ;;
       +  sysv5* | sco3.2v5* | sco5v6*)
       +    # Note: We can NOT use -z defs as we might desire, because we do not
       +    # link with -lc, and that would cause any symbols used from libc to
       +    # always be unresolved, which means just about no library would
       +    # ever link correctly.  If we're not using GNU ld we use -z text
       +    # though, which does catch some bad symbols but isn't as heavy-handed
       +    # as -z defs.
       +    # For security reasons, it is highly recommended that you always
       +    # use absolute paths for naming shared libraries, and exclude the
       +    # DT_RUNPATH tag from executables and libraries.  But doing so
       +    # requires that you compile everything twice, which is a pain.
       +    # So that behaviour is only enabled if SCOABSPATH is set to a
       +    # non-empty value in the environment.  Most likely only useful for
       +    # creating official distributions of packages.
       +    # This is a hack until libtool officially supports absolute path
       +    # names for shared libraries.
       +    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
       +    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
       +    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       +    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       +    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
       +    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
       +    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       +    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
       +    runpath_var='LD_RUN_PATH'
       +
       +    case $cc_basename in
       +      CC*)
       +        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
       +        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
       +        ;;
       +      *)
       +        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
       +        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
       +        ;;
       +    esac
            ;;
          tandem*)
            case $cc_basename in
       -      NCC)
       +      NCC*)
                # NonStop-UX NCC 3.20
                # FIXME: insert proper C++ library support
                _LT_AC_TAGVAR(ld_shlibs, $1)=no
       t@@ -3498,8 +3714,6 @@ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
        AC_LIBTOOL_PROG_LD_SHLIBS($1)
        AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
        AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
       -AC_LIBTOOL_SYS_LIB_STRIP
       -AC_LIBTOOL_DLOPEN_SELF($1)
        
        AC_LIBTOOL_CONFIG($1)
        
       t@@ -3517,7 +3731,7 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
        ])# AC_LIBTOOL_LANG_CXX_CONFIG
        
        # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
       -# ------------------------
       +# ------------------------------------
        # Figure out "hidden" library dependencies from verbose
        # compiler output when linking a shared library.
        # Parse the compiler output and extract the necessary
       t@@ -3571,7 +3785,7 @@ if AC_TRY_EVAL(ac_compile); then
          # 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
       t@@ -3647,13 +3861,37 @@ fi
        
        $rm -f confest.$objext
        
       +# PORTME: override above test on systems where it is broken
       +ifelse([$1],[CXX],
       +[case $host_os in
       +interix3*)
       +  # Interix 3.5 installs completely hosed .la files for C++, so rather than
       +  # hack all around it, let's just trust "g++" to DTRT.
       +  _LT_AC_TAGVAR(predep_objects,$1)=
       +  _LT_AC_TAGVAR(postdep_objects,$1)=
       +  _LT_AC_TAGVAR(postdeps,$1)=
       +  ;;
       +
       +solaris*)
       +  case $cc_basename in
       +  CC*)
       +    # 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
        ])# AC_LIBTOOL_POSTDEP_PREDEP
        
        # AC_LIBTOOL_LANG_F77_CONFIG
       -# ------------------------
       +# --------------------------
        # Ensure that the configuration vars for the C compiler are
        # suitably defined.  Those variables are subsequently used by
        # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
       t@@ -3697,12 +3935,16 @@ lt_simple_link_test_code="      program t\n      end\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=${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])
       t@@ -3712,7 +3954,7 @@ test "$can_build_shared" = "no" && enable_shared=no
        
        # On AIX, shared libraries and static libraries use the same namespace, and
        # are all built from PIC.
       -case "$host_os" in
       +case $host_os in
        aix3*)
          test "$enable_shared" = yes && enable_static=no
          if test -n "$RANLIB"; then
       t@@ -3721,7 +3963,9 @@ aix3*)
          fi
          ;;
        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
        AC_MSG_RESULT([$enable_shared])
       t@@ -3731,8 +3975,6 @@ AC_MSG_CHECKING([whether to build static libraries])
        test "$enable_shared" = yes || enable_static=yes
        AC_MSG_RESULT([$enable_static])
        
       -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
       -
        _LT_AC_TAGVAR(GCC, $1)="$G77"
        _LT_AC_TAGVAR(LD, $1)="$LD"
        
       t@@ -3742,8 +3984,6 @@ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
        AC_LIBTOOL_PROG_LD_SHLIBS($1)
        AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
        AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
       -AC_LIBTOOL_SYS_LIB_STRIP
       -
        
        AC_LIBTOOL_CONFIG($1)
        
       t@@ -3772,20 +4012,27 @@ _LT_AC_TAGVAR(objext, $1)=$objext
        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
       t@@ -3797,8 +4044,6 @@ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
        AC_LIBTOOL_PROG_LD_SHLIBS($1)
        AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
        AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
       -AC_LIBTOOL_SYS_LIB_STRIP
       -AC_LIBTOOL_DLOPEN_SELF($1)
        
        AC_LIBTOOL_CONFIG($1)
        
       t@@ -3808,7 +4053,7 @@ CC="$lt_save_CC"
        
        
        # AC_LIBTOOL_LANG_RC_CONFIG
       -# --------------------------
       +# -------------------------
        # Ensure that the configuration vars for the Windows resource compiler are
        # suitably defined.  Those variables are subsequently used by
        # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
       t@@ -3832,11 +4077,16 @@ lt_simple_link_test_code="$lt_simple_compile_test_code"
        # 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)
       t@@ -3866,7 +4116,7 @@ if test -f "$ltmain"; then
          # Now quote all the things that may contain metacharacters while being
          # careful not to overquote the AC_SUBSTed values.  We take copies of the
          # variables and quote the copies for generation of the libtool script.
       -  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
       +  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
            SED SHELL STRIP \
            libname_spec library_names_spec soname_spec extract_expsyms_cmds \
            old_striplib striplib file_magic_cmd finish_cmds finish_eval \
       t@@ -3972,7 +4222,7 @@ ifelse([$1], [],
        #
        # You should have received a copy of the GNU General Public License
        # along with this program; if not, write to the Free Software
       -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
       +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
        #
        # As a special exception to the GNU General Public License, if you
        # distribute this file as part of a program that contains a
       t@@ -3983,11 +4233,11 @@ ifelse([$1], [],
        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=
       t@@ -4018,6 +4268,12 @@ fast_install=$enable_fast_install
        # 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
       t@@ -4029,6 +4285,9 @@ AR_FLAGS=$lt_AR_FLAGS
        # A C compiler.
        LTCC=$lt_LTCC
        
       +# LTCC compiler flags.
       +LTCFLAGS=$lt_LTCFLAGS
       +
        # A language-specific compiler.
        CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
        
       t@@ -4094,7 +4353,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
        # 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?
       t@@ -4368,9 +4627,6 @@ symcode='[[BCDEGRST]]'
        # Regexp to match symbols that can be accessed directly from C.
        sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
        
       -# Transform the above into a raw symbol and a C symbol.
       -symxfrm='\1 \2\3 \3'
       -
        # Transform an extracted symbol line into a proper C declaration
        lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
        
       t@@ -4392,15 +4648,31 @@ hpux*) # Its linker distinguishes data from code symbols
          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]]'
          ;;
        osf*)
          symcode='[[BCDEGQRST]]'
          ;;
       -solaris* | sysv5*)
       +solaris*)
          symcode='[[BDRT]]'
          ;;
       +sco3.2v5*)
       +  symcode='[[DT]]'
       +  ;;
       +sysv4.2uw2*)
       +  symcode='[[DT]]'
       +  ;;
       +sysv5* | sco5v6* | unixware* | OpenUNIX*)
       +  symcode='[[ABDT]]'
       +  ;;
        sysv4)
          symcode='[[DFNSTU]]'
          ;;
       t@@ -4423,8 +4695,11 @@ esac
        # Try without a prefix undercore, then with it.
        for ac_symprfx in "" "_"; do
        
       +  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
       +  symxfrm="\\1 $ac_symprfx\\2 \\2"
       +
          # Write the raw and C identifiers.
       -  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[         ]]\($symcode$symcode*\)[[         ]][[         ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
       +  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[         ]]\($symcode$symcode*\)[[         ]][[         ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
        
          # Check to see that the pipe works correctly.
          pipe_works=no
       t@@ -4580,6 +4855,10 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
              # DJGPP does not support shared libraries at all
              _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
              ;;
       +    interix3*)
       +      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       +      # Instead, we relocate shared libraries at runtime.
       +      ;;
            sysv4*MP*)
              if test -d /usr/nec; then
                _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
       t@@ -4588,7 +4867,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
            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*)
                ;;
              *)
       t@@ -4613,18 +4892,28 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
                ;;
              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'
                    ;;
       t@@ -4632,22 +4921,22 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
                    ;;
                esac
                ;;
       -      freebsd* | kfreebsd*-gnu)
       +      freebsd* | kfreebsd*-gnu | dragonfly*)
                # FreeBSD uses GNU C++
                ;;
              hpux9* | hpux10* | hpux11*)
                case $cc_basename in
       -          CC)
       +          CC*)
                    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       -            _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
       +            _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
                    if test "$host_cpu" != ia64; then
                      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
                    fi
                    ;;
       -          aCC)
       +          aCC*)
                    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       -            _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
       -            case "$host_cpu" in
       +            _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
       +            case $host_cpu in
                    hppa*64*|ia64*)
                      # +Z the default
                      ;;
       t@@ -4660,9 +4949,13 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
                    ;;
                esac
                ;;
       +      interix*)
       +        # This is c89, which is MS Visual C++ (no shared libs)
       +        # Anyone wants to do a port?
       +        ;;
              irix5* | irix6* | nonstopux*)
                case $cc_basename in
       -          CC)
       +          CC*)
                    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
                    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
                    # CC pic flag -KPIC is the default.
       t@@ -4673,18 +4966,24 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
                ;;
              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)
       +          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
                    # Linux and Compaq Tru64 Unix objects are PIC.
       t@@ -4701,7 +5000,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
                ;;
              mvs*)
                case $cc_basename in
       -          cxx)
       +          cxx*)
                    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
                    ;;
                  *)
       t@@ -4712,14 +5011,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
                ;;
              osf3* | osf4* | osf5*)
                case $cc_basename in
       -          KCC)
       +          KCC*)
                    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
                    ;;
       -          RCC)
       +          RCC*)
                    # Rational C++ 2.4.1
                    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
                    ;;
       -          cxx)
       +          cxx*)
                    # Digital/Compaq C++
                    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
                    # Make sure the PIC flag is empty.  It appears that all Alpha
       t@@ -4733,24 +5032,15 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
                ;;
              psos*)
                ;;
       -      sco*)
       -        case $cc_basename in
       -          CC)
       -            _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
       -            ;;
       -          *)
       -            ;;
       -        esac
       -        ;;
              solaris*)
                case $cc_basename in
       -          CC)
       +          CC*)
                    # Sun C++ 4.2, 5.x and Centerline C++
                    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
                    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
                    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
                    ;;
       -          gcx)
       +          gcx*)
                    # Green Hills C++ Compiler
                    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
                    ;;
       t@@ -4760,12 +5050,12 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
                ;;
              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'
                    ;;
       t@@ -4775,7 +5065,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
                ;;
              tandem*)
                case $cc_basename in
       -          NCC)
       +          NCC*)
                    # NonStop-UX NCC 3.20
                    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
                    ;;
       t@@ -4783,7 +5073,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
                    ;;
                esac
                ;;
       -      unixware*)
       +      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
       +        case $cc_basename in
       +          CC*)
       +            _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       +            _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       +            _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       +            ;;
       +        esac
                ;;
              vxworks*)
                ;;
       t@@ -4830,6 +5127,11 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
              _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
              ;;
        
       +    interix3*)
       +      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       +      # Instead, we relocate shared libraries at runtime.
       +      ;;
       +
            msdosdjgpp*)
              # Just because we use GCC doesn't mean we suddenly get shared libraries
              # on systems that don't support them.
       t@@ -4846,7 +5148,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
            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
                ;;
       t@@ -4872,6 +5174,16 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
                _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
       t@@ -4883,7 +5195,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
              _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
                ;;
       t@@ -4907,12 +5219,19 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
              ;;
        
            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.
       t@@ -4927,15 +5246,15 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
              _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
              ;;
        
       -    sco3.2v5*)
       -      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
       -      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
       -      ;;
       -
            solaris*)
       -      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
              _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
              _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*)
       t@@ -4944,7 +5263,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
              _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
              ;;
        
       -    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
       +    sysv4 | sysv4.2uw2* | sysv4.3*)
              _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
              _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
              _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       t@@ -4957,6 +5276,17 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
              fi
              ;;
        
       +    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
       +      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       +      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       +      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       +      ;;
       +
       +    unicos*)
       +      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       +      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
       +      ;;
       +
            uts4*)
              _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
              _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       t@@ -4984,7 +5314,7 @@ if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
            [_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)=
       t@@ -4993,6 +5323,16 @@ case "$host_os" in
            _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
            ;;
        esac
       +
       +#
       +# Check to make sure the static flag actually works.
       +#
       +wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
       +AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
       +  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
       +  $lt_tmp_static_flag,
       +  [],
       +  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
        ])
        
        
       t@@ -5017,7 +5357,7 @@ ifelse([$1],[CXX],[
            _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
          ;;
          cygwin* | mingw*)
       -    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
       +    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
          ;;
          *)
            _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
       t@@ -5060,7 +5400,8 @@ ifelse([$1],[CXX],[
          # 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
       t@@ -5070,6 +5411,10 @@ ifelse([$1],[CXX],[
              with_gnu_ld=no
            fi
            ;;
       +  interix*)
       +    # we just hope/assume this is gcc and not c89 (= MSVC++)
       +    with_gnu_ld=yes
       +    ;;
          openbsd*)
            with_gnu_ld=no
            ;;
       t@@ -5080,6 +5425,27 @@ ifelse([$1],[CXX],[
            # 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*)
       t@@ -5130,10 +5496,10 @@ EOF
              _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
              _LT_AC_TAGVAR(always_export_symbols, $1)=no
              _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       -      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
       +      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $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 $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
       +        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
                # If the export-symbols file already is a .def file (1st line
                # is EXPORTS), use it as is; otherwise, prepend...
                _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
       t@@ -5142,9 +5508,55 @@ EOF
                  echo EXPORTS > $output_objdir/$soname.def;
                  cat $export_symbols >> $output_objdir/$soname.def;
                fi~
       -        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
       +        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
              else
       -        ld_shlibs=no
       +        _LT_AC_TAGVAR(ld_shlibs, $1)=no
       +      fi
       +      ;;
       +
       +    interix3*)
       +      _LT_AC_TAGVAR(hardcode_direct, $1)=no
       +      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       +      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
       +      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
       +      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
       +      # Instead, shared libraries are loaded at an image base (0x10000000 by
       +      # default) and relocated if they conflict, which is a slow very memory
       +      # consuming and fragmenting process.  To avoid this, we pick a random,
       +      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
       +      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
       +      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       +      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       +      ;;
       +
       +    linux*)
       +      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
       +      else
       +        _LT_AC_TAGVAR(ld_shlibs, $1)=no
              fi
              ;;
        
       t@@ -5158,7 +5570,7 @@ EOF
              fi
              ;;
        
       -    solaris* | sysv5*)
       +    solaris*)
              if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
                _LT_AC_TAGVAR(ld_shlibs, $1)=no
                cat <<EOF 1>&2
       t@@ -5179,6 +5591,33 @@ EOF
              fi
              ;;
        
       +    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
       +      case `$LD -v 2>&1` in
       +        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
       +        _LT_AC_TAGVAR(ld_shlibs, $1)=no
       +        cat <<_LT_EOF 1>&2
       +
       +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
       +*** reliably create shared libraries on SCO systems.  Therefore, libtool
       +*** is disabling shared libraries support.  We urge you to upgrade GNU
       +*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
       +*** your PATH or compiler configuration so that the native linker is
       +*** used, and then restart.
       +
       +_LT_EOF
       +        ;;
       +        *)
       +          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
       +            _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
       +            _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
       +            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
       +          else
       +            _LT_AC_TAGVAR(ld_shlibs, $1)=no
       +          fi
       +        ;;
       +      esac
       +      ;;
       +
            sunos4*)
              _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
              wlarc=
       t@@ -5186,31 +5625,6 @@ EOF
              _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
              ;;
        
       -  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
       -    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 $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
       t@@ -5221,16 +5635,11 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
              ;;
            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)
       t@@ -5242,7 +5651,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
              # Note: this linker hardcodes the directories in LIBPATH if there
              # are no directories specified by -L.
              _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
       -      if test "$GCC" = yes && test -z "$link_static_flag"; then
       +      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
                # Neither direct hardcoding nor static linking is supported with a
                # broken collect2.
                _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
       t@@ -5276,6 +5685,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
                      break
                    fi
                  done
       +          ;;
                esac
        
                exp_sym_flag='-bexport'
       t@@ -5294,7 +5704,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
              _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`
       t@@ -5313,8 +5723,12 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
                    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
                    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
                  fi
       +          ;;
                esac
                shared_flag='-shared'
       +        if test "$aix_use_runtimelinking" = yes; then
       +          shared_flag="$shared_flag "'${wl}-G'
       +        fi
              else
                # not using gcc
                if test "$host_cpu" = ia64; then
       t@@ -5322,11 +5736,11 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
                  # chokes on -Wl,-G. The following line is correct:
                  shared_flag='-G'
                else
       -          if test "$aix_use_runtimelinking" = yes; then
       +          if test "$aix_use_runtimelinking" = yes; then
                    shared_flag='${wl}-G'
                  else
                    shared_flag='${wl}-bM:SRE'
       -          fi
       +          fi
                fi
              fi
        
       t@@ -5340,12 +5754,12 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
               # Determine the default libpath from the value encoded in an empty executable.
               _LT_AC_SYS_LIBPATH_AIX
               _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
       -        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
       +        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
               else
                if test "$host_cpu" = ia64; then
                  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
                  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
       -          _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
       +          _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
                else
                 # Determine the default libpath from the value encoded in an empty executable.
                 _LT_AC_SYS_LIBPATH_AIX
       t@@ -5354,13 +5768,11 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
                  # -berok will link without error, but may produce a broken library.
                  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
                  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
       -          # -bexpall does not export symbols beginning with underscore (_)
       -          _LT_AC_TAGVAR(always_export_symbols, $1)=yes
                  # Exported symbols can be pulled into shared objects from archives
       -          _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
       +          _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
                  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
       -          # This is similar to how AIX traditionally builds it's shared libraries.
       -          _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
       +          # This is similar to how AIX traditionally builds its shared libraries.
       +          _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
                fi
              fi
              ;;
       t@@ -5373,7 +5785,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
              _LT_AC_TAGVAR(ld_shlibs, $1)=no
              ;;
        
       -    bsdi4*)
       +    bsdi[[45]]*)
              _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
              ;;
        
       t@@ -5394,57 +5806,57 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
              _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
              # FIXME: Should let the user specify the lib program.
              _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
       -      fix_srcfile_path='`cygpath -w "$srcfile"`'
       +      _LT_AC_TAGVAR(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)='-undefined suppress'
       -        ;;
       -      *) # Darwin 1.3 on
       -      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
       -            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 $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
       -            else
       -        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
       -      fi
       -      _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
       -          _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 ${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
       -          _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)=''
              _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       +    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
       +      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
              ;;
        
       t@@ -5478,7 +5890,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
              ;;
        
            # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
       -    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
       t@@ -5501,47 +5913,62 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
              _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
              ;;
        
       -    hpux10* | hpux11*)
       +    hpux10*)
              if test "$GCC" = yes -a "$with_gnu_ld" = no; then
       -        case "$host_cpu" in
       -        hppa*64*|ia64*)
       +        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       +      else
       +        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       +      fi
       +      if test "$with_gnu_ld" = no; then
       +        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
       +        _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
       +
       +        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
       +        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
       +
       +        # hardcode_minus_L: Not really in the search PATH,
       +        # but as the default location of the library.
       +        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
       +      fi
       +      ;;
       +
       +    hpux11*)
       +      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
       +        case $host_cpu in
       +        hppa*64*)
                  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
                  ;;
       +        ia64*)
       +          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
       +          ;;
                *)
                  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
                  ;;
                esac
              else
       -        case "$host_cpu" in
       -        hppa*64*|ia64*)
       -          _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
       +        case $host_cpu in
       +        hppa*64*)
       +          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
       +          ;;
       +        ia64*)
       +          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
                  ;;
                *)
       -          _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       +          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
                  ;;
                esac
              fi
              if test "$with_gnu_ld" = no; then
       -        case "$host_cpu" in
       -        hppa*64*)
       -          _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
       +        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
       +        _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
       +
       +        case $host_cpu in
       +        hppa*64*|ia64*)
                  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
       -          _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
                  _LT_AC_TAGVAR(hardcode_direct, $1)=no
                  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
                  ;;
       -        ia64*)
       -          _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
       -          _LT_AC_TAGVAR(hardcode_direct, $1)=no
       -          _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       -
       -          # hardcode_minus_L: Not really in the search PATH,
       -          # but as the default location of the library.
       -          _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
       -          ;;
                *)
       -          _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
       -          _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
                  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
                  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        
       t@@ -5589,6 +6016,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
              _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
              if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
                _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       +        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
                _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
                _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
              else
       t@@ -5634,7 +6062,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
                _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
                _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
                _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
       -        $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
       +        $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
        
                # Both c and cxx compiler support -rpath directly
                _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
       t@@ -5642,21 +6070,15 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
              _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
              ;;
        
       -    sco3.2v5*)
       -      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
       -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       -      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
       -      runpath_var=LD_RUN_PATH
       -      hardcode_runpath_var=yes
       -      ;;
       -
            solaris*)
              _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
              if test "$GCC" = yes; then
       +        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 $libobjs $deplibs $compiler_flags~$rm $lib.exp'
              else
       +        wlarc=''
                _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
                _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
                  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
       t@@ -5665,8 +6087,18 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
              _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
              ;;
       t@@ -5723,36 +6155,45 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
              fi
              ;;
        
       -    sysv4.2uw2*)
       -      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
       -      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
       -      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
       +    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
       +      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
       +      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
              _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       -      hardcode_runpath_var=yes
       -      runpath_var=LD_RUN_PATH
       -      ;;
       +      runpath_var='LD_RUN_PATH'
        
       -   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
       -      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
              if test "$GCC" = yes; then
       -        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
       +        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       +        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
              else
       -        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
       +        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       +        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
              fi
       -      runpath_var='LD_RUN_PATH'
       -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
              ;;
        
       -    sysv5*)
       -      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
       -      # $CC -shared without GNU ld will not create a library from C++
       -      # object files and a static libstdc++, better avoid it by now
       -      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
       -      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
       -                  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
       -      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
       +    sysv5* | sco3.2v5* | sco5v6*)
       +      # Note: We can NOT use -z defs as we might desire, because we do not
       +      # link with -lc, and that would cause any symbols used from libc to
       +      # always be unresolved, which means just about no library would
       +      # ever link correctly.  If we're not using GNU ld we use -z text
       +      # though, which does catch some bad symbols but isn't as heavy-handed
       +      # as -z defs.
       +      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
       +      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
       +      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
              _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       +      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
       +      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
       +      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       +      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
              runpath_var='LD_RUN_PATH'
       +
       +      if test "$GCC" = yes; then
       +        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
       +        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
       +      else
       +        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
       +        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
       +      fi
              ;;
        
            uts4*)
       t@@ -5770,11 +6211,6 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
        AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
        test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
        
       -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
       -if test "$GCC" = yes; then
       -  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
       -fi
       -
        #
        # Do we need to explicitly link libc?
        #
       t@@ -5802,6 +6238,7 @@ x|xyes)
                libobjs=conftest.$ac_objext
                deplibs=
                wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
       +        pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
                compiler_flags=-v
                linker_flags=-v
                verstring=
       t@@ -5929,7 +6366,7 @@ lt_ac_count=0
        # Add /usr/xpg4/bin/sed as it is typically found on Solaris
        # along with /bin/sed that truncates output.
        for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
       -  test ! -f $lt_ac_sed && break
       +  test ! -f $lt_ac_sed && continue
          cat /dev/null > conftest.in
          lt_ac_count=0
          echo $ECHO_N "0123456789$ECHO_C" >conftest.in
       t@@ -5954,7 +6391,7 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
            fi
          done
        done
       -SED=$lt_cv_path_SED
        ])
       +SED=$lt_cv_path_SED
        AC_MSG_RESULT([$SED])
        ])